diff --git a/accounts/abi/abi.go b/accounts/abi/abi.go index aaba001ba94..a321a8a7a79 100644 --- a/accounts/abi/abi.go +++ b/accounts/abi/abi.go @@ -24,7 +24,7 @@ import ( "fmt" "io" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/crypto" ) diff --git a/accounts/abi/abi_test.go b/accounts/abi/abi_test.go index 56414a88050..e77f71e1bbb 100644 --- a/accounts/abi/abi_test.go +++ b/accounts/abi/abi_test.go @@ -27,7 +27,7 @@ import ( "strings" "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/common" "github.com/ledgerwatch/erigon/common/math" diff --git a/accounts/abi/bind/auth.go b/accounts/abi/bind/auth.go index 59da964fbe0..39c545dd1c2 100644 --- a/accounts/abi/bind/auth.go +++ b/accounts/abi/bind/auth.go @@ -21,7 +21,7 @@ import ( "errors" "math/big" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/core/types" "github.com/ledgerwatch/erigon/crypto" diff --git a/accounts/abi/bind/backend.go b/accounts/abi/bind/backend.go index 120cf191bf9..0571efbea75 100644 --- a/accounts/abi/bind/backend.go +++ b/accounts/abi/bind/backend.go @@ -21,7 +21,7 @@ import ( "errors" "math/big" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" ethereum "github.com/ledgerwatch/erigon" "github.com/ledgerwatch/erigon/core/types" diff --git a/accounts/abi/bind/backends/simulated.go b/accounts/abi/bind/backends/simulated.go index 9ec89a6fb63..19b19f33cba 100644 --- a/accounts/abi/bind/backends/simulated.go +++ b/accounts/abi/bind/backends/simulated.go @@ -28,13 +28,13 @@ import ( "github.com/holiman/uint256" "github.com/ledgerwatch/log/v3" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/fixedgas" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/kv" - state2 "github.com/ledgerwatch/erigon-lib/state" - types2 "github.com/ledgerwatch/erigon-lib/types" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/fixedgas" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + state2 "github.com/ledgerwatch/erigon/erigon-lib/state" + types2 "github.com/ledgerwatch/erigon/erigon-lib/types" ethereum "github.com/ledgerwatch/erigon" "github.com/ledgerwatch/erigon/accounts/abi" diff --git a/accounts/abi/bind/backends/simulated_test.go b/accounts/abi/bind/backends/simulated_test.go index 0d33ca281b9..7d206972546 100644 --- a/accounts/abi/bind/backends/simulated_test.go +++ b/accounts/abi/bind/backends/simulated_test.go @@ -28,8 +28,6 @@ import ( "github.com/holiman/uint256" ethereum "github.com/ledgerwatch/erigon" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" "github.com/ledgerwatch/erigon/accounts/abi" "github.com/ledgerwatch/erigon/accounts/abi/bind" "github.com/ledgerwatch/erigon/common" @@ -37,6 +35,8 @@ import ( "github.com/ledgerwatch/erigon/core/rawdb" "github.com/ledgerwatch/erigon/core/types" "github.com/ledgerwatch/erigon/crypto" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/erigon/params" ) diff --git a/accounts/abi/bind/base.go b/accounts/abi/bind/base.go index d6f2b33b805..46ee3d201e9 100644 --- a/accounts/abi/bind/base.go +++ b/accounts/abi/bind/base.go @@ -23,7 +23,7 @@ import ( "math/big" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" ethereum "github.com/ledgerwatch/erigon" "github.com/ledgerwatch/erigon/accounts/abi" diff --git a/accounts/abi/bind/base_test.go b/accounts/abi/bind/base_test.go index ca2d4e19e31..043eba165d8 100644 --- a/accounts/abi/bind/base_test.go +++ b/accounts/abi/bind/base_test.go @@ -23,7 +23,7 @@ import ( "strings" "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" ethereum "github.com/ledgerwatch/erigon" "github.com/ledgerwatch/erigon/accounts/abi" diff --git a/accounts/abi/bind/bind_test.go b/accounts/abi/bind/bind_test.go index 2561a63f5e7..3295030b69f 100644 --- a/accounts/abi/bind/bind_test.go +++ b/accounts/abi/bind/bind_test.go @@ -26,7 +26,7 @@ import ( "strings" "testing" - "github.com/ledgerwatch/erigon-lib/common/dir" + "github.com/ledgerwatch/erigon/erigon-lib/common/dir" ) var bindTests = []struct { @@ -47,7 +47,7 @@ var bindTests = []struct { `contract NilContract {}`, []string{`606060405260068060106000396000f3606060405200`}, []string{`[]`}, - `libcommon "github.com/ledgerwatch/erigon-lib/common"`, + `libcommon "github.com/ledgerwatch/erigon/erigon-lib/common"`, ` if b, err := NewEmpty(libcommon.Address{}, nil); b == nil || err != nil { t.Fatalf("combined binding (%v) nil or error (%v) not nil", b, nil) @@ -70,7 +70,7 @@ var bindTests = []struct { `https://ethereum.org/token`, []string{`60606040526040516107fd3803806107fd83398101604052805160805160a05160c051929391820192909101600160a060020a0333166000908152600360209081526040822086905581548551838052601f6002600019610100600186161502019093169290920482018390047f290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e56390810193919290918801908390106100e857805160ff19168380011785555b506101189291505b8082111561017157600081556001016100b4565b50506002805460ff19168317905550505050610658806101a56000396000f35b828001600101855582156100ac579182015b828111156100ac5782518260005055916020019190600101906100fa565b50508060016000509080519060200190828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061017557805160ff19168380011785555b506100c89291506100b4565b5090565b82800160010185558215610165579182015b8281111561016557825182600050559160200191906001019061018756606060405236156100775760e060020a600035046306fdde03811461007f57806323b872dd146100dc578063313ce5671461010e57806370a082311461011a57806395d89b4114610132578063a9059cbb1461018e578063cae9ca51146101bd578063dc3080f21461031c578063dd62ed3e14610341575b610365610002565b61036760008054602060026001831615610100026000190190921691909104601f810182900490910260809081016040526060828152929190828280156104eb5780601f106104c0576101008083540402835291602001916104eb565b6103d5600435602435604435600160a060020a038316600090815260036020526040812054829010156104f357610002565b6103e760025460ff1681565b6103d560043560036020526000908152604090205481565b610367600180546020600282841615610100026000190190921691909104601f810182900490910260809081016040526060828152929190828280156104eb5780601f106104c0576101008083540402835291602001916104eb565b610365600435602435600160a060020a033316600090815260036020526040902054819010156103f157610002565b60806020604435600481810135601f8101849004909302840160405260608381526103d5948235946024803595606494939101919081908382808284375094965050505050505060006000836004600050600033600160a060020a03168152602001908152602001600020600050600087600160a060020a031681526020019081526020016000206000508190555084905080600160a060020a0316638f4ffcb1338630876040518560e060020a0281526004018085600160a060020a0316815260200184815260200183600160a060020a03168152602001806020018281038252838181518152602001915080519060200190808383829060006004602084601f0104600f02600301f150905090810190601f1680156102f25780820380516001836020036101000a031916815260200191505b50955050505050506000604051808303816000876161da5a03f11561000257505050509392505050565b6005602090815260043560009081526040808220909252602435815220546103d59081565b60046020818152903560009081526040808220909252602435815220546103d59081565b005b60405180806020018281038252838181518152602001915080519060200190808383829060006004602084601f0104600f02600301f150905090810190601f1680156103c75780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b60408051918252519081900360200190f35b6060908152602090f35b600160a060020a03821660009081526040902054808201101561041357610002565b806003600050600033600160a060020a03168152602001908152602001600020600082828250540392505081905550806003600050600084600160a060020a0316815260200190815260200160002060008282825054019250508190555081600160a060020a031633600160a060020a03167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef836040518082815260200191505060405180910390a35050565b820191906000526020600020905b8154815290600101906020018083116104ce57829003601f168201915b505050505081565b600160a060020a03831681526040812054808301101561051257610002565b600160a060020a0380851680835260046020908152604080852033949094168086529382528085205492855260058252808520938552929052908220548301111561055c57610002565b816003600050600086600160a060020a03168152602001908152602001600020600082828250540392505081905550816003600050600085600160a060020a03168152602001908152602001600020600082828250540192505081905550816005600050600086600160a060020a03168152602001908152602001600020600050600033600160a060020a0316815260200190815260200160002060008282825054019250508190555082600160a060020a031633600160a060020a03167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a3939250505056`}, []string{`[{"constant":true,"inputs":[],"name":"name","outputs":[{"name":"","type":"string"}],"type":"function"},{"constant":false,"inputs":[{"name":"_from","type":"address"},{"name":"_to","type":"address"},{"name":"_value","type":"uint256"}],"name":"transferFrom","outputs":[{"name":"success","type":"bool"}],"type":"function"},{"constant":true,"inputs":[],"name":"decimals","outputs":[{"name":"","type":"uint8"}],"type":"function"},{"constant":true,"inputs":[{"name":"","type":"address"}],"name":"balanceOf","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[],"name":"symbol","outputs":[{"name":"","type":"string"}],"type":"function"},{"constant":false,"inputs":[{"name":"_to","type":"address"},{"name":"_value","type":"uint256"}],"name":"transfer","outputs":[],"type":"function"},{"constant":false,"inputs":[{"name":"_spender","type":"address"},{"name":"_value","type":"uint256"},{"name":"_extraData","type":"bytes"}],"name":"approveAndCall","outputs":[{"name":"success","type":"bool"}],"type":"function"},{"constant":true,"inputs":[{"name":"","type":"address"},{"name":"","type":"address"}],"name":"spentAllowance","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[{"name":"","type":"address"},{"name":"","type":"address"}],"name":"allowance","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"inputs":[{"name":"initialSupply","type":"uint256"},{"name":"tokenName","type":"string"},{"name":"decimalUnits","type":"uint8"},{"name":"tokenSymbol","type":"string"}],"type":"constructor"},{"anonymous":false,"inputs":[{"indexed":true,"name":"from","type":"address"},{"indexed":true,"name":"to","type":"address"},{"indexed":false,"name":"value","type":"uint256"}],"name":"Transfer","type":"event"}]`}, - `libcommon "github.com/ledgerwatch/erigon-lib/common"`, + `libcommon "github.com/ledgerwatch/erigon/erigon-lib/common"`, ` if b, err := NewToken(libcommon.Address{}, nil); b == nil || err != nil { t.Fatalf("binding (%v) nil or error (%v) not nil", b, nil) @@ -86,7 +86,7 @@ var bindTests = []struct { `https://ethereum.org/crowdsale`, []string{`606060408190526007805460ff1916905560a0806105a883396101006040529051608051915160c05160e05160008054600160a060020a03199081169095178155670de0b6b3a7640000958602600155603c9093024201600355930260045560058054909216909217905561052f90819061007990396000f36060604052361561006c5760e060020a600035046301cb3b20811461008257806329dcb0cf1461014457806338af3eed1461014d5780636e66f6e91461015f5780637a3a0e84146101715780637b3e5e7b1461017a578063a035b1fe14610183578063dc0d3dff1461018c575b61020060075460009060ff161561032357610002565b61020060035460009042106103205760025460015490106103cb576002548154600160a060020a0316908290606082818181858883f150915460025460408051600160a060020a039390931683526020830191909152818101869052517fe842aea7a5f1b01049d752008c53c52890b1a6daf660cf39e8eec506112bbdf6945090819003909201919050a15b60405160008054600160a060020a039081169230909116319082818181858883f150506007805460ff1916600117905550505050565b6103a160035481565b6103ab600054600160a060020a031681565b6103ab600554600160a060020a031681565b6103a160015481565b6103a160025481565b6103a160045481565b6103be60043560068054829081101561000257506000526002027ff652222313e28459528d920b65115c16c04f3efc82aaedc97be59f3f377c0d3f8101547ff652222313e28459528d920b65115c16c04f3efc82aaedc97be59f3f377c0d409190910154600160a060020a03919091169082565b005b505050815481101561000257906000526020600020906002020160005060008201518160000160006101000a815481600160a060020a030219169083021790555060208201518160010160005055905050806002600082828250540192505081905550600560009054906101000a9004600160a060020a0316600160a060020a031663a9059cbb3360046000505484046040518360e060020a0281526004018083600160a060020a03168152602001828152602001925050506000604051808303816000876161da5a03f11561000257505060408051600160a060020a03331681526020810184905260018183015290517fe842aea7a5f1b01049d752008c53c52890b1a6daf660cf39e8eec506112bbdf692509081900360600190a15b50565b5060a0604052336060908152346080819052600680546001810180835592939282908280158290116102025760020281600202836000526020600020918201910161020291905b8082111561039d57805473ffffffffffffffffffffffffffffffffffffffff19168155600060019190910190815561036a565b5090565b6060908152602090f35b600160a060020a03166060908152602090f35b6060918252608052604090f35b5b60065481101561010e576006805482908110156100025760009182526002027ff652222313e28459528d920b65115c16c04f3efc82aaedc97be59f3f377c0d3f0190600680549254600160a060020a0316928490811015610002576002027ff652222313e28459528d920b65115c16c04f3efc82aaedc97be59f3f377c0d40015460405190915082818181858883f19350505050507fe842aea7a5f1b01049d752008c53c52890b1a6daf660cf39e8eec506112bbdf660066000508281548110156100025760008290526002027ff652222313e28459528d920b65115c16c04f3efc82aaedc97be59f3f377c0d3f01548154600160a060020a039190911691908490811015610002576002027ff652222313e28459528d920b65115c16c04f3efc82aaedc97be59f3f377c0d40015460408051600160a060020a0394909416845260208401919091526000838201525191829003606001919050a16001016103cc56`}, []string{`[{"constant":false,"inputs":[],"name":"checkGoalReached","outputs":[],"type":"function"},{"constant":true,"inputs":[],"name":"deadline","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[],"name":"beneficiary","outputs":[{"name":"","type":"address"}],"type":"function"},{"constant":true,"inputs":[],"name":"tokenReward","outputs":[{"name":"","type":"address"}],"type":"function"},{"constant":true,"inputs":[],"name":"fundingGoal","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[],"name":"amountRaised","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[],"name":"price","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[{"name":"","type":"uint256"}],"name":"funders","outputs":[{"name":"addr","type":"address"},{"name":"amount","type":"uint256"}],"type":"function"},{"inputs":[{"name":"ifSuccessfulSendTo","type":"address"},{"name":"fundingGoalInEthers","type":"uint256"},{"name":"durationInMinutes","type":"uint256"},{"name":"etherCostOfEachToken","type":"uint256"},{"name":"addressOfTokenUsedAsReward","type":"address"}],"type":"constructor"},{"anonymous":false,"inputs":[{"indexed":false,"name":"backer","type":"address"},{"indexed":false,"name":"amount","type":"uint256"},{"indexed":false,"name":"isContribution","type":"bool"}],"name":"FundTransfer","type":"event"}]`}, - `libcommon "github.com/ledgerwatch/erigon-lib/common"`, + `libcommon "github.com/ledgerwatch/erigon/erigon-lib/common"`, ` if b, err := NewCrowdsale(libcommon.Address{}, nil); b == nil || err != nil { t.Fatalf("binding (%v) nil or error (%v) not nil", b, nil) @@ -102,7 +102,7 @@ var bindTests = []struct { `https://ethereum.org/dao`, []string{`606060405260405160808061145f833960e06040529051905160a05160c05160008054600160a060020a03191633179055600184815560028490556003839055600780549182018082558280158290116100b8576003028160030283600052602060002091820191016100b891906101c8565b50506060919091015160029190910155600160a060020a0381166000146100a65760008054600160a060020a031916821790555b505050506111f18061026e6000396000f35b505060408051608081018252600080825260208281018290528351908101845281815292820192909252426060820152600780549194509250811015610002579081527fa66cc928b5edb82af9bd49922954155ab7b0942694bea4ce44661d9a8736c6889050815181546020848101517401000000000000000000000000000000000000000002600160a060020a03199290921690921760a060020a60ff021916178255604083015180516001848101805460008281528690209195600293821615610100026000190190911692909204601f9081018390048201949192919091019083901061023e57805160ff19168380011785555b50610072929150610226565b5050600060028201556001015b8082111561023a578054600160a860020a031916815560018181018054600080835592600290821615610100026000190190911604601f81901061020c57506101bb565b601f0160209004906000526020600020908101906101bb91905b8082111561023a5760008155600101610226565b5090565b828001600101855582156101af579182015b828111156101af57825182600050559160200191906001019061025056606060405236156100b95760e060020a6000350463013cf08b81146100bb578063237e9492146101285780633910682114610281578063400e3949146102995780635daf08ca146102a257806369bd34361461032f5780638160f0b5146103385780638da5cb5b146103415780639644fcbd14610353578063aa02a90f146103be578063b1050da5146103c7578063bcca1fd3146104b5578063d3c0715b146104dc578063eceb29451461058d578063f2fde38b1461067b575b005b61069c6004356004805482908110156100025790600052602060002090600a02016000506005810154815460018301546003840154600485015460068601546007870154600160a060020a03959095169750929560020194919360ff828116946101009093041692919089565b60408051602060248035600481810135601f81018590048502860185019096528585526107759581359591946044949293909201918190840183828082843750949650505050505050600060006004600050848154811015610002575090527f8a35acfbc15ff81a39ae7d344fd709f28e8600b4aa8c65c6b64bfe7fe36bd19e600a8402908101547f8a35acfbc15ff81a39ae7d344fd709f28e8600b4aa8c65c6b64bfe7fe36bd19b909101904210806101e65750600481015460ff165b8061026757508060000160009054906101000a9004600160a060020a03168160010160005054846040518084600160a060020a0316606060020a0281526014018381526020018280519060200190808383829060006004602084601f0104600f02600301f15090500193505050506040518091039020816007016000505414155b8061027757506001546005820154105b1561109257610002565b61077560043560066020526000908152604090205481565b61077560055481565b61078760043560078054829081101561000257506000526003026000805160206111d18339815191528101547fa66cc928b5edb82af9bd49922954155ab7b0942694bea4ce44661d9a8736c68a820154600160a060020a0382169260a060020a90920460ff16917fa66cc928b5edb82af9bd49922954155ab7b0942694bea4ce44661d9a8736c689019084565b61077560025481565b61077560015481565b610830600054600160a060020a031681565b604080516020604435600481810135601f81018490048402850184019095528484526100b9948135946024803595939460649492939101918190840183828082843750949650505050505050600080548190600160a060020a03908116339091161461084d57610002565b61077560035481565b604080516020604435600481810135601f8101849004840285018401909552848452610775948135946024803595939460649492939101918190840183828082843750506040805160209735808a0135601f81018a90048a0283018a019093528282529698976084979196506024909101945090925082915084018382808284375094965050505050505033600160a060020a031660009081526006602052604081205481908114806104ab5750604081205460078054909190811015610002579082526003026000805160206111d1833981519152015460a060020a900460ff16155b15610ce557610002565b6100b960043560243560443560005433600160a060020a03908116911614610b1857610002565b604080516020604435600481810135601f810184900484028501840190955284845261077594813594602480359593946064949293910191819084018382808284375094965050505050505033600160a060020a031660009081526006602052604081205481908114806105835750604081205460078054909190811015610002579082526003026000805160206111d18339815191520181505460a060020a900460ff16155b15610f1d57610002565b604080516020606435600481810135601f81018490048402850184019095528484526107759481359460248035956044359560849492019190819084018382808284375094965050505050505060006000600460005086815481101561000257908252600a027f8a35acfbc15ff81a39ae7d344fd709f28e8600b4aa8c65c6b64bfe7fe36bd19b01815090508484846040518084600160a060020a0316606060020a0281526014018381526020018280519060200190808383829060006004602084601f0104600f02600301f150905001935050505060405180910390208160070160005054149150610cdc565b6100b960043560005433600160a060020a03908116911614610f0857610002565b604051808a600160a060020a031681526020018981526020018060200188815260200187815260200186815260200185815260200184815260200183815260200182810382528981815460018160011615610100020316600290048152602001915080546001816001161561010002031660029004801561075e5780601f106107335761010080835404028352916020019161075e565b820191906000526020600020905b81548152906001019060200180831161074157829003601f168201915b50509a505050505050505050505060405180910390f35b60408051918252519081900360200190f35b60408051600160a060020a038616815260208101859052606081018390526080918101828152845460026001821615610100026000190190911604928201839052909160a08301908590801561081e5780601f106107f35761010080835404028352916020019161081e565b820191906000526020600020905b81548152906001019060200180831161080157829003601f168201915b50509550505050505060405180910390f35b60408051600160a060020a03929092168252519081900360200190f35b600160a060020a03851660009081526006602052604081205414156108a957604060002060078054918290556001820180825582801582901161095c5760030281600302836000526020600020918201910161095c9190610a4f565b600160a060020a03851660009081526006602052604090205460078054919350908390811015610002575060005250600381026000805160206111d183398151915201805474ff0000000000000000000000000000000000000000191660a060020a85021781555b60408051600160a060020a03871681526020810186905281517f27b022af4a8347100c7a041ce5ccf8e14d644ff05de696315196faae8cd50c9b929181900390910190a15050505050565b505050915081506080604051908101604052808681526020018581526020018481526020014281526020015060076000508381548110156100025790600052602060002090600302016000508151815460208481015160a060020a02600160a060020a03199290921690921774ff00000000000000000000000000000000000000001916178255604083015180516001848101805460008281528690209195600293821615610100026000190190911692909204601f90810183900482019491929190910190839010610ad357805160ff19168380011785555b50610b03929150610abb565b5050600060028201556001015b80821115610acf57805474ffffffffffffffffffffffffffffffffffffffffff1916815560018181018054600080835592600290821615610100026000190190911604601f819010610aa15750610a42565b601f016020900490600052602060002090810190610a4291905b80821115610acf5760008155600101610abb565b5090565b82800160010185558215610a36579182015b82811115610a36578251826000505591602001919060010190610ae5565b50506060919091015160029190910155610911565b600183905560028290556003819055604080518481526020810184905280820183905290517fa439d3fa452be5e0e1e24a8145e715f4fd8b9c08c96a42fd82a855a85e5d57de9181900360600190a1505050565b50508585846040518084600160a060020a0316606060020a0281526014018381526020018280519060200190808383829060006004602084601f0104600f02600301f150905001935050505060405180910390208160070160005081905550600260005054603c024201816003016000508190555060008160040160006101000a81548160ff0219169083021790555060008160040160016101000a81548160ff02191690830217905550600081600501600050819055507f646fec02522b41e7125cfc859a64fd4f4cefd5dc3b6237ca0abe251ded1fa881828787876040518085815260200184600160a060020a03168152602001838152602001806020018281038252838181518152602001915080519060200190808383829060006004602084601f0104600f02600301f150905090810190601f168015610cc45780820380516001836020036101000a031916815260200191505b509550505050505060405180910390a1600182016005555b50949350505050565b6004805460018101808355909190828015829011610d1c57600a0281600a028360005260206000209182019101610d1c9190610db8565b505060048054929450918491508110156100025790600052602060002090600a02016000508054600160a060020a031916871781556001818101879055855160028381018054600082815260209081902096975091959481161561010002600019011691909104601f90810182900484019391890190839010610ed857805160ff19168380011785555b50610b6c929150610abb565b50506001015b80821115610acf578054600160a060020a03191681556000600182810182905560028381018054848255909281161561010002600019011604601f819010610e9c57505b5060006003830181905560048301805461ffff191690556005830181905560068301819055600783018190556008830180548282559082526020909120610db2916002028101905b80821115610acf57805474ffffffffffffffffffffffffffffffffffffffffff1916815560018181018054600080835592600290821615610100026000190190911604601f819010610eba57505b5050600101610e44565b601f016020900490600052602060002090810190610dfc9190610abb565b601f016020900490600052602060002090810190610e929190610abb565b82800160010185558215610da6579182015b82811115610da6578251826000505591602001919060010190610eea565b60008054600160a060020a0319168217905550565b600480548690811015610002576000918252600a027f8a35acfbc15ff81a39ae7d344fd709f28e8600b4aa8c65c6b64bfe7fe36bd19b01905033600160a060020a0316600090815260098201602052604090205490915060ff1660011415610f8457610002565b33600160a060020a031660009081526009820160205260409020805460ff1916600190811790915560058201805490910190558315610fcd576006810180546001019055610fda565b6006810180546000190190555b7fc34f869b7ff431b034b7b9aea9822dac189a685e0b015c7d1be3add3f89128e8858533866040518085815260200184815260200183600160a060020a03168152602001806020018281038252838181518152602001915080519060200190808383829060006004602084601f0104600f02600301f150905090810190601f16801561107a5780820380516001836020036101000a031916815260200191505b509550505050505060405180910390a1509392505050565b6006810154600354901315611158578060000160009054906101000a9004600160a060020a0316600160a060020a03168160010160005054670de0b6b3a76400000284604051808280519060200190808383829060006004602084601f0104600f02600301f150905090810190601f1680156111225780820380516001836020036101000a031916815260200191505b5091505060006040518083038185876185025a03f15050505060048101805460ff191660011761ff00191661010017905561116d565b60048101805460ff191660011761ff00191690555b60068101546005820154600483015460408051888152602081019490945283810192909252610100900460ff166060830152517fd220b7272a8b6d0d7d6bcdace67b936a8f175e6d5c1b3ee438b72256b32ab3af9181900360800190a1509291505056a66cc928b5edb82af9bd49922954155ab7b0942694bea4ce44661d9a8736c688`}, []string{`[{"constant":true,"inputs":[{"name":"","type":"uint256"}],"name":"proposals","outputs":[{"name":"recipient","type":"address"},{"name":"amount","type":"uint256"},{"name":"description","type":"string"},{"name":"votingDeadline","type":"uint256"},{"name":"executed","type":"bool"},{"name":"proposalPassed","type":"bool"},{"name":"numberOfVotes","type":"uint256"},{"name":"currentResult","type":"int256"},{"name":"proposalHash","type":"bytes32"}],"type":"function"},{"constant":false,"inputs":[{"name":"proposalNumber","type":"uint256"},{"name":"transactionBytecode","type":"bytes"}],"name":"executeProposal","outputs":[{"name":"result","type":"int256"}],"type":"function"},{"constant":true,"inputs":[{"name":"","type":"address"}],"name":"memberId","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[],"name":"numProposals","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[{"name":"","type":"uint256"}],"name":"members","outputs":[{"name":"member","type":"address"},{"name":"canVote","type":"bool"},{"name":"name","type":"string"},{"name":"memberSince","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[],"name":"debatingPeriodInMinutes","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[],"name":"minimumQuorum","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[],"name":"owner","outputs":[{"name":"","type":"address"}],"type":"function"},{"constant":false,"inputs":[{"name":"targetMember","type":"address"},{"name":"canVote","type":"bool"},{"name":"memberName","type":"string"}],"name":"changeMembership","outputs":[],"type":"function"},{"constant":true,"inputs":[],"name":"majorityMargin","outputs":[{"name":"","type":"int256"}],"type":"function"},{"constant":false,"inputs":[{"name":"beneficiary","type":"address"},{"name":"etherAmount","type":"uint256"},{"name":"JobDescription","type":"string"},{"name":"transactionBytecode","type":"bytes"}],"name":"newProposal","outputs":[{"name":"proposalID","type":"uint256"}],"type":"function"},{"constant":false,"inputs":[{"name":"minimumQuorumForProposals","type":"uint256"},{"name":"minutesForDebate","type":"uint256"},{"name":"marginOfVotesForMajority","type":"int256"}],"name":"changeVotingRules","outputs":[],"type":"function"},{"constant":false,"inputs":[{"name":"proposalNumber","type":"uint256"},{"name":"supportsProposal","type":"bool"},{"name":"justificationText","type":"string"}],"name":"vote","outputs":[{"name":"voteID","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[{"name":"proposalNumber","type":"uint256"},{"name":"beneficiary","type":"address"},{"name":"etherAmount","type":"uint256"},{"name":"transactionBytecode","type":"bytes"}],"name":"checkProposalCode","outputs":[{"name":"codeChecksOut","type":"bool"}],"type":"function"},{"constant":false,"inputs":[{"name":"newOwner","type":"address"}],"name":"transferOwnership","outputs":[],"type":"function"},{"inputs":[{"name":"minimumQuorumForProposals","type":"uint256"},{"name":"minutesForDebate","type":"uint256"},{"name":"marginOfVotesForMajority","type":"int256"},{"name":"congressLeader","type":"address"}],"type":"constructor"},{"anonymous":false,"inputs":[{"indexed":false,"name":"proposalID","type":"uint256"},{"indexed":false,"name":"recipient","type":"address"},{"indexed":false,"name":"amount","type":"uint256"},{"indexed":false,"name":"description","type":"string"}],"name":"ProposalAdded","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"proposalID","type":"uint256"},{"indexed":false,"name":"position","type":"bool"},{"indexed":false,"name":"voter","type":"address"},{"indexed":false,"name":"justification","type":"string"}],"name":"Voted","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"proposalID","type":"uint256"},{"indexed":false,"name":"result","type":"int256"},{"indexed":false,"name":"quorum","type":"uint256"},{"indexed":false,"name":"active","type":"bool"}],"name":"ProposalTallied","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"member","type":"address"},{"indexed":false,"name":"isMember","type":"bool"}],"name":"MembershipChanged","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"minimumQuorum","type":"uint256"},{"indexed":false,"name":"debatingPeriodInMinutes","type":"uint256"},{"indexed":false,"name":"majorityMargin","type":"int256"}],"name":"ChangeOfRules","type":"event"}]`}, - `libcommon "github.com/ledgerwatch/erigon-lib/common"`, + `libcommon "github.com/ledgerwatch/erigon/erigon-lib/common"`, ` if b, err := NewDAO(libcommon.Address{}, nil); b == nil || err != nil { t.Fatalf("binding (%v) nil or error (%v) not nil", b, nil) @@ -129,7 +129,7 @@ var bindTests = []struct { ` "fmt" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" `, `if b, err := NewInputChecker(libcommon.Address{}, nil); b == nil || err != nil { t.Fatalf("binding (%v) nil or error (%v) not nil", b, nil) @@ -167,7 +167,7 @@ var bindTests = []struct { ` "fmt" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" `, `if b, err := NewOutputChecker(libcommon.Address{}, nil); b == nil || err != nil { t.Fatalf("binding (%v) nil or error (%v) not nil", b, nil) @@ -208,7 +208,7 @@ var bindTests = []struct { "math/big" "reflect" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" `, `if e, err := NewEventChecker(libcommon.Address{}, nil); e == nil || err != nil { t.Fatalf("binding (%v) nil or error (%v) not nil", e, nil) @@ -448,7 +448,7 @@ var bindTests = []struct { "github.com/ledgerwatch/erigon/accounts/abi/bind" "github.com/ledgerwatch/erigon/accounts/abi/bind/backends" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/core" "github.com/ledgerwatch/erigon/crypto" `, @@ -608,7 +608,7 @@ var bindTests = []struct { ` "github.com/ledgerwatch/erigon/accounts/abi/bind" "github.com/ledgerwatch/erigon/accounts/abi/bind/backends" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/core" `, ` @@ -647,7 +647,7 @@ var bindTests = []struct { ` "github.com/ledgerwatch/erigon/accounts/abi/bind" "github.com/ledgerwatch/erigon/accounts/abi/bind/backends" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/core" `, ` @@ -744,7 +744,7 @@ var bindTests = []struct { "github.com/ledgerwatch/erigon/accounts/abi/bind" "github.com/ledgerwatch/erigon/accounts/abi/bind/backends" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/core" "github.com/ledgerwatch/erigon/crypto" `, @@ -913,7 +913,7 @@ var bindTests = []struct { "github.com/ledgerwatch/erigon/accounts/abi/bind" "github.com/ledgerwatch/erigon/accounts/abi/bind/backends" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/core" "github.com/ledgerwatch/erigon/crypto" `, diff --git a/accounts/abi/bind/template.go b/accounts/abi/bind/template.go index 344b1974bf0..1fb3e525462 100644 --- a/accounts/abi/bind/template.go +++ b/accounts/abi/bind/template.go @@ -96,7 +96,7 @@ import ( ethereum "github.com/ledgerwatch/erigon" "github.com/ledgerwatch/erigon/accounts/abi" "github.com/ledgerwatch/erigon/accounts/abi/bind" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/core/types" "github.com/ledgerwatch/erigon/event" ) diff --git a/accounts/abi/bind/util.go b/accounts/abi/bind/util.go index 19c2983d2bd..a519ecbd3df 100644 --- a/accounts/abi/bind/util.go +++ b/accounts/abi/bind/util.go @@ -21,7 +21,7 @@ import ( "errors" "time" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/log/v3" "github.com/ledgerwatch/erigon/core/types" diff --git a/accounts/abi/bind/util_test.go b/accounts/abi/bind/util_test.go index 3c2632e4d15..a5ef5c7a48a 100644 --- a/accounts/abi/bind/util_test.go +++ b/accounts/abi/bind/util_test.go @@ -24,13 +24,13 @@ import ( "testing" "time" - libcommon "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/accounts/abi/bind" "github.com/ledgerwatch/erigon/accounts/abi/bind/backends" "github.com/ledgerwatch/erigon/common" "github.com/ledgerwatch/erigon/common/u256" "github.com/ledgerwatch/erigon/core/types" "github.com/ledgerwatch/erigon/crypto" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/params" ) diff --git a/accounts/abi/error.go b/accounts/abi/error.go index 0a709efd378..c55f36c8656 100644 --- a/accounts/abi/error.go +++ b/accounts/abi/error.go @@ -23,7 +23,7 @@ import ( "reflect" "strings" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/crypto" ) diff --git a/accounts/abi/event.go b/accounts/abi/event.go index 27f64e71d50..9d340e52975 100644 --- a/accounts/abi/event.go +++ b/accounts/abi/event.go @@ -20,7 +20,7 @@ import ( "fmt" "strings" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/crypto" ) diff --git a/accounts/abi/event_test.go b/accounts/abi/event_test.go index a734f971dfc..53e024cb6ce 100644 --- a/accounts/abi/event_test.go +++ b/accounts/abi/event_test.go @@ -25,7 +25,7 @@ import ( "strings" "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/accounts/abi/pack.go b/accounts/abi/pack.go index 2f0fe3f45c3..3b71b78c31a 100644 --- a/accounts/abi/pack.go +++ b/accounts/abi/pack.go @@ -22,9 +22,9 @@ import ( "math/big" "reflect" - common2 "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/common" "github.com/ledgerwatch/erigon/common/math" + common2 "github.com/ledgerwatch/erigon/erigon-lib/common" ) // packBytesSlice packs the given bytes as [L, V] as the canonical representation diff --git a/accounts/abi/pack_test.go b/accounts/abi/pack_test.go index 0c745016f9e..13595be5e98 100644 --- a/accounts/abi/pack_test.go +++ b/accounts/abi/pack_test.go @@ -28,7 +28,7 @@ import ( "strings" "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/common" ) diff --git a/accounts/abi/packing_test.go b/accounts/abi/packing_test.go index d960223f897..cd9057b059e 100644 --- a/accounts/abi/packing_test.go +++ b/accounts/abi/packing_test.go @@ -19,7 +19,7 @@ package abi import ( "math/big" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/common" ) diff --git a/accounts/abi/topics.go b/accounts/abi/topics.go index ca14e22383c..747e704f851 100644 --- a/accounts/abi/topics.go +++ b/accounts/abi/topics.go @@ -23,8 +23,8 @@ import ( "math/big" "reflect" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" "github.com/ledgerwatch/erigon/crypto" ) diff --git a/accounts/abi/topics_test.go b/accounts/abi/topics_test.go index 7a576c8c1f1..020f46b09b2 100644 --- a/accounts/abi/topics_test.go +++ b/accounts/abi/topics_test.go @@ -22,7 +22,7 @@ import ( "reflect" "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/crypto" ) diff --git a/accounts/abi/type.go b/accounts/abi/type.go index edaabda15d7..d18b2f0cef4 100644 --- a/accounts/abi/type.go +++ b/accounts/abi/type.go @@ -24,7 +24,7 @@ import ( "strconv" "strings" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" ) // Type enumerator diff --git a/accounts/abi/type_test.go b/accounts/abi/type_test.go index a1ac4738a2a..b3cb67bb052 100644 --- a/accounts/abi/type_test.go +++ b/accounts/abi/type_test.go @@ -22,7 +22,7 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" ) // typeWithoutStringer is a alias for the Type type which simply doesn't implement diff --git a/accounts/abi/unpack.go b/accounts/abi/unpack.go index 64f2599a1fc..18f7eeb01d8 100644 --- a/accounts/abi/unpack.go +++ b/accounts/abi/unpack.go @@ -22,7 +22,7 @@ import ( "math/big" "reflect" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" ) var ( diff --git a/accounts/abi/unpack_test.go b/accounts/abi/unpack_test.go index 880fb589335..763197ea8cb 100644 --- a/accounts/abi/unpack_test.go +++ b/accounts/abi/unpack_test.go @@ -27,7 +27,7 @@ import ( "strings" "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/stretchr/testify/require" "github.com/ledgerwatch/erigon/common" diff --git a/cl/abstract/beacon_state.go b/cl/abstract/beacon_state.go index da949eed384..e2f534a3750 100644 --- a/cl/abstract/beacon_state.go +++ b/cl/abstract/beacon_state.go @@ -1,11 +1,11 @@ package abstract import ( - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/types/clonable" "github.com/ledgerwatch/erigon/cl/clparams" "github.com/ledgerwatch/erigon/cl/cltypes" "github.com/ledgerwatch/erigon/cl/cltypes/solid" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/types/clonable" ) type BeaconState interface { diff --git a/cl/beacon/handler/blocks.go b/cl/beacon/handler/blocks.go index 5ee67b535ef..151a5c1690e 100644 --- a/cl/beacon/handler/blocks.go +++ b/cl/beacon/handler/blocks.go @@ -6,10 +6,10 @@ import ( "fmt" "net/http" - libcommon "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/cl/clparams" "github.com/ledgerwatch/erigon/cl/cltypes" "github.com/ledgerwatch/erigon/cl/persistence/beacon_indicies" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" ) type headerResponse struct { diff --git a/cl/beacon/handler/config.go b/cl/beacon/handler/config.go index 104fb31111a..e8abbc7628e 100644 --- a/cl/beacon/handler/config.go +++ b/cl/beacon/handler/config.go @@ -5,9 +5,9 @@ import ( "net/http" "sort" - libcommon "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/cl/clparams" "github.com/ledgerwatch/erigon/cl/cltypes" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" ) func (a *ApiHandler) getSpec(r *http.Request) (data any, finalized *bool, version *clparams.StateVersion, httpStatus int, err error) { diff --git a/cl/beacon/handler/format.go b/cl/beacon/handler/format.go index c0ea1de1c15..9177b3150c0 100644 --- a/cl/beacon/handler/format.go +++ b/cl/beacon/handler/format.go @@ -10,9 +10,9 @@ import ( "strings" "github.com/go-chi/chi/v5" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/types/ssz" "github.com/ledgerwatch/erigon/cl/clparams" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/types/ssz" "github.com/ledgerwatch/log/v3" ) diff --git a/cl/beacon/handler/genesis.go b/cl/beacon/handler/genesis.go index 2348afe500f..53961260f02 100644 --- a/cl/beacon/handler/genesis.go +++ b/cl/beacon/handler/genesis.go @@ -4,10 +4,10 @@ import ( "errors" "net/http" - "github.com/ledgerwatch/erigon-lib/common" - libcommon "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/cl/clparams" "github.com/ledgerwatch/erigon/cl/fork" + "github.com/ledgerwatch/erigon/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" ) type genesisReponse struct { diff --git a/cl/beacon/handler/headers.go b/cl/beacon/handler/headers.go index 8c6f5ca32cc..765ecd86679 100644 --- a/cl/beacon/handler/headers.go +++ b/cl/beacon/handler/headers.go @@ -8,10 +8,10 @@ import ( "io" "net/http" - libcommon "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/cl/clparams" "github.com/ledgerwatch/erigon/cl/cltypes" "github.com/ledgerwatch/erigon/cl/persistence/beacon_indicies" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" ) func (a *ApiHandler) getHeaders(r *http.Request) (data any, finalized *bool, version *clparams.StateVersion, httpStatus int, err error) { diff --git a/cl/clparams/config.go b/cl/clparams/config.go index f448162116b..5f0e4b2fe14 100644 --- a/cl/clparams/config.go +++ b/cl/clparams/config.go @@ -21,8 +21,8 @@ import ( "os" "time" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/types/ssz" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/types/ssz" "gopkg.in/yaml.v2" "github.com/ledgerwatch/erigon/cl/utils" diff --git a/cl/clparams/initial_state/initial_state_test.go b/cl/clparams/initial_state/initial_state_test.go index e6ccef9c792..cc5e408d40d 100644 --- a/cl/clparams/initial_state/initial_state_test.go +++ b/cl/clparams/initial_state/initial_state_test.go @@ -3,9 +3,9 @@ package initial_state_test import ( "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/cl/clparams" "github.com/ledgerwatch/erigon/cl/clparams/initial_state" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/stretchr/testify/assert" ) diff --git a/cl/cltypes/aggregate.go b/cl/cltypes/aggregate.go index a8c8e1f3b54..975d318af0c 100644 --- a/cl/cltypes/aggregate.go +++ b/cl/cltypes/aggregate.go @@ -1,10 +1,10 @@ package cltypes import ( - libcommon "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/cl/cltypes/solid" "github.com/ledgerwatch/erigon/cl/merkle_tree" ssz2 "github.com/ledgerwatch/erigon/cl/ssz" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" ) /* diff --git a/cl/cltypes/beacon_block.go b/cl/cltypes/beacon_block.go index 818e6d37629..6fea45d375a 100644 --- a/cl/cltypes/beacon_block.go +++ b/cl/cltypes/beacon_block.go @@ -3,8 +3,8 @@ package cltypes import ( "fmt" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/types/ssz" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/types/ssz" "github.com/ledgerwatch/erigon/cl/clparams" "github.com/ledgerwatch/erigon/cl/cltypes/solid" diff --git a/cl/cltypes/beacon_block_test.go b/cl/cltypes/beacon_block_test.go index e032454800e..1dd816064f5 100644 --- a/cl/cltypes/beacon_block_test.go +++ b/cl/cltypes/beacon_block_test.go @@ -5,10 +5,10 @@ import ( "testing" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/cl/clparams" "github.com/ledgerwatch/erigon/cl/cltypes/solid" "github.com/ledgerwatch/erigon/core/types" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/stretchr/testify/assert" ) diff --git a/cl/cltypes/beacon_header.go b/cl/cltypes/beacon_header.go index 94064339d23..ee0e0faf178 100644 --- a/cl/cltypes/beacon_header.go +++ b/cl/cltypes/beacon_header.go @@ -1,8 +1,8 @@ package cltypes import ( - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" "github.com/ledgerwatch/erigon/cl/merkle_tree" ssz2 "github.com/ledgerwatch/erigon/cl/ssz" diff --git a/cl/cltypes/beacon_kzgcommitment.go b/cl/cltypes/beacon_kzgcommitment.go index f6a5d5f38f1..3ac27bc2460 100644 --- a/cl/cltypes/beacon_kzgcommitment.go +++ b/cl/cltypes/beacon_kzgcommitment.go @@ -4,9 +4,9 @@ import ( "encoding/json" gokzg4844 "github.com/crate-crypto/go-kzg-4844" - libcommon "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/cl/merkle_tree" ssz2 "github.com/ledgerwatch/erigon/cl/ssz" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" ) type Blob gokzg4844.Blob diff --git a/cl/cltypes/bls_to_execution_change.go b/cl/cltypes/bls_to_execution_change.go index 676154f15fc..48241af4ff7 100644 --- a/cl/cltypes/bls_to_execution_change.go +++ b/cl/cltypes/bls_to_execution_change.go @@ -3,10 +3,10 @@ package cltypes import ( "fmt" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/types/ssz" "github.com/ledgerwatch/erigon/cl/merkle_tree" ssz2 "github.com/ledgerwatch/erigon/cl/ssz" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/types/ssz" ) // Change to EL engine diff --git a/cl/cltypes/clone.go b/cl/cltypes/clone.go index 8d1d618cd0f..260ff4e575c 100644 --- a/cl/cltypes/clone.go +++ b/cl/cltypes/clone.go @@ -1,7 +1,7 @@ package cltypes import ( - "github.com/ledgerwatch/erigon-lib/types/clonable" + "github.com/ledgerwatch/erigon/erigon-lib/types/clonable" ) func (s *SignedBeaconBlock) Clone() clonable.Clonable { diff --git a/cl/cltypes/eth1_block.go b/cl/cltypes/eth1_block.go index f9009fe7aa0..697fe75a3be 100644 --- a/cl/cltypes/eth1_block.go +++ b/cl/cltypes/eth1_block.go @@ -4,7 +4,7 @@ import ( "fmt" "math/big" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/cl/clparams" "github.com/ledgerwatch/erigon/cl/cltypes/solid" diff --git a/cl/cltypes/eth1_data.go b/cl/cltypes/eth1_data.go index 92b45be76cb..50c72c162d2 100644 --- a/cl/cltypes/eth1_data.go +++ b/cl/cltypes/eth1_data.go @@ -1,8 +1,8 @@ package cltypes import ( - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" "github.com/ledgerwatch/erigon/cl/merkle_tree" ssz2 "github.com/ledgerwatch/erigon/cl/ssz" diff --git a/cl/cltypes/eth1_data_test.go b/cl/cltypes/eth1_data_test.go index 9d363e9fb0e..de95c3838a7 100644 --- a/cl/cltypes/eth1_data_test.go +++ b/cl/cltypes/eth1_data_test.go @@ -3,7 +3,7 @@ package cltypes_test import ( "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/cl/cltypes/eth1_header.go b/cl/cltypes/eth1_header.go index 32794c2ebdd..91a34dcd51b 100644 --- a/cl/cltypes/eth1_header.go +++ b/cl/cltypes/eth1_header.go @@ -3,13 +3,13 @@ package cltypes import ( "fmt" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/types/ssz" "github.com/ledgerwatch/erigon/cl/clparams" "github.com/ledgerwatch/erigon/cl/cltypes/solid" "github.com/ledgerwatch/erigon/cl/merkle_tree" ssz2 "github.com/ledgerwatch/erigon/cl/ssz" "github.com/ledgerwatch/erigon/core/types" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/types/ssz" ) // ETH1Header represents the ethereum 1 header structure CL-side. diff --git a/cl/cltypes/eth1_header_test.go b/cl/cltypes/eth1_header_test.go index 8acfc6bda7e..05843522c60 100644 --- a/cl/cltypes/eth1_header_test.go +++ b/cl/cltypes/eth1_header_test.go @@ -3,10 +3,10 @@ package cltypes import ( "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/cl/clparams" "github.com/ledgerwatch/erigon/cl/cltypes/solid" "github.com/ledgerwatch/erigon/core/types" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/stretchr/testify/assert" ) diff --git a/cl/cltypes/fork.go b/cl/cltypes/fork.go index 9059a927112..2798cf03af0 100644 --- a/cl/cltypes/fork.go +++ b/cl/cltypes/fork.go @@ -1,9 +1,9 @@ package cltypes import ( - libcommon "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/cl/merkle_tree" ssz2 "github.com/ledgerwatch/erigon/cl/ssz" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" ) // Fork data, contains if we were on bellatrix/alteir/phase0 and transition epoch. diff --git a/cl/cltypes/historical_summary.go b/cl/cltypes/historical_summary.go index d67e90a98b3..4925b041546 100644 --- a/cl/cltypes/historical_summary.go +++ b/cl/cltypes/historical_summary.go @@ -1,11 +1,11 @@ package cltypes import ( - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" "github.com/ledgerwatch/erigon/cl/merkle_tree" ssz2 "github.com/ledgerwatch/erigon/cl/ssz" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" ) type HistoricalSummary struct { diff --git a/cl/cltypes/indexed_attestation.go b/cl/cltypes/indexed_attestation.go index e1690c0f7b8..cc510f6a03b 100644 --- a/cl/cltypes/indexed_attestation.go +++ b/cl/cltypes/indexed_attestation.go @@ -1,10 +1,10 @@ package cltypes import ( - libcommon "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/cl/cltypes/solid" "github.com/ledgerwatch/erigon/cl/merkle_tree" ssz2 "github.com/ledgerwatch/erigon/cl/ssz" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" ) /* diff --git a/cl/cltypes/justification_bits.go b/cl/cltypes/justification_bits.go index 060844a6693..af25a6b9e31 100644 --- a/cl/cltypes/justification_bits.go +++ b/cl/cltypes/justification_bits.go @@ -1,8 +1,8 @@ package cltypes import ( - "github.com/ledgerwatch/erigon-lib/types/clonable" "github.com/ledgerwatch/erigon/cl/utils" + "github.com/ledgerwatch/erigon/erigon-lib/types/clonable" ) const JustificationBitsLength = 4 diff --git a/cl/cltypes/network.go b/cl/cltypes/network.go index 45f51acfaee..c5bec3eba6e 100644 --- a/cl/cltypes/network.go +++ b/cl/cltypes/network.go @@ -1,8 +1,8 @@ package cltypes import ( - "github.com/ledgerwatch/erigon-lib/types/clonable" - "github.com/ledgerwatch/erigon-lib/types/ssz" + "github.com/ledgerwatch/erigon/erigon-lib/types/clonable" + "github.com/ledgerwatch/erigon/erigon-lib/types/ssz" ssz2 "github.com/ledgerwatch/erigon/cl/ssz" "github.com/ledgerwatch/erigon/common" diff --git a/cl/cltypes/network_test.go b/cl/cltypes/network_test.go index 85296644433..a6268a65300 100644 --- a/cl/cltypes/network_test.go +++ b/cl/cltypes/network_test.go @@ -3,8 +3,8 @@ package cltypes_test import ( "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/types/ssz" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/types/ssz" "github.com/stretchr/testify/require" "github.com/ledgerwatch/erigon/cl/clparams" diff --git a/cl/cltypes/slashings_test.go b/cl/cltypes/slashings_test.go index 51e355844b8..ee5227d1a0a 100644 --- a/cl/cltypes/slashings_test.go +++ b/cl/cltypes/slashings_test.go @@ -3,8 +3,8 @@ package cltypes import ( "testing" - "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/cl/cltypes/solid" + "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/stretchr/testify/assert" ) diff --git a/cl/cltypes/solid/attestation.go b/cl/cltypes/solid/attestation.go index 12ca81b07cf..d42542b800f 100644 --- a/cl/cltypes/solid/attestation.go +++ b/cl/cltypes/solid/attestation.go @@ -3,13 +3,13 @@ package solid import ( "encoding/json" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/types/clonable" - "github.com/ledgerwatch/erigon-lib/types/ssz" "github.com/ledgerwatch/erigon/cl/merkle_tree" "github.com/ledgerwatch/erigon/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" + "github.com/ledgerwatch/erigon/erigon-lib/types/clonable" + "github.com/ledgerwatch/erigon/erigon-lib/types/ssz" ) const ( diff --git a/cl/cltypes/solid/attestation_data.go b/cl/cltypes/solid/attestation_data.go index 82cbebec8a5..0f93c420413 100644 --- a/cl/cltypes/solid/attestation_data.go +++ b/cl/cltypes/solid/attestation_data.go @@ -5,11 +5,11 @@ import ( "encoding/binary" "encoding/json" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/types/clonable" - "github.com/ledgerwatch/erigon-lib/types/ssz" "github.com/ledgerwatch/erigon/cl/merkle_tree" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" + "github.com/ledgerwatch/erigon/erigon-lib/types/clonable" + "github.com/ledgerwatch/erigon/erigon-lib/types/ssz" ) // slot: 8 bytes diff --git a/cl/cltypes/solid/attestation_test.go b/cl/cltypes/solid/attestation_test.go index 2aa4e22d37a..0061cc2c999 100644 --- a/cl/cltypes/solid/attestation_test.go +++ b/cl/cltypes/solid/attestation_test.go @@ -3,7 +3,7 @@ package solid import ( "testing" - "github.com/ledgerwatch/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/stretchr/testify/assert" ) diff --git a/cl/cltypes/solid/bitlist.go b/cl/cltypes/solid/bitlist.go index f93a47ef786..b80f46beaea 100644 --- a/cl/cltypes/solid/bitlist.go +++ b/cl/cltypes/solid/bitlist.go @@ -3,10 +3,10 @@ package solid import ( "math/bits" - "github.com/ledgerwatch/erigon-lib/types/clonable" "github.com/ledgerwatch/erigon/cl/merkle_tree" "github.com/ledgerwatch/erigon/cl/utils" "github.com/ledgerwatch/erigon/common" + "github.com/ledgerwatch/erigon/erigon-lib/types/clonable" ) // BitList is like a dynamic binary string. It's like a flipbook of 1s and 0s! diff --git a/cl/cltypes/solid/checkpoint.go b/cl/cltypes/solid/checkpoint.go index 66b1c96ad90..f26452603d3 100644 --- a/cl/cltypes/solid/checkpoint.go +++ b/cl/cltypes/solid/checkpoint.go @@ -5,11 +5,11 @@ import ( "encoding/binary" "encoding/json" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/types/clonable" - "github.com/ledgerwatch/erigon-lib/types/ssz" "github.com/ledgerwatch/erigon/cl/merkle_tree" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" + "github.com/ledgerwatch/erigon/erigon-lib/types/clonable" + "github.com/ledgerwatch/erigon/erigon-lib/types/ssz" ) // Constants to represent the size and layout of a Checkpoint diff --git a/cl/cltypes/solid/checkpoint_test.go b/cl/cltypes/solid/checkpoint_test.go index de41bd3e9f9..ebf5914bb95 100644 --- a/cl/cltypes/solid/checkpoint_test.go +++ b/cl/cltypes/solid/checkpoint_test.go @@ -3,7 +3,7 @@ package solid_test import ( "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/cl/cltypes/solid/extra_data.go b/cl/cltypes/solid/extra_data.go index 4ef2c78ec31..8135b152170 100644 --- a/cl/cltypes/solid/extra_data.go +++ b/cl/cltypes/solid/extra_data.go @@ -4,11 +4,11 @@ import ( "encoding/binary" "encoding/json" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/types/clonable" "github.com/ledgerwatch/erigon/cl/merkle_tree" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" + "github.com/ledgerwatch/erigon/erigon-lib/types/clonable" ) // ExtraData type stores data as a byte slice and its length. diff --git a/cl/cltypes/solid/hash_list.go b/cl/cltypes/solid/hash_list.go index 35f4302653b..e832c039c80 100644 --- a/cl/cltypes/solid/hash_list.go +++ b/cl/cltypes/solid/hash_list.go @@ -3,13 +3,13 @@ package solid import ( "encoding/json" - "github.com/ledgerwatch/erigon-lib/common" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/types/clonable" - "github.com/ledgerwatch/erigon-lib/types/ssz" "github.com/ledgerwatch/erigon/cl/merkle_tree" "github.com/ledgerwatch/erigon/cl/utils" + "github.com/ledgerwatch/erigon/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" + "github.com/ledgerwatch/erigon/erigon-lib/types/clonable" + "github.com/ledgerwatch/erigon/erigon-lib/types/ssz" ) type hashList struct { diff --git a/cl/cltypes/solid/hash_vector.go b/cl/cltypes/solid/hash_vector.go index e91642d7fa9..dec000b641f 100644 --- a/cl/cltypes/solid/hash_vector.go +++ b/cl/cltypes/solid/hash_vector.go @@ -3,11 +3,11 @@ package solid import ( "encoding/json" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/types/clonable" - "github.com/ledgerwatch/erigon-lib/types/ssz" "github.com/ledgerwatch/erigon/cl/merkle_tree" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" + "github.com/ledgerwatch/erigon/erigon-lib/types/clonable" + "github.com/ledgerwatch/erigon/erigon-lib/types/ssz" ) type hashVector struct { diff --git a/cl/cltypes/solid/interfaces.go b/cl/cltypes/solid/interfaces.go index b6b42d2b044..cb9924da5a9 100644 --- a/cl/cltypes/solid/interfaces.go +++ b/cl/cltypes/solid/interfaces.go @@ -3,9 +3,9 @@ package solid import ( "encoding/json" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/types/ssz" ssz2 "github.com/ledgerwatch/erigon/cl/ssz" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/types/ssz" ) type IterableSSZ[T any] interface { diff --git a/cl/cltypes/solid/list_ssz.go b/cl/cltypes/solid/list_ssz.go index 22234ebb84e..19d4c1e7a5a 100644 --- a/cl/cltypes/solid/list_ssz.go +++ b/cl/cltypes/solid/list_ssz.go @@ -3,10 +3,10 @@ package solid import ( "encoding/json" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/types/clonable" - "github.com/ledgerwatch/erigon-lib/types/ssz" "github.com/ledgerwatch/erigon/cl/merkle_tree" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/types/clonable" + "github.com/ledgerwatch/erigon/erigon-lib/types/ssz" ) type encodableHashableSSZ interface { diff --git a/cl/cltypes/solid/list_ssz_test.go b/cl/cltypes/solid/list_ssz_test.go index 5d41d49f12b..8e2391d26b7 100644 --- a/cl/cltypes/solid/list_ssz_test.go +++ b/cl/cltypes/solid/list_ssz_test.go @@ -3,7 +3,7 @@ package solid import ( "testing" - "github.com/ledgerwatch/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/stretchr/testify/assert" ) diff --git a/cl/cltypes/solid/list_test.go b/cl/cltypes/solid/list_test.go index f8cc50aa3ac..a54fc989c6b 100644 --- a/cl/cltypes/solid/list_test.go +++ b/cl/cltypes/solid/list_test.go @@ -3,8 +3,8 @@ package solid import ( "testing" - "github.com/ledgerwatch/erigon-lib/common" - libcommon "github.com/ledgerwatch/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/stretchr/testify/assert" ) diff --git a/cl/cltypes/solid/pending_attestation.go b/cl/cltypes/solid/pending_attestation.go index 3ea621f6979..a11f24752ca 100644 --- a/cl/cltypes/solid/pending_attestation.go +++ b/cl/cltypes/solid/pending_attestation.go @@ -3,10 +3,10 @@ package solid import ( "encoding/binary" - "github.com/ledgerwatch/erigon-lib/types/clonable" - "github.com/ledgerwatch/erigon-lib/types/ssz" "github.com/ledgerwatch/erigon/cl/merkle_tree" "github.com/ledgerwatch/erigon/common" + "github.com/ledgerwatch/erigon/erigon-lib/types/clonable" + "github.com/ledgerwatch/erigon/erigon-lib/types/ssz" ) const ( diff --git a/cl/cltypes/solid/sync_committee.go b/cl/cltypes/solid/sync_committee.go index 95a7b4a97ca..9d4509ba63a 100644 --- a/cl/cltypes/solid/sync_committee.go +++ b/cl/cltypes/solid/sync_committee.go @@ -1,9 +1,9 @@ package solid import ( - "github.com/ledgerwatch/erigon-lib/types/clonable" - "github.com/ledgerwatch/erigon-lib/types/ssz" "github.com/ledgerwatch/erigon/cl/merkle_tree" + "github.com/ledgerwatch/erigon/erigon-lib/types/clonable" + "github.com/ledgerwatch/erigon/erigon-lib/types/ssz" ) // Whole committee(512) public key and the aggregate public key. diff --git a/cl/cltypes/solid/sync_committee_test.go b/cl/cltypes/solid/sync_committee_test.go index 4c004f3941a..75340c68a14 100644 --- a/cl/cltypes/solid/sync_committee_test.go +++ b/cl/cltypes/solid/sync_committee_test.go @@ -3,8 +3,8 @@ package solid import ( "testing" - "github.com/ledgerwatch/erigon-lib/common" - libcommon "github.com/ledgerwatch/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/stretchr/testify/assert" ) diff --git a/cl/cltypes/solid/transactions.go b/cl/cltypes/solid/transactions.go index 40651ac85fd..7642b63c3d2 100644 --- a/cl/cltypes/solid/transactions.go +++ b/cl/cltypes/solid/transactions.go @@ -3,11 +3,11 @@ package solid import ( "encoding/json" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/types/clonable" - "github.com/ledgerwatch/erigon-lib/types/ssz" "github.com/ledgerwatch/erigon/cl/merkle_tree" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/types/clonable" + "github.com/ledgerwatch/erigon/erigon-lib/types/ssz" ) type TransactionsSSZ struct { diff --git a/cl/cltypes/solid/uint64_list.go b/cl/cltypes/solid/uint64_list.go index a18eeec030c..2d4f7f9bd64 100644 --- a/cl/cltypes/solid/uint64_list.go +++ b/cl/cltypes/solid/uint64_list.go @@ -3,7 +3,7 @@ package solid import ( "encoding/json" - "github.com/ledgerwatch/erigon-lib/types/clonable" + "github.com/ledgerwatch/erigon/erigon-lib/types/clonable" ) type uint64ListSSZ struct { diff --git a/cl/cltypes/solid/uint64_vector.go b/cl/cltypes/solid/uint64_vector.go index 8ba0a5188eb..7570ee7b750 100644 --- a/cl/cltypes/solid/uint64_vector.go +++ b/cl/cltypes/solid/uint64_vector.go @@ -3,8 +3,8 @@ package solid import ( "encoding/json" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/types/clonable" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" + "github.com/ledgerwatch/erigon/erigon-lib/types/clonable" ) type uint64VectorSSZ struct { diff --git a/cl/cltypes/solid/uint64slice_byte.go b/cl/cltypes/solid/uint64slice_byte.go index b3a55fa9b30..115fb333c75 100644 --- a/cl/cltypes/solid/uint64slice_byte.go +++ b/cl/cltypes/solid/uint64slice_byte.go @@ -5,11 +5,11 @@ import ( "encoding/binary" "encoding/json" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/types/ssz" "github.com/ledgerwatch/erigon/cl/merkle_tree" "github.com/ledgerwatch/erigon/cl/utils" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" + "github.com/ledgerwatch/erigon/erigon-lib/types/ssz" ) const treeCacheDepthUint64Slice = 0 diff --git a/cl/cltypes/solid/uint64slice_byte_test.go b/cl/cltypes/solid/uint64slice_byte_test.go index 973866df9fc..817e4f24654 100644 --- a/cl/cltypes/solid/uint64slice_byte_test.go +++ b/cl/cltypes/solid/uint64slice_byte_test.go @@ -3,8 +3,8 @@ package solid_test import ( "testing" - "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/cl/cltypes/solid" + "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/cl/cltypes/solid/validator.go b/cl/cltypes/solid/validator.go index 60f1696a223..f45a8e80d71 100644 --- a/cl/cltypes/solid/validator.go +++ b/cl/cltypes/solid/validator.go @@ -3,11 +3,11 @@ package solid import ( "encoding/binary" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/types/clonable" - "github.com/ledgerwatch/erigon-lib/types/ssz" "github.com/ledgerwatch/erigon/cl/merkle_tree" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" + "github.com/ledgerwatch/erigon/erigon-lib/types/clonable" + "github.com/ledgerwatch/erigon/erigon-lib/types/ssz" ) // PublicKey 48 diff --git a/cl/cltypes/solid/validator_set.go b/cl/cltypes/solid/validator_set.go index 731af01fb19..f9c63685cf0 100644 --- a/cl/cltypes/solid/validator_set.go +++ b/cl/cltypes/solid/validator_set.go @@ -3,12 +3,12 @@ package solid import ( "bytes" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/types/clonable" - "github.com/ledgerwatch/erigon-lib/types/ssz" "github.com/ledgerwatch/erigon/cl/merkle_tree" "github.com/ledgerwatch/erigon/cl/utils" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" + "github.com/ledgerwatch/erigon/erigon-lib/types/clonable" + "github.com/ledgerwatch/erigon/erigon-lib/types/ssz" ) const ( diff --git a/cl/cltypes/solid/validator_test.go b/cl/cltypes/solid/validator_test.go index 2c9bee41424..a47e33f63bd 100644 --- a/cl/cltypes/solid/validator_test.go +++ b/cl/cltypes/solid/validator_test.go @@ -4,7 +4,7 @@ import ( "encoding/binary" "testing" - "github.com/ledgerwatch/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/cl/cltypes/validator.go b/cl/cltypes/validator.go index 83b5e04db9c..d9051d9a2c7 100644 --- a/cl/cltypes/validator.go +++ b/cl/cltypes/validator.go @@ -1,9 +1,9 @@ package cltypes import ( - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/types/clonable" - "github.com/ledgerwatch/erigon-lib/types/ssz" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/types/clonable" + "github.com/ledgerwatch/erigon/erigon-lib/types/ssz" "github.com/ledgerwatch/erigon/cl/cltypes/solid" "github.com/ledgerwatch/erigon/cl/merkle_tree" diff --git a/cl/cltypes/validator_test.go b/cl/cltypes/validator_test.go index 6ee34a39fb8..0f070d1c841 100644 --- a/cl/cltypes/validator_test.go +++ b/cl/cltypes/validator_test.go @@ -4,10 +4,10 @@ import ( "encoding/hex" "testing" - "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/cl/cltypes" "github.com/ledgerwatch/erigon/cl/cltypes/solid" "github.com/ledgerwatch/erigon/cl/utils" + "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/cl/fork/fork.go b/cl/fork/fork.go index bd262032276..7ba547cadec 100644 --- a/cl/fork/fork.go +++ b/cl/fork/fork.go @@ -21,8 +21,8 @@ import ( "sort" "time" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/types/ssz" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/types/ssz" "github.com/ledgerwatch/erigon/cl/clparams" "github.com/ledgerwatch/erigon/cl/cltypes" diff --git a/cl/fork/fork_test.go b/cl/fork/fork_test.go index 8e272facf2f..7a9243526fa 100644 --- a/cl/fork/fork_test.go +++ b/cl/fork/fork_test.go @@ -16,9 +16,9 @@ package fork import ( "testing" - "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/cl/clparams" "github.com/ledgerwatch/erigon/cl/utils" + "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/stretchr/testify/require" ) diff --git a/cl/freezer/utils.go b/cl/freezer/utils.go index 4d2cb25ca8b..3137d4cf135 100644 --- a/cl/freezer/utils.go +++ b/cl/freezer/utils.go @@ -4,8 +4,8 @@ import ( "bytes" "fmt" - "github.com/ledgerwatch/erigon-lib/types/ssz" "github.com/ledgerwatch/erigon/cmd/sentinel/sentinel/communication/ssz_snappy" + "github.com/ledgerwatch/erigon/erigon-lib/types/ssz" ) type marshalerHashable interface { diff --git a/cl/merkle_tree/hasher.go b/cl/merkle_tree/hasher.go index dafb4fbab2f..f2a4f9abfbd 100644 --- a/cl/merkle_tree/hasher.go +++ b/cl/merkle_tree/hasher.go @@ -3,8 +3,8 @@ package merkle_tree import ( "sync" - libcommon "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/cl/utils" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/prysmaticlabs/gohashtree" ) diff --git a/cl/merkle_tree/list.go b/cl/merkle_tree/list.go index 791b6a2ab59..b1eff4880df 100644 --- a/cl/merkle_tree/list.go +++ b/cl/merkle_tree/list.go @@ -5,9 +5,9 @@ import ( "github.com/prysmaticlabs/gohashtree" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/types/ssz" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" + "github.com/ledgerwatch/erigon/erigon-lib/types/ssz" "github.com/ledgerwatch/erigon/cl/utils" ) diff --git a/cl/merkle_tree/merkle_root.go b/cl/merkle_tree/merkle_root.go index a67a29b9683..e3112bb5e51 100644 --- a/cl/merkle_tree/merkle_root.go +++ b/cl/merkle_tree/merkle_root.go @@ -7,9 +7,9 @@ import ( "reflect" "unsafe" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/types/ssz" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" + "github.com/ledgerwatch/erigon/erigon-lib/types/ssz" "github.com/prysmaticlabs/gohashtree" ) diff --git a/cl/merkle_tree/merkle_root_test.go b/cl/merkle_tree/merkle_root_test.go index c56ea8895bc..5af922c7df5 100644 --- a/cl/merkle_tree/merkle_root_test.go +++ b/cl/merkle_tree/merkle_root_test.go @@ -4,11 +4,11 @@ import ( _ "embed" "testing" - "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/cl/clparams" "github.com/ledgerwatch/erigon/cl/merkle_tree" "github.com/ledgerwatch/erigon/cl/phase1/core/state" "github.com/ledgerwatch/erigon/cl/utils" + "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/stretchr/testify/require" ) diff --git a/cl/merkle_tree/primitives.go b/cl/merkle_tree/primitives.go index 0384f4a64dc..ca086102b9c 100644 --- a/cl/merkle_tree/primitives.go +++ b/cl/merkle_tree/primitives.go @@ -3,8 +3,8 @@ package merkle_tree import ( "encoding/binary" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" ) // Uint64Root retrieves the root hash of a uint64 value by converting it to a byte array and returning it as a hash. diff --git a/cl/persistence/beacon_indicies/sql_indexer.go b/cl/persistence/beacon_indicies/sql_indexer.go index e16ddc4c782..c53ca93d55e 100644 --- a/cl/persistence/beacon_indicies/sql_indexer.go +++ b/cl/persistence/beacon_indicies/sql_indexer.go @@ -6,8 +6,8 @@ import ( "errors" "fmt" - libcommon "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/cl/cltypes" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" _ "modernc.org/sqlite" ) diff --git a/cl/persistence/beacon_indicies/sql_indexer_test.go b/cl/persistence/beacon_indicies/sql_indexer_test.go index 021b47bd25d..2dd6c43f397 100644 --- a/cl/persistence/beacon_indicies/sql_indexer_test.go +++ b/cl/persistence/beacon_indicies/sql_indexer_test.go @@ -5,10 +5,10 @@ import ( "database/sql" "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/cl/clparams" "github.com/ledgerwatch/erigon/cl/cltypes" "github.com/ledgerwatch/erigon/cl/persistence/sql_migrations" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/stretchr/testify/require" ) diff --git a/cl/persistence/block_saver.go b/cl/persistence/block_saver.go index db4b7480566..43e167a5484 100644 --- a/cl/persistence/block_saver.go +++ b/cl/persistence/block_saver.go @@ -7,13 +7,13 @@ import ( "io" "path" - libcommon "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/cl/clparams" "github.com/ledgerwatch/erigon/cl/cltypes" "github.com/ledgerwatch/erigon/cl/persistence/beacon_indicies" "github.com/ledgerwatch/erigon/cl/phase1/execution_client" "github.com/ledgerwatch/erigon/cl/sentinel/peers" "github.com/ledgerwatch/erigon/cmd/sentinel/sentinel/communication/ssz_snappy" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/spf13/afero" ) diff --git a/cl/persistence/block_saver_test.go b/cl/persistence/block_saver_test.go index b94aa02ae45..a3e291b85de 100644 --- a/cl/persistence/block_saver_test.go +++ b/cl/persistence/block_saver_test.go @@ -7,7 +7,6 @@ import ( _ "embed" - libcommon "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/cl/clparams" "github.com/ledgerwatch/erigon/cl/cltypes" "github.com/ledgerwatch/erigon/cl/cltypes/solid" @@ -15,6 +14,7 @@ import ( "github.com/ledgerwatch/erigon/cl/phase1/execution_client" "github.com/ledgerwatch/erigon/cl/utils" "github.com/ledgerwatch/erigon/core/types" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/spf13/afero" "github.com/stretchr/testify/require" ) diff --git a/cl/persistence/interface.go b/cl/persistence/interface.go index 3a4c22d6907..0b2f1b9758c 100644 --- a/cl/persistence/interface.go +++ b/cl/persistence/interface.go @@ -5,9 +5,9 @@ import ( "database/sql" "io" - libcommon "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/cl/cltypes" "github.com/ledgerwatch/erigon/cl/sentinel/peers" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" ) type BlockSource interface { diff --git a/cl/persistence/raw_block_saver.go b/cl/persistence/raw_block_saver.go index 3074968ebe3..c041319e430 100644 --- a/cl/persistence/raw_block_saver.go +++ b/cl/persistence/raw_block_saver.go @@ -5,8 +5,8 @@ import ( "io" "os" - libcommon "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/cl/clparams" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/spf13/afero" ) diff --git a/cl/phase1/cache/attestation_indicies_cache.go b/cl/phase1/cache/attestation_indicies_cache.go index 36c3b83e366..4388e84dacb 100644 --- a/cl/phase1/cache/attestation_indicies_cache.go +++ b/cl/phase1/cache/attestation_indicies_cache.go @@ -1,10 +1,10 @@ package cache import ( - "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/cl/cltypes/solid" "github.com/ledgerwatch/erigon/cl/phase1/core/state/lru" "github.com/ledgerwatch/erigon/cl/utils" + "github.com/ledgerwatch/erigon/erigon-lib/common" ) var attestationIndiciesCache *lru.Cache[common.Hash, []uint64] diff --git a/cl/phase1/cache/init.go b/cl/phase1/cache/init.go index 1f349b2b402..7fe33681245 100644 --- a/cl/phase1/cache/init.go +++ b/cl/phase1/cache/init.go @@ -1,8 +1,8 @@ package cache import ( - "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/cl/phase1/core/state/lru" + "github.com/ledgerwatch/erigon/erigon-lib/common" ) func init() { diff --git a/cl/phase1/core/rawdb/accessors.go b/cl/phase1/core/rawdb/accessors.go index 337686c711d..696abc53846 100644 --- a/cl/phase1/core/rawdb/accessors.go +++ b/cl/phase1/core/rawdb/accessors.go @@ -7,9 +7,9 @@ import ( "github.com/ledgerwatch/erigon/cl/clparams" "github.com/ledgerwatch/erigon/cl/phase1/core/state" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/kv" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/erigon/cl/cltypes" "github.com/ledgerwatch/erigon/cl/utils" diff --git a/cl/phase1/core/rawdb/accessors_test.go b/cl/phase1/core/rawdb/accessors_test.go index e15907f49a2..5c289e09de3 100644 --- a/cl/phase1/core/rawdb/accessors_test.go +++ b/cl/phase1/core/rawdb/accessors_test.go @@ -6,9 +6,9 @@ import ( "github.com/ledgerwatch/erigon/cl/clparams" "github.com/ledgerwatch/erigon/cl/phase1/core/rawdb" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv/memdb" "github.com/ledgerwatch/erigon/cl/cltypes" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv/memdb" "github.com/stretchr/testify/require" ) diff --git a/cl/phase1/core/rawdb/config.go b/cl/phase1/core/rawdb/config.go index 4346c81ce85..4e215b07709 100644 --- a/cl/phase1/core/rawdb/config.go +++ b/cl/phase1/core/rawdb/config.go @@ -3,8 +3,8 @@ package rawdb import ( "encoding/json" - "github.com/ledgerwatch/erigon-lib/kv" "github.com/ledgerwatch/erigon/common/math" + "github.com/ledgerwatch/erigon/erigon-lib/kv" ) type BeaconDataConfig struct { diff --git a/cl/phase1/core/rawdb/config_test.go b/cl/phase1/core/rawdb/config_test.go index 53b733d2e10..c6c7ad7b8ae 100644 --- a/cl/phase1/core/rawdb/config_test.go +++ b/cl/phase1/core/rawdb/config_test.go @@ -3,8 +3,8 @@ package rawdb_test import ( "testing" - "github.com/ledgerwatch/erigon-lib/kv/memdb" "github.com/ledgerwatch/erigon/cl/phase1/core/rawdb" + "github.com/ledgerwatch/erigon/erigon-lib/kv/memdb" "github.com/stretchr/testify/require" ) diff --git a/cl/phase1/core/state/accessors.go b/cl/phase1/core/state/accessors.go index 9c688df7a0a..74fa6c37f60 100644 --- a/cl/phase1/core/state/accessors.go +++ b/cl/phase1/core/state/accessors.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/Giulio2002/bls" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/cl/abstract" "github.com/ledgerwatch/erigon/cl/clparams" diff --git a/cl/phase1/core/state/cache.go b/cl/phase1/core/state/cache.go index 76d71aa446a..338a8a4bde9 100644 --- a/cl/phase1/core/state/cache.go +++ b/cl/phase1/core/state/cache.go @@ -9,10 +9,10 @@ import ( "github.com/ledgerwatch/erigon/cl/phase1/core/state/raw" shuffling2 "github.com/ledgerwatch/erigon/cl/phase1/core/state/shuffling" - "github.com/ledgerwatch/erigon-lib/common" - libcommon "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/cl/clparams" "github.com/ledgerwatch/erigon/cl/utils" + "github.com/ledgerwatch/erigon/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" ) type HashFunc func([]byte) ([32]byte, error) diff --git a/cl/phase1/core/state/cache_getters.go b/cl/phase1/core/state/cache_getters.go index f6a1a7cc11c..e3832a73be1 100644 --- a/cl/phase1/core/state/cache_getters.go +++ b/cl/phase1/core/state/cache_getters.go @@ -1,7 +1,7 @@ package state import ( - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" ) func (b *CachingBeaconState) ValidatorIndexByPubkey(key [48]byte) (uint64, bool) { diff --git a/cl/phase1/core/state/cache_mutators.go b/cl/phase1/core/state/cache_mutators.go index 8d4f8a1f9ed..7934a10b9e2 100644 --- a/cl/phase1/core/state/cache_mutators.go +++ b/cl/phase1/core/state/cache_mutators.go @@ -3,10 +3,10 @@ package state import ( "fmt" - "github.com/ledgerwatch/erigon-lib/common/math" "github.com/ledgerwatch/erigon/cl/clparams" "github.com/ledgerwatch/erigon/cl/cltypes/solid" "github.com/ledgerwatch/erigon/cl/utils" + "github.com/ledgerwatch/erigon/erigon-lib/common/math" ) func (b *CachingBeaconState) getSlashingProposerReward(whistleBlowerReward uint64) uint64 { diff --git a/cl/phase1/core/state/raw/getters.go b/cl/phase1/core/state/raw/getters.go index 9d1d512025b..9ca45bd7adb 100644 --- a/cl/phase1/core/state/raw/getters.go +++ b/cl/phase1/core/state/raw/getters.go @@ -4,11 +4,11 @@ import ( "errors" "fmt" - libcommon "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/cl/clparams" "github.com/ledgerwatch/erigon/cl/cltypes" "github.com/ledgerwatch/erigon/cl/cltypes/solid" "github.com/ledgerwatch/erigon/cl/fork" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" ) var ( diff --git a/cl/phase1/core/state/raw/hashing.go b/cl/phase1/core/state/raw/hashing.go index 72c840fbf35..e2d364c579d 100644 --- a/cl/phase1/core/state/raw/hashing.go +++ b/cl/phase1/core/state/raw/hashing.go @@ -3,10 +3,10 @@ package raw import ( "time" - "github.com/ledgerwatch/erigon-lib/common" - libcommon "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/cl/clparams" "github.com/ledgerwatch/erigon/cl/merkle_tree" + "github.com/ledgerwatch/erigon/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/log/v3" ) diff --git a/cl/phase1/core/state/raw/misc_test.go b/cl/phase1/core/state/raw/misc_test.go index 8ad541891df..61cc056a278 100644 --- a/cl/phase1/core/state/raw/misc_test.go +++ b/cl/phase1/core/state/raw/misc_test.go @@ -4,7 +4,7 @@ import ( _ "embed" "testing" - "github.com/ledgerwatch/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/stretchr/testify/require" ) diff --git a/cl/phase1/core/state/raw/setters.go b/cl/phase1/core/state/raw/setters.go index a73ccbb938b..d48db82db1e 100644 --- a/cl/phase1/core/state/raw/setters.go +++ b/cl/phase1/core/state/raw/setters.go @@ -1,10 +1,10 @@ package raw import ( - libcommon "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/cl/clparams" "github.com/ledgerwatch/erigon/cl/cltypes" "github.com/ledgerwatch/erigon/cl/cltypes/solid" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" ) func (b *BeaconState) SetVersion(version clparams.StateVersion) { diff --git a/cl/phase1/core/state/raw/setters_test.go b/cl/phase1/core/state/raw/setters_test.go index 98ea9fcf7e7..a5638579854 100644 --- a/cl/phase1/core/state/raw/setters_test.go +++ b/cl/phase1/core/state/raw/setters_test.go @@ -3,10 +3,10 @@ package raw import ( "testing" - "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/cl/clparams" "github.com/ledgerwatch/erigon/cl/cltypes" "github.com/ledgerwatch/erigon/cl/cltypes/solid" + "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/stretchr/testify/assert" ) diff --git a/cl/phase1/core/state/raw/ssz.go b/cl/phase1/core/state/raw/ssz.go index 17e03a0b70a..5d34d2f6b18 100644 --- a/cl/phase1/core/state/raw/ssz.go +++ b/cl/phase1/core/state/raw/ssz.go @@ -5,8 +5,8 @@ import ( ssz2 "github.com/ledgerwatch/erigon/cl/ssz" - "github.com/ledgerwatch/erigon-lib/types/clonable" - "github.com/ledgerwatch/erigon-lib/types/ssz" + "github.com/ledgerwatch/erigon/erigon-lib/types/clonable" + "github.com/ledgerwatch/erigon/erigon-lib/types/ssz" "github.com/ledgerwatch/erigon/cl/clparams" "github.com/ledgerwatch/erigon/cl/cltypes" diff --git a/cl/phase1/core/state/raw/state.go b/cl/phase1/core/state/raw/state.go index dc8c92b849a..4f5e60df396 100644 --- a/cl/phase1/core/state/raw/state.go +++ b/cl/phase1/core/state/raw/state.go @@ -1,10 +1,10 @@ package raw import ( - "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/cl/clparams" "github.com/ledgerwatch/erigon/cl/cltypes" "github.com/ledgerwatch/erigon/cl/cltypes/solid" + "github.com/ledgerwatch/erigon/erigon-lib/common" ) const ( diff --git a/cl/phase1/core/state/shuffling/util.go b/cl/phase1/core/state/shuffling/util.go index 0eb6e9e67ce..96f4d6e08cf 100644 --- a/cl/phase1/core/state/shuffling/util.go +++ b/cl/phase1/core/state/shuffling/util.go @@ -4,10 +4,10 @@ import ( "encoding/binary" "fmt" - "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/cl/clparams" "github.com/ledgerwatch/erigon/cl/utils" "github.com/ledgerwatch/erigon/common/eth2shuffle" + "github.com/ledgerwatch/erigon/erigon-lib/common" ) func ComputeShuffledIndex(conf *clparams.BeaconChainConfig, ind, ind_count uint64, seed [32]byte, preInputs [][32]byte, hashFunc utils.HashFunc) (uint64, error) { diff --git a/cl/phase1/core/state/ssz.go b/cl/phase1/core/state/ssz.go index ce7209d6a95..25fe7bf851e 100644 --- a/cl/phase1/core/state/ssz.go +++ b/cl/phase1/core/state/ssz.go @@ -1,7 +1,7 @@ package state import ( - "github.com/ledgerwatch/erigon-lib/types/clonable" + "github.com/ledgerwatch/erigon/erigon-lib/types/clonable" "github.com/ledgerwatch/erigon/metrics" ) diff --git a/cl/phase1/core/state/ssz_test.go b/cl/phase1/core/state/ssz_test.go index 9327d357e7a..5420d9ab970 100644 --- a/cl/phase1/core/state/ssz_test.go +++ b/cl/phase1/core/state/ssz_test.go @@ -6,7 +6,7 @@ import ( "github.com/ledgerwatch/erigon/cl/phase1/core/state" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/cl/clparams" "github.com/ledgerwatch/erigon/cl/utils" diff --git a/cl/phase1/core/state/upgrade.go b/cl/phase1/core/state/upgrade.go index 2270fe37113..9540f6e12b1 100644 --- a/cl/phase1/core/state/upgrade.go +++ b/cl/phase1/core/state/upgrade.go @@ -1,11 +1,11 @@ package state import ( - libcommon "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/cl/clparams" "github.com/ledgerwatch/erigon/cl/cltypes" "github.com/ledgerwatch/erigon/cl/cltypes/solid" "github.com/ledgerwatch/erigon/cl/utils" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" ) func (b *CachingBeaconState) UpgradeToAltair() error { diff --git a/cl/phase1/execution_client/execution_client_direct.go b/cl/phase1/execution_client/execution_client_direct.go index dc4674fb2ef..48f7c937481 100644 --- a/cl/phase1/execution_client/execution_client_direct.go +++ b/cl/phase1/execution_client/execution_client_direct.go @@ -4,10 +4,10 @@ import ( "context" "fmt" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/gointerfaces/execution" "github.com/ledgerwatch/erigon/cl/cltypes" "github.com/ledgerwatch/erigon/core/types" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/execution" "github.com/ledgerwatch/erigon/turbo/execution/eth1/eth1_chain_reader.go" ) diff --git a/cl/phase1/execution_client/execution_client_rpc.go b/cl/phase1/execution_client/execution_client_rpc.go index 20c5fb83550..114a94d8c24 100644 --- a/cl/phase1/execution_client/execution_client_rpc.go +++ b/cl/phase1/execution_client/execution_client_rpc.go @@ -8,12 +8,12 @@ import ( "strings" "time" - libcommon "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/cl/clparams" "github.com/ledgerwatch/erigon/cl/cltypes" "github.com/ledgerwatch/erigon/cl/phase1/execution_client/rpc_helper" "github.com/ledgerwatch/erigon/common/hexutil" "github.com/ledgerwatch/erigon/core/types" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/rpc" "github.com/ledgerwatch/erigon/turbo/engineapi/engine_types" "github.com/ledgerwatch/log/v3" diff --git a/cl/phase1/execution_client/interface.go b/cl/phase1/execution_client/interface.go index e6aad186ee5..87a4dadaab6 100644 --- a/cl/phase1/execution_client/interface.go +++ b/cl/phase1/execution_client/interface.go @@ -1,7 +1,7 @@ package execution_client import ( - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/cl/cltypes" "github.com/ledgerwatch/erigon/core/types" diff --git a/cl/phase1/forkchoice/checkpoint_state.go b/cl/phase1/forkchoice/checkpoint_state.go index 14a5ad90493..dc4c5a54115 100644 --- a/cl/phase1/forkchoice/checkpoint_state.go +++ b/cl/phase1/forkchoice/checkpoint_state.go @@ -7,7 +7,7 @@ import ( "github.com/ledgerwatch/erigon/cl/phase1/core/state/shuffling" "github.com/Giulio2002/bls" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/cl/clparams" "github.com/ledgerwatch/erigon/cl/cltypes" diff --git a/cl/phase1/forkchoice/fork_choice_test.go b/cl/phase1/forkchoice/fork_choice_test.go index b396b2fc8fb..06543d12268 100644 --- a/cl/phase1/forkchoice/fork_choice_test.go +++ b/cl/phase1/forkchoice/fork_choice_test.go @@ -8,7 +8,7 @@ import ( "github.com/ledgerwatch/erigon/cl/phase1/core/state" "github.com/ledgerwatch/erigon/cl/phase1/forkchoice" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/cl/clparams" "github.com/ledgerwatch/erigon/cl/cltypes" diff --git a/cl/phase1/forkchoice/fork_graph/fork_graph.go b/cl/phase1/forkchoice/fork_graph/fork_graph.go index c9cef8ccc75..89fd905051a 100644 --- a/cl/phase1/forkchoice/fork_graph/fork_graph.go +++ b/cl/phase1/forkchoice/fork_graph/fork_graph.go @@ -1,12 +1,12 @@ package fork_graph import ( - libcommon "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/cl/clparams" "github.com/ledgerwatch/erigon/cl/cltypes" "github.com/ledgerwatch/erigon/cl/cltypes/solid" "github.com/ledgerwatch/erigon/cl/phase1/core/state" "github.com/ledgerwatch/erigon/cl/transition" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/log/v3" "golang.org/x/exp/slices" ) diff --git a/cl/phase1/forkchoice/forkchoice.go b/cl/phase1/forkchoice/forkchoice.go index a92a981a40e..531e07f9a60 100644 --- a/cl/phase1/forkchoice/forkchoice.go +++ b/cl/phase1/forkchoice/forkchoice.go @@ -10,7 +10,7 @@ import ( "github.com/ledgerwatch/erigon/cl/phase1/forkchoice/fork_graph" lru "github.com/hashicorp/golang-lru/v2" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" ) type checkpointComparable string diff --git a/cl/phase1/forkchoice/get_head.go b/cl/phase1/forkchoice/get_head.go index ce821f1db6c..0ef3a1e51d0 100644 --- a/cl/phase1/forkchoice/get_head.go +++ b/cl/phase1/forkchoice/get_head.go @@ -5,8 +5,8 @@ import ( "fmt" "sort" - libcommon "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/cl/cltypes" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" ) // GetHead fetches the current head. diff --git a/cl/phase1/forkchoice/interface.go b/cl/phase1/forkchoice/interface.go index dfbcb9e5b47..9448c3c78c3 100644 --- a/cl/phase1/forkchoice/interface.go +++ b/cl/phase1/forkchoice/interface.go @@ -1,10 +1,10 @@ package forkchoice import ( - "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/cl/cltypes" "github.com/ledgerwatch/erigon/cl/cltypes/solid" "github.com/ledgerwatch/erigon/cl/phase1/execution_client" + "github.com/ledgerwatch/erigon/erigon-lib/common" ) type ForkChoiceStorage interface { diff --git a/cl/phase1/forkchoice/on_attestation.go b/cl/phase1/forkchoice/on_attestation.go index c5fc7ac3583..029a0a368ef 100644 --- a/cl/phase1/forkchoice/on_attestation.go +++ b/cl/phase1/forkchoice/on_attestation.go @@ -7,7 +7,7 @@ import ( "github.com/ledgerwatch/erigon/cl/phase1/cache" "github.com/ledgerwatch/erigon/cl/phase1/core/state" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" ) // OnAttestation processes incoming attestations. TODO(Giulio2002): finish it with forward changesets. diff --git a/cl/phase1/forkchoice/on_tick.go b/cl/phase1/forkchoice/on_tick.go index 4f59528d25c..4a63229b78f 100644 --- a/cl/phase1/forkchoice/on_tick.go +++ b/cl/phase1/forkchoice/on_tick.go @@ -1,6 +1,6 @@ package forkchoice -import libcommon "github.com/ledgerwatch/erigon-lib/common" +import libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" // OnTick executes on_tick operation for forkchoice. func (f *ForkChoiceStore) OnTick(time uint64) { diff --git a/cl/phase1/forkchoice/utils.go b/cl/phase1/forkchoice/utils.go index fd2865a2c26..4ded09892d8 100644 --- a/cl/phase1/forkchoice/utils.go +++ b/cl/phase1/forkchoice/utils.go @@ -5,9 +5,9 @@ import ( "github.com/ledgerwatch/erigon/cl/transition" - libcommon "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/cl/cltypes/solid" "github.com/ledgerwatch/erigon/cl/phase1/core/state" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/log/v3" ) diff --git a/cl/phase1/main.go b/cl/phase1/main.go index e64c2ccabfa..f415942afa4 100644 --- a/cl/phase1/main.go +++ b/cl/phase1/main.go @@ -16,9 +16,9 @@ func main() {} // stages2 "github.com/ledgerwatch/erigon/cl/phase1/stages" // rawdb2 "github.com/ledgerwatch/erigon/cl/phase4/rawdb" -// sentinelrpc "github.com/ledgerwatch/erigon-lib/gointerfaces/sentinel" -// "github.com/ledgerwatch/erigon-lib/kv" -// "github.com/ledgerwatch/erigon-lib/kv/mdbx" +// sentinelrpc "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/sentinel" +// "github.com/ledgerwatch/erigon/erigon-lib/kv" +// "github.com/ledgerwatch/erigon/erigon-lib/kv/mdbx" // "github.com/ledgerwatch/erigon/cl/clparams" // "github.com/ledgerwatch/erigon/cl/clparams/initial_state" // "github.com/ledgerwatch/erigon/cl/cltypes" diff --git a/cl/phase1/network/backward_beacon_downloader.go b/cl/phase1/network/backward_beacon_downloader.go index 612406d5f05..4f74d8b6b2e 100644 --- a/cl/phase1/network/backward_beacon_downloader.go +++ b/cl/phase1/network/backward_beacon_downloader.go @@ -3,7 +3,7 @@ package network import ( "sync" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/log/v3" "golang.org/x/net/context" diff --git a/cl/phase1/network/beacon_downloader.go b/cl/phase1/network/beacon_downloader.go index af673d0f084..1c41c2fe01c 100644 --- a/cl/phase1/network/beacon_downloader.go +++ b/cl/phase1/network/beacon_downloader.go @@ -4,7 +4,7 @@ import ( "sync" "time" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "golang.org/x/net/context" "github.com/ledgerwatch/erigon/cl/cltypes" diff --git a/cl/phase1/network/gossip_manager.go b/cl/phase1/network/gossip_manager.go index 2d15095c4d0..83c7f37faa8 100644 --- a/cl/phase1/network/gossip_manager.go +++ b/cl/phase1/network/gossip_manager.go @@ -8,12 +8,12 @@ import ( "github.com/ledgerwatch/erigon/cl/phase1/forkchoice" "github.com/ledgerwatch/erigon/cl/sentinel/peers" - "github.com/ledgerwatch/erigon-lib/gointerfaces/sentinel" - "github.com/ledgerwatch/erigon-lib/types/ssz" "github.com/ledgerwatch/erigon/cl/clparams" "github.com/ledgerwatch/erigon/cl/cltypes" "github.com/ledgerwatch/erigon/cl/utils" "github.com/ledgerwatch/erigon/common" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/sentinel" + "github.com/ledgerwatch/erigon/erigon-lib/types/ssz" "github.com/ledgerwatch/log/v3" ) diff --git a/cl/phase1/stages/clstages.go b/cl/phase1/stages/clstages.go index d3fd9c7a0f8..6443833d592 100644 --- a/cl/phase1/stages/clstages.go +++ b/cl/phase1/stages/clstages.go @@ -7,8 +7,6 @@ import ( "runtime" "time" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/dbg" "github.com/ledgerwatch/erigon/cl/clparams" "github.com/ledgerwatch/erigon/cl/clstages" "github.com/ledgerwatch/erigon/cl/cltypes" @@ -19,6 +17,8 @@ import ( "github.com/ledgerwatch/erigon/cl/phase1/execution_client" "github.com/ledgerwatch/erigon/cl/phase1/forkchoice" "github.com/ledgerwatch/erigon/core/types" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/dbg" network2 "github.com/ledgerwatch/erigon/cl/phase1/network" "github.com/ledgerwatch/erigon/cl/rpc" diff --git a/cl/phase1/stages/stage_history_download.go b/cl/phase1/stages/stage_history_download.go index 36bad848a95..d6ed1efcc2d 100644 --- a/cl/phase1/stages/stage_history_download.go +++ b/cl/phase1/stages/stage_history_download.go @@ -7,10 +7,6 @@ import ( "sync/atomic" "time" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/etl" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/memdb" "github.com/ledgerwatch/erigon/cl/persistence" "github.com/ledgerwatch/erigon/cl/persistence/db_config" "github.com/ledgerwatch/erigon/cl/phase1/execution_client" @@ -18,6 +14,10 @@ import ( "github.com/ledgerwatch/erigon/cl/utils" "github.com/ledgerwatch/erigon/common/dbutils" "github.com/ledgerwatch/erigon/core/types" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/etl" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/memdb" "github.com/ledgerwatch/erigon/cl/clparams" "github.com/ledgerwatch/erigon/cl/cltypes" diff --git a/cl/rpc/rpc.go b/cl/rpc/rpc.go index c9ca3436598..f3b3b190613 100644 --- a/cl/rpc/rpc.go +++ b/cl/rpc/rpc.go @@ -10,9 +10,9 @@ import ( "github.com/c2h5oh/datasize" "github.com/golang/snappy" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - "github.com/ledgerwatch/erigon-lib/gointerfaces/sentinel" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/sentinel" "github.com/ledgerwatch/log/v3" "go.uber.org/zap/buffer" diff --git a/cl/ssz/decode.go b/cl/ssz/decode.go index 1cd1b2e46c4..0d9161b52e3 100644 --- a/cl/ssz/decode.go +++ b/cl/ssz/decode.go @@ -5,7 +5,7 @@ import ( "fmt" "reflect" - "github.com/ledgerwatch/erigon-lib/types/ssz" + "github.com/ledgerwatch/erigon/erigon-lib/types/ssz" ) /* diff --git a/cl/ssz/encode.go b/cl/ssz/encode.go index 2f851f1d208..c764a142b32 100644 --- a/cl/ssz/encode.go +++ b/cl/ssz/encode.go @@ -4,7 +4,7 @@ import ( "encoding/binary" "fmt" - "github.com/ledgerwatch/erigon-lib/types/ssz" + "github.com/ledgerwatch/erigon/erigon-lib/types/ssz" ) type Sized interface { diff --git a/cl/ssz/ssz_test.go b/cl/ssz/ssz_test.go index 19f53c699e5..3dd4431c5ac 100644 --- a/cl/ssz/ssz_test.go +++ b/cl/ssz/ssz_test.go @@ -4,10 +4,10 @@ import ( _ "embed" "testing" - "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/cl/clparams" "github.com/ledgerwatch/erigon/cl/phase1/core/state" "github.com/ledgerwatch/erigon/cl/utils" + "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/stretchr/testify/require" ) diff --git a/cl/transition/impl/eth2/operations.go b/cl/transition/impl/eth2/operations.go index e22016e02b7..d3db7506bce 100644 --- a/cl/transition/impl/eth2/operations.go +++ b/cl/transition/impl/eth2/operations.go @@ -13,9 +13,9 @@ import ( "github.com/ledgerwatch/erigon/cl/transition/impl/eth2/statechange" "golang.org/x/exp/slices" - "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/cl/cltypes/solid" "github.com/ledgerwatch/erigon/cl/phase1/core/state" + "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/Giulio2002/bls" "github.com/ledgerwatch/log/v3" diff --git a/cl/transition/impl/eth2/utils.go b/cl/transition/impl/eth2/utils.go index a23addfb70c..3550a4e74f4 100644 --- a/cl/transition/impl/eth2/utils.go +++ b/cl/transition/impl/eth2/utils.go @@ -3,7 +3,7 @@ package eth2 import ( "encoding/binary" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/cl/abstract" "github.com/ledgerwatch/erigon/cl/cltypes" diff --git a/cl/transition/machine/helpers.go b/cl/transition/machine/helpers.go index b3a45c36c2b..14797f0b8f1 100644 --- a/cl/transition/machine/helpers.go +++ b/cl/transition/machine/helpers.go @@ -1,10 +1,10 @@ package machine import ( - "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/cl/abstract" "github.com/ledgerwatch/erigon/cl/cltypes" "github.com/ledgerwatch/erigon/cl/phase1/core/state" + "github.com/ledgerwatch/erigon/erigon-lib/common" ) func executionEnabled(s abstract.BeaconState, payload *cltypes.Eth1Block) bool { diff --git a/cl/utils/bytes.go b/cl/utils/bytes.go index 417fe4b583c..2ae088375c7 100644 --- a/cl/utils/bytes.go +++ b/cl/utils/bytes.go @@ -17,7 +17,7 @@ import ( "encoding/binary" "math/bits" - "github.com/ledgerwatch/erigon-lib/types/ssz" + "github.com/ledgerwatch/erigon/erigon-lib/types/ssz" "github.com/golang/snappy" ) diff --git a/cl/utils/merkle.go b/cl/utils/merkle.go index 2e63a59b095..d143f775b4d 100644 --- a/cl/utils/merkle.go +++ b/cl/utils/merkle.go @@ -1,7 +1,7 @@ package utils import ( - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" ) // Check if leaf at index verifies against the Merkle root and branch diff --git a/cmd/abigen/main.go b/cmd/abigen/main.go index 2c65209b009..7ba0fe88464 100644 --- a/cmd/abigen/main.go +++ b/cmd/abigen/main.go @@ -19,13 +19,14 @@ package main import ( "encoding/json" "fmt" - "github.com/ledgerwatch/erigon-lib/common" "io" "os" "path/filepath" "regexp" "strings" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/log/v3" "github.com/urfave/cli/v2" diff --git a/cmd/bootnode/main.go b/cmd/bootnode/main.go index ee1bb44e62c..318372e3b39 100644 --- a/cmd/bootnode/main.go +++ b/cmd/bootnode/main.go @@ -24,7 +24,7 @@ import ( "net" "os" - "github.com/ledgerwatch/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/turbo/logging" "github.com/ledgerwatch/erigon/cmd/utils" diff --git a/cmd/capcli/cli.go b/cmd/capcli/cli.go index f7ad42d359f..e532cfda87a 100644 --- a/cmd/capcli/cli.go +++ b/cmd/capcli/cli.go @@ -8,7 +8,6 @@ import ( "time" "github.com/jedib0t/go-pretty/v6/progress" - "github.com/ledgerwatch/erigon-lib/gointerfaces/sentinel" "github.com/ledgerwatch/erigon/cl/abstract" "github.com/ledgerwatch/erigon/cl/clparams" "github.com/ledgerwatch/erigon/cl/cltypes" @@ -19,6 +18,7 @@ import ( "github.com/ledgerwatch/erigon/cl/transition/impl/eth2" "github.com/ledgerwatch/erigon/cl/transition/machine" "github.com/ledgerwatch/erigon/cl/utils" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/sentinel" "github.com/ledgerwatch/log/v3" "github.com/spf13/afero" "golang.org/x/sync/errgroup" diff --git a/cmd/caplin-phase1/caplin1/run.go b/cmd/caplin-phase1/caplin1/run.go index fb20ee94a16..649c0c13ead 100644 --- a/cmd/caplin-phase1/caplin1/run.go +++ b/cmd/caplin-phase1/caplin1/run.go @@ -21,9 +21,9 @@ import ( "github.com/ledgerwatch/erigon/cl/phase1/stages" "github.com/Giulio2002/bls" - "github.com/ledgerwatch/erigon-lib/gointerfaces/sentinel" "github.com/ledgerwatch/erigon/cl/clparams" "github.com/ledgerwatch/erigon/cl/rpc" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/sentinel" "github.com/ledgerwatch/log/v3" ) diff --git a/cmd/caplin-regression/regression/tester.go b/cmd/caplin-regression/regression/tester.go index 4003e04dd40..c17322a25d9 100644 --- a/cmd/caplin-regression/regression/tester.go +++ b/cmd/caplin-regression/regression/tester.go @@ -5,11 +5,11 @@ import ( "time" "github.com/Giulio2002/bls" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/dbg" "github.com/ledgerwatch/erigon/cl/cltypes" "github.com/ledgerwatch/erigon/cl/cltypes/solid" "github.com/ledgerwatch/erigon/cl/phase1/forkchoice" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/dbg" "github.com/ledgerwatch/log/v3" ) diff --git a/cmd/devnet/accounts/accounts.go b/cmd/devnet/accounts/accounts.go index 032cebdc616..44cd6ed6db1 100644 --- a/cmd/devnet/accounts/accounts.go +++ b/cmd/devnet/accounts/accounts.go @@ -3,9 +3,9 @@ package accounts import ( "crypto/ecdsa" - libcommon "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/core" "github.com/ledgerwatch/erigon/crypto" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" ) const DevAddress = "0x67b1d87101671b127f5f8714789C7192f7ad340e" diff --git a/cmd/devnet/accounts/steps/steps.go b/cmd/devnet/accounts/steps/steps.go index 3547c2363c8..5acb8e683e0 100644 --- a/cmd/devnet/accounts/steps/steps.go +++ b/cmd/devnet/accounts/steps/steps.go @@ -6,7 +6,7 @@ import ( "fmt" "math/big" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/accounts/abi/bind" "github.com/ledgerwatch/erigon/cmd/devnet/accounts" diff --git a/cmd/devnet/blocks/waiter.go b/cmd/devnet/blocks/waiter.go index cccc780bcfb..172c2cc20b5 100644 --- a/cmd/devnet/blocks/waiter.go +++ b/cmd/devnet/blocks/waiter.go @@ -4,10 +4,10 @@ import ( "context" ethereum "github.com/ledgerwatch/erigon" - libcommon "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/cmd/devnet/devnet" "github.com/ledgerwatch/erigon/cmd/devnet/requests" "github.com/ledgerwatch/erigon/core/types" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/rpc" "github.com/ledgerwatch/erigon/turbo/jsonrpc" "github.com/ledgerwatch/log/v3" diff --git a/cmd/devnet/contracts/backend.go b/cmd/devnet/contracts/backend.go index fc9e7237519..c317d8dd8ae 100644 --- a/cmd/devnet/contracts/backend.go +++ b/cmd/devnet/contracts/backend.go @@ -6,12 +6,12 @@ import ( "math/big" ethereum "github.com/ledgerwatch/erigon" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" "github.com/ledgerwatch/erigon/accounts/abi/bind" "github.com/ledgerwatch/erigon/cmd/devnet/devnet" "github.com/ledgerwatch/erigon/common/hexutil" "github.com/ledgerwatch/erigon/core/types" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" "github.com/ledgerwatch/erigon/rpc" "github.com/ledgerwatch/erigon/turbo/adapter/ethapi" ) diff --git a/cmd/devnet/contracts/gen_childreceiver.go b/cmd/devnet/contracts/gen_childreceiver.go index c4a88535535..824219c0919 100644 --- a/cmd/devnet/contracts/gen_childreceiver.go +++ b/cmd/devnet/contracts/gen_childreceiver.go @@ -10,7 +10,7 @@ import ( "strings" ethereum "github.com/ledgerwatch/erigon" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/accounts/abi" "github.com/ledgerwatch/erigon/accounts/abi/bind" "github.com/ledgerwatch/erigon/core/types" diff --git a/cmd/devnet/contracts/gen_childsender.go b/cmd/devnet/contracts/gen_childsender.go index 4928cf39f51..35f9a892def 100644 --- a/cmd/devnet/contracts/gen_childsender.go +++ b/cmd/devnet/contracts/gen_childsender.go @@ -10,7 +10,7 @@ import ( "strings" ethereum "github.com/ledgerwatch/erigon" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/accounts/abi" "github.com/ledgerwatch/erigon/accounts/abi/bind" "github.com/ledgerwatch/erigon/core/types" diff --git a/cmd/devnet/contracts/gen_faucet.go b/cmd/devnet/contracts/gen_faucet.go index fececc739de..c418b2be65f 100644 --- a/cmd/devnet/contracts/gen_faucet.go +++ b/cmd/devnet/contracts/gen_faucet.go @@ -10,7 +10,7 @@ import ( "strings" ethereum "github.com/ledgerwatch/erigon" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/accounts/abi" "github.com/ledgerwatch/erigon/accounts/abi/bind" "github.com/ledgerwatch/erigon/core/types" diff --git a/cmd/devnet/contracts/gen_rootreceiver.go b/cmd/devnet/contracts/gen_rootreceiver.go index 5f9f39c9aac..cc3fd6cbd14 100644 --- a/cmd/devnet/contracts/gen_rootreceiver.go +++ b/cmd/devnet/contracts/gen_rootreceiver.go @@ -10,7 +10,7 @@ import ( "strings" ethereum "github.com/ledgerwatch/erigon" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/accounts/abi" "github.com/ledgerwatch/erigon/accounts/abi/bind" "github.com/ledgerwatch/erigon/core/types" diff --git a/cmd/devnet/contracts/gen_rootsender.go b/cmd/devnet/contracts/gen_rootsender.go index 472f96dbf8f..dbe776f1544 100644 --- a/cmd/devnet/contracts/gen_rootsender.go +++ b/cmd/devnet/contracts/gen_rootsender.go @@ -10,7 +10,7 @@ import ( "strings" ethereum "github.com/ledgerwatch/erigon" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/accounts/abi" "github.com/ledgerwatch/erigon/accounts/abi/bind" "github.com/ledgerwatch/erigon/core/types" diff --git a/cmd/devnet/contracts/gen_subscription.go b/cmd/devnet/contracts/gen_subscription.go index cb1a209743a..7652b8e44aa 100644 --- a/cmd/devnet/contracts/gen_subscription.go +++ b/cmd/devnet/contracts/gen_subscription.go @@ -7,7 +7,7 @@ import ( "math/big" "strings" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" ethereum "github.com/ledgerwatch/erigon" "github.com/ledgerwatch/erigon/accounts/abi" diff --git a/cmd/devnet/contracts/gen_testrootchain.go b/cmd/devnet/contracts/gen_testrootchain.go index 24d82755a52..284c5f13578 100644 --- a/cmd/devnet/contracts/gen_testrootchain.go +++ b/cmd/devnet/contracts/gen_testrootchain.go @@ -10,7 +10,7 @@ import ( "strings" ethereum "github.com/ledgerwatch/erigon" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/accounts/abi" "github.com/ledgerwatch/erigon/accounts/abi/bind" "github.com/ledgerwatch/erigon/core/types" diff --git a/cmd/devnet/contracts/gen_teststatesender.go b/cmd/devnet/contracts/gen_teststatesender.go index 7cecbef02a5..16d89c339e2 100644 --- a/cmd/devnet/contracts/gen_teststatesender.go +++ b/cmd/devnet/contracts/gen_teststatesender.go @@ -10,7 +10,7 @@ import ( "strings" ethereum "github.com/ledgerwatch/erigon" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/accounts/abi" "github.com/ledgerwatch/erigon/accounts/abi/bind" "github.com/ledgerwatch/erigon/core/types" diff --git a/cmd/devnet/contracts/steps/l1l2transfers.go b/cmd/devnet/contracts/steps/l1l2transfers.go index c002c61c956..a0753d176bc 100644 --- a/cmd/devnet/contracts/steps/l1l2transfers.go +++ b/cmd/devnet/contracts/steps/l1l2transfers.go @@ -8,7 +8,6 @@ import ( "math" "math/big" - libcommon "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/accounts/abi" "github.com/ledgerwatch/erigon/accounts/abi/bind" "github.com/ledgerwatch/erigon/cmd/devnet/accounts" @@ -18,6 +17,7 @@ import ( "github.com/ledgerwatch/erigon/cmd/devnet/requests" "github.com/ledgerwatch/erigon/cmd/devnet/scenarios" "github.com/ledgerwatch/erigon/cmd/devnet/services" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/params/networkname" "github.com/ledgerwatch/erigon/rpc" "github.com/ledgerwatch/erigon/turbo/adapter/ethapi" diff --git a/cmd/devnet/contracts/steps/l2l1transfers.go b/cmd/devnet/contracts/steps/l2l1transfers.go index b7b04efe35e..b8b43b531c1 100644 --- a/cmd/devnet/contracts/steps/l2l1transfers.go +++ b/cmd/devnet/contracts/steps/l2l1transfers.go @@ -6,7 +6,6 @@ import ( "fmt" "math/big" - libcommon "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/accounts/abi" "github.com/ledgerwatch/erigon/accounts/abi/bind" "github.com/ledgerwatch/erigon/cmd/devnet/accounts" @@ -16,6 +15,7 @@ import ( "github.com/ledgerwatch/erigon/cmd/devnet/requests" "github.com/ledgerwatch/erigon/cmd/devnet/scenarios" "github.com/ledgerwatch/erigon/cmd/devnet/services" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/params/networkname" "github.com/ledgerwatch/erigon/rpc" "github.com/ledgerwatch/erigon/turbo/adapter/ethapi" diff --git a/cmd/devnet/contracts/steps/subscriber.go b/cmd/devnet/contracts/steps/subscriber.go index b9900f28573..6c43b2dccf5 100644 --- a/cmd/devnet/contracts/steps/subscriber.go +++ b/cmd/devnet/contracts/steps/subscriber.go @@ -6,8 +6,8 @@ import ( "math/big" ethereum "github.com/ledgerwatch/erigon" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" "github.com/ledgerwatch/log/v3" "github.com/ledgerwatch/erigon/accounts/abi/bind" diff --git a/cmd/devnet/contracts/util.go b/cmd/devnet/contracts/util.go index c9f0f173a77..e85d4199a30 100644 --- a/cmd/devnet/contracts/util.go +++ b/cmd/devnet/contracts/util.go @@ -3,13 +3,13 @@ package contracts import ( "context" - libcommon "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/accounts/abi/bind" "github.com/ledgerwatch/erigon/cmd/devnet/accounts" "github.com/ledgerwatch/erigon/cmd/devnet/blocks" "github.com/ledgerwatch/erigon/cmd/devnet/devnet" "github.com/ledgerwatch/erigon/cmd/devnet/requests" "github.com/ledgerwatch/erigon/core/types" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/rpc" "github.com/ledgerwatch/erigon/turbo/jsonrpc" ) diff --git a/cmd/devnet/devnet/network.go b/cmd/devnet/devnet/network.go index 701b71f763d..bb16a4104dc 100644 --- a/cmd/devnet/devnet/network.go +++ b/cmd/devnet/devnet/network.go @@ -13,11 +13,11 @@ import ( "sync" "time" - "github.com/ledgerwatch/erigon-lib/common/dbg" "github.com/ledgerwatch/erigon/cmd/devnet/args" "github.com/ledgerwatch/erigon/cmd/devnet/devnetutils" "github.com/ledgerwatch/erigon/cmd/devnet/requests" "github.com/ledgerwatch/erigon/core/types" + "github.com/ledgerwatch/erigon/erigon-lib/common/dbg" "github.com/ledgerwatch/erigon/params" erigonapp "github.com/ledgerwatch/erigon/turbo/app" erigoncli "github.com/ledgerwatch/erigon/turbo/cli" diff --git a/cmd/devnet/devnetutils/utils.go b/cmd/devnet/devnetutils/utils.go index 5e204a41771..3d22d0fa633 100644 --- a/cmd/devnet/devnetutils/utils.go +++ b/cmd/devnet/devnetutils/utils.go @@ -12,7 +12,7 @@ import ( "strconv" "strings" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/crypto" "github.com/ledgerwatch/log/v3" diff --git a/cmd/devnet/main.go b/cmd/devnet/main.go index 0d6d482b8a2..0faff0f8eb2 100644 --- a/cmd/devnet/main.go +++ b/cmd/devnet/main.go @@ -20,13 +20,13 @@ import ( "github.com/ledgerwatch/erigon/cmd/devnet/transactions" "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon-lib/common/metrics" "github.com/ledgerwatch/erigon/cmd/devnet/args" "github.com/ledgerwatch/erigon/cmd/devnet/devnet" "github.com/ledgerwatch/erigon/cmd/devnet/devnetutils" "github.com/ledgerwatch/erigon/cmd/devnet/requests" "github.com/ledgerwatch/erigon/cmd/devnet/scenarios" "github.com/ledgerwatch/erigon/cmd/devnet/services" + "github.com/ledgerwatch/erigon/erigon-lib/common/metrics" "github.com/ledgerwatch/erigon/params/networkname" "github.com/ledgerwatch/log/v3" diff --git a/cmd/devnet/requests/account.go b/cmd/devnet/requests/account.go index d77834ff0cb..703009fa97f 100644 --- a/cmd/devnet/requests/account.go +++ b/cmd/devnet/requests/account.go @@ -4,9 +4,9 @@ import ( "fmt" "math/big" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" "github.com/ledgerwatch/erigon/common/hexutil" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" "github.com/ledgerwatch/erigon/rpc" ) diff --git a/cmd/devnet/requests/block.go b/cmd/devnet/requests/block.go index 153f376c4a0..99428093ff5 100644 --- a/cmd/devnet/requests/block.go +++ b/cmd/devnet/requests/block.go @@ -4,7 +4,7 @@ import ( "encoding/json" "math/big" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/common/hexutil" "github.com/ledgerwatch/erigon/common/math" diff --git a/cmd/devnet/requests/event.go b/cmd/devnet/requests/event.go index 2ece47d6636..3b3ee24d374 100644 --- a/cmd/devnet/requests/event.go +++ b/cmd/devnet/requests/event.go @@ -6,10 +6,10 @@ import ( "fmt" ethereum "github.com/ledgerwatch/erigon" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" "github.com/ledgerwatch/erigon/common/hexutil" "github.com/ledgerwatch/erigon/core/types" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" ) func Compare(expected types.Log, actual types.Log) ([]error, bool) { diff --git a/cmd/devnet/requests/request_generator.go b/cmd/devnet/requests/request_generator.go index 80bbe5f5708..5247b8edcec 100644 --- a/cmd/devnet/requests/request_generator.go +++ b/cmd/devnet/requests/request_generator.go @@ -12,10 +12,10 @@ import ( "time" ethereum "github.com/ledgerwatch/erigon" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" "github.com/ledgerwatch/erigon/cmd/devnet/devnetutils" "github.com/ledgerwatch/erigon/core/types" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" "github.com/ledgerwatch/erigon/p2p" "github.com/ledgerwatch/erigon/rpc" "github.com/ledgerwatch/erigon/turbo/adapter/ethapi" diff --git a/cmd/devnet/requests/trace.go b/cmd/devnet/requests/trace.go index 4704e5e8859..2eea29283a4 100644 --- a/cmd/devnet/requests/trace.go +++ b/cmd/devnet/requests/trace.go @@ -4,9 +4,9 @@ import ( "encoding/json" "fmt" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" "github.com/ledgerwatch/erigon/common/hexutil" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" "github.com/ledgerwatch/erigon/rpc" "github.com/ledgerwatch/erigon/turbo/adapter/ethapi" ) diff --git a/cmd/devnet/requests/transaction.go b/cmd/devnet/requests/transaction.go index cf0889491c8..19c6968ba54 100644 --- a/cmd/devnet/requests/transaction.go +++ b/cmd/devnet/requests/transaction.go @@ -7,10 +7,10 @@ import ( "math/big" ethereum "github.com/ledgerwatch/erigon" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" "github.com/ledgerwatch/erigon/common/hexutil" "github.com/ledgerwatch/erigon/core/types" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" "github.com/ledgerwatch/erigon/rpc" "github.com/ledgerwatch/erigon/turbo/adapter/ethapi" "github.com/ledgerwatch/erigon/turbo/jsonrpc" diff --git a/cmd/devnet/services/accounts/faucet.go b/cmd/devnet/services/accounts/faucet.go index 92279992d76..3e082eb5b95 100644 --- a/cmd/devnet/services/accounts/faucet.go +++ b/cmd/devnet/services/accounts/faucet.go @@ -7,12 +7,12 @@ import ( "strings" "sync" - libcommon "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/accounts/abi/bind" "github.com/ledgerwatch/erigon/cmd/devnet/accounts" "github.com/ledgerwatch/erigon/cmd/devnet/blocks" "github.com/ledgerwatch/erigon/cmd/devnet/contracts" "github.com/ledgerwatch/erigon/cmd/devnet/devnet" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/rpc" ) diff --git a/cmd/devnet/services/polygon/checkpoint.go b/cmd/devnet/services/polygon/checkpoint.go index b789d6de2b2..8890b10c8bd 100644 --- a/cmd/devnet/services/polygon/checkpoint.go +++ b/cmd/devnet/services/polygon/checkpoint.go @@ -10,8 +10,6 @@ import ( "strings" "time" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" "github.com/ledgerwatch/erigon/accounts/abi/bind" "github.com/ledgerwatch/erigon/cmd/devnet/accounts" "github.com/ledgerwatch/erigon/cmd/devnet/blocks" @@ -21,6 +19,8 @@ import ( "github.com/ledgerwatch/erigon/consensus/bor/heimdall/checkpoint" "github.com/ledgerwatch/erigon/core/types" "github.com/ledgerwatch/erigon/crypto" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" "github.com/ledgerwatch/erigon/params/networkname" ) diff --git a/cmd/devnet/services/polygon/heimdall.go b/cmd/devnet/services/polygon/heimdall.go index 3eb6d3f1837..7884cfa24ed 100644 --- a/cmd/devnet/services/polygon/heimdall.go +++ b/cmd/devnet/services/polygon/heimdall.go @@ -9,8 +9,6 @@ import ( "time" ethereum "github.com/ledgerwatch/erigon" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/accounts/abi/bind" "github.com/ledgerwatch/erigon/cmd/devnet/accounts" "github.com/ledgerwatch/erigon/cmd/devnet/blocks" @@ -21,6 +19,8 @@ import ( "github.com/ledgerwatch/erigon/consensus/bor/heimdall/span" "github.com/ledgerwatch/erigon/consensus/bor/heimdallgrpc" "github.com/ledgerwatch/erigon/consensus/bor/valset" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/log/v3" ) diff --git a/cmd/devnet/services/polygon/proofgenerator.go b/cmd/devnet/services/polygon/proofgenerator.go index 75faa4c8aa9..bc3b8fb8223 100644 --- a/cmd/devnet/services/polygon/proofgenerator.go +++ b/cmd/devnet/services/polygon/proofgenerator.go @@ -10,14 +10,14 @@ import ( "strings" "sync" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" "github.com/ledgerwatch/erigon/accounts/abi/bind" "github.com/ledgerwatch/erigon/cl/merkle_tree" "github.com/ledgerwatch/erigon/cmd/devnet/devnet" "github.com/ledgerwatch/erigon/cmd/devnet/requests" "github.com/ledgerwatch/erigon/core/types" "github.com/ledgerwatch/erigon/crypto" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" "github.com/ledgerwatch/erigon/params/networkname" "github.com/ledgerwatch/erigon/rlp" "github.com/ledgerwatch/erigon/rpc" diff --git a/cmd/devnet/services/polygon/util.go b/cmd/devnet/services/polygon/util.go index 2c5f2799313..d70c09d0244 100644 --- a/cmd/devnet/services/polygon/util.go +++ b/cmd/devnet/services/polygon/util.go @@ -7,10 +7,10 @@ import ( "reflect" "strings" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" "github.com/ledgerwatch/erigon/accounts/abi" "github.com/ledgerwatch/erigon/core/types" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" ) // UnpackLog unpacks log diff --git a/cmd/devnet/transactions/block.go b/cmd/devnet/transactions/block.go index cf53d0292c5..50a6ac4e082 100644 --- a/cmd/devnet/transactions/block.go +++ b/cmd/devnet/transactions/block.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/log/v3" "github.com/ledgerwatch/erigon/cmd/devnet/devnet" diff --git a/cmd/devnet/transactions/tx.go b/cmd/devnet/transactions/tx.go index 7298fb41089..1b88552fe3a 100644 --- a/cmd/devnet/transactions/tx.go +++ b/cmd/devnet/transactions/tx.go @@ -6,7 +6,7 @@ import ( "strings" "time" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/log/v3" "github.com/ledgerwatch/erigon/cmd/devnet/accounts" diff --git a/cmd/downloader/main.go b/cmd/downloader/main.go index dc2f5fb5d75..5132a70c2e1 100644 --- a/cmd/downloader/main.go +++ b/cmd/downloader/main.go @@ -4,26 +4,27 @@ import ( "context" "errors" "fmt" - "github.com/ledgerwatch/erigon-lib/common/dir" - "github.com/ledgerwatch/erigon-lib/downloader/snaptype" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/mdbx" - "github.com/ledgerwatch/erigon/cmd/hack/tool" - "github.com/ledgerwatch/erigon/turbo/snapshotsync/snapcfg" "net" "os" "path/filepath" "time" + "github.com/ledgerwatch/erigon/cmd/hack/tool" + "github.com/ledgerwatch/erigon/erigon-lib/common/dir" + "github.com/ledgerwatch/erigon/erigon-lib/downloader/snaptype" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/mdbx" + "github.com/ledgerwatch/erigon/turbo/snapshotsync/snapcfg" + "github.com/anacrolix/torrent/metainfo" "github.com/c2h5oh/datasize" grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware" grpc_recovery "github.com/grpc-ecosystem/go-grpc-middleware/recovery" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/downloader" - downloadercfg2 "github.com/ledgerwatch/erigon-lib/downloader/downloadercfg" - proto_downloader "github.com/ledgerwatch/erigon-lib/gointerfaces/downloader" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/datadir" + "github.com/ledgerwatch/erigon/erigon-lib/downloader" + downloadercfg2 "github.com/ledgerwatch/erigon/erigon-lib/downloader/downloadercfg" + proto_downloader "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/downloader" "github.com/ledgerwatch/log/v3" "github.com/pelletier/go-toml" "github.com/spf13/cobra" diff --git a/cmd/erigon/main.go b/cmd/erigon/main.go index a77ae422bed..8050728ca42 100644 --- a/cmd/erigon/main.go +++ b/cmd/erigon/main.go @@ -8,7 +8,7 @@ import ( "reflect" "strings" - "github.com/ledgerwatch/erigon-lib/common/dbg" + "github.com/ledgerwatch/erigon/erigon-lib/common/dbg" "github.com/ledgerwatch/erigon/metrics" "github.com/ledgerwatch/log/v3" "github.com/pelletier/go-toml" diff --git a/cmd/evm/internal/t8ntool/execution.go b/cmd/evm/internal/t8ntool/execution.go index 0b390e0c39c..7484970cc48 100644 --- a/cmd/evm/internal/t8ntool/execution.go +++ b/cmd/evm/internal/t8ntool/execution.go @@ -21,9 +21,9 @@ import ( "math/big" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/erigon/common" "github.com/ledgerwatch/erigon/common/math" diff --git a/cmd/evm/internal/t8ntool/gen_stenv.go b/cmd/evm/internal/t8ntool/gen_stenv.go index 7f08b6a3735..2306241a336 100644 --- a/cmd/evm/internal/t8ntool/gen_stenv.go +++ b/cmd/evm/internal/t8ntool/gen_stenv.go @@ -7,7 +7,7 @@ import ( "errors" "math/big" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/common" "github.com/ledgerwatch/erigon/common/math" diff --git a/cmd/evm/internal/t8ntool/transition.go b/cmd/evm/internal/t8ntool/transition.go index 2cc5b531203..a73a207ad45 100644 --- a/cmd/evm/internal/t8ntool/transition.go +++ b/cmd/evm/internal/t8ntool/transition.go @@ -28,17 +28,11 @@ import ( "path/filepath" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/common/datadir" "github.com/ledgerwatch/erigon/core/state/temporal" + "github.com/ledgerwatch/erigon/erigon-lib/common/datadir" "github.com/ledgerwatch/log/v3" "github.com/urfave/cli/v2" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/kvcfg" "github.com/ledgerwatch/erigon/common" "github.com/ledgerwatch/erigon/common/math" "github.com/ledgerwatch/erigon/consensus/ethash" @@ -48,6 +42,12 @@ import ( "github.com/ledgerwatch/erigon/core/types" "github.com/ledgerwatch/erigon/core/vm" "github.com/ledgerwatch/erigon/crypto" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/kvcfg" trace_logger "github.com/ledgerwatch/erigon/eth/tracers/logger" "github.com/ledgerwatch/erigon/rlp" "github.com/ledgerwatch/erigon/tests" diff --git a/cmd/evm/runner.go b/cmd/evm/runner.go index 547dd534d8a..8fc9979a477 100644 --- a/cmd/evm/runner.go +++ b/cmd/evm/runner.go @@ -30,14 +30,14 @@ import ( "time" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - common2 "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/kv/kvcfg" - "github.com/ledgerwatch/erigon-lib/kv/memdb" "github.com/ledgerwatch/erigon/cmd/utils/flags" "github.com/ledgerwatch/erigon/core/types" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + common2 "github.com/ledgerwatch/erigon/erigon-lib/common/dbg" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/kv/kvcfg" + "github.com/ledgerwatch/erigon/erigon-lib/kv/memdb" "github.com/ledgerwatch/log/v3" "github.com/urfave/cli/v2" diff --git a/cmd/evm/staterunner.go b/cmd/evm/staterunner.go index db787e76da7..a71d89d83b0 100644 --- a/cmd/evm/staterunner.go +++ b/cmd/evm/staterunner.go @@ -26,8 +26,8 @@ import ( "github.com/c2h5oh/datasize" mdbx2 "github.com/erigontech/mdbx-go/mdbx" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv/mdbx" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv/mdbx" "github.com/ledgerwatch/log/v3" "github.com/urfave/cli/v2" diff --git a/cmd/hack/db/lmdb.go b/cmd/hack/db/lmdb.go index 288bcf10208..612d4d9dc5a 100644 --- a/cmd/hack/db/lmdb.go +++ b/cmd/hack/db/lmdb.go @@ -13,9 +13,9 @@ import ( "path/filepath" "strings" - "github.com/ledgerwatch/erigon-lib/kv" - kv2 "github.com/ledgerwatch/erigon-lib/kv/mdbx" "github.com/ledgerwatch/erigon/common/debug" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + kv2 "github.com/ledgerwatch/erigon/erigon-lib/kv/mdbx" "github.com/ledgerwatch/log/v3" ) diff --git a/cmd/hack/flow/flow.go b/cmd/hack/flow/flow.go index e36b3fb27cf..c50a150c273 100644 --- a/cmd/hack/flow/flow.go +++ b/cmd/hack/flow/flow.go @@ -14,7 +14,7 @@ import ( "strings" "time" - "github.com/ledgerwatch/erigon-lib/common/dbg" + "github.com/ledgerwatch/erigon/erigon-lib/common/dbg" "github.com/ledgerwatch/erigon/cmd/hack/tool" "github.com/ledgerwatch/erigon/common/debug" diff --git a/cmd/hack/hack.go b/cmd/hack/hack.go index 25d8e1209a6..cccb52be866 100644 --- a/cmd/hack/hack.go +++ b/cmd/hack/hack.go @@ -23,16 +23,16 @@ import ( "github.com/ledgerwatch/log/v3" "golang.org/x/exp/slices" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/compress" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/kvcfg" - "github.com/ledgerwatch/erigon-lib/kv/mdbx" - "github.com/ledgerwatch/erigon-lib/kv/temporal/historyv2" - "github.com/ledgerwatch/erigon-lib/recsplit" - "github.com/ledgerwatch/erigon-lib/recsplit/eliasfano32" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" + "github.com/ledgerwatch/erigon/erigon-lib/compress" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/kvcfg" + "github.com/ledgerwatch/erigon/erigon-lib/kv/mdbx" + "github.com/ledgerwatch/erigon/erigon-lib/kv/temporal/historyv2" + "github.com/ledgerwatch/erigon/erigon-lib/recsplit" + "github.com/ledgerwatch/erigon/erigon-lib/recsplit/eliasfano32" hackdb "github.com/ledgerwatch/erigon/cmd/hack/db" "github.com/ledgerwatch/erigon/cmd/hack/flow" diff --git a/cmd/hack/tool/fromdb/tool.go b/cmd/hack/tool/fromdb/tool.go index 32ae74e9652..e293d34fe2c 100644 --- a/cmd/hack/tool/fromdb/tool.go +++ b/cmd/hack/tool/fromdb/tool.go @@ -3,10 +3,10 @@ package fromdb import ( "context" - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/kvcfg" "github.com/ledgerwatch/erigon/cmd/hack/tool" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/kvcfg" "github.com/ledgerwatch/erigon/ethdb/prune" ) diff --git a/cmd/hack/tool/tool.go b/cmd/hack/tool/tool.go index dfd2f4d8709..3f48f7bed1c 100644 --- a/cmd/hack/tool/tool.go +++ b/cmd/hack/tool/tool.go @@ -3,9 +3,9 @@ package tool import ( "strconv" - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/kv" "github.com/ledgerwatch/erigon/core/rawdb" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + "github.com/ledgerwatch/erigon/erigon-lib/kv" ) func Check(e error) { diff --git a/cmd/integration/commands/refetence_db.go b/cmd/integration/commands/refetence_db.go index d07ee259024..fd210108494 100644 --- a/cmd/integration/commands/refetence_db.go +++ b/cmd/integration/commands/refetence_db.go @@ -11,10 +11,10 @@ import ( "sync/atomic" "time" - common2 "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - mdbx2 "github.com/ledgerwatch/erigon-lib/kv/mdbx" "github.com/ledgerwatch/erigon/common" + common2 "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + mdbx2 "github.com/ledgerwatch/erigon/erigon-lib/kv/mdbx" "github.com/ledgerwatch/erigon/turbo/backup" "github.com/ledgerwatch/erigon/turbo/debug" "github.com/ledgerwatch/log/v3" diff --git a/cmd/integration/commands/reset_state.go b/cmd/integration/commands/reset_state.go index 665525f92a8..399697fabd0 100644 --- a/cmd/integration/commands/reset_state.go +++ b/cmd/integration/commands/reset_state.go @@ -10,11 +10,11 @@ import ( "github.com/ledgerwatch/erigon/turbo/backup" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/kvcfg" - "github.com/ledgerwatch/erigon-lib/kv/rawdbv3" - "github.com/ledgerwatch/erigon-lib/state" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/kvcfg" + "github.com/ledgerwatch/erigon/erigon-lib/kv/rawdbv3" + "github.com/ledgerwatch/erigon/erigon-lib/state" "github.com/ledgerwatch/erigon/turbo/snapshotsync/freezeblocks" "github.com/spf13/cobra" diff --git a/cmd/integration/commands/root.go b/cmd/integration/commands/root.go index 08bfb2b9fbf..54eb244672e 100644 --- a/cmd/integration/commands/root.go +++ b/cmd/integration/commands/root.go @@ -13,9 +13,9 @@ import ( "github.com/spf13/cobra" "golang.org/x/sync/semaphore" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/kvcfg" - kv2 "github.com/ledgerwatch/erigon-lib/kv/mdbx" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/kvcfg" + kv2 "github.com/ledgerwatch/erigon/erigon-lib/kv/mdbx" "github.com/ledgerwatch/erigon/cmd/utils" "github.com/ledgerwatch/erigon/core/state/temporal" diff --git a/cmd/integration/commands/stages.go b/cmd/integration/commands/stages.go index ed656b3867d..0a466a99fcf 100644 --- a/cmd/integration/commands/stages.go +++ b/cmd/integration/commands/stages.go @@ -22,16 +22,6 @@ import ( "github.com/spf13/cobra" "golang.org/x/exp/slices" - chain2 "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/commitment" - common2 "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/cmp" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/common/dir" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/kvcfg" - "github.com/ledgerwatch/erigon-lib/kv/rawdbv3" - libstate "github.com/ledgerwatch/erigon-lib/state" "github.com/ledgerwatch/erigon/cmd/hack/tool/fromdb" "github.com/ledgerwatch/erigon/cmd/sentry/sentry" "github.com/ledgerwatch/erigon/consensus" @@ -40,6 +30,16 @@ import ( reset2 "github.com/ledgerwatch/erigon/core/rawdb/rawdbreset" "github.com/ledgerwatch/erigon/core/types" "github.com/ledgerwatch/erigon/core/vm" + chain2 "github.com/ledgerwatch/erigon/erigon-lib/chain" + "github.com/ledgerwatch/erigon/erigon-lib/commitment" + common2 "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/cmp" + "github.com/ledgerwatch/erigon/erigon-lib/common/datadir" + "github.com/ledgerwatch/erigon/erigon-lib/common/dir" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/kvcfg" + "github.com/ledgerwatch/erigon/erigon-lib/kv/rawdbv3" + libstate "github.com/ledgerwatch/erigon/erigon-lib/state" "github.com/ledgerwatch/erigon/eth/ethconfig" "github.com/ledgerwatch/erigon/eth/ethconsensusconfig" "github.com/ledgerwatch/erigon/eth/integrity" diff --git a/cmd/integration/commands/state_domains.go b/cmd/integration/commands/state_domains.go index 3f9d1041236..a2d9a320e1c 100644 --- a/cmd/integration/commands/state_domains.go +++ b/cmd/integration/commands/state_domains.go @@ -17,16 +17,16 @@ import ( "github.com/ledgerwatch/log/v3" "github.com/spf13/cobra" - chain2 "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/commitment" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/common/fixedgas" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/kv" - kv2 "github.com/ledgerwatch/erigon-lib/kv/mdbx" - libstate "github.com/ledgerwatch/erigon-lib/state" + chain2 "github.com/ledgerwatch/erigon/erigon-lib/chain" + "github.com/ledgerwatch/erigon/erigon-lib/commitment" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/datadir" + "github.com/ledgerwatch/erigon/erigon-lib/common/dbg" + "github.com/ledgerwatch/erigon/erigon-lib/common/fixedgas" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + kv2 "github.com/ledgerwatch/erigon/erigon-lib/kv/mdbx" + libstate "github.com/ledgerwatch/erigon/erigon-lib/state" "github.com/ledgerwatch/erigon/cmd/hack/tool/fromdb" "github.com/ledgerwatch/erigon/cmd/state/exec3" diff --git a/cmd/integration/commands/state_stages.go b/cmd/integration/commands/state_stages.go index b9d761f8022..26eb9c3a014 100644 --- a/cmd/integration/commands/state_stages.go +++ b/cmd/integration/commands/state_stages.go @@ -11,14 +11,14 @@ import ( "time" "github.com/c2h5oh/datasize" - chain2 "github.com/ledgerwatch/erigon-lib/chain" - common2 "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/bitmapdb" - "github.com/ledgerwatch/erigon-lib/kv/kvcfg" - "github.com/ledgerwatch/erigon-lib/kv/temporal/historyv2" + chain2 "github.com/ledgerwatch/erigon/erigon-lib/chain" + common2 "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/datadir" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/bitmapdb" + "github.com/ledgerwatch/erigon/erigon-lib/kv/kvcfg" + "github.com/ledgerwatch/erigon/erigon-lib/kv/temporal/historyv2" "github.com/ledgerwatch/log/v3" "github.com/spf13/cobra" diff --git a/cmd/integration/main.go b/cmd/integration/main.go index e4c0c3e2684..405b9b17c73 100644 --- a/cmd/integration/main.go +++ b/cmd/integration/main.go @@ -4,8 +4,8 @@ import ( "fmt" "os" - "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/cmd/integration/commands" + "github.com/ledgerwatch/erigon/erigon-lib/common" ) func main() { diff --git a/cmd/observer/database/db_sqlite.go b/cmd/observer/database/db_sqlite.go index d8065f992ed..ffd05ade88c 100644 --- a/cmd/observer/database/db_sqlite.go +++ b/cmd/observer/database/db_sqlite.go @@ -5,11 +5,12 @@ import ( "database/sql" "errors" "fmt" - "github.com/ledgerwatch/erigon-lib/common" "net" "strings" "time" + "github.com/ledgerwatch/erigon/erigon-lib/common" + _ "modernc.org/sqlite" ) diff --git a/cmd/observer/main.go b/cmd/observer/main.go index 12f613e1306..eb8ec06fd8b 100644 --- a/cmd/observer/main.go +++ b/cmd/observer/main.go @@ -6,11 +6,11 @@ import ( "fmt" "path/filepath" - "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/cmd/observer/database" "github.com/ledgerwatch/erigon/cmd/observer/observer" "github.com/ledgerwatch/erigon/cmd/observer/reports" "github.com/ledgerwatch/erigon/cmd/utils" + "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/params" "github.com/ledgerwatch/log/v3" ) diff --git a/cmd/observer/observer/handshake.go b/cmd/observer/observer/handshake.go index c975e5086c0..75c7b76ef82 100644 --- a/cmd/observer/observer/handshake.go +++ b/cmd/observer/observer/handshake.go @@ -9,8 +9,8 @@ import ( "net" "time" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/direct" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/direct" "github.com/ledgerwatch/erigon/common" "github.com/ledgerwatch/erigon/core/forkid" diff --git a/cmd/observer/observer/handshake_test.go b/cmd/observer/observer/handshake_test.go index f2b64c1c17e..25d2adcd993 100644 --- a/cmd/observer/observer/handshake_test.go +++ b/cmd/observer/observer/handshake_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/direct" + "github.com/ledgerwatch/erigon/erigon-lib/direct" "github.com/ledgerwatch/erigon/crypto" "github.com/ledgerwatch/erigon/p2p/enode" diff --git a/cmd/p2psim/main.go b/cmd/p2psim/main.go index 3f567847bbd..5fc281e0c99 100644 --- a/cmd/p2psim/main.go +++ b/cmd/p2psim/main.go @@ -39,12 +39,13 @@ import ( "context" "encoding/json" "fmt" - "github.com/ledgerwatch/erigon-lib/common" "io" "os" "strings" "text/tabwriter" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/turbo/logging" "github.com/urfave/cli/v2" diff --git a/cmd/pics/contracts/gen_token.go b/cmd/pics/contracts/gen_token.go index 3973e6d0e62..ffc21803071 100644 --- a/cmd/pics/contracts/gen_token.go +++ b/cmd/pics/contracts/gen_token.go @@ -7,7 +7,7 @@ import ( "math/big" "strings" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" ethereum "github.com/ledgerwatch/erigon" "github.com/ledgerwatch/erigon/accounts/abi" diff --git a/cmd/pics/pics.go b/cmd/pics/pics.go index 356ca5d8a08..3f27fe5e739 100644 --- a/cmd/pics/pics.go +++ b/cmd/pics/pics.go @@ -7,7 +7,7 @@ import ( "os/exec" "sort" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/crypto" "github.com/ledgerwatch/erigon/turbo/trie" diff --git a/cmd/pics/state.go b/cmd/pics/state.go index 7c999e4f878..52d93247d68 100644 --- a/cmd/pics/state.go +++ b/cmd/pics/state.go @@ -12,9 +12,9 @@ import ( "strings" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/memdb" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/memdb" "github.com/ledgerwatch/log/v3" "github.com/ledgerwatch/erigon/accounts/abi/bind" diff --git a/cmd/rpcdaemon/cli/config.go b/cmd/rpcdaemon/cli/config.go index 74beef59da9..9f0acbd2817 100644 --- a/cmd/rpcdaemon/cli/config.go +++ b/cmd/rpcdaemon/cli/config.go @@ -12,15 +12,15 @@ import ( "strings" "time" - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/common/dir" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/kv/kvcfg" - "github.com/ledgerwatch/erigon-lib/kv/rawdbv3" - libstate "github.com/ledgerwatch/erigon-lib/state" "github.com/ledgerwatch/erigon/core/state/temporal" "github.com/ledgerwatch/erigon/core/systemcontracts" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + "github.com/ledgerwatch/erigon/erigon-lib/common/datadir" + "github.com/ledgerwatch/erigon/erigon-lib/common/dir" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/kv/kvcfg" + "github.com/ledgerwatch/erigon/erigon-lib/kv/rawdbv3" + libstate "github.com/ledgerwatch/erigon/erigon-lib/state" "github.com/ledgerwatch/erigon/eth/ethconfig" "github.com/ledgerwatch/erigon/rpc/rpccfg" "github.com/ledgerwatch/erigon/turbo/debug" @@ -28,16 +28,16 @@ import ( "github.com/ledgerwatch/erigon/turbo/snapshotsync/freezeblocks" "github.com/ledgerwatch/erigon/turbo/snapshotsync/snap" - "github.com/ledgerwatch/erigon-lib/direct" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - "github.com/ledgerwatch/erigon-lib/gointerfaces/grpcutil" - "github.com/ledgerwatch/erigon-lib/gointerfaces/remote" - "github.com/ledgerwatch/erigon-lib/gointerfaces/txpool" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/kvcache" - kv2 "github.com/ledgerwatch/erigon-lib/kv/mdbx" - "github.com/ledgerwatch/erigon-lib/kv/remotedb" - "github.com/ledgerwatch/erigon-lib/kv/remotedbserver" + "github.com/ledgerwatch/erigon/erigon-lib/direct" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/grpcutil" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/remote" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/txpool" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/kvcache" + kv2 "github.com/ledgerwatch/erigon/erigon-lib/kv/mdbx" + "github.com/ledgerwatch/erigon/erigon-lib/kv/remotedb" + "github.com/ledgerwatch/erigon/erigon-lib/kv/remotedbserver" "github.com/ledgerwatch/log/v3" "github.com/spf13/cobra" "golang.org/x/sync/semaphore" diff --git a/cmd/rpcdaemon/cli/httpcfg/http_cfg.go b/cmd/rpcdaemon/cli/httpcfg/http_cfg.go index a41f562342b..b98f08597f3 100644 --- a/cmd/rpcdaemon/cli/httpcfg/http_cfg.go +++ b/cmd/rpcdaemon/cli/httpcfg/http_cfg.go @@ -3,8 +3,8 @@ package httpcfg import ( "time" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/kv/kvcache" + "github.com/ledgerwatch/erigon/erigon-lib/common/datadir" + "github.com/ledgerwatch/erigon/erigon-lib/kv/kvcache" "github.com/ledgerwatch/erigon/eth/ethconfig" "github.com/ledgerwatch/erigon/rpc/rpccfg" ) diff --git a/cmd/rpcdaemon/graphql/graph/helpers.go b/cmd/rpcdaemon/graphql/graph/helpers.go index 4bc6c7da4e6..66e64c61234 100644 --- a/cmd/rpcdaemon/graphql/graph/helpers.go +++ b/cmd/rpcdaemon/graphql/graph/helpers.go @@ -8,8 +8,8 @@ import ( "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" "github.com/ledgerwatch/erigon/common/hexutil" "github.com/ledgerwatch/erigon/core/types" diff --git a/cmd/rpcdaemon/graphql/graph/resolver.go b/cmd/rpcdaemon/graphql/graph/resolver.go index 400d9751ece..a5fe98d82f0 100644 --- a/cmd/rpcdaemon/graphql/graph/resolver.go +++ b/cmd/rpcdaemon/graphql/graph/resolver.go @@ -1,7 +1,7 @@ package graph import ( - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/erigon/turbo/jsonrpc" "github.com/ledgerwatch/erigon/turbo/rpchelper" "github.com/ledgerwatch/erigon/turbo/services" diff --git a/cmd/rpcdaemon/main.go b/cmd/rpcdaemon/main.go index 15dcc0df7db..768aac2289f 100644 --- a/cmd/rpcdaemon/main.go +++ b/cmd/rpcdaemon/main.go @@ -4,9 +4,9 @@ import ( "fmt" "os" - "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/cmd/rpcdaemon/cli" "github.com/ledgerwatch/erigon/consensus/ethash" + "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/rpc" "github.com/ledgerwatch/erigon/turbo/debug" "github.com/ledgerwatch/erigon/turbo/jsonrpc" diff --git a/cmd/rpcdaemon/rpcdaemontest/test_util.go b/cmd/rpcdaemon/rpcdaemontest/test_util.go index 8dfe4af3f94..5a72fd9ea96 100644 --- a/cmd/rpcdaemon/rpcdaemontest/test_util.go +++ b/cmd/rpcdaemon/rpcdaemontest/test_util.go @@ -14,11 +14,6 @@ import ( "google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/test/bufconn" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/gointerfaces/remote" - "github.com/ledgerwatch/erigon-lib/gointerfaces/txpool" - "github.com/ledgerwatch/erigon-lib/kv" "github.com/ledgerwatch/erigon/accounts/abi/bind" "github.com/ledgerwatch/erigon/accounts/abi/bind/backends" "github.com/ledgerwatch/erigon/common/u256" @@ -28,6 +23,11 @@ import ( "github.com/ledgerwatch/erigon/core/types" "github.com/ledgerwatch/erigon/core/vm" "github.com/ledgerwatch/erigon/crypto" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/remote" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/txpool" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/erigon/ethdb/privateapi" "github.com/ledgerwatch/erigon/params" "github.com/ledgerwatch/erigon/turbo/builder" diff --git a/cmd/rpcdaemon/rpcservices/eth_backend.go b/cmd/rpcdaemon/rpcservices/eth_backend.go index 44f1d91e61d..1cda9c29e16 100644 --- a/cmd/rpcdaemon/rpcservices/eth_backend.go +++ b/cmd/rpcdaemon/rpcservices/eth_backend.go @@ -9,10 +9,10 @@ import ( "io" "sync/atomic" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - "github.com/ledgerwatch/erigon-lib/gointerfaces/remote" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/remote" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/erigon/eth/ethconfig" "github.com/ledgerwatch/log/v3" "google.golang.org/grpc" diff --git a/cmd/rpcdaemon/rpcservices/eth_mining.go b/cmd/rpcdaemon/rpcservices/eth_mining.go index 889b24d62e3..76ba1177182 100644 --- a/cmd/rpcdaemon/rpcservices/eth_mining.go +++ b/cmd/rpcdaemon/rpcservices/eth_mining.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - "github.com/ledgerwatch/erigon-lib/gointerfaces/txpool" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/txpool" "github.com/ledgerwatch/erigon/ethdb/privateapi" "github.com/ledgerwatch/log/v3" "google.golang.org/grpc" diff --git a/cmd/rpcdaemon/rpcservices/eth_txpool.go b/cmd/rpcdaemon/rpcservices/eth_txpool.go index 670a77b538b..8d0b4674d7b 100644 --- a/cmd/rpcdaemon/rpcservices/eth_txpool.go +++ b/cmd/rpcdaemon/rpcservices/eth_txpool.go @@ -5,10 +5,10 @@ import ( "fmt" "time" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - "github.com/ledgerwatch/erigon-lib/gointerfaces/grpcutil" - txpooproto "github.com/ledgerwatch/erigon-lib/gointerfaces/txpool" - txpool2 "github.com/ledgerwatch/erigon-lib/txpool" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/grpcutil" + txpooproto "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/txpool" + txpool2 "github.com/ledgerwatch/erigon/erigon-lib/txpool" "github.com/ledgerwatch/log/v3" "google.golang.org/grpc" "google.golang.org/protobuf/types/known/emptypb" diff --git a/cmd/rpctest/rpctest/account_range_verify.go b/cmd/rpctest/rpctest/account_range_verify.go index dcb89c619ae..b0d7bd93a9b 100644 --- a/cmd/rpctest/rpctest/account_range_verify.go +++ b/cmd/rpctest/rpctest/account_range_verify.go @@ -11,9 +11,9 @@ import ( "time" "github.com/davecgh/go-spew/spew" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/mdbx" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/mdbx" "github.com/ledgerwatch/log/v3" "github.com/ledgerwatch/erigon/common" diff --git a/cmd/rpctest/rpctest/bench1.go b/cmd/rpctest/rpctest/bench1.go index 400e64c19de..9de74bea6ec 100644 --- a/cmd/rpctest/rpctest/bench1.go +++ b/cmd/rpctest/rpctest/bench1.go @@ -9,7 +9,7 @@ import ( "path/filepath" "time" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/core/state" ) diff --git a/cmd/rpctest/rpctest/bench2.go b/cmd/rpctest/rpctest/bench2.go index 74165c14220..e867e25c722 100644 --- a/cmd/rpctest/rpctest/bench2.go +++ b/cmd/rpctest/rpctest/bench2.go @@ -5,7 +5,7 @@ import ( "net/http" "time" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/crypto" ) diff --git a/cmd/rpctest/rpctest/bench3.go b/cmd/rpctest/rpctest/bench3.go index 317700750a5..beade11d2f3 100644 --- a/cmd/rpctest/rpctest/bench3.go +++ b/cmd/rpctest/rpctest/bench3.go @@ -6,7 +6,7 @@ import ( "net/http" "time" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/core/state" ) diff --git a/cmd/rpctest/rpctest/bench4.go b/cmd/rpctest/rpctest/bench4.go index 1d403049185..2695c8e61be 100644 --- a/cmd/rpctest/rpctest/bench4.go +++ b/cmd/rpctest/rpctest/bench4.go @@ -5,7 +5,7 @@ import ( "net/http" "time" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" ) func Bench4(erigon_url string) { diff --git a/cmd/rpctest/rpctest/bench6.go b/cmd/rpctest/rpctest/bench6.go index 825c8b5ebbc..4a2ad20490b 100644 --- a/cmd/rpctest/rpctest/bench6.go +++ b/cmd/rpctest/rpctest/bench6.go @@ -5,7 +5,7 @@ import ( "net/http" "time" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" ) func Bench6(erigon_url string) { diff --git a/cmd/rpctest/rpctest/bench7.go b/cmd/rpctest/rpctest/bench7.go index 29c5e49a7e8..c55e86426d5 100644 --- a/cmd/rpctest/rpctest/bench7.go +++ b/cmd/rpctest/rpctest/bench7.go @@ -5,7 +5,7 @@ import ( "net/http" "time" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" ) func Bench7(erigonURL, gethURL string) { diff --git a/cmd/rpctest/rpctest/bench9.go b/cmd/rpctest/rpctest/bench9.go index 7b2a4266ee4..14e9f39ae10 100644 --- a/cmd/rpctest/rpctest/bench9.go +++ b/cmd/rpctest/rpctest/bench9.go @@ -5,7 +5,7 @@ import ( "net/http" "time" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/core/state" ) diff --git a/cmd/rpctest/rpctest/bench_tracecallmany.go b/cmd/rpctest/rpctest/bench_tracecallmany.go index a3599af7c0c..7fcfca6c694 100644 --- a/cmd/rpctest/rpctest/bench_tracecallmany.go +++ b/cmd/rpctest/rpctest/bench_tracecallmany.go @@ -7,8 +7,8 @@ import ( "os" "time" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" "github.com/ledgerwatch/erigon/common/hexutil" ) diff --git a/cmd/rpctest/rpctest/bench_tracefilter.go b/cmd/rpctest/rpctest/bench_tracefilter.go index 9d907c2c559..fdfb0d4ec85 100644 --- a/cmd/rpctest/rpctest/bench_tracefilter.go +++ b/cmd/rpctest/rpctest/bench_tracefilter.go @@ -8,7 +8,7 @@ import ( "os" "time" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" ) // Compares response of Erigon with OpenEthereum diff --git a/cmd/rpctest/rpctest/request_generator.go b/cmd/rpctest/rpctest/request_generator.go index b5936b8980a..2f1d419b4e3 100644 --- a/cmd/rpctest/rpctest/request_generator.go +++ b/cmd/rpctest/rpctest/request_generator.go @@ -9,8 +9,8 @@ import ( "github.com/valyala/fastjson" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" "github.com/ledgerwatch/erigon/common/hexutil" ) diff --git a/cmd/rpctest/rpctest/request_generator_test.go b/cmd/rpctest/rpctest/request_generator_test.go index 2dfecf6cba1..b83c35a5b6f 100644 --- a/cmd/rpctest/rpctest/request_generator_test.go +++ b/cmd/rpctest/rpctest/request_generator_test.go @@ -3,7 +3,7 @@ package rpctest import ( "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/stretchr/testify/require" ) diff --git a/cmd/rpctest/rpctest/type.go b/cmd/rpctest/rpctest/type.go index bfdcbcc5050..255afc0208d 100644 --- a/cmd/rpctest/rpctest/type.go +++ b/cmd/rpctest/rpctest/type.go @@ -3,8 +3,8 @@ package rpctest import ( "fmt" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" "github.com/ledgerwatch/erigon/common/hexutil" "github.com/ledgerwatch/erigon/core/state" diff --git a/cmd/rpctest/rpctest/utils.go b/cmd/rpctest/rpctest/utils.go index 95d21dbb8a7..75c36089f14 100644 --- a/cmd/rpctest/rpctest/utils.go +++ b/cmd/rpctest/rpctest/utils.go @@ -11,7 +11,7 @@ import ( "strings" "time" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/log/v3" "github.com/valyala/fastjson" diff --git a/cmd/sentinel/cli/cliSettings.go b/cmd/sentinel/cli/cliSettings.go index a587cb5aa4f..3b062bfe71f 100644 --- a/cmd/sentinel/cli/cliSettings.go +++ b/cmd/sentinel/cli/cliSettings.go @@ -3,15 +3,16 @@ package cli import ( "errors" "fmt" - common2 "github.com/ledgerwatch/erigon-lib/common" "os" "strings" "time" - "github.com/ledgerwatch/erigon-lib/common/datadir" + common2 "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/cl/phase1/core/rawdb" "github.com/ledgerwatch/erigon/cl/phase1/core/state" "github.com/ledgerwatch/erigon/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/datadir" "github.com/ledgerwatch/erigon/cmd/utils" "github.com/urfave/cli/v2" diff --git a/cmd/sentinel/sentinel/communication/ssz_snappy/encoding.go b/cmd/sentinel/sentinel/communication/ssz_snappy/encoding.go index 6f460b3599d..18eaa82a64b 100644 --- a/cmd/sentinel/sentinel/communication/ssz_snappy/encoding.go +++ b/cmd/sentinel/sentinel/communication/ssz_snappy/encoding.go @@ -23,10 +23,10 @@ import ( "github.com/c2h5oh/datasize" "github.com/golang/snappy" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/types/ssz" "github.com/ledgerwatch/erigon/cl/clparams" "github.com/ledgerwatch/erigon/cl/fork" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/types/ssz" ) var writerPool = sync.Pool{ diff --git a/cmd/sentinel/sentinel/service/notifiers.go b/cmd/sentinel/sentinel/service/notifiers.go index 8af9b991a73..3a3d746e7f9 100644 --- a/cmd/sentinel/sentinel/service/notifiers.go +++ b/cmd/sentinel/sentinel/service/notifiers.go @@ -4,7 +4,7 @@ import ( "fmt" "sync" - "github.com/ledgerwatch/erigon-lib/gointerfaces/sentinel" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/sentinel" ) const ( diff --git a/cmd/sentinel/sentinel/service/service.go b/cmd/sentinel/sentinel/service/service.go index c230a5469d3..1100cca730e 100644 --- a/cmd/sentinel/sentinel/service/service.go +++ b/cmd/sentinel/sentinel/service/service.go @@ -9,13 +9,13 @@ import ( "sync" "time" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - sentinelrpc "github.com/ledgerwatch/erigon-lib/gointerfaces/sentinel" "github.com/ledgerwatch/erigon/cl/cltypes" "github.com/ledgerwatch/erigon/cl/utils" "github.com/ledgerwatch/erigon/cmd/sentinel/sentinel" "github.com/ledgerwatch/erigon/cmd/sentinel/sentinel/communication" "github.com/ledgerwatch/erigon/cmd/sentinel/sentinel/peers" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces" + sentinelrpc "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/sentinel" "github.com/ledgerwatch/log/v3" pubsub "github.com/libp2p/go-libp2p-pubsub" "github.com/libp2p/go-libp2p/core/peer" diff --git a/cmd/sentinel/sentinel/service/start.go b/cmd/sentinel/sentinel/service/start.go index f6e7b77ffd3..ff10bb02fda 100644 --- a/cmd/sentinel/sentinel/service/start.go +++ b/cmd/sentinel/sentinel/service/start.go @@ -4,11 +4,11 @@ import ( "context" "net" - "github.com/ledgerwatch/erigon-lib/direct" - sentinelrpc "github.com/ledgerwatch/erigon-lib/gointerfaces/sentinel" "github.com/ledgerwatch/erigon/cl/cltypes" "github.com/ledgerwatch/erigon/cl/persistence" "github.com/ledgerwatch/erigon/cmd/sentinel/sentinel" + "github.com/ledgerwatch/erigon/erigon-lib/direct" + sentinelrpc "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/sentinel" "github.com/ledgerwatch/log/v3" "google.golang.org/grpc" "google.golang.org/grpc/credentials" diff --git a/cmd/sentry/main.go b/cmd/sentry/main.go index 146ee737baf..e8d6d7ef46d 100644 --- a/cmd/sentry/main.go +++ b/cmd/sentry/main.go @@ -4,8 +4,8 @@ import ( "fmt" "os" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/datadir" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/datadir" "github.com/spf13/cobra" "github.com/ledgerwatch/erigon/cmd/sentry/sentry" diff --git a/cmd/sentry/sentry/broadcast.go b/cmd/sentry/sentry/broadcast.go index d81c941f780..0dee5642a84 100644 --- a/cmd/sentry/sentry/broadcast.go +++ b/cmd/sentry/sentry/broadcast.go @@ -7,7 +7,7 @@ import ( "strings" "syscall" - proto_sentry "github.com/ledgerwatch/erigon-lib/gointerfaces/sentry" + proto_sentry "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/sentry" "github.com/ledgerwatch/log/v3" "google.golang.org/grpc" diff --git a/cmd/sentry/sentry/eth_handshake.go b/cmd/sentry/sentry/eth_handshake.go index 768f57cd1a8..8436102d205 100644 --- a/cmd/sentry/sentry/eth_handshake.go +++ b/cmd/sentry/sentry/eth_handshake.go @@ -3,9 +3,9 @@ package sentry import ( "fmt" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - proto_sentry "github.com/ledgerwatch/erigon-lib/gointerfaces/sentry" "github.com/ledgerwatch/erigon/core/forkid" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces" + proto_sentry "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/sentry" "github.com/ledgerwatch/erigon/eth/protocols/eth" "github.com/ledgerwatch/erigon/p2p" ) diff --git a/cmd/sentry/sentry/eth_handshake_test.go b/cmd/sentry/sentry/eth_handshake_test.go index 57eed30b339..3c1ef3654ad 100644 --- a/cmd/sentry/sentry/eth_handshake_test.go +++ b/cmd/sentry/sentry/eth_handshake_test.go @@ -7,10 +7,10 @@ import ( "github.com/holiman/uint256" "github.com/stretchr/testify/assert" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/direct" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - proto_sentry "github.com/ledgerwatch/erigon-lib/gointerfaces/sentry" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/direct" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces" + proto_sentry "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/sentry" "github.com/ledgerwatch/erigon/core/forkid" "github.com/ledgerwatch/erigon/eth/protocols/eth" diff --git a/cmd/sentry/sentry/sentry_api.go b/cmd/sentry/sentry/sentry_api.go index f850e677eb7..89d779c35e7 100644 --- a/cmd/sentry/sentry/sentry_api.go +++ b/cmd/sentry/sentry/sentry_api.go @@ -5,9 +5,9 @@ import ( "math/rand" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - proto_sentry "github.com/ledgerwatch/erigon-lib/gointerfaces/sentry" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces" + proto_sentry "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/sentry" "google.golang.org/grpc" "github.com/ledgerwatch/erigon/eth/protocols/eth" diff --git a/cmd/sentry/sentry/sentry_grpc_server.go b/cmd/sentry/sentry/sentry_grpc_server.go index 3d55727c2ca..c5a8b82198f 100644 --- a/cmd/sentry/sentry/sentry_grpc_server.go +++ b/cmd/sentry/sentry/sentry_grpc_server.go @@ -24,14 +24,14 @@ import ( "google.golang.org/grpc/health/grpc_health_v1" "google.golang.org/protobuf/types/known/emptypb" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/common/dir" - "github.com/ledgerwatch/erigon-lib/direct" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - "github.com/ledgerwatch/erigon-lib/gointerfaces/grpcutil" - proto_sentry "github.com/ledgerwatch/erigon-lib/gointerfaces/sentry" - proto_types "github.com/ledgerwatch/erigon-lib/gointerfaces/types" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/datadir" + "github.com/ledgerwatch/erigon/erigon-lib/common/dir" + "github.com/ledgerwatch/erigon/erigon-lib/direct" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/grpcutil" + proto_sentry "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/sentry" + proto_types "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/types" "github.com/ledgerwatch/erigon/cmd/utils" "github.com/ledgerwatch/erigon/common/debug" diff --git a/cmd/sentry/sentry/sentry_grpc_server_test.go b/cmd/sentry/sentry/sentry_grpc_server_test.go index 93b0c4b8e8d..8ed3b7204ee 100644 --- a/cmd/sentry/sentry/sentry_grpc_server_test.go +++ b/cmd/sentry/sentry/sentry_grpc_server_test.go @@ -7,20 +7,20 @@ import ( "time" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/direct" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - proto_sentry "github.com/ledgerwatch/erigon-lib/gointerfaces/sentry" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + "github.com/ledgerwatch/erigon/erigon-lib/common/datadir" + "github.com/ledgerwatch/erigon/erigon-lib/direct" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces" + proto_sentry "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/sentry" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/stretchr/testify/require" - libcommon "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/core" "github.com/ledgerwatch/erigon/core/forkid" "github.com/ledgerwatch/erigon/core/rawdb" "github.com/ledgerwatch/erigon/core/state/temporal" "github.com/ledgerwatch/erigon/core/types" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/p2p" ) diff --git a/cmd/sentry/sentry/sentry_multi_client.go b/cmd/sentry/sentry/sentry_multi_client.go index 164ae1c94b6..f66e3bf8285 100644 --- a/cmd/sentry/sentry/sentry_multi_client.go +++ b/cmd/sentry/sentry/sentry_multi_client.go @@ -20,16 +20,16 @@ import ( "google.golang.org/grpc/keepalive" "google.golang.org/protobuf/types/known/emptypb" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/direct" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - "github.com/ledgerwatch/erigon-lib/gointerfaces/grpcutil" - proto_sentry "github.com/ledgerwatch/erigon-lib/gointerfaces/sentry" - proto_types "github.com/ledgerwatch/erigon-lib/gointerfaces/types" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/kvcfg" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/dbg" + "github.com/ledgerwatch/erigon/erigon-lib/direct" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/grpcutil" + proto_sentry "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/sentry" + proto_types "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/types" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/kvcfg" "github.com/ledgerwatch/erigon/consensus" "github.com/ledgerwatch/erigon/core/forkid" diff --git a/cmd/silkworm_api/snapshot_idx.go b/cmd/silkworm_api/snapshot_idx.go index f4c8c0b1576..1149d2d2f78 100644 --- a/cmd/silkworm_api/snapshot_idx.go +++ b/cmd/silkworm_api/snapshot_idx.go @@ -2,19 +2,20 @@ package main import ( "fmt" - "github.com/ledgerwatch/erigon-lib/common/background" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/downloader/snaptype" - "github.com/ledgerwatch/erigon-lib/kv/mdbx" + "os" + "path/filepath" + "time" + "github.com/ledgerwatch/erigon/cmd/hack/tool/fromdb" + "github.com/ledgerwatch/erigon/erigon-lib/common/background" + "github.com/ledgerwatch/erigon/erigon-lib/common/datadir" + "github.com/ledgerwatch/erigon/erigon-lib/downloader/snaptype" + "github.com/ledgerwatch/erigon/erigon-lib/kv/mdbx" "github.com/ledgerwatch/erigon/turbo/debug" "github.com/ledgerwatch/erigon/turbo/snapshotsync/freezeblocks" "github.com/ledgerwatch/log/v3" "github.com/urfave/cli/v2" "golang.org/x/sync/errgroup" - "os" - "path/filepath" - "time" ) // Build snapshot indexes for given snapshot files. diff --git a/cmd/state/commands/check_change_sets.go b/cmd/state/commands/check_change_sets.go index 204640e1d47..c702927f60a 100644 --- a/cmd/state/commands/check_change_sets.go +++ b/cmd/state/commands/check_change_sets.go @@ -14,13 +14,13 @@ import ( "github.com/ledgerwatch/log/v3" "github.com/spf13/cobra" - chain2 "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/kv" - kv2 "github.com/ledgerwatch/erigon-lib/kv/mdbx" - "github.com/ledgerwatch/erigon-lib/kv/temporal/historyv2" + chain2 "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/datadir" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + kv2 "github.com/ledgerwatch/erigon/erigon-lib/kv/mdbx" + "github.com/ledgerwatch/erigon/erigon-lib/kv/temporal/historyv2" "github.com/ledgerwatch/erigon/turbo/snapshotsync/freezeblocks" "github.com/ledgerwatch/erigon/consensus" diff --git a/cmd/state/commands/check_index.go b/cmd/state/commands/check_index.go index 2c229a78f49..aab87ec09df 100644 --- a/cmd/state/commands/check_index.go +++ b/cmd/state/commands/check_index.go @@ -1,8 +1,8 @@ package commands import ( - "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/cmd/state/verify" + "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/spf13/cobra" ) diff --git a/cmd/state/commands/global_flags_vars.go b/cmd/state/commands/global_flags_vars.go index dd81e19aee6..54571b316b8 100644 --- a/cmd/state/commands/global_flags_vars.go +++ b/cmd/state/commands/global_flags_vars.go @@ -3,7 +3,7 @@ package commands import ( "github.com/spf13/cobra" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/erigon/cmd/utils" "github.com/ledgerwatch/erigon/common/paths" diff --git a/cmd/state/commands/opcode_tracer.go b/cmd/state/commands/opcode_tracer.go index 50672c4dfc8..b832597d7ee 100644 --- a/cmd/state/commands/opcode_tracer.go +++ b/cmd/state/commands/opcode_tracer.go @@ -16,12 +16,12 @@ import ( "github.com/ledgerwatch/log/v3" "github.com/spf13/cobra" - chain2 "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/fixedgas" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/kvcfg" - "github.com/ledgerwatch/erigon-lib/kv/mdbx" + chain2 "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/fixedgas" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/kvcfg" + "github.com/ledgerwatch/erigon/erigon-lib/kv/mdbx" "github.com/ledgerwatch/erigon/common/debug" "github.com/ledgerwatch/erigon/consensus" diff --git a/cmd/state/commands/root.go b/cmd/state/commands/root.go index a088005f1b9..a9304dc87a9 100644 --- a/cmd/state/commands/root.go +++ b/cmd/state/commands/root.go @@ -6,9 +6,9 @@ import ( "os" "path/filepath" - chain2 "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/core/types" + chain2 "github.com/ledgerwatch/erigon/erigon-lib/chain" + "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/spf13/cobra" "github.com/ledgerwatch/erigon/turbo/debug" diff --git a/cmd/state/commands/state_root.go b/cmd/state/commands/state_root.go index 85eb3bc43ec..0e612a150d7 100644 --- a/cmd/state/commands/state_root.go +++ b/cmd/state/commands/state_root.go @@ -9,14 +9,14 @@ import ( "path/filepath" "syscall" - chain2 "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - datadir2 "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/kvcfg" - kv2 "github.com/ledgerwatch/erigon-lib/kv/mdbx" "github.com/ledgerwatch/erigon/core" "github.com/ledgerwatch/erigon/core/rawdb/blockio" + chain2 "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + datadir2 "github.com/ledgerwatch/erigon/erigon-lib/common/datadir" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/kvcfg" + kv2 "github.com/ledgerwatch/erigon/erigon-lib/kv/mdbx" "github.com/ledgerwatch/erigon/eth/ethconfig" "github.com/ledgerwatch/erigon/turbo/services" "github.com/ledgerwatch/erigon/turbo/snapshotsync/freezeblocks" diff --git a/cmd/state/exec22/txtask.go b/cmd/state/exec22/txtask.go index 9225d260fd9..a2d76e8a90d 100644 --- a/cmd/state/exec22/txtask.go +++ b/cmd/state/exec22/txtask.go @@ -7,13 +7,13 @@ import ( "time" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/state" + "github.com/ledgerwatch/erigon/erigon-lib/state" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/core/types" "github.com/ledgerwatch/erigon/core/types/accounts" "github.com/ledgerwatch/erigon/core/vm/evmtypes" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" ) // ReadWriteSet contains ReadSet, WriteSet and BalanceIncrease of a transaction, diff --git a/cmd/state/exec3/calltracer_v3.go b/cmd/state/exec3/calltracer_v3.go index 31e25fa0007..c7d6a476760 100644 --- a/cmd/state/exec3/calltracer_v3.go +++ b/cmd/state/exec3/calltracer_v3.go @@ -2,8 +2,8 @@ package exec3 import ( "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/core/vm" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" ) type CallTracer struct { diff --git a/cmd/state/exec3/state.go b/cmd/state/exec3/state.go index a5f61b03bda..961f1fb0055 100644 --- a/cmd/state/exec3/state.go +++ b/cmd/state/exec3/state.go @@ -8,9 +8,9 @@ import ( "github.com/ledgerwatch/log/v3" "golang.org/x/sync/errgroup" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/erigon/cmd/state/exec22" "github.com/ledgerwatch/erigon/consensus" diff --git a/cmd/state/exec3/state_recon.go b/cmd/state/exec3/state_recon.go index 3d4c24b78a3..add7e95a839 100644 --- a/cmd/state/exec3/state_recon.go +++ b/cmd/state/exec3/state_recon.go @@ -9,12 +9,12 @@ import ( "github.com/RoaringBitmap/roaring/roaring64" "github.com/ledgerwatch/log/v3" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/etl" - "github.com/ledgerwatch/erigon-lib/kv" - libstate "github.com/ledgerwatch/erigon-lib/state" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" + "github.com/ledgerwatch/erigon/erigon-lib/etl" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + libstate "github.com/ledgerwatch/erigon/erigon-lib/state" "github.com/ledgerwatch/erigon/cmd/state/exec22" "github.com/ledgerwatch/erigon/common" diff --git a/cmd/state/stats/index_stats.go b/cmd/state/stats/index_stats.go index 0b275436c3c..3baf08e98b2 100644 --- a/cmd/state/stats/index_stats.go +++ b/cmd/state/stats/index_stats.go @@ -12,10 +12,10 @@ import ( "strings" "time" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/mdbx" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/mdbx" "github.com/ledgerwatch/erigon/common" ) diff --git a/cmd/state/verify/check_changeset_enc.go b/cmd/state/verify/check_changeset_enc.go index e094155dc2f..16431b93aec 100644 --- a/cmd/state/verify/check_changeset_enc.go +++ b/cmd/state/verify/check_changeset_enc.go @@ -9,9 +9,9 @@ import ( "sync/atomic" "time" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/mdbx" - historyv22 "github.com/ledgerwatch/erigon-lib/kv/temporal/historyv2" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/mdbx" + historyv22 "github.com/ledgerwatch/erigon/erigon-lib/kv/temporal/historyv2" "golang.org/x/sync/errgroup" ) diff --git a/cmd/state/verify/check_indexes.go b/cmd/state/verify/check_indexes.go index c3966ffd365..65844c30ede 100644 --- a/cmd/state/verify/check_indexes.go +++ b/cmd/state/verify/check_indexes.go @@ -5,11 +5,11 @@ import ( "fmt" "time" - "github.com/ledgerwatch/erigon-lib/kv/bitmapdb" - "github.com/ledgerwatch/erigon-lib/kv/mdbx" - "github.com/ledgerwatch/erigon-lib/kv/temporal/historyv2" "github.com/ledgerwatch/erigon/common" "github.com/ledgerwatch/erigon/common/dbutils" + "github.com/ledgerwatch/erigon/erigon-lib/kv/bitmapdb" + "github.com/ledgerwatch/erigon/erigon-lib/kv/mdbx" + "github.com/ledgerwatch/erigon/erigon-lib/kv/temporal/historyv2" ) func CheckIndex(ctx context.Context, chaindata string, changeSetBucket string, indexBucket string) error { diff --git a/cmd/state/verify/verify_txlookup.go b/cmd/state/verify/verify_txlookup.go index 3a7351d11b8..a549b54f95c 100644 --- a/cmd/state/verify/verify_txlookup.go +++ b/cmd/state/verify/verify_txlookup.go @@ -9,11 +9,11 @@ import ( "os/signal" "time" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/kvcfg" - "github.com/ledgerwatch/erigon-lib/kv/mdbx" "github.com/ledgerwatch/erigon/core/rawdb/blockio" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/kvcfg" + "github.com/ledgerwatch/erigon/erigon-lib/kv/mdbx" "github.com/ledgerwatch/erigon/eth/ethconfig" "github.com/ledgerwatch/erigon/turbo/services" "github.com/ledgerwatch/erigon/turbo/snapshotsync/freezeblocks" diff --git a/cmd/txpool/main.go b/cmd/txpool/main.go index 1dc3d7541fb..a354abf3ac3 100644 --- a/cmd/txpool/main.go +++ b/cmd/txpool/main.go @@ -8,22 +8,22 @@ import ( "path/filepath" "time" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/direct" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - "github.com/ledgerwatch/erigon-lib/gointerfaces/grpcutil" - "github.com/ledgerwatch/erigon-lib/gointerfaces/remote" - proto_sentry "github.com/ledgerwatch/erigon-lib/gointerfaces/sentry" - "github.com/ledgerwatch/erigon-lib/kv/kvcache" - "github.com/ledgerwatch/erigon-lib/kv/remotedb" - "github.com/ledgerwatch/erigon-lib/kv/remotedbserver" - "github.com/ledgerwatch/erigon-lib/txpool" - "github.com/ledgerwatch/erigon-lib/txpool/txpoolcfg" - "github.com/ledgerwatch/erigon-lib/txpool/txpooluitl" - "github.com/ledgerwatch/erigon-lib/types" "github.com/ledgerwatch/erigon/cmd/rpcdaemon/rpcdaemontest" common2 "github.com/ledgerwatch/erigon/common" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/datadir" + "github.com/ledgerwatch/erigon/erigon-lib/direct" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/grpcutil" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/remote" + proto_sentry "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/sentry" + "github.com/ledgerwatch/erigon/erigon-lib/kv/kvcache" + "github.com/ledgerwatch/erigon/erigon-lib/kv/remotedb" + "github.com/ledgerwatch/erigon/erigon-lib/kv/remotedbserver" + "github.com/ledgerwatch/erigon/erigon-lib/txpool" + "github.com/ledgerwatch/erigon/erigon-lib/txpool/txpoolcfg" + "github.com/ledgerwatch/erigon/erigon-lib/txpool/txpooluitl" + "github.com/ledgerwatch/erigon/erigon-lib/types" "github.com/ledgerwatch/erigon/ethdb/privateapi" "github.com/ledgerwatch/log/v3" "github.com/spf13/cobra" diff --git a/cmd/txpool/readme.md b/cmd/txpool/readme.md index 12b1f2bdaff..2a8d4f05762 100644 --- a/cmd/txpool/readme.md +++ b/cmd/txpool/readme.md @@ -6,7 +6,7 @@ Erigon's TxPool can work inside Erigon (default) and as separated process. Erigon's pool implementation is not fork of Geth’s, has Apache license - Design docs: https://github.com/ledgerwatch/erigon/wiki/Transaction-Pool-Design 95% of pool-related code (from p2p message parsing, to sorting logic) is inside this -folder: https://github.com/ledgerwatch/erigon-lib/tree/main/txpool +folder: https://github.com/ledgerwatch/erigon/erigon-lib/tree/main/txpool ## Internal mode diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index b9805d00390..9348b98e9ef 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -27,14 +27,14 @@ import ( "strings" "github.com/c2h5oh/datasize" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/cmp" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/common/metrics" - libkzg "github.com/ledgerwatch/erigon-lib/crypto/kzg" - "github.com/ledgerwatch/erigon-lib/direct" - downloadercfg2 "github.com/ledgerwatch/erigon-lib/downloader/downloadercfg" - "github.com/ledgerwatch/erigon-lib/txpool/txpoolcfg" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/cmp" + "github.com/ledgerwatch/erigon/erigon-lib/common/datadir" + "github.com/ledgerwatch/erigon/erigon-lib/common/metrics" + libkzg "github.com/ledgerwatch/erigon/erigon-lib/crypto/kzg" + "github.com/ledgerwatch/erigon/erigon-lib/direct" + downloadercfg2 "github.com/ledgerwatch/erigon/erigon-lib/downloader/downloadercfg" + "github.com/ledgerwatch/erigon/erigon-lib/txpool/txpoolcfg" "github.com/ledgerwatch/log/v3" "github.com/spf13/cobra" "github.com/spf13/pflag" diff --git a/cmd/verkle/main.go b/cmd/verkle/main.go index b74c6a060f9..65e176b29aa 100644 --- a/cmd/verkle/main.go +++ b/cmd/verkle/main.go @@ -9,10 +9,10 @@ import ( "time" "github.com/c2h5oh/datasize" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/etl" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/mdbx" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/etl" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/mdbx" "github.com/ledgerwatch/log/v3" "go.uber.org/zap/buffer" diff --git a/cmd/verkle/verkletrie/incrementAccount.go b/cmd/verkle/verkletrie/incrementAccount.go index e8555217e0a..3715a9bc3cd 100644 --- a/cmd/verkle/verkletrie/incrementAccount.go +++ b/cmd/verkle/verkletrie/incrementAccount.go @@ -6,10 +6,10 @@ import ( "sync" "time" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/temporal/historyv2" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/temporal/historyv2" "github.com/ledgerwatch/log/v3" "github.com/ledgerwatch/erigon/common/debug" diff --git a/cmd/verkle/verkletrie/incrementStorage.go b/cmd/verkle/verkletrie/incrementStorage.go index 72ee83177c9..5cbb0f2c820 100644 --- a/cmd/verkle/verkletrie/incrementStorage.go +++ b/cmd/verkle/verkletrie/incrementStorage.go @@ -6,10 +6,10 @@ import ( "time" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/temporal/historyv2" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/temporal/historyv2" "github.com/ledgerwatch/log/v3" "github.com/ledgerwatch/erigon/common" diff --git a/cmd/verkle/verkletrie/pedersen_hashstate.go b/cmd/verkle/verkletrie/pedersen_hashstate.go index f04561e4017..3c678905681 100644 --- a/cmd/verkle/verkletrie/pedersen_hashstate.go +++ b/cmd/verkle/verkletrie/pedersen_hashstate.go @@ -8,8 +8,8 @@ import ( "time" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/log/v3" "github.com/ledgerwatch/erigon/common" diff --git a/cmd/verkle/verkletrie/verkle_marker.go b/cmd/verkle/verkletrie/verkle_marker.go index f2f94fbb477..06e453d32cb 100644 --- a/cmd/verkle/verkletrie/verkle_marker.go +++ b/cmd/verkle/verkletrie/verkle_marker.go @@ -3,8 +3,8 @@ package verkletrie import ( "context" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/mdbx" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/mdbx" ) type VerkleMarker struct { diff --git a/cmd/verkle/verkletrie/verkle_tree_writer.go b/cmd/verkle/verkletrie/verkle_tree_writer.go index 08f1acaa282..2b3560a778f 100644 --- a/cmd/verkle/verkletrie/verkle_tree_writer.go +++ b/cmd/verkle/verkletrie/verkle_tree_writer.go @@ -8,9 +8,9 @@ import ( "github.com/anacrolix/sync" "github.com/gballet/go-verkle" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/etl" - "github.com/ledgerwatch/erigon-lib/kv" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/etl" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/log/v3" "github.com/ledgerwatch/erigon/common" diff --git a/cmd/verkle/verkletrie/workers.go b/cmd/verkle/verkletrie/workers.go index 5b3695ba6d5..10ffc309510 100644 --- a/cmd/verkle/verkletrie/workers.go +++ b/cmd/verkle/verkletrie/workers.go @@ -4,7 +4,7 @@ import ( "context" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/common" "github.com/ledgerwatch/erigon/core/types/accounts" diff --git a/common/changeset/accs.go b/common/changeset/accs.go index edc7e4955cf..60e8b3fb26f 100644 --- a/common/changeset/accs.go +++ b/common/changeset/accs.go @@ -1,12 +1,12 @@ package changeset import ( - common2 "github.com/ledgerwatch/erigon-lib/common" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/etl" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/temporal/historyv2" + common2 "github.com/ledgerwatch/erigon/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/etl" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/temporal/historyv2" "github.com/ledgerwatch/erigon/ethdb" ) diff --git a/common/changeset/storage_changeset_test.go b/common/changeset/storage_changeset_test.go index 02a5966a1eb..cf3b01d5a8d 100644 --- a/common/changeset/storage_changeset_test.go +++ b/common/changeset/storage_changeset_test.go @@ -8,10 +8,10 @@ import ( "strconv" "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/memdb" - historyv22 "github.com/ledgerwatch/erigon-lib/kv/temporal/historyv2" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/memdb" + historyv22 "github.com/ledgerwatch/erigon/erigon-lib/kv/temporal/historyv2" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/common/dbutils/composite_keys.go b/common/dbutils/composite_keys.go index d2274f022e3..a4bd4e1480e 100644 --- a/common/dbutils/composite_keys.go +++ b/common/dbutils/composite_keys.go @@ -5,8 +5,8 @@ import ( "errors" "fmt" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" ) const NumberLength = 8 diff --git a/common/dbutils/composite_keys_test.go b/common/dbutils/composite_keys_test.go index 7eac33bcfc1..dd19c5b00a8 100644 --- a/common/dbutils/composite_keys_test.go +++ b/common/dbutils/composite_keys_test.go @@ -3,7 +3,7 @@ package dbutils import ( "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/stretchr/testify/assert" "github.com/ledgerwatch/erigon/common" diff --git a/common/dbutils/history_index.go b/common/dbutils/history_index.go index 394cf82feec..ce204f5ccfd 100644 --- a/common/dbutils/history_index.go +++ b/common/dbutils/history_index.go @@ -1,7 +1,7 @@ package dbutils import ( - "github.com/ledgerwatch/erigon-lib/common/length" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" ) func CompositeKeyWithoutIncarnation(key []byte) []byte { diff --git a/common/debug/log_panic.go b/common/debug/log_panic.go index c7b91a35f44..1a244cbb668 100644 --- a/common/debug/log_panic.go +++ b/common/debug/log_panic.go @@ -4,7 +4,7 @@ import ( "os" "syscall" - "github.com/ledgerwatch/erigon-lib/common/dbg" + "github.com/ledgerwatch/erigon/erigon-lib/common/dbg" "github.com/ledgerwatch/log/v3" ) diff --git a/common/debug/memstats.go b/common/debug/memstats.go index ff6431244c0..ee0579452f0 100644 --- a/common/debug/memstats.go +++ b/common/debug/memstats.go @@ -4,7 +4,7 @@ import ( "fmt" "runtime" - "github.com/ledgerwatch/erigon-lib/common/dbg" + "github.com/ledgerwatch/erigon/erigon-lib/common/dbg" ) func PrintMemStats(short bool) { diff --git a/common/hasher.go b/common/hasher.go index e92367f9bd0..9724d8cbbad 100644 --- a/common/hasher.go +++ b/common/hasher.go @@ -4,7 +4,7 @@ import ( "hash" "sync" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "golang.org/x/crypto/sha3" ) diff --git a/common/hexutil/json_example_test.go b/common/hexutil/json_example_test.go index c256b412e39..09de7e24035 100644 --- a/common/hexutil/json_example_test.go +++ b/common/hexutil/json_example_test.go @@ -20,7 +20,7 @@ import ( "encoding/json" "fmt" - "github.com/ledgerwatch/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" ) type MyType [5]byte diff --git a/common/math/modexp.go b/common/math/modexp.go index b2a4f1bf0f9..0da6831480a 100644 --- a/common/math/modexp.go +++ b/common/math/modexp.go @@ -8,7 +8,7 @@ import ( "math/big" "math/bits" - "github.com/ledgerwatch/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common" ) // FastExp is semantically equivalent to x.Exp(x,y, m), but is faster for even diff --git a/common/types.go b/common/types.go index e296ed887de..ef8139dbdb0 100644 --- a/common/types.go +++ b/common/types.go @@ -25,9 +25,9 @@ import ( "reflect" "strings" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/common/length" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" "github.com/ledgerwatch/erigon/common/hexutil" ) diff --git a/common/types_test.go b/common/types_test.go index 0e2f9e78d55..1e49c3cf3ba 100644 --- a/common/types_test.go +++ b/common/types_test.go @@ -26,7 +26,7 @@ import ( "strings" "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" ) func TestBytesConversion(t *testing.T) { diff --git a/consensus/aura/aura.go b/consensus/aura/aura.go index 40b241706f7..d7cf13449d9 100644 --- a/consensus/aura/aura.go +++ b/consensus/aura/aura.go @@ -27,9 +27,9 @@ import ( "github.com/holiman/uint256" "github.com/ledgerwatch/log/v3" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/erigon/common" "github.com/ledgerwatch/erigon/consensus" diff --git a/consensus/aura/aura_test.go b/consensus/aura/aura_test.go index 401cae8a92d..ff77922e55e 100644 --- a/consensus/aura/aura_test.go +++ b/consensus/aura/aura_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/require" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv/memdb" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv/memdb" "github.com/ledgerwatch/erigon/accounts/abi" "github.com/ledgerwatch/erigon/consensus/aura" diff --git a/consensus/aura/auraabi/gen_block_reward.go b/consensus/aura/auraabi/gen_block_reward.go index 27d4fce7bec..011b8a50fdd 100644 --- a/consensus/aura/auraabi/gen_block_reward.go +++ b/consensus/aura/auraabi/gen_block_reward.go @@ -8,7 +8,7 @@ import ( "strings" ethereum "github.com/ledgerwatch/erigon" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/accounts/abi" "github.com/ledgerwatch/erigon/accounts/abi/bind" "github.com/ledgerwatch/erigon/core/types" diff --git a/consensus/aura/auraabi/gen_validator_set.go b/consensus/aura/auraabi/gen_validator_set.go index b16614af7d3..d348509f165 100644 --- a/consensus/aura/auraabi/gen_validator_set.go +++ b/consensus/aura/auraabi/gen_validator_set.go @@ -8,7 +8,7 @@ import ( "strings" ethereum "github.com/ledgerwatch/erigon" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/accounts/abi" "github.com/ledgerwatch/erigon/accounts/abi/bind" "github.com/ledgerwatch/erigon/core/types" diff --git a/consensus/aura/aurainterfaces/interface.go b/consensus/aura/aurainterfaces/interface.go index 40cc0d2ba7f..06d90da315f 100644 --- a/consensus/aura/aurainterfaces/interface.go +++ b/consensus/aura/aurainterfaces/interface.go @@ -2,8 +2,8 @@ package aurainterfaces import ( "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/consensus" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" ) // see openethereum/crates/ethcore/res/contracts/block_reward.json diff --git a/consensus/aura/config.go b/consensus/aura/config.go index 00c12b4da27..73ebe327938 100644 --- a/consensus/aura/config.go +++ b/consensus/aura/config.go @@ -23,8 +23,8 @@ import ( "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/common/u256" "github.com/ledgerwatch/erigon/consensus" diff --git a/consensus/aura/config_test.go b/consensus/aura/config_test.go index a910625fd9a..5d327802dd5 100644 --- a/consensus/aura/config_test.go +++ b/consensus/aura/config_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/params" ) diff --git a/consensus/aura/contract_abi.go b/consensus/aura/contract_abi.go index 7f806f515d8..f2a00d0c32b 100644 --- a/consensus/aura/contract_abi.go +++ b/consensus/aura/contract_abi.go @@ -6,7 +6,7 @@ import ( "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/accounts/abi" "github.com/ledgerwatch/erigon/common" diff --git a/consensus/aura/empty_step.go b/consensus/aura/empty_step.go index c2f5173e432..202f3ae267a 100644 --- a/consensus/aura/empty_step.go +++ b/consensus/aura/empty_step.go @@ -7,7 +7,7 @@ import ( "github.com/ledgerwatch/secp256k1" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/crypto" "github.com/ledgerwatch/erigon/rlp" diff --git a/consensus/aura/epoch.go b/consensus/aura/epoch.go index c663fc171fb..478c8dd9dbf 100644 --- a/consensus/aura/epoch.go +++ b/consensus/aura/epoch.go @@ -3,8 +3,8 @@ package aura import ( "context" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/erigon/core/rawdb" ) diff --git a/consensus/aura/finality_test.go b/consensus/aura/finality_test.go index a09e55e8a73..a83d8bc194b 100644 --- a/consensus/aura/finality_test.go +++ b/consensus/aura/finality_test.go @@ -3,7 +3,7 @@ package aura import ( "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/stretchr/testify/assert" ) diff --git a/consensus/aura/gaslimit_override.go b/consensus/aura/gaslimit_override.go index a2df8f11fd5..0552e6f65b8 100644 --- a/consensus/aura/gaslimit_override.go +++ b/consensus/aura/gaslimit_override.go @@ -3,10 +3,10 @@ package aura import ( lru "github.com/hashicorp/golang-lru/v2" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/chain" + "github.com/ledgerwatch/erigon/erigon-lib/chain" "github.com/ledgerwatch/erigon/consensus" "github.com/ledgerwatch/erigon/consensus/misc" diff --git a/consensus/aura/rolling_finality.go b/consensus/aura/rolling_finality.go index e5a3eac27ac..c77d286119d 100644 --- a/consensus/aura/rolling_finality.go +++ b/consensus/aura/rolling_finality.go @@ -20,7 +20,7 @@ import ( "container/list" "fmt" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" ) // RollingFinality checker for authority round consensus. diff --git a/consensus/aura/types.go b/consensus/aura/types.go index 62ab6ea4bc5..9cc9c709abd 100644 --- a/consensus/aura/types.go +++ b/consensus/aura/types.go @@ -3,8 +3,8 @@ package aura import ( "sync/atomic" - libcommon "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/core/types" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" ) type StepDurationInfo struct { diff --git a/consensus/aura/unassemble.go b/consensus/aura/unassemble.go index 170f075306b..3ad30f776b3 100644 --- a/consensus/aura/unassemble.go +++ b/consensus/aura/unassemble.go @@ -2,7 +2,8 @@ package aura import ( "container/list" - libcommon "github.com/ledgerwatch/erigon-lib/common" + + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" ) // nolint diff --git a/consensus/aura/validators.go b/consensus/aura/validators.go index 8af70bf4908..5dc63c1824c 100644 --- a/consensus/aura/validators.go +++ b/consensus/aura/validators.go @@ -9,8 +9,8 @@ import ( "sync" "sync/atomic" - "github.com/hashicorp/golang-lru/v2" - libcommon "github.com/ledgerwatch/erigon-lib/common" + lru "github.com/hashicorp/golang-lru/v2" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/log/v3" "github.com/ledgerwatch/erigon/accounts/abi" diff --git a/consensus/bor/api.go b/consensus/bor/api.go index bb8c933c12a..714e989c62e 100644 --- a/consensus/bor/api.go +++ b/consensus/bor/api.go @@ -12,7 +12,7 @@ import ( "golang.org/x/crypto/sha3" lru "github.com/hashicorp/golang-lru/arc/v2" - "github.com/ledgerwatch/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/consensus" "github.com/ledgerwatch/erigon/consensus/bor/valset" diff --git a/consensus/bor/bor.go b/consensus/bor/bor.go index 40533496abd..130fbb2a30e 100644 --- a/consensus/bor/bor.go +++ b/consensus/bor/bor.go @@ -18,10 +18,10 @@ import ( lru "github.com/hashicorp/golang-lru/arc/v2" "github.com/ledgerwatch/log/v3" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/erigon/common" "github.com/ledgerwatch/erigon/consensus" diff --git a/consensus/bor/bor_test.go b/consensus/bor/bor_test.go index ce336c4c9b9..15976fbeb07 100644 --- a/consensus/bor/bor_test.go +++ b/consensus/bor/bor_test.go @@ -6,10 +6,6 @@ import ( "math/big" "testing" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/gointerfaces/sentry" - "github.com/ledgerwatch/erigon-lib/kv/memdb" "github.com/ledgerwatch/erigon/consensus" "github.com/ledgerwatch/erigon/consensus/bor" "github.com/ledgerwatch/erigon/consensus/bor/clerk" @@ -21,6 +17,10 @@ import ( "github.com/ledgerwatch/erigon/core" "github.com/ledgerwatch/erigon/core/types" "github.com/ledgerwatch/erigon/crypto" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/sentry" + "github.com/ledgerwatch/erigon/erigon-lib/kv/memdb" "github.com/ledgerwatch/erigon/eth/protocols/eth" "github.com/ledgerwatch/erigon/ethdb/prune" "github.com/ledgerwatch/erigon/params" diff --git a/consensus/bor/clerk/clerk.go b/consensus/bor/clerk/clerk.go index 39b9aefb8c7..3bdf2b7caae 100644 --- a/consensus/bor/clerk/clerk.go +++ b/consensus/bor/clerk/clerk.go @@ -4,8 +4,8 @@ import ( "fmt" "time" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" ) // EventRecord represents state record diff --git a/consensus/bor/contract/client.go b/consensus/bor/contract/client.go index bf080b8511f..a7d8208b11c 100644 --- a/consensus/bor/contract/client.go +++ b/consensus/bor/contract/client.go @@ -4,10 +4,10 @@ import ( "math/big" "strings" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/accounts/abi" "github.com/ledgerwatch/erigon/consensus" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/rlp" "github.com/ledgerwatch/log/v3" ) diff --git a/consensus/bor/fake.go b/consensus/bor/fake.go index fb79b7642da..4b771fede71 100644 --- a/consensus/bor/fake.go +++ b/consensus/bor/fake.go @@ -1,11 +1,11 @@ package bor import ( - "github.com/ledgerwatch/erigon-lib/chain" "github.com/ledgerwatch/erigon/consensus" "github.com/ledgerwatch/erigon/consensus/ethash" "github.com/ledgerwatch/erigon/core/state" "github.com/ledgerwatch/erigon/core/types" + "github.com/ledgerwatch/erigon/erigon-lib/chain" "github.com/ledgerwatch/log/v3" ) diff --git a/consensus/bor/heimdall/checkpoint/checkpoint.go b/consensus/bor/heimdall/checkpoint/checkpoint.go index ebced7beef8..18fadc81b3b 100644 --- a/consensus/bor/heimdall/checkpoint/checkpoint.go +++ b/consensus/bor/heimdall/checkpoint/checkpoint.go @@ -4,7 +4,7 @@ import ( "fmt" "math/big" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" ) // Checkpoint defines a response object type of bor checkpoint diff --git a/consensus/bor/heimdall/milestone/milestone.go b/consensus/bor/heimdall/milestone/milestone.go index a849f4461bd..f8cd28abdf8 100644 --- a/consensus/bor/heimdall/milestone/milestone.go +++ b/consensus/bor/heimdall/milestone/milestone.go @@ -3,7 +3,7 @@ package milestone import ( "math/big" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" ) // milestone defines a response object type of bor milestone diff --git a/consensus/bor/heimdall/span/spanner.go b/consensus/bor/heimdall/span/spanner.go index b7f50ff796b..d3add3070af 100644 --- a/consensus/bor/heimdall/span/spanner.go +++ b/consensus/bor/heimdall/span/spanner.go @@ -4,11 +4,11 @@ import ( "encoding/hex" "math/big" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/consensus" "github.com/ledgerwatch/erigon/consensus/bor/abi" "github.com/ledgerwatch/erigon/consensus/bor/valset" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/rlp" "github.com/ledgerwatch/log/v3" ) diff --git a/consensus/bor/heimdall/span/testValidators.go b/consensus/bor/heimdall/span/testValidators.go index 8c00117dca5..d56ca0da7dc 100644 --- a/consensus/bor/heimdall/span/testValidators.go +++ b/consensus/bor/heimdall/span/testValidators.go @@ -1,8 +1,8 @@ package span import ( - "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/consensus/bor/valset" + "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/params/networkname" ) diff --git a/consensus/bor/heimdallgrpc/server.go b/consensus/bor/heimdallgrpc/server.go index a19156aebb9..9c7cfc387ba 100644 --- a/consensus/bor/heimdallgrpc/server.go +++ b/consensus/bor/heimdallgrpc/server.go @@ -6,8 +6,8 @@ import ( "net" "time" - "github.com/ledgerwatch/erigon-lib/gointerfaces" "github.com/ledgerwatch/erigon/consensus/bor/heimdall" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces" "github.com/ledgerwatch/log/v3" proto "github.com/maticnetwork/polyproto/heimdall" "google.golang.org/grpc" diff --git a/consensus/bor/heimdallgrpc/state_sync.go b/consensus/bor/heimdallgrpc/state_sync.go index 3cf93dc906a..bab93e4c12c 100644 --- a/consensus/bor/heimdallgrpc/state_sync.go +++ b/consensus/bor/heimdallgrpc/state_sync.go @@ -5,9 +5,9 @@ import ( "errors" "io" - libcommon "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/common" "github.com/ledgerwatch/erigon/consensus/bor/clerk" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" proto "github.com/maticnetwork/polyproto/heimdall" ) diff --git a/consensus/bor/snapshot.go b/consensus/bor/snapshot.go index 0e8825dd5bb..beb5c378296 100644 --- a/consensus/bor/snapshot.go +++ b/consensus/bor/snapshot.go @@ -6,11 +6,11 @@ import ( "encoding/json" lru "github.com/hashicorp/golang-lru/arc/v2" - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" "github.com/ledgerwatch/erigon/consensus/bor/valset" "github.com/ledgerwatch/erigon/core/types" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/log/v3" ) diff --git a/consensus/bor/snapshot_test.go b/consensus/bor/snapshot_test.go index d3d827ab31b..c117976c938 100644 --- a/consensus/bor/snapshot_test.go +++ b/consensus/bor/snapshot_test.go @@ -5,9 +5,9 @@ import ( "sort" "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/consensus/bor" "github.com/ledgerwatch/erigon/consensus/bor/valset" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/log/v3" "github.com/maticnetwork/crand" "github.com/stretchr/testify/require" diff --git a/consensus/bor/span.go b/consensus/bor/span.go index 7365fd10c80..d0e828d4686 100644 --- a/consensus/bor/span.go +++ b/consensus/bor/span.go @@ -1,10 +1,10 @@ package bor import ( - libcommon "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/consensus" "github.com/ledgerwatch/erigon/consensus/bor/heimdall/span" "github.com/ledgerwatch/erigon/consensus/bor/valset" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" ) //go:generate mockgen -destination=./span_mock.go -package=bor . Spanner diff --git a/consensus/bor/span_mock.go b/consensus/bor/span_mock.go index ced3dee6a0d..66cbefbff79 100644 --- a/consensus/bor/span_mock.go +++ b/consensus/bor/span_mock.go @@ -8,7 +8,7 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - common "github.com/ledgerwatch/erigon-lib/common" + common "github.com/ledgerwatch/erigon/erigon-lib/common" consensus "github.com/ledgerwatch/erigon/consensus" span "github.com/ledgerwatch/erigon/consensus/bor/heimdall/span" valset "github.com/ledgerwatch/erigon/consensus/bor/valset" diff --git a/consensus/bor/statefull/processor.go b/consensus/bor/statefull/processor.go index a19844e0f28..b64feb2cdca 100644 --- a/consensus/bor/statefull/processor.go +++ b/consensus/bor/statefull/processor.go @@ -3,11 +3,11 @@ package statefull import ( "github.com/holiman/uint256" ethereum "github.com/ledgerwatch/erigon" - libcommon "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/consensus" "github.com/ledgerwatch/erigon/core" "github.com/ledgerwatch/erigon/core/types" "github.com/ledgerwatch/erigon/core/vm" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" ) type ChainContext struct { diff --git a/consensus/bor/valset/validator.go b/consensus/bor/valset/validator.go index 2a525bfd935..7cda4949695 100644 --- a/consensus/bor/valset/validator.go +++ b/consensus/bor/valset/validator.go @@ -9,7 +9,7 @@ import ( "sort" "strings" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" ) // Validator represets Volatile state for each Validator diff --git a/consensus/bor/valset/validator_set.go b/consensus/bor/valset/validator_set.go index de2792d5285..1b481954821 100644 --- a/consensus/bor/valset/validator_set.go +++ b/consensus/bor/valset/validator_set.go @@ -10,7 +10,7 @@ import ( "sort" "strings" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/log/v3" ) diff --git a/consensus/chain_reader.go b/consensus/chain_reader.go index 795e2a856e4..29743d9bc56 100644 --- a/consensus/chain_reader.go +++ b/consensus/chain_reader.go @@ -4,9 +4,9 @@ import ( "context" "math/big" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/erigon/turbo/services" "github.com/ledgerwatch/log/v3" diff --git a/consensus/clique/api.go b/consensus/clique/api.go index 07ac51f1839..609c337e8e8 100644 --- a/consensus/clique/api.go +++ b/consensus/clique/api.go @@ -20,10 +20,10 @@ import ( "context" "fmt" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" "github.com/ledgerwatch/erigon/consensus" "github.com/ledgerwatch/erigon/core/types" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/erigon/rpc" "github.com/ledgerwatch/erigon/turbo/services" "github.com/ledgerwatch/log/v3" diff --git a/consensus/clique/clique.go b/consensus/clique/clique.go index afd33850838..db2399eb61c 100644 --- a/consensus/clique/clique.go +++ b/consensus/clique/clique.go @@ -33,9 +33,9 @@ import ( "github.com/ledgerwatch/erigon/turbo/services" "github.com/ledgerwatch/log/v3" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/erigon/common" "github.com/ledgerwatch/erigon/common/dbutils" diff --git a/consensus/clique/clique_test.go b/consensus/clique/clique_test.go index c69bbf349af..f32e84aaef8 100644 --- a/consensus/clique/clique_test.go +++ b/consensus/clique/clique_test.go @@ -21,15 +21,15 @@ import ( "testing" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/memdb" "github.com/ledgerwatch/erigon/consensus/clique" "github.com/ledgerwatch/erigon/core" "github.com/ledgerwatch/erigon/core/rawdb" "github.com/ledgerwatch/erigon/core/types" "github.com/ledgerwatch/erigon/crypto" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/memdb" "github.com/ledgerwatch/erigon/params" "github.com/ledgerwatch/erigon/turbo/stages/mock" "github.com/ledgerwatch/log/v3" diff --git a/consensus/clique/keys.go b/consensus/clique/keys.go index cfb773dcc21..3c12d8e9e34 100644 --- a/consensus/clique/keys.go +++ b/consensus/clique/keys.go @@ -3,7 +3,7 @@ package clique import ( "encoding/binary" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" ) // SnapshotFullKey = SnapshotBucket + num (uint64 big endian) + hash diff --git a/consensus/clique/snapshot.go b/consensus/clique/snapshot.go index c478d6ec3b1..430650e3e0d 100644 --- a/consensus/clique/snapshot.go +++ b/consensus/clique/snapshot.go @@ -26,9 +26,9 @@ import ( "github.com/goccy/go-json" lru "github.com/hashicorp/golang-lru/arc/v2" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/log/v3" diff --git a/consensus/clique/snapshot_test.go b/consensus/clique/snapshot_test.go index bfdaa4e1d09..96cf250c3f1 100644 --- a/consensus/clique/snapshot_test.go +++ b/consensus/clique/snapshot_test.go @@ -23,15 +23,15 @@ import ( "sort" "testing" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/memdb" "github.com/ledgerwatch/erigon/consensus/clique" "github.com/ledgerwatch/erigon/core" "github.com/ledgerwatch/erigon/core/types" "github.com/ledgerwatch/erigon/crypto" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/memdb" "github.com/ledgerwatch/erigon/eth/stagedsync" "github.com/ledgerwatch/erigon/params" "github.com/ledgerwatch/erigon/turbo/stages/mock" diff --git a/consensus/clique/verifier.go b/consensus/clique/verifier.go index 69269566448..b8068223ebc 100644 --- a/consensus/clique/verifier.go +++ b/consensus/clique/verifier.go @@ -5,8 +5,8 @@ import ( "fmt" "time" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" "github.com/ledgerwatch/erigon/consensus" "github.com/ledgerwatch/erigon/consensus/misc" diff --git a/consensus/consensus.go b/consensus/consensus.go index fa3cd9a4629..5a6db24e7de 100644 --- a/consensus/consensus.go +++ b/consensus/consensus.go @@ -22,8 +22,8 @@ import ( "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/core/state" "github.com/ledgerwatch/erigon/core/types" diff --git a/consensus/ethash/algorithm.go b/consensus/ethash/algorithm.go index 3c20c22439e..d16bede08a8 100644 --- a/consensus/ethash/algorithm.go +++ b/consensus/ethash/algorithm.go @@ -27,7 +27,7 @@ import ( "time" "unsafe" - "github.com/ledgerwatch/erigon-lib/common/length" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" "golang.org/x/crypto/sha3" "github.com/ledgerwatch/log/v3" diff --git a/consensus/ethash/algorithm_test.go b/consensus/ethash/algorithm_test.go index 722c83fadc3..927821f9c78 100644 --- a/consensus/ethash/algorithm_test.go +++ b/consensus/ethash/algorithm_test.go @@ -23,7 +23,7 @@ import ( "reflect" "testing" - "github.com/ledgerwatch/erigon-lib/common/length" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" "github.com/ledgerwatch/erigon/common/hexutil" ) diff --git a/consensus/ethash/api.go b/consensus/ethash/api.go index 7ee7d81b19f..a3e2364e3ad 100644 --- a/consensus/ethash/api.go +++ b/consensus/ethash/api.go @@ -19,7 +19,7 @@ package ethash import ( "errors" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/common/hexutil" "github.com/ledgerwatch/erigon/core/types" diff --git a/consensus/ethash/consensus.go b/consensus/ethash/consensus.go index 5c92c2061d5..cc6d305d428 100644 --- a/consensus/ethash/consensus.go +++ b/consensus/ethash/consensus.go @@ -26,9 +26,9 @@ import ( mapset "github.com/deckarep/golang-set/v2" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/consensus/ethash/ethashcfg" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/log/v3" "golang.org/x/crypto/sha3" diff --git a/consensus/ethash/consensus_test.go b/consensus/ethash/consensus_test.go index 1528c866f52..7dfb7a0ed33 100644 --- a/consensus/ethash/consensus_test.go +++ b/consensus/ethash/consensus_test.go @@ -25,8 +25,8 @@ import ( "testing" "github.com/goccy/go-json" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/common/math" "github.com/ledgerwatch/erigon/core/types" diff --git a/consensus/ethash/ethash_test.go b/consensus/ethash/ethash_test.go index 805ebe9cf60..4bdd8a789c6 100644 --- a/consensus/ethash/ethash_test.go +++ b/consensus/ethash/ethash_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/common/hexutil" "github.com/ledgerwatch/erigon/core/types" diff --git a/consensus/ethash/fake.go b/consensus/ethash/fake.go index 70899866d27..bbcc2ebca90 100644 --- a/consensus/ethash/fake.go +++ b/consensus/ethash/fake.go @@ -4,8 +4,8 @@ import ( "time" mapset "github.com/deckarep/golang-set/v2" - libcommon "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/consensus/ethash/ethashcfg" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/log/v3" "github.com/ledgerwatch/erigon/consensus" diff --git a/consensus/ethash/sealer.go b/consensus/ethash/sealer.go index 76a00da872f..d3a76a526c2 100644 --- a/consensus/ethash/sealer.go +++ b/consensus/ethash/sealer.go @@ -29,7 +29,7 @@ import ( "time" "github.com/goccy/go-json" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/common" "github.com/ledgerwatch/erigon/common/hexutil" diff --git a/consensus/ethash/sealer_test.go b/consensus/ethash/sealer_test.go index 72bcf16fda2..29c3b1ec56c 100644 --- a/consensus/ethash/sealer_test.go +++ b/consensus/ethash/sealer_test.go @@ -26,8 +26,8 @@ import ( "time" "github.com/goccy/go-json" - libcommon "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/consensus/ethash/ethashcfg" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/turbo/testlog" diff --git a/consensus/merge/merge.go b/consensus/merge/merge.go index 8adeab7aabe..fdfdb75e151 100644 --- a/consensus/merge/merge.go +++ b/consensus/merge/merge.go @@ -8,13 +8,13 @@ import ( "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/consensus" "github.com/ledgerwatch/erigon/consensus/aura" "github.com/ledgerwatch/erigon/consensus/misc" "github.com/ledgerwatch/erigon/core/state" "github.com/ledgerwatch/erigon/core/types" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/params" "github.com/ledgerwatch/erigon/rpc" "github.com/ledgerwatch/log/v3" diff --git a/consensus/merge/merge_test.go b/consensus/merge/merge_test.go index bf0558211d3..95359975550 100644 --- a/consensus/merge/merge_test.go +++ b/consensus/merge/merge_test.go @@ -4,8 +4,8 @@ import ( "math/big" "testing" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/consensus" "github.com/ledgerwatch/erigon/core/types" diff --git a/consensus/misc/dao.go b/consensus/misc/dao.go index 934a94577df..0f853439ca1 100644 --- a/consensus/misc/dao.go +++ b/consensus/misc/dao.go @@ -22,7 +22,7 @@ import ( "math/big" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/chain" + "github.com/ledgerwatch/erigon/erigon-lib/chain" "github.com/ledgerwatch/erigon/core/state" "github.com/ledgerwatch/erigon/core/types" diff --git a/consensus/misc/eip1559.go b/consensus/misc/eip1559.go index 8cd278b253b..755e2c98b67 100644 --- a/consensus/misc/eip1559.go +++ b/consensus/misc/eip1559.go @@ -20,8 +20,8 @@ import ( "fmt" "math/big" - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/common/math" "github.com/ledgerwatch/erigon/core/types" diff --git a/consensus/misc/eip1559_test.go b/consensus/misc/eip1559_test.go index c937880ffa0..8abe14d1488 100644 --- a/consensus/misc/eip1559_test.go +++ b/consensus/misc/eip1559_test.go @@ -20,8 +20,8 @@ import ( "math/big" "testing" - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/core/types" "github.com/ledgerwatch/erigon/params" diff --git a/consensus/misc/eip4788.go b/consensus/misc/eip4788.go index 26293004b28..031b0011c71 100644 --- a/consensus/misc/eip4788.go +++ b/consensus/misc/eip4788.go @@ -3,8 +3,8 @@ package misc import ( "github.com/ledgerwatch/log/v3" - libcommon "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/consensus" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/params" ) diff --git a/consensus/misc/eip4844.go b/consensus/misc/eip4844.go index 7c8d2de92be..651a612a6ed 100644 --- a/consensus/misc/eip4844.go +++ b/consensus/misc/eip4844.go @@ -21,7 +21,7 @@ import ( "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/common/fixedgas" + "github.com/ledgerwatch/erigon/erigon-lib/common/fixedgas" "github.com/ledgerwatch/erigon/core/types" "github.com/ledgerwatch/erigon/params" diff --git a/consensus/misc/pos.go b/consensus/misc/pos.go index ce6bdc5585f..bb7c7099caa 100644 --- a/consensus/misc/pos.go +++ b/consensus/misc/pos.go @@ -1,8 +1,8 @@ package misc import ( - libcommon "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/core/types" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" ) // Constants for The Merge as specified by EIP-3675: Upgrade consensus to Proof-of-Stake diff --git a/core/block_builder_parameters.go b/core/block_builder_parameters.go index 936724c2624..948a99a35e8 100644 --- a/core/block_builder_parameters.go +++ b/core/block_builder_parameters.go @@ -1,7 +1,7 @@ package core import ( - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/core/types" ) diff --git a/core/block_validator_test.go b/core/block_validator_test.go index 0548eda0c89..fbe5f8bbdd5 100644 --- a/core/block_validator_test.go +++ b/core/block_validator_test.go @@ -20,10 +20,10 @@ import ( "context" "testing" - "github.com/ledgerwatch/erigon-lib/kv" "github.com/ledgerwatch/erigon/consensus/ethash" "github.com/ledgerwatch/erigon/core" "github.com/ledgerwatch/erigon/core/types" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/erigon/eth/stagedsync" "github.com/ledgerwatch/erigon/params" "github.com/ledgerwatch/erigon/turbo/stages/mock" diff --git a/core/blockchain.go b/core/blockchain.go index aec17acb9f4..6a6434ac01c 100644 --- a/core/blockchain.go +++ b/core/blockchain.go @@ -21,13 +21,13 @@ import ( "fmt" "time" - cmp2 "github.com/ledgerwatch/erigon-lib/common/cmp" + cmp2 "github.com/ledgerwatch/erigon/erigon-lib/common/cmp" "golang.org/x/crypto/sha3" "golang.org/x/exp/slices" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/fixedgas" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/fixedgas" "github.com/ledgerwatch/erigon/common/math" "github.com/ledgerwatch/erigon/common/u256" @@ -185,7 +185,7 @@ func ExecuteBlockEphemerally( stateSyncReceipt := &types.Receipt{} if chainConfig.Consensus == chain.BorConsensus && len(blockLogs) > 0 { - slices.SortStableFunc(blockLogs, func(i, j *types.Log) int { return cmp2.Compare(i.Index, j.Index) }) + slices.SortStableFunc(blockLogs, func(i, j *types.Log) int { return cmp2.Less(i.Index, j.Index) }) if len(blockLogs) > len(logs) { stateSyncReceipt.Logs = blockLogs[len(logs):] // get state-sync logs from `state.Logs()` diff --git a/core/blocks.go b/core/blocks.go index 630cb9b3a0f..c9439a62928 100644 --- a/core/blocks.go +++ b/core/blocks.go @@ -17,7 +17,7 @@ package core import ( - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" ) // BadHashes represent a set of manually tracked bad hashes (usually hard forks) diff --git a/core/bor_fee_log.go b/core/bor_fee_log.go index 135ffa64f5c..0236236935d 100644 --- a/core/bor_fee_log.go +++ b/core/bor_fee_log.go @@ -2,7 +2,7 @@ package core import ( "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/core/types" "github.com/ledgerwatch/erigon/core/vm/evmtypes" diff --git a/core/chain_makers.go b/core/chain_makers.go index 547a880bebe..f4973869aff 100644 --- a/core/chain_makers.go +++ b/core/chain_makers.go @@ -22,10 +22,10 @@ import ( "fmt" "math/big" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/log/v3" "github.com/ledgerwatch/erigon/common" diff --git a/core/events.go b/core/events.go index f37d7c0a34c..7a05770e8ef 100644 --- a/core/events.go +++ b/core/events.go @@ -17,7 +17,7 @@ package core import ( - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/core/types" ) diff --git a/core/evm.go b/core/evm.go index 148e1ac07f6..ec9f7159c10 100644 --- a/core/evm.go +++ b/core/evm.go @@ -22,8 +22,8 @@ import ( "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/consensus" "github.com/ledgerwatch/erigon/consensus/merge" diff --git a/core/forkid/forkid.go b/core/forkid/forkid.go index 5eee62811bb..062a7f5568c 100644 --- a/core/forkid/forkid.go +++ b/core/forkid/forkid.go @@ -26,8 +26,8 @@ import ( "reflect" "strings" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/log/v3" "golang.org/x/exp/slices" diff --git a/core/forkid/forkid_test.go b/core/forkid/forkid_test.go index 4a8e69b6226..0c6a8212f6d 100644 --- a/core/forkid/forkid_test.go +++ b/core/forkid/forkid_test.go @@ -21,8 +21,8 @@ import ( "math" "testing" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/common" "github.com/ledgerwatch/erigon/params" diff --git a/core/genesis_test.go b/core/genesis_test.go index 05c7d4d778e..4b6f4ff30e2 100644 --- a/core/genesis_test.go +++ b/core/genesis_test.go @@ -6,11 +6,11 @@ import ( "testing" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/kv" "github.com/ledgerwatch/erigon/core" "github.com/ledgerwatch/erigon/core/state/temporal" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/datadir" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/erigon/turbo/rpchelper" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/core/genesis_write.go b/core/genesis_write.go index 50ff7c2bb1e..9d9fad80e7b 100644 --- a/core/genesis_write.go +++ b/core/genesis_write.go @@ -31,12 +31,12 @@ import ( "github.com/ledgerwatch/log/v3" "golang.org/x/exp/slices" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/kvcfg" - "github.com/ledgerwatch/erigon-lib/kv/mdbx" - "github.com/ledgerwatch/erigon-lib/kv/rawdbv3" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/kvcfg" + "github.com/ledgerwatch/erigon/erigon-lib/kv/mdbx" + "github.com/ledgerwatch/erigon/erigon-lib/kv/rawdbv3" "github.com/ledgerwatch/erigon/common" "github.com/ledgerwatch/erigon/common/hexutil" diff --git a/core/rawdb/accessors_account.go b/core/rawdb/accessors_account.go index 254d4d9bb02..00efd75ed8e 100644 --- a/core/rawdb/accessors_account.go +++ b/core/rawdb/accessors_account.go @@ -17,8 +17,8 @@ package rawdb import ( - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/erigon/core/types/accounts" ) diff --git a/core/rawdb/accessors_chain.go b/core/rawdb/accessors_chain.go index 02dee8ea2fb..8154bcce178 100644 --- a/core/rawdb/accessors_chain.go +++ b/core/rawdb/accessors_chain.go @@ -27,14 +27,14 @@ import ( "time" "github.com/gballet/go-verkle" - common2 "github.com/ledgerwatch/erigon-lib/common" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/cmp" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/rawdbv3" + common2 "github.com/ledgerwatch/erigon/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/cmp" + "github.com/ledgerwatch/erigon/erigon-lib/common/dbg" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/rawdbv3" "github.com/ledgerwatch/log/v3" "github.com/ledgerwatch/erigon/common" diff --git a/core/rawdb/accessors_chain_test.go b/core/rawdb/accessors_chain_test.go index a317d7b133e..5ed5c0aa10a 100644 --- a/core/rawdb/accessors_chain_test.go +++ b/core/rawdb/accessors_chain_test.go @@ -24,9 +24,9 @@ import ( "math/big" "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv/memdb" "github.com/ledgerwatch/erigon/core/rawdb" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv/memdb" "github.com/ledgerwatch/erigon/turbo/stages/mock" "github.com/ledgerwatch/log/v3" "github.com/stretchr/testify/require" diff --git a/core/rawdb/accessors_indexes.go b/core/rawdb/accessors_indexes.go index 97ef018347a..a65667fb087 100644 --- a/core/rawdb/accessors_indexes.go +++ b/core/rawdb/accessors_indexes.go @@ -19,8 +19,8 @@ package rawdb import ( "math/big" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/log/v3" "github.com/ledgerwatch/erigon/core/types" diff --git a/core/rawdb/accessors_indexes_test.go b/core/rawdb/accessors_indexes_test.go index dc7283bd653..fe0bd76d65a 100644 --- a/core/rawdb/accessors_indexes_test.go +++ b/core/rawdb/accessors_indexes_test.go @@ -22,10 +22,10 @@ import ( "testing" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" "github.com/ledgerwatch/erigon/core/rawdb" "github.com/ledgerwatch/erigon/core/types" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/erigon/turbo/services" "github.com/ledgerwatch/erigon/turbo/stages/mock" "github.com/ledgerwatch/log/v3" diff --git a/core/rawdb/accessors_metadata.go b/core/rawdb/accessors_metadata.go index d93691c723d..90e3755b57c 100644 --- a/core/rawdb/accessors_metadata.go +++ b/core/rawdb/accessors_metadata.go @@ -20,9 +20,9 @@ import ( "encoding/json" "fmt" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv" ) // ReadChainConfig retrieves the consensus settings based on the given genesis hash. diff --git a/core/rawdb/blockio/block_writer.go b/core/rawdb/blockio/block_writer.go index 0b645e0df87..97d440fb687 100644 --- a/core/rawdb/blockio/block_writer.go +++ b/core/rawdb/blockio/block_writer.go @@ -4,13 +4,13 @@ import ( "context" "encoding/binary" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/etl" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/rawdbv3" "github.com/ledgerwatch/erigon/common/dbutils" "github.com/ledgerwatch/erigon/core/rawdb" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/etl" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/rawdbv3" "github.com/ledgerwatch/erigon/turbo/backup" "github.com/ledgerwatch/log/v3" ) diff --git a/core/rawdb/bor_receipts.go b/core/rawdb/bor_receipts.go index e5eef61f391..af13cf46dde 100644 --- a/core/rawdb/bor_receipts.go +++ b/core/rawdb/bor_receipts.go @@ -6,9 +6,9 @@ import ( "fmt" "math/big" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/kv" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/log/v3" "github.com/ledgerwatch/erigon/common/dbutils" diff --git a/core/rawdb/rawdbhelpers/rawdbhelpers.go b/core/rawdb/rawdbhelpers/rawdbhelpers.go index 195c3950810..1997e468e15 100644 --- a/core/rawdb/rawdbhelpers/rawdbhelpers.go +++ b/core/rawdb/rawdbhelpers/rawdbhelpers.go @@ -3,7 +3,7 @@ package rawdbhelpers import ( "encoding/binary" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/erigon/eth/ethconfig" ) diff --git a/core/rawdb/rawdbreset/reset_stages.go b/core/rawdb/rawdbreset/reset_stages.go index cb5e238b8c8..e6c0b5851ba 100644 --- a/core/rawdb/rawdbreset/reset_stages.go +++ b/core/rawdb/rawdbreset/reset_stages.go @@ -4,15 +4,15 @@ import ( "context" "fmt" - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/kvcfg" - "github.com/ledgerwatch/erigon-lib/state" "github.com/ledgerwatch/erigon/consensus" "github.com/ledgerwatch/erigon/core" "github.com/ledgerwatch/erigon/core/rawdb" "github.com/ledgerwatch/erigon/core/rawdb/blockio" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + "github.com/ledgerwatch/erigon/erigon-lib/common/datadir" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/kvcfg" + "github.com/ledgerwatch/erigon/erigon-lib/state" "github.com/ledgerwatch/erigon/eth/stagedsync" "github.com/ledgerwatch/erigon/eth/stagedsync/stages" "github.com/ledgerwatch/erigon/turbo/backup" diff --git a/core/rawdb/state_version.go b/core/rawdb/state_version.go index f849b0146c7..998a55b3198 100644 --- a/core/rawdb/state_version.go +++ b/core/rawdb/state_version.go @@ -3,7 +3,7 @@ package rawdb import ( "encoding/binary" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv" ) func GetStateVersion(tx kv.Tx) (uint64, error) { diff --git a/core/rlp_test.go b/core/rlp_test.go index 8ef1c13ba83..288e619c85b 100644 --- a/core/rlp_test.go +++ b/core/rlp_test.go @@ -22,9 +22,9 @@ import ( "math/big" "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/datadir" "github.com/ledgerwatch/erigon/core/state/temporal" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/datadir" "golang.org/x/crypto/sha3" "github.com/ledgerwatch/erigon/common/u256" diff --git a/core/skip_analysis.go b/core/skip_analysis.go index 96c9226bdd9..d57032c3fe5 100644 --- a/core/skip_analysis.go +++ b/core/skip_analysis.go @@ -19,7 +19,7 @@ package core import ( "sort" - "github.com/ledgerwatch/erigon-lib/chain" + "github.com/ledgerwatch/erigon/erigon-lib/chain" "github.com/ledgerwatch/erigon/params/networkname" ) diff --git a/core/state/access_list.go b/core/state/access_list.go index 72f9e9a4c75..e26953c2a7b 100644 --- a/core/state/access_list.go +++ b/core/state/access_list.go @@ -17,7 +17,7 @@ package state import ( - "github.com/ledgerwatch/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common" ) type accessList struct { diff --git a/core/state/access_list_test.go b/core/state/access_list_test.go index 03ad2511203..2894d7546f0 100644 --- a/core/state/access_list_test.go +++ b/core/state/access_list_test.go @@ -3,8 +3,8 @@ package state import ( "testing" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv/memdb" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv/memdb" ) func verifyAddrs(t *testing.T, s *IntraBlockState, astrings ...string) { diff --git a/core/state/cached_reader.go b/core/state/cached_reader.go index 196d3823344..2c40a1e89d5 100644 --- a/core/state/cached_reader.go +++ b/core/state/cached_reader.go @@ -3,7 +3,7 @@ package state import ( "bytes" - "github.com/ledgerwatch/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/core/types/accounts" "github.com/ledgerwatch/erigon/turbo/shards" diff --git a/core/state/cached_reader2.go b/core/state/cached_reader2.go index 58e63b4620f..c8a1dbf2a20 100644 --- a/core/state/cached_reader2.go +++ b/core/state/cached_reader2.go @@ -4,9 +4,9 @@ import ( "bytes" "encoding/binary" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/kvcache" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/kvcache" "github.com/ledgerwatch/erigon/common/dbutils" "github.com/ledgerwatch/erigon/core/types/accounts" diff --git a/core/state/cached_writer.go b/core/state/cached_writer.go index 1cd916ae382..489f272987d 100644 --- a/core/state/cached_writer.go +++ b/core/state/cached_writer.go @@ -2,7 +2,7 @@ package state import ( "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/core/types/accounts" "github.com/ledgerwatch/erigon/turbo/shards" diff --git a/core/state/change_set_writer.go b/core/state/change_set_writer.go index b3da878448f..67b9e093406 100644 --- a/core/state/change_set_writer.go +++ b/core/state/change_set_writer.go @@ -4,10 +4,10 @@ import ( "fmt" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/kv" - historyv22 "github.com/ledgerwatch/erigon-lib/kv/temporal/historyv2" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + historyv22 "github.com/ledgerwatch/erigon/erigon-lib/kv/temporal/historyv2" "github.com/ledgerwatch/erigon/common" "github.com/ledgerwatch/erigon/common/dbutils" diff --git a/core/state/contracts/gen_changer.go b/core/state/contracts/gen_changer.go index ffe8ef43dc9..6a192206da6 100644 --- a/core/state/contracts/gen_changer.go +++ b/core/state/contracts/gen_changer.go @@ -7,7 +7,7 @@ import ( "math/big" "strings" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" ethereum "github.com/ledgerwatch/erigon" "github.com/ledgerwatch/erigon/accounts/abi" diff --git a/core/state/contracts/gen_phoenix.go b/core/state/contracts/gen_phoenix.go index e26dfa963ec..28f97fed5c6 100644 --- a/core/state/contracts/gen_phoenix.go +++ b/core/state/contracts/gen_phoenix.go @@ -7,7 +7,7 @@ import ( "math/big" "strings" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" ethereum "github.com/ledgerwatch/erigon" "github.com/ledgerwatch/erigon/accounts/abi" diff --git a/core/state/contracts/gen_poly.go b/core/state/contracts/gen_poly.go index 8da9b79bf02..b1aa6efa2d2 100644 --- a/core/state/contracts/gen_poly.go +++ b/core/state/contracts/gen_poly.go @@ -7,7 +7,7 @@ import ( "math/big" "strings" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" ethereum "github.com/ledgerwatch/erigon" "github.com/ledgerwatch/erigon/accounts/abi" diff --git a/core/state/contracts/gen_revive.go b/core/state/contracts/gen_revive.go index f769b92726f..e1efb449c82 100644 --- a/core/state/contracts/gen_revive.go +++ b/core/state/contracts/gen_revive.go @@ -7,7 +7,7 @@ import ( "math/big" "strings" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" ethereum "github.com/ledgerwatch/erigon" "github.com/ledgerwatch/erigon/accounts/abi" diff --git a/core/state/contracts/gen_revive2.go b/core/state/contracts/gen_revive2.go index d7dbfe85054..af7f434a8fa 100644 --- a/core/state/contracts/gen_revive2.go +++ b/core/state/contracts/gen_revive2.go @@ -7,7 +7,7 @@ import ( "math/big" "strings" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" ethereum "github.com/ledgerwatch/erigon" "github.com/ledgerwatch/erigon/accounts/abi" diff --git a/core/state/contracts/gen_selfdestruct.go b/core/state/contracts/gen_selfdestruct.go index 1049bda856c..48ffe0fa287 100644 --- a/core/state/contracts/gen_selfdestruct.go +++ b/core/state/contracts/gen_selfdestruct.go @@ -7,7 +7,7 @@ import ( "math/big" "strings" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" ethereum "github.com/ledgerwatch/erigon" "github.com/ledgerwatch/erigon/accounts/abi" diff --git a/core/state/database.go b/core/state/database.go index 651581ebfd3..3e2d1e3666d 100644 --- a/core/state/database.go +++ b/core/state/database.go @@ -19,7 +19,7 @@ package state import ( "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/core/types/accounts" ) diff --git a/core/state/database_test.go b/core/state/database_test.go index ce50eb03bcd..96fd7bc2f95 100644 --- a/core/state/database_test.go +++ b/core/state/database_test.go @@ -24,10 +24,10 @@ import ( "testing" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/memdb" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/memdb" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/core/state/db_state_reader.go b/core/state/db_state_reader.go index 21f91d5e981..f7b3df3d852 100644 --- a/core/state/db_state_reader.go +++ b/core/state/db_state_reader.go @@ -5,8 +5,8 @@ import ( "encoding/binary" "github.com/VictoriaMetrics/fastcache" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/erigon/common" "github.com/ledgerwatch/erigon/common/dbutils" diff --git a/core/state/db_state_writer.go b/core/state/db_state_writer.go index fd4319840d3..be85dd37ce4 100644 --- a/core/state/db_state_writer.go +++ b/core/state/db_state_writer.go @@ -7,10 +7,10 @@ import ( "github.com/RoaringBitmap/roaring/roaring64" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/bitmapdb" - "github.com/ledgerwatch/erigon-lib/kv/temporal/historyv2" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/bitmapdb" + "github.com/ledgerwatch/erigon/erigon-lib/kv/temporal/historyv2" "github.com/ledgerwatch/erigon/common" "github.com/ledgerwatch/erigon/common/dbutils" diff --git a/core/state/dump.go b/core/state/dump.go index d217b1442a7..ff4f42f1e80 100644 --- a/core/state/dump.go +++ b/core/state/dump.go @@ -21,11 +21,11 @@ import ( "encoding/json" "fmt" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/order" - "github.com/ledgerwatch/erigon-lib/kv/rawdbv3" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/order" + "github.com/ledgerwatch/erigon/erigon-lib/kv/rawdbv3" "github.com/ledgerwatch/erigon/common" "github.com/ledgerwatch/erigon/common/dbutils" diff --git a/core/state/history_reader_inc.go b/core/state/history_reader_inc.go index f3021a79cf5..bdefda5e559 100644 --- a/core/state/history_reader_inc.go +++ b/core/state/history_reader_inc.go @@ -4,9 +4,9 @@ import ( "encoding/binary" "fmt" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - libstate "github.com/ledgerwatch/erigon-lib/state" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + libstate "github.com/ledgerwatch/erigon/erigon-lib/state" "github.com/ledgerwatch/erigon/core/types/accounts" ) diff --git a/core/state/history_reader_v3.go b/core/state/history_reader_v3.go index 855d46d6d84..1a6096406d3 100644 --- a/core/state/history_reader_v3.go +++ b/core/state/history_reader_v3.go @@ -4,9 +4,9 @@ import ( "encoding/binary" "fmt" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" "github.com/ledgerwatch/erigon/core/types/accounts" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/erigon/eth/ethconfig" ) diff --git a/core/state/history_test.go b/core/state/history_test.go index ab243534bba..fb61800bdfb 100644 --- a/core/state/history_test.go +++ b/core/state/history_test.go @@ -10,12 +10,12 @@ import ( "github.com/davecgh/go-spew/spew" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/bitmapdb" - "github.com/ledgerwatch/erigon-lib/kv/memdb" - "github.com/ledgerwatch/erigon-lib/kv/temporal/historyv2" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/bitmapdb" + "github.com/ledgerwatch/erigon/erigon-lib/kv/memdb" + "github.com/ledgerwatch/erigon/erigon-lib/kv/temporal/historyv2" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/core/state/history_walk.go b/core/state/history_walk.go index f14446f122a..c5a6c303170 100644 --- a/core/state/history_walk.go +++ b/core/state/history_walk.go @@ -6,10 +6,10 @@ import ( "fmt" "github.com/RoaringBitmap/roaring/roaring64" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/bitmapdb" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/bitmapdb" "github.com/ledgerwatch/erigon/common" "github.com/ledgerwatch/erigon/common/dbutils" diff --git a/core/state/historyv2read/history.go b/core/state/historyv2read/history.go index b33680397ae..a36df74987e 100644 --- a/core/state/historyv2read/history.go +++ b/core/state/historyv2read/history.go @@ -3,11 +3,11 @@ package historyv2read import ( "encoding/binary" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/temporal/historyv2" "github.com/ledgerwatch/erigon/core/types/accounts" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/temporal/historyv2" ) const DefaultIncarnation = uint64(1) diff --git a/core/state/intra_block_state.go b/core/state/intra_block_state.go index 34e9b3be0b8..c02c8ffec22 100644 --- a/core/state/intra_block_state.go +++ b/core/state/intra_block_state.go @@ -23,13 +23,13 @@ import ( "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - types2 "github.com/ledgerwatch/erigon-lib/types" "github.com/ledgerwatch/erigon/common/u256" "github.com/ledgerwatch/erigon/core/types" "github.com/ledgerwatch/erigon/core/types/accounts" "github.com/ledgerwatch/erigon/crypto" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + types2 "github.com/ledgerwatch/erigon/erigon-lib/types" "github.com/ledgerwatch/erigon/turbo/trie" ) diff --git a/core/state/intra_block_state_test.go b/core/state/intra_block_state_test.go index 08f4b28899f..9ad23fdd4c9 100644 --- a/core/state/intra_block_state_test.go +++ b/core/state/intra_block_state_test.go @@ -32,9 +32,9 @@ import ( "testing/quick" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv/memdb" "github.com/ledgerwatch/erigon/core/types" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv/memdb" ) func TestSnapshotRandom(t *testing.T) { diff --git a/core/state/journal.go b/core/state/journal.go index 4b018dcbfca..b4f3a90a133 100644 --- a/core/state/journal.go +++ b/core/state/journal.go @@ -18,7 +18,7 @@ package state import ( "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" ) // journalEntry is a modification entry in the state change journal that can be diff --git a/core/state/plain_readonly.go b/core/state/plain_readonly.go index 433ffeccd25..a55e916ac8b 100644 --- a/core/state/plain_readonly.go +++ b/core/state/plain_readonly.go @@ -24,10 +24,10 @@ import ( "github.com/google/btree" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/kvcfg" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/kvcfg" "github.com/ledgerwatch/log/v3" "github.com/ledgerwatch/erigon/common" diff --git a/core/state/plain_state_reader.go b/core/state/plain_state_reader.go index 0b43033f259..39eb2b579e6 100644 --- a/core/state/plain_state_reader.go +++ b/core/state/plain_state_reader.go @@ -4,8 +4,8 @@ import ( "bytes" "encoding/binary" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/erigon/common/dbutils" "github.com/ledgerwatch/erigon/core/types/accounts" diff --git a/core/state/plain_state_writer.go b/core/state/plain_state_writer.go index 367139027df..44db2d73fd4 100644 --- a/core/state/plain_state_writer.go +++ b/core/state/plain_state_writer.go @@ -4,8 +4,8 @@ import ( "encoding/binary" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/erigon/common/dbutils" "github.com/ledgerwatch/erigon/core/types/accounts" diff --git a/core/state/recon_state.go b/core/state/recon_state.go index 1bc8fa8a19e..d0c92a91a0c 100644 --- a/core/state/recon_state.go +++ b/core/state/recon_state.go @@ -11,8 +11,8 @@ import ( "github.com/RoaringBitmap/roaring/roaring64" "github.com/google/btree" - "github.com/ledgerwatch/erigon-lib/kv" "github.com/ledgerwatch/erigon/cmd/state/exec22" + "github.com/ledgerwatch/erigon/erigon-lib/kv" btree2 "github.com/tidwall/btree" ) diff --git a/core/state/recon_writer_inc.go b/core/state/recon_writer_inc.go index 05862023dbe..b7b19624c17 100644 --- a/core/state/recon_writer_inc.go +++ b/core/state/recon_writer_inc.go @@ -4,9 +4,9 @@ import ( "bytes" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - libstate "github.com/ledgerwatch/erigon-lib/state" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + libstate "github.com/ledgerwatch/erigon/erigon-lib/state" "github.com/ledgerwatch/erigon/common" "github.com/ledgerwatch/erigon/common/dbutils" diff --git a/core/state/rw_v3.go b/core/state/rw_v3.go index 756501a8afe..e1c6eb0330e 100644 --- a/core/state/rw_v3.go +++ b/core/state/rw_v3.go @@ -12,13 +12,13 @@ import ( "github.com/VictoriaMetrics/metrics" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/etl" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/order" - libstate "github.com/ledgerwatch/erigon-lib/state" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/dbg" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" + "github.com/ledgerwatch/erigon/erigon-lib/etl" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/order" + libstate "github.com/ledgerwatch/erigon/erigon-lib/state" "github.com/ledgerwatch/log/v3" btree2 "github.com/tidwall/btree" diff --git a/core/state/state_object.go b/core/state/state_object.go index 9d681b6749e..18783d9b88f 100644 --- a/core/state/state_object.go +++ b/core/state/state_object.go @@ -23,7 +23,7 @@ import ( "math/big" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/core/types/accounts" "github.com/ledgerwatch/erigon/crypto" diff --git a/core/state/state_object_test.go b/core/state/state_object_test.go index 36042fd36d7..0cd77be2927 100644 --- a/core/state/state_object_test.go +++ b/core/state/state_object_test.go @@ -20,7 +20,7 @@ import ( "bytes" "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/common" ) diff --git a/core/state/state_test.go b/core/state/state_test.go index 7a81456b31f..aa99aabdc1f 100644 --- a/core/state/state_test.go +++ b/core/state/state_test.go @@ -22,11 +22,11 @@ import ( "testing" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/kvcfg" - "github.com/ledgerwatch/erigon-lib/kv/memdb" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/kvcfg" + "github.com/ledgerwatch/erigon/erigon-lib/kv/memdb" checker "gopkg.in/check.v1" "github.com/ledgerwatch/erigon/core/types/accounts" diff --git a/core/state/temporal/kv_temporal.go b/core/state/temporal/kv_temporal.go index 3ebd94952d2..5d99130d457 100644 --- a/core/state/temporal/kv_temporal.go +++ b/core/state/temporal/kv_temporal.go @@ -6,22 +6,22 @@ import ( "fmt" "testing" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/common/dir" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/iter" - "github.com/ledgerwatch/erigon-lib/kv/kvcfg" - "github.com/ledgerwatch/erigon-lib/kv/mdbx" - "github.com/ledgerwatch/erigon-lib/kv/memdb" - "github.com/ledgerwatch/erigon-lib/kv/order" - "github.com/ledgerwatch/erigon-lib/kv/rawdbv3" - "github.com/ledgerwatch/erigon-lib/state" "github.com/ledgerwatch/erigon/core/state/historyv2read" "github.com/ledgerwatch/erigon/core/systemcontracts" "github.com/ledgerwatch/erigon/core/types" "github.com/ledgerwatch/erigon/core/types/accounts" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/datadir" + "github.com/ledgerwatch/erigon/erigon-lib/common/dir" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/iter" + "github.com/ledgerwatch/erigon/erigon-lib/kv/kvcfg" + "github.com/ledgerwatch/erigon/erigon-lib/kv/mdbx" + "github.com/ledgerwatch/erigon/erigon-lib/kv/memdb" + "github.com/ledgerwatch/erigon/erigon-lib/kv/order" + "github.com/ledgerwatch/erigon/erigon-lib/kv/rawdbv3" + "github.com/ledgerwatch/erigon/erigon-lib/state" "github.com/ledgerwatch/erigon/eth/ethconfig" "github.com/ledgerwatch/log/v3" ) diff --git a/core/state/transient_storage.go b/core/state/transient_storage.go index 39b2535fdf5..af2aa8aabb7 100644 --- a/core/state/transient_storage.go +++ b/core/state/transient_storage.go @@ -19,7 +19,7 @@ package state import ( "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" ) // transientStorage is a representation of EIP-1153 "Transient Storage". diff --git a/core/state_processor.go b/core/state_processor.go index 672385fa7f2..497ae867f09 100644 --- a/core/state_processor.go +++ b/core/state_processor.go @@ -17,8 +17,8 @@ package core import ( - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/consensus" "github.com/ledgerwatch/erigon/core/state" diff --git a/core/state_transition.go b/core/state_transition.go index 5ab9d196db0..f4b43d7a8a6 100644 --- a/core/state_transition.go +++ b/core/state_transition.go @@ -20,9 +20,9 @@ import ( "fmt" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/txpool/txpoolcfg" - types2 "github.com/ledgerwatch/erigon-lib/types" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/txpool/txpoolcfg" + types2 "github.com/ledgerwatch/erigon/erigon-lib/types" "github.com/ledgerwatch/erigon/common" cmath "github.com/ledgerwatch/erigon/common/math" diff --git a/core/system_contract_lookup.go b/core/system_contract_lookup.go index 0e26363ba5d..d4ba2db9a71 100644 --- a/core/system_contract_lookup.go +++ b/core/system_contract_lookup.go @@ -4,8 +4,8 @@ import ( "encoding/hex" "fmt" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" "github.com/ledgerwatch/erigon/common" "github.com/ledgerwatch/erigon/core/systemcontracts" diff --git a/core/systemcontracts/const.go b/core/systemcontracts/const.go index ab3315e726f..358e037eb29 100644 --- a/core/systemcontracts/const.go +++ b/core/systemcontracts/const.go @@ -1,7 +1,7 @@ package systemcontracts import ( - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" ) var ( diff --git a/core/systemcontracts/upgrade.go b/core/systemcontracts/upgrade.go index 677aea242fe..91ac429a199 100644 --- a/core/systemcontracts/upgrade.go +++ b/core/systemcontracts/upgrade.go @@ -5,9 +5,9 @@ import ( "fmt" "math/big" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/core/vm/evmtypes" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/log/v3" "github.com/ledgerwatch/erigon/params/networkname" diff --git a/core/tx_cacher.go b/core/tx_cacher.go index e4c8cf05781..15f3ca8115f 100644 --- a/core/tx_cacher.go +++ b/core/tx_cacher.go @@ -19,9 +19,9 @@ package core import ( "sync" - libcommon "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/common/debug" "github.com/ledgerwatch/erigon/core/types" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" ) // txSenderCacherRequest is a request for recovering transaction senders with a diff --git a/core/types/access_list_tx.go b/core/types/access_list_tx.go index 562205d3327..97bcec1f77f 100644 --- a/core/types/access_list_tx.go +++ b/core/types/access_list_tx.go @@ -26,9 +26,9 @@ import ( "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - types2 "github.com/ledgerwatch/erigon-lib/types" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + types2 "github.com/ledgerwatch/erigon/erigon-lib/types" "github.com/ledgerwatch/erigon/common" "github.com/ledgerwatch/erigon/common/u256" diff --git a/core/types/accounts/account.go b/core/types/accounts/account.go index 1953249c652..fc6511cbd3f 100644 --- a/core/types/accounts/account.go +++ b/core/types/accounts/account.go @@ -7,7 +7,7 @@ import ( "sync" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/crypto" "github.com/ledgerwatch/erigon/rlp" diff --git a/core/types/accounts/account_benchmark_test.go b/core/types/accounts/account_benchmark_test.go index 626ece3ebe0..726ac4d9419 100644 --- a/core/types/accounts/account_benchmark_test.go +++ b/core/types/accounts/account_benchmark_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/crypto" ) diff --git a/core/types/accounts/account_proof.go b/core/types/accounts/account_proof.go index 7653445d1d1..f1025dd96ef 100644 --- a/core/types/accounts/account_proof.go +++ b/core/types/accounts/account_proof.go @@ -1,8 +1,8 @@ package accounts import ( - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" "github.com/ledgerwatch/erigon/common/hexutil" ) diff --git a/core/types/accounts/account_test.go b/core/types/accounts/account_test.go index 6383a1440e7..ddc7860a2ef 100644 --- a/core/types/accounts/account_test.go +++ b/core/types/accounts/account_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/crypto" ) diff --git a/core/types/blacklist.go b/core/types/blacklist.go index ba0f6d15735..8015245737e 100644 --- a/core/types/blacklist.go +++ b/core/types/blacklist.go @@ -1,7 +1,7 @@ package types import ( - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" ) // This is introduced because of the Tendermint IAVL Merkle Proof verification exploitation. diff --git a/core/types/blob_tx.go b/core/types/blob_tx.go index dfe03c44c58..06ebb761155 100644 --- a/core/types/blob_tx.go +++ b/core/types/blob_tx.go @@ -8,10 +8,10 @@ import ( "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/fixedgas" - types2 "github.com/ledgerwatch/erigon-lib/types" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/fixedgas" + types2 "github.com/ledgerwatch/erigon/erigon-lib/types" "github.com/ledgerwatch/erigon/rlp" ) diff --git a/core/types/blob_tx_wrapper.go b/core/types/blob_tx_wrapper.go index a078cc351f5..c2cd17dbdd0 100644 --- a/core/types/blob_tx_wrapper.go +++ b/core/types/blob_tx_wrapper.go @@ -10,11 +10,11 @@ import ( gokzg4844 "github.com/crate-crypto/go-kzg-4844" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/fixedgas" - libkzg "github.com/ledgerwatch/erigon-lib/crypto/kzg" - types2 "github.com/ledgerwatch/erigon-lib/types" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/fixedgas" + libkzg "github.com/ledgerwatch/erigon/erigon-lib/crypto/kzg" + types2 "github.com/ledgerwatch/erigon/erigon-lib/types" "github.com/ledgerwatch/erigon/rlp" ) diff --git a/core/types/block.go b/core/types/block.go index c99ec59a9fa..cbd08b2e680 100644 --- a/core/types/block.go +++ b/core/types/block.go @@ -29,9 +29,9 @@ import ( "sync/atomic" "github.com/gballet/go-verkle" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - rlp2 "github.com/ledgerwatch/erigon-lib/rlp" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" + rlp2 "github.com/ledgerwatch/erigon/erigon-lib/rlp" "github.com/ledgerwatch/erigon/common" "github.com/ledgerwatch/erigon/common/hexutil" diff --git a/core/types/block_test.go b/core/types/block_test.go index be05c716b26..67105f3422a 100644 --- a/core/types/block_test.go +++ b/core/types/block_test.go @@ -25,9 +25,9 @@ import ( "testing" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - types2 "github.com/ledgerwatch/erigon-lib/types" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" + types2 "github.com/ledgerwatch/erigon/erigon-lib/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/core/types/bloom9.go b/core/types/bloom9.go index 07ba1f9583b..11a01b2e65a 100644 --- a/core/types/bloom9.go +++ b/core/types/bloom9.go @@ -21,7 +21,7 @@ import ( "fmt" "math/big" - "github.com/ledgerwatch/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" "github.com/ledgerwatch/erigon/crypto" "github.com/ledgerwatch/erigon/crypto/cryptopool" diff --git a/core/types/bloom9_test.go b/core/types/bloom9_test.go index 97b1f8b9f8e..7d30b37adc9 100644 --- a/core/types/bloom9_test.go +++ b/core/types/bloom9_test.go @@ -22,7 +22,7 @@ import ( "testing" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/crypto" ) diff --git a/core/types/bor_receipt.go b/core/types/bor_receipt.go index a993de490c4..7fdb3c86e6f 100644 --- a/core/types/bor_receipt.go +++ b/core/types/bor_receipt.go @@ -5,7 +5,7 @@ import ( "sort" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/common/dbutils" "github.com/ledgerwatch/erigon/crypto" diff --git a/core/types/dynamic_fee_tx.go b/core/types/dynamic_fee_tx.go index 0fa8b865569..7e475351a3f 100644 --- a/core/types/dynamic_fee_tx.go +++ b/core/types/dynamic_fee_tx.go @@ -25,9 +25,9 @@ import ( "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - types2 "github.com/ledgerwatch/erigon-lib/types" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + types2 "github.com/ledgerwatch/erigon/erigon-lib/types" "github.com/ledgerwatch/erigon/common" "github.com/ledgerwatch/erigon/common/u256" diff --git a/core/types/gen_erigon_log_json.go b/core/types/gen_erigon_log_json.go index 2360e2fdba0..22d1947c79d 100644 --- a/core/types/gen_erigon_log_json.go +++ b/core/types/gen_erigon_log_json.go @@ -6,8 +6,8 @@ import ( "encoding/json" "errors" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" "github.com/ledgerwatch/erigon/common/hexutil" ) diff --git a/core/types/gen_genesis.go b/core/types/gen_genesis.go index 3528ce38e56..e30c6183d1b 100644 --- a/core/types/gen_genesis.go +++ b/core/types/gen_genesis.go @@ -7,9 +7,9 @@ import ( "errors" "math/big" - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" common0 "github.com/ledgerwatch/erigon/common" "github.com/ledgerwatch/erigon/common/math" ) diff --git a/core/types/gen_genesis_account.go b/core/types/gen_genesis_account.go index 21fa482d88c..fe61c772b95 100644 --- a/core/types/gen_genesis_account.go +++ b/core/types/gen_genesis_account.go @@ -7,8 +7,8 @@ import ( "errors" "math/big" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" "github.com/ledgerwatch/erigon/common/math" ) diff --git a/core/types/gen_header_json.go b/core/types/gen_header_json.go index 17b70798b48..c506f9aedb9 100644 --- a/core/types/gen_header_json.go +++ b/core/types/gen_header_json.go @@ -7,8 +7,8 @@ import ( "errors" "math/big" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" "github.com/ledgerwatch/erigon/common/hexutil" ) diff --git a/core/types/gen_log_json.go b/core/types/gen_log_json.go index e3db5873dc4..4758ed2d1dd 100644 --- a/core/types/gen_log_json.go +++ b/core/types/gen_log_json.go @@ -6,8 +6,8 @@ import ( "encoding/json" "errors" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" "github.com/ledgerwatch/erigon/common/hexutil" ) diff --git a/core/types/gen_receipt_json.go b/core/types/gen_receipt_json.go index 8a898648386..89296596b34 100644 --- a/core/types/gen_receipt_json.go +++ b/core/types/gen_receipt_json.go @@ -7,8 +7,8 @@ import ( "errors" "math/big" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" "github.com/ledgerwatch/erigon/common/hexutil" ) diff --git a/core/types/gen_withdrawal_json.go b/core/types/gen_withdrawal_json.go index c56eb61537d..334448b28a9 100644 --- a/core/types/gen_withdrawal_json.go +++ b/core/types/gen_withdrawal_json.go @@ -5,7 +5,7 @@ package types import ( "encoding/json" - "github.com/ledgerwatch/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/common/hexutil" ) diff --git a/core/types/genesis.go b/core/types/genesis.go index 9a696a0bd25..0a2d5f7f280 100644 --- a/core/types/genesis.go +++ b/core/types/genesis.go @@ -24,9 +24,9 @@ import ( "fmt" "math/big" - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" common2 "github.com/ledgerwatch/erigon/common" "github.com/ledgerwatch/erigon/common/math" diff --git a/core/types/hashing.go b/core/types/hashing.go index eb363872531..5bcb3a66b1a 100644 --- a/core/types/hashing.go +++ b/core/types/hashing.go @@ -21,7 +21,7 @@ import ( "fmt" "io" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/protolambda/ztyp/codec" "github.com/ledgerwatch/erigon/crypto" diff --git a/core/types/hashing_test.go b/core/types/hashing_test.go index 5150a5b9a08..4e0d6f2c40a 100644 --- a/core/types/hashing_test.go +++ b/core/types/hashing_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/common" "github.com/ledgerwatch/erigon/rlp" diff --git a/core/types/legacy_tx.go b/core/types/legacy_tx.go index 92c12f2f964..980af01b67d 100644 --- a/core/types/legacy_tx.go +++ b/core/types/legacy_tx.go @@ -24,9 +24,9 @@ import ( "math/bits" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - types2 "github.com/ledgerwatch/erigon-lib/types" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + types2 "github.com/ledgerwatch/erigon/erigon-lib/types" "github.com/ledgerwatch/erigon/common" "github.com/ledgerwatch/erigon/common/u256" diff --git a/core/types/log.go b/core/types/log.go index 552300f49a6..7d87f5d7c16 100644 --- a/core/types/log.go +++ b/core/types/log.go @@ -19,8 +19,8 @@ package types import ( "io" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" "github.com/ledgerwatch/erigon/common/hexutil" "github.com/ledgerwatch/erigon/rlp" diff --git a/core/types/log_test.go b/core/types/log_test.go index 408bb33aaef..6cf77a6fb75 100644 --- a/core/types/log_test.go +++ b/core/types/log_test.go @@ -23,7 +23,7 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/common/hexutil" ) diff --git a/core/types/receipt.go b/core/types/receipt.go index bc3a4d9a7ba..15d4a9d05ef 100644 --- a/core/types/receipt.go +++ b/core/types/receipt.go @@ -23,8 +23,8 @@ import ( "io" "math/big" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" "github.com/ledgerwatch/erigon/common/hexutil" "github.com/ledgerwatch/erigon/crypto" diff --git a/core/types/receipt_codecgen_gen.go b/core/types/receipt_codecgen_gen.go index e2bc7db9db1..b27ff3b91ba 100644 --- a/core/types/receipt_codecgen_gen.go +++ b/core/types/receipt_codecgen_gen.go @@ -7,7 +7,7 @@ package types import ( "errors" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" codec1978 "github.com/ugorji/go/codec" pkg2_big "math/big" "runtime" diff --git a/core/types/receipt_test.go b/core/types/receipt_test.go index cef57f007db..3a4e309ed76 100644 --- a/core/types/receipt_test.go +++ b/core/types/receipt_test.go @@ -25,7 +25,7 @@ import ( "testing" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/common" "github.com/ledgerwatch/erigon/common/u256" diff --git a/core/types/state_data.go b/core/types/state_data.go index 03d1a221137..3205519f73f 100644 --- a/core/types/state_data.go +++ b/core/types/state_data.go @@ -1,7 +1,7 @@ package types import ( - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" ) // StateSyncData represents state received from Ethereum Blockchain diff --git a/core/types/transaction.go b/core/types/transaction.go index 71f6f729aa9..d3b7d70c0d5 100644 --- a/core/types/transaction.go +++ b/core/types/transaction.go @@ -30,10 +30,10 @@ import ( "github.com/ledgerwatch/log/v3" "github.com/protolambda/ztyp/codec" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/fixedgas" - types2 "github.com/ledgerwatch/erigon-lib/types" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/fixedgas" + types2 "github.com/ledgerwatch/erigon/erigon-lib/types" "github.com/ledgerwatch/erigon/common" "github.com/ledgerwatch/erigon/common/math" diff --git a/core/types/transaction_marshalling.go b/core/types/transaction_marshalling.go index c2d460a6643..da73c4c91a5 100644 --- a/core/types/transaction_marshalling.go +++ b/core/types/transaction_marshalling.go @@ -8,9 +8,9 @@ import ( "github.com/holiman/uint256" "github.com/valyala/fastjson" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - types2 "github.com/ledgerwatch/erigon-lib/types" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" + types2 "github.com/ledgerwatch/erigon/erigon-lib/types" "github.com/ledgerwatch/erigon/common/hexutil" ) diff --git a/core/types/transaction_signing.go b/core/types/transaction_signing.go index 19695c6c93d..9a867fc8937 100644 --- a/core/types/transaction_signing.go +++ b/core/types/transaction_signing.go @@ -23,8 +23,8 @@ import ( "math/big" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/secp256k1" "github.com/ledgerwatch/erigon/common/u256" diff --git a/core/types/transaction_signing_test.go b/core/types/transaction_signing_test.go index 76e306528ea..04612054b20 100644 --- a/core/types/transaction_signing_test.go +++ b/core/types/transaction_signing_test.go @@ -21,7 +21,7 @@ import ( "testing" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/common" "github.com/ledgerwatch/erigon/crypto" diff --git a/core/types/transaction_test.go b/core/types/transaction_test.go index 5d19a9b49dd..5e4acef7131 100644 --- a/core/types/transaction_test.go +++ b/core/types/transaction_test.go @@ -32,9 +32,9 @@ import ( "github.com/holiman/uint256" "github.com/stretchr/testify/assert" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/fixedgas" - types2 "github.com/ledgerwatch/erigon-lib/types" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/fixedgas" + types2 "github.com/ledgerwatch/erigon/erigon-lib/types" "github.com/ledgerwatch/erigon/common" "github.com/ledgerwatch/erigon/common/u256" diff --git a/core/types/withdrawal.go b/core/types/withdrawal.go index c5ec8274a77..34181761b9b 100644 --- a/core/types/withdrawal.go +++ b/core/types/withdrawal.go @@ -21,10 +21,10 @@ import ( "fmt" "io" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/types/clonable" - "github.com/ledgerwatch/erigon-lib/types/ssz" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" + "github.com/ledgerwatch/erigon/erigon-lib/types/clonable" + "github.com/ledgerwatch/erigon/erigon-lib/types/ssz" "github.com/ledgerwatch/erigon/cl/merkle_tree" "github.com/ledgerwatch/erigon/common/hexutil" diff --git a/core/types/withdrawal_test.go b/core/types/withdrawal_test.go index fdb11401dc7..d6d3780ab10 100644 --- a/core/types/withdrawal_test.go +++ b/core/types/withdrawal_test.go @@ -3,7 +3,7 @@ package types import ( "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/core/vm/analysis_test.go b/core/vm/analysis_test.go index c2265de4659..2e080531937 100644 --- a/core/vm/analysis_test.go +++ b/core/vm/analysis_test.go @@ -20,7 +20,7 @@ import ( "testing" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/common" "github.com/ledgerwatch/erigon/crypto" diff --git a/core/vm/contract.go b/core/vm/contract.go index a3225f1517d..9f506e0cf1f 100644 --- a/core/vm/contract.go +++ b/core/vm/contract.go @@ -18,7 +18,7 @@ package vm import ( "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" ) // ContractRef is a reference to the contract's backing object diff --git a/core/vm/contracts.go b/core/vm/contracts.go index 1fe0386030a..3f4cc66a0aa 100644 --- a/core/vm/contracts.go +++ b/core/vm/contracts.go @@ -24,9 +24,9 @@ import ( "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - libkzg "github.com/ledgerwatch/erigon-lib/crypto/kzg" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + libkzg "github.com/ledgerwatch/erigon/erigon-lib/crypto/kzg" "github.com/ledgerwatch/erigon/common" "github.com/ledgerwatch/erigon/common/math" diff --git a/core/vm/contracts_test.go b/core/vm/contracts_test.go index da2f81c9e2f..15b7bb2cb64 100644 --- a/core/vm/contracts_test.go +++ b/core/vm/contracts_test.go @@ -24,7 +24,7 @@ import ( "testing" "time" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/common" ) diff --git a/core/vm/eips.go b/core/vm/eips.go index 83d8a595018..161ceb63274 100644 --- a/core/vm/eips.go +++ b/core/vm/eips.go @@ -22,7 +22,7 @@ import ( "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/consensus/misc" "github.com/ledgerwatch/erigon/params" diff --git a/core/vm/evm.go b/core/vm/evm.go index 1c9d18481a6..f4977849b4c 100644 --- a/core/vm/evm.go +++ b/core/vm/evm.go @@ -21,8 +21,8 @@ import ( "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/common/u256" "github.com/ledgerwatch/erigon/core/vm/evmtypes" diff --git a/core/vm/evmtypes/evmtypes.go b/core/vm/evmtypes/evmtypes.go index ac2012a8158..148f6fd9900 100644 --- a/core/vm/evmtypes/evmtypes.go +++ b/core/vm/evmtypes/evmtypes.go @@ -5,9 +5,9 @@ import ( "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/common" - types2 "github.com/ledgerwatch/erigon-lib/types" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + "github.com/ledgerwatch/erigon/erigon-lib/common" + types2 "github.com/ledgerwatch/erigon/erigon-lib/types" "github.com/ledgerwatch/erigon/core/types" ) diff --git a/core/vm/gas_table.go b/core/vm/gas_table.go index f4495765f4c..bd84e4462df 100644 --- a/core/vm/gas_table.go +++ b/core/vm/gas_table.go @@ -21,8 +21,8 @@ import ( "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/math" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/math" "github.com/ledgerwatch/erigon/core/vm/stack" "github.com/ledgerwatch/erigon/params" diff --git a/core/vm/gas_table_test.go b/core/vm/gas_table_test.go index 7e3300a37ea..82ef273c824 100644 --- a/core/vm/gas_table_test.go +++ b/core/vm/gas_table_test.go @@ -24,9 +24,9 @@ import ( "testing" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/kv/memdb" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/datadir" + "github.com/ledgerwatch/erigon/erigon-lib/kv/memdb" "github.com/ledgerwatch/erigon/common/hexutil" "github.com/ledgerwatch/erigon/core/state" diff --git a/core/vm/instructions.go b/core/vm/instructions.go index ae6bbe1f0c2..e1948d2d803 100644 --- a/core/vm/instructions.go +++ b/core/vm/instructions.go @@ -20,7 +20,7 @@ import ( "fmt" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "golang.org/x/crypto/sha3" "github.com/ledgerwatch/log/v3" diff --git a/core/vm/instructions_test.go b/core/vm/instructions_test.go index c64b0f34697..5116e4beeef 100644 --- a/core/vm/instructions_test.go +++ b/core/vm/instructions_test.go @@ -27,8 +27,8 @@ import ( "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/math" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/math" "github.com/ledgerwatch/erigon/common" "github.com/ledgerwatch/erigon/common/u256" diff --git a/core/vm/interface.go b/core/vm/interface.go index 58ecf4f559f..6e1f5601daa 100644 --- a/core/vm/interface.go +++ b/core/vm/interface.go @@ -20,8 +20,8 @@ import ( "math/big" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/core/vm/evmtypes" ) diff --git a/core/vm/interpreter.go b/core/vm/interpreter.go index f26e272bbd8..eb4d5bb38ed 100644 --- a/core/vm/interpreter.go +++ b/core/vm/interpreter.go @@ -20,9 +20,9 @@ import ( "hash" "sync" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/math" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/math" "github.com/ledgerwatch/log/v3" "github.com/ledgerwatch/erigon/core/vm/stack" diff --git a/core/vm/logger.go b/core/vm/logger.go index ff76ae71efb..371b0ae8086 100644 --- a/core/vm/logger.go +++ b/core/vm/logger.go @@ -18,7 +18,7 @@ package vm import ( "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/core/types" ) diff --git a/core/vm/mock_vm.go b/core/vm/mock_vm.go index f2a99b66f0a..be60b180d02 100644 --- a/core/vm/mock_vm.go +++ b/core/vm/mock_vm.go @@ -5,7 +5,7 @@ import ( "math/big" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/core/state" ) diff --git a/core/vm/operations_acl.go b/core/vm/operations_acl.go index 526b855676b..734c608f212 100644 --- a/core/vm/operations_acl.go +++ b/core/vm/operations_acl.go @@ -20,8 +20,8 @@ import ( "errors" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/math" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/math" "github.com/ledgerwatch/erigon/core/vm/stack" "github.com/ledgerwatch/erigon/params" diff --git a/core/vm/runtime/runtime.go b/core/vm/runtime/runtime.go index 8dd6706448b..e485eb8cdca 100644 --- a/core/vm/runtime/runtime.go +++ b/core/vm/runtime/runtime.go @@ -23,13 +23,13 @@ import ( "time" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/memdb" "github.com/ledgerwatch/erigon/core/state" "github.com/ledgerwatch/erigon/core/vm" "github.com/ledgerwatch/erigon/crypto" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/memdb" ) // Config is a basic type specifying certain configuration flags for running diff --git a/core/vm/runtime/runtime_test.go b/core/vm/runtime/runtime_test.go index 40d334748e4..37de695ca7e 100644 --- a/core/vm/runtime/runtime_test.go +++ b/core/vm/runtime/runtime_test.go @@ -24,9 +24,6 @@ import ( "strings" "testing" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv/memdb" "github.com/ledgerwatch/erigon/accounts/abi" "github.com/ledgerwatch/erigon/common" "github.com/ledgerwatch/erigon/consensus" @@ -35,6 +32,9 @@ import ( "github.com/ledgerwatch/erigon/core/state" "github.com/ledgerwatch/erigon/core/types" "github.com/ledgerwatch/erigon/core/vm" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv/memdb" "github.com/ledgerwatch/erigon/eth/tracers/logger" ) diff --git a/crypto/crypto.go b/crypto/crypto.go index 17e592ba6a8..0f580d8353e 100644 --- a/crypto/crypto.go +++ b/crypto/crypto.go @@ -30,7 +30,7 @@ import ( "os" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "golang.org/x/crypto/sha3" "github.com/ledgerwatch/erigon/crypto/cryptopool" diff --git a/crypto/crypto_test.go b/crypto/crypto_test.go index 8f33c95f81d..49de65c5f18 100644 --- a/crypto/crypto_test.go +++ b/crypto/crypto_test.go @@ -27,7 +27,7 @@ import ( "golang.org/x/crypto/sha3" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/common" "github.com/ledgerwatch/erigon/common/hexutil" diff --git a/crypto/ecies/ecies.go b/crypto/ecies/ecies.go index c5050095315..38b6c1e7b02 100644 --- a/crypto/ecies/ecies.go +++ b/crypto/ecies/ecies.go @@ -41,7 +41,7 @@ import ( "io" "math/big" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" ) var ( diff --git a/diagnostics/db_access.go b/diagnostics/db_access.go index b3c12cd57d0..d9611d7c730 100644 --- a/diagnostics/db_access.go +++ b/diagnostics/db_access.go @@ -7,9 +7,9 @@ import ( "io" "net/http" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/mdbx" "github.com/ledgerwatch/erigon/common/paths" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/mdbx" "github.com/urfave/cli/v2" ) diff --git a/docs/programmers_guide/dupsort.md b/docs/programmers_guide/dupsort.md index d652d6f82c4..e5a9408249e 100644 --- a/docs/programmers_guide/dupsort.md +++ b/docs/programmers_guide/dupsort.md @@ -154,7 +154,7 @@ This article target is to show tricky concepts on examples. Future reading [here](./db_walkthrough.MD#table-history-of-accounts) Erigon supports multiple typed cursors, see the [KV -Readme.md](https://github.com/ledgerwatch/erigon-lib/tree/main/kv) +Readme.md](https://github.com/ledgerwatch/erigon/erigon-lib/tree/main/kv) diff --git a/docs/readthedocs/source/rpc/tutorial.rst b/docs/readthedocs/source/rpc/tutorial.rst index 55e19ba5234..a131198476c 100644 --- a/docs/readthedocs/source/rpc/tutorial.rst +++ b/docs/readthedocs/source/rpc/tutorial.rst @@ -14,7 +14,7 @@ our daemon will only contain one method: `myNamespace_getBlockNumberByHash` whic import ( "context" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/erigon/common" "github.com/ledgerwatch/erigon/core/rawdb" ) @@ -58,7 +58,7 @@ Now we are going to make our `main.go` where we are going to serve the api we ma import ( "os" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/erigon/cmd/rpcdaemon/cli" "github.com/ledgerwatch/erigon/cmd/utils" "github.com/ledgerwatch/erigon/rpc" diff --git a/erigon-lib/Makefile b/erigon-lib/Makefile index 078cac4aa07..e7358279b57 100644 --- a/erigon-lib/Makefile +++ b/erigon-lib/Makefile @@ -1,6 +1,5 @@ GOBINREL = build/bin GOBIN = $(CURDIR)/$(GOBINREL) - BUILD_TAGS = nosqlite,noboltdb,disable_libutp CGO_CXXFLAGS ?= $(shell go env CGO_CXXFLAGS 2>/dev/null) @@ -61,16 +60,16 @@ protoc-clean: grpc: protoc-all go mod vendor - PATH="$(GOBIN):$(PATH)" protoc --proto_path=vendor/github.com/ledgerwatch/interfaces --go_out=gointerfaces -I=$(PROTOC_INCLUDE) \ + PATH="$(GOBIN):$(PATH)" protoc --proto_path=../vendor/github.com/ledgerwatch/interfaces --go_out=gointerfaces -I=$(PROTOC_INCLUDE) \ types/types.proto - PATH="$(GOBIN):$(PATH)" protoc --proto_path=vendor/github.com/ledgerwatch/interfaces --go_out=gointerfaces --go-grpc_out=gointerfaces -I=$(PROTOC_INCLUDE) \ - --go_opt=Mtypes/types.proto=github.com/ledgerwatch/erigon-lib/gointerfaces/types \ - --go-grpc_opt=Mtypes/types.proto=github.com/ledgerwatch/erigon-lib/gointerfaces/types \ + PATH="$(GOBIN):$(PATH)" protoc --proto_path=../vendor/github.com/ledgerwatch/interfaces --go_out=gointerfaces --go-grpc_out=gointerfaces -I=$(PROTOC_INCLUDE) \ + --go_opt=Mtypes/types.proto=github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/types \ + --go-grpc_opt=Mtypes/types.proto=github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/types \ p2psentry/sentry.proto p2psentinel/sentinel.proto \ remote/kv.proto remote/ethbackend.proto \ downloader/downloader.proto execution/execution.proto \ txpool/txpool.proto txpool/mining.proto - rm -rf vendor + rm -rf ../vendor $(GOBINREL)/moq: | $(GOBINREL) $(GOBUILD) -o "$(GOBIN)/moq" github.com/matryer/moq diff --git a/erigon-lib/chain/aura_config.go b/erigon-lib/chain/aura_config.go index a8fa90190f2..d7b3bbef79f 100644 --- a/erigon-lib/chain/aura_config.go +++ b/erigon-lib/chain/aura_config.go @@ -17,8 +17,8 @@ package chain import ( - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" ) // Different ways of specifying validators. diff --git a/erigon-lib/chain/chain_config.go b/erigon-lib/chain/chain_config.go index a82481115b7..f25cc070ab9 100644 --- a/erigon-lib/chain/chain_config.go +++ b/erigon-lib/chain/chain_config.go @@ -22,7 +22,7 @@ import ( "sort" "strconv" - "github.com/ledgerwatch/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common" ) // Config is the core config which determines the blockchain settings. diff --git a/erigon-lib/chain/chain_db.go b/erigon-lib/chain/chain_db.go index 6b41d708c6a..26df29da039 100644 --- a/erigon-lib/chain/chain_db.go +++ b/erigon-lib/chain/chain_db.go @@ -21,8 +21,8 @@ import ( "encoding/json" "fmt" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv" ) // GetConfig retrieves the consensus settings based on the given genesis hash. diff --git a/erigon-lib/commitment/bin_patricia_hashed.go b/erigon-lib/commitment/bin_patricia_hashed.go index 0c4aebdb637..286aa9ed2e8 100644 --- a/erigon-lib/commitment/bin_patricia_hashed.go +++ b/erigon-lib/commitment/bin_patricia_hashed.go @@ -28,9 +28,9 @@ import ( "github.com/ledgerwatch/log/v3" "golang.org/x/crypto/sha3" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/rlp" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" + "github.com/ledgerwatch/erigon/erigon-lib/rlp" ) const ( diff --git a/erigon-lib/commitment/bin_patricia_hashed_test.go b/erigon-lib/commitment/bin_patricia_hashed_test.go index 2c16bcbf5d9..9a2056288d7 100644 --- a/erigon-lib/commitment/bin_patricia_hashed_test.go +++ b/erigon-lib/commitment/bin_patricia_hashed_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" "golang.org/x/exp/slices" - "github.com/ledgerwatch/erigon-lib/common/length" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" ) func Test_BinPatriciaTrie_UniqueRepresentation(t *testing.T) { diff --git a/erigon-lib/commitment/commitment.go b/erigon-lib/commitment/commitment.go index a51cfcb59ce..69f1ba2ec2d 100644 --- a/erigon-lib/commitment/commitment.go +++ b/erigon-lib/commitment/commitment.go @@ -10,7 +10,7 @@ import ( "golang.org/x/crypto/sha3" - "github.com/ledgerwatch/erigon-lib/common/length" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" ) // Trie represents commitment variant. diff --git a/erigon-lib/commitment/hex_patricia_hashed.go b/erigon-lib/commitment/hex_patricia_hashed.go index 3ba53a41759..be10c95d700 100644 --- a/erigon-lib/commitment/hex_patricia_hashed.go +++ b/erigon-lib/commitment/hex_patricia_hashed.go @@ -30,9 +30,9 @@ import ( "github.com/ledgerwatch/log/v3" "golang.org/x/crypto/sha3" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/rlp" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" + "github.com/ledgerwatch/erigon/erigon-lib/rlp" ) // keccakState wraps sha3.state. In addition to the usual hash methods, it also supports diff --git a/erigon-lib/commitment/hex_patricia_hashed_bench_test.go b/erigon-lib/commitment/hex_patricia_hashed_bench_test.go index a44d4e7c865..0f8979fae67 100644 --- a/erigon-lib/commitment/hex_patricia_hashed_bench_test.go +++ b/erigon-lib/commitment/hex_patricia_hashed_bench_test.go @@ -5,7 +5,7 @@ import ( "math/rand" "testing" - "github.com/ledgerwatch/erigon-lib/common/length" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" ) func Benchmark_HexPatriciaHahsed_ReviewKeys(b *testing.B) { diff --git a/erigon-lib/commitment/hex_patricia_hashed_fuzz_test.go b/erigon-lib/commitment/hex_patricia_hashed_fuzz_test.go index e1e772b8385..5c8848a2dc5 100644 --- a/erigon-lib/commitment/hex_patricia_hashed_fuzz_test.go +++ b/erigon-lib/commitment/hex_patricia_hashed_fuzz_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/require" "golang.org/x/crypto/sha3" - "github.com/ledgerwatch/erigon-lib/common/length" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" ) // go test -trimpath -v -fuzz=Fuzz_ProcessUpdate$ -fuzztime=300s ./commitment diff --git a/erigon-lib/commitment/hex_patricia_hashed_test.go b/erigon-lib/commitment/hex_patricia_hashed_test.go index 3798701c7c5..8ba3a07f8d2 100644 --- a/erigon-lib/commitment/hex_patricia_hashed_test.go +++ b/erigon-lib/commitment/hex_patricia_hashed_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/common/length" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" ) func Test_HexPatriciaHashed_ResetThenSingularUpdates(t *testing.T) { diff --git a/erigon-lib/commitment/patricia_state_mock_test.go b/erigon-lib/commitment/patricia_state_mock_test.go index 82dc932a2cb..8effb1732c7 100644 --- a/erigon-lib/commitment/patricia_state_mock_test.go +++ b/erigon-lib/commitment/patricia_state_mock_test.go @@ -10,8 +10,8 @@ import ( "golang.org/x/crypto/sha3" "golang.org/x/exp/slices" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" ) // In memory commitment and state to use with the tests diff --git a/erigon-lib/common/address.go b/erigon-lib/common/address.go index 4ad22034520..30b3677342d 100644 --- a/erigon-lib/common/address.go +++ b/erigon-lib/common/address.go @@ -24,9 +24,9 @@ import ( "math/big" "reflect" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/crypto/cryptopool" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" + "github.com/ledgerwatch/erigon/erigon-lib/crypto/cryptopool" ) var ( diff --git a/erigon-lib/common/bytes4.go b/erigon-lib/common/bytes4.go index 2687074ef2a..5965edff95d 100644 --- a/erigon-lib/common/bytes4.go +++ b/erigon-lib/common/bytes4.go @@ -8,8 +8,8 @@ import ( "math/rand" "reflect" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/common/length" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" ) var ( diff --git a/erigon-lib/common/bytes48.go b/erigon-lib/common/bytes48.go index 092e451f64e..08e1c4b44c3 100644 --- a/erigon-lib/common/bytes48.go +++ b/erigon-lib/common/bytes48.go @@ -8,8 +8,8 @@ import ( "math/rand" "reflect" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/common/length" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" ) var ( diff --git a/erigon-lib/common/bytes64.go b/erigon-lib/common/bytes64.go index bd407e8aaf3..0010f6a9600 100644 --- a/erigon-lib/common/bytes64.go +++ b/erigon-lib/common/bytes64.go @@ -7,8 +7,8 @@ import ( "fmt" "reflect" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/common/length" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" ) var ( diff --git a/erigon-lib/common/bytes96.go b/erigon-lib/common/bytes96.go index e15850d2e33..7f0f13eb3fb 100644 --- a/erigon-lib/common/bytes96.go +++ b/erigon-lib/common/bytes96.go @@ -8,8 +8,8 @@ import ( "math/rand" "reflect" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/common/length" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" ) var ( diff --git a/erigon-lib/common/cmp/cmp.go b/erigon-lib/common/cmp/cmp.go index 4407492ce3f..6ce2e1b8afd 100644 --- a/erigon-lib/common/cmp/cmp.go +++ b/erigon-lib/common/cmp/cmp.go @@ -44,3 +44,10 @@ func Max[T constraints.Ordered](a, b T) T { } return b } + +func Less[T constraints.Ordered](a, b T) int { + if a < b { + return -1 + } + return 1 +} diff --git a/erigon-lib/common/hash.go b/erigon-lib/common/hash.go index a2353a4e6b9..241b99b1617 100644 --- a/erigon-lib/common/hash.go +++ b/erigon-lib/common/hash.go @@ -24,8 +24,8 @@ import ( "math/rand" "reflect" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/common/length" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" ) var ( diff --git a/erigon-lib/compress/compress.go b/erigon-lib/compress/compress.go index fc5d5da0ee9..770eab05f10 100644 --- a/erigon-lib/compress/compress.go +++ b/erigon-lib/compress/compress.go @@ -32,9 +32,10 @@ import ( "time" "github.com/c2h5oh/datasize" - "github.com/ledgerwatch/erigon-lib/common" - dir2 "github.com/ledgerwatch/erigon-lib/common/dir" - "github.com/ledgerwatch/erigon-lib/etl" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/cmp" + dir2 "github.com/ledgerwatch/erigon/erigon-lib/common/dir" + "github.com/ledgerwatch/erigon/erigon-lib/etl" "github.com/ledgerwatch/log/v3" "golang.org/x/exp/slices" ) @@ -300,11 +301,11 @@ func (db *DictionaryBuilder) Less(i, j int) bool { return db.items[i].score < db.items[j].score } -func dictionaryBuilderLess(i, j *Pattern) bool { +func dictionaryBuilderLess(i, j *Pattern) int { if i.score == j.score { - return bytes.Compare(i.word, j.word) < 0 + return bytes.Compare(i.word, j.word) } - return i.score < j.score + return cmp.Less(i.score, j.score) } func (db *DictionaryBuilder) Swap(i, j int) { @@ -383,11 +384,11 @@ type Pattern struct { type PatternList []*Pattern func (pl PatternList) Len() int { return len(pl) } -func patternListLess(i, j *Pattern) bool { +func patternListLess(i, j *Pattern) int { if i.uses == j.uses { - return bits.Reverse64(i.code) < bits.Reverse64(j.code) + return cmp.Less(bits.Reverse64(i.code), bits.Reverse64(j.code)) } - return i.uses < j.uses + return cmp.Less(i.uses, j.uses) } // PatternHuff is an intermediate node in a huffman tree of patterns @@ -555,11 +556,11 @@ type PositionList []*Position func (pl PositionList) Len() int { return len(pl) } -func positionListLess(i, j *Position) bool { +func positionListLess(i, j *Position) int { if i.uses == j.uses { - return bits.Reverse64(i.code) < bits.Reverse64(j.code) + return cmp.Less(bits.Reverse64(i.code), bits.Reverse64(j.code)) } - return i.uses < j.uses + return cmp.Less(i.uses, j.uses) } type PositionHeap []*PositionHuff diff --git a/erigon-lib/compress/compress_fuzz_test.go b/erigon-lib/compress/compress_fuzz_test.go index f9403ef8457..4d5a04aa57a 100644 --- a/erigon-lib/compress/compress_fuzz_test.go +++ b/erigon-lib/compress/compress_fuzz_test.go @@ -24,7 +24,7 @@ import ( "path/filepath" "testing" - "github.com/ledgerwatch/erigon-lib/common/cmp" + "github.com/ledgerwatch/erigon/erigon-lib/common/cmp" "github.com/ledgerwatch/log/v3" ) diff --git a/erigon-lib/compress/decompress.go b/erigon-lib/compress/decompress.go index 3fbd9603e35..dffc05fa0f2 100644 --- a/erigon-lib/compress/decompress.go +++ b/erigon-lib/compress/decompress.go @@ -25,8 +25,8 @@ import ( "strconv" "time" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/mmap" + "github.com/ledgerwatch/erigon/erigon-lib/common/dbg" + "github.com/ledgerwatch/erigon/erigon-lib/mmap" "github.com/ledgerwatch/log/v3" ) diff --git a/erigon-lib/compress/decompress_fuzz_test.go b/erigon-lib/compress/decompress_fuzz_test.go index e127a6240e0..bf52da6c155 100644 --- a/erigon-lib/compress/decompress_fuzz_test.go +++ b/erigon-lib/compress/decompress_fuzz_test.go @@ -8,7 +8,7 @@ import ( "path/filepath" "testing" - "github.com/ledgerwatch/erigon-lib/common/cmp" + "github.com/ledgerwatch/erigon/erigon-lib/common/cmp" "github.com/ledgerwatch/log/v3" ) diff --git a/erigon-lib/compress/parallel_compress.go b/erigon-lib/compress/parallel_compress.go index b90e7ab2c4e..8bb950c47fd 100644 --- a/erigon-lib/compress/parallel_compress.go +++ b/erigon-lib/compress/parallel_compress.go @@ -29,11 +29,11 @@ import ( "sync/atomic" "time" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/assert" - "github.com/ledgerwatch/erigon-lib/etl" - "github.com/ledgerwatch/erigon-lib/patricia" - "github.com/ledgerwatch/erigon-lib/sais" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/assert" + "github.com/ledgerwatch/erigon/erigon-lib/etl" + "github.com/ledgerwatch/erigon/erigon-lib/patricia" + "github.com/ledgerwatch/erigon/erigon-lib/sais" "github.com/ledgerwatch/log/v3" "golang.org/x/exp/slices" ) diff --git a/erigon-lib/crypto/secp256k1.go b/erigon-lib/crypto/secp256k1.go index 3e8f6dc2ff0..e3d52c8d37c 100644 --- a/erigon-lib/crypto/secp256k1.go +++ b/erigon-lib/crypto/secp256k1.go @@ -19,7 +19,7 @@ package crypto import ( "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" ) var ( diff --git a/erigon-lib/direct/downloader_client.go b/erigon-lib/direct/downloader_client.go index a6924a1ebe7..c0c2bb30fec 100644 --- a/erigon-lib/direct/downloader_client.go +++ b/erigon-lib/direct/downloader_client.go @@ -19,7 +19,7 @@ package direct import ( "context" - proto_downloader "github.com/ledgerwatch/erigon-lib/gointerfaces/downloader" + proto_downloader "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/downloader" "google.golang.org/grpc" "google.golang.org/protobuf/types/known/emptypb" ) diff --git a/erigon-lib/direct/eth_backend_client.go b/erigon-lib/direct/eth_backend_client.go index 7d100a5ee03..7bfef186e5c 100644 --- a/erigon-lib/direct/eth_backend_client.go +++ b/erigon-lib/direct/eth_backend_client.go @@ -20,8 +20,8 @@ import ( "context" "io" - "github.com/ledgerwatch/erigon-lib/gointerfaces/remote" - "github.com/ledgerwatch/erigon-lib/gointerfaces/types" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/remote" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/types" "google.golang.org/grpc" "google.golang.org/protobuf/types/known/emptypb" ) diff --git a/erigon-lib/direct/execution_client.go b/erigon-lib/direct/execution_client.go index d5899815eae..e78d462396c 100644 --- a/erigon-lib/direct/execution_client.go +++ b/erigon-lib/direct/execution_client.go @@ -19,8 +19,8 @@ package direct import ( "context" - "github.com/ledgerwatch/erigon-lib/gointerfaces/execution" - "github.com/ledgerwatch/erigon-lib/gointerfaces/types" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/execution" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/types" "google.golang.org/grpc" "google.golang.org/protobuf/types/known/emptypb" ) diff --git a/erigon-lib/direct/mining_client.go b/erigon-lib/direct/mining_client.go index c6db989e0cc..ce04f2370bb 100644 --- a/erigon-lib/direct/mining_client.go +++ b/erigon-lib/direct/mining_client.go @@ -20,8 +20,8 @@ import ( "context" "io" - txpool_proto "github.com/ledgerwatch/erigon-lib/gointerfaces/txpool" - "github.com/ledgerwatch/erigon-lib/gointerfaces/types" + txpool_proto "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/txpool" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/types" "google.golang.org/grpc" "google.golang.org/protobuf/types/known/emptypb" ) diff --git a/erigon-lib/direct/sentinel_client.go b/erigon-lib/direct/sentinel_client.go index 86481b4fb77..86bb07429dd 100644 --- a/erigon-lib/direct/sentinel_client.go +++ b/erigon-lib/direct/sentinel_client.go @@ -20,7 +20,7 @@ import ( "context" "io" - "github.com/ledgerwatch/erigon-lib/gointerfaces/sentinel" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/sentinel" "google.golang.org/grpc" ) diff --git a/erigon-lib/direct/sentry_client.go b/erigon-lib/direct/sentry_client.go index cf01003e71d..7cfd4615629 100644 --- a/erigon-lib/direct/sentry_client.go +++ b/erigon-lib/direct/sentry_client.go @@ -26,8 +26,8 @@ import ( "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/known/emptypb" - "github.com/ledgerwatch/erigon-lib/gointerfaces/sentry" - "github.com/ledgerwatch/erigon-lib/gointerfaces/types" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/sentry" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/types" ) const ( diff --git a/erigon-lib/direct/state_diff_client.go b/erigon-lib/direct/state_diff_client.go index 8c798c10546..db56c2c00fb 100644 --- a/erigon-lib/direct/state_diff_client.go +++ b/erigon-lib/direct/state_diff_client.go @@ -20,7 +20,7 @@ import ( "context" "io" - "github.com/ledgerwatch/erigon-lib/gointerfaces/remote" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/remote" "google.golang.org/grpc" ) diff --git a/erigon-lib/direct/txpool_client.go b/erigon-lib/direct/txpool_client.go index 5e54409b640..46c79d1e0a0 100644 --- a/erigon-lib/direct/txpool_client.go +++ b/erigon-lib/direct/txpool_client.go @@ -20,8 +20,8 @@ import ( "context" "io" - txpool_proto "github.com/ledgerwatch/erigon-lib/gointerfaces/txpool" - "github.com/ledgerwatch/erigon-lib/gointerfaces/types" + txpool_proto "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/txpool" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/types" "google.golang.org/grpc" "google.golang.org/protobuf/types/known/emptypb" ) diff --git a/erigon-lib/downloader/downloader.go b/erigon-lib/downloader/downloader.go index d9cf831d7aa..7bb5b872efb 100644 --- a/erigon-lib/downloader/downloader.go +++ b/erigon-lib/downloader/downloader.go @@ -33,12 +33,12 @@ import ( "github.com/anacrolix/torrent" "github.com/anacrolix/torrent/metainfo" "github.com/anacrolix/torrent/storage" - common2 "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/dir" - "github.com/ledgerwatch/erigon-lib/downloader/downloadercfg" - "github.com/ledgerwatch/erigon-lib/downloader/snaptype" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/mdbx" + common2 "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/dir" + "github.com/ledgerwatch/erigon/erigon-lib/downloader/downloadercfg" + "github.com/ledgerwatch/erigon/erigon-lib/downloader/snaptype" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/mdbx" "github.com/ledgerwatch/log/v3" "github.com/pelletier/go-toml/v2" "golang.org/x/exp/maps" diff --git a/erigon-lib/downloader/downloader_grpc_server.go b/erigon-lib/downloader/downloader_grpc_server.go index bb50349ff0a..93b6855111b 100644 --- a/erigon-lib/downloader/downloader_grpc_server.go +++ b/erigon-lib/downloader/downloader_grpc_server.go @@ -22,9 +22,9 @@ import ( "time" "github.com/anacrolix/torrent/metainfo" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - proto_downloader "github.com/ledgerwatch/erigon-lib/gointerfaces/downloader" - prototypes "github.com/ledgerwatch/erigon-lib/gointerfaces/types" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces" + proto_downloader "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/downloader" + prototypes "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/types" "github.com/ledgerwatch/log/v3" "google.golang.org/protobuf/types/known/emptypb" ) diff --git a/erigon-lib/downloader/downloader_test.go b/erigon-lib/downloader/downloader_test.go index cbd341e508b..2751fb9a45c 100644 --- a/erigon-lib/downloader/downloader_test.go +++ b/erigon-lib/downloader/downloader_test.go @@ -2,13 +2,14 @@ package downloader import ( "context" - lg "github.com/anacrolix/log" - "github.com/ledgerwatch/erigon-lib/common/datadir" - downloadercfg2 "github.com/ledgerwatch/erigon-lib/downloader/downloadercfg" - "github.com/ledgerwatch/erigon-lib/downloader/snaptype" - "github.com/stretchr/testify/require" "path/filepath" "testing" + + lg "github.com/anacrolix/log" + "github.com/ledgerwatch/erigon/erigon-lib/common/datadir" + downloadercfg2 "github.com/ledgerwatch/erigon/erigon-lib/downloader/downloadercfg" + "github.com/ledgerwatch/erigon/erigon-lib/downloader/snaptype" + "github.com/stretchr/testify/require" ) func TestChangeInfoHashOfSameFile(t *testing.T) { diff --git a/erigon-lib/downloader/downloadercfg/downloadercfg.go b/erigon-lib/downloader/downloadercfg/downloadercfg.go index 6b702b94844..e3639c2fe5c 100644 --- a/erigon-lib/downloader/downloadercfg/downloadercfg.go +++ b/erigon-lib/downloader/downloadercfg/downloadercfg.go @@ -28,9 +28,9 @@ import ( lg "github.com/anacrolix/log" "github.com/anacrolix/torrent" "github.com/c2h5oh/datasize" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/common/dir" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/datadir" + "github.com/ledgerwatch/erigon/erigon-lib/common/dir" "github.com/ledgerwatch/log/v3" "golang.org/x/time/rate" ) diff --git a/erigon-lib/downloader/downloadergrpc/client.go b/erigon-lib/downloader/downloadergrpc/client.go index c5a85230f78..a4d1ddba03b 100644 --- a/erigon-lib/downloader/downloadergrpc/client.go +++ b/erigon-lib/downloader/downloadergrpc/client.go @@ -24,9 +24,9 @@ import ( "github.com/anacrolix/torrent/metainfo" "github.com/c2h5oh/datasize" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - proto_downloader "github.com/ledgerwatch/erigon-lib/gointerfaces/downloader" - prototypes "github.com/ledgerwatch/erigon-lib/gointerfaces/types" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces" + proto_downloader "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/downloader" + prototypes "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/types" "google.golang.org/grpc" "google.golang.org/grpc/backoff" "google.golang.org/grpc/credentials/insecure" diff --git a/erigon-lib/downloader/mdbx_piece_completion.go b/erigon-lib/downloader/mdbx_piece_completion.go index 6f209cd19c9..ee533b50be8 100644 --- a/erigon-lib/downloader/mdbx_piece_completion.go +++ b/erigon-lib/downloader/mdbx_piece_completion.go @@ -23,7 +23,7 @@ import ( "github.com/anacrolix/torrent/metainfo" "github.com/anacrolix/torrent/storage" "github.com/anacrolix/torrent/types/infohash" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv" ) const ( diff --git a/erigon-lib/downloader/mdbx_piece_completion_test.go b/erigon-lib/downloader/mdbx_piece_completion_test.go index c2035501ad4..ee979071cb6 100644 --- a/erigon-lib/downloader/mdbx_piece_completion_test.go +++ b/erigon-lib/downloader/mdbx_piece_completion_test.go @@ -19,7 +19,7 @@ package downloader import ( "testing" - "github.com/ledgerwatch/erigon-lib/kv/memdb" + "github.com/ledgerwatch/erigon/erigon-lib/kv/memdb" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/erigon-lib/downloader/snaptype/files.go b/erigon-lib/downloader/snaptype/files.go index 43b0a9392b1..cbd376832b3 100644 --- a/erigon-lib/downloader/snaptype/files.go +++ b/erigon-lib/downloader/snaptype/files.go @@ -20,13 +20,15 @@ import ( "encoding/hex" "errors" "fmt" - "github.com/anacrolix/torrent/metainfo" "os" "path/filepath" "strconv" "strings" - "github.com/ledgerwatch/erigon-lib/common/dir" + "github.com/anacrolix/torrent/metainfo" + + "github.com/ledgerwatch/erigon/erigon-lib/common/cmp" + "github.com/ledgerwatch/erigon/erigon-lib/common/dir" "golang.org/x/exp/slices" ) @@ -209,20 +211,20 @@ func ParseDir(dir string) (res []FileInfo, err error) { } res = append(res, meta) } - slices.SortFunc(res, func(i, j FileInfo) bool { + slices.SortFunc(res, func(i, j FileInfo) int { if i.Version != j.Version { - return i.Version < j.Version + return cmp.Less(i.Version, j.Version) } if i.From != j.From { - return i.From < j.From + return cmp.Less(i.From, j.From) } if i.To != j.To { - return i.To < j.To + return cmp.Less(i.To, j.To) } if i.T != j.T { - return i.T < j.T + return cmp.Less(i.T, j.T) } - return i.Ext < j.Ext + return cmp.Less(i.Ext, j.Ext) }) return res, nil diff --git a/erigon-lib/downloader/util.go b/erigon-lib/downloader/util.go index 57963021bc5..2080f7dcda2 100644 --- a/erigon-lib/downloader/util.go +++ b/erigon-lib/downloader/util.go @@ -31,13 +31,13 @@ import ( "github.com/anacrolix/torrent" "github.com/anacrolix/torrent/bencode" "github.com/anacrolix/torrent/metainfo" - common2 "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/cmp" - "github.com/ledgerwatch/erigon-lib/common/dbg" - dir2 "github.com/ledgerwatch/erigon-lib/common/dir" - "github.com/ledgerwatch/erigon-lib/downloader/downloadercfg" - "github.com/ledgerwatch/erigon-lib/downloader/snaptype" - "github.com/ledgerwatch/erigon-lib/kv" + common2 "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/cmp" + "github.com/ledgerwatch/erigon/erigon-lib/common/dbg" + dir2 "github.com/ledgerwatch/erigon/erigon-lib/common/dir" + "github.com/ledgerwatch/erigon/erigon-lib/downloader/downloadercfg" + "github.com/ledgerwatch/erigon/erigon-lib/downloader/snaptype" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/log/v3" "golang.org/x/sync/errgroup" ) diff --git a/erigon-lib/etl/buffers.go b/erigon-lib/etl/buffers.go index 5d0c2e4e761..ae18fbee1d8 100644 --- a/erigon-lib/etl/buffers.go +++ b/erigon-lib/etl/buffers.go @@ -25,7 +25,7 @@ import ( "strconv" "github.com/c2h5oh/datasize" - "github.com/ledgerwatch/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common" ) const ( diff --git a/erigon-lib/etl/collector.go b/erigon-lib/etl/collector.go index d72ddecd0c4..70e49351403 100644 --- a/erigon-lib/etl/collector.go +++ b/erigon-lib/etl/collector.go @@ -29,8 +29,8 @@ import ( "github.com/c2h5oh/datasize" "github.com/ledgerwatch/log/v3" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv" ) type LoadNextFunc func(originalK, k, v []byte) error diff --git a/erigon-lib/etl/etl.go b/erigon-lib/etl/etl.go index 942e115cb1e..da961ace8d6 100644 --- a/erigon-lib/etl/etl.go +++ b/erigon-lib/etl/etl.go @@ -23,8 +23,8 @@ import ( "time" "github.com/c2h5oh/datasize" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/log/v3" ) diff --git a/erigon-lib/etl/etl_test.go b/erigon-lib/etl/etl_test.go index 18ab3dc48e8..852455b9b6f 100644 --- a/erigon-lib/etl/etl_test.go +++ b/erigon-lib/etl/etl_test.go @@ -25,8 +25,8 @@ import ( "strings" "testing" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/memdb" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/memdb" "github.com/ledgerwatch/log/v3" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/erigon-lib/go.mod b/erigon-lib/go.mod deleted file mode 100644 index 376a53fbb8c..00000000000 --- a/erigon-lib/go.mod +++ /dev/null @@ -1,119 +0,0 @@ -module github.com/ledgerwatch/erigon-lib - -go 1.19 - -require ( - github.com/erigontech/mdbx-go v0.27.14 - github.com/ledgerwatch/interfaces v0.0.0-20230912104607-5501cfd6e5af - github.com/ledgerwatch/log/v3 v3.9.0 - github.com/ledgerwatch/secp256k1 v1.0.0 -) - -require ( - github.com/RoaringBitmap/roaring v1.2.3 - github.com/VictoriaMetrics/metrics v1.23.1 - github.com/anacrolix/dht/v2 v2.19.2-0.20221121215055-066ad8494444 - github.com/anacrolix/go-libutp v1.3.1 - github.com/anacrolix/log v0.14.3-0.20230823030427-4b296d71a6b4 - github.com/anacrolix/torrent v1.52.6-0.20230914125831-4fb12d06b31b - github.com/c2h5oh/datasize v0.0.0-20220606134207-859f65c6625b - github.com/crate-crypto/go-kzg-4844 v0.3.0 - github.com/deckarep/golang-set/v2 v2.3.1 - github.com/edsrzf/mmap-go v1.1.0 - github.com/go-stack/stack v1.8.1 - github.com/google/btree v1.1.2 - github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 - github.com/hashicorp/golang-lru/v2 v2.0.6 - github.com/holiman/uint256 v1.2.3 - github.com/matryer/moq v0.3.2 - github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 - github.com/pelletier/go-toml/v2 v2.1.0 - github.com/quasilyte/go-ruleguard/dsl v0.3.22 - github.com/spaolacci/murmur3 v1.1.0 - github.com/stretchr/testify v1.8.4 - github.com/tidwall/btree v1.6.0 - golang.org/x/crypto v0.13.0 - golang.org/x/exp v0.0.0-20230711023510-fffb14384f22 - golang.org/x/sync v0.3.0 - golang.org/x/sys v0.12.0 - golang.org/x/time v0.3.0 - google.golang.org/grpc v1.58.1 - google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.3.0 - google.golang.org/protobuf v1.31.0 -) - -require ( - github.com/ajwerner/btree v0.0.0-20211221152037-f427b3e689c0 // indirect - github.com/alecthomas/atomic v0.1.0-alpha2 // indirect - github.com/anacrolix/chansync v0.3.0 // indirect - github.com/anacrolix/envpprof v1.3.0 // indirect - github.com/anacrolix/generics v0.0.0-20230816105729-c755655aee45 // indirect - github.com/anacrolix/missinggo v1.3.0 // indirect - github.com/anacrolix/missinggo/perf v1.0.0 // indirect - github.com/anacrolix/missinggo/v2 v2.7.2-0.20230527121029-a582b4f397b9 // indirect - github.com/anacrolix/mmsg v1.0.0 // indirect - github.com/anacrolix/multiless v0.3.0 // indirect - github.com/anacrolix/stm v0.4.0 // indirect - github.com/anacrolix/sync v0.4.0 // indirect - github.com/anacrolix/upnp v0.1.3-0.20220123035249-922794e51c96 // indirect - github.com/anacrolix/utp v0.1.0 // indirect - github.com/bahlo/generic-list-go v0.2.0 // indirect - github.com/benbjohnson/immutable v0.3.0 // indirect - github.com/bits-and-blooms/bitset v1.5.0 // indirect - github.com/bradfitz/iter v0.0.0-20191230175014-e8f45d346db8 // indirect - github.com/consensys/bavard v0.1.13 // indirect - github.com/consensys/gnark-crypto v0.10.0 // indirect - github.com/davecgh/go-spew v1.1.1 // indirect - github.com/dustin/go-humanize v1.0.0 // indirect - github.com/go-llsqlite/adapter v0.0.0-20230912124304-94ed0e573c23 // indirect - github.com/go-llsqlite/crawshaw v0.0.0-20230910110433-7e901377eb6c // indirect - github.com/go-logr/logr v1.2.3 // indirect - github.com/go-logr/stdr v1.2.2 // indirect - github.com/golang/protobuf v1.5.3 // indirect - github.com/google/uuid v1.3.0 // indirect - github.com/gorilla/websocket v1.5.0 // indirect - github.com/huandu/xstrings v1.4.0 // indirect - github.com/mattn/go-colorable v0.1.13 // indirect - github.com/mattn/go-isatty v0.0.19 // indirect - github.com/mmcloughlin/addchain v0.4.0 // indirect - github.com/mschoch/smat v0.2.0 // indirect - github.com/pion/datachannel v1.5.2 // indirect - github.com/pion/dtls/v2 v2.2.4 // indirect - github.com/pion/ice/v2 v2.2.6 // indirect - github.com/pion/interceptor v0.1.11 // indirect - github.com/pion/logging v0.2.2 // indirect - github.com/pion/mdns v0.0.5 // indirect - github.com/pion/randutil v0.1.0 // indirect - github.com/pion/rtcp v1.2.9 // indirect - github.com/pion/rtp v1.7.13 // indirect - github.com/pion/sctp v1.8.2 // indirect - github.com/pion/sdp/v3 v3.0.5 // indirect - github.com/pion/srtp/v2 v2.0.9 // indirect - github.com/pion/stun v0.3.5 // indirect - github.com/pion/transport v0.13.1 // indirect - github.com/pion/transport/v2 v2.0.0 // indirect - github.com/pion/turn/v2 v2.0.8 // indirect - github.com/pion/udp v0.1.4 // indirect - github.com/pion/webrtc/v3 v3.1.42 // indirect - github.com/pkg/errors v0.9.1 // indirect - github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect - github.com/rs/dnscache v0.0.0-20211102005908-e0241e321417 // indirect - github.com/valyala/fastrand v1.1.0 // indirect - github.com/valyala/histogram v1.2.0 // indirect - go.etcd.io/bbolt v1.3.6 // indirect - go.opentelemetry.io/otel v1.8.0 // indirect - go.opentelemetry.io/otel/trace v1.8.0 // indirect - golang.org/x/mod v0.11.0 // indirect - golang.org/x/net v0.12.0 // indirect - golang.org/x/text v0.13.0 // indirect - golang.org/x/tools v0.7.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect - gopkg.in/yaml.v3 v3.0.1 // indirect - modernc.org/libc v1.22.3 // indirect - modernc.org/mathutil v1.5.0 // indirect - modernc.org/memory v1.5.0 // indirect - modernc.org/sqlite v1.21.1 // indirect - rsc.io/tmplfunc v0.0.3 // indirect - zombiezen.com/go/sqlite v0.13.1 // indirect -) diff --git a/erigon-lib/go.sum b/erigon-lib/go.sum deleted file mode 100644 index 5eaaa0b1a0a..00000000000 --- a/erigon-lib/go.sum +++ /dev/null @@ -1,619 +0,0 @@ -cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -crawshaw.io/iox v0.0.0-20181124134642-c51c3df30797 h1:yDf7ARQc637HoxDho7xjqdvO5ZA2Yb+xzv/fOnnvZzw= -crawshaw.io/iox v0.0.0-20181124134642-c51c3df30797/go.mod h1:sXBiorCo8c46JlQV3oXPKINnZ8mcqnye1EkVkqsectk= -crawshaw.io/sqlite v0.3.2/go.mod h1:igAO5JulrQ1DbdZdtVq48mnZUBAPOeFzer7VhDWNtW4= -filippo.io/edwards25519 v1.0.0-rc.1 h1:m0VOOB23frXZvAOK44usCgLWvtsxIoMCTBGJZlpmGfU= -github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/RoaringBitmap/roaring v0.4.7/go.mod h1:8khRDP4HmeXns4xIj9oGrKSz7XTQiJx2zgh7AcNke4w= -github.com/RoaringBitmap/roaring v0.4.17/go.mod h1:D3qVegWTmfCaX4Bl5CrBE9hfrSrrXIr8KVNvRsDi1NI= -github.com/RoaringBitmap/roaring v0.4.23/go.mod h1:D0gp8kJQgE1A4LQ5wFLggQEyvDi06Mq5mKs52e1TwOo= -github.com/RoaringBitmap/roaring v1.2.3 h1:yqreLINqIrX22ErkKI0vY47/ivtJr6n+kMhVOVmhWBY= -github.com/RoaringBitmap/roaring v1.2.3/go.mod h1:plvDsJQpxOC5bw8LRteu/MLWHsHez/3y6cubLI4/1yE= -github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= -github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= -github.com/VictoriaMetrics/metrics v1.23.1 h1:/j8DzeJBxSpL2qSIdqnRFLvQQhbJyJbbEi22yMm7oL0= -github.com/VictoriaMetrics/metrics v1.23.1/go.mod h1:rAr/llLpEnAdTehiNlUxKgnjcOuROSzpw0GvjpEbvFc= -github.com/ajwerner/btree v0.0.0-20211221152037-f427b3e689c0 h1:byYvvbfSo3+9efR4IeReh77gVs4PnNDR3AMOE9NJ7a0= -github.com/ajwerner/btree v0.0.0-20211221152037-f427b3e689c0/go.mod h1:q37NoqncT41qKc048STsifIt69LfUJ8SrWWcz/yam5k= -github.com/alecthomas/assert/v2 v2.0.0-alpha3 h1:pcHeMvQ3OMstAWgaeaXIAL8uzB9xMm2zlxt+/4ml8lk= -github.com/alecthomas/atomic v0.1.0-alpha2 h1:dqwXmax66gXvHhsOS4pGPZKqYOlTkapELkLb3MNdlH8= -github.com/alecthomas/atomic v0.1.0-alpha2/go.mod h1:zD6QGEyw49HIq19caJDc2NMXAy8rNi9ROrxtMXATfyI= -github.com/alecthomas/repr v0.0.0-20210801044451-80ca428c5142 h1:8Uy0oSf5co/NZXje7U1z8Mpep++QJOldL2hs/sBQf48= -github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= -github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= -github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= -github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= -github.com/anacrolix/chansync v0.3.0 h1:lRu9tbeuw3wl+PhMu/r+JJCRu5ArFXIluOgdF0ao6/U= -github.com/anacrolix/chansync v0.3.0/go.mod h1:DZsatdsdXxD0WiwcGl0nJVwyjCKMDv+knl1q2iBjA2k= -github.com/anacrolix/dht/v2 v2.19.2-0.20221121215055-066ad8494444 h1:8V0K09lrGoeT2KRJNOtspA7q+OMxGwQqK/Ug0IiaaRE= -github.com/anacrolix/dht/v2 v2.19.2-0.20221121215055-066ad8494444/go.mod h1:MctKM1HS5YYDb3F30NGJxLE+QPuqWoT5ReW/4jt8xew= -github.com/anacrolix/envpprof v0.0.0-20180404065416-323002cec2fa/go.mod h1:KgHhUaQMc8cC0+cEflSgCFNFbKwi5h54gqtVn8yhP7c= -github.com/anacrolix/envpprof v1.0.0/go.mod h1:KgHhUaQMc8cC0+cEflSgCFNFbKwi5h54gqtVn8yhP7c= -github.com/anacrolix/envpprof v1.1.0/go.mod h1:My7T5oSqVfEn4MD4Meczkw/f5lSIndGAKu/0SM/rkf4= -github.com/anacrolix/envpprof v1.3.0 h1:WJt9bpuT7A/CDCxPOv/eeZqHWlle/Y0keJUvc6tcJDk= -github.com/anacrolix/envpprof v1.3.0/go.mod h1:7QIG4CaX1uexQ3tqd5+BRa/9e2D02Wcertl6Yh0jCB0= -github.com/anacrolix/generics v0.0.0-20230816105729-c755655aee45 h1:Kmcl3I9K2+5AdnnR7hvrnVT0TLeFWWMa9bxnm55aVIg= -github.com/anacrolix/generics v0.0.0-20230816105729-c755655aee45/go.mod h1:ff2rHB/joTV03aMSSn/AZNnaIpUw0h3njetGsaXcMy8= -github.com/anacrolix/go-libutp v1.3.1 h1:idJzreNLl+hNjGC3ZnUOjujEaryeOGgkwHLqSGoige0= -github.com/anacrolix/go-libutp v1.3.1/go.mod h1:heF41EC8kN0qCLMokLBVkB8NXiLwx3t8R8810MTNI5o= -github.com/anacrolix/log v0.3.0/go.mod h1:lWvLTqzAnCWPJA08T2HCstZi0L1y2Wyvm3FJgwU9jwU= -github.com/anacrolix/log v0.6.0/go.mod h1:lWvLTqzAnCWPJA08T2HCstZi0L1y2Wyvm3FJgwU9jwU= -github.com/anacrolix/log v0.10.1-0.20220123034749-3920702c17f8/go.mod h1:GmnE2c0nvz8pOIPUSC9Rawgefy1sDXqposC2wgtBZE4= -github.com/anacrolix/log v0.13.1/go.mod h1:D4+CvN8SnruK6zIFS/xPoRJmtvtnxs+CSfDQ+BFxZ68= -github.com/anacrolix/log v0.14.3-0.20230823030427-4b296d71a6b4 h1:01OE3pdiBGIZGyQb6cIAu+QfaNhBR9k5MVmLsl+DVbE= -github.com/anacrolix/log v0.14.3-0.20230823030427-4b296d71a6b4/go.mod h1:1OmJESOtxQGNMlUO5rcv96Vpp9mfMqXXbe2RdinFLdY= -github.com/anacrolix/lsan v0.0.0-20211126052245-807000409a62 h1:P04VG6Td13FHMgS5ZBcJX23NPC/fiC4cp9bXwYujdYM= -github.com/anacrolix/lsan v0.0.0-20211126052245-807000409a62/go.mod h1:66cFKPCO7Sl4vbFnAaSq7e4OXtdMhRSBagJGWgmpJbM= -github.com/anacrolix/missinggo v0.0.0-20180725070939-60ef2fbf63df/go.mod h1:kwGiTUTZ0+p4vAz3VbAI5a30t2YbvemcmspjKwrAz5s= -github.com/anacrolix/missinggo v1.1.0/go.mod h1:MBJu3Sk/k3ZfGYcS7z18gwfu72Ey/xopPFJJbTi5yIo= -github.com/anacrolix/missinggo v1.1.2-0.20190815015349-b888af804467/go.mod h1:MBJu3Sk/k3ZfGYcS7z18gwfu72Ey/xopPFJJbTi5yIo= -github.com/anacrolix/missinggo v1.2.1/go.mod h1:J5cMhif8jPmFoC3+Uvob3OXXNIhOUikzMt+uUjeM21Y= -github.com/anacrolix/missinggo v1.3.0 h1:06HlMsudotL7BAELRZs0yDZ4yVXsHXGi323QBjAVASw= -github.com/anacrolix/missinggo v1.3.0/go.mod h1:bqHm8cE8xr+15uVfMG3BFui/TxyB6//H5fwlq/TeqMc= -github.com/anacrolix/missinggo/perf v1.0.0 h1:7ZOGYziGEBytW49+KmYGTaNfnwUqP1HBsy6BqESAJVw= -github.com/anacrolix/missinggo/perf v1.0.0/go.mod h1:ljAFWkBuzkO12MQclXzZrosP5urunoLS0Cbvb4V0uMQ= -github.com/anacrolix/missinggo/v2 v2.2.0/go.mod h1:o0jgJoYOyaoYQ4E2ZMISVa9c88BbUBVQQW4QeRkNCGY= -github.com/anacrolix/missinggo/v2 v2.5.1/go.mod h1:WEjqh2rmKECd0t1VhQkLGTdIWXO6f6NLjp5GlMZ+6FA= -github.com/anacrolix/missinggo/v2 v2.5.2/go.mod h1:yNvsLrtZYRYCOI+KRH/JM8TodHjtIE/bjOGhQaLOWIE= -github.com/anacrolix/missinggo/v2 v2.7.2-0.20230527121029-a582b4f397b9 h1:W/oGeHhYwxueeiDjQfmK9G+X9M2xJgfTtow62v0TWAs= -github.com/anacrolix/missinggo/v2 v2.7.2-0.20230527121029-a582b4f397b9/go.mod h1:mIEtp9pgaXqt8VQ3NQxFOod/eQ1H0D1XsZzKUQfwtac= -github.com/anacrolix/mmsg v0.0.0-20180515031531-a4a3ba1fc8bb/go.mod h1:x2/ErsYUmT77kezS63+wzZp8E3byYB0gzirM/WMBLfw= -github.com/anacrolix/mmsg v1.0.0 h1:btC7YLjOn29aTUAExJiVUhQOuf/8rhm+/nWCMAnL3Hg= -github.com/anacrolix/mmsg v1.0.0/go.mod h1:x8kRaJY/dCrY9Al0PEcj1mb/uFHwP6GCJ9fLl4thEPc= -github.com/anacrolix/multiless v0.3.0 h1:5Bu0DZncjE4e06b9r1Ap2tUY4Au0NToBP5RpuEngSis= -github.com/anacrolix/multiless v0.3.0/go.mod h1:TrCLEZfIDbMVfLoQt5tOoiBS/uq4y8+ojuEVVvTNPX4= -github.com/anacrolix/stm v0.2.0/go.mod h1:zoVQRvSiGjGoTmbM0vSLIiaKjWtNPeTvXUSdJQA4hsg= -github.com/anacrolix/stm v0.4.0 h1:tOGvuFwaBjeu1u9X1eIh9TX8OEedEiEQ1se1FjhFnXY= -github.com/anacrolix/stm v0.4.0/go.mod h1:GCkwqWoAsP7RfLW+jw+Z0ovrt2OO7wRzcTtFYMYY5t8= -github.com/anacrolix/sync v0.0.0-20180808010631-44578de4e778/go.mod h1:s735Etp3joe/voe2sdaXLcqDdJSay1O0OPnM0ystjqk= -github.com/anacrolix/sync v0.3.0/go.mod h1:BbecHL6jDSExojhNtgTFSBcdGerzNc64tz3DCOj/I0g= -github.com/anacrolix/sync v0.4.0 h1:T+MdO/u87ir/ijWsTFsPYw5jVm0SMm4kVpg8t4KF38o= -github.com/anacrolix/sync v0.4.0/go.mod h1:BbecHL6jDSExojhNtgTFSBcdGerzNc64tz3DCOj/I0g= -github.com/anacrolix/tagflag v0.0.0-20180109131632-2146c8d41bf0/go.mod h1:1m2U/K6ZT+JZG0+bdMK6qauP49QT4wE5pmhJXOKKCHw= -github.com/anacrolix/tagflag v1.0.0/go.mod h1:1m2U/K6ZT+JZG0+bdMK6qauP49QT4wE5pmhJXOKKCHw= -github.com/anacrolix/tagflag v1.1.0/go.mod h1:Scxs9CV10NQatSmbyjqmqmeQNwGzlNe0CMUMIxqHIG8= -github.com/anacrolix/torrent v1.52.6-0.20230914125831-4fb12d06b31b h1:Asaf/ETwCIEIYya0+oX2ZCIhHsV6Zt77VGHCP82fchA= -github.com/anacrolix/torrent v1.52.6-0.20230914125831-4fb12d06b31b/go.mod h1:6lKyJNzkkY68p+LeSfv62auyyceWn12Uji+kme5cpaI= -github.com/anacrolix/upnp v0.1.3-0.20220123035249-922794e51c96 h1:QAVZ3pN/J4/UziniAhJR2OZ9Ox5kOY2053tBbbqUPYA= -github.com/anacrolix/upnp v0.1.3-0.20220123035249-922794e51c96/go.mod h1:Wa6n8cYIdaG35x15aH3Zy6d03f7P728QfdcDeD/IEOs= -github.com/anacrolix/utp v0.1.0 h1:FOpQOmIwYsnENnz7tAGohA+r6iXpRjrq8ssKSre2Cp4= -github.com/anacrolix/utp v0.1.0/go.mod h1:MDwc+vsGEq7RMw6lr2GKOEqjWny5hO5OZXRVNaBJ2Dk= -github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= -github.com/bahlo/generic-list-go v0.2.0 h1:5sz/EEAK+ls5wF+NeqDpk5+iNdMDXrh3z3nPnH1Wvgk= -github.com/bahlo/generic-list-go v0.2.0/go.mod h1:2KvAjgMlE5NNynlg/5iLrrCCZ2+5xWbdbCW3pNTGyYg= -github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= -github.com/benbjohnson/immutable v0.2.0/go.mod h1:uc6OHo6PN2++n98KHLxW8ef4W42ylHiQSENghE1ezxI= -github.com/benbjohnson/immutable v0.3.0 h1:TVRhuZx2wG9SZ0LRdqlbs9S5BZ6Y24hJEHTCgWHZEIw= -github.com/benbjohnson/immutable v0.3.0/go.mod h1:uc6OHo6PN2++n98KHLxW8ef4W42ylHiQSENghE1ezxI= -github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= -github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= -github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= -github.com/bits-and-blooms/bitset v1.2.0/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA= -github.com/bits-and-blooms/bitset v1.5.0 h1:NpE8frKRLGHIcEzkR+gZhiioW1+WbYV6fKwD6ZIpQT8= -github.com/bits-and-blooms/bitset v1.5.0/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA= -github.com/bradfitz/iter v0.0.0-20140124041915-454541ec3da2/go.mod h1:PyRFw1Lt2wKX4ZVSQ2mk+PeDa1rxyObEDlApuIsUKuo= -github.com/bradfitz/iter v0.0.0-20190303215204-33e6a9893b0c/go.mod h1:PyRFw1Lt2wKX4ZVSQ2mk+PeDa1rxyObEDlApuIsUKuo= -github.com/bradfitz/iter v0.0.0-20191230175014-e8f45d346db8 h1:GKTyiRCL6zVf5wWaqKnf+7Qs6GbEPfd4iMOitWzXJx8= -github.com/bradfitz/iter v0.0.0-20191230175014-e8f45d346db8/go.mod h1:spo1JLcs67NmW1aVLEgtA8Yy1elc+X8y5SRW1sFW4Og= -github.com/c2h5oh/datasize v0.0.0-20220606134207-859f65c6625b h1:6+ZFm0flnudZzdSE0JxlhR2hKnGPcNB35BjQf4RYQDY= -github.com/c2h5oh/datasize v0.0.0-20220606134207-859f65c6625b/go.mod h1:S/7n9copUssQ56c7aAgHqftWO4LTf4xY6CGWt8Bc+3M= -github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= -github.com/consensys/bavard v0.1.13 h1:oLhMLOFGTLdlda/kma4VOJazblc7IM5y5QPd2A/YjhQ= -github.com/consensys/bavard v0.1.13/go.mod h1:9ItSMtA/dXMAiL7BG6bqW2m3NdSEObYWoH223nGHukI= -github.com/consensys/gnark-crypto v0.10.0 h1:zRh22SR7o4K35SoNqouS9J/TKHTyU2QWaj5ldehyXtA= -github.com/consensys/gnark-crypto v0.10.0/go.mod h1:Iq/P3HHl0ElSjsg2E1gsMwhAyxnxoKK5nVyZKd+/KhU= -github.com/crate-crypto/go-kzg-4844 v0.3.0 h1:UBlWE0CgyFqqzTI+IFyCzA7A3Zw4iip6uzRv5NIXG0A= -github.com/crate-crypto/go-kzg-4844 v0.3.0/go.mod h1:SBP7ikXEgDnUPONgm33HtuDZEDtWa3L4QtN1ocJSEQ4= -github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= -github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/deckarep/golang-set/v2 v2.3.1 h1:vjmkvJt/IV27WXPyYQpAh4bRyWJc5Y435D17XQ9QU5A= -github.com/deckarep/golang-set/v2 v2.3.1/go.mod h1:VAky9rY/yGXJOLEDv3OMci+7wtDpOF4IN+y82NBOac4= -github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE= -github.com/dustin/go-humanize v0.0.0-20180421182945-02af3965c54e/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= -github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo= -github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= -github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= -github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= -github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= -github.com/edsrzf/mmap-go v1.1.0 h1:6EUwBLQ/Mcr1EYLE4Tn1VdW1A4ckqCQWZBw8Hr0kjpQ= -github.com/edsrzf/mmap-go v1.1.0/go.mod h1:19H/e8pUPLicwkyNgOykDXkJ9F0MHE+Z52B8EIth78Q= -github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= -github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= -github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= -github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/erigontech/mdbx-go v0.27.14 h1:IVVeQVCAjZRpAR8bThlP2ISxrOwdV35NZdGwAgotaRw= -github.com/erigontech/mdbx-go v0.27.14/go.mod h1:FAMxbOgqOnRDx51j8HjuJZIgznbDwjX7LItd+/UWyA4= -github.com/frankban/quicktest v1.9.0/go.mod h1:ui7WezCLWMWxVWr1GETZY3smRy0G4KWq9vcPtJmFl7Y= -github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8= -github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= -github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= -github.com/glycerine/go-unsnap-stream v0.0.0-20180323001048-9f0cb55181dd/go.mod h1:/20jfyN9Y5QPEAprSgKAUr+glWDY39ZiUEAYOEv5dsE= -github.com/glycerine/go-unsnap-stream v0.0.0-20181221182339-f9677308dec2/go.mod h1:/20jfyN9Y5QPEAprSgKAUr+glWDY39ZiUEAYOEv5dsE= -github.com/glycerine/go-unsnap-stream v0.0.0-20190901134440-81cf024a9e0a/go.mod h1:/20jfyN9Y5QPEAprSgKAUr+glWDY39ZiUEAYOEv5dsE= -github.com/glycerine/goconvey v0.0.0-20180728074245-46e3a41ad493/go.mod h1:Ogl1Tioa0aV7gstGFO7KhffUsb9M4ydbEbbxpcEDc24= -github.com/glycerine/goconvey v0.0.0-20190315024820-982ee783a72e/go.mod h1:Ogl1Tioa0aV7gstGFO7KhffUsb9M4ydbEbbxpcEDc24= -github.com/glycerine/goconvey v0.0.0-20190410193231-58a59202ab31/go.mod h1:Ogl1Tioa0aV7gstGFO7KhffUsb9M4ydbEbbxpcEDc24= -github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= -github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= -github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= -github.com/go-llsqlite/adapter v0.0.0-20230912124304-94ed0e573c23 h1:7krbnPREaxbmEaAkZovTNCMjmiZXEy/Gz9isFbqFK0I= -github.com/go-llsqlite/adapter v0.0.0-20230912124304-94ed0e573c23/go.mod h1:DADrR88ONKPPeSGjFp5iEN55Arx3fi2qXZeKCYDpbmU= -github.com/go-llsqlite/crawshaw v0.0.0-20230910110433-7e901377eb6c h1:pm7z8uwA2q3s8fAsJmKuGckNohqIrw2PRtv6yJ6z0Ro= -github.com/go-llsqlite/crawshaw v0.0.0-20230910110433-7e901377eb6c/go.mod h1:UdTSzmN3nr5dJNuZCsbPLfhSQB76u16rWh8pn+WFx9Q= -github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= -github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= -github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= -github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0= -github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= -github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= -github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/go-stack/stack v1.8.1 h1:ntEHSVwIt7PNXNpgPmVfMrNhLtgjlmnZha2kOpuRiDw= -github.com/go-stack/stack v1.8.1/go.mod h1:dcoOX6HbPZSZptuspn9bctJ+N/CnF5gGygcUP3XYfe4= -github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= -github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= -github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= -github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= -github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= -github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= -github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= -github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= -github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= -github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= -github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/google/btree v0.0.0-20180124185431-e89373fe6b4a/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= -github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= -github.com/google/btree v1.1.2 h1:xf4v41cLI2Z6FxbKm+8Bu+m8ifhj15JuZ9sa0jZCMUU= -github.com/google/btree v1.1.2/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4= -github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= -github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= -github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/subcommands v1.2.0/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= -github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= -github.com/gopherjs/gopherjs v0.0.0-20190309154008-847fc94819f9/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= -github.com/gopherjs/gopherjs v0.0.0-20190910122728-9d188e94fb99/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= -github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= -github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= -github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= -github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= -github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 h1:UH//fgunKIs4JdUbpDl1VZCDaL56wXCB/5+wF6uHfaI= -github.com/grpc-ecosystem/go-grpc-middleware v1.4.0/go.mod h1:g5qyo/la0ALbONm6Vbp88Yd8NsDy6rZz+RcrMPxvld8= -github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hashicorp/golang-lru/v2 v2.0.6 h1:3xi/Cafd1NaoEnS/yDssIiuVeDVywU0QdFGl3aQaQHM= -github.com/hashicorp/golang-lru/v2 v2.0.6/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM= -github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM= -github.com/holiman/uint256 v1.2.3 h1:K8UWO1HUJpRMXBxbmaY1Y8IAMZC/RsKB+ArEnnK4l5o= -github.com/holiman/uint256 v1.2.3/go.mod h1:SC8Ryt4n+UBbPbIBKaG9zbbDlp4jOru9xFZmPzLUTxw= -github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= -github.com/huandu/xstrings v1.0.0/go.mod h1:4qWG/gcEcfX4z/mBDHJ++3ReCw9ibxbsNJbcucJdbSo= -github.com/huandu/xstrings v1.2.0/go.mod h1:DvyZB1rfVYsBIigL8HwpZgxHwXozlTgGqn63UyNX5k4= -github.com/huandu/xstrings v1.3.0/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= -github.com/huandu/xstrings v1.3.1/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= -github.com/huandu/xstrings v1.3.2/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= -github.com/huandu/xstrings v1.4.0 h1:D17IlohoQq4UcpqD7fDk80P7l+lwAmlFaBHgOipl2FU= -github.com/huandu/xstrings v1.4.0/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= -github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= -github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -github.com/jtolds/gls v4.2.1+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= -github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= -github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= -github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= -github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= -github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= -github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= -github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= -github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= -github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/leanovate/gopter v0.2.9 h1:fQjYxZaynp97ozCzfOyOuAGOU4aU/z37zf/tOujFk7c= -github.com/ledgerwatch/interfaces v0.0.0-20230912104607-5501cfd6e5af h1:gGWTa4p8npycnK9gVBbZxMSOBvUgM80lsDU9rnFqyHU= -github.com/ledgerwatch/interfaces v0.0.0-20230912104607-5501cfd6e5af/go.mod h1:ugQv1QllJzBny3cKZKxUrSnykkjkBgm27eQM6dnGAcc= -github.com/ledgerwatch/log/v3 v3.9.0 h1:iDwrXe0PVwBC68Dd94YSsHbMgQ3ufsgjzXtFNFVZFRk= -github.com/ledgerwatch/log/v3 v3.9.0/go.mod h1:EiAY6upmI/6LkNhOVxb4eVsmsP11HZCnZ3PlJMjYiqE= -github.com/ledgerwatch/secp256k1 v1.0.0 h1:Usvz87YoTG0uePIV8woOof5cQnLXGYa162rFf3YnwaQ= -github.com/ledgerwatch/secp256k1 v1.0.0/go.mod h1:SPmqJFciiF/Q0mPt2jVs2dTr/1TZBTIA+kPMmKgBAak= -github.com/matryer/moq v0.3.2 h1:z7oltmpTxiQ9nKNg0Jc7z45TM+eO7OhCVohxRxwaudM= -github.com/matryer/moq v0.3.2/go.mod h1:RJ75ZZZD71hejp39j4crZLsEDszGk6iH4v4YsWFKH4s= -github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= -github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= -github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= -github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA= -github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= -github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/mmcloughlin/addchain v0.4.0 h1:SobOdjm2xLj1KkXN5/n0xTIWyZA2+s99UCY1iPfkHRY= -github.com/mmcloughlin/addchain v0.4.0/go.mod h1:A86O+tHqZLMNO4w6ZZ4FlVQEadcoqkyU72HC5wJ4RlU= -github.com/mmcloughlin/profile v0.1.1/go.mod h1:IhHD7q1ooxgwTgjxQYkACGA77oFTDdFVejUS1/tS/qU= -github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -github.com/mschoch/smat v0.0.0-20160514031455-90eadee771ae/go.mod h1:qAyveg+e4CE+eKJXWVjKXM4ck2QobLqTDytGJbLLhJg= -github.com/mschoch/smat v0.2.0 h1:8imxQsjDm8yFEAVBe7azKmKSgzSkZXDuKkSq9374khM= -github.com/mschoch/smat v0.2.0/go.mod h1:kc9mz7DoBKqDyiRL7VZN8KvXQMWeTaVnttLRXOlotKw= -github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= -github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= -github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= -github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= -github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= -github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= -github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= -github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= -github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= -github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= -github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= -github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw= -github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 h1:onHthvaw9LFnH4t2DcNVpwGmV9E1BkGknEliJkfwQj0= -github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58/go.mod h1:DXv8WO4yhMYhSNPKjeNKa5WY9YCIEBRbNzFFPJbWO6Y= -github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4= -github.com/pelletier/go-toml/v2 v2.1.0/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= -github.com/philhofer/fwd v1.0.0/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU= -github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= -github.com/pion/datachannel v1.5.2 h1:piB93s8LGmbECrpO84DnkIVWasRMk3IimbcXkTQLE6E= -github.com/pion/datachannel v1.5.2/go.mod h1:FTGQWaHrdCwIJ1rw6xBIfZVkslikjShim5yr05XFuCQ= -github.com/pion/dtls/v2 v2.1.3/go.mod h1:o6+WvyLDAlXF7YiPB/RlskRoeK+/JtuaZa5emwQcWus= -github.com/pion/dtls/v2 v2.1.5/go.mod h1:BqCE7xPZbPSubGasRoDFJeTsyJtdD1FanJYL0JGheqY= -github.com/pion/dtls/v2 v2.2.4 h1:YSfYwDQgrxMYXLBc/m7PFY5BVtWlNm/DN4qoU2CbcWg= -github.com/pion/dtls/v2 v2.2.4/go.mod h1:WGKfxqhrddne4Kg3p11FUMJrynkOY4lb25zHNO49wuw= -github.com/pion/ice/v2 v2.2.6 h1:R/vaLlI1J2gCx141L5PEwtuGAGcyS6e7E0hDeJFq5Ig= -github.com/pion/ice/v2 v2.2.6/go.mod h1:SWuHiOGP17lGromHTFadUe1EuPgFh/oCU6FCMZHooVE= -github.com/pion/interceptor v0.1.11 h1:00U6OlqxA3FFB50HSg25J/8cWi7P6FbSzw4eFn24Bvs= -github.com/pion/interceptor v0.1.11/go.mod h1:tbtKjZY14awXd7Bq0mmWvgtHB5MDaRN7HV3OZ/uy7s8= -github.com/pion/logging v0.2.2 h1:M9+AIj/+pxNsDfAT64+MAVgJO0rsyLnoJKCqf//DoeY= -github.com/pion/logging v0.2.2/go.mod h1:k0/tDVsRCX2Mb2ZEmTqNa7CWsQPc+YYCB7Q+5pahoms= -github.com/pion/mdns v0.0.5 h1:Q2oj/JB3NqfzY9xGZ1fPzZzK7sDSD8rZPOvcIQ10BCw= -github.com/pion/mdns v0.0.5/go.mod h1:UgssrvdD3mxpi8tMxAXbsppL3vJ4Jipw1mTCW+al01g= -github.com/pion/randutil v0.1.0 h1:CFG1UdESneORglEsnimhUjf33Rwjubwj6xfiOXBa3mA= -github.com/pion/randutil v0.1.0/go.mod h1:XcJrSMMbbMRhASFVOlj/5hQial/Y8oH/HVo7TBZq+j8= -github.com/pion/rtcp v1.2.9 h1:1ujStwg++IOLIEoOiIQ2s+qBuJ1VN81KW+9pMPsif+U= -github.com/pion/rtcp v1.2.9/go.mod h1:qVPhiCzAm4D/rxb6XzKeyZiQK69yJpbUDJSF7TgrqNo= -github.com/pion/rtp v1.7.13 h1:qcHwlmtiI50t1XivvoawdCGTP4Uiypzfrsap+bijcoA= -github.com/pion/rtp v1.7.13/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko= -github.com/pion/sctp v1.8.0/go.mod h1:xFe9cLMZ5Vj6eOzpyiKjT9SwGM4KpK/8Jbw5//jc+0s= -github.com/pion/sctp v1.8.2 h1:yBBCIrUMJ4yFICL3RIvR4eh/H2BTTvlligmSTy+3kiA= -github.com/pion/sctp v1.8.2/go.mod h1:xFe9cLMZ5Vj6eOzpyiKjT9SwGM4KpK/8Jbw5//jc+0s= -github.com/pion/sdp/v3 v3.0.5 h1:ouvI7IgGl+V4CrqskVtr3AaTrPvPisEOxwgpdktctkU= -github.com/pion/sdp/v3 v3.0.5/go.mod h1:iiFWFpQO8Fy3S5ldclBkpXqmWy02ns78NOKoLLL0YQw= -github.com/pion/srtp/v2 v2.0.9 h1:JJq3jClmDFBPX/F5roEb0U19jSU7eUhyDqR/NZ34EKQ= -github.com/pion/srtp/v2 v2.0.9/go.mod h1:5TtM9yw6lsH0ppNCehB/EjEUli7VkUgKSPJqWVqbhQ4= -github.com/pion/stun v0.3.5 h1:uLUCBCkQby4S1cf6CGuR9QrVOKcvUwFeemaC865QHDg= -github.com/pion/stun v0.3.5/go.mod h1:gDMim+47EeEtfWogA37n6qXZS88L5V6LqFcf+DZA2UA= -github.com/pion/transport v0.12.2/go.mod h1:N3+vZQD9HlDP5GWkZ85LohxNsDcNgofQmyL6ojX5d8Q= -github.com/pion/transport v0.12.3/go.mod h1:OViWW9SP2peE/HbwBvARicmAVnesphkNkCVZIWJ6q9A= -github.com/pion/transport v0.13.0/go.mod h1:yxm9uXpK9bpBBWkITk13cLo1y5/ur5VQpG22ny6EP7g= -github.com/pion/transport v0.13.1 h1:/UH5yLeQtwm2VZIPjxwnNFxjS4DFhyLfS4GlfuKUzfA= -github.com/pion/transport v0.13.1/go.mod h1:EBxbqzyv+ZrmDb82XswEE0BjfQFtuw1Nu6sjnjWCsGg= -github.com/pion/transport/v2 v2.0.0 h1:bsMYyqHCbkvHwj+eNCFBuxtlKndKfyGI2vaQmM3fIE4= -github.com/pion/transport/v2 v2.0.0/go.mod h1:HS2MEBJTwD+1ZI2eSXSvHJx/HnzQqRy2/LXxt6eVMHc= -github.com/pion/turn/v2 v2.0.8 h1:KEstL92OUN3k5k8qxsXHpr7WWfrdp7iJZHx99ud8muw= -github.com/pion/turn/v2 v2.0.8/go.mod h1:+y7xl719J8bAEVpSXBXvTxStjJv3hbz9YFflvkpcGPw= -github.com/pion/udp v0.1.1/go.mod h1:6AFo+CMdKQm7UiA0eUPA8/eVCTx8jBIITLZHc9DWX5M= -github.com/pion/udp v0.1.4 h1:OowsTmu1Od3sD6i3fQUJxJn2fEvJO6L1TidgadtbTI8= -github.com/pion/udp v0.1.4/go.mod h1:G8LDo56HsFwC24LIcnT4YIDU5qcB6NepqqjP0keL2us= -github.com/pion/webrtc/v3 v3.1.42 h1:wJEQFIXVanptnQcHOLTuIo4AtGB2+mG2x4OhIhnITOA= -github.com/pion/webrtc/v3 v3.1.42/go.mod h1:ffD9DulDrPxyWvDPUIPAOSAWx9GUlOExiJPf7cCcMLA= -github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= -github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= -github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= -github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= -github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs= -github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= -github.com/prometheus/client_golang v1.5.1/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= -github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= -github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= -github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= -github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= -github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= -github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= -github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= -github.com/prometheus/procfs v0.0.11/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= -github.com/quasilyte/go-ruleguard/dsl v0.3.22 h1:wd8zkOhSNr+I+8Qeciml08ivDt1pSXe60+5DqOpCjPE= -github.com/quasilyte/go-ruleguard/dsl v0.3.22/go.mod h1:KeCP03KrjuSO0H1kTuZQCWlQPulDV6YMIXmpQss17rU= -github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= -github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= -github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE= -github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= -github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= -github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE= -github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= -github.com/rs/dnscache v0.0.0-20211102005908-e0241e321417 h1:Lt9DzQALzHoDwMBGJ6v8ObDPR0dzr2a6sXTB1Fq7IHs= -github.com/rs/dnscache v0.0.0-20211102005908-e0241e321417/go.mod h1:qe5TWALJ8/a1Lqznoc5BDHpYX/8HU60Hm2AwRmqzxqA= -github.com/ryszard/goskiplist v0.0.0-20150312221310-2dfbae5fcf46 h1:GHRpF1pTW19a8tTFrMLUcfWwyC0pnifVo2ClaLq+hP8= -github.com/ryszard/goskiplist v0.0.0-20150312221310-2dfbae5fcf46/go.mod h1:uAQ5PCi+MFsC7HjREoAz1BU+Mq60+05gifQSsHSDG/8= -github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw= -github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= -github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= -github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= -github.com/smartystreets/assertions v0.0.0-20190215210624-980c5ac6f3ac/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= -github.com/smartystreets/goconvey v0.0.0-20181108003508-044398e4856c/go.mod h1:XDJAKZRPZ1CvBcN2aX5YOUTYGHki24fSF0Iv48Ibg0s= -github.com/smartystreets/goconvey v0.0.0-20190306220146-200a235640ff/go.mod h1:KSQcGKpxUMHk3nbYzs/tIBAM2iDooCn0BmttHOJEbLs= -github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI= -github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= -github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= -github.com/stretchr/testify v1.2.1/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= -github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= -github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/tidwall/btree v1.6.0 h1:LDZfKfQIBHGHWSwckhXI0RPSXzlo+KYdjK7FWSqOzzg= -github.com/tidwall/btree v1.6.0/go.mod h1:twD9XRA5jj9VUQGELzDO4HPQTNJsoWWfYEL+EUQ2cKY= -github.com/tinylib/msgp v1.0.2/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE= -github.com/tinylib/msgp v1.1.0/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE= -github.com/tinylib/msgp v1.1.2/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE= -github.com/valyala/fastrand v1.1.0 h1:f+5HkLW4rsgzdNoleUOB69hyT9IlD2ZQh9GyDMfb5G8= -github.com/valyala/fastrand v1.1.0/go.mod h1:HWqCzkrkg6QXT8V2EXWvXCoow7vLwOFN002oeRzjapQ= -github.com/valyala/histogram v1.2.0 h1:wyYGAZZt3CpwUiIb9AU/Zbllg1llXyrtApRS815OLoQ= -github.com/valyala/histogram v1.2.0/go.mod h1:Hb4kBwb4UxsaNbbbh+RRz8ZR6pdodR57tzWUS3BUzXY= -github.com/willf/bitset v1.1.9/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4= -github.com/willf/bitset v1.1.10/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4= -github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -go.etcd.io/bbolt v1.3.6 h1:/ecaJf0sk1l4l6V4awd65v2C3ILy7MSj+s/x1ADCIMU= -go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4= -go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= -go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= -go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/otel v1.8.0 h1:zcvBFizPbpa1q7FehvFiHbQwGzmPILebO0tyqIR5Djg= -go.opentelemetry.io/otel v1.8.0/go.mod h1:2pkj+iMj0o03Y+cW6/m8Y4WkRdYN3AvCXCnzRMp9yvM= -go.opentelemetry.io/otel/trace v1.8.0 h1:cSy0DF9eGI5WIfNwZ1q2iUyGj00tGzP24dE1lOlHrfY= -go.opentelemetry.io/otel/trace v1.8.0/go.mod h1:0Bt3PXY8w+3pheS3hQUt+wow8b1ojPaTBoTCh2zIFI4= -go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= -go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= -go.uber.org/zap v1.18.1/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI= -golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20220131195533-30dcbda58838/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.0.0-20220427172511-eb4f295cb31f/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.0.0-20220516162934-403b01795ae8/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU= -golang.org/x/crypto v0.13.0 h1:mvySKfSWJ+UKUii46M40LOvyWfN0s2U+46/jDd0e6Ck= -golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc= -golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20230711023510-fffb14384f22 h1:FqrVOBQxQ8r/UwwXibI0KMolVhvFiGobSfdE33deHJM= -golang.org/x/exp v0.0.0-20230711023510-fffb14384f22/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc= -golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= -golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.11.0 h1:bUO06HqtnRcc/7l71XBe4WcqTZ+3AH1J59zWDDwLKgU= -golang.org/x/mod v0.11.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201201195509-5d6afe98e0b7/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= -golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20211201190559-0a0e4e1bb54c/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.0.0-20220401154927-543a649e0bdd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.0.0-20220531201128-c960675eff93/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= -golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws= -golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.12.0 h1:cfawfvKITfUsFCeJIHJrbSxpeu/E81khclypR0GVT50= -golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA= -golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E= -golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= -golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200413165638-669c56c373c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220608164250-635b8c9b7f68/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o= -golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ= -golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= -golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= -golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= -golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= -golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.7.0 h1:W4OVu8VVOaIO0yzWMNdepAulS7YfoS3Zabrm8DOXXU4= -golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk= -google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= -google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/genproto v0.0.0-20200423170343-7949de9c1215/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 h1:bVf09lpb+OJbByTj913DRJioFFAjf/ZGxEz7MajTp2U= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98/go.mod h1:TUfxEVdsvPg18p6AslUXFoLdpED4oBnGwyqk3dV1XzM= -google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= -google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= -google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= -google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= -google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= -google.golang.org/grpc v1.58.1 h1:OL+Vz23DTtrrldqHK49FUOPHyY75rvFqJfXC84NYW58= -google.golang.org/grpc v1.58.1/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0= -google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.3.0 h1:rNBFJjBCOgVr9pWD7rs/knKL4FRTKgpZmsRfV214zcA= -google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.3.0/go.mod h1:Dk1tviKTvMCz5tvh7t+fh94dhmQVHuCt2OzJB3CTW9Y= -google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= -google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= -google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= -google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= -google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= -google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= -google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= -gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= -gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= -gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= -gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= -gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= -gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -modernc.org/libc v1.22.3 h1:D/g6O5ftAfavceqlLOFwaZuA5KYafKwmr30A6iSqoyY= -modernc.org/libc v1.22.3/go.mod h1:MQrloYP209xa2zHome2a8HLiLm6k0UT8CoHpV74tOFw= -modernc.org/mathutil v1.5.0 h1:rV0Ko/6SfM+8G+yKiyI830l3Wuz1zRutdslNoQ0kfiQ= -modernc.org/mathutil v1.5.0/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E= -modernc.org/memory v1.5.0 h1:N+/8c5rE6EqugZwHii4IFsaJ7MUhoWX07J5tC/iI5Ds= -modernc.org/memory v1.5.0/go.mod h1:PkUhL0Mugw21sHPeskwZW4D6VscE/GQJOnIpCnW6pSU= -modernc.org/sqlite v1.21.1 h1:GyDFqNnESLOhwwDRaHGdp2jKLDzpyT/rNLglX3ZkMSU= -modernc.org/sqlite v1.21.1/go.mod h1:XwQ0wZPIh1iKb5mkvCJ3szzbhk+tykC8ZWqTRTgYRwI= -rsc.io/tmplfunc v0.0.3 h1:53XFQh69AfOa8Tw0Jm7t+GV7KZhOi6jzsCzTtKbMvzU= -rsc.io/tmplfunc v0.0.3/go.mod h1:AG3sTPzElb1Io3Yg4voV9AGZJuleGAwaVRxL9M49PhA= -zombiezen.com/go/sqlite v0.13.1 h1:qDzxyWWmMtSSEH5qxamqBFmqA2BLSSbtODi3ojaE02o= -zombiezen.com/go/sqlite v0.13.1/go.mod h1:Ht/5Rg3Ae2hoyh1I7gbWtWAl89CNocfqeb/aAMTkJr4= diff --git a/erigon-lib/gointerfaces/downloader/downloader.pb.go b/erigon-lib/gointerfaces/downloader/downloader.pb.go index 773282e315b..2a68ff5cfd2 100644 --- a/erigon-lib/gointerfaces/downloader/downloader.pb.go +++ b/erigon-lib/gointerfaces/downloader/downloader.pb.go @@ -7,7 +7,7 @@ package downloader import ( - types "github.com/ledgerwatch/erigon-lib/gointerfaces/types" + types "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/types" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" emptypb "google.golang.org/protobuf/types/known/emptypb" diff --git a/erigon-lib/gointerfaces/execution/execution.pb.go b/erigon-lib/gointerfaces/execution/execution.pb.go index 5c2effd51b8..82432757981 100644 --- a/erigon-lib/gointerfaces/execution/execution.pb.go +++ b/erigon-lib/gointerfaces/execution/execution.pb.go @@ -7,7 +7,7 @@ package execution import ( - types "github.com/ledgerwatch/erigon-lib/gointerfaces/types" + types "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/types" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" emptypb "google.golang.org/protobuf/types/known/emptypb" diff --git a/erigon-lib/gointerfaces/execution/execution_grpc.pb.go b/erigon-lib/gointerfaces/execution/execution_grpc.pb.go index b3779a0b1b7..a9a324dd81d 100644 --- a/erigon-lib/gointerfaces/execution/execution_grpc.pb.go +++ b/erigon-lib/gointerfaces/execution/execution_grpc.pb.go @@ -8,7 +8,7 @@ package execution import ( context "context" - types "github.com/ledgerwatch/erigon-lib/gointerfaces/types" + types "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/types" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/erigon-lib/gointerfaces/remote/ethbackend.pb.go b/erigon-lib/gointerfaces/remote/ethbackend.pb.go index 118a3f7637d..4ba985961db 100644 --- a/erigon-lib/gointerfaces/remote/ethbackend.pb.go +++ b/erigon-lib/gointerfaces/remote/ethbackend.pb.go @@ -7,7 +7,7 @@ package remote import ( - types "github.com/ledgerwatch/erigon-lib/gointerfaces/types" + types "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/types" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" emptypb "google.golang.org/protobuf/types/known/emptypb" diff --git a/erigon-lib/gointerfaces/remote/ethbackend_grpc.pb.go b/erigon-lib/gointerfaces/remote/ethbackend_grpc.pb.go index 4a410a32b86..df8c2594550 100644 --- a/erigon-lib/gointerfaces/remote/ethbackend_grpc.pb.go +++ b/erigon-lib/gointerfaces/remote/ethbackend_grpc.pb.go @@ -8,7 +8,7 @@ package remote import ( context "context" - types "github.com/ledgerwatch/erigon-lib/gointerfaces/types" + types "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/types" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/erigon-lib/gointerfaces/remote/kv.pb.go b/erigon-lib/gointerfaces/remote/kv.pb.go index b2a0bff9ce9..3fd11fd5240 100644 --- a/erigon-lib/gointerfaces/remote/kv.pb.go +++ b/erigon-lib/gointerfaces/remote/kv.pb.go @@ -7,7 +7,7 @@ package remote import ( - types "github.com/ledgerwatch/erigon-lib/gointerfaces/types" + types "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/types" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" emptypb "google.golang.org/protobuf/types/known/emptypb" diff --git a/erigon-lib/gointerfaces/remote/kv_grpc.pb.go b/erigon-lib/gointerfaces/remote/kv_grpc.pb.go index d0305cb0fb4..d16cd5f71c0 100644 --- a/erigon-lib/gointerfaces/remote/kv_grpc.pb.go +++ b/erigon-lib/gointerfaces/remote/kv_grpc.pb.go @@ -8,7 +8,7 @@ package remote import ( context "context" - types "github.com/ledgerwatch/erigon-lib/gointerfaces/types" + types "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/types" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/erigon-lib/gointerfaces/remote/mocks.go b/erigon-lib/gointerfaces/remote/mocks.go index 8300eb434d2..c7bd4ad3ffd 100644 --- a/erigon-lib/gointerfaces/remote/mocks.go +++ b/erigon-lib/gointerfaces/remote/mocks.go @@ -5,7 +5,7 @@ package remote import ( context "context" - types "github.com/ledgerwatch/erigon-lib/gointerfaces/types" + types "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/types" grpc "google.golang.org/grpc" "google.golang.org/grpc/metadata" emptypb "google.golang.org/protobuf/types/known/emptypb" diff --git a/erigon-lib/gointerfaces/remote/sort.go b/erigon-lib/gointerfaces/remote/sort.go index 8145cfc3c69..58b36e27aa1 100644 --- a/erigon-lib/gointerfaces/remote/sort.go +++ b/erigon-lib/gointerfaces/remote/sort.go @@ -3,7 +3,7 @@ package remote import ( "strings" - "github.com/ledgerwatch/erigon-lib/gointerfaces/types" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/types" ) func NodeInfoReplyLess(i, j *types.NodeInfoReply) bool { diff --git a/erigon-lib/gointerfaces/remote/sort_test.go b/erigon-lib/gointerfaces/remote/sort_test.go index 46de9befa66..df47e2e0e32 100644 --- a/erigon-lib/gointerfaces/remote/sort_test.go +++ b/erigon-lib/gointerfaces/remote/sort_test.go @@ -1,12 +1,12 @@ package remote_test import ( + "sort" "testing" - "github.com/ledgerwatch/erigon-lib/gointerfaces/remote" - "github.com/ledgerwatch/erigon-lib/gointerfaces/types" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/remote" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/types" "github.com/stretchr/testify/assert" - "golang.org/x/exp/slices" ) func TestSort(t *testing.T) { @@ -49,7 +49,9 @@ func TestSort(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - slices.SortFunc(tt.got.NodesInfo, remote.NodeInfoReplyLess) + sort.Slice(tt.got.NodesInfo, func(i, j int) bool { + return remote.NodeInfoReplyLess(tt.got.NodesInfo[i], tt.got.NodesInfo[j]) + }) assert.Equal(t, tt.want, tt.got) }) } diff --git a/erigon-lib/gointerfaces/sentinel/sentinel.pb.go b/erigon-lib/gointerfaces/sentinel/sentinel.pb.go index 608597e7f2b..5e8f6cc6095 100644 --- a/erigon-lib/gointerfaces/sentinel/sentinel.pb.go +++ b/erigon-lib/gointerfaces/sentinel/sentinel.pb.go @@ -7,7 +7,7 @@ package sentinel import ( - types "github.com/ledgerwatch/erigon-lib/gointerfaces/types" + types "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/types" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" diff --git a/erigon-lib/gointerfaces/sentry/mocks.go b/erigon-lib/gointerfaces/sentry/mocks.go index 37a446b4470..0c7af511a50 100644 --- a/erigon-lib/gointerfaces/sentry/mocks.go +++ b/erigon-lib/gointerfaces/sentry/mocks.go @@ -5,7 +5,7 @@ package sentry import ( context "context" - types "github.com/ledgerwatch/erigon-lib/gointerfaces/types" + types "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/types" grpc "google.golang.org/grpc" emptypb "google.golang.org/protobuf/types/known/emptypb" sync "sync" diff --git a/erigon-lib/gointerfaces/sentry/sentry.pb.go b/erigon-lib/gointerfaces/sentry/sentry.pb.go index 87710f44292..176c301a063 100644 --- a/erigon-lib/gointerfaces/sentry/sentry.pb.go +++ b/erigon-lib/gointerfaces/sentry/sentry.pb.go @@ -7,7 +7,7 @@ package sentry import ( - types "github.com/ledgerwatch/erigon-lib/gointerfaces/types" + types "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/types" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" emptypb "google.golang.org/protobuf/types/known/emptypb" diff --git a/erigon-lib/gointerfaces/sentry/sentry_grpc.pb.go b/erigon-lib/gointerfaces/sentry/sentry_grpc.pb.go index 1a9d1959b5c..5798137ad15 100644 --- a/erigon-lib/gointerfaces/sentry/sentry_grpc.pb.go +++ b/erigon-lib/gointerfaces/sentry/sentry_grpc.pb.go @@ -8,7 +8,7 @@ package sentry import ( context "context" - types "github.com/ledgerwatch/erigon-lib/gointerfaces/types" + types "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/types" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/erigon-lib/gointerfaces/txpool/mining.pb.go b/erigon-lib/gointerfaces/txpool/mining.pb.go index 20b3e0bd7e6..df6e5425cb1 100644 --- a/erigon-lib/gointerfaces/txpool/mining.pb.go +++ b/erigon-lib/gointerfaces/txpool/mining.pb.go @@ -7,7 +7,7 @@ package txpool import ( - types "github.com/ledgerwatch/erigon-lib/gointerfaces/types" + types "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/types" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" emptypb "google.golang.org/protobuf/types/known/emptypb" diff --git a/erigon-lib/gointerfaces/txpool/mining_grpc.pb.go b/erigon-lib/gointerfaces/txpool/mining_grpc.pb.go index d0465eb5f11..b02df71d4f0 100644 --- a/erigon-lib/gointerfaces/txpool/mining_grpc.pb.go +++ b/erigon-lib/gointerfaces/txpool/mining_grpc.pb.go @@ -8,7 +8,7 @@ package txpool import ( context "context" - types "github.com/ledgerwatch/erigon-lib/gointerfaces/types" + types "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/types" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/erigon-lib/gointerfaces/txpool/txpool.pb.go b/erigon-lib/gointerfaces/txpool/txpool.pb.go index 52b9b02def1..ca03def7be8 100644 --- a/erigon-lib/gointerfaces/txpool/txpool.pb.go +++ b/erigon-lib/gointerfaces/txpool/txpool.pb.go @@ -7,7 +7,7 @@ package txpool import ( - types "github.com/ledgerwatch/erigon-lib/gointerfaces/types" + types "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/types" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" emptypb "google.golang.org/protobuf/types/known/emptypb" diff --git a/erigon-lib/gointerfaces/txpool/txpool_grpc.pb.go b/erigon-lib/gointerfaces/txpool/txpool_grpc.pb.go index d8c6da0d0a6..34a5c84db8e 100644 --- a/erigon-lib/gointerfaces/txpool/txpool_grpc.pb.go +++ b/erigon-lib/gointerfaces/txpool/txpool_grpc.pb.go @@ -8,7 +8,7 @@ package txpool import ( context "context" - types "github.com/ledgerwatch/erigon-lib/gointerfaces/types" + types "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/types" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/erigon-lib/gointerfaces/type_utils.go b/erigon-lib/gointerfaces/type_utils.go index e2dd156a551..dc6b54a4207 100644 --- a/erigon-lib/gointerfaces/type_utils.go +++ b/erigon-lib/gointerfaces/type_utils.go @@ -17,7 +17,7 @@ import ( "encoding/binary" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/gointerfaces/types" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/types" ) func ConvertH2048ToBloom(h2048 *types.H2048) [256]byte { diff --git a/erigon-lib/gointerfaces/version.go b/erigon-lib/gointerfaces/version.go index 3adc946022d..5ce2d2e83da 100644 --- a/erigon-lib/gointerfaces/version.go +++ b/erigon-lib/gointerfaces/version.go @@ -19,7 +19,7 @@ package gointerfaces import ( "fmt" - "github.com/ledgerwatch/erigon-lib/gointerfaces/types" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/types" ) type Version struct { diff --git a/erigon-lib/kv/bitmapdb/bitmapdb.go b/erigon-lib/kv/bitmapdb/bitmapdb.go index 0311eb60712..f6f57835792 100644 --- a/erigon-lib/kv/bitmapdb/bitmapdb.go +++ b/erigon-lib/kv/bitmapdb/bitmapdb.go @@ -27,8 +27,8 @@ import ( "github.com/RoaringBitmap/roaring/roaring64" "github.com/c2h5oh/datasize" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv" ) const MaxUint32 = 1<<32 - 1 diff --git a/erigon-lib/kv/bitmapdb/bitmapdb_test.go b/erigon-lib/kv/bitmapdb/bitmapdb_test.go index b3a4e9bfc02..251cce791e3 100644 --- a/erigon-lib/kv/bitmapdb/bitmapdb_test.go +++ b/erigon-lib/kv/bitmapdb/bitmapdb_test.go @@ -20,7 +20,7 @@ import ( "testing" "github.com/RoaringBitmap/roaring" - "github.com/ledgerwatch/erigon-lib/kv/bitmapdb" + "github.com/ledgerwatch/erigon/erigon-lib/kv/bitmapdb" "github.com/stretchr/testify/require" ) diff --git a/erigon-lib/kv/helpers.go b/erigon-lib/kv/helpers.go index 727a140a124..2ee5593722f 100644 --- a/erigon-lib/kv/helpers.go +++ b/erigon-lib/kv/helpers.go @@ -25,7 +25,7 @@ import ( "time" "github.com/erigontech/mdbx-go/mdbx" - "github.com/ledgerwatch/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common" ) func DefaultPageSize() uint64 { diff --git a/erigon-lib/kv/iter/iter.go b/erigon-lib/kv/iter/iter.go index d722caed15e..553e1e1a632 100644 --- a/erigon-lib/kv/iter/iter.go +++ b/erigon-lib/kv/iter/iter.go @@ -19,7 +19,7 @@ package iter import ( "bytes" - "github.com/ledgerwatch/erigon-lib/kv/order" + "github.com/ledgerwatch/erigon/erigon-lib/kv/order" "golang.org/x/exp/constraints" "golang.org/x/exp/slices" ) diff --git a/erigon-lib/kv/iter/iter_test.go b/erigon-lib/kv/iter/iter_test.go index 2c0a02a1ba3..10d51ee2f19 100644 --- a/erigon-lib/kv/iter/iter_test.go +++ b/erigon-lib/kv/iter/iter_test.go @@ -22,10 +22,10 @@ import ( "fmt" "testing" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/iter" - "github.com/ledgerwatch/erigon-lib/kv/memdb" - "github.com/ledgerwatch/erigon-lib/kv/order" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/iter" + "github.com/ledgerwatch/erigon/erigon-lib/kv/memdb" + "github.com/ledgerwatch/erigon/erigon-lib/kv/order" "github.com/stretchr/testify/require" ) diff --git a/erigon-lib/kv/kv_interface.go b/erigon-lib/kv/kv_interface.go index d1d4f0de56c..bb9a9998810 100644 --- a/erigon-lib/kv/kv_interface.go +++ b/erigon-lib/kv/kv_interface.go @@ -22,8 +22,8 @@ import ( "fmt" "github.com/VictoriaMetrics/metrics" - "github.com/ledgerwatch/erigon-lib/kv/iter" - "github.com/ledgerwatch/erigon-lib/kv/order" + "github.com/ledgerwatch/erigon/erigon-lib/kv/iter" + "github.com/ledgerwatch/erigon/erigon-lib/kv/order" ) //Variables Naming: diff --git a/erigon-lib/kv/kvcache/cache.go b/erigon-lib/kv/kvcache/cache.go index 9ffefba7080..201242a32c8 100644 --- a/erigon-lib/kv/kvcache/cache.go +++ b/erigon-lib/kv/kvcache/cache.go @@ -31,10 +31,10 @@ import ( btree2 "github.com/tidwall/btree" "golang.org/x/crypto/sha3" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - "github.com/ledgerwatch/erigon-lib/gointerfaces/remote" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/remote" + "github.com/ledgerwatch/erigon/erigon-lib/kv" ) type CacheValidationResult struct { diff --git a/erigon-lib/kv/kvcache/cache_test.go b/erigon-lib/kv/kvcache/cache_test.go index 0f119831afe..efbd2ff2f9b 100644 --- a/erigon-lib/kv/kvcache/cache_test.go +++ b/erigon-lib/kv/kvcache/cache_test.go @@ -22,11 +22,11 @@ import ( "sync" "testing" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - "github.com/ledgerwatch/erigon-lib/gointerfaces/remote" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/memdb" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/remote" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/memdb" "github.com/stretchr/testify/require" ) diff --git a/erigon-lib/kv/kvcache/dummy.go b/erigon-lib/kv/kvcache/dummy.go index 68697d0039e..6f9b70c6703 100644 --- a/erigon-lib/kv/kvcache/dummy.go +++ b/erigon-lib/kv/kvcache/dummy.go @@ -18,8 +18,8 @@ package kvcache import ( "context" - "github.com/ledgerwatch/erigon-lib/gointerfaces/remote" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/remote" + "github.com/ledgerwatch/erigon/erigon-lib/kv" ) // DummyCache - doesn't remember anything - can be used when service is not remote diff --git a/erigon-lib/kv/kvcfg/accessors_config.go b/erigon-lib/kv/kvcfg/accessors_config.go index 5c68771e45d..042d2135796 100644 --- a/erigon-lib/kv/kvcfg/accessors_config.go +++ b/erigon-lib/kv/kvcfg/accessors_config.go @@ -19,7 +19,7 @@ package kvcfg import ( "context" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv" ) type ConfigKey []byte diff --git a/erigon-lib/kv/mdbx/kv_abstract_test.go b/erigon-lib/kv/mdbx/kv_abstract_test.go index a504eac6407..1d01ead0dac 100644 --- a/erigon-lib/kv/mdbx/kv_abstract_test.go +++ b/erigon-lib/kv/mdbx/kv_abstract_test.go @@ -23,13 +23,13 @@ import ( "runtime" "testing" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - "github.com/ledgerwatch/erigon-lib/gointerfaces/remote" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/mdbx" - "github.com/ledgerwatch/erigon-lib/kv/memdb" - "github.com/ledgerwatch/erigon-lib/kv/remotedb" - "github.com/ledgerwatch/erigon-lib/kv/remotedbserver" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/remote" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/mdbx" + "github.com/ledgerwatch/erigon/erigon-lib/kv/memdb" + "github.com/ledgerwatch/erigon/erigon-lib/kv/remotedb" + "github.com/ledgerwatch/erigon/erigon-lib/kv/remotedbserver" "github.com/ledgerwatch/log/v3" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/erigon-lib/kv/mdbx/kv_mdbx.go b/erigon-lib/kv/mdbx/kv_mdbx.go index 847f772f2bc..d67bf948559 100644 --- a/erigon-lib/kv/mdbx/kv_mdbx.go +++ b/erigon-lib/kv/mdbx/kv_mdbx.go @@ -32,10 +32,10 @@ import ( "github.com/c2h5oh/datasize" "github.com/erigontech/mdbx-go/mdbx" stack2 "github.com/go-stack/stack" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/iter" - "github.com/ledgerwatch/erigon-lib/kv/order" + "github.com/ledgerwatch/erigon/erigon-lib/common/dbg" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/iter" + "github.com/ledgerwatch/erigon/erigon-lib/kv/order" "github.com/ledgerwatch/log/v3" "github.com/pbnjay/memory" "golang.org/x/exp/maps" diff --git a/erigon-lib/kv/mdbx/kv_mdbx_temporary.go b/erigon-lib/kv/mdbx/kv_mdbx_temporary.go index f6723b85c73..ea936db6940 100644 --- a/erigon-lib/kv/mdbx/kv_mdbx_temporary.go +++ b/erigon-lib/kv/mdbx/kv_mdbx_temporary.go @@ -20,7 +20,7 @@ import ( "context" "os" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/log/v3" ) diff --git a/erigon-lib/kv/mdbx/kv_mdbx_test.go b/erigon-lib/kv/mdbx/kv_mdbx_test.go index e79a852dae2..47f5f6249d5 100644 --- a/erigon-lib/kv/mdbx/kv_mdbx_test.go +++ b/erigon-lib/kv/mdbx/kv_mdbx_test.go @@ -21,8 +21,8 @@ import ( "testing" "github.com/c2h5oh/datasize" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/order" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/order" "github.com/ledgerwatch/log/v3" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/erigon-lib/kv/mdbx/kv_migrator_test.go b/erigon-lib/kv/mdbx/kv_migrator_test.go index 62be6bcb86b..34078da19e6 100644 --- a/erigon-lib/kv/mdbx/kv_migrator_test.go +++ b/erigon-lib/kv/mdbx/kv_migrator_test.go @@ -24,9 +24,9 @@ import ( "time" "github.com/c2h5oh/datasize" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/mdbx" - "github.com/ledgerwatch/erigon-lib/kv/memdb" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/mdbx" + "github.com/ledgerwatch/erigon/erigon-lib/kv/memdb" "github.com/ledgerwatch/log/v3" "github.com/stretchr/testify/require" ) diff --git a/erigon-lib/kv/mdbx/util.go b/erigon-lib/kv/mdbx/util.go index ca16ee273cd..fc84b097163 100644 --- a/erigon-lib/kv/mdbx/util.go +++ b/erigon-lib/kv/mdbx/util.go @@ -18,7 +18,7 @@ package mdbx import ( mdbxbind "github.com/erigontech/mdbx-go/mdbx" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/log/v3" ) diff --git a/erigon-lib/kv/memdb/memory_database.go b/erigon-lib/kv/memdb/memory_database.go index 57b90680d5f..46e92866bcb 100644 --- a/erigon-lib/kv/memdb/memory_database.go +++ b/erigon-lib/kv/memdb/memory_database.go @@ -20,8 +20,8 @@ import ( "context" "testing" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/mdbx" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/mdbx" "github.com/ledgerwatch/log/v3" ) diff --git a/erigon-lib/kv/memdb/memory_mutation.go b/erigon-lib/kv/memdb/memory_mutation.go index bca696ddc56..993ed7d6fa5 100644 --- a/erigon-lib/kv/memdb/memory_mutation.go +++ b/erigon-lib/kv/memdb/memory_mutation.go @@ -17,13 +17,13 @@ import ( "bytes" "context" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv/iter" - "github.com/ledgerwatch/erigon-lib/kv/order" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv/iter" + "github.com/ledgerwatch/erigon/erigon-lib/kv/order" "github.com/ledgerwatch/log/v3" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/mdbx" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/mdbx" ) type MemoryMutation struct { diff --git a/erigon-lib/kv/memdb/memory_mutation_cursor.go b/erigon-lib/kv/memdb/memory_mutation_cursor.go index 792bfe34bfb..2630e45ad77 100644 --- a/erigon-lib/kv/memdb/memory_mutation_cursor.go +++ b/erigon-lib/kv/memdb/memory_mutation_cursor.go @@ -17,8 +17,8 @@ import ( "bytes" "fmt" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv" ) type NextType int diff --git a/erigon-lib/kv/memdb/memory_mutation_diff.go b/erigon-lib/kv/memdb/memory_mutation_diff.go index 7f58b8a1daf..34733a6bafd 100644 --- a/erigon-lib/kv/memdb/memory_mutation_diff.go +++ b/erigon-lib/kv/memdb/memory_mutation_diff.go @@ -1,6 +1,6 @@ package memdb -import "github.com/ledgerwatch/erigon-lib/kv" +import "github.com/ledgerwatch/erigon/erigon-lib/kv" type entry struct { k []byte diff --git a/erigon-lib/kv/memdb/memory_mutation_test.go b/erigon-lib/kv/memdb/memory_mutation_test.go index 9777b8a30f9..979ca8a9c6f 100644 --- a/erigon-lib/kv/memdb/memory_mutation_test.go +++ b/erigon-lib/kv/memdb/memory_mutation_test.go @@ -19,7 +19,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv" ) func initializeDbNonDupSort(rwTx kv.RwTx) { diff --git a/erigon-lib/kv/rawdbv3/txnum.go b/erigon-lib/kv/rawdbv3/txnum.go index f01bae47650..09b63b05a56 100644 --- a/erigon-lib/kv/rawdbv3/txnum.go +++ b/erigon-lib/kv/rawdbv3/txnum.go @@ -21,7 +21,7 @@ import ( "fmt" "sort" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv" ) type txNums struct{} diff --git a/erigon-lib/kv/remotedb/kv_remote.go b/erigon-lib/kv/remotedb/kv_remote.go index 9c59b28f402..fec07c55850 100644 --- a/erigon-lib/kv/remotedb/kv_remote.go +++ b/erigon-lib/kv/remotedb/kv_remote.go @@ -23,18 +23,18 @@ import ( "fmt" "runtime" - "github.com/ledgerwatch/erigon-lib/kv/iter" - "github.com/ledgerwatch/erigon-lib/kv/order" + "github.com/ledgerwatch/erigon/erigon-lib/kv/iter" + "github.com/ledgerwatch/erigon/erigon-lib/kv/order" "github.com/ledgerwatch/log/v3" "golang.org/x/sync/semaphore" "google.golang.org/grpc" "google.golang.org/protobuf/types/known/emptypb" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - "github.com/ledgerwatch/erigon-lib/gointerfaces/grpcutil" - "github.com/ledgerwatch/erigon-lib/gointerfaces/remote" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/mdbx" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/grpcutil" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/remote" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/mdbx" ) // generate the messages and services diff --git a/erigon-lib/kv/remotedbserver/remotedbserver.go b/erigon-lib/kv/remotedbserver/remotedbserver.go index 526190af36b..fb8f1889197 100644 --- a/erigon-lib/kv/remotedbserver/remotedbserver.go +++ b/erigon-lib/kv/remotedbserver/remotedbserver.go @@ -31,14 +31,14 @@ import ( "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/known/emptypb" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/gointerfaces/remote" - "github.com/ledgerwatch/erigon-lib/gointerfaces/types" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/iter" - "github.com/ledgerwatch/erigon-lib/kv/order" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/dbg" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/remote" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/types" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/iter" + "github.com/ledgerwatch/erigon/erigon-lib/kv/order" ) // MaxTxTTL - kv interface provide high-consistancy guaranties: Serializable Isolations Level https://en.wikipedia.org/wiki/Isolation_(database_systems) diff --git a/erigon-lib/kv/remotedbserver/server_test.go b/erigon-lib/kv/remotedbserver/server_test.go index fec193f0389..b13600bbb75 100644 --- a/erigon-lib/kv/remotedbserver/server_test.go +++ b/erigon-lib/kv/remotedbserver/server_test.go @@ -21,8 +21,8 @@ import ( "runtime" "testing" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/memdb" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/memdb" "github.com/ledgerwatch/log/v3" "github.com/stretchr/testify/require" "golang.org/x/sync/errgroup" diff --git a/erigon-lib/kv/tables.go b/erigon-lib/kv/tables.go index d700ce173a9..90ee1025f06 100644 --- a/erigon-lib/kv/tables.go +++ b/erigon-lib/kv/tables.go @@ -21,7 +21,7 @@ import ( "sort" "strings" - "github.com/ledgerwatch/erigon-lib/gointerfaces/types" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/types" ) // DBSchemaVersion versions list diff --git a/erigon-lib/kv/temporal/historyv2/account_changeset.go b/erigon-lib/kv/temporal/historyv2/account_changeset.go index db09519f5f4..0a2a78c16e3 100644 --- a/erigon-lib/kv/temporal/historyv2/account_changeset.go +++ b/erigon-lib/kv/temporal/historyv2/account_changeset.go @@ -22,9 +22,9 @@ import ( "fmt" "sort" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" + "github.com/ledgerwatch/erigon/erigon-lib/kv" ) type Encoder func(blockN uint64, s *ChangeSet, f func(k, v []byte) error) error diff --git a/erigon-lib/kv/temporal/historyv2/account_changeset_test.go b/erigon-lib/kv/temporal/historyv2/account_changeset_test.go index 231ce569284..557ee52b2a1 100644 --- a/erigon-lib/kv/temporal/historyv2/account_changeset_test.go +++ b/erigon-lib/kv/temporal/historyv2/account_changeset_test.go @@ -25,8 +25,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/kv" ) func TestEncodingAccount(t *testing.T) { diff --git a/erigon-lib/kv/temporal/historyv2/changeset.go b/erigon-lib/kv/temporal/historyv2/changeset.go index 4ca0eeadef0..7bab1424d62 100644 --- a/erigon-lib/kv/temporal/historyv2/changeset.go +++ b/erigon-lib/kv/temporal/historyv2/changeset.go @@ -23,9 +23,9 @@ import ( math2 "math" "reflect" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" + "github.com/ledgerwatch/erigon/erigon-lib/kv" ) func NewChangeSet() *ChangeSet { diff --git a/erigon-lib/kv/temporal/historyv2/find_by_history.go b/erigon-lib/kv/temporal/historyv2/find_by_history.go index 42c895f2f9f..84aa8a56e26 100644 --- a/erigon-lib/kv/temporal/historyv2/find_by_history.go +++ b/erigon-lib/kv/temporal/historyv2/find_by_history.go @@ -22,9 +22,9 @@ import ( "fmt" "github.com/RoaringBitmap/roaring/roaring64" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/bitmapdb" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/bitmapdb" ) func FindByHistory(indexC kv.Cursor, changesC kv.CursorDupSort, storage bool, key []byte, timestamp uint64) ([]byte, bool, error) { diff --git a/erigon-lib/kv/temporal/historyv2/storage_changeset.go b/erigon-lib/kv/temporal/historyv2/storage_changeset.go index 61b435394c2..93d20b64985 100644 --- a/erigon-lib/kv/temporal/historyv2/storage_changeset.go +++ b/erigon-lib/kv/temporal/historyv2/storage_changeset.go @@ -23,8 +23,8 @@ import ( "fmt" "sort" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" + "github.com/ledgerwatch/erigon/erigon-lib/kv" ) var ( diff --git a/erigon-lib/patricia/patricia.go b/erigon-lib/patricia/patricia.go index 76e1eea7283..785cd05a8a1 100644 --- a/erigon-lib/patricia/patricia.go +++ b/erigon-lib/patricia/patricia.go @@ -21,7 +21,8 @@ import ( "math/bits" "strings" - "github.com/ledgerwatch/erigon-lib/sais" + "github.com/ledgerwatch/erigon/erigon-lib/common/cmp" + "github.com/ledgerwatch/erigon/erigon-lib/sais" "golang.org/x/exp/slices" ) @@ -699,7 +700,7 @@ func (mf2 *MatchFinder2) FindLongestMatches(data []byte) []Match { return mf2.matches } //sort.Sort(&mf2.matches) - slices.SortFunc(mf2.matches, func(i, j Match) bool { return i.Start < j.Start }) + slices.SortFunc(mf2.matches, func(i, j Match) int { return cmp.Less(i.Start, j.Start) }) lastEnd := mf2.matches[0].End j := 1 diff --git a/erigon-lib/recsplit/eliasfano16/elias_fano.go b/erigon-lib/recsplit/eliasfano16/elias_fano.go index b67a2ab24f4..b506e4b5215 100644 --- a/erigon-lib/recsplit/eliasfano16/elias_fano.go +++ b/erigon-lib/recsplit/eliasfano16/elias_fano.go @@ -24,7 +24,7 @@ import ( "math/bits" "unsafe" - "github.com/ledgerwatch/erigon-lib/common/bitutil" + "github.com/ledgerwatch/erigon/erigon-lib/common/bitutil" ) // EliasFano algo overview https://www.antoniomallia.it/sorted-integers-compression-with-elias-fano-encoding.html diff --git a/erigon-lib/recsplit/eliasfano32/elias_fano.go b/erigon-lib/recsplit/eliasfano32/elias_fano.go index a966aa9c38e..d7a5532bb1d 100644 --- a/erigon-lib/recsplit/eliasfano32/elias_fano.go +++ b/erigon-lib/recsplit/eliasfano32/elias_fano.go @@ -25,8 +25,8 @@ import ( "sort" "unsafe" - "github.com/ledgerwatch/erigon-lib/common/bitutil" - "github.com/ledgerwatch/erigon-lib/kv/iter" + "github.com/ledgerwatch/erigon/erigon-lib/common/bitutil" + "github.com/ledgerwatch/erigon/erigon-lib/kv/iter" ) // EliasFano algo overview https://www.antoniomallia.it/sorted-integers-compression-with-elias-fano-encoding.html diff --git a/erigon-lib/recsplit/eliasfano32/elias_fano_test.go b/erigon-lib/recsplit/eliasfano32/elias_fano_test.go index 5d9cd74f1e9..d75cd7c0e52 100644 --- a/erigon-lib/recsplit/eliasfano32/elias_fano_test.go +++ b/erigon-lib/recsplit/eliasfano32/elias_fano_test.go @@ -22,7 +22,7 @@ import ( "math/bits" "testing" - "github.com/ledgerwatch/erigon-lib/kv/iter" + "github.com/ledgerwatch/erigon/erigon-lib/kv/iter" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/erigon-lib/recsplit/golomb_rice.go b/erigon-lib/recsplit/golomb_rice.go index 98221e1bfcd..486156d2569 100644 --- a/erigon-lib/recsplit/golomb_rice.go +++ b/erigon-lib/recsplit/golomb_rice.go @@ -22,7 +22,7 @@ import ( "math/bits" "unsafe" - "github.com/ledgerwatch/erigon-lib/common/bitutil" + "github.com/ledgerwatch/erigon/erigon-lib/common/bitutil" ) // Optimal Golomb-Rice parameters for leaves diff --git a/erigon-lib/recsplit/index.go b/erigon-lib/recsplit/index.go index d1765a7d3e6..16bb2130dd0 100644 --- a/erigon-lib/recsplit/index.go +++ b/erigon-lib/recsplit/index.go @@ -28,13 +28,13 @@ import ( "time" "unsafe" - "github.com/ledgerwatch/erigon-lib/common/dbg" + "github.com/ledgerwatch/erigon/erigon-lib/common/dbg" "github.com/ledgerwatch/log/v3" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/mmap" - "github.com/ledgerwatch/erigon-lib/recsplit/eliasfano16" - "github.com/ledgerwatch/erigon-lib/recsplit/eliasfano32" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/mmap" + "github.com/ledgerwatch/erigon/erigon-lib/recsplit/eliasfano16" + "github.com/ledgerwatch/erigon/erigon-lib/recsplit/eliasfano32" ) // Index implements index lookup from the file created by the RecSplit diff --git a/erigon-lib/recsplit/recsplit.go b/erigon-lib/recsplit/recsplit.go index a019ca9b3f9..530485fe8fd 100644 --- a/erigon-lib/recsplit/recsplit.go +++ b/erigon-lib/recsplit/recsplit.go @@ -32,11 +32,11 @@ import ( "github.com/ledgerwatch/log/v3" "github.com/spaolacci/murmur3" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/assert" - "github.com/ledgerwatch/erigon-lib/etl" - "github.com/ledgerwatch/erigon-lib/recsplit/eliasfano16" - "github.com/ledgerwatch/erigon-lib/recsplit/eliasfano32" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/assert" + "github.com/ledgerwatch/erigon/erigon-lib/etl" + "github.com/ledgerwatch/erigon/erigon-lib/recsplit/eliasfano16" + "github.com/ledgerwatch/erigon/erigon-lib/recsplit/eliasfano32" ) var ErrCollision = fmt.Errorf("duplicate key") diff --git a/erigon-lib/rlp/encodel.go b/erigon-lib/rlp/encodel.go index 7e075a7b8c0..0ba5dfd1d93 100644 --- a/erigon-lib/rlp/encodel.go +++ b/erigon-lib/rlp/encodel.go @@ -20,7 +20,7 @@ import ( "encoding/binary" "math/bits" - "github.com/ledgerwatch/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common" ) // General design: diff --git a/erigon-lib/rlp/parse.go b/erigon-lib/rlp/parse.go index cbe59749a0f..82648bf595e 100644 --- a/erigon-lib/rlp/parse.go +++ b/erigon-lib/rlp/parse.go @@ -22,7 +22,7 @@ import ( "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common" ) var ( diff --git a/erigon-lib/rlp/parse_test.go b/erigon-lib/rlp/parse_test.go index 00712776868..1d89e19537a 100644 --- a/erigon-lib/rlp/parse_test.go +++ b/erigon-lib/rlp/parse_test.go @@ -7,7 +7,7 @@ import ( "github.com/holiman/uint256" "github.com/stretchr/testify/assert" - "github.com/ledgerwatch/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" ) var parseU64Tests = []struct { diff --git a/erigon-lib/sais/gsa/gsa_test.go b/erigon-lib/sais/gsa/gsa_test.go index 20bb9a68422..4704dc67cec 100644 --- a/erigon-lib/sais/gsa/gsa_test.go +++ b/erigon-lib/sais/gsa/gsa_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/ledgerwatch/erigon-lib/sais" + "github.com/ledgerwatch/erigon/erigon-lib/sais" "github.com/stretchr/testify/assert" ) diff --git a/erigon-lib/state/aggregator.go b/erigon-lib/state/aggregator.go index 0f719924609..76d52ed8e15 100644 --- a/erigon-lib/state/aggregator.go +++ b/erigon-lib/state/aggregator.go @@ -32,13 +32,13 @@ import ( "github.com/ledgerwatch/log/v3" "golang.org/x/sync/errgroup" - "github.com/ledgerwatch/erigon-lib/commitment" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/background" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/iter" - "github.com/ledgerwatch/erigon-lib/kv/order" + "github.com/ledgerwatch/erigon/erigon-lib/commitment" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/background" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/iter" + "github.com/ledgerwatch/erigon/erigon-lib/kv/order" ) // StepsInBiggestFile - files of this size are completely frozen/immutable. diff --git a/erigon-lib/state/aggregator_bench_test.go b/erigon-lib/state/aggregator_bench_test.go index 16b748fd997..9d0e7fcee33 100644 --- a/erigon-lib/state/aggregator_bench_test.go +++ b/erigon-lib/state/aggregator_bench_test.go @@ -14,13 +14,13 @@ import ( "github.com/ledgerwatch/log/v3" "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/commitment" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/compress" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/mdbx" - "github.com/ledgerwatch/erigon-lib/recsplit" + "github.com/ledgerwatch/erigon/erigon-lib/commitment" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" + "github.com/ledgerwatch/erigon/erigon-lib/compress" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/mdbx" + "github.com/ledgerwatch/erigon/erigon-lib/recsplit" ) func testDbAndAggregatorBench(b *testing.B, aggStep uint64) (string, kv.RwDB, *Aggregator) { diff --git a/erigon-lib/state/aggregator_test.go b/erigon-lib/state/aggregator_test.go index 9fc43fb3a05..7c4ae0ac650 100644 --- a/erigon-lib/state/aggregator_test.go +++ b/erigon-lib/state/aggregator_test.go @@ -13,16 +13,16 @@ import ( "time" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/common/background" + "github.com/ledgerwatch/erigon/erigon-lib/common/background" "github.com/ledgerwatch/log/v3" "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/commitment" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/compress" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/mdbx" + "github.com/ledgerwatch/erigon/erigon-lib/commitment" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" + "github.com/ledgerwatch/erigon/erigon-lib/compress" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/mdbx" ) func testDbAndAggregator(t *testing.T, aggStep uint64) (string, kv.RwDB, *Aggregator) { diff --git a/erigon-lib/state/aggregator_v3.go b/erigon-lib/state/aggregator_v3.go index 371f5a60719..4c6fb5649cc 100644 --- a/erigon-lib/state/aggregator_v3.go +++ b/erigon-lib/state/aggregator_v3.go @@ -29,14 +29,14 @@ import ( "time" "github.com/RoaringBitmap/roaring/roaring64" - common2 "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/background" - "github.com/ledgerwatch/erigon-lib/common/cmp" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/bitmapdb" - "github.com/ledgerwatch/erigon-lib/kv/iter" - "github.com/ledgerwatch/erigon-lib/kv/order" + common2 "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/background" + "github.com/ledgerwatch/erigon/erigon-lib/common/cmp" + "github.com/ledgerwatch/erigon/erigon-lib/common/dbg" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/bitmapdb" + "github.com/ledgerwatch/erigon/erigon-lib/kv/iter" + "github.com/ledgerwatch/erigon/erigon-lib/kv/order" "github.com/ledgerwatch/log/v3" "golang.org/x/sync/errgroup" ) diff --git a/erigon-lib/state/btree_index.go b/erigon-lib/state/btree_index.go index 00d2b9e1374..c199c12e07b 100644 --- a/erigon-lib/state/btree_index.go +++ b/erigon-lib/state/btree_index.go @@ -16,15 +16,15 @@ import ( "github.com/c2h5oh/datasize" "github.com/edsrzf/mmap-go" - "github.com/ledgerwatch/erigon-lib/common/dbg" + "github.com/ledgerwatch/erigon/erigon-lib/common/dbg" "github.com/ledgerwatch/log/v3" - "github.com/ledgerwatch/erigon-lib/common/background" + "github.com/ledgerwatch/erigon/erigon-lib/common/background" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/compress" - "github.com/ledgerwatch/erigon-lib/etl" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" + "github.com/ledgerwatch/erigon/erigon-lib/compress" + "github.com/ledgerwatch/erigon/erigon-lib/etl" ) func logBase(n, base uint64) uint64 { diff --git a/erigon-lib/state/domain.go b/erigon-lib/state/domain.go index 34f85637246..1c397c05899 100644 --- a/erigon-lib/state/domain.go +++ b/erigon-lib/state/domain.go @@ -32,18 +32,18 @@ import ( "time" "github.com/RoaringBitmap/roaring/roaring64" - "github.com/ledgerwatch/erigon-lib/common/background" + "github.com/ledgerwatch/erigon/erigon-lib/common/background" btree2 "github.com/tidwall/btree" "golang.org/x/sync/errgroup" "github.com/ledgerwatch/log/v3" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/dir" - "github.com/ledgerwatch/erigon-lib/compress" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/bitmapdb" - "github.com/ledgerwatch/erigon-lib/recsplit" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/dir" + "github.com/ledgerwatch/erigon/erigon-lib/compress" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/bitmapdb" + "github.com/ledgerwatch/erigon/erigon-lib/recsplit" ) // filesItem corresponding to a pair of files (.dat and .idx) diff --git a/erigon-lib/state/domain_committed.go b/erigon-lib/state/domain_committed.go index 9c046975c7d..0d77b1dc7c2 100644 --- a/erigon-lib/state/domain_committed.go +++ b/erigon-lib/state/domain_committed.go @@ -28,14 +28,14 @@ import ( "time" "github.com/google/btree" - "github.com/ledgerwatch/erigon-lib/common/background" + "github.com/ledgerwatch/erigon/erigon-lib/common/background" "github.com/ledgerwatch/log/v3" "golang.org/x/crypto/sha3" - "github.com/ledgerwatch/erigon-lib/commitment" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/compress" + "github.com/ledgerwatch/erigon/erigon-lib/commitment" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" + "github.com/ledgerwatch/erigon/erigon-lib/compress" ) // Defines how to evaluate commitments diff --git a/erigon-lib/state/domain_test.go b/erigon-lib/state/domain_test.go index cf1ed599d70..19b0f3aa04e 100644 --- a/erigon-lib/state/domain_test.go +++ b/erigon-lib/state/domain_test.go @@ -26,14 +26,14 @@ import ( "testing" "time" - "github.com/ledgerwatch/erigon-lib/common/background" + "github.com/ledgerwatch/erigon/erigon-lib/common/background" "github.com/ledgerwatch/log/v3" "github.com/stretchr/testify/require" btree2 "github.com/tidwall/btree" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/mdbx" - "github.com/ledgerwatch/erigon-lib/recsplit" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/mdbx" + "github.com/ledgerwatch/erigon/erigon-lib/recsplit" ) func testDbAndDomain(t *testing.T, logger log.Logger) (string, kv.RwDB, *Domain) { diff --git a/erigon-lib/state/gc_test.go b/erigon-lib/state/gc_test.go index a159b766da1..5d91384c806 100644 --- a/erigon-lib/state/gc_test.go +++ b/erigon-lib/state/gc_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/log/v3" "github.com/stretchr/testify/require" ) diff --git a/erigon-lib/state/history.go b/erigon-lib/state/history.go index 23fad025128..c6f3328a06b 100644 --- a/erigon-lib/state/history.go +++ b/erigon-lib/state/history.go @@ -35,18 +35,18 @@ import ( "golang.org/x/exp/slices" "golang.org/x/sync/errgroup" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/background" - "github.com/ledgerwatch/erigon-lib/common/cmp" - "github.com/ledgerwatch/erigon-lib/common/dir" - "github.com/ledgerwatch/erigon-lib/compress" - "github.com/ledgerwatch/erigon-lib/etl" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/bitmapdb" - "github.com/ledgerwatch/erigon-lib/kv/iter" - "github.com/ledgerwatch/erigon-lib/kv/order" - "github.com/ledgerwatch/erigon-lib/recsplit" - "github.com/ledgerwatch/erigon-lib/recsplit/eliasfano32" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/background" + "github.com/ledgerwatch/erigon/erigon-lib/common/cmp" + "github.com/ledgerwatch/erigon/erigon-lib/common/dir" + "github.com/ledgerwatch/erigon/erigon-lib/compress" + "github.com/ledgerwatch/erigon/erigon-lib/etl" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/bitmapdb" + "github.com/ledgerwatch/erigon/erigon-lib/kv/iter" + "github.com/ledgerwatch/erigon/erigon-lib/kv/order" + "github.com/ledgerwatch/erigon/erigon-lib/recsplit" + "github.com/ledgerwatch/erigon/erigon-lib/recsplit/eliasfano32" ) type History struct { diff --git a/erigon-lib/state/history_test.go b/erigon-lib/state/history_test.go index 647e14a3967..88b67e6ee72 100644 --- a/erigon-lib/state/history_test.go +++ b/erigon-lib/state/history_test.go @@ -25,14 +25,14 @@ import ( "testing" "time" - "github.com/ledgerwatch/erigon-lib/common/background" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/iter" - "github.com/ledgerwatch/erigon-lib/kv/mdbx" - "github.com/ledgerwatch/erigon-lib/kv/order" - "github.com/ledgerwatch/erigon-lib/recsplit" - "github.com/ledgerwatch/erigon-lib/recsplit/eliasfano32" + "github.com/ledgerwatch/erigon/erigon-lib/common/background" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/iter" + "github.com/ledgerwatch/erigon/erigon-lib/kv/mdbx" + "github.com/ledgerwatch/erigon/erigon-lib/kv/order" + "github.com/ledgerwatch/erigon/erigon-lib/recsplit" + "github.com/ledgerwatch/erigon/erigon-lib/recsplit/eliasfano32" "github.com/ledgerwatch/log/v3" "github.com/stretchr/testify/require" btree2 "github.com/tidwall/btree" diff --git a/erigon-lib/state/inverted_index.go b/erigon-lib/state/inverted_index.go index 5ef8e6ec2a1..1cc58906673 100644 --- a/erigon-lib/state/inverted_index.go +++ b/erigon-lib/state/inverted_index.go @@ -32,17 +32,17 @@ import ( "github.com/RoaringBitmap/roaring/roaring64" "github.com/c2h5oh/datasize" - "github.com/ledgerwatch/erigon-lib/common/background" - "github.com/ledgerwatch/erigon-lib/common/cmp" - "github.com/ledgerwatch/erigon-lib/common/dir" - "github.com/ledgerwatch/erigon-lib/compress" - "github.com/ledgerwatch/erigon-lib/etl" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/bitmapdb" - "github.com/ledgerwatch/erigon-lib/kv/iter" - "github.com/ledgerwatch/erigon-lib/kv/order" - "github.com/ledgerwatch/erigon-lib/recsplit" - "github.com/ledgerwatch/erigon-lib/recsplit/eliasfano32" + "github.com/ledgerwatch/erigon/erigon-lib/common/background" + "github.com/ledgerwatch/erigon/erigon-lib/common/cmp" + "github.com/ledgerwatch/erigon/erigon-lib/common/dir" + "github.com/ledgerwatch/erigon/erigon-lib/compress" + "github.com/ledgerwatch/erigon/erigon-lib/etl" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/bitmapdb" + "github.com/ledgerwatch/erigon/erigon-lib/kv/iter" + "github.com/ledgerwatch/erigon/erigon-lib/kv/order" + "github.com/ledgerwatch/erigon/erigon-lib/recsplit" + "github.com/ledgerwatch/erigon/erigon-lib/recsplit/eliasfano32" "github.com/ledgerwatch/log/v3" btree2 "github.com/tidwall/btree" "golang.org/x/exp/slices" diff --git a/erigon-lib/state/inverted_index_test.go b/erigon-lib/state/inverted_index_test.go index c23dcb5d0a0..f0990f72665 100644 --- a/erigon-lib/state/inverted_index_test.go +++ b/erigon-lib/state/inverted_index_test.go @@ -25,17 +25,17 @@ import ( "testing" "time" - "github.com/ledgerwatch/erigon-lib/common/background" - "github.com/ledgerwatch/erigon-lib/kv/iter" - "github.com/ledgerwatch/erigon-lib/kv/order" + "github.com/ledgerwatch/erigon/erigon-lib/common/background" + "github.com/ledgerwatch/erigon/erigon-lib/kv/iter" + "github.com/ledgerwatch/erigon/erigon-lib/kv/order" "github.com/ledgerwatch/log/v3" "github.com/stretchr/testify/require" btree2 "github.com/tidwall/btree" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/mdbx" - "github.com/ledgerwatch/erigon-lib/recsplit" - "github.com/ledgerwatch/erigon-lib/recsplit/eliasfano32" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/mdbx" + "github.com/ledgerwatch/erigon/erigon-lib/recsplit" + "github.com/ledgerwatch/erigon/erigon-lib/recsplit/eliasfano32" ) func testDbAndInvertedIndex(tb testing.TB, aggStep uint64, logger log.Logger) (string, kv.RwDB, *InvertedIndex) { diff --git a/erigon-lib/state/locality_index.go b/erigon-lib/state/locality_index.go index 8d126a08751..e4bc5c4323c 100644 --- a/erigon-lib/state/locality_index.go +++ b/erigon-lib/state/locality_index.go @@ -28,10 +28,10 @@ import ( "sync/atomic" "time" - "github.com/ledgerwatch/erigon-lib/common/assert" - "github.com/ledgerwatch/erigon-lib/common/dir" - "github.com/ledgerwatch/erigon-lib/kv/bitmapdb" - "github.com/ledgerwatch/erigon-lib/recsplit" + "github.com/ledgerwatch/erigon/erigon-lib/common/assert" + "github.com/ledgerwatch/erigon/erigon-lib/common/dir" + "github.com/ledgerwatch/erigon/erigon-lib/kv/bitmapdb" + "github.com/ledgerwatch/erigon/erigon-lib/recsplit" "github.com/ledgerwatch/log/v3" ) diff --git a/erigon-lib/state/merge.go b/erigon-lib/state/merge.go index 1a45bb55021..67cf1a460ea 100644 --- a/erigon-lib/state/merge.go +++ b/erigon-lib/state/merge.go @@ -26,14 +26,14 @@ import ( "path/filepath" "strings" - "github.com/ledgerwatch/erigon-lib/common/background" + "github.com/ledgerwatch/erigon/erigon-lib/common/background" "github.com/ledgerwatch/log/v3" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/cmp" - "github.com/ledgerwatch/erigon-lib/compress" - "github.com/ledgerwatch/erigon-lib/recsplit" - "github.com/ledgerwatch/erigon-lib/recsplit/eliasfano32" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/cmp" + "github.com/ledgerwatch/erigon/erigon-lib/compress" + "github.com/ledgerwatch/erigon/erigon-lib/recsplit" + "github.com/ledgerwatch/erigon/erigon-lib/recsplit/eliasfano32" ) func (d *Domain) endTxNumMinimax() uint64 { diff --git a/erigon-lib/state/merge_test.go b/erigon-lib/state/merge_test.go index 24b63de76a3..16850cd1f37 100644 --- a/erigon-lib/state/merge_test.go +++ b/erigon-lib/state/merge_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" btree2 "github.com/tidwall/btree" - "github.com/ledgerwatch/erigon-lib/recsplit/eliasfano32" + "github.com/ledgerwatch/erigon/erigon-lib/recsplit/eliasfano32" ) func TestFindMergeRangeCornerCases(t *testing.T) { diff --git a/erigon-lib/state/state_recon.go b/erigon-lib/state/state_recon.go index 31babca99a4..d7150d1c611 100644 --- a/erigon-lib/state/state_recon.go +++ b/erigon-lib/state/state_recon.go @@ -20,9 +20,9 @@ import ( "bytes" "encoding/binary" - "github.com/ledgerwatch/erigon-lib/compress" - "github.com/ledgerwatch/erigon-lib/recsplit" - "github.com/ledgerwatch/erigon-lib/recsplit/eliasfano32" + "github.com/ledgerwatch/erigon/erigon-lib/compress" + "github.com/ledgerwatch/erigon/erigon-lib/recsplit" + "github.com/ledgerwatch/erigon/erigon-lib/recsplit/eliasfano32" ) // Algorithms for reconstituting the state from state history diff --git a/erigon-lib/txpool/fetch.go b/erigon-lib/txpool/fetch.go index 552b01c58fb..01fcadec283 100644 --- a/erigon-lib/txpool/fetch.go +++ b/erigon-lib/txpool/fetch.go @@ -24,14 +24,14 @@ import ( "time" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/direct" - "github.com/ledgerwatch/erigon-lib/gointerfaces/grpcutil" - "github.com/ledgerwatch/erigon-lib/gointerfaces/remote" - "github.com/ledgerwatch/erigon-lib/gointerfaces/sentry" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/rlp" - types2 "github.com/ledgerwatch/erigon-lib/types" + "github.com/ledgerwatch/erigon/erigon-lib/common/dbg" + "github.com/ledgerwatch/erigon/erigon-lib/direct" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/grpcutil" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/remote" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/sentry" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/rlp" + types2 "github.com/ledgerwatch/erigon/erigon-lib/types" "github.com/ledgerwatch/log/v3" "google.golang.org/grpc" "google.golang.org/protobuf/types/known/emptypb" diff --git a/erigon-lib/txpool/fetch_test.go b/erigon-lib/txpool/fetch_test.go index 0547655ffa7..c52f5e4bb7b 100644 --- a/erigon-lib/txpool/fetch_test.go +++ b/erigon-lib/txpool/fetch_test.go @@ -24,14 +24,14 @@ import ( "sync" "testing" - "github.com/ledgerwatch/erigon-lib/common/u256" - "github.com/ledgerwatch/erigon-lib/direct" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - "github.com/ledgerwatch/erigon-lib/gointerfaces/remote" - "github.com/ledgerwatch/erigon-lib/gointerfaces/sentry" - "github.com/ledgerwatch/erigon-lib/gointerfaces/types" - "github.com/ledgerwatch/erigon-lib/kv/memdb" - types3 "github.com/ledgerwatch/erigon-lib/types" + "github.com/ledgerwatch/erigon/erigon-lib/common/u256" + "github.com/ledgerwatch/erigon/erigon-lib/direct" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/remote" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/sentry" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/types" + "github.com/ledgerwatch/erigon/erigon-lib/kv/memdb" + types3 "github.com/ledgerwatch/erigon/erigon-lib/types" "github.com/ledgerwatch/log/v3" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/erigon-lib/txpool/mocks_test.go b/erigon-lib/txpool/mocks_test.go index 22e8e8121af..5fd88cb0c64 100644 --- a/erigon-lib/txpool/mocks_test.go +++ b/erigon-lib/txpool/mocks_test.go @@ -5,10 +5,10 @@ package txpool import ( "context" - "github.com/ledgerwatch/erigon-lib/gointerfaces/remote" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/txpool/txpoolcfg" - types2 "github.com/ledgerwatch/erigon-lib/types" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/remote" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/txpool/txpoolcfg" + types2 "github.com/ledgerwatch/erigon/erigon-lib/types" "sync" ) diff --git a/erigon-lib/txpool/pool.go b/erigon-lib/txpool/pool.go index cfd593794dc..2f8bbd1c5cb 100644 --- a/erigon-lib/txpool/pool.go +++ b/erigon-lib/txpool/pool.go @@ -42,23 +42,23 @@ import ( "github.com/holiman/uint256" "github.com/ledgerwatch/log/v3" - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/assert" - "github.com/ledgerwatch/erigon-lib/common/cmp" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/common/fixedgas" - "github.com/ledgerwatch/erigon-lib/common/u256" - libkzg "github.com/ledgerwatch/erigon-lib/crypto/kzg" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - "github.com/ledgerwatch/erigon-lib/gointerfaces/grpcutil" - "github.com/ledgerwatch/erigon-lib/gointerfaces/remote" - proto_txpool "github.com/ledgerwatch/erigon-lib/gointerfaces/txpool" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/kvcache" - "github.com/ledgerwatch/erigon-lib/kv/mdbx" - "github.com/ledgerwatch/erigon-lib/txpool/txpoolcfg" - "github.com/ledgerwatch/erigon-lib/types" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/assert" + "github.com/ledgerwatch/erigon/erigon-lib/common/cmp" + "github.com/ledgerwatch/erigon/erigon-lib/common/dbg" + "github.com/ledgerwatch/erigon/erigon-lib/common/fixedgas" + "github.com/ledgerwatch/erigon/erigon-lib/common/u256" + libkzg "github.com/ledgerwatch/erigon/erigon-lib/crypto/kzg" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/grpcutil" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/remote" + proto_txpool "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/txpool" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/kvcache" + "github.com/ledgerwatch/erigon/erigon-lib/kv/mdbx" + "github.com/ledgerwatch/erigon/erigon-lib/txpool/txpoolcfg" + "github.com/ledgerwatch/erigon/erigon-lib/types" ) var ( diff --git a/erigon-lib/txpool/pool_fuzz_test.go b/erigon-lib/txpool/pool_fuzz_test.go index 967afbadcd5..acc82d6eb3b 100644 --- a/erigon-lib/txpool/pool_fuzz_test.go +++ b/erigon-lib/txpool/pool_fuzz_test.go @@ -13,16 +13,16 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/u256" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - "github.com/ledgerwatch/erigon-lib/gointerfaces/remote" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/kvcache" - "github.com/ledgerwatch/erigon-lib/kv/memdb" - "github.com/ledgerwatch/erigon-lib/rlp" - "github.com/ledgerwatch/erigon-lib/txpool/txpoolcfg" - "github.com/ledgerwatch/erigon-lib/types" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/u256" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/remote" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/kvcache" + "github.com/ledgerwatch/erigon/erigon-lib/kv/memdb" + "github.com/ledgerwatch/erigon/erigon-lib/rlp" + "github.com/ledgerwatch/erigon/erigon-lib/txpool/txpoolcfg" + "github.com/ledgerwatch/erigon/erigon-lib/types" ) // https://go.dev/doc/fuzz/ diff --git a/erigon-lib/txpool/pool_test.go b/erigon-lib/txpool/pool_test.go index 6ae617cd710..6d7f4fb1f49 100644 --- a/erigon-lib/txpool/pool_test.go +++ b/erigon-lib/txpool/pool_test.go @@ -32,18 +32,18 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/fixedgas" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/common/u256" - "github.com/ledgerwatch/erigon-lib/crypto/kzg" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - "github.com/ledgerwatch/erigon-lib/gointerfaces/remote" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/kvcache" - "github.com/ledgerwatch/erigon-lib/kv/memdb" - "github.com/ledgerwatch/erigon-lib/txpool/txpoolcfg" - "github.com/ledgerwatch/erigon-lib/types" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/fixedgas" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/common/u256" + "github.com/ledgerwatch/erigon/erigon-lib/crypto/kzg" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/remote" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/kvcache" + "github.com/ledgerwatch/erigon/erigon-lib/kv/memdb" + "github.com/ledgerwatch/erigon/erigon-lib/txpool/txpoolcfg" + "github.com/ledgerwatch/erigon/erigon-lib/types" ) func TestNonceFromAddress(t *testing.T) { diff --git a/erigon-lib/txpool/send.go b/erigon-lib/txpool/send.go index 12917e5184e..6b4907f8906 100644 --- a/erigon-lib/txpool/send.go +++ b/erigon-lib/txpool/send.go @@ -21,10 +21,10 @@ import ( "fmt" "sync" - "github.com/ledgerwatch/erigon-lib/direct" - "github.com/ledgerwatch/erigon-lib/gointerfaces/sentry" - "github.com/ledgerwatch/erigon-lib/rlp" - types2 "github.com/ledgerwatch/erigon-lib/types" + "github.com/ledgerwatch/erigon/erigon-lib/direct" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/sentry" + "github.com/ledgerwatch/erigon/erigon-lib/rlp" + types2 "github.com/ledgerwatch/erigon/erigon-lib/types" "github.com/ledgerwatch/log/v3" "google.golang.org/grpc" ) diff --git a/erigon-lib/txpool/test_util.go b/erigon-lib/txpool/test_util.go index 93c52f810a9..d1a8cc237fe 100644 --- a/erigon-lib/txpool/test_util.go +++ b/erigon-lib/txpool/test_util.go @@ -20,9 +20,9 @@ import ( "context" "sync" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - "github.com/ledgerwatch/erigon-lib/gointerfaces/sentry" - "github.com/ledgerwatch/erigon-lib/types" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/sentry" + "github.com/ledgerwatch/erigon/erigon-lib/types" "google.golang.org/protobuf/types/known/emptypb" ) diff --git a/erigon-lib/txpool/txpool_grpc_server.go b/erigon-lib/txpool/txpool_grpc_server.go index de4c26db372..cc5433022c5 100644 --- a/erigon-lib/txpool/txpool_grpc_server.go +++ b/erigon-lib/txpool/txpool_grpc_server.go @@ -28,7 +28,7 @@ import ( grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware" grpc_recovery "github.com/grpc-ecosystem/go-grpc-middleware/recovery" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/txpool/txpoolcfg" + "github.com/ledgerwatch/erigon/erigon-lib/txpool/txpoolcfg" "github.com/ledgerwatch/log/v3" "google.golang.org/grpc" "google.golang.org/grpc/credentials" @@ -38,12 +38,12 @@ import ( "google.golang.org/grpc/reflection" "google.golang.org/protobuf/types/known/emptypb" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - txpool_proto "github.com/ledgerwatch/erigon-lib/gointerfaces/txpool" - types2 "github.com/ledgerwatch/erigon-lib/gointerfaces/types" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/types" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces" + txpool_proto "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/txpool" + types2 "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/types" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/types" ) // TxPoolAPIVersion diff --git a/erigon-lib/txpool/txpoolcfg/txpoolcfg.go b/erigon-lib/txpool/txpoolcfg/txpoolcfg.go index c929b22402c..bf64dba9648 100644 --- a/erigon-lib/txpool/txpoolcfg/txpoolcfg.go +++ b/erigon-lib/txpool/txpoolcfg/txpoolcfg.go @@ -23,9 +23,9 @@ import ( "time" "github.com/c2h5oh/datasize" - "github.com/ledgerwatch/erigon-lib/common/fixedgas" - emath "github.com/ledgerwatch/erigon-lib/common/math" - "github.com/ledgerwatch/erigon-lib/types" + "github.com/ledgerwatch/erigon/erigon-lib/common/fixedgas" + emath "github.com/ledgerwatch/erigon/erigon-lib/common/math" + "github.com/ledgerwatch/erigon/erigon-lib/types" ) type Config struct { diff --git a/erigon-lib/txpool/txpooluitl/all_components.go b/erigon-lib/txpool/txpooluitl/all_components.go index e831841d833..30432782e45 100644 --- a/erigon-lib/txpool/txpooluitl/all_components.go +++ b/erigon-lib/txpool/txpooluitl/all_components.go @@ -26,14 +26,14 @@ import ( "github.com/holiman/uint256" "github.com/ledgerwatch/log/v3" - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/direct" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/kvcache" - "github.com/ledgerwatch/erigon-lib/kv/mdbx" - "github.com/ledgerwatch/erigon-lib/txpool" - "github.com/ledgerwatch/erigon-lib/txpool/txpoolcfg" - "github.com/ledgerwatch/erigon-lib/types" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + "github.com/ledgerwatch/erigon/erigon-lib/direct" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/kvcache" + "github.com/ledgerwatch/erigon/erigon-lib/kv/mdbx" + "github.com/ledgerwatch/erigon/erigon-lib/txpool" + "github.com/ledgerwatch/erigon/erigon-lib/txpool/txpoolcfg" + "github.com/ledgerwatch/erigon/erigon-lib/types" ) func SaveChainConfigIfNeed(ctx context.Context, coreDB kv.RoDB, txPoolDB kv.RwDB, force bool, logger log.Logger) (cc *chain.Config, blockNum uint64, err error) { diff --git a/erigon-lib/types/ssz/ssz.go b/erigon-lib/types/ssz/ssz.go index 6ecae5a1328..aa28769bd50 100644 --- a/erigon-lib/types/ssz/ssz.go +++ b/erigon-lib/types/ssz/ssz.go @@ -19,9 +19,9 @@ package ssz import ( "encoding/binary" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/types/clonable" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" + "github.com/ledgerwatch/erigon/erigon-lib/types/clonable" ) var ( diff --git a/erigon-lib/types/txn.go b/erigon-lib/types/txn.go index fc0b538c61b..58fda69bdc2 100644 --- a/erigon-lib/types/txn.go +++ b/erigon-lib/types/txn.go @@ -31,13 +31,13 @@ import ( "github.com/ledgerwatch/secp256k1" "golang.org/x/crypto/sha3" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/fixedgas" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/common/u256" - "github.com/ledgerwatch/erigon-lib/crypto" - "github.com/ledgerwatch/erigon-lib/gointerfaces/types" - "github.com/ledgerwatch/erigon-lib/rlp" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/fixedgas" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" + "github.com/ledgerwatch/erigon/erigon-lib/common/u256" + "github.com/ledgerwatch/erigon/erigon-lib/crypto" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/types" + "github.com/ledgerwatch/erigon/erigon-lib/rlp" ) type TxParseConfig struct { diff --git a/erigon-lib/types/txn_packets.go b/erigon-lib/types/txn_packets.go index 3f7ed58bd3f..42404a93e5c 100644 --- a/erigon-lib/types/txn_packets.go +++ b/erigon-lib/types/txn_packets.go @@ -20,9 +20,9 @@ import ( "errors" "fmt" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/rlp" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" + "github.com/ledgerwatch/erigon/erigon-lib/rlp" ) type NewPooledTransactionHashesPacket [][length.Hash]byte diff --git a/erigon-lib/types/txn_packets_fuzz_test.go b/erigon-lib/types/txn_packets_fuzz_test.go index dfb5932281e..b60cb3daa64 100644 --- a/erigon-lib/types/txn_packets_fuzz_test.go +++ b/erigon-lib/types/txn_packets_fuzz_test.go @@ -5,8 +5,8 @@ package types import ( "testing" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/common/u256" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/common/u256" ) func FuzzPooledTransactions66(f *testing.F) { diff --git a/erigon-lib/types/txn_packets_test.go b/erigon-lib/types/txn_packets_test.go index a21c523fd2e..73771b8e904 100644 --- a/erigon-lib/types/txn_packets_test.go +++ b/erigon-lib/types/txn_packets_test.go @@ -24,7 +24,7 @@ import ( "github.com/holiman/uint256" "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" ) var hashParseTests = []struct { diff --git a/erigon-lib/types/txn_test.go b/erigon-lib/types/txn_test.go index b5e992d493f..1d4fd7cc53a 100644 --- a/erigon-lib/types/txn_test.go +++ b/erigon-lib/types/txn_test.go @@ -27,8 +27,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/common/fixedgas" - "github.com/ledgerwatch/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/common/fixedgas" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" ) func TestParseTransactionRLP(t *testing.T) { diff --git a/erigon-lib/types/txn_types_fuzz_test.go b/erigon-lib/types/txn_types_fuzz_test.go index 1f43a695d37..a3c9c2e3deb 100644 --- a/erigon-lib/types/txn_types_fuzz_test.go +++ b/erigon-lib/types/txn_types_fuzz_test.go @@ -5,7 +5,7 @@ package types import ( "testing" - "github.com/ledgerwatch/erigon-lib/common/u256" + "github.com/ledgerwatch/erigon/erigon-lib/common/u256" ) // golang.org/s/draft-fuzzing-design diff --git a/eth/backend.go b/eth/backend.go index 1f2e4c10dd6..3c720be88da 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -26,13 +26,12 @@ import ( "net" "os" "path/filepath" + "sort" "strconv" "strings" "sync" "time" - "github.com/ledgerwatch/erigon-lib/downloader/downloadergrpc" - "github.com/ledgerwatch/erigon-lib/kv/kvcfg" "github.com/ledgerwatch/erigon/cl/beacon" "github.com/ledgerwatch/erigon/cl/clparams" "github.com/ledgerwatch/erigon/cl/cltypes" @@ -41,6 +40,8 @@ import ( "github.com/ledgerwatch/erigon/cl/persistence/db_config" "github.com/ledgerwatch/erigon/cl/phase1/execution_client" "github.com/ledgerwatch/erigon/core/rawdb/blockio" + "github.com/ledgerwatch/erigon/erigon-lib/downloader/downloadergrpc" + "github.com/ledgerwatch/erigon/erigon-lib/kv/kvcfg" "github.com/ledgerwatch/erigon/ethdb/prune" "github.com/ledgerwatch/erigon/params/networkname" "github.com/ledgerwatch/erigon/turbo/builder" @@ -55,31 +56,30 @@ import ( "github.com/holiman/uint256" "github.com/ledgerwatch/log/v3" - "golang.org/x/exp/slices" "google.golang.org/grpc" "google.golang.org/grpc/credentials" "google.golang.org/protobuf/types/known/emptypb" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/common/dir" - "github.com/ledgerwatch/erigon-lib/direct" - downloader3 "github.com/ledgerwatch/erigon-lib/downloader" - "github.com/ledgerwatch/erigon-lib/downloader/downloadercfg" - proto_downloader "github.com/ledgerwatch/erigon-lib/gointerfaces/downloader" - "github.com/ledgerwatch/erigon-lib/gointerfaces/grpcutil" - "github.com/ledgerwatch/erigon-lib/gointerfaces/remote" - proto_sentry "github.com/ledgerwatch/erigon-lib/gointerfaces/sentry" - txpool_proto "github.com/ledgerwatch/erigon-lib/gointerfaces/txpool" - prototypes "github.com/ledgerwatch/erigon-lib/gointerfaces/types" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/kvcache" - "github.com/ledgerwatch/erigon-lib/kv/remotedbserver" - libstate "github.com/ledgerwatch/erigon-lib/state" - "github.com/ledgerwatch/erigon-lib/txpool" - "github.com/ledgerwatch/erigon-lib/txpool/txpooluitl" - types2 "github.com/ledgerwatch/erigon-lib/types" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/datadir" + "github.com/ledgerwatch/erigon/erigon-lib/common/dir" + "github.com/ledgerwatch/erigon/erigon-lib/direct" + downloader3 "github.com/ledgerwatch/erigon/erigon-lib/downloader" + "github.com/ledgerwatch/erigon/erigon-lib/downloader/downloadercfg" + proto_downloader "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/downloader" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/grpcutil" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/remote" + proto_sentry "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/sentry" + txpool_proto "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/txpool" + prototypes "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/types" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/kvcache" + "github.com/ledgerwatch/erigon/erigon-lib/kv/remotedbserver" + libstate "github.com/ledgerwatch/erigon/erigon-lib/state" + "github.com/ledgerwatch/erigon/erigon-lib/txpool" + "github.com/ledgerwatch/erigon/erigon-lib/txpool/txpooluitl" + types2 "github.com/ledgerwatch/erigon/erigon-lib/types" clcore "github.com/ledgerwatch/erigon/cl/phase1/core" "github.com/ledgerwatch/erigon/cmd/caplin-phase1/caplin1" @@ -1092,7 +1092,9 @@ func (s *Ethereum) NodesInfo(limit int) (*remote.NodesInfoReply, error) { } nodesInfo := &remote.NodesInfoReply{NodesInfo: nodes} - slices.SortFunc(nodesInfo.NodesInfo, remote.NodeInfoReplyCmp) + sort.Slice(nodesInfo.NodesInfo, func(i, j int) bool { + return remote.NodeInfoReplyLess(nodesInfo.NodesInfo[i], nodesInfo.NodesInfo[j]) + }) return nodesInfo, nil } diff --git a/eth/borfinality/api.go b/eth/borfinality/api.go index fbeabf4ccac..c2b403ef1c1 100644 --- a/eth/borfinality/api.go +++ b/eth/borfinality/api.go @@ -1,10 +1,10 @@ package borfinality import ( - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" "github.com/ledgerwatch/erigon/core/rawdb" "github.com/ledgerwatch/erigon/core/types" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/erigon/eth/borfinality/whitelist" ) diff --git a/eth/borfinality/generics/generics.go b/eth/borfinality/generics/generics.go index d54b26fbbda..b335a9431d5 100644 --- a/eth/borfinality/generics/generics.go +++ b/eth/borfinality/generics/generics.go @@ -3,8 +3,8 @@ package generics import ( "sync/atomic" - libcommon "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/core/types" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" ) func Empty[T any]() (t T) { diff --git a/eth/borfinality/rawdb/checkpoint.go b/eth/borfinality/rawdb/checkpoint.go index eecf3a53236..5f41ed22da1 100644 --- a/eth/borfinality/rawdb/checkpoint.go +++ b/eth/borfinality/rawdb/checkpoint.go @@ -4,7 +4,7 @@ package rawdb import ( "errors" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" ) var ( diff --git a/eth/borfinality/rawdb/milestone.go b/eth/borfinality/rawdb/milestone.go index 8f94bb6c433..ee2fc8cd737 100644 --- a/eth/borfinality/rawdb/milestone.go +++ b/eth/borfinality/rawdb/milestone.go @@ -5,8 +5,8 @@ import ( "encoding/json" "fmt" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/erigon/eth/borfinality/generics" "github.com/ledgerwatch/log/v3" ) diff --git a/eth/borfinality/whitelist.go b/eth/borfinality/whitelist.go index c5bca650a59..20c664347a4 100644 --- a/eth/borfinality/whitelist.go +++ b/eth/borfinality/whitelist.go @@ -6,8 +6,8 @@ import ( "fmt" "time" - "github.com/ledgerwatch/erigon-lib/kv" "github.com/ledgerwatch/erigon/consensus/bor/heimdall" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/erigon/eth/borfinality/flags" "github.com/ledgerwatch/erigon/eth/borfinality/whitelist" "github.com/ledgerwatch/erigon/turbo/services" diff --git a/eth/borfinality/whitelist/checkpoint.go b/eth/borfinality/whitelist/checkpoint.go index 1051696c3c4..f35ab48bd89 100644 --- a/eth/borfinality/whitelist/checkpoint.go +++ b/eth/borfinality/whitelist/checkpoint.go @@ -1,8 +1,8 @@ package whitelist import ( - "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/core/types" + "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/eth/borfinality/rawdb" ) diff --git a/eth/borfinality/whitelist/finality.go b/eth/borfinality/whitelist/finality.go index 293445229b8..5c2a255086a 100644 --- a/eth/borfinality/whitelist/finality.go +++ b/eth/borfinality/whitelist/finality.go @@ -3,9 +3,9 @@ package whitelist import ( "sync" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" "github.com/ledgerwatch/erigon/core/types" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/erigon/eth/borfinality/rawdb" "github.com/ledgerwatch/log/v3" ) diff --git a/eth/borfinality/whitelist/milestone.go b/eth/borfinality/whitelist/milestone.go index 7a449198d16..f0e9ead98c7 100644 --- a/eth/borfinality/whitelist/milestone.go +++ b/eth/borfinality/whitelist/milestone.go @@ -1,8 +1,8 @@ package whitelist import ( - "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/core/types" + "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/eth/borfinality/flags" "github.com/ledgerwatch/erigon/eth/borfinality/rawdb" "github.com/ledgerwatch/log/v3" diff --git a/eth/borfinality/whitelist/service.go b/eth/borfinality/whitelist/service.go index 3ca07a58ee5..42e7111521a 100644 --- a/eth/borfinality/whitelist/service.go +++ b/eth/borfinality/whitelist/service.go @@ -3,9 +3,9 @@ package whitelist import ( "errors" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" "github.com/ledgerwatch/erigon/core/types" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/erigon/eth/borfinality/rawdb" ) diff --git a/eth/borfinality/whitelist/service_test.go b/eth/borfinality/whitelist/service_test.go index cbbdd7f5a37..775bc1fe084 100644 --- a/eth/borfinality/whitelist/service_test.go +++ b/eth/borfinality/whitelist/service_test.go @@ -8,11 +8,11 @@ import ( "testing" "time" - "github.com/ledgerwatch/erigon-lib/common" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/memdb" "github.com/ledgerwatch/erigon/core/types" + "github.com/ledgerwatch/erigon/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/memdb" "github.com/ledgerwatch/erigon/eth/borfinality/rawdb" "github.com/stretchr/testify/require" diff --git a/eth/borfinality/whitelist_helpers.go b/eth/borfinality/whitelist_helpers.go index 17140fd80b4..2db4a5bccc8 100644 --- a/eth/borfinality/whitelist_helpers.go +++ b/eth/borfinality/whitelist_helpers.go @@ -4,8 +4,8 @@ import ( "context" "errors" - "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/consensus/bor/heimdall" + "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/eth/borfinality/whitelist" "github.com/ledgerwatch/log/v3" ) diff --git a/eth/calltracer/calltracer.go b/eth/calltracer/calltracer.go index 7271a088f29..0a68363d932 100644 --- a/eth/calltracer/calltracer.go +++ b/eth/calltracer/calltracer.go @@ -5,9 +5,9 @@ import ( "sort" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/kv" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/erigon/common" "github.com/ledgerwatch/erigon/core/types" diff --git a/eth/ethconfig/config.go b/eth/ethconfig/config.go index 57ef1772b55..249e2fab955 100644 --- a/eth/ethconfig/config.go +++ b/eth/ethconfig/config.go @@ -27,11 +27,11 @@ import ( "time" "github.com/c2h5oh/datasize" - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/downloader/downloadercfg" - "github.com/ledgerwatch/erigon-lib/txpool/txpoolcfg" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/datadir" + "github.com/ledgerwatch/erigon/erigon-lib/downloader/downloadercfg" + "github.com/ledgerwatch/erigon/erigon-lib/txpool/txpoolcfg" "github.com/ledgerwatch/erigon/consensus/ethash/ethashcfg" "github.com/ledgerwatch/erigon/core/types" diff --git a/eth/ethconfig/estimate/esitmated_ram.go b/eth/ethconfig/estimate/esitmated_ram.go index 573be06b861..eea2e38b97f 100644 --- a/eth/ethconfig/estimate/esitmated_ram.go +++ b/eth/ethconfig/estimate/esitmated_ram.go @@ -5,7 +5,7 @@ import ( "runtime" "github.com/c2h5oh/datasize" - "github.com/ledgerwatch/erigon-lib/common/cmp" + "github.com/ledgerwatch/erigon/erigon-lib/common/cmp" "github.com/pbnjay/memory" "github.com/shirou/gopsutil/v3/docker" ) diff --git a/eth/ethconfig/gen_config.go b/eth/ethconfig/gen_config.go index 5d9db0e26cb..277d3b6d80b 100644 --- a/eth/ethconfig/gen_config.go +++ b/eth/ethconfig/gen_config.go @@ -6,8 +6,8 @@ import ( "time" "github.com/c2h5oh/datasize" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/consensus/ethash/ethashcfg" "github.com/ledgerwatch/erigon/core/types" "github.com/ledgerwatch/erigon/eth/gasprice/gaspricecfg" diff --git a/eth/ethconfig/tx_pool.go b/eth/ethconfig/tx_pool.go index 1bdcfe0c950..2759f4fb09b 100644 --- a/eth/ethconfig/tx_pool.go +++ b/eth/ethconfig/tx_pool.go @@ -19,8 +19,8 @@ package ethconfig import ( "time" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/txpool/txpoolcfg" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/txpool/txpoolcfg" ) // DeprecatedTxPoolConfig are the configuration parameters of the transaction pool. diff --git a/eth/ethconsensusconfig/config.go b/eth/ethconsensusconfig/config.go index e5702c37ce7..22ef4c6614b 100644 --- a/eth/ethconsensusconfig/config.go +++ b/eth/ethconsensusconfig/config.go @@ -6,9 +6,8 @@ import ( "github.com/davecgh/go-spew/spew" "github.com/ledgerwatch/log/v3" - "github.com/ledgerwatch/erigon-lib/chain" + "github.com/ledgerwatch/erigon/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/kv" "github.com/ledgerwatch/erigon/consensus" "github.com/ledgerwatch/erigon/consensus/aura" "github.com/ledgerwatch/erigon/consensus/bor" @@ -19,6 +18,7 @@ import ( "github.com/ledgerwatch/erigon/consensus/ethash" "github.com/ledgerwatch/erigon/consensus/ethash/ethashcfg" "github.com/ledgerwatch/erigon/consensus/merge" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/erigon/node" "github.com/ledgerwatch/erigon/node/nodecfg" "github.com/ledgerwatch/erigon/params" diff --git a/eth/ethutils/utils.go b/eth/ethutils/utils.go index f26d24f442d..33664770f0e 100644 --- a/eth/ethutils/utils.go +++ b/eth/ethutils/utils.go @@ -1,7 +1,7 @@ package ethutils import ( - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/log/v3" "github.com/ledgerwatch/erigon/consensus" diff --git a/eth/filters/api.go b/eth/filters/api.go index a0c0ad7e48a..c345a08b888 100644 --- a/eth/filters/api.go +++ b/eth/filters/api.go @@ -22,8 +22,8 @@ import ( "fmt" "math/big" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" ethereum "github.com/ledgerwatch/erigon" "github.com/ledgerwatch/erigon/common/hexutil" diff --git a/eth/filters/api_test.go b/eth/filters/api_test.go index 9c7ae790a99..c4f372c2fce 100644 --- a/eth/filters/api_test.go +++ b/eth/filters/api_test.go @@ -21,7 +21,7 @@ import ( "fmt" "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/rpc" ) diff --git a/eth/gasprice/feehistory.go b/eth/gasprice/feehistory.go index 2e9923a2302..121480f425b 100644 --- a/eth/gasprice/feehistory.go +++ b/eth/gasprice/feehistory.go @@ -25,9 +25,9 @@ import ( "sync/atomic" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/consensus/misc" "github.com/ledgerwatch/erigon/core/types" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/rpc" "github.com/ledgerwatch/log/v3" ) diff --git a/eth/gasprice/gasprice.go b/eth/gasprice/gasprice.go index 81c47fc161d..847652a89ac 100644 --- a/eth/gasprice/gasprice.go +++ b/eth/gasprice/gasprice.go @@ -23,8 +23,8 @@ import ( "math/big" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/eth/gasprice/gaspricecfg" "github.com/ledgerwatch/log/v3" diff --git a/eth/gasprice/gasprice_test.go b/eth/gasprice/gasprice_test.go index 501c2bc3264..0c39280d0c8 100644 --- a/eth/gasprice/gasprice_test.go +++ b/eth/gasprice/gasprice_test.go @@ -23,9 +23,9 @@ import ( "testing" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/erigon/eth/gasprice/gaspricecfg" "github.com/ledgerwatch/erigon/turbo/jsonrpc" "github.com/ledgerwatch/erigon/turbo/services" diff --git a/eth/integrity/trie.go b/eth/integrity/trie.go index 92f4a48200f..a506bb10149 100644 --- a/eth/integrity/trie.go +++ b/eth/integrity/trie.go @@ -10,10 +10,10 @@ import ( "sync/atomic" "time" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/kv" "github.com/ledgerwatch/erigon/common/hexutil" "github.com/ledgerwatch/erigon/common/math" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/erigon/ethdb" "github.com/ledgerwatch/erigon/turbo/trie" "github.com/ledgerwatch/log/v3" diff --git a/eth/protocols/eth/discovery.go b/eth/protocols/eth/discovery.go index 50afab48f8d..79842fccfc2 100644 --- a/eth/protocols/eth/discovery.go +++ b/eth/protocols/eth/discovery.go @@ -19,7 +19,7 @@ package eth import ( "fmt" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/core/forkid" "github.com/ledgerwatch/erigon/p2p/enr" diff --git a/eth/protocols/eth/handler.go b/eth/protocols/eth/handler.go index 396bbbbc238..83f285bf451 100644 --- a/eth/protocols/eth/handler.go +++ b/eth/protocols/eth/handler.go @@ -19,9 +19,9 @@ package eth import ( "math/big" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/erigon/core/rawdb" ) diff --git a/eth/protocols/eth/handler_test.go b/eth/protocols/eth/handler_test.go index a3cb2c50dcb..ae09e4f828c 100644 --- a/eth/protocols/eth/handler_test.go +++ b/eth/protocols/eth/handler_test.go @@ -23,10 +23,10 @@ import ( "github.com/holiman/uint256" "github.com/stretchr/testify/require" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/direct" - "github.com/ledgerwatch/erigon-lib/gointerfaces/sentry" - "github.com/ledgerwatch/erigon-lib/kv" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/direct" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/sentry" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/erigon/core" "github.com/ledgerwatch/erigon/core/rawdb" diff --git a/eth/protocols/eth/handlers.go b/eth/protocols/eth/handlers.go index 774092027e1..d2f8e1bb0ed 100644 --- a/eth/protocols/eth/handlers.go +++ b/eth/protocols/eth/handlers.go @@ -20,8 +20,8 @@ import ( "context" "fmt" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/log/v3" "github.com/ledgerwatch/erigon/common" diff --git a/eth/protocols/eth/protocol.go b/eth/protocols/eth/protocol.go index d55f4b5b61e..dbd828300f5 100644 --- a/eth/protocols/eth/protocol.go +++ b/eth/protocols/eth/protocol.go @@ -22,9 +22,9 @@ import ( "math/big" "math/bits" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/direct" - proto_sentry "github.com/ledgerwatch/erigon-lib/gointerfaces/sentry" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/direct" + proto_sentry "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/sentry" "github.com/ledgerwatch/erigon/core/forkid" "github.com/ledgerwatch/erigon/core/types" diff --git a/eth/protocols/eth/protocol_test.go b/eth/protocols/eth/protocol_test.go index b99caaf8e10..ac45d10ae4f 100644 --- a/eth/protocols/eth/protocol_test.go +++ b/eth/protocols/eth/protocol_test.go @@ -21,7 +21,7 @@ import ( "math/big" "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/common" "github.com/ledgerwatch/erigon/core/types" diff --git a/eth/stagedsync/README.md b/eth/stagedsync/README.md index 1a3c290dc45..8ae06a77e07 100644 --- a/eth/stagedsync/README.md +++ b/eth/stagedsync/README.md @@ -45,7 +45,7 @@ state.unwindOrder = []*Stage{ } ``` -## Preprocessing with [ETL](https://github.com/ledgerwatch/erigon-lib/tree/main/etl) +## Preprocessing with [ETL](https://github.com/ledgerwatch/erigon/erigon-lib/tree/main/etl) Some stages use our ETL framework to sort data by keys before inserting it into the database. diff --git a/eth/stagedsync/all_stages.go b/eth/stagedsync/all_stages.go index 48f310d6676..f2e6f9b5a89 100644 --- a/eth/stagedsync/all_stages.go +++ b/eth/stagedsync/all_stages.go @@ -5,7 +5,7 @@ import ( metrics2 "github.com/VictoriaMetrics/metrics" "github.com/huandu/xstrings" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/erigon/eth/stagedsync/stages" "github.com/ledgerwatch/erigon/metrics" ) diff --git a/eth/stagedsync/chain_reader.go b/eth/stagedsync/chain_reader.go index d86f7c3f2ff..aebfe8f4a2d 100644 --- a/eth/stagedsync/chain_reader.go +++ b/eth/stagedsync/chain_reader.go @@ -4,9 +4,9 @@ import ( "context" "math/big" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/erigon/rlp" "github.com/ledgerwatch/erigon/turbo/services" "github.com/ledgerwatch/log/v3" diff --git a/eth/stagedsync/default_stages.go b/eth/stagedsync/default_stages.go index 25107abb37a..adf54a74f12 100644 --- a/eth/stagedsync/default_stages.go +++ b/eth/stagedsync/default_stages.go @@ -3,7 +3,7 @@ package stagedsync import ( "context" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/erigon/eth/ethconfig" "github.com/ledgerwatch/erigon/eth/stagedsync/stages" "github.com/ledgerwatch/log/v3" diff --git a/eth/stagedsync/exec3.go b/eth/stagedsync/exec3.go index d702dab8dd7..12ec2ec13aa 100644 --- a/eth/stagedsync/exec3.go +++ b/eth/stagedsync/exec3.go @@ -16,18 +16,18 @@ import ( "github.com/VictoriaMetrics/metrics" "github.com/c2h5oh/datasize" "github.com/erigontech/mdbx-go/mdbx" - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/common/dir" - "github.com/ledgerwatch/erigon-lib/etl" - "github.com/ledgerwatch/erigon-lib/kv" - kv2 "github.com/ledgerwatch/erigon-lib/kv/mdbx" - "github.com/ledgerwatch/erigon-lib/kv/rawdbv3" - libstate "github.com/ledgerwatch/erigon-lib/state" - state2 "github.com/ledgerwatch/erigon-lib/state" "github.com/ledgerwatch/erigon/common/math" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/datadir" + "github.com/ledgerwatch/erigon/erigon-lib/common/dbg" + "github.com/ledgerwatch/erigon/erigon-lib/common/dir" + "github.com/ledgerwatch/erigon/erigon-lib/etl" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + kv2 "github.com/ledgerwatch/erigon/erigon-lib/kv/mdbx" + "github.com/ledgerwatch/erigon/erigon-lib/kv/rawdbv3" + libstate "github.com/ledgerwatch/erigon/erigon-lib/state" + state2 "github.com/ledgerwatch/erigon/erigon-lib/state" "github.com/ledgerwatch/log/v3" "golang.org/x/sync/errgroup" diff --git a/eth/stagedsync/stage.go b/eth/stagedsync/stage.go index 60db9d10b7f..875bb9fccaf 100644 --- a/eth/stagedsync/stage.go +++ b/eth/stagedsync/stage.go @@ -1,8 +1,8 @@ package stagedsync import ( - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/log/v3" "github.com/ledgerwatch/erigon/eth/stagedsync/stages" diff --git a/eth/stagedsync/stage_blockhashes.go b/eth/stagedsync/stage_blockhashes.go index 69b466ecdd0..40a05e98820 100644 --- a/eth/stagedsync/stage_blockhashes.go +++ b/eth/stagedsync/stage_blockhashes.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/kv" "github.com/ledgerwatch/erigon/core/rawdb/blockio" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/erigon/eth/stagedsync/stages" "github.com/ledgerwatch/log/v3" ) diff --git a/eth/stagedsync/stage_bodies.go b/eth/stagedsync/stage_bodies.go index acf99996050..27f7b5d8dfa 100644 --- a/eth/stagedsync/stage_bodies.go +++ b/eth/stagedsync/stage_bodies.go @@ -6,12 +6,12 @@ import ( "runtime" "time" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/kv" "github.com/ledgerwatch/erigon/core/rawdb" "github.com/ledgerwatch/erigon/core/rawdb/blockio" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/dbg" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/log/v3" "github.com/ledgerwatch/erigon/dataflow" diff --git a/eth/stagedsync/stage_bodies_test.go b/eth/stagedsync/stage_bodies_test.go index 7e4d6fbe06d..83389c6e16b 100644 --- a/eth/stagedsync/stage_bodies_test.go +++ b/eth/stagedsync/stage_bodies_test.go @@ -6,10 +6,10 @@ import ( "testing" "time" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/u256" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/rawdbv3" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/u256" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/rawdbv3" "github.com/stretchr/testify/require" "github.com/ledgerwatch/erigon/core/rawdb" diff --git a/eth/stagedsync/stage_bor_heimdall.go b/eth/stagedsync/stage_bor_heimdall.go index 0c48c60ec28..2569a4825d8 100644 --- a/eth/stagedsync/stage_bor_heimdall.go +++ b/eth/stagedsync/stage_bor_heimdall.go @@ -9,13 +9,13 @@ import ( "strconv" "time" - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/kv" "github.com/ledgerwatch/erigon/accounts/abi" "github.com/ledgerwatch/erigon/consensus/bor/contract" "github.com/ledgerwatch/erigon/consensus/bor/heimdall" "github.com/ledgerwatch/erigon/core/types" "github.com/ledgerwatch/erigon/dataflow" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/erigon/eth/borfinality/generics" "github.com/ledgerwatch/erigon/eth/borfinality/whitelist" "github.com/ledgerwatch/erigon/eth/stagedsync/stages" diff --git a/eth/stagedsync/stage_call_traces.go b/eth/stagedsync/stage_call_traces.go index f6c94008e03..9b191dc472d 100644 --- a/eth/stagedsync/stage_call_traces.go +++ b/eth/stagedsync/stage_call_traces.go @@ -11,13 +11,13 @@ import ( "github.com/RoaringBitmap/roaring/roaring64" "github.com/c2h5oh/datasize" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/etl" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/bitmapdb" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/dbg" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" + "github.com/ledgerwatch/erigon/erigon-lib/etl" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/bitmapdb" "github.com/ledgerwatch/log/v3" "github.com/ledgerwatch/erigon/common/math" diff --git a/eth/stagedsync/stage_call_traces_test.go b/eth/stagedsync/stage_call_traces_test.go index 0248d65ae47..2323db0f517 100644 --- a/eth/stagedsync/stage_call_traces_test.go +++ b/eth/stagedsync/stage_call_traces_test.go @@ -6,10 +6,10 @@ import ( "time" "github.com/RoaringBitmap/roaring/roaring64" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/bitmapdb" + "github.com/ledgerwatch/erigon/erigon-lib/common/datadir" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/bitmapdb" "github.com/stretchr/testify/require" "github.com/ledgerwatch/erigon/core/state/temporal" diff --git a/eth/stagedsync/stage_execute.go b/eth/stagedsync/stage_execute.go index c19b0b739f9..3c7d0bbc20f 100644 --- a/eth/stagedsync/stage_execute.go +++ b/eth/stagedsync/stage_execute.go @@ -13,19 +13,19 @@ import ( "github.com/ledgerwatch/log/v3" "golang.org/x/sync/errgroup" - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/common" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/cmp" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/etl" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/rawdbv3" - "github.com/ledgerwatch/erigon-lib/kv/temporal/historyv2" - libstate "github.com/ledgerwatch/erigon-lib/state" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + "github.com/ledgerwatch/erigon/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/cmp" + "github.com/ledgerwatch/erigon/erigon-lib/common/datadir" + "github.com/ledgerwatch/erigon/erigon-lib/common/dbg" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" + "github.com/ledgerwatch/erigon/erigon-lib/etl" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/rawdbv3" + "github.com/ledgerwatch/erigon/erigon-lib/kv/temporal/historyv2" + libstate "github.com/ledgerwatch/erigon/erigon-lib/state" "github.com/ledgerwatch/erigon/common/changeset" "github.com/ledgerwatch/erigon/common/dbutils" diff --git a/eth/stagedsync/stage_execute_test.go b/eth/stagedsync/stage_execute_test.go index 7ef922a112a..6a80fef8e68 100644 --- a/eth/stagedsync/stage_execute_test.go +++ b/eth/stagedsync/stage_execute_test.go @@ -7,15 +7,15 @@ import ( "testing" "time" - "github.com/ledgerwatch/erigon-lib/common/datadir" + "github.com/ledgerwatch/erigon/erigon-lib/common/datadir" "github.com/ledgerwatch/log/v3" "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/memdb" - "github.com/ledgerwatch/erigon-lib/kv/rawdbv3" - "github.com/ledgerwatch/erigon-lib/kv/temporal/historyv2" - libstate "github.com/ledgerwatch/erigon-lib/state" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/memdb" + "github.com/ledgerwatch/erigon/erigon-lib/kv/rawdbv3" + "github.com/ledgerwatch/erigon/erigon-lib/kv/temporal/historyv2" + libstate "github.com/ledgerwatch/erigon/erigon-lib/state" "github.com/ledgerwatch/erigon/cmd/state/exec22" "github.com/ledgerwatch/erigon/core/state" diff --git a/eth/stagedsync/stage_finish.go b/eth/stagedsync/stage_finish.go index 39bdd191cc1..18e53483626 100644 --- a/eth/stagedsync/stage_finish.go +++ b/eth/stagedsync/stage_finish.go @@ -7,12 +7,12 @@ import ( "fmt" "time" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - "github.com/ledgerwatch/erigon-lib/gointerfaces/remote" - types2 "github.com/ledgerwatch/erigon-lib/gointerfaces/types" - "github.com/ledgerwatch/erigon-lib/kv" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/remote" + types2 "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/types" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/erigon/turbo/engineapi/engine_helpers" "github.com/ledgerwatch/erigon/turbo/services" "github.com/ledgerwatch/log/v3" diff --git a/eth/stagedsync/stage_hashstate.go b/eth/stagedsync/stage_hashstate.go index 64231c2179c..b79209d56ed 100644 --- a/eth/stagedsync/stage_hashstate.go +++ b/eth/stagedsync/stage_hashstate.go @@ -10,16 +10,16 @@ import ( "runtime" "time" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/etl" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/order" - "github.com/ledgerwatch/erigon-lib/kv/rawdbv3" - "github.com/ledgerwatch/erigon-lib/kv/temporal/historyv2" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/datadir" + "github.com/ledgerwatch/erigon/erigon-lib/common/dbg" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" + "github.com/ledgerwatch/erigon/erigon-lib/etl" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/order" + "github.com/ledgerwatch/erigon/erigon-lib/kv/rawdbv3" + "github.com/ledgerwatch/erigon/erigon-lib/kv/temporal/historyv2" "github.com/ledgerwatch/log/v3" "golang.org/x/sync/errgroup" diff --git a/eth/stagedsync/stage_hashstate_test.go b/eth/stagedsync/stage_hashstate_test.go index 81d5c12206a..1520bb45f87 100644 --- a/eth/stagedsync/stage_hashstate_test.go +++ b/eth/stagedsync/stage_hashstate_test.go @@ -5,13 +5,13 @@ import ( "errors" "testing" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/memdb" + "github.com/ledgerwatch/erigon/erigon-lib/common/datadir" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/memdb" "github.com/ledgerwatch/erigon/eth/ethconfig" "github.com/stretchr/testify/require" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/log/v3" ) diff --git a/eth/stagedsync/stage_headers.go b/eth/stagedsync/stage_headers.go index 7f9b62222d4..9c3fb7599ca 100644 --- a/eth/stagedsync/stage_headers.go +++ b/eth/stagedsync/stage_headers.go @@ -9,12 +9,12 @@ import ( "time" "github.com/c2h5oh/datasize" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/kv" "github.com/ledgerwatch/erigon/core/rawdb/blockio" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/dbg" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/log/v3" "github.com/ledgerwatch/erigon/common" diff --git a/eth/stagedsync/stage_indexes.go b/eth/stagedsync/stage_indexes.go index 383b01d61b9..ce841a7df34 100644 --- a/eth/stagedsync/stage_indexes.go +++ b/eth/stagedsync/stage_indexes.go @@ -12,14 +12,14 @@ import ( "github.com/RoaringBitmap/roaring/roaring64" "github.com/c2h5oh/datasize" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/etl" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/bitmapdb" - "github.com/ledgerwatch/erigon-lib/kv/temporal/historyv2" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/dbg" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" + "github.com/ledgerwatch/erigon/erigon-lib/etl" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/bitmapdb" + "github.com/ledgerwatch/erigon/erigon-lib/kv/temporal/historyv2" "github.com/ledgerwatch/log/v3" "golang.org/x/exp/slices" diff --git a/eth/stagedsync/stage_indexes_test.go b/eth/stagedsync/stage_indexes_test.go index 2d9d8f847f5..24743c1b5a8 100644 --- a/eth/stagedsync/stage_indexes_test.go +++ b/eth/stagedsync/stage_indexes_test.go @@ -11,11 +11,11 @@ import ( "time" "github.com/RoaringBitmap/roaring/roaring64" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/bitmapdb" - kv2 "github.com/ledgerwatch/erigon-lib/kv/memdb" - "github.com/ledgerwatch/erigon-lib/kv/temporal/historyv2" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/bitmapdb" + kv2 "github.com/ledgerwatch/erigon/erigon-lib/kv/memdb" + "github.com/ledgerwatch/erigon/erigon-lib/kv/temporal/historyv2" "github.com/ledgerwatch/log/v3" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/eth/stagedsync/stage_interhashes.go b/eth/stagedsync/stage_interhashes.go index ba67e558a2c..650e62137e4 100644 --- a/eth/stagedsync/stage_interhashes.go +++ b/eth/stagedsync/stage_interhashes.go @@ -8,15 +8,15 @@ import ( "math/bits" "sync/atomic" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/etl" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/order" - "github.com/ledgerwatch/erigon-lib/kv/rawdbv3" - "github.com/ledgerwatch/erigon-lib/kv/temporal/historyv2" - "github.com/ledgerwatch/erigon-lib/state" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" + "github.com/ledgerwatch/erigon/erigon-lib/etl" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/order" + "github.com/ledgerwatch/erigon/erigon-lib/kv/rawdbv3" + "github.com/ledgerwatch/erigon/erigon-lib/kv/temporal/historyv2" + "github.com/ledgerwatch/erigon/erigon-lib/state" "github.com/ledgerwatch/log/v3" "golang.org/x/exp/slices" diff --git a/eth/stagedsync/stage_interhashes_test.go b/eth/stagedsync/stage_interhashes_test.go index 1bf48ebf452..76f4539ceaa 100644 --- a/eth/stagedsync/stage_interhashes_test.go +++ b/eth/stagedsync/stage_interhashes_test.go @@ -5,11 +5,11 @@ import ( "encoding/binary" "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/memdb" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/memdb" "github.com/ledgerwatch/erigon/eth/ethconfig" "github.com/ledgerwatch/erigon/eth/stagedsync" "github.com/ledgerwatch/erigon/turbo/snapshotsync/freezeblocks" diff --git a/eth/stagedsync/stage_log_index.go b/eth/stagedsync/stage_log_index.go index 0f10c1b576b..d4e44db0bb7 100644 --- a/eth/stagedsync/stage_log_index.go +++ b/eth/stagedsync/stage_log_index.go @@ -10,12 +10,12 @@ import ( "github.com/RoaringBitmap/roaring" "github.com/c2h5oh/datasize" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/etl" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/bitmapdb" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/dbg" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/etl" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/bitmapdb" "github.com/ledgerwatch/log/v3" "golang.org/x/exp/slices" diff --git a/eth/stagedsync/stage_log_index_test.go b/eth/stagedsync/stage_log_index_test.go index cde5ae2c307..554039a167f 100644 --- a/eth/stagedsync/stage_log_index_test.go +++ b/eth/stagedsync/stage_log_index_test.go @@ -6,11 +6,11 @@ import ( "testing" "time" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/bitmapdb" - "github.com/ledgerwatch/erigon-lib/kv/memdb" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/bitmapdb" + "github.com/ledgerwatch/erigon/erigon-lib/kv/memdb" "github.com/ledgerwatch/log/v3" "github.com/ledgerwatch/erigon/core/rawdb" diff --git a/eth/stagedsync/stage_mining_create_block.go b/eth/stagedsync/stage_mining_create_block.go index 5016d4afa02..fd206722791 100644 --- a/eth/stagedsync/stage_mining_create_block.go +++ b/eth/stagedsync/stage_mining_create_block.go @@ -8,18 +8,18 @@ import ( "time" mapset "github.com/deckarep/golang-set/v2" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/turbo/services" "github.com/ledgerwatch/log/v3" - "github.com/ledgerwatch/erigon-lib/kv" "github.com/ledgerwatch/erigon/common/debug" "github.com/ledgerwatch/erigon/consensus" "github.com/ledgerwatch/erigon/core" "github.com/ledgerwatch/erigon/core/rawdb" "github.com/ledgerwatch/erigon/core/state" "github.com/ledgerwatch/erigon/core/types" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/erigon/eth/ethutils" "github.com/ledgerwatch/erigon/params" ) diff --git a/eth/stagedsync/stage_mining_exec.go b/eth/stagedsync/stage_mining_exec.go index 4bb14b2f0b1..0a1ff3b8b72 100644 --- a/eth/stagedsync/stage_mining_exec.go +++ b/eth/stagedsync/stage_mining_exec.go @@ -13,12 +13,12 @@ import ( "github.com/ledgerwatch/log/v3" "golang.org/x/net/context" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/fixedgas" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/memdb" - types2 "github.com/ledgerwatch/erigon-lib/types" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/fixedgas" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/memdb" + types2 "github.com/ledgerwatch/erigon/erigon-lib/types" "github.com/ledgerwatch/erigon/consensus" "github.com/ledgerwatch/erigon/core" diff --git a/eth/stagedsync/stage_mining_finish.go b/eth/stagedsync/stage_mining_finish.go index 7c3f0a02f63..1162aed1f0c 100644 --- a/eth/stagedsync/stage_mining_finish.go +++ b/eth/stagedsync/stage_mining_finish.go @@ -3,8 +3,8 @@ package stagedsync import ( "fmt" - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/erigon/turbo/builder" "github.com/ledgerwatch/erigon/turbo/services" "github.com/ledgerwatch/log/v3" diff --git a/eth/stagedsync/stage_postexec.go b/eth/stagedsync/stage_postexec.go index 5a119e56de6..efc2c03da96 100644 --- a/eth/stagedsync/stage_postexec.go +++ b/eth/stagedsync/stage_postexec.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv" ) // PostExec stage is run after execution stage to peform extra verifications that are only possible when state is available. diff --git a/eth/stagedsync/stage_senders.go b/eth/stagedsync/stage_senders.go index b15409eab9e..333599f3f51 100644 --- a/eth/stagedsync/stage_senders.go +++ b/eth/stagedsync/stage_senders.go @@ -9,14 +9,14 @@ import ( "sync" "time" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/cmp" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/etl" - "github.com/ledgerwatch/erigon-lib/kv" "github.com/ledgerwatch/erigon/consensus" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/cmp" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" + "github.com/ledgerwatch/erigon/erigon-lib/etl" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/erigon/turbo/services" "github.com/ledgerwatch/log/v3" "github.com/ledgerwatch/secp256k1" diff --git a/eth/stagedsync/stage_senders_test.go b/eth/stagedsync/stage_senders_test.go index 15bda777a11..174a3497dc8 100644 --- a/eth/stagedsync/stage_senders_test.go +++ b/eth/stagedsync/stage_senders_test.go @@ -3,8 +3,8 @@ package stagedsync_test import ( "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/erigon/eth/stagedsync" "github.com/ledgerwatch/erigon/turbo/stages/mock" "github.com/stretchr/testify/assert" diff --git a/eth/stagedsync/stage_snapshots.go b/eth/stagedsync/stage_snapshots.go index 0886737e4c4..dca47ec7a70 100644 --- a/eth/stagedsync/stage_snapshots.go +++ b/eth/stagedsync/stage_snapshots.go @@ -10,14 +10,14 @@ import ( "github.com/ledgerwatch/log/v3" - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/etl" - proto_downloader "github.com/ledgerwatch/erigon-lib/gointerfaces/downloader" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/kvcfg" - "github.com/ledgerwatch/erigon-lib/kv/rawdbv3" - "github.com/ledgerwatch/erigon-lib/state" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + "github.com/ledgerwatch/erigon/erigon-lib/common/datadir" + "github.com/ledgerwatch/erigon/erigon-lib/etl" + proto_downloader "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/downloader" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/kvcfg" + "github.com/ledgerwatch/erigon/erigon-lib/kv/rawdbv3" + "github.com/ledgerwatch/erigon/erigon-lib/state" "github.com/ledgerwatch/erigon/core/rawdb" "github.com/ledgerwatch/erigon/core/types" diff --git a/eth/stagedsync/stage_txlookup.go b/eth/stagedsync/stage_txlookup.go index 3c0223e3393..5ef667ced3c 100644 --- a/eth/stagedsync/stage_txlookup.go +++ b/eth/stagedsync/stage_txlookup.go @@ -6,12 +6,12 @@ import ( "fmt" "math/big" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/cmp" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/etl" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/cmp" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/etl" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/erigon/turbo/services" "github.com/ledgerwatch/log/v3" diff --git a/eth/stagedsync/stage_verkle_trie.go b/eth/stagedsync/stage_verkle_trie.go index 1c29dc50578..ea435d0a252 100644 --- a/eth/stagedsync/stage_verkle_trie.go +++ b/eth/stagedsync/stage_verkle_trie.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/log/v3" "github.com/ledgerwatch/erigon/cmd/verkle/verkletrie" diff --git a/eth/stagedsync/stagebuilder.go b/eth/stagedsync/stagebuilder.go index 05ed4183ca6..b01d12faf04 100644 --- a/eth/stagedsync/stagebuilder.go +++ b/eth/stagedsync/stagebuilder.go @@ -3,9 +3,9 @@ package stagedsync import ( "context" - "github.com/ledgerwatch/erigon-lib/gointerfaces/remote" - "github.com/ledgerwatch/erigon-lib/kv" "github.com/ledgerwatch/erigon/core/types" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/remote" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/erigon/eth/stagedsync/stages" "github.com/ledgerwatch/log/v3" ) diff --git a/eth/stagedsync/stages/stages.go b/eth/stagedsync/stages/stages.go index bf3c9fba6ae..02622192fba 100644 --- a/eth/stagedsync/stages/stages.go +++ b/eth/stagedsync/stages/stages.go @@ -20,7 +20,7 @@ import ( "encoding/binary" "fmt" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv" ) // SyncStage represents the stages of syncronisation in the Mode.StagedSync mode diff --git a/eth/stagedsync/sync.go b/eth/stagedsync/sync.go index f63f4ca0335..f46e5f8a97d 100644 --- a/eth/stagedsync/sync.go +++ b/eth/stagedsync/sync.go @@ -5,9 +5,9 @@ import ( "fmt" "time" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/kv" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/dbg" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/log/v3" "github.com/ledgerwatch/erigon/eth/stagedsync/stages" diff --git a/eth/stagedsync/sync_test.go b/eth/stagedsync/sync_test.go index bf731cd151b..7dcba0e08a2 100644 --- a/eth/stagedsync/sync_test.go +++ b/eth/stagedsync/sync_test.go @@ -5,9 +5,9 @@ import ( "fmt" "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/memdb" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/memdb" "github.com/ledgerwatch/log/v3" "github.com/stretchr/testify/assert" diff --git a/eth/stagedsync/testutil.go b/eth/stagedsync/testutil.go index 28ce1bf2169..7d382d1d762 100644 --- a/eth/stagedsync/testutil.go +++ b/eth/stagedsync/testutil.go @@ -6,12 +6,12 @@ import ( "testing" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - state2 "github.com/ledgerwatch/erigon-lib/state" "github.com/ledgerwatch/erigon/common" "github.com/ledgerwatch/erigon/core/state" "github.com/ledgerwatch/erigon/core/types/accounts" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + state2 "github.com/ledgerwatch/erigon/erigon-lib/state" "github.com/ledgerwatch/erigon/eth/ethconfig" "github.com/stretchr/testify/assert" ) diff --git a/eth/tracers/internal/tracetest/calltrace_test.go b/eth/tracers/internal/tracetest/calltrace_test.go index 891ad50fe2f..250e5c4b82c 100644 --- a/eth/tracers/internal/tracetest/calltrace_test.go +++ b/eth/tracers/internal/tracetest/calltrace_test.go @@ -25,9 +25,6 @@ import ( "testing" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" "github.com/ledgerwatch/erigon/common" "github.com/ledgerwatch/erigon/common/hexutil" "github.com/ledgerwatch/erigon/common/math" @@ -36,6 +33,9 @@ import ( "github.com/ledgerwatch/erigon/core/vm" "github.com/ledgerwatch/erigon/core/vm/evmtypes" "github.com/ledgerwatch/erigon/crypto" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" "github.com/ledgerwatch/erigon/eth/tracers" _ "github.com/ledgerwatch/erigon/eth/tracers/js" _ "github.com/ledgerwatch/erigon/eth/tracers/native" diff --git a/eth/tracers/internal/tracetest/prestate_test.go b/eth/tracers/internal/tracetest/prestate_test.go index 0a5515a743c..197cd13762d 100644 --- a/eth/tracers/internal/tracetest/prestate_test.go +++ b/eth/tracers/internal/tracetest/prestate_test.go @@ -25,7 +25,7 @@ import ( "testing" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/stretchr/testify/require" "github.com/ledgerwatch/erigon/common" diff --git a/eth/tracers/js/goja.go b/eth/tracers/js/goja.go index cd057c9f5d1..dea38474d1a 100644 --- a/eth/tracers/js/goja.go +++ b/eth/tracers/js/goja.go @@ -24,8 +24,8 @@ import ( "github.com/dop251/goja" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" "github.com/ledgerwatch/erigon/common" "github.com/ledgerwatch/erigon/core/vm" diff --git a/eth/tracers/js/tracer_test.go b/eth/tracers/js/tracer_test.go index 32251acc700..905de3a546f 100644 --- a/eth/tracers/js/tracer_test.go +++ b/eth/tracers/js/tracer_test.go @@ -25,8 +25,8 @@ import ( "time" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/core/state" "github.com/ledgerwatch/erigon/core/vm" diff --git a/eth/tracers/logger/access_list_tracer.go b/eth/tracers/logger/access_list_tracer.go index e41ab87abaf..2a2e60cd45f 100644 --- a/eth/tracers/logger/access_list_tracer.go +++ b/eth/tracers/logger/access_list_tracer.go @@ -18,8 +18,8 @@ package logger import ( "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - types2 "github.com/ledgerwatch/erigon-lib/types" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + types2 "github.com/ledgerwatch/erigon/erigon-lib/types" "github.com/ledgerwatch/erigon/core/vm" ) diff --git a/eth/tracers/logger/gen_structlog.go b/eth/tracers/logger/gen_structlog.go index fa9de16a7b4..58e291229bf 100644 --- a/eth/tracers/logger/gen_structlog.go +++ b/eth/tracers/logger/gen_structlog.go @@ -4,8 +4,8 @@ import ( "encoding/json" "math/big" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" "github.com/ledgerwatch/erigon/common/math" "github.com/ledgerwatch/erigon/core/vm" diff --git a/eth/tracers/logger/json_stream.go b/eth/tracers/logger/json_stream.go index 3f272ed6196..0dc6f60a403 100644 --- a/eth/tracers/logger/json_stream.go +++ b/eth/tracers/logger/json_stream.go @@ -7,7 +7,7 @@ import ( "github.com/holiman/uint256" jsoniter "github.com/json-iterator/go" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/common" "github.com/ledgerwatch/erigon/core/vm" diff --git a/eth/tracers/logger/logger.go b/eth/tracers/logger/logger.go index 3beb7e7d96c..705ba078b39 100644 --- a/eth/tracers/logger/logger.go +++ b/eth/tracers/logger/logger.go @@ -12,9 +12,9 @@ import ( "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" "github.com/ledgerwatch/erigon/common/math" "github.com/ledgerwatch/erigon/core/types" diff --git a/eth/tracers/logger/logger_json.go b/eth/tracers/logger/logger_json.go index b2c90f3509e..16780322450 100644 --- a/eth/tracers/logger/logger_json.go +++ b/eth/tracers/logger/logger_json.go @@ -22,7 +22,7 @@ import ( "math/big" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/common" "github.com/ledgerwatch/erigon/common/math" diff --git a/eth/tracers/logger/logger_test.go b/eth/tracers/logger/logger_test.go index 730b5fbca57..f981c3003bd 100644 --- a/eth/tracers/logger/logger_test.go +++ b/eth/tracers/logger/logger_test.go @@ -21,7 +21,7 @@ import ( "testing" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/core/state" "github.com/ledgerwatch/erigon/core/vm" diff --git a/eth/tracers/native/4byte.go b/eth/tracers/native/4byte.go index 41900f17b16..aa6187e0752 100644 --- a/eth/tracers/native/4byte.go +++ b/eth/tracers/native/4byte.go @@ -22,7 +22,7 @@ import ( "sync/atomic" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/common" "github.com/ledgerwatch/erigon/core/vm" diff --git a/eth/tracers/native/call.go b/eth/tracers/native/call.go index 520e953b9bd..7ace1d50cfa 100644 --- a/eth/tracers/native/call.go +++ b/eth/tracers/native/call.go @@ -23,12 +23,12 @@ import ( "sync/atomic" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" "github.com/ledgerwatch/erigon/accounts/abi" "github.com/ledgerwatch/erigon/common" "github.com/ledgerwatch/erigon/common/hexutil" "github.com/ledgerwatch/erigon/core/vm" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" "github.com/ledgerwatch/erigon/eth/tracers" ) diff --git a/eth/tracers/native/gen_account_json.go b/eth/tracers/native/gen_account_json.go index d4f00b2a4e2..4975d0d3c2e 100644 --- a/eth/tracers/native/gen_account_json.go +++ b/eth/tracers/native/gen_account_json.go @@ -6,8 +6,8 @@ import ( "encoding/json" "math/big" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" "github.com/ledgerwatch/erigon/common/hexutil" ) diff --git a/eth/tracers/native/gen_callframe_json.go b/eth/tracers/native/gen_callframe_json.go index 9a49f0f7cc5..225984d5e4b 100644 --- a/eth/tracers/native/gen_callframe_json.go +++ b/eth/tracers/native/gen_callframe_json.go @@ -6,8 +6,8 @@ import ( "encoding/json" "math/big" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" "github.com/ledgerwatch/erigon/common/hexutil" "github.com/ledgerwatch/erigon/core/vm" diff --git a/eth/tracers/native/mux.go b/eth/tracers/native/mux.go index 77809c64fa7..a1e0b79b1c9 100644 --- a/eth/tracers/native/mux.go +++ b/eth/tracers/native/mux.go @@ -20,7 +20,7 @@ import ( "encoding/json" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/core/vm" "github.com/ledgerwatch/erigon/eth/tracers" diff --git a/eth/tracers/native/noop.go b/eth/tracers/native/noop.go index ff04a23a000..30b292071c8 100644 --- a/eth/tracers/native/noop.go +++ b/eth/tracers/native/noop.go @@ -20,7 +20,7 @@ import ( "encoding/json" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/core/vm" "github.com/ledgerwatch/erigon/eth/tracers" diff --git a/eth/tracers/native/prestate.go b/eth/tracers/native/prestate.go index 8398af06c9a..0b3d9c4ad70 100644 --- a/eth/tracers/native/prestate.go +++ b/eth/tracers/native/prestate.go @@ -24,8 +24,8 @@ import ( "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" "github.com/ledgerwatch/erigon/common/hexutil" "github.com/ledgerwatch/erigon/core/vm" diff --git a/eth/tracers/tracers.go b/eth/tracers/tracers.go index 7bf41f5769b..ad0dfa5a5be 100644 --- a/eth/tracers/tracers.go +++ b/eth/tracers/tracers.go @@ -21,7 +21,7 @@ import ( "encoding/json" "errors" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/core/vm" ) diff --git a/eth/tracers/tracers_test.go b/eth/tracers/tracers_test.go index da79af92fa4..bef10dd75c2 100644 --- a/eth/tracers/tracers_test.go +++ b/eth/tracers/tracers_test.go @@ -23,13 +23,13 @@ import ( "math/big" "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/common/hexutil" "github.com/ledgerwatch/erigon/core" "github.com/ledgerwatch/erigon/core/types" "github.com/ledgerwatch/erigon/core/vm" "github.com/ledgerwatch/erigon/core/vm/evmtypes" "github.com/ledgerwatch/erigon/crypto" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/params" "github.com/ledgerwatch/erigon/tests" "github.com/ledgerwatch/erigon/turbo/stages/mock" diff --git a/ethdb/db_interface.go b/ethdb/db_interface.go index d8a1cf590f9..030a74ebd6a 100644 --- a/ethdb/db_interface.go +++ b/ethdb/db_interface.go @@ -20,7 +20,7 @@ import ( "context" "errors" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv" ) // DESCRIBED: For info on database buckets see docs/programmers_guide/db_walkthrough.MD diff --git a/ethdb/kv_util.go b/ethdb/kv_util.go index 796ad8fe2a3..bdc12ffb346 100644 --- a/ethdb/kv_util.go +++ b/ethdb/kv_util.go @@ -3,8 +3,8 @@ package ethdb import ( "bytes" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv" ) func Walk(c kv.Cursor, startkey []byte, fixedbits int, walker func(k, v []byte) (bool, error)) error { diff --git a/ethdb/olddb/database_test.go b/ethdb/olddb/database_test.go index 7767f3005af..53636c6db19 100644 --- a/ethdb/olddb/database_test.go +++ b/ethdb/olddb/database_test.go @@ -27,9 +27,9 @@ import ( "testing" "time" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/memdb" "github.com/ledgerwatch/erigon/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/memdb" "github.com/ledgerwatch/erigon/ethdb" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/ethdb/olddb/mapmutation.go b/ethdb/olddb/mapmutation.go index 385d201ddd0..77d3b444f9e 100644 --- a/ethdb/olddb/mapmutation.go +++ b/ethdb/olddb/mapmutation.go @@ -8,8 +8,8 @@ import ( "time" "unsafe" - "github.com/ledgerwatch/erigon-lib/etl" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/etl" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/log/v3" "github.com/ledgerwatch/erigon/ethdb" diff --git a/ethdb/olddb/mutation.go b/ethdb/olddb/mutation.go index ee39868dabb..a92cf385ea5 100644 --- a/ethdb/olddb/mutation.go +++ b/ethdb/olddb/mutation.go @@ -11,8 +11,8 @@ import ( "unsafe" "github.com/google/btree" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/erigon/ethdb" "github.com/ledgerwatch/log/v3" ) diff --git a/ethdb/olddb/object_db.go b/ethdb/olddb/object_db.go index 24d03523175..e2a8ddf2ffc 100644 --- a/ethdb/olddb/object_db.go +++ b/ethdb/olddb/object_db.go @@ -21,8 +21,8 @@ import ( "context" "fmt" - "github.com/ledgerwatch/erigon-lib/kv" "github.com/ledgerwatch/erigon/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/erigon/ethdb" "github.com/ledgerwatch/log/v3" ) diff --git a/ethdb/olddb/tx_db.go b/ethdb/olddb/tx_db.go index f54727ba04e..ecf0c2d1853 100644 --- a/ethdb/olddb/tx_db.go +++ b/ethdb/olddb/tx_db.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/erigon/ethdb" "github.com/ledgerwatch/log/v3" ) diff --git a/ethdb/privateapi/all.go b/ethdb/privateapi/all.go index 098bd7f8300..940b9e99ee8 100644 --- a/ethdb/privateapi/all.go +++ b/ethdb/privateapi/all.go @@ -4,11 +4,11 @@ import ( "fmt" "net" - "github.com/ledgerwatch/erigon-lib/gointerfaces/grpcutil" - "github.com/ledgerwatch/erigon-lib/gointerfaces/remote" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/grpcutil" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/remote" - txpool_proto "github.com/ledgerwatch/erigon-lib/gointerfaces/txpool" - "github.com/ledgerwatch/erigon-lib/kv/remotedbserver" + txpool_proto "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/txpool" + "github.com/ledgerwatch/erigon/erigon-lib/kv/remotedbserver" "github.com/ledgerwatch/log/v3" "google.golang.org/grpc" "google.golang.org/grpc/credentials" diff --git a/ethdb/privateapi/ethbackend.go b/ethdb/privateapi/ethbackend.go index 1e0bb3bc1f5..382c29e0e69 100644 --- a/ethdb/privateapi/ethbackend.go +++ b/ethdb/privateapi/ethbackend.go @@ -8,12 +8,12 @@ import ( "github.com/ledgerwatch/log/v3" "google.golang.org/protobuf/types/known/emptypb" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/direct" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - "github.com/ledgerwatch/erigon-lib/gointerfaces/remote" - types2 "github.com/ledgerwatch/erigon-lib/gointerfaces/types" - "github.com/ledgerwatch/erigon-lib/kv" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/direct" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/remote" + types2 "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/types" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/erigon/common" "github.com/ledgerwatch/erigon/params" diff --git a/ethdb/privateapi/logsfilter.go b/ethdb/privateapi/logsfilter.go index c5bd3d11ece..fc50e0e5be1 100644 --- a/ethdb/privateapi/logsfilter.go +++ b/ethdb/privateapi/logsfilter.go @@ -5,10 +5,10 @@ import ( "io" "sync" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - "github.com/ledgerwatch/erigon-lib/gointerfaces/remote" - "github.com/ledgerwatch/erigon-lib/gointerfaces/types" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/remote" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/types" "github.com/ledgerwatch/erigon/turbo/shards" ) diff --git a/ethdb/privateapi/logsfilter_test.go b/ethdb/privateapi/logsfilter_test.go index a593cd14f04..14e6a3c745f 100644 --- a/ethdb/privateapi/logsfilter_test.go +++ b/ethdb/privateapi/logsfilter_test.go @@ -4,10 +4,10 @@ import ( "context" "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - "github.com/ledgerwatch/erigon-lib/gointerfaces/remote" - types2 "github.com/ledgerwatch/erigon-lib/gointerfaces/types" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/remote" + types2 "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/types" "google.golang.org/grpc" "github.com/ledgerwatch/erigon/turbo/shards" diff --git a/ethdb/privateapi/mining.go b/ethdb/privateapi/mining.go index 414fb9891e7..c99aa317844 100644 --- a/ethdb/privateapi/mining.go +++ b/ethdb/privateapi/mining.go @@ -6,9 +6,9 @@ import ( "errors" "sync" - libcommon "github.com/ledgerwatch/erigon-lib/common" - proto_txpool "github.com/ledgerwatch/erigon-lib/gointerfaces/txpool" - types2 "github.com/ledgerwatch/erigon-lib/gointerfaces/types" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + proto_txpool "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/txpool" + types2 "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/types" "github.com/ledgerwatch/log/v3" "google.golang.org/protobuf/types/known/emptypb" diff --git a/ethdb/prune/storage_mode.go b/ethdb/prune/storage_mode.go index cde01f6cdac..ff0cf5c675d 100644 --- a/ethdb/prune/storage_mode.go +++ b/ethdb/prune/storage_mode.go @@ -9,7 +9,7 @@ import ( "reflect" "strings" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/erigon/params" "github.com/ledgerwatch/log/v3" ) diff --git a/ethdb/prune/storage_mode_test.go b/ethdb/prune/storage_mode_test.go index a5aeca248ac..ac5a41e583a 100644 --- a/ethdb/prune/storage_mode_test.go +++ b/ethdb/prune/storage_mode_test.go @@ -5,8 +5,8 @@ import ( "strconv" "testing" - "github.com/ledgerwatch/erigon-lib/kv/memdb" "github.com/ledgerwatch/erigon/common/math" + "github.com/ledgerwatch/erigon/erigon-lib/kv/memdb" "github.com/stretchr/testify/assert" ) diff --git a/ethdb/walk.go b/ethdb/walk.go index 006b1785fce..9e00e0b8f13 100644 --- a/ethdb/walk.go +++ b/ethdb/walk.go @@ -19,7 +19,7 @@ package ethdb import ( "bytes" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv" ) // splitCursor implements cursor with two keys diff --git a/ethstats/ethstats.go b/ethstats/ethstats.go index 45f67ab8de2..979d7d5dacf 100644 --- a/ethstats/ethstats.go +++ b/ethstats/ethstats.go @@ -32,8 +32,8 @@ import ( "time" "github.com/gorilla/websocket" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/erigon/turbo/services" "github.com/ledgerwatch/log/v3" diff --git a/go.mod b/go.mod index a80257356b0..cfe73fae9ea 100644 --- a/go.mod +++ b/go.mod @@ -4,13 +4,12 @@ go 1.19 require ( github.com/erigontech/mdbx-go v0.27.14 - github.com/ledgerwatch/erigon-lib v0.0.0-20230920112310-93d9c9d9fe4b github.com/ledgerwatch/erigon-snapshot v1.2.1-0.20230911054727-4e865b051314 github.com/ledgerwatch/log/v3 v3.9.0 github.com/ledgerwatch/secp256k1 v1.0.0 ) -replace github.com/ledgerwatch/erigon-lib => ./erigon-lib +replace github.com/ledgerwatch/erigon/erigon-lib => ./erigon-lib require ( gfx.cafe/util/go/generic v0.0.0-20230502013805-237fcc25d586 @@ -20,6 +19,9 @@ require ( github.com/VictoriaMetrics/fastcache v1.12.1 github.com/VictoriaMetrics/metrics v1.23.1 github.com/alecthomas/kong v0.8.0 + github.com/anacrolix/dht/v2 v2.19.2-0.20221121215055-066ad8494444 + github.com/anacrolix/go-libutp v1.3.1 + github.com/anacrolix/log v0.14.3-0.20230823030427-4b296d71a6b4 github.com/anacrolix/sync v0.4.0 github.com/anacrolix/torrent v1.52.6-0.20230914125831-4fb12d06b31b github.com/benesch/cgosymbolizer v0.0.0-20190515212042-bec6fe6e597b @@ -38,6 +40,7 @@ require ( github.com/fjl/gencodec v0.0.0-20220412091415-8bb9e558978c github.com/gballet/go-verkle v0.0.0-20221121182333-31427a1f2d35 github.com/go-chi/chi/v5 v5.0.10 + github.com/go-stack/stack v1.8.1 github.com/goccy/go-json v0.9.11 github.com/gofrs/flock v0.8.1 github.com/golang-jwt/jwt/v4 v4.5.0 @@ -56,11 +59,13 @@ require ( github.com/jedib0t/go-pretty/v6 v6.4.6 github.com/json-iterator/go v1.1.12 github.com/julienschmidt/httprouter v1.3.0 + github.com/ledgerwatch/interfaces v0.0.0-20230918134526-659364cb330f github.com/libp2p/go-libp2p v0.31.0 github.com/libp2p/go-libp2p-pubsub v0.9.3 github.com/libp2p/go-mplex v0.7.0 github.com/maticnetwork/crand v1.0.2 github.com/maticnetwork/polyproto v0.0.3-0.20230216113155-340ea926ca53 + github.com/matryer/moq v0.2.7 github.com/multiformats/go-multiaddr v0.11.0 github.com/nxadm/tail v1.4.9-0.20211216163028-4472660a31a6 github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 @@ -76,6 +81,7 @@ require ( github.com/quasilyte/go-ruleguard/dsl v0.3.22 github.com/rs/cors v1.10.0 github.com/shirou/gopsutil/v3 v3.23.8 + github.com/spaolacci/murmur3 v1.1.0 github.com/spf13/afero v1.9.5 github.com/spf13/cobra v1.7.0 github.com/spf13/pflag v1.0.5 @@ -111,11 +117,8 @@ require ( github.com/ajwerner/btree v0.0.0-20211221152037-f427b3e689c0 // indirect github.com/alecthomas/atomic v0.1.0-alpha2 // indirect github.com/anacrolix/chansync v0.3.0 // indirect - github.com/anacrolix/dht/v2 v2.19.2-0.20221121215055-066ad8494444 // indirect github.com/anacrolix/envpprof v1.3.0 // indirect github.com/anacrolix/generics v0.0.0-20230816105729-c755655aee45 // indirect - github.com/anacrolix/go-libutp v1.3.1 // indirect - github.com/anacrolix/log v0.14.3-0.20230823030427-4b296d71a6b4 // indirect github.com/anacrolix/missinggo v1.3.0 // indirect github.com/anacrolix/missinggo/perf v1.0.0 // indirect github.com/anacrolix/missinggo/v2 v2.7.2-0.20230527121029-a582b4f397b9 // indirect @@ -152,7 +155,6 @@ require ( github.com/go-logr/stdr v1.2.2 // indirect github.com/go-ole/go-ole v1.2.6 // indirect github.com/go-sourcemap/sourcemap v2.1.3+incompatible // indirect - github.com/go-stack/stack v1.8.1 // indirect github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect github.com/godbus/dbus/v5 v5.1.0 // indirect github.com/gogo/protobuf v1.3.2 // indirect @@ -238,7 +240,6 @@ require ( github.com/rs/dnscache v0.0.0-20211102005908-e0241e321417 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect - github.com/spaolacci/murmur3 v1.1.0 // indirect github.com/supranational/blst v0.3.11 // indirect github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect diff --git a/go.sum b/go.sum index 4ca8aca5507..dfc83ee0e08 100644 --- a/go.sum +++ b/go.sum @@ -501,6 +501,8 @@ github.com/leanovate/gopter v0.2.9 h1:fQjYxZaynp97ozCzfOyOuAGOU4aU/z37zf/tOujFk7 github.com/leanovate/gopter v0.2.9/go.mod h1:U2L/78B+KVFIx2VmW6onHJQzXtFb+p5y3y2Sh+Jxxv8= github.com/ledgerwatch/erigon-snapshot v1.2.1-0.20230911054727-4e865b051314 h1:TeQoOW2o0rL5jF4ava+SlB8l0mhzM8ISnq81okJ790c= github.com/ledgerwatch/erigon-snapshot v1.2.1-0.20230911054727-4e865b051314/go.mod h1:3AuPxZc85jkehh/HA9h8gabv5MSi3kb/ddtzBsTVJFo= +github.com/ledgerwatch/interfaces v0.0.0-20230918134526-659364cb330f h1:FIYhhGRdObdQUREitS7EEclvHaoXhqukdveR7Wg2htc= +github.com/ledgerwatch/interfaces v0.0.0-20230918134526-659364cb330f/go.mod h1:ugQv1QllJzBny3cKZKxUrSnykkjkBgm27eQM6dnGAcc= github.com/ledgerwatch/log/v3 v3.9.0 h1:iDwrXe0PVwBC68Dd94YSsHbMgQ3ufsgjzXtFNFVZFRk= github.com/ledgerwatch/log/v3 v3.9.0/go.mod h1:EiAY6upmI/6LkNhOVxb4eVsmsP11HZCnZ3PlJMjYiqE= github.com/ledgerwatch/secp256k1 v1.0.0 h1:Usvz87YoTG0uePIV8woOof5cQnLXGYa162rFf3YnwaQ= @@ -542,6 +544,8 @@ github.com/maticnetwork/crand v1.0.2 h1:Af0tAivC8zrxXDpGWNWVT/0s1fOz8w0eRbahZgUR github.com/maticnetwork/crand v1.0.2/go.mod h1:/NRNL3bj2eYdqpWmoIP5puxndTpi0XRxpj5ZKxfHjyg= github.com/maticnetwork/polyproto v0.0.3-0.20230216113155-340ea926ca53 h1:PjYV+lghs106JKkrYgOnrsfDLoTc11BxZd4rUa4Rus4= github.com/maticnetwork/polyproto v0.0.3-0.20230216113155-340ea926ca53/go.mod h1:e1mU2EXSwEpn5jM7GfNwu3AupsV6WAGoPFFfswXOF0o= +github.com/matryer/moq v0.2.7 h1:RtpiPUM8L7ZSCbSwK+QcZH/E9tgqAkFjKQxsRs25b4w= +github.com/matryer/moq v0.2.7/go.mod h1:kITsx543GOENm48TUAQyJ9+SAvFSr7iGQXPoth/VUBk= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= @@ -875,6 +879,7 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= +github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= @@ -968,6 +973,7 @@ golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc= @@ -1015,6 +1021,7 @@ golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= +golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211201190559-0a0e4e1bb54c/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= @@ -1113,6 +1120,7 @@ golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211020174200-9d6173849985/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -1207,6 +1215,7 @@ golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/tools v0.13.0 h1:Iey4qkscZuv0VvIt8E0neZjtPVQFSc870HQ448QgEmQ= diff --git a/interfaces.go b/interfaces.go index a9f97e5a8a6..5530be1f1d5 100644 --- a/interfaces.go +++ b/interfaces.go @@ -23,8 +23,8 @@ import ( "math/big" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - types2 "github.com/ledgerwatch/erigon-lib/types" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + types2 "github.com/ledgerwatch/erigon/erigon-lib/types" "github.com/ledgerwatch/erigon/core/types" ) diff --git a/migrations/db_schema_version.go b/migrations/db_schema_version.go index b0cda4a41d4..bc4f54fd25a 100644 --- a/migrations/db_schema_version.go +++ b/migrations/db_schema_version.go @@ -3,8 +3,8 @@ package migrations import ( "context" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/common/datadir" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/log/v3" ) diff --git a/migrations/migrations.go b/migrations/migrations.go index d69e523bcf9..d16506ed680 100644 --- a/migrations/migrations.go +++ b/migrations/migrations.go @@ -6,10 +6,10 @@ import ( "fmt" "path/filepath" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/kv" "github.com/ledgerwatch/erigon/common" "github.com/ledgerwatch/erigon/core/rawdb" + "github.com/ledgerwatch/erigon/erigon-lib/common/datadir" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/erigon/eth/stagedsync/stages" "github.com/ledgerwatch/log/v3" "github.com/ugorji/go/codec" diff --git a/migrations/migrations_test.go b/migrations/migrations_test.go index b98799f0ee5..d2709668642 100644 --- a/migrations/migrations_test.go +++ b/migrations/migrations_test.go @@ -5,9 +5,9 @@ import ( "errors" "testing" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/memdb" + "github.com/ledgerwatch/erigon/erigon-lib/common/datadir" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/memdb" "github.com/ledgerwatch/erigon/eth/stagedsync/stages" "github.com/ledgerwatch/log/v3" "github.com/stretchr/testify/require" diff --git a/migrations/txs_begin_end.go b/migrations/txs_begin_end.go index bae1019f259..e06f4ab19ff 100644 --- a/migrations/txs_begin_end.go +++ b/migrations/txs_begin_end.go @@ -8,12 +8,12 @@ import ( "runtime" "time" - common2 "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/assert" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/kv" + common2 "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/assert" + "github.com/ledgerwatch/erigon/erigon-lib/common/datadir" + "github.com/ledgerwatch/erigon/erigon-lib/common/dbg" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/log/v3" "github.com/ledgerwatch/erigon/common" diff --git a/migrations/txs_begin_end_test.go b/migrations/txs_begin_end_test.go index 0ed8819ae9b..cb3061ced9d 100644 --- a/migrations/txs_begin_end_test.go +++ b/migrations/txs_begin_end_test.go @@ -8,11 +8,11 @@ import ( "testing" "time" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/common/u256" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/memdb" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/common/u256" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/memdb" "github.com/ledgerwatch/erigon/migrations" "github.com/ledgerwatch/log/v3" "github.com/stretchr/testify/require" diff --git a/migrations/txs_v3.go b/migrations/txs_v3.go index 6047585626d..216fc437c61 100644 --- a/migrations/txs_v3.go +++ b/migrations/txs_v3.go @@ -7,11 +7,11 @@ import ( "runtime" "time" - common2 "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/kv" + common2 "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/datadir" + "github.com/ledgerwatch/erigon/erigon-lib/common/dbg" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/log/v3" "github.com/ledgerwatch/erigon/common" diff --git a/migrations/txs_v3_test.go b/migrations/txs_v3_test.go index 50ac319f12a..5e885c27209 100644 --- a/migrations/txs_v3_test.go +++ b/migrations/txs_v3_test.go @@ -9,12 +9,12 @@ import ( "testing" "time" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/common/u256" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/memdb" "github.com/ledgerwatch/erigon/common/dbutils" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/common/u256" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/memdb" "github.com/ledgerwatch/erigon/migrations" "github.com/ledgerwatch/erigon/rlp" "github.com/ledgerwatch/log/v3" diff --git a/node/endpoints.go b/node/endpoints.go index 3855b6dc8d3..144cc33e3e4 100644 --- a/node/endpoints.go +++ b/node/endpoints.go @@ -23,7 +23,7 @@ import ( "net/http" "time" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/rpc" "github.com/ledgerwatch/erigon/rpc/rpccfg" "github.com/ledgerwatch/log/v3" diff --git a/node/node.go b/node/node.go index 60a12240f93..e48ff60935a 100644 --- a/node/node.go +++ b/node/node.go @@ -34,9 +34,9 @@ import ( "golang.org/x/sync/semaphore" "github.com/gofrs/flock" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/mdbx" - "github.com/ledgerwatch/erigon-lib/kv/memdb" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/mdbx" + "github.com/ledgerwatch/erigon/erigon-lib/kv/memdb" "github.com/ledgerwatch/erigon/migrations" "github.com/ledgerwatch/log/v3" ) diff --git a/node/node_test.go b/node/node_test.go index b2d8c7f2c40..6f63a61aec1 100644 --- a/node/node_test.go +++ b/node/node_test.go @@ -23,9 +23,9 @@ import ( "runtime" "testing" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/kv" "github.com/ledgerwatch/erigon/crypto" + "github.com/ledgerwatch/erigon/erigon-lib/common/datadir" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/erigon/node/nodecfg" "github.com/ledgerwatch/erigon/p2p" "github.com/ledgerwatch/log/v3" diff --git a/node/nodecfg/config.go b/node/nodecfg/config.go index 42e8e18a894..8c23e4c80a2 100644 --- a/node/nodecfg/config.go +++ b/node/nodecfg/config.go @@ -25,11 +25,11 @@ import ( "sync" "github.com/c2h5oh/datasize" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/kv" "github.com/ledgerwatch/erigon/cmd/rpcdaemon/cli/httpcfg" "github.com/ledgerwatch/erigon/common" "github.com/ledgerwatch/erigon/common/paths" + "github.com/ledgerwatch/erigon/erigon-lib/common/datadir" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/erigon/p2p" "github.com/ledgerwatch/erigon/p2p/enode" "github.com/ledgerwatch/erigon/rpc/rpccfg" diff --git a/node/nodecfg/config_test.go b/node/nodecfg/config_test.go index fe1e4d10a1a..f202f391890 100644 --- a/node/nodecfg/config_test.go +++ b/node/nodecfg/config_test.go @@ -22,7 +22,7 @@ import ( "runtime" "testing" - "github.com/ledgerwatch/erigon-lib/common/datadir" + "github.com/ledgerwatch/erigon/erigon-lib/common/datadir" node2 "github.com/ledgerwatch/erigon/node" "github.com/ledgerwatch/erigon/node/nodecfg" "github.com/ledgerwatch/log/v3" diff --git a/node/nodecfg/defaults.go b/node/nodecfg/defaults.go index 7ba748370f8..8b071e0d2c0 100644 --- a/node/nodecfg/defaults.go +++ b/node/nodecfg/defaults.go @@ -17,8 +17,8 @@ package nodecfg import ( - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/direct" + "github.com/ledgerwatch/erigon/erigon-lib/common/datadir" + "github.com/ledgerwatch/erigon/erigon-lib/direct" "github.com/ledgerwatch/erigon/common/paths" "github.com/ledgerwatch/erigon/p2p" diff --git a/node/rpcstack_test.go b/node/rpcstack_test.go index d9b4a643d07..2253b13dfb4 100644 --- a/node/rpcstack_test.go +++ b/node/rpcstack_test.go @@ -19,7 +19,6 @@ package node import ( "bytes" "fmt" - "github.com/ledgerwatch/erigon-lib/common" "io" "net/http" "net/url" @@ -27,6 +26,8 @@ import ( "strings" "testing" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/gorilla/websocket" "github.com/ledgerwatch/erigon/rpc" "github.com/ledgerwatch/erigon/rpc/rpccfg" diff --git a/p2p/discover/table.go b/p2p/discover/table.go index eaa79403447..89685273921 100644 --- a/p2p/discover/table.go +++ b/p2p/discover/table.go @@ -32,7 +32,7 @@ import ( "sync" "time" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/log/v3" "github.com/ledgerwatch/erigon/common/debug" diff --git a/p2p/discover/v5_udp.go b/p2p/discover/v5_udp.go index 686bd267879..577e38a3e1c 100644 --- a/p2p/discover/v5_udp.go +++ b/p2p/discover/v5_udp.go @@ -29,9 +29,9 @@ import ( "sync" "time" - common2 "github.com/ledgerwatch/erigon-lib/common/cmp" "github.com/ledgerwatch/erigon/common/debug" "github.com/ledgerwatch/erigon/common/mclock" + common2 "github.com/ledgerwatch/erigon/erigon-lib/common/cmp" "github.com/ledgerwatch/erigon/p2p/discover/v5wire" "github.com/ledgerwatch/erigon/p2p/enode" "github.com/ledgerwatch/erigon/p2p/enr" diff --git a/p2p/enode/nodedb.go b/p2p/enode/nodedb.go index 7879772e4c0..37882572790 100644 --- a/p2p/enode/nodedb.go +++ b/p2p/enode/nodedb.go @@ -29,9 +29,9 @@ import ( "time" "github.com/c2h5oh/datasize" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/mdbx" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/mdbx" "github.com/ledgerwatch/erigon/common" "github.com/ledgerwatch/erigon/rlp" diff --git a/params/bootnodes.go b/params/bootnodes.go index b224283b88d..199889c203d 100644 --- a/params/bootnodes.go +++ b/params/bootnodes.go @@ -17,7 +17,7 @@ package params import ( - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/params/networkname" ) diff --git a/params/config.go b/params/config.go index 851090f0238..1a839c3d810 100644 --- a/params/config.go +++ b/params/config.go @@ -23,8 +23,8 @@ import ( "math/big" "path" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/common/paths" "github.com/ledgerwatch/erigon/params/networkname" diff --git a/params/config_test.go b/params/config_test.go index b448a1526f4..e4c20496d8c 100644 --- a/params/config_test.go +++ b/params/config_test.go @@ -21,7 +21,7 @@ import ( "reflect" "testing" - "github.com/ledgerwatch/erigon-lib/chain" + "github.com/ledgerwatch/erigon/erigon-lib/chain" ) func TestCheckCompatible(t *testing.T) { diff --git a/params/dao.go b/params/dao.go index f98b425c799..828f3829f99 100644 --- a/params/dao.go +++ b/params/dao.go @@ -19,7 +19,7 @@ package params import ( "math/big" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/common" ) diff --git a/params/mining.go b/params/mining.go index d5e0d8cc868..96f450b7488 100644 --- a/params/mining.go +++ b/params/mining.go @@ -5,8 +5,8 @@ import ( "math/big" "time" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" ) // MiningConfig is the configuration parameters of mining. diff --git a/params/protocol_params.go b/params/protocol_params.go index ce20a1f39dd..cd7c286a7cb 100644 --- a/params/protocol_params.go +++ b/params/protocol_params.go @@ -19,7 +19,7 @@ package params import ( "math/big" - "github.com/ledgerwatch/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common" ) const ( diff --git a/params/version.go b/params/version.go index bdd7aeaa56d..5b635b6c311 100644 --- a/params/version.go +++ b/params/version.go @@ -19,7 +19,7 @@ package params import ( "fmt" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv" ) var ( diff --git a/rlp/encode.go b/rlp/encode.go index f43b71670d8..8dd5159d4ac 100644 --- a/rlp/encode.go +++ b/rlp/encode.go @@ -27,7 +27,7 @@ import ( "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" ) // https://github.com/ethereum/wiki/wiki/RLP diff --git a/rpc/client_test.go b/rpc/client_test.go index b504a9c3206..cbd7ebff9ac 100644 --- a/rpc/client_test.go +++ b/rpc/client_test.go @@ -30,7 +30,7 @@ import ( "time" "github.com/davecgh/go-spew/spew" - "github.com/ledgerwatch/erigon-lib/common/dbg" + "github.com/ledgerwatch/erigon/erigon-lib/common/dbg" "github.com/ledgerwatch/log/v3" ) diff --git a/rpc/service.go b/rpc/service.go index c2252194584..616f587d0d8 100644 --- a/rpc/service.go +++ b/rpc/service.go @@ -26,7 +26,7 @@ import ( "unicode" jsoniter "github.com/json-iterator/go" - "github.com/ledgerwatch/erigon-lib/common/dbg" + "github.com/ledgerwatch/erigon/erigon-lib/common/dbg" "github.com/ledgerwatch/log/v3" ) diff --git a/rpc/types.go b/rpc/types.go index 8ed915a21df..b8b40bc4dc7 100644 --- a/rpc/types.go +++ b/rpc/types.go @@ -25,7 +25,7 @@ import ( "strconv" "strings" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/common/hexutil" ) diff --git a/rpc/types_test.go b/rpc/types_test.go index 6c063d4bcbf..8777fb7b7bb 100644 --- a/rpc/types_test.go +++ b/rpc/types_test.go @@ -20,7 +20,7 @@ import ( "encoding/json" "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/common/math" ) diff --git a/spectest/util.go b/spectest/util.go index 598bd83444d..224915b7504 100644 --- a/spectest/util.go +++ b/spectest/util.go @@ -7,7 +7,7 @@ import ( "gopkg.in/yaml.v3" - "github.com/ledgerwatch/erigon-lib/types/ssz" + "github.com/ledgerwatch/erigon/erigon-lib/types/ssz" "github.com/ledgerwatch/erigon/cl/clparams" "github.com/ledgerwatch/erigon/cl/cltypes" diff --git a/tests/block_test_util.go b/tests/block_test_util.go index 11c6856aab0..c22d1c9b7a8 100644 --- a/tests/block_test_util.go +++ b/tests/block_test_util.go @@ -29,10 +29,10 @@ import ( "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/erigon/turbo/services" "github.com/ledgerwatch/erigon/turbo/stages/mock" diff --git a/tests/bor/helper/miner.go b/tests/bor/helper/miner.go index 14abe7adc5f..018bb4ba4a0 100644 --- a/tests/bor/helper/miner.go +++ b/tests/bor/helper/miner.go @@ -8,13 +8,13 @@ import ( "time" "github.com/c2h5oh/datasize" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/direct" - "github.com/ledgerwatch/erigon-lib/downloader/downloadercfg" - "github.com/ledgerwatch/erigon-lib/txpool/txpoolcfg" "github.com/ledgerwatch/erigon/cmd/utils" "github.com/ledgerwatch/erigon/core/types" "github.com/ledgerwatch/erigon/crypto" + "github.com/ledgerwatch/erigon/erigon-lib/common/datadir" + "github.com/ledgerwatch/erigon/erigon-lib/direct" + "github.com/ledgerwatch/erigon/erigon-lib/downloader/downloadercfg" + "github.com/ledgerwatch/erigon/erigon-lib/txpool/txpoolcfg" "github.com/ledgerwatch/erigon/eth" "github.com/ledgerwatch/erigon/eth/ethconfig" "github.com/ledgerwatch/erigon/node" diff --git a/tests/bor/mining_test.go b/tests/bor/mining_test.go index 511d384170b..5808298a0cd 100644 --- a/tests/bor/mining_test.go +++ b/tests/bor/mining_test.go @@ -23,11 +23,11 @@ import ( "github.com/ledgerwatch/erigon/tests/bor/helper" "github.com/ledgerwatch/log/v3" - "github.com/ledgerwatch/erigon-lib/gointerfaces" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces" - "github.com/ledgerwatch/erigon-lib/gointerfaces/remote" - "github.com/ledgerwatch/erigon-lib/gointerfaces/txpool" - txpool_proto "github.com/ledgerwatch/erigon-lib/gointerfaces/txpool" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/remote" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/txpool" + txpool_proto "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/txpool" ) const ( diff --git a/tests/contracts/gen_selfDestructor.go b/tests/contracts/gen_selfDestructor.go index 77149f59f12..68b8d9c7f0d 100644 --- a/tests/contracts/gen_selfDestructor.go +++ b/tests/contracts/gen_selfDestructor.go @@ -7,7 +7,7 @@ import ( "math/big" "strings" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" ethereum "github.com/ledgerwatch/erigon" "github.com/ledgerwatch/erigon/accounts/abi" diff --git a/tests/contracts/gen_testcontract.go b/tests/contracts/gen_testcontract.go index ac88800a0ff..d731a15f777 100644 --- a/tests/contracts/gen_testcontract.go +++ b/tests/contracts/gen_testcontract.go @@ -7,7 +7,7 @@ import ( "math/big" "strings" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" ethereum "github.com/ledgerwatch/erigon" "github.com/ledgerwatch/erigon/accounts/abi" diff --git a/tests/difficulty_test_util.go b/tests/difficulty_test_util.go index 26d695cd74c..5abece30bb3 100644 --- a/tests/difficulty_test_util.go +++ b/tests/difficulty_test_util.go @@ -20,8 +20,8 @@ import ( "fmt" "math/big" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/common/math" "github.com/ledgerwatch/erigon/consensus/ethash" diff --git a/tests/fuzzers/bls12381/precompile_fuzzer.go b/tests/fuzzers/bls12381/precompile_fuzzer.go index 74c8c5954c2..75a0f790236 100644 --- a/tests/fuzzers/bls12381/precompile_fuzzer.go +++ b/tests/fuzzers/bls12381/precompile_fuzzer.go @@ -20,7 +20,7 @@ import ( "bytes" "fmt" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/core/vm" ) diff --git a/tests/fuzzers/difficulty/difficulty-fuzz.go b/tests/fuzzers/difficulty/difficulty-fuzz.go index 69e7222c488..6fc22f789f2 100644 --- a/tests/fuzzers/difficulty/difficulty-fuzz.go +++ b/tests/fuzzers/difficulty/difficulty-fuzz.go @@ -23,7 +23,7 @@ import ( "io" "math/big" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/consensus/ethash" "github.com/ledgerwatch/erigon/core/types" diff --git a/tests/gen_btheader.go b/tests/gen_btheader.go index 521f77eb667..b121cce0a41 100644 --- a/tests/gen_btheader.go +++ b/tests/gen_btheader.go @@ -6,8 +6,8 @@ import ( "encoding/json" "math/big" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" "github.com/ledgerwatch/erigon/common/math" "github.com/ledgerwatch/erigon/core/types" diff --git a/tests/gen_stenv.go b/tests/gen_stenv.go index c35997528b9..51c830e61bd 100644 --- a/tests/gen_stenv.go +++ b/tests/gen_stenv.go @@ -7,7 +7,7 @@ import ( "errors" "math/big" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/common" "github.com/ledgerwatch/erigon/common/math" diff --git a/tests/init.go b/tests/init.go index 6629cbb2d5d..517137c1240 100644 --- a/tests/init.go +++ b/tests/init.go @@ -21,7 +21,7 @@ import ( "math/big" "sort" - "github.com/ledgerwatch/erigon-lib/chain" + "github.com/ledgerwatch/erigon/erigon-lib/chain" ) // Forks table defines supported forks and their chain config. diff --git a/tests/init_test.go b/tests/init_test.go index 36ad4118285..9cfbb1a8f12 100644 --- a/tests/init_test.go +++ b/tests/init_test.go @@ -28,7 +28,7 @@ import ( "strings" "testing" - "github.com/ledgerwatch/erigon-lib/chain" + "github.com/ledgerwatch/erigon/erigon-lib/chain" "golang.org/x/exp/slices" ) diff --git a/tests/state_test.go b/tests/state_test.go index e90f4513201..a75d807380d 100644 --- a/tests/state_test.go +++ b/tests/state_test.go @@ -27,7 +27,7 @@ import ( "runtime" "testing" - "github.com/ledgerwatch/erigon-lib/common/datadir" + "github.com/ledgerwatch/erigon/erigon-lib/common/datadir" "github.com/ledgerwatch/log/v3" "github.com/ledgerwatch/erigon/core/state/temporal" diff --git a/tests/state_test_util.go b/tests/state_test_util.go index 119f30b6fc1..7e57fe2f4e6 100644 --- a/tests/state_test_util.go +++ b/tests/state_test_util.go @@ -28,13 +28,13 @@ import ( "github.com/holiman/uint256" "golang.org/x/crypto/sha3" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/fixedgas" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/kv" - types2 "github.com/ledgerwatch/erigon-lib/types" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/fixedgas" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + types2 "github.com/ledgerwatch/erigon/erigon-lib/types" "github.com/ledgerwatch/erigon/common" "github.com/ledgerwatch/erigon/common/math" diff --git a/tests/statedb_chain_test.go b/tests/statedb_chain_test.go index 1334199e299..fbce82574eb 100644 --- a/tests/statedb_chain_test.go +++ b/tests/statedb_chain_test.go @@ -22,8 +22,8 @@ import ( "testing" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/stretchr/testify/require" "github.com/ledgerwatch/erigon/accounts/abi/bind" diff --git a/tests/statedb_insert_chain_transaction_test.go b/tests/statedb_insert_chain_transaction_test.go index 1f8bc4ff7ac..2179340e4f4 100644 --- a/tests/statedb_insert_chain_transaction_test.go +++ b/tests/statedb_insert_chain_transaction_test.go @@ -8,9 +8,9 @@ import ( "testing" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/stretchr/testify/require" "github.com/ledgerwatch/erigon/turbo/stages/mock" diff --git a/tests/transaction_test_util.go b/tests/transaction_test_util.go index 6551c43d734..98c53577216 100644 --- a/tests/transaction_test_util.go +++ b/tests/transaction_test_util.go @@ -23,9 +23,9 @@ import ( "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" "github.com/ledgerwatch/erigon/common/math" "github.com/ledgerwatch/erigon/core" diff --git a/turbo/adapter/ethapi/api.go b/turbo/adapter/ethapi/api.go index c11dd3c98b0..cf621f9ab93 100644 --- a/turbo/adapter/ethapi/api.go +++ b/turbo/adapter/ethapi/api.go @@ -22,9 +22,9 @@ import ( "math/big" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - types2 "github.com/ledgerwatch/erigon-lib/types" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" + types2 "github.com/ledgerwatch/erigon/erigon-lib/types" "github.com/ledgerwatch/log/v3" "github.com/ledgerwatch/erigon/accounts/abi" diff --git a/turbo/adapter/ethapi/get_proof.go b/turbo/adapter/ethapi/get_proof.go index 49832b7f910..7192dbdffd9 100644 --- a/turbo/adapter/ethapi/get_proof.go +++ b/turbo/adapter/ethapi/get_proof.go @@ -3,8 +3,8 @@ package ethapi import ( "bytes" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" "github.com/ledgerwatch/erigon/common/hexutil" "github.com/ledgerwatch/erigon/core/types/accounts" diff --git a/turbo/adapter/ethapi/internal.go b/turbo/adapter/ethapi/internal.go index 67e985ade1e..0490a0341bf 100644 --- a/turbo/adapter/ethapi/internal.go +++ b/turbo/adapter/ethapi/internal.go @@ -2,7 +2,7 @@ package ethapi // This file stores proxy-objects for `internal` package import ( - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/core/types" ) diff --git a/turbo/adapter/ethapi/state_overrides.go b/turbo/adapter/ethapi/state_overrides.go index 1ce2655acad..cbbbea62e69 100644 --- a/turbo/adapter/ethapi/state_overrides.go +++ b/turbo/adapter/ethapi/state_overrides.go @@ -5,7 +5,7 @@ import ( "math/big" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/core/state" ) diff --git a/turbo/app/backup_cmd.go b/turbo/app/backup_cmd.go index dc7aecda097..fb6cf2b31c4 100644 --- a/turbo/app/backup_cmd.go +++ b/turbo/app/backup_cmd.go @@ -2,16 +2,17 @@ package app import ( "fmt" - "github.com/ledgerwatch/erigon-lib/common" "os" "path/filepath" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/c2h5oh/datasize" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/common/dir" - "github.com/ledgerwatch/erigon-lib/kv" "github.com/ledgerwatch/erigon/cmd/utils" "github.com/ledgerwatch/erigon/cmd/utils/flags" + "github.com/ledgerwatch/erigon/erigon-lib/common/datadir" + "github.com/ledgerwatch/erigon/erigon-lib/common/dir" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/erigon/turbo/backup" "github.com/ledgerwatch/erigon/turbo/debug" "github.com/urfave/cli/v2" diff --git a/turbo/app/import_cmd.go b/turbo/app/import_cmd.go index d948e456254..9154c9fc29c 100644 --- a/turbo/app/import_cmd.go +++ b/turbo/app/import_cmd.go @@ -11,7 +11,7 @@ import ( "strings" "syscall" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/erigon/turbo/services" "github.com/ledgerwatch/log/v3" "github.com/urfave/cli/v2" diff --git a/turbo/app/init_cmd.go b/turbo/app/init_cmd.go index ed4c01ac898..e33c9d7b6c7 100644 --- a/turbo/app/init_cmd.go +++ b/turbo/app/init_cmd.go @@ -9,9 +9,9 @@ import ( "github.com/ledgerwatch/log/v3" "github.com/urfave/cli/v2" - "github.com/ledgerwatch/erigon-lib/kv" "github.com/ledgerwatch/erigon/cmd/utils" "github.com/ledgerwatch/erigon/core" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/erigon/node" ) diff --git a/turbo/app/make_app.go b/turbo/app/make_app.go index de25969d4e9..d2f844a6665 100644 --- a/turbo/app/make_app.go +++ b/turbo/app/make_app.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - "github.com/ledgerwatch/erigon-lib/common/datadir" + "github.com/ledgerwatch/erigon/erigon-lib/common/datadir" "github.com/ledgerwatch/erigon/turbo/logging" "github.com/ledgerwatch/log/v3" "github.com/urfave/cli/v2" diff --git a/turbo/app/snapshots_cmd.go b/turbo/app/snapshots_cmd.go index 260cead9ad5..295bcb0f542 100644 --- a/turbo/app/snapshots_cmd.go +++ b/turbo/app/snapshots_cmd.go @@ -16,17 +16,17 @@ import ( "github.com/ledgerwatch/log/v3" "github.com/urfave/cli/v2" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/common/dir" - "github.com/ledgerwatch/erigon-lib/compress" - "github.com/ledgerwatch/erigon-lib/downloader/snaptype" - "github.com/ledgerwatch/erigon-lib/etl" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/kvcfg" - "github.com/ledgerwatch/erigon-lib/kv/mdbx" - "github.com/ledgerwatch/erigon-lib/kv/rawdbv3" - libstate "github.com/ledgerwatch/erigon-lib/state" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/datadir" + "github.com/ledgerwatch/erigon/erigon-lib/common/dir" + "github.com/ledgerwatch/erigon/erigon-lib/compress" + "github.com/ledgerwatch/erigon/erigon-lib/downloader/snaptype" + "github.com/ledgerwatch/erigon/erigon-lib/etl" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/kvcfg" + "github.com/ledgerwatch/erigon/erigon-lib/kv/mdbx" + "github.com/ledgerwatch/erigon/erigon-lib/kv/rawdbv3" + libstate "github.com/ledgerwatch/erigon/erigon-lib/state" "github.com/ledgerwatch/erigon/cmd/hack/tool/fromdb" "github.com/ledgerwatch/erigon/cmd/utils" diff --git a/turbo/backup/backup.go b/turbo/backup/backup.go index a861232962e..40b758944b8 100644 --- a/turbo/backup/backup.go +++ b/turbo/backup/backup.go @@ -12,10 +12,10 @@ import ( "github.com/c2h5oh/datasize" "github.com/erigontech/mdbx-go/mdbx" - common2 "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/kv" - mdbx2 "github.com/ledgerwatch/erigon-lib/kv/mdbx" + common2 "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/dbg" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + mdbx2 "github.com/ledgerwatch/erigon/erigon-lib/kv/mdbx" "github.com/ledgerwatch/log/v3" "golang.org/x/exp/maps" "golang.org/x/sync/errgroup" diff --git a/turbo/cli/flags.go b/turbo/cli/flags.go index 471e891e928..974e32d2e17 100644 --- a/turbo/cli/flags.go +++ b/turbo/cli/flags.go @@ -4,16 +4,16 @@ import ( "fmt" "time" - "github.com/ledgerwatch/erigon-lib/txpool/txpoolcfg" + "github.com/ledgerwatch/erigon/erigon-lib/txpool/txpoolcfg" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/rpc/rpccfg" "github.com/c2h5oh/datasize" - "github.com/ledgerwatch/erigon-lib/etl" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/kvcache" + "github.com/ledgerwatch/erigon/erigon-lib/etl" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/kvcache" "github.com/ledgerwatch/log/v3" "github.com/spf13/pflag" "github.com/urfave/cli/v2" diff --git a/turbo/debug/api.go b/turbo/debug/api.go index cb74109489f..d8936fc6b3e 100644 --- a/turbo/debug/api.go +++ b/turbo/debug/api.go @@ -34,7 +34,7 @@ import ( "sync" "time" - "github.com/ledgerwatch/erigon-lib/common/dbg" + "github.com/ledgerwatch/erigon/erigon-lib/common/dbg" "github.com/ledgerwatch/log/v3" ) diff --git a/turbo/engineapi/engine_block_downloader/block_downloader.go b/turbo/engineapi/engine_block_downloader/block_downloader.go index b14f52e9abf..b715f82e2b9 100644 --- a/turbo/engineapi/engine_block_downloader/block_downloader.go +++ b/turbo/engineapi/engine_block_downloader/block_downloader.go @@ -12,14 +12,14 @@ import ( "github.com/ledgerwatch/log/v3" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/etl" - "github.com/ledgerwatch/erigon-lib/gointerfaces/execution" - "github.com/ledgerwatch/erigon-lib/kv" "github.com/ledgerwatch/erigon/common/dbutils" "github.com/ledgerwatch/erigon/core/rawdb" "github.com/ledgerwatch/erigon/core/types" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/etl" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/execution" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/erigon/rlp" "github.com/ledgerwatch/erigon/turbo/adapter" "github.com/ledgerwatch/erigon/turbo/execution/eth1/eth1_chain_reader.go" diff --git a/turbo/engineapi/engine_block_downloader/body.go b/turbo/engineapi/engine_block_downloader/body.go index 0ca0daa2890..67388a58cba 100644 --- a/turbo/engineapi/engine_block_downloader/body.go +++ b/turbo/engineapi/engine_block_downloader/body.go @@ -5,11 +5,11 @@ import ( "runtime" "time" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/kv" "github.com/ledgerwatch/erigon/core/rawdb" "github.com/ledgerwatch/erigon/dataflow" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/dbg" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/erigon/eth/stagedsync/stages" "github.com/ledgerwatch/erigon/turbo/stages/bodydownload" "github.com/ledgerwatch/log/v3" diff --git a/turbo/engineapi/engine_block_downloader/core.go b/turbo/engineapi/engine_block_downloader/core.go index f0965787d0b..700eebda97c 100644 --- a/turbo/engineapi/engine_block_downloader/core.go +++ b/turbo/engineapi/engine_block_downloader/core.go @@ -1,11 +1,11 @@ package engine_block_downloader import ( - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/gointerfaces/execution" - "github.com/ledgerwatch/erigon-lib/kv/mdbx" - "github.com/ledgerwatch/erigon-lib/kv/memdb" "github.com/ledgerwatch/erigon/core/types" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/execution" + "github.com/ledgerwatch/erigon/erigon-lib/kv/mdbx" + "github.com/ledgerwatch/erigon/erigon-lib/kv/memdb" "github.com/ledgerwatch/erigon/turbo/stages/headerdownload" ) diff --git a/turbo/engineapi/engine_helpers/fork_validator.go b/turbo/engineapi/engine_helpers/fork_validator.go index 2f5a6038831..068d946209b 100644 --- a/turbo/engineapi/engine_helpers/fork_validator.go +++ b/turbo/engineapi/engine_helpers/fork_validator.go @@ -19,11 +19,11 @@ import ( "fmt" "sync" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/memdb" "github.com/ledgerwatch/erigon/cl/phase1/core/state/lru" "github.com/ledgerwatch/erigon/consensus" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/memdb" "github.com/ledgerwatch/erigon/eth/stagedsync/stages" "github.com/ledgerwatch/erigon/turbo/engineapi/engine_types" "github.com/ledgerwatch/erigon/turbo/services" diff --git a/turbo/engineapi/engine_server.go b/turbo/engineapi/engine_server.go index 15778f33266..c740a206a85 100644 --- a/turbo/engineapi/engine_server.go +++ b/turbo/engineapi/engine_server.go @@ -10,16 +10,16 @@ import ( "sync" "time" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - "github.com/ledgerwatch/erigon-lib/kv" - libstate "github.com/ledgerwatch/erigon-lib/state" - - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/gointerfaces/execution" - "github.com/ledgerwatch/erigon-lib/gointerfaces/txpool" - "github.com/ledgerwatch/erigon-lib/kv/kvcache" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + libstate "github.com/ledgerwatch/erigon/erigon-lib/state" + + "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/execution" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/txpool" + "github.com/ledgerwatch/erigon/erigon-lib/kv/kvcache" "github.com/ledgerwatch/log/v3" "github.com/ledgerwatch/erigon/cl/clparams" diff --git a/turbo/engineapi/engine_types/jsonrpc.go b/turbo/engineapi/engine_types/jsonrpc.go index 0d5d9f13f1f..f9909762a55 100644 --- a/turbo/engineapi/engine_types/jsonrpc.go +++ b/turbo/engineapi/engine_types/jsonrpc.go @@ -5,13 +5,13 @@ import ( "encoding/json" "errors" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - "github.com/ledgerwatch/erigon-lib/gointerfaces/execution" - types2 "github.com/ledgerwatch/erigon-lib/gointerfaces/types" "github.com/ledgerwatch/erigon/common/hexutil" "github.com/ledgerwatch/erigon/core/types" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/execution" + types2 "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/types" ) // ExecutionPayload represents an execution payload (aka block) diff --git a/turbo/engineapi/interface.go b/turbo/engineapi/interface.go index a4d613171c2..bb46e55152f 100644 --- a/turbo/engineapi/interface.go +++ b/turbo/engineapi/interface.go @@ -3,9 +3,9 @@ package engineapi import ( "context" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" "github.com/ledgerwatch/erigon/common/hexutil" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" "github.com/ledgerwatch/erigon/turbo/engineapi/engine_types" ) diff --git a/turbo/execution/eth1/block_building.go b/turbo/execution/eth1/block_building.go index 609cb794acf..7d0c6142faa 100644 --- a/turbo/execution/eth1/block_building.go +++ b/turbo/execution/eth1/block_building.go @@ -7,10 +7,10 @@ import ( "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - "github.com/ledgerwatch/erigon-lib/gointerfaces/execution" - types2 "github.com/ledgerwatch/erigon-lib/gointerfaces/types" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/execution" + types2 "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/types" "github.com/ledgerwatch/erigon/common" "github.com/ledgerwatch/erigon/core" diff --git a/turbo/execution/eth1/eth1_chain_reader.go/chain_reader.go b/turbo/execution/eth1/eth1_chain_reader.go/chain_reader.go index 15324177108..2e09c3588c3 100644 --- a/turbo/execution/eth1/eth1_chain_reader.go/chain_reader.go +++ b/turbo/execution/eth1/eth1_chain_reader.go/chain_reader.go @@ -6,12 +6,12 @@ import ( "math/big" "time" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - "github.com/ledgerwatch/erigon-lib/gointerfaces/execution" - types2 "github.com/ledgerwatch/erigon-lib/gointerfaces/types" "github.com/ledgerwatch/erigon/core/types" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/execution" + types2 "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/types" "github.com/ledgerwatch/erigon/turbo/execution/eth1/eth1_utils" "github.com/ledgerwatch/log/v3" "google.golang.org/protobuf/types/known/emptypb" diff --git a/turbo/execution/eth1/eth1_utils/grpc.go b/turbo/execution/eth1/eth1_utils/grpc.go index 692e0755392..05b861ca585 100644 --- a/turbo/execution/eth1/eth1_utils/grpc.go +++ b/turbo/execution/eth1/eth1_utils/grpc.go @@ -6,11 +6,11 @@ import ( "math/big" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - "github.com/ledgerwatch/erigon-lib/gointerfaces/execution" - types2 "github.com/ledgerwatch/erigon-lib/gointerfaces/types" "github.com/ledgerwatch/erigon/core/types" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/execution" + types2 "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/types" ) func HeaderToHeaderRPC(header *types.Header) *execution.Header { diff --git a/turbo/execution/eth1/ethereum_execution.go b/turbo/execution/eth1/ethereum_execution.go index 8b42f4227ac..695904938b3 100644 --- a/turbo/execution/eth1/ethereum_execution.go +++ b/turbo/execution/eth1/ethereum_execution.go @@ -4,19 +4,19 @@ import ( "context" "math/big" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - "github.com/ledgerwatch/erigon-lib/gointerfaces/execution" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/execution" "github.com/ledgerwatch/log/v3" "golang.org/x/sync/semaphore" "google.golang.org/protobuf/types/known/emptypb" - "github.com/ledgerwatch/erigon-lib/kv" "github.com/ledgerwatch/erigon/common/math" "github.com/ledgerwatch/erigon/core" "github.com/ledgerwatch/erigon/core/rawdb" "github.com/ledgerwatch/erigon/core/types" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/erigon/eth/stagedsync" "github.com/ledgerwatch/erigon/turbo/builder" "github.com/ledgerwatch/erigon/turbo/engineapi/engine_helpers" diff --git a/turbo/execution/eth1/forkchoice.go b/turbo/execution/eth1/forkchoice.go index 47e338dc562..1180449f59c 100644 --- a/turbo/execution/eth1/forkchoice.go +++ b/turbo/execution/eth1/forkchoice.go @@ -5,12 +5,12 @@ import ( "fmt" "time" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - "github.com/ledgerwatch/erigon-lib/gointerfaces/execution" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/rawdbv3" "github.com/ledgerwatch/erigon/core/rawdb" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/execution" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/rawdbv3" "github.com/ledgerwatch/erigon/eth/stagedsync/stages" ) diff --git a/turbo/execution/eth1/getters.go b/turbo/execution/eth1/getters.go index c1a870cbe9f..12f0e96f36a 100644 --- a/turbo/execution/eth1/getters.go +++ b/turbo/execution/eth1/getters.go @@ -5,13 +5,13 @@ import ( "errors" "fmt" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - "github.com/ledgerwatch/erigon-lib/kv" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "google.golang.org/protobuf/types/known/emptypb" - "github.com/ledgerwatch/erigon-lib/gointerfaces/execution" - types2 "github.com/ledgerwatch/erigon-lib/gointerfaces/types" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/execution" + types2 "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/types" "github.com/ledgerwatch/erigon/core/rawdb" "github.com/ledgerwatch/erigon/turbo/execution/eth1/eth1_utils" diff --git a/turbo/execution/eth1/inserters.go b/turbo/execution/eth1/inserters.go index efb18065803..a5719f9cee0 100644 --- a/turbo/execution/eth1/inserters.go +++ b/turbo/execution/eth1/inserters.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/ledgerwatch/erigon-lib/gointerfaces/execution" "github.com/ledgerwatch/erigon/core/rawdb" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/execution" "github.com/ledgerwatch/erigon/turbo/execution/eth1/eth1_utils" ) diff --git a/turbo/jsonrpc/admin_api.go b/turbo/jsonrpc/admin_api.go index 29252ea8863..d53ab94e0a0 100644 --- a/turbo/jsonrpc/admin_api.go +++ b/turbo/jsonrpc/admin_api.go @@ -5,7 +5,7 @@ import ( "errors" "fmt" - "github.com/ledgerwatch/erigon-lib/gointerfaces/remote" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/remote" "github.com/ledgerwatch/erigon/p2p" "github.com/ledgerwatch/erigon/turbo/rpchelper" diff --git a/turbo/jsonrpc/bor_api.go b/turbo/jsonrpc/bor_api.go index a21de629979..fced9d5d8dd 100644 --- a/turbo/jsonrpc/bor_api.go +++ b/turbo/jsonrpc/bor_api.go @@ -1,8 +1,8 @@ package jsonrpc import ( - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/erigon/consensus/bor/valset" "github.com/ledgerwatch/erigon/rpc" diff --git a/turbo/jsonrpc/bor_helper.go b/turbo/jsonrpc/bor_helper.go index 31f2bdc7607..e522fd0fa57 100644 --- a/turbo/jsonrpc/bor_helper.go +++ b/turbo/jsonrpc/bor_helper.go @@ -7,9 +7,9 @@ import ( "fmt" "sort" - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/erigon/consensus/bor" "github.com/ledgerwatch/erigon/consensus/bor/valset" diff --git a/turbo/jsonrpc/bor_snapshot.go b/turbo/jsonrpc/bor_snapshot.go index b17051ed248..164eef0b45f 100644 --- a/turbo/jsonrpc/bor_snapshot.go +++ b/turbo/jsonrpc/bor_snapshot.go @@ -8,9 +8,9 @@ import ( "fmt" "math/big" - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/log/v3" "github.com/xsleonard/go-merkle" "golang.org/x/crypto/sha3" diff --git a/turbo/jsonrpc/call_traces_test.go b/turbo/jsonrpc/call_traces_test.go index fe831a8188c..7f86bc86226 100644 --- a/turbo/jsonrpc/call_traces_test.go +++ b/turbo/jsonrpc/call_traces_test.go @@ -7,7 +7,7 @@ import ( "github.com/holiman/uint256" jsoniter "github.com/json-iterator/go" - "github.com/ledgerwatch/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/valyala/fastjson" diff --git a/turbo/jsonrpc/contracts/gen_poly.go b/turbo/jsonrpc/contracts/gen_poly.go index f2749850fa9..9aea4550029 100644 --- a/turbo/jsonrpc/contracts/gen_poly.go +++ b/turbo/jsonrpc/contracts/gen_poly.go @@ -7,7 +7,7 @@ import ( "math/big" "strings" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" ethereum "github.com/ledgerwatch/erigon" "github.com/ledgerwatch/erigon/accounts/abi" diff --git a/turbo/jsonrpc/contracts/gen_token.go b/turbo/jsonrpc/contracts/gen_token.go index 3973e6d0e62..ffc21803071 100644 --- a/turbo/jsonrpc/contracts/gen_token.go +++ b/turbo/jsonrpc/contracts/gen_token.go @@ -7,7 +7,7 @@ import ( "math/big" "strings" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" ethereum "github.com/ledgerwatch/erigon" "github.com/ledgerwatch/erigon/accounts/abi" diff --git a/turbo/jsonrpc/corner_cases_support_test.go b/turbo/jsonrpc/corner_cases_support_test.go index 4c259b1a258..93e21be345a 100644 --- a/turbo/jsonrpc/corner_cases_support_test.go +++ b/turbo/jsonrpc/corner_cases_support_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/ledgerwatch/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/stretchr/testify/require" "github.com/ledgerwatch/erigon/cmd/rpcdaemon/rpcdaemontest" diff --git a/turbo/jsonrpc/daemon.go b/turbo/jsonrpc/daemon.go index e69ce1cd7ad..9e232c25214 100644 --- a/turbo/jsonrpc/daemon.go +++ b/turbo/jsonrpc/daemon.go @@ -1,13 +1,13 @@ package jsonrpc import ( - "github.com/ledgerwatch/erigon-lib/gointerfaces/txpool" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/kvcache" - libstate "github.com/ledgerwatch/erigon-lib/state" "github.com/ledgerwatch/erigon/cmd/rpcdaemon/cli/httpcfg" "github.com/ledgerwatch/erigon/consensus" "github.com/ledgerwatch/erigon/consensus/clique" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/txpool" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/kvcache" + libstate "github.com/ledgerwatch/erigon/erigon-lib/state" "github.com/ledgerwatch/erigon/rpc" "github.com/ledgerwatch/erigon/turbo/rpchelper" "github.com/ledgerwatch/erigon/turbo/services" diff --git a/turbo/jsonrpc/db_api_deprecated.go b/turbo/jsonrpc/db_api_deprecated.go index 1a11d93abd6..bd522ef6702 100644 --- a/turbo/jsonrpc/db_api_deprecated.go +++ b/turbo/jsonrpc/db_api_deprecated.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/ledgerwatch/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" ) // DBAPI the interface for the db_ RPC commands (deprecated) diff --git a/turbo/jsonrpc/debug_api.go b/turbo/jsonrpc/debug_api.go index ab91c40a0a8..1e5f0a349ab 100644 --- a/turbo/jsonrpc/debug_api.go +++ b/turbo/jsonrpc/debug_api.go @@ -5,11 +5,11 @@ import ( "fmt" jsoniter "github.com/json-iterator/go" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/order" - "github.com/ledgerwatch/erigon-lib/kv/rawdbv3" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/order" + "github.com/ledgerwatch/erigon/erigon-lib/kv/rawdbv3" "github.com/ledgerwatch/erigon/common/changeset" "github.com/ledgerwatch/erigon/common/hexutil" diff --git a/turbo/jsonrpc/debug_api_test.go b/turbo/jsonrpc/debug_api_test.go index e25f6b102a8..2471f97d91d 100644 --- a/turbo/jsonrpc/debug_api_test.go +++ b/turbo/jsonrpc/debug_api_test.go @@ -8,14 +8,14 @@ import ( "github.com/davecgh/go-spew/spew" jsoniter "github.com/json-iterator/go" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/iter" - "github.com/ledgerwatch/erigon-lib/kv/kvcache" - "github.com/ledgerwatch/erigon-lib/kv/order" "github.com/ledgerwatch/erigon/cmd/rpcdaemon/rpcdaemontest" common2 "github.com/ledgerwatch/erigon/common" "github.com/ledgerwatch/erigon/core/types" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/iter" + "github.com/ledgerwatch/erigon/erigon-lib/kv/kvcache" + "github.com/ledgerwatch/erigon/erigon-lib/kv/order" "github.com/ledgerwatch/erigon/eth/tracers" "github.com/ledgerwatch/erigon/rpc" "github.com/ledgerwatch/erigon/rpc/rpccfg" diff --git a/turbo/jsonrpc/erigon_api.go b/turbo/jsonrpc/erigon_api.go index 50a40848eec..ef68673c3c3 100644 --- a/turbo/jsonrpc/erigon_api.go +++ b/turbo/jsonrpc/erigon_api.go @@ -3,12 +3,12 @@ package jsonrpc import ( "context" - "github.com/ledgerwatch/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/eth/filters" ethFilters "github.com/ledgerwatch/erigon/eth/filters" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/erigon/common/hexutil" "github.com/ledgerwatch/erigon/core/types" diff --git a/turbo/jsonrpc/erigon_block.go b/turbo/jsonrpc/erigon_block.go index d61069bad63..f1439195d2a 100644 --- a/turbo/jsonrpc/erigon_block.go +++ b/turbo/jsonrpc/erigon_block.go @@ -8,12 +8,12 @@ import ( "sort" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/order" - "github.com/ledgerwatch/erigon-lib/kv/rawdbv3" - "github.com/ledgerwatch/erigon-lib/kv/temporal/historyv2" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/order" + "github.com/ledgerwatch/erigon/erigon-lib/kv/rawdbv3" + "github.com/ledgerwatch/erigon/erigon-lib/kv/temporal/historyv2" "github.com/ledgerwatch/erigon/turbo/services" "github.com/ledgerwatch/erigon/common/hexutil" diff --git a/turbo/jsonrpc/erigon_cache_check.go b/turbo/jsonrpc/erigon_cache_check.go index 903ca3c949d..6fb76794cc0 100644 --- a/turbo/jsonrpc/erigon_cache_check.go +++ b/turbo/jsonrpc/erigon_cache_check.go @@ -3,7 +3,7 @@ package jsonrpc import ( "context" - "github.com/ledgerwatch/erigon-lib/kv/kvcache" + "github.com/ledgerwatch/erigon/erigon-lib/kv/kvcache" ) func (api *ErigonImpl) CacheCheck() (*kvcache.CacheValidationResult, error) { diff --git a/turbo/jsonrpc/erigon_receipts.go b/turbo/jsonrpc/erigon_receipts.go index 3e35ce7db85..edfab13071b 100644 --- a/turbo/jsonrpc/erigon_receipts.go +++ b/turbo/jsonrpc/erigon_receipts.go @@ -7,10 +7,10 @@ import ( "fmt" "github.com/RoaringBitmap/roaring" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/bitmapdb" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/bitmapdb" "github.com/ledgerwatch/erigon/core/rawdb" "github.com/ledgerwatch/erigon/core/types" diff --git a/turbo/jsonrpc/erigon_receipts_test.go b/turbo/jsonrpc/erigon_receipts_test.go index 71e15c1e958..783d38a44aa 100644 --- a/turbo/jsonrpc/erigon_receipts_test.go +++ b/turbo/jsonrpc/erigon_receipts_test.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/turbo/jsonrpc/erigon_system.go b/turbo/jsonrpc/erigon_system.go index b9b20085926..db553e7e16d 100644 --- a/turbo/jsonrpc/erigon_system.go +++ b/turbo/jsonrpc/erigon_system.go @@ -4,7 +4,7 @@ import ( "context" "errors" - "github.com/ledgerwatch/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/common/hexutil" "github.com/ledgerwatch/erigon/core/forkid" diff --git a/turbo/jsonrpc/eth_accounts.go b/turbo/jsonrpc/eth_accounts.go index 8653a2c6280..3fb4ae7c9c5 100644 --- a/turbo/jsonrpc/eth_accounts.go +++ b/turbo/jsonrpc/eth_accounts.go @@ -5,14 +5,14 @@ import ( "fmt" "math/big" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/gointerfaces" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces" "google.golang.org/grpc" "github.com/ledgerwatch/erigon/turbo/rpchelper" - txpool_proto "github.com/ledgerwatch/erigon-lib/gointerfaces/txpool" + txpool_proto "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/txpool" "github.com/ledgerwatch/erigon/common" "github.com/ledgerwatch/erigon/common/hexutil" diff --git a/turbo/jsonrpc/eth_api.go b/turbo/jsonrpc/eth_api.go index 518918e19bf..e3fa06a6b3d 100644 --- a/turbo/jsonrpc/eth_api.go +++ b/turbo/jsonrpc/eth_api.go @@ -13,16 +13,16 @@ import ( "github.com/holiman/uint256" "github.com/ledgerwatch/log/v3" - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/gointerfaces/txpool" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/kvcache" - "github.com/ledgerwatch/erigon-lib/kv/kvcfg" - libstate "github.com/ledgerwatch/erigon-lib/state" - types2 "github.com/ledgerwatch/erigon-lib/types" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/datadir" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/txpool" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/kvcache" + "github.com/ledgerwatch/erigon/erigon-lib/kv/kvcfg" + libstate "github.com/ledgerwatch/erigon/erigon-lib/state" + types2 "github.com/ledgerwatch/erigon/erigon-lib/types" "github.com/ledgerwatch/erigon/common/hexutil" "github.com/ledgerwatch/erigon/common/math" diff --git a/turbo/jsonrpc/eth_api_test.go b/turbo/jsonrpc/eth_api_test.go index 6f508ab7097..550b0fa0c2c 100644 --- a/turbo/jsonrpc/eth_api_test.go +++ b/turbo/jsonrpc/eth_api_test.go @@ -6,12 +6,12 @@ import ( "testing" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/stretchr/testify/assert" - "github.com/ledgerwatch/erigon-lib/kv/kvcache" "github.com/ledgerwatch/erigon/common/hexutil" "github.com/ledgerwatch/erigon/core" + "github.com/ledgerwatch/erigon/erigon-lib/kv/kvcache" "github.com/ledgerwatch/erigon/rpc" "github.com/ledgerwatch/erigon/rpc/rpccfg" "github.com/ledgerwatch/erigon/turbo/adapter/ethapi" diff --git a/turbo/jsonrpc/eth_block.go b/turbo/jsonrpc/eth_block.go index 23f5fdb1910..811ac965090 100644 --- a/turbo/jsonrpc/eth_block.go +++ b/turbo/jsonrpc/eth_block.go @@ -6,9 +6,9 @@ import ( "math/big" "time" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/log/v3" "github.com/ledgerwatch/erigon/cl/clparams" diff --git a/turbo/jsonrpc/eth_block_test.go b/turbo/jsonrpc/eth_block_test.go index 9ae61196be6..698ab48320b 100644 --- a/turbo/jsonrpc/eth_block_test.go +++ b/turbo/jsonrpc/eth_block_test.go @@ -5,9 +5,9 @@ import ( "math/big" "testing" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/gointerfaces/txpool" - "github.com/ledgerwatch/erigon-lib/kv/kvcache" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/txpool" + "github.com/ledgerwatch/erigon/erigon-lib/kv/kvcache" "github.com/stretchr/testify/assert" "github.com/ledgerwatch/erigon/cmd/rpcdaemon/rpcdaemontest" diff --git a/turbo/jsonrpc/eth_call.go b/turbo/jsonrpc/eth_call.go index ac66c1efd91..a15656d7513 100644 --- a/turbo/jsonrpc/eth_call.go +++ b/turbo/jsonrpc/eth_call.go @@ -10,13 +10,13 @@ import ( "github.com/ledgerwatch/log/v3" "google.golang.org/grpc" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - txpool_proto "github.com/ledgerwatch/erigon-lib/gointerfaces/txpool" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/memdb" - types2 "github.com/ledgerwatch/erigon-lib/types" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces" + txpool_proto "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/txpool" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/memdb" + types2 "github.com/ledgerwatch/erigon/erigon-lib/types" "github.com/ledgerwatch/erigon/common/hexutil" "github.com/ledgerwatch/erigon/core" diff --git a/turbo/jsonrpc/eth_callMany.go b/turbo/jsonrpc/eth_callMany.go index ccf3c7ad442..767d9d99dd8 100644 --- a/turbo/jsonrpc/eth_callMany.go +++ b/turbo/jsonrpc/eth_callMany.go @@ -8,7 +8,7 @@ import ( "time" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/log/v3" "github.com/ledgerwatch/erigon/common/hexutil" diff --git a/turbo/jsonrpc/eth_callMany_test.go b/turbo/jsonrpc/eth_callMany_test.go index 4ef58d7b8f9..fba28e900f4 100644 --- a/turbo/jsonrpc/eth_callMany_test.go +++ b/turbo/jsonrpc/eth_callMany_test.go @@ -8,9 +8,9 @@ import ( "strconv" "testing" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/kv/kvcache" + "github.com/ledgerwatch/erigon/erigon-lib/common/datadir" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/kv/kvcache" "github.com/ledgerwatch/erigon/accounts/abi/bind" "github.com/ledgerwatch/erigon/accounts/abi/bind/backends" diff --git a/turbo/jsonrpc/eth_call_test.go b/turbo/jsonrpc/eth_call_test.go index e1c4a6f3383..6f668b2b3c7 100644 --- a/turbo/jsonrpc/eth_call_test.go +++ b/turbo/jsonrpc/eth_call_test.go @@ -11,11 +11,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/gointerfaces/txpool" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/kvcache" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/txpool" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/kvcache" "github.com/ledgerwatch/erigon/cmd/rpcdaemon/rpcdaemontest" "github.com/ledgerwatch/erigon/common/hexutil" diff --git a/turbo/jsonrpc/eth_deprecated.go b/turbo/jsonrpc/eth_deprecated.go index 5d2fc1d986c..501dc7d1eef 100644 --- a/turbo/jsonrpc/eth_deprecated.go +++ b/turbo/jsonrpc/eth_deprecated.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" ) // Accounts implements eth_accounts. Returns a list of addresses owned by the client. diff --git a/turbo/jsonrpc/eth_filters_test.go b/turbo/jsonrpc/eth_filters_test.go index 636e771927a..95f9ae9ea80 100644 --- a/turbo/jsonrpc/eth_filters_test.go +++ b/turbo/jsonrpc/eth_filters_test.go @@ -6,13 +6,13 @@ import ( "testing" "time" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" "github.com/ledgerwatch/erigon/rpc/rpccfg" - "github.com/ledgerwatch/erigon-lib/gointerfaces/txpool" - "github.com/ledgerwatch/erigon-lib/kv/kvcache" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/txpool" + "github.com/ledgerwatch/erigon/erigon-lib/kv/kvcache" "github.com/stretchr/testify/assert" "github.com/ledgerwatch/erigon/cmd/rpcdaemon/rpcdaemontest" diff --git a/turbo/jsonrpc/eth_mining.go b/turbo/jsonrpc/eth_mining.go index 5d6898803e7..619c1f0cc2a 100644 --- a/turbo/jsonrpc/eth_mining.go +++ b/turbo/jsonrpc/eth_mining.go @@ -4,8 +4,8 @@ import ( "context" "errors" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/gointerfaces/txpool" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/txpool" "google.golang.org/grpc/status" "github.com/ledgerwatch/erigon/common/hexutil" diff --git a/turbo/jsonrpc/eth_mining_test.go b/turbo/jsonrpc/eth_mining_test.go index 86f86b40e6a..72c0ebf25c7 100644 --- a/turbo/jsonrpc/eth_mining_test.go +++ b/turbo/jsonrpc/eth_mining_test.go @@ -8,10 +8,10 @@ import ( "github.com/ledgerwatch/erigon/consensus/ethash" "github.com/ledgerwatch/erigon/rpc/rpccfg" - "github.com/ledgerwatch/erigon-lib/gointerfaces/txpool" - "github.com/ledgerwatch/erigon-lib/kv/kvcache" "github.com/ledgerwatch/erigon/cmd/rpcdaemon/rpcdaemontest" "github.com/ledgerwatch/erigon/core/types" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/txpool" + "github.com/ledgerwatch/erigon/erigon-lib/kv/kvcache" "github.com/ledgerwatch/erigon/rlp" "github.com/ledgerwatch/erigon/turbo/rpchelper" "github.com/ledgerwatch/erigon/turbo/stages/mock" diff --git a/turbo/jsonrpc/eth_receipts.go b/turbo/jsonrpc/eth_receipts.go index cd8ec361c50..6e13a8e6249 100644 --- a/turbo/jsonrpc/eth_receipts.go +++ b/turbo/jsonrpc/eth_receipts.go @@ -11,15 +11,15 @@ import ( "github.com/holiman/uint256" "github.com/ledgerwatch/log/v3" - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/fixedgas" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/bitmapdb" - "github.com/ledgerwatch/erigon-lib/kv/iter" - "github.com/ledgerwatch/erigon-lib/kv/order" - "github.com/ledgerwatch/erigon-lib/kv/rawdbv3" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/fixedgas" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/bitmapdb" + "github.com/ledgerwatch/erigon/erigon-lib/kv/iter" + "github.com/ledgerwatch/erigon/erigon-lib/kv/order" + "github.com/ledgerwatch/erigon/erigon-lib/kv/rawdbv3" "github.com/ledgerwatch/erigon/common/hexutil" "github.com/ledgerwatch/erigon/consensus" diff --git a/turbo/jsonrpc/eth_subscribe_test.go b/turbo/jsonrpc/eth_subscribe_test.go index 7a6fa74c2a5..4e9636c2d0b 100644 --- a/turbo/jsonrpc/eth_subscribe_test.go +++ b/turbo/jsonrpc/eth_subscribe_test.go @@ -5,9 +5,9 @@ import ( "fmt" "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/direct" - "github.com/ledgerwatch/erigon-lib/gointerfaces/sentry" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/direct" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/sentry" "github.com/stretchr/testify/require" "github.com/ledgerwatch/erigon/cmd/rpcdaemon/rpcservices" diff --git a/turbo/jsonrpc/eth_system.go b/turbo/jsonrpc/eth_system.go index e0f59067f4e..ad6e2030ab0 100644 --- a/turbo/jsonrpc/eth_system.go +++ b/turbo/jsonrpc/eth_system.go @@ -4,8 +4,8 @@ import ( "context" "math/big" - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/erigon/common/hexutil" "github.com/ledgerwatch/erigon/core/rawdb" diff --git a/turbo/jsonrpc/eth_system_test.go b/turbo/jsonrpc/eth_system_test.go index f29dbc7b15b..864f2505ce2 100644 --- a/turbo/jsonrpc/eth_system_test.go +++ b/turbo/jsonrpc/eth_system_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/core" "github.com/ledgerwatch/erigon/core/types" diff --git a/turbo/jsonrpc/eth_txs.go b/turbo/jsonrpc/eth_txs.go index d2086c1b38c..8fd203dd2fb 100644 --- a/turbo/jsonrpc/eth_txs.go +++ b/turbo/jsonrpc/eth_txs.go @@ -6,11 +6,11 @@ import ( "fmt" "math/big" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - "github.com/ledgerwatch/erigon-lib/gointerfaces/txpool" - "github.com/ledgerwatch/erigon-lib/gointerfaces/types" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/txpool" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/types" "github.com/ledgerwatch/erigon/common/hexutil" "github.com/ledgerwatch/erigon/core/rawdb" diff --git a/turbo/jsonrpc/eth_uncles.go b/turbo/jsonrpc/eth_uncles.go index b5a75666a75..81c202be233 100644 --- a/turbo/jsonrpc/eth_uncles.go +++ b/turbo/jsonrpc/eth_uncles.go @@ -3,7 +3,7 @@ package jsonrpc import ( "context" - "github.com/ledgerwatch/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/log/v3" "github.com/ledgerwatch/erigon/common/hexutil" diff --git a/turbo/jsonrpc/gen_traces_test.go b/turbo/jsonrpc/gen_traces_test.go index 88989cfb282..7bdfe7b6d0d 100644 --- a/turbo/jsonrpc/gen_traces_test.go +++ b/turbo/jsonrpc/gen_traces_test.go @@ -9,10 +9,10 @@ import ( jsoniter "github.com/json-iterator/go" "github.com/stretchr/testify/assert" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv/kvcache" "github.com/ledgerwatch/erigon/cmd/rpcdaemon/cli/httpcfg" "github.com/ledgerwatch/erigon/cmd/rpcdaemon/rpcdaemontest" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv/kvcache" "github.com/ledgerwatch/erigon/eth/tracers" "github.com/ledgerwatch/erigon/rpc" "github.com/ledgerwatch/erigon/rpc/rpccfg" diff --git a/turbo/jsonrpc/graphql_api.go b/turbo/jsonrpc/graphql_api.go index 97b9b0c082e..545ad6e5334 100644 --- a/turbo/jsonrpc/graphql_api.go +++ b/turbo/jsonrpc/graphql_api.go @@ -5,11 +5,11 @@ import ( "fmt" "math/big" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" "github.com/ledgerwatch/erigon/common/hexutil" "github.com/ledgerwatch/erigon/core/rawdb" "github.com/ledgerwatch/erigon/core/types" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/erigon/rpc" "github.com/ledgerwatch/erigon/turbo/adapter/ethapi" "github.com/ledgerwatch/erigon/turbo/rpchelper" diff --git a/turbo/jsonrpc/otterscan_api.go b/turbo/jsonrpc/otterscan_api.go index b6b9f2757f2..de3fd0c52c6 100644 --- a/turbo/jsonrpc/otterscan_api.go +++ b/turbo/jsonrpc/otterscan_api.go @@ -10,19 +10,19 @@ import ( "github.com/holiman/uint256" "github.com/ledgerwatch/log/v3" - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/iter" - "github.com/ledgerwatch/erigon-lib/kv/order" - "github.com/ledgerwatch/erigon-lib/kv/rawdbv3" "github.com/ledgerwatch/erigon/common/hexutil" "github.com/ledgerwatch/erigon/consensus/ethash" "github.com/ledgerwatch/erigon/core" "github.com/ledgerwatch/erigon/core/rawdb" "github.com/ledgerwatch/erigon/core/types" "github.com/ledgerwatch/erigon/core/vm" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/iter" + "github.com/ledgerwatch/erigon/erigon-lib/kv/order" + "github.com/ledgerwatch/erigon/erigon-lib/kv/rawdbv3" "github.com/ledgerwatch/erigon/rpc" "github.com/ledgerwatch/erigon/turbo/adapter/ethapi" "github.com/ledgerwatch/erigon/turbo/rpchelper" diff --git a/turbo/jsonrpc/otterscan_block_details.go b/turbo/jsonrpc/otterscan_block_details.go index 0af04e02340..821be986551 100644 --- a/turbo/jsonrpc/otterscan_block_details.go +++ b/turbo/jsonrpc/otterscan_block_details.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/ledgerwatch/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/common/hexutil" "github.com/ledgerwatch/erigon/core/rawdb" diff --git a/turbo/jsonrpc/otterscan_contract_creator.go b/turbo/jsonrpc/otterscan_contract_creator.go index 072f05ccb79..2de1d9e9fd0 100644 --- a/turbo/jsonrpc/otterscan_contract_creator.go +++ b/turbo/jsonrpc/otterscan_contract_creator.go @@ -6,13 +6,13 @@ import ( "fmt" "sort" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/cmp" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/bitmapdb" - "github.com/ledgerwatch/erigon-lib/kv/order" - "github.com/ledgerwatch/erigon-lib/kv/rawdbv3" - "github.com/ledgerwatch/erigon-lib/kv/temporal/historyv2" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/cmp" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/bitmapdb" + "github.com/ledgerwatch/erigon/erigon-lib/kv/order" + "github.com/ledgerwatch/erigon/erigon-lib/kv/rawdbv3" + "github.com/ledgerwatch/erigon/erigon-lib/kv/temporal/historyv2" "github.com/ledgerwatch/log/v3" "github.com/ledgerwatch/erigon/core/types/accounts" diff --git a/turbo/jsonrpc/otterscan_contract_creator_test.go b/turbo/jsonrpc/otterscan_contract_creator_test.go index 38e39dbc724..d09dc1c56a1 100644 --- a/turbo/jsonrpc/otterscan_contract_creator_test.go +++ b/turbo/jsonrpc/otterscan_contract_creator_test.go @@ -3,8 +3,8 @@ package jsonrpc import ( "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/cmd/rpcdaemon/rpcdaemontest" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/stretchr/testify/require" ) diff --git a/turbo/jsonrpc/otterscan_default_tracer.go b/turbo/jsonrpc/otterscan_default_tracer.go index 1b312e59b0b..5b73b2c0535 100644 --- a/turbo/jsonrpc/otterscan_default_tracer.go +++ b/turbo/jsonrpc/otterscan_default_tracer.go @@ -2,7 +2,7 @@ package jsonrpc import ( "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/core/vm" ) diff --git a/turbo/jsonrpc/otterscan_generic_tracer.go b/turbo/jsonrpc/otterscan_generic_tracer.go index 7309f258457..d0b348ef7ab 100644 --- a/turbo/jsonrpc/otterscan_generic_tracer.go +++ b/turbo/jsonrpc/otterscan_generic_tracer.go @@ -3,9 +3,9 @@ package jsonrpc import ( "context" - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/erigon/turbo/rpchelper" "github.com/ledgerwatch/log/v3" diff --git a/turbo/jsonrpc/otterscan_has_code.go b/turbo/jsonrpc/otterscan_has_code.go index e4af5b4189b..1413027753a 100644 --- a/turbo/jsonrpc/otterscan_has_code.go +++ b/turbo/jsonrpc/otterscan_has_code.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/ledgerwatch/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/rpc" "github.com/ledgerwatch/erigon/turbo/rpchelper" diff --git a/turbo/jsonrpc/otterscan_search_backward.go b/turbo/jsonrpc/otterscan_search_backward.go index a7d2c4a9712..b82cf64945b 100644 --- a/turbo/jsonrpc/otterscan_search_backward.go +++ b/turbo/jsonrpc/otterscan_search_backward.go @@ -4,8 +4,8 @@ import ( "bytes" "github.com/RoaringBitmap/roaring/roaring64" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv" ) // Given a ChunkLocator, moves back over the chunks and inside each chunk, moves diff --git a/turbo/jsonrpc/otterscan_search_backward_test.go b/turbo/jsonrpc/otterscan_search_backward_test.go index 8be5f918313..408ecfdfb77 100644 --- a/turbo/jsonrpc/otterscan_search_backward_test.go +++ b/turbo/jsonrpc/otterscan_search_backward_test.go @@ -5,9 +5,9 @@ import ( "testing" "github.com/RoaringBitmap/roaring/roaring64" - libcommon "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/cmd/rpcdaemon/rpcdaemontest" "github.com/ledgerwatch/erigon/common/hexutil" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/stretchr/testify/require" ) diff --git a/turbo/jsonrpc/otterscan_search_forward.go b/turbo/jsonrpc/otterscan_search_forward.go index 5931ad25609..687d166372d 100644 --- a/turbo/jsonrpc/otterscan_search_forward.go +++ b/turbo/jsonrpc/otterscan_search_forward.go @@ -4,8 +4,8 @@ import ( "bytes" "github.com/RoaringBitmap/roaring/roaring64" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv" ) // Given a ChunkLocator, moves forward over the chunks and inside each chunk, moves diff --git a/turbo/jsonrpc/otterscan_search_trace.go b/turbo/jsonrpc/otterscan_search_trace.go index ae9bc2f528c..0503bacdf25 100644 --- a/turbo/jsonrpc/otterscan_search_trace.go +++ b/turbo/jsonrpc/otterscan_search_trace.go @@ -4,9 +4,9 @@ import ( "context" "sync" - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/erigon/turbo/rpchelper" "github.com/ledgerwatch/log/v3" diff --git a/turbo/jsonrpc/otterscan_trace_contract_creator.go b/turbo/jsonrpc/otterscan_trace_contract_creator.go index 8d55e3305a2..a85c42a08fa 100644 --- a/turbo/jsonrpc/otterscan_trace_contract_creator.go +++ b/turbo/jsonrpc/otterscan_trace_contract_creator.go @@ -4,7 +4,7 @@ import ( "context" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/core/types" "github.com/ledgerwatch/erigon/core/vm" diff --git a/turbo/jsonrpc/otterscan_trace_operations.go b/turbo/jsonrpc/otterscan_trace_operations.go index 6f09c8941a1..062a2237323 100644 --- a/turbo/jsonrpc/otterscan_trace_operations.go +++ b/turbo/jsonrpc/otterscan_trace_operations.go @@ -4,7 +4,7 @@ import ( "context" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/common/hexutil" "github.com/ledgerwatch/erigon/core/vm" diff --git a/turbo/jsonrpc/otterscan_trace_touch.go b/turbo/jsonrpc/otterscan_trace_touch.go index 06c3c2960c4..9d459e236da 100644 --- a/turbo/jsonrpc/otterscan_trace_touch.go +++ b/turbo/jsonrpc/otterscan_trace_touch.go @@ -4,7 +4,7 @@ import ( "bytes" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/core/vm" ) diff --git a/turbo/jsonrpc/otterscan_trace_transaction.go b/turbo/jsonrpc/otterscan_trace_transaction.go index 7959871aa22..90c906807ec 100644 --- a/turbo/jsonrpc/otterscan_trace_transaction.go +++ b/turbo/jsonrpc/otterscan_trace_transaction.go @@ -6,8 +6,8 @@ import ( "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" "github.com/ledgerwatch/erigon/common/hexutil" "github.com/ledgerwatch/erigon/core/vm" diff --git a/turbo/jsonrpc/otterscan_transaction_by_sender_and_nonce.go b/turbo/jsonrpc/otterscan_transaction_by_sender_and_nonce.go index 8bb1d0ec9af..d11fe0245e5 100644 --- a/turbo/jsonrpc/otterscan_transaction_by_sender_and_nonce.go +++ b/turbo/jsonrpc/otterscan_transaction_by_sender_and_nonce.go @@ -7,12 +7,12 @@ import ( "sort" "github.com/RoaringBitmap/roaring/roaring64" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/cmp" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/order" - "github.com/ledgerwatch/erigon-lib/kv/rawdbv3" - "github.com/ledgerwatch/erigon-lib/kv/temporal/historyv2" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/cmp" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/order" + "github.com/ledgerwatch/erigon/erigon-lib/kv/rawdbv3" + "github.com/ledgerwatch/erigon/erigon-lib/kv/temporal/historyv2" "github.com/ledgerwatch/log/v3" "github.com/ledgerwatch/erigon/core/types/accounts" diff --git a/turbo/jsonrpc/otterscan_transaction_by_sender_and_nonce_test.go b/turbo/jsonrpc/otterscan_transaction_by_sender_and_nonce_test.go index 9e72d5d0275..fda852bbfe3 100644 --- a/turbo/jsonrpc/otterscan_transaction_by_sender_and_nonce_test.go +++ b/turbo/jsonrpc/otterscan_transaction_by_sender_and_nonce_test.go @@ -3,8 +3,8 @@ package jsonrpc import ( "testing" - "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/cmd/rpcdaemon/rpcdaemontest" + "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/rpc/rpccfg" "github.com/stretchr/testify/require" ) diff --git a/turbo/jsonrpc/otterscan_transaction_error.go b/turbo/jsonrpc/otterscan_transaction_error.go index e71d27112a9..21dda663aec 100644 --- a/turbo/jsonrpc/otterscan_transaction_error.go +++ b/turbo/jsonrpc/otterscan_transaction_error.go @@ -3,8 +3,8 @@ package jsonrpc import ( "context" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" ) func (api *OtterscanAPIImpl) GetTransactionError(ctx context.Context, hash common.Hash) (hexutility.Bytes, error) { diff --git a/turbo/jsonrpc/otterscan_types.go b/turbo/jsonrpc/otterscan_types.go index cb2bfd212ff..da5d263f2a3 100644 --- a/turbo/jsonrpc/otterscan_types.go +++ b/turbo/jsonrpc/otterscan_types.go @@ -4,9 +4,9 @@ import ( "bytes" "encoding/binary" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" + "github.com/ledgerwatch/erigon/erigon-lib/kv" ) // Bootstrap a function able to locate a series of byte chunks containing diff --git a/turbo/jsonrpc/parity_api.go b/turbo/jsonrpc/parity_api.go index 8cf5892405e..6dcaee2229a 100644 --- a/turbo/jsonrpc/parity_api.go +++ b/turbo/jsonrpc/parity_api.go @@ -5,14 +5,14 @@ import ( "encoding/binary" "fmt" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/order" - "github.com/ledgerwatch/erigon-lib/kv/rawdbv3" "github.com/ledgerwatch/erigon/common" "github.com/ledgerwatch/erigon/core/rawdb" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/order" + "github.com/ledgerwatch/erigon/erigon-lib/kv/rawdbv3" "github.com/ledgerwatch/erigon/turbo/rpchelper" "github.com/ledgerwatch/erigon/rpc" diff --git a/turbo/jsonrpc/parity_api_test.go b/turbo/jsonrpc/parity_api_test.go index 857a617fa39..fbaaab81aa2 100644 --- a/turbo/jsonrpc/parity_api_test.go +++ b/turbo/jsonrpc/parity_api_test.go @@ -8,8 +8,8 @@ import ( "github.com/ledgerwatch/erigon/rpc/rpccfg" "github.com/stretchr/testify/assert" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" "github.com/ledgerwatch/erigon/cmd/rpcdaemon/rpcdaemontest" "github.com/ledgerwatch/erigon/common" diff --git a/turbo/jsonrpc/send_transaction.go b/turbo/jsonrpc/send_transaction.go index ffdfa2e216a..8de03845186 100644 --- a/turbo/jsonrpc/send_transaction.go +++ b/turbo/jsonrpc/send_transaction.go @@ -6,9 +6,9 @@ import ( "fmt" "math/big" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - txPoolProto "github.com/ledgerwatch/erigon-lib/gointerfaces/txpool" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" + txPoolProto "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/txpool" "github.com/ledgerwatch/erigon/core/types" "github.com/ledgerwatch/erigon/eth/ethconfig" diff --git a/turbo/jsonrpc/send_transaction_test.go b/turbo/jsonrpc/send_transaction_test.go index 847ee34bf65..1d592ab39d4 100644 --- a/turbo/jsonrpc/send_transaction_test.go +++ b/turbo/jsonrpc/send_transaction_test.go @@ -7,10 +7,10 @@ import ( "testing" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/gointerfaces/sentry" - "github.com/ledgerwatch/erigon-lib/gointerfaces/txpool" - "github.com/ledgerwatch/erigon-lib/kv/kvcache" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/sentry" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/txpool" + "github.com/ledgerwatch/erigon/erigon-lib/kv/kvcache" "github.com/ledgerwatch/erigon/rpc/rpccfg" "github.com/stretchr/testify/require" diff --git a/turbo/jsonrpc/storage_range.go b/turbo/jsonrpc/storage_range.go index 12730522a1e..70da9c3994c 100644 --- a/turbo/jsonrpc/storage_range.go +++ b/turbo/jsonrpc/storage_range.go @@ -4,10 +4,10 @@ import ( "fmt" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/order" "github.com/ledgerwatch/erigon/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/order" ) // StorageRangeResult is the result of a debug_storageRangeAt API call. diff --git a/turbo/jsonrpc/trace_adhoc.go b/turbo/jsonrpc/trace_adhoc.go index b47da577b36..b721921002c 100644 --- a/turbo/jsonrpc/trace_adhoc.go +++ b/turbo/jsonrpc/trace_adhoc.go @@ -11,10 +11,10 @@ import ( "github.com/holiman/uint256" "github.com/ledgerwatch/log/v3" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/kv" - types2 "github.com/ledgerwatch/erigon-lib/types" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + types2 "github.com/ledgerwatch/erigon/erigon-lib/types" "github.com/ledgerwatch/erigon/common" "github.com/ledgerwatch/erigon/common/hexutil" diff --git a/turbo/jsonrpc/trace_adhoc_test.go b/turbo/jsonrpc/trace_adhoc_test.go index ad237f4a826..a0a41cdea9c 100644 --- a/turbo/jsonrpc/trace_adhoc_test.go +++ b/turbo/jsonrpc/trace_adhoc_test.go @@ -5,8 +5,8 @@ import ( "encoding/json" "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/stretchr/testify/require" "github.com/ledgerwatch/erigon/cmd/rpcdaemon/cli/httpcfg" diff --git a/turbo/jsonrpc/trace_api.go b/turbo/jsonrpc/trace_api.go index d5973ef227e..3b0e4478fc5 100644 --- a/turbo/jsonrpc/trace_api.go +++ b/turbo/jsonrpc/trace_api.go @@ -5,8 +5,8 @@ import ( "encoding/json" jsoniter "github.com/json-iterator/go" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/erigon/cmd/rpcdaemon/cli/httpcfg" "github.com/ledgerwatch/erigon/common/hexutil" diff --git a/turbo/jsonrpc/trace_filtering.go b/turbo/jsonrpc/trace_filtering.go index b8bfcce2885..9f962c93da9 100644 --- a/turbo/jsonrpc/trace_filtering.go +++ b/turbo/jsonrpc/trace_filtering.go @@ -9,13 +9,13 @@ import ( jsoniter "github.com/json-iterator/go" "github.com/ledgerwatch/log/v3" - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/bitmapdb" - "github.com/ledgerwatch/erigon-lib/kv/iter" - "github.com/ledgerwatch/erigon-lib/kv/order" - "github.com/ledgerwatch/erigon-lib/kv/rawdbv3" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/bitmapdb" + "github.com/ledgerwatch/erigon/erigon-lib/kv/iter" + "github.com/ledgerwatch/erigon/erigon-lib/kv/order" + "github.com/ledgerwatch/erigon/erigon-lib/kv/rawdbv3" "github.com/ledgerwatch/erigon/common/hexutil" "github.com/ledgerwatch/erigon/consensus" diff --git a/turbo/jsonrpc/trace_types.go b/turbo/jsonrpc/trace_types.go index 500087d77a1..8771f4e0793 100644 --- a/turbo/jsonrpc/trace_types.go +++ b/turbo/jsonrpc/trace_types.go @@ -3,8 +3,8 @@ package jsonrpc import ( "fmt" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" "github.com/ledgerwatch/erigon/common/hexutil" "github.com/ledgerwatch/erigon/core/types" diff --git a/turbo/jsonrpc/tracing.go b/turbo/jsonrpc/tracing.go index ead8a094f95..22c0563c410 100644 --- a/turbo/jsonrpc/tracing.go +++ b/turbo/jsonrpc/tracing.go @@ -8,7 +8,7 @@ import ( "github.com/holiman/uint256" jsoniter "github.com/json-iterator/go" - "github.com/ledgerwatch/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/log/v3" "github.com/ledgerwatch/erigon/core/vm/evmtypes" diff --git a/turbo/jsonrpc/txpool_api.go b/turbo/jsonrpc/txpool_api.go index c20fef68290..4dd1fd71493 100644 --- a/turbo/jsonrpc/txpool_api.go +++ b/turbo/jsonrpc/txpool_api.go @@ -4,10 +4,10 @@ import ( "context" "fmt" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - proto_txpool "github.com/ledgerwatch/erigon-lib/gointerfaces/txpool" - "github.com/ledgerwatch/erigon-lib/kv" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces" + proto_txpool "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/txpool" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/erigon/common/hexutil" "github.com/ledgerwatch/erigon/core/rawdb" diff --git a/turbo/jsonrpc/txpool_api_test.go b/turbo/jsonrpc/txpool_api_test.go index e08ac9339e5..6115f454e16 100644 --- a/turbo/jsonrpc/txpool_api_test.go +++ b/turbo/jsonrpc/txpool_api_test.go @@ -6,10 +6,10 @@ import ( "testing" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/gointerfaces/txpool" - txPoolProto "github.com/ledgerwatch/erigon-lib/gointerfaces/txpool" - "github.com/ledgerwatch/erigon-lib/kv/kvcache" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/txpool" + txPoolProto "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/txpool" + "github.com/ledgerwatch/erigon/erigon-lib/kv/kvcache" "github.com/stretchr/testify/require" "github.com/ledgerwatch/erigon/cmd/rpcdaemon/rpcdaemontest" diff --git a/turbo/jsonrpc/validator_set.go b/turbo/jsonrpc/validator_set.go index 70c6a5ee5f0..575bbfec39a 100644 --- a/turbo/jsonrpc/validator_set.go +++ b/turbo/jsonrpc/validator_set.go @@ -10,7 +10,7 @@ import ( "sort" "strings" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/log/v3" "github.com/ledgerwatch/erigon/consensus/bor/valset" diff --git a/turbo/jsonrpc/web3_api.go b/turbo/jsonrpc/web3_api.go index ea4ae201f3f..cf9d7a94576 100644 --- a/turbo/jsonrpc/web3_api.go +++ b/turbo/jsonrpc/web3_api.go @@ -3,7 +3,7 @@ package jsonrpc import ( "context" - "github.com/ledgerwatch/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" "github.com/ledgerwatch/erigon/crypto" "github.com/ledgerwatch/erigon/turbo/rpchelper" diff --git a/turbo/mock/txpool.go b/turbo/mock/txpool.go index d9fd2b8bfa3..efb66591fab 100644 --- a/turbo/mock/txpool.go +++ b/turbo/mock/txpool.go @@ -4,7 +4,7 @@ import ( "sort" "sync" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/core" "github.com/ledgerwatch/erigon/core/types" diff --git a/turbo/node/node.go b/turbo/node/node.go index e33061915d7..6d5d138c689 100644 --- a/turbo/node/node.go +++ b/turbo/node/node.go @@ -2,7 +2,7 @@ package node import ( - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/log/v3" "github.com/urfave/cli/v2" diff --git a/turbo/rpchelper/filters.go b/turbo/rpchelper/filters.go index 48234a2eec4..c95923de5bf 100644 --- a/turbo/rpchelper/filters.go +++ b/turbo/rpchelper/filters.go @@ -12,12 +12,12 @@ import ( "sync/atomic" "time" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - "github.com/ledgerwatch/erigon-lib/gointerfaces/grpcutil" - "github.com/ledgerwatch/erigon-lib/gointerfaces/remote" - "github.com/ledgerwatch/erigon-lib/gointerfaces/txpool" - txpool2 "github.com/ledgerwatch/erigon-lib/txpool" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/grpcutil" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/remote" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/txpool" + txpool2 "github.com/ledgerwatch/erigon/erigon-lib/txpool" "github.com/ledgerwatch/log/v3" "google.golang.org/grpc" diff --git a/turbo/rpchelper/filters_deadlock_test.go b/turbo/rpchelper/filters_deadlock_test.go index 7e6ec6838e2..6e4a13448e1 100644 --- a/turbo/rpchelper/filters_deadlock_test.go +++ b/turbo/rpchelper/filters_deadlock_test.go @@ -4,10 +4,10 @@ import ( "context" "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - "github.com/ledgerwatch/erigon-lib/gointerfaces/remote" - types2 "github.com/ledgerwatch/erigon-lib/gointerfaces/types" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/remote" + types2 "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/types" "github.com/ledgerwatch/erigon/core/types" "github.com/ledgerwatch/erigon/eth/filters" diff --git a/turbo/rpchelper/filters_test.go b/turbo/rpchelper/filters_test.go index bdf61f98fb3..224ba8a9381 100644 --- a/turbo/rpchelper/filters_test.go +++ b/turbo/rpchelper/filters_test.go @@ -4,11 +4,11 @@ import ( "context" "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - "github.com/ledgerwatch/erigon-lib/gointerfaces/remote" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/remote" - types2 "github.com/ledgerwatch/erigon-lib/gointerfaces/types" + types2 "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/types" "github.com/ledgerwatch/erigon/eth/filters" "github.com/ledgerwatch/log/v3" diff --git a/turbo/rpchelper/helper.go b/turbo/rpchelper/helper.go index b5cc1e62a34..87567f70d34 100644 --- a/turbo/rpchelper/helper.go +++ b/turbo/rpchelper/helper.go @@ -5,13 +5,13 @@ import ( "errors" "fmt" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/kvcache" - "github.com/ledgerwatch/erigon-lib/kv/rawdbv3" "github.com/ledgerwatch/erigon/core/rawdb" "github.com/ledgerwatch/erigon/core/state" "github.com/ledgerwatch/erigon/core/systemcontracts" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/kvcache" + "github.com/ledgerwatch/erigon/erigon-lib/kv/rawdbv3" "github.com/ledgerwatch/erigon/eth/borfinality" "github.com/ledgerwatch/erigon/eth/borfinality/whitelist" "github.com/ledgerwatch/erigon/eth/ethconfig" diff --git a/turbo/rpchelper/interface.go b/turbo/rpchelper/interface.go index 801f57fccbd..7226c02fb90 100644 --- a/turbo/rpchelper/interface.go +++ b/turbo/rpchelper/interface.go @@ -4,10 +4,10 @@ import ( "context" "sync/atomic" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/gointerfaces/remote" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/remote" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/erigon/core/types" "github.com/ledgerwatch/erigon/p2p" diff --git a/turbo/rpchelper/logsfilter.go b/turbo/rpchelper/logsfilter.go index 9b14eb2ea7e..6b46b75376a 100644 --- a/turbo/rpchelper/logsfilter.go +++ b/turbo/rpchelper/logsfilter.go @@ -3,9 +3,9 @@ package rpchelper import ( "sync" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - "github.com/ledgerwatch/erigon-lib/gointerfaces/remote" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/remote" types2 "github.com/ledgerwatch/erigon/core/types" ) diff --git a/turbo/rpchelper/rpc_block.go b/turbo/rpchelper/rpc_block.go index 2bd69416c60..5ae8b20c66e 100644 --- a/turbo/rpchelper/rpc_block.go +++ b/turbo/rpchelper/rpc_block.go @@ -3,8 +3,8 @@ package rpchelper import ( "fmt" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/erigon/core/rawdb" "github.com/ledgerwatch/erigon/eth/stagedsync/stages" diff --git a/turbo/services/interfaces.go b/turbo/services/interfaces.go index 592006477d2..af551bdd858 100644 --- a/turbo/services/interfaces.go +++ b/turbo/services/interfaces.go @@ -3,10 +3,10 @@ package services import ( "context" - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" "github.com/ledgerwatch/erigon/core/types" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/erigon/eth/ethconfig" "github.com/ledgerwatch/erigon/rlp" "github.com/ledgerwatch/log/v3" diff --git a/turbo/shards/events.go b/turbo/shards/events.go index 7b50d4b0917..6656ad0f437 100644 --- a/turbo/shards/events.go +++ b/turbo/shards/events.go @@ -3,9 +3,9 @@ package shards import ( "sync" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/gointerfaces/remote" "github.com/ledgerwatch/erigon/core/types" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/remote" ) type RpcEventType uint64 diff --git a/turbo/shards/state_cache.go b/turbo/shards/state_cache.go index 2a5ab4cff41..800dc8ef309 100644 --- a/turbo/shards/state_cache.go +++ b/turbo/shards/state_cache.go @@ -9,7 +9,7 @@ import ( "github.com/c2h5oh/datasize" "github.com/google/btree" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/metrics" "github.com/ledgerwatch/erigon/common" diff --git a/turbo/shards/state_cache_test.go b/turbo/shards/state_cache_test.go index 1d03754cdfe..5a609af8f26 100644 --- a/turbo/shards/state_cache_test.go +++ b/turbo/shards/state_cache_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/c2h5oh/datasize" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/stretchr/testify/assert" "golang.org/x/crypto/sha3" diff --git a/turbo/shards/state_change_accumulator.go b/turbo/shards/state_change_accumulator.go index 8ba19686ee5..7099400214b 100644 --- a/turbo/shards/state_change_accumulator.go +++ b/turbo/shards/state_change_accumulator.go @@ -3,9 +3,9 @@ package shards import ( "context" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - "github.com/ledgerwatch/erigon-lib/gointerfaces/remote" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/remote" ) // Accumulator collects state changes in a form that can then be delivered to the RPC daemon diff --git a/turbo/shards/trie_cache.go b/turbo/shards/trie_cache.go index ea995854aeb..826b11ea8a9 100644 --- a/turbo/shards/trie_cache.go +++ b/turbo/shards/trie_cache.go @@ -7,7 +7,7 @@ import ( "unsafe" "github.com/google/btree" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/common" "github.com/ledgerwatch/erigon/common/dbutils" diff --git a/turbo/snapshotsync/freezeblocks/block_reader.go b/turbo/snapshotsync/freezeblocks/block_reader.go index a837d6bf0b7..87aa641814d 100644 --- a/turbo/snapshotsync/freezeblocks/block_reader.go +++ b/turbo/snapshotsync/freezeblocks/block_reader.go @@ -8,13 +8,13 @@ import ( "math" "sort" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - "github.com/ledgerwatch/erigon-lib/gointerfaces/remote" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/recsplit" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/dbg" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/remote" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/recsplit" "github.com/ledgerwatch/erigon/eth/ethconfig" "github.com/ledgerwatch/erigon/core/rawdb" diff --git a/turbo/snapshotsync/freezeblocks/block_snapshots.go b/turbo/snapshotsync/freezeblocks/block_snapshots.go index 3c7c3818e2b..746929ec9d1 100644 --- a/turbo/snapshotsync/freezeblocks/block_snapshots.go +++ b/turbo/snapshotsync/freezeblocks/block_snapshots.go @@ -18,26 +18,26 @@ import ( "time" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/chain" - common2 "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/background" - "github.com/ledgerwatch/erigon-lib/common/cmp" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/common/dbg" - dir2 "github.com/ledgerwatch/erigon-lib/common/dir" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/compress" - "github.com/ledgerwatch/erigon-lib/downloader/snaptype" - "github.com/ledgerwatch/erigon-lib/etl" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/recsplit" - types2 "github.com/ledgerwatch/erigon-lib/types" "github.com/ledgerwatch/erigon/cmd/hack/tool/fromdb" "github.com/ledgerwatch/erigon/core/rawdb" "github.com/ledgerwatch/erigon/core/rawdb/blockio" "github.com/ledgerwatch/erigon/core/types" "github.com/ledgerwatch/erigon/crypto" "github.com/ledgerwatch/erigon/crypto/cryptopool" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + common2 "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/background" + "github.com/ledgerwatch/erigon/erigon-lib/common/cmp" + "github.com/ledgerwatch/erigon/erigon-lib/common/datadir" + "github.com/ledgerwatch/erigon/erigon-lib/common/dbg" + dir2 "github.com/ledgerwatch/erigon/erigon-lib/common/dir" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/compress" + "github.com/ledgerwatch/erigon/erigon-lib/downloader/snaptype" + "github.com/ledgerwatch/erigon/erigon-lib/etl" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/recsplit" + types2 "github.com/ledgerwatch/erigon/erigon-lib/types" "github.com/ledgerwatch/erigon/eth/ethconfig" "github.com/ledgerwatch/erigon/eth/ethconfig/estimate" "github.com/ledgerwatch/erigon/eth/stagedsync/stages" @@ -2146,7 +2146,7 @@ func (*Merger) FindMergeRanges(currentRanges []Range) (toMerge []Range) { break } } - slices.SortFunc(toMerge, func(i, j Range) int { return cmp.Compare(i.from, j.from) }) + slices.SortFunc(toMerge, func(i, j Range) int { return cmp.Less(i.from, j.from) }) return toMerge } diff --git a/turbo/snapshotsync/freezeblocks/block_snapshots_test.go b/turbo/snapshotsync/freezeblocks/block_snapshots_test.go index 68a3508d412..5bcc6fcb4a5 100644 --- a/turbo/snapshotsync/freezeblocks/block_snapshots_test.go +++ b/turbo/snapshotsync/freezeblocks/block_snapshots_test.go @@ -6,9 +6,9 @@ import ( "testing" "testing/fstest" - "github.com/ledgerwatch/erigon-lib/compress" - "github.com/ledgerwatch/erigon-lib/downloader/snaptype" - "github.com/ledgerwatch/erigon-lib/recsplit" + "github.com/ledgerwatch/erigon/erigon-lib/compress" + "github.com/ledgerwatch/erigon/erigon-lib/downloader/snaptype" + "github.com/ledgerwatch/erigon/erigon-lib/recsplit" "github.com/ledgerwatch/log/v3" "github.com/stretchr/testify/require" diff --git a/turbo/snapshotsync/freezeblocks/bor_snapshots.go b/turbo/snapshotsync/freezeblocks/bor_snapshots.go index 9ef3490643b..b7ef9a956e7 100644 --- a/turbo/snapshotsync/freezeblocks/bor_snapshots.go +++ b/turbo/snapshotsync/freezeblocks/bor_snapshots.go @@ -15,20 +15,20 @@ import ( "sync/atomic" "time" - "github.com/ledgerwatch/erigon-lib/chain" - common2 "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/background" - "github.com/ledgerwatch/erigon-lib/common/cmp" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/compress" - "github.com/ledgerwatch/erigon-lib/downloader/snaptype" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/recsplit" "github.com/ledgerwatch/erigon/cmd/hack/tool/fromdb" "github.com/ledgerwatch/erigon/core/rawdb" "github.com/ledgerwatch/erigon/core/types" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + common2 "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/background" + "github.com/ledgerwatch/erigon/erigon-lib/common/cmp" + "github.com/ledgerwatch/erigon/erigon-lib/common/dbg" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" + "github.com/ledgerwatch/erigon/erigon-lib/compress" + "github.com/ledgerwatch/erigon/erigon-lib/downloader/snaptype" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/recsplit" "github.com/ledgerwatch/erigon/eth/ethconfig" "github.com/ledgerwatch/erigon/turbo/services" "github.com/ledgerwatch/erigon/turbo/snapshotsync/snapcfg" @@ -1097,7 +1097,7 @@ func (*BorMerger) FindMergeRanges(currentRanges []Range) (toMerge []Range) { break } } - slices.SortFunc(toMerge, func(i, j Range) int { return cmp.Compare(i.from, j.from) }) + slices.SortFunc(toMerge, func(i, j Range) int { return cmp.Less(i.from, j.from) }) return toMerge } diff --git a/turbo/snapshotsync/freezeblocks/dump_test.go b/turbo/snapshotsync/freezeblocks/dump_test.go index 62eb4a6cdb4..773d7d3b941 100644 --- a/turbo/snapshotsync/freezeblocks/dump_test.go +++ b/turbo/snapshotsync/freezeblocks/dump_test.go @@ -8,9 +8,9 @@ import ( "github.com/ledgerwatch/log/v3" "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - types2 "github.com/ledgerwatch/erigon-lib/types" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + types2 "github.com/ledgerwatch/erigon/erigon-lib/types" "github.com/ledgerwatch/erigon/common/math" "github.com/ledgerwatch/erigon/core" diff --git a/turbo/snapshotsync/snap/flags.go b/turbo/snapshotsync/snap/flags.go index 741e3223549..e973b91194a 100644 --- a/turbo/snapshotsync/snap/flags.go +++ b/turbo/snapshotsync/snap/flags.go @@ -1,7 +1,7 @@ package snap import ( - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/erigon/eth/ethconfig" ) diff --git a/turbo/snapshotsync/snapcfg/util.go b/turbo/snapshotsync/snapcfg/util.go index f379a00a12d..f444317bf69 100644 --- a/turbo/snapshotsync/snapcfg/util.go +++ b/turbo/snapshotsync/snapcfg/util.go @@ -6,8 +6,8 @@ import ( "strconv" "strings" - "github.com/ledgerwatch/erigon-lib/common/cmp" snapshothashes "github.com/ledgerwatch/erigon-snapshot" + "github.com/ledgerwatch/erigon/erigon-lib/common/cmp" "github.com/ledgerwatch/erigon/params/networkname" "github.com/pelletier/go-toml/v2" "golang.org/x/exp/slices" @@ -52,7 +52,7 @@ func doSort(in preverified) Preverified { for k, v := range in { out = append(out, PreverifiedItem{k, v}) } - slices.SortFunc(out, func(i, j PreverifiedItem) int { return cmp.Compare(i.Name, j.Name) }) + slices.SortFunc(out, func(i, j PreverifiedItem) int { return cmp.Less(i.Name, j.Name) }) return out } diff --git a/turbo/snapshotsync/snapshotsync.go b/turbo/snapshotsync/snapshotsync.go index 2ed95c8a9ac..427bd4e8ae8 100644 --- a/turbo/snapshotsync/snapshotsync.go +++ b/turbo/snapshotsync/snapshotsync.go @@ -7,15 +7,15 @@ import ( "runtime" "time" - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/downloader/downloadergrpc" - "github.com/ledgerwatch/erigon-lib/downloader/snaptype" - proto_downloader "github.com/ledgerwatch/erigon-lib/gointerfaces/downloader" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/rawdbv3" - "github.com/ledgerwatch/erigon-lib/state" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/dbg" + "github.com/ledgerwatch/erigon/erigon-lib/downloader/downloadergrpc" + "github.com/ledgerwatch/erigon/erigon-lib/downloader/snaptype" + proto_downloader "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/downloader" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/rawdbv3" + "github.com/ledgerwatch/erigon/erigon-lib/state" "github.com/ledgerwatch/erigon/core/rawdb" "github.com/ledgerwatch/erigon/turbo/services" diff --git a/turbo/stages/blockchain_test.go b/turbo/stages/blockchain_test.go index 183a457a880..22a5b0d94ff 100644 --- a/turbo/stages/blockchain_test.go +++ b/turbo/stages/blockchain_test.go @@ -30,13 +30,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/chain" - chain2 "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/bitmapdb" - types2 "github.com/ledgerwatch/erigon-lib/types" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + chain2 "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/bitmapdb" + types2 "github.com/ledgerwatch/erigon/erigon-lib/types" "github.com/ledgerwatch/erigon/common/hexutil" "github.com/ledgerwatch/erigon/common/u256" diff --git a/turbo/stages/bodydownload/body_algos.go b/turbo/stages/bodydownload/body_algos.go index 80ec0770e80..4cacc055487 100644 --- a/turbo/stages/bodydownload/body_algos.go +++ b/turbo/stages/bodydownload/body_algos.go @@ -7,10 +7,10 @@ import ( "math/big" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/kv" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/dbg" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/log/v3" "golang.org/x/exp/maps" diff --git a/turbo/stages/bodydownload/body_data_struct.go b/turbo/stages/bodydownload/body_data_struct.go index ca2703e4ce7..c50a6fb5f65 100644 --- a/turbo/stages/bodydownload/body_data_struct.go +++ b/turbo/stages/bodydownload/body_data_struct.go @@ -3,8 +3,8 @@ package bodydownload import ( "github.com/RoaringBitmap/roaring/roaring64" "github.com/google/btree" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" "github.com/ledgerwatch/erigon/turbo/services" "github.com/ledgerwatch/erigon/consensus" diff --git a/turbo/stages/bodydownload/prefetched_blocks.go b/turbo/stages/bodydownload/prefetched_blocks.go index b7633aaba13..9e79e4e2b8c 100644 --- a/turbo/stages/bodydownload/prefetched_blocks.go +++ b/turbo/stages/bodydownload/prefetched_blocks.go @@ -1,8 +1,8 @@ package bodydownload import ( - "github.com/hashicorp/golang-lru/v2" - "github.com/ledgerwatch/erigon-lib/common" + lru "github.com/hashicorp/golang-lru/v2" + "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/core/types" ) diff --git a/turbo/stages/chain_makers_test.go b/turbo/stages/chain_makers_test.go index 49e10c12fb8..6ddf97e82e4 100644 --- a/turbo/stages/chain_makers_test.go +++ b/turbo/stages/chain_makers_test.go @@ -22,7 +22,7 @@ import ( "testing" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/chain" + "github.com/ledgerwatch/erigon/erigon-lib/chain" "github.com/ledgerwatch/log/v3" diff --git a/turbo/stages/genesis_test.go b/turbo/stages/genesis_test.go index 4cc5a63075f..c38a0659599 100644 --- a/turbo/stages/genesis_test.go +++ b/turbo/stages/genesis_test.go @@ -23,14 +23,14 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/kv" "github.com/ledgerwatch/erigon/core" "github.com/ledgerwatch/erigon/core/state/temporal" "github.com/ledgerwatch/erigon/core/types" "github.com/ledgerwatch/erigon/crypto" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/datadir" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/erigon/eth/ethconfig" "github.com/ledgerwatch/erigon/params" "github.com/ledgerwatch/erigon/turbo/snapshotsync/freezeblocks" diff --git a/turbo/stages/headerdownload/header_algo_test.go b/turbo/stages/headerdownload/header_algo_test.go index 23a17fedf15..6cbfcdc2ef1 100644 --- a/turbo/stages/headerdownload/header_algo_test.go +++ b/turbo/stages/headerdownload/header_algo_test.go @@ -5,7 +5,7 @@ import ( "math/big" "testing" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/erigon/core" "github.com/ledgerwatch/erigon/core/types" diff --git a/turbo/stages/headerdownload/header_algos.go b/turbo/stages/headerdownload/header_algos.go index a6110148801..2b5cd54255d 100644 --- a/turbo/stages/headerdownload/header_algos.go +++ b/turbo/stages/headerdownload/header_algos.go @@ -14,9 +14,9 @@ import ( "strings" "time" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/etl" - "github.com/ledgerwatch/erigon-lib/kv" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/etl" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "golang.org/x/exp/slices" "github.com/ledgerwatch/erigon/dataflow" diff --git a/turbo/stages/headerdownload/header_data_struct.go b/turbo/stages/headerdownload/header_data_struct.go index d745e69fa99..b628d6d4d41 100644 --- a/turbo/stages/headerdownload/header_data_struct.go +++ b/turbo/stages/headerdownload/header_data_struct.go @@ -9,10 +9,10 @@ import ( "github.com/google/btree" lru "github.com/hashicorp/golang-lru/v2" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/etl" "github.com/ledgerwatch/erigon/consensus" "github.com/ledgerwatch/erigon/core/types" + "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/etl" "github.com/ledgerwatch/erigon/rlp" "github.com/ledgerwatch/erigon/turbo/services" "github.com/ledgerwatch/log/v3" diff --git a/turbo/stages/mock/mock_sentry.go b/turbo/stages/mock/mock_sentry.go index f63df52f27c..e375103dbd8 100644 --- a/turbo/stages/mock/mock_sentry.go +++ b/turbo/stages/mock/mock_sentry.go @@ -16,22 +16,22 @@ import ( "github.com/ledgerwatch/log/v3" "google.golang.org/protobuf/types/known/emptypb" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/direct" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - proto_downloader "github.com/ledgerwatch/erigon-lib/gointerfaces/downloader" - proto_sentry "github.com/ledgerwatch/erigon-lib/gointerfaces/sentry" - ptypes "github.com/ledgerwatch/erigon-lib/gointerfaces/types" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/kvcache" - "github.com/ledgerwatch/erigon-lib/kv/memdb" - "github.com/ledgerwatch/erigon-lib/kv/remotedbserver" - libstate "github.com/ledgerwatch/erigon-lib/state" - "github.com/ledgerwatch/erigon-lib/txpool" - "github.com/ledgerwatch/erigon-lib/txpool/txpoolcfg" - types2 "github.com/ledgerwatch/erigon-lib/types" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/datadir" + "github.com/ledgerwatch/erigon/erigon-lib/direct" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces" + proto_downloader "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/downloader" + proto_sentry "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/sentry" + ptypes "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/types" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/kvcache" + "github.com/ledgerwatch/erigon/erigon-lib/kv/memdb" + "github.com/ledgerwatch/erigon/erigon-lib/kv/remotedbserver" + libstate "github.com/ledgerwatch/erigon/erigon-lib/state" + "github.com/ledgerwatch/erigon/erigon-lib/txpool" + "github.com/ledgerwatch/erigon/erigon-lib/txpool/txpoolcfg" + types2 "github.com/ledgerwatch/erigon/erigon-lib/types" "github.com/ledgerwatch/erigon/cmd/sentry/sentry" "github.com/ledgerwatch/erigon/consensus" diff --git a/turbo/stages/mock/sentry_mock_test.go b/turbo/stages/mock/sentry_mock_test.go index 9a0870e0622..66cf44076ac 100644 --- a/turbo/stages/mock/sentry_mock_test.go +++ b/turbo/stages/mock/sentry_mock_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/gointerfaces/sentry" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/sentry" "github.com/ledgerwatch/log/v3" "github.com/stretchr/testify/require" diff --git a/turbo/stages/stageloop.go b/turbo/stages/stageloop.go index e767ee48dfa..753077dc1db 100644 --- a/turbo/stages/stageloop.go +++ b/turbo/stages/stageloop.go @@ -10,15 +10,15 @@ import ( "github.com/holiman/uint256" "github.com/ledgerwatch/log/v3" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/common/dbg" - proto_downloader "github.com/ledgerwatch/erigon-lib/gointerfaces/downloader" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/memdb" - "github.com/ledgerwatch/erigon-lib/state" "github.com/ledgerwatch/erigon/consensus" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/datadir" + "github.com/ledgerwatch/erigon/erigon-lib/common/dbg" + proto_downloader "github.com/ledgerwatch/erigon/erigon-lib/gointerfaces/downloader" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/memdb" + "github.com/ledgerwatch/erigon/erigon-lib/state" "github.com/ledgerwatch/erigon/params" "github.com/ledgerwatch/erigon/turbo/engineapi/engine_helpers" "github.com/ledgerwatch/erigon/turbo/services" diff --git a/turbo/transactions/call.go b/turbo/transactions/call.go index 822f7505e4b..ce4efba3221 100644 --- a/turbo/transactions/call.go +++ b/turbo/transactions/call.go @@ -8,9 +8,9 @@ import ( "github.com/holiman/uint256" "github.com/ledgerwatch/log/v3" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/erigon/consensus" "github.com/ledgerwatch/erigon/core" diff --git a/turbo/transactions/tracing.go b/turbo/transactions/tracing.go index 31c85f9c23d..92c8dff7f8a 100644 --- a/turbo/transactions/tracing.go +++ b/turbo/transactions/tracing.go @@ -11,9 +11,9 @@ import ( jsoniter "github.com/json-iterator/go" "github.com/ledgerwatch/log/v3" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/chain" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv" ethereum "github.com/ledgerwatch/erigon" "github.com/ledgerwatch/erigon/consensus" diff --git a/turbo/trie/account_node_test.go b/turbo/trie/account_node_test.go index bab99834d1c..64cc420c163 100644 --- a/turbo/trie/account_node_test.go +++ b/turbo/trie/account_node_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "golang.org/x/crypto/sha3" "github.com/ledgerwatch/erigon/common/dbutils" diff --git a/turbo/trie/debug.go b/turbo/trie/debug.go index 7945e611ca0..7115ccaef4c 100644 --- a/turbo/trie/debug.go +++ b/turbo/trie/debug.go @@ -23,7 +23,7 @@ import ( "fmt" "io" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" ) func (t *Trie) Print(w io.Writer) { diff --git a/turbo/trie/debug_test.go b/turbo/trie/debug_test.go index c923f4d914c..7e3a3f64c33 100644 --- a/turbo/trie/debug_test.go +++ b/turbo/trie/debug_test.go @@ -24,7 +24,7 @@ import ( "testing" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/common" "github.com/ledgerwatch/erigon/core/types/accounts" diff --git a/turbo/trie/delete_subrtee_test.go b/turbo/trie/delete_subrtee_test.go index 9cc4e5d9207..6486e31f447 100644 --- a/turbo/trie/delete_subrtee_test.go +++ b/turbo/trie/delete_subrtee_test.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" "github.com/ledgerwatch/erigon/common" "github.com/ledgerwatch/erigon/core/types/accounts" diff --git a/turbo/trie/errors.go b/turbo/trie/errors.go index bf879782fda..eedfabee24f 100644 --- a/turbo/trie/errors.go +++ b/turbo/trie/errors.go @@ -19,7 +19,7 @@ package trie import ( "fmt" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" ) // MissingNodeError is returned by the trie functions (TryGet, TryUpdate, TryDelete) diff --git a/turbo/trie/flatdb_sub_trie_loader_test.go b/turbo/trie/flatdb_sub_trie_loader_test.go index 94eb131a23f..a9a6e453bcb 100644 --- a/turbo/trie/flatdb_sub_trie_loader_test.go +++ b/turbo/trie/flatdb_sub_trie_loader_test.go @@ -5,8 +5,8 @@ import ( "fmt" "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/stretchr/testify/assert" "github.com/ledgerwatch/erigon/common" diff --git a/turbo/trie/gen_struct_step.go b/turbo/trie/gen_struct_step.go index 45651ed75ab..a0ee0750fa1 100644 --- a/turbo/trie/gen_struct_step.go +++ b/turbo/trie/gen_struct_step.go @@ -20,7 +20,7 @@ import ( "fmt" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/turbo/rlphacks" ) diff --git a/turbo/trie/hack.go b/turbo/trie/hack.go index 933a147000c..e41bdf1a567 100644 --- a/turbo/trie/hack.go +++ b/turbo/trie/hack.go @@ -3,7 +3,7 @@ package trie import ( "fmt" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/common" "github.com/ledgerwatch/erigon/rlp" diff --git a/turbo/trie/hashbuilder.go b/turbo/trie/hashbuilder.go index 26e166daee5..29e4d5dca76 100644 --- a/turbo/trie/hashbuilder.go +++ b/turbo/trie/hashbuilder.go @@ -7,8 +7,8 @@ import ( "math/bits" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - length2 "github.com/ledgerwatch/erigon-lib/common/length" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + length2 "github.com/ledgerwatch/erigon/erigon-lib/common/length" "golang.org/x/crypto/sha3" "github.com/ledgerwatch/erigon/common" diff --git a/turbo/trie/hasher.go b/turbo/trie/hasher.go index 194d694a23d..76da74dad4e 100644 --- a/turbo/trie/hasher.go +++ b/turbo/trie/hasher.go @@ -21,8 +21,8 @@ import ( "hash" "sync" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" "golang.org/x/crypto/sha3" "github.com/ledgerwatch/erigon/crypto" diff --git a/turbo/trie/hasher_test.go b/turbo/trie/hasher_test.go index a68a47a4b06..2f7241772a0 100644 --- a/turbo/trie/hasher_test.go +++ b/turbo/trie/hasher_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" ) func TestValue(t *testing.T) { diff --git a/turbo/trie/node.go b/turbo/trie/node.go index b7bb2262237..8e641b67209 100644 --- a/turbo/trie/node.go +++ b/turbo/trie/node.go @@ -20,7 +20,7 @@ import ( "bytes" "io" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/core/types/accounts" diff --git a/turbo/trie/proof.go b/turbo/trie/proof.go index ae0e5243701..11de1aec22d 100644 --- a/turbo/trie/proof.go +++ b/turbo/trie/proof.go @@ -4,12 +4,12 @@ import ( "bytes" "fmt" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/common/length" "github.com/ledgerwatch/erigon/common" "github.com/ledgerwatch/erigon/core/types/accounts" "github.com/ledgerwatch/erigon/crypto" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" "github.com/ledgerwatch/erigon/rlp" ) diff --git a/turbo/trie/retain_list.go b/turbo/trie/retain_list.go index 5bad665aa23..d8da696ebab 100644 --- a/turbo/trie/retain_list.go +++ b/turbo/trie/retain_list.go @@ -24,11 +24,11 @@ import ( "sort" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" "github.com/ledgerwatch/erigon/common" "github.com/ledgerwatch/erigon/common/hexutil" "github.com/ledgerwatch/erigon/core/types/accounts" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" ) type RetainDecider interface { diff --git a/turbo/trie/retain_list_test.go b/turbo/trie/retain_list_test.go index 9c3196bf652..e737bfa54a4 100644 --- a/turbo/trie/retain_list_test.go +++ b/turbo/trie/retain_list_test.go @@ -4,9 +4,9 @@ import ( "testing" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/common/hexutil" "github.com/ledgerwatch/erigon/core/types/accounts" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/stretchr/testify/require" ) diff --git a/turbo/trie/stark_stats.go b/turbo/trie/stark_stats.go index ffa8f0a89d2..1e3ba6fd17d 100644 --- a/turbo/trie/stark_stats.go +++ b/turbo/trie/stark_stats.go @@ -7,8 +7,8 @@ import ( "sort" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - len2 "github.com/ledgerwatch/erigon-lib/common/length" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + len2 "github.com/ledgerwatch/erigon/erigon-lib/common/length" "github.com/ledgerwatch/erigon/core/types/accounts" "github.com/ledgerwatch/erigon/turbo/rlphacks" diff --git a/turbo/trie/stream.go b/turbo/trie/stream.go index c89a5c83369..d0d88ce3333 100644 --- a/turbo/trie/stream.go +++ b/turbo/trie/stream.go @@ -22,8 +22,8 @@ import ( "fmt" "os" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" "github.com/ledgerwatch/erigon/common" "github.com/ledgerwatch/erigon/core/types/accounts" diff --git a/turbo/trie/stream_test.go b/turbo/trie/stream_test.go index 2c3038d5ea6..ab099f83fbb 100644 --- a/turbo/trie/stream_test.go +++ b/turbo/trie/stream_test.go @@ -23,7 +23,7 @@ import ( "sort" "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/common" "github.com/ledgerwatch/erigon/core/types/accounts" diff --git a/turbo/trie/structural_branch_test.go b/turbo/trie/structural_branch_test.go index 39f8f612655..4d541f4b66e 100644 --- a/turbo/trie/structural_branch_test.go +++ b/turbo/trie/structural_branch_test.go @@ -21,9 +21,9 @@ import ( "fmt" "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/memdb" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/memdb" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/turbo/trie/structural_test.go b/turbo/trie/structural_test.go index 9cd3a827bee..2c30d29b739 100644 --- a/turbo/trie/structural_test.go +++ b/turbo/trie/structural_test.go @@ -24,8 +24,8 @@ import ( "fmt" "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" "github.com/stretchr/testify/require" "golang.org/x/exp/slices" diff --git a/turbo/trie/sub_trie_loader.go b/turbo/trie/sub_trie_loader.go index 7e3d41b4972..e982999e3bc 100644 --- a/turbo/trie/sub_trie_loader.go +++ b/turbo/trie/sub_trie_loader.go @@ -1,7 +1,7 @@ package trie import ( - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" ) var emptyHash [32]byte diff --git a/turbo/trie/trie.go b/turbo/trie/trie.go index 6587938ecd9..e58dcc6bd7d 100644 --- a/turbo/trie/trie.go +++ b/turbo/trie/trie.go @@ -22,8 +22,8 @@ import ( "encoding/binary" "fmt" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/cmp" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/cmp" "github.com/ledgerwatch/erigon/core/types/accounts" "github.com/ledgerwatch/erigon/crypto" diff --git a/turbo/trie/trie_root.go b/turbo/trie/trie_root.go index 757bf5807ff..8b582c93760 100644 --- a/turbo/trie/trie_root.go +++ b/turbo/trie/trie_root.go @@ -8,10 +8,10 @@ import ( "math/bits" "time" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" - length2 "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/kv" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/length" + length2 "github.com/ledgerwatch/erigon/erigon-lib/common/length" + "github.com/ledgerwatch/erigon/erigon-lib/kv" "github.com/ledgerwatch/log/v3" "github.com/ledgerwatch/erigon/common" diff --git a/turbo/trie/trie_root_test.go b/turbo/trie/trie_root_test.go index 9db6e3394aa..e0857d4a801 100644 --- a/turbo/trie/trie_root_test.go +++ b/turbo/trie/trie_root_test.go @@ -9,14 +9,14 @@ import ( "time" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/memdb" "github.com/ledgerwatch/erigon/common/dbutils" "github.com/ledgerwatch/erigon/common/hexutil" "github.com/ledgerwatch/erigon/core/types/accounts" "github.com/ledgerwatch/erigon/crypto" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" + "github.com/ledgerwatch/erigon/erigon-lib/common/hexutility" + "github.com/ledgerwatch/erigon/erigon-lib/kv" + "github.com/ledgerwatch/erigon/erigon-lib/kv/memdb" "github.com/ledgerwatch/erigon/eth/stagedsync" "github.com/ledgerwatch/erigon/turbo/trie" "github.com/ledgerwatch/log/v3" diff --git a/turbo/trie/trie_test.go b/turbo/trie/trie_test.go index e6e88496854..5c3929ebe36 100644 --- a/turbo/trie/trie_test.go +++ b/turbo/trie/trie_test.go @@ -26,7 +26,7 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/stretchr/testify/assert" "github.com/ledgerwatch/erigon/common" diff --git a/turbo/trie/visual.go b/turbo/trie/visual.go index fb462d1a6fb..21c4f0703e9 100644 --- a/turbo/trie/visual.go +++ b/turbo/trie/visual.go @@ -23,7 +23,7 @@ import ( "io" "math/big" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/visual" ) diff --git a/turbo/trie/witness_builder.go b/turbo/trie/witness_builder.go index d517b0ad8c5..b0a6e35b8c0 100644 --- a/turbo/trie/witness_builder.go +++ b/turbo/trie/witness_builder.go @@ -4,7 +4,7 @@ import ( "fmt" "math/big" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" ) type HashNodeFunc func(node, bool, []byte) (int, error) diff --git a/turbo/trie/witness_builder_test.go b/turbo/trie/witness_builder_test.go index a5e60d52fae..e8c890fdc94 100644 --- a/turbo/trie/witness_builder_test.go +++ b/turbo/trie/witness_builder_test.go @@ -4,7 +4,7 @@ import ( "bytes" "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ledgerwatch/erigon/core/types/accounts" ) diff --git a/turbo/trie/witness_marshalling.go b/turbo/trie/witness_marshalling.go index 2bd13143f08..fe464889944 100644 --- a/turbo/trie/witness_marshalling.go +++ b/turbo/trie/witness_marshalling.go @@ -4,7 +4,7 @@ import ( "fmt" "io" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ugorji/go/codec" ) diff --git a/turbo/trie/witness_operators.go b/turbo/trie/witness_operators.go index e61a7df5304..8e1f38b90b3 100644 --- a/turbo/trie/witness_operators.go +++ b/turbo/trie/witness_operators.go @@ -3,7 +3,7 @@ package trie import ( "math/big" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" "github.com/ugorji/go/codec" ) diff --git a/turbo/trie/witness_test.go b/turbo/trie/witness_test.go index 23f0148aaca..3231c45769b 100644 --- a/turbo/trie/witness_test.go +++ b/turbo/trie/witness_test.go @@ -6,7 +6,7 @@ import ( "math/big" "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/ledgerwatch/erigon/erigon-lib/common" ) func generateOperands() []WitnessOperator {