diff --git a/.golangci.yaml b/.golangci.yaml index 996a47f6a..f31b32156 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -105,8 +105,8 @@ linters-settings: - Prefix(cosmossdk.io) - Prefix(github.com/cosmos/cosmos-sdk - Prefix(github.com/ethereum/go-ethereum - - Prefix(pkg.berachain.dev - - Prefix(pkg.berachain.dev/polaris + - Prefix(github.com/berachain + - Prefix(github.com/berachain/polaris - blank - dot skip-generated: true diff --git a/.mockery.yaml b/.mockery.yaml index 1bccd82cd..c61f5bda7 100644 --- a/.mockery.yaml +++ b/.mockery.yaml @@ -3,17 +3,17 @@ mockname: "{{.InterfaceNameCamel}}" filename: "{{.InterfaceNameSnake}}.go" outpkg: "mocks" packages: - pkg.berachain.dev/polaris/cosmos/config: + github.com/berachain/polaris/cosmos/config: config: recursive: True with-expecter: true all: True - pkg.berachain.dev/polaris/cosmos/runtime/txpool: + github.com/berachain/polaris/cosmos/runtime/txpool: config: recursive: True with-expecter: true all: True - pkg.berachain.dev/polaris/eth/core/state: + github.com/berachain/polaris/eth/core/state: config: recursive: True with-expecter: true diff --git a/README.md b/README.md index bb0be6fdc..aa3c33db8 100644 --- a/README.md +++ b/README.md @@ -6,10 +6,10 @@
- + - - Go Reference + + Go Reference Telegram Chat @@ -21,8 +21,6 @@
- - ## What is Polaris? Introducing Polaris, the revolutionary framework designed to simplify the integration of an Ethereum Virtual Machine (EVM) into your application. Polaris is built with a clean, easy-to-integrate API that eliminates the need for developers to spend time hacking together their own EVM integration solutions. Our framework is highly modular, allowing you to choose the components that best fit your needs and integrate an EVM environment into virtually any application. @@ -55,7 +53,6 @@ If you want to help contribute to the framework, check out the [Framework Specs] ├── tools: Package for holding tooling deps. - ## Build & Test [Golang 1.20+](https://go.dev/doc/install) and [Foundry](https://book.getfoundry.sh/getting-started/installation) are required for Polaris. diff --git a/build/scripts/proto_generate.sh b/build/scripts/proto_generate.sh index e6bedc295..67335b8e7 100755 --- a/build/scripts/proto_generate.sh +++ b/build/scripts/proto_generate.sh @@ -44,8 +44,8 @@ for dir in $proto_dirs; do done # move proto files to the right places -cp -r pkg.berachain.dev/polaris/* ../ -rm -rf pkg.berachain.dev +cp -r github.com/berachain/polaris/* ../ +rm -rf github.com/berachain cd ../ diff --git a/build/tools/go.mod b/build/tools/go.mod index af36d14f9..797cee602 100644 --- a/build/tools/go.mod +++ b/build/tools/go.mod @@ -1,4 +1,4 @@ -module pkg.berachain.dev/polaris/build/tools +module github.com/berachain/polaris/build/tools go 1.21 diff --git a/contracts/bindings/testing/swapper.abigen.go b/contracts/bindings/testing/swapper.abigen.go deleted file mode 100644 index d97fcc510..000000000 --- a/contracts/bindings/testing/swapper.abigen.go +++ /dev/null @@ -1,328 +0,0 @@ -// Code generated - DO NOT EDIT. -// This file is a generated binding and any manual changes will be lost. - -package testing - -import ( - "errors" - "math/big" - "strings" - - ethereum "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/event" -) - -// Reference imports to suppress errors if they are not otherwise used. -var ( - _ = errors.New - _ = big.NewInt - _ = strings.NewReader - _ = ethereum.NotFound - _ = bind.Bind - _ = common.Big1 - _ = types.BloomLookup - _ = event.NewSubscription - _ = abi.ConvertType -) - -// SwapperMetaData contains all meta data concerning the Swapper contract. -var SwapperMetaData = &bind.MetaData{ - ABI: "[{\"inputs\":[{\"internalType\":\"address\",\"name\":\"token\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"amount\",\"type\":\"uint256\"}],\"name\":\"deposit\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"erc20Module\",\"outputs\":[{\"internalType\":\"contractIERC20Module\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"string\",\"name\":\"denom\",\"type\":\"string\"}],\"name\":\"getPolarisERC20\",\"outputs\":[{\"internalType\":\"contractIERC20\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"string\",\"name\":\"denom\",\"type\":\"string\"},{\"internalType\":\"uint256\",\"name\":\"amount\",\"type\":\"uint256\"}],\"name\":\"swap\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"contractIERC20\",\"name\":\"token\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"amount\",\"type\":\"uint256\"}],\"name\":\"swap\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"}]", - Bin: "0x60a06040526269696973ffffffffffffffffffffffffffffffffffffffff1660809073ffffffffffffffffffffffffffffffffffffffff16815250348015610045575f80fd5b50608051610b116100735f395f81816101c2015281816101e7015281816102d101526103b80152610b115ff3fe608060405234801561000f575f80fd5b5060043610610055575f3560e01c806347e7ef2414610059578063714ba40c146100755780639d456b6214610093578063d004f0f7146100af578063d6ece467146100cb575b5f80fd5b610073600480360381019061006e91906104ed565b6100fb565b005b61007d6101c0565b60405161008a9190610586565b60405180910390f35b6100ad60048036038101906100a89190610600565b6101e4565b005b6100c960048036038101906100c49190610698565b6102ce565b005b6100e560048036038101906100e091906106d6565b6103b5565b6040516100f29190610741565b60405180910390f35b5f8273ffffffffffffffffffffffffffffffffffffffff166323b872dd3330856040518463ffffffff1660e01b815260040161013993929190610778565b6020604051808303815f875af1158015610155573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061017991906107e2565b9050806101bb576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016101b290610867565b60405180910390fd5b505050565b7f000000000000000000000000000000000000000000000000000000000000000081565b5f7f000000000000000000000000000000000000000000000000000000000000000073ffffffffffffffffffffffffffffffffffffffff1663096b406985853333876040518663ffffffff1660e01b81526004016102469594939291906108cf565b6020604051808303815f875af1158015610262573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061028691906107e2565b9050806102c8576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016102bf9061098b565b60405180910390fd5b50505050565b5f7f000000000000000000000000000000000000000000000000000000000000000073ffffffffffffffffffffffffffffffffffffffff1663b96d8bec843333866040518563ffffffff1660e01b815260040161032e94939291906109a9565b6020604051808303815f875af115801561034a573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061036e91906107e2565b9050806103b0576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016103a790610a5c565b60405180910390fd5b505050565b5f7f000000000000000000000000000000000000000000000000000000000000000073ffffffffffffffffffffffffffffffffffffffff1663a333e57c84846040518363ffffffff1660e01b8152600401610411929190610a7a565b602060405180830381865afa15801561042c573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906104509190610ab0565b905092915050565b5f80fd5b5f80fd5b5f73ffffffffffffffffffffffffffffffffffffffff82169050919050565b5f61048982610460565b9050919050565b6104998161047f565b81146104a3575f80fd5b50565b5f813590506104b481610490565b92915050565b5f819050919050565b6104cc816104ba565b81146104d6575f80fd5b50565b5f813590506104e7816104c3565b92915050565b5f806040838503121561050357610502610458565b5b5f610510858286016104a6565b9250506020610521858286016104d9565b9150509250929050565b5f819050919050565b5f61054e61054961054484610460565b61052b565b610460565b9050919050565b5f61055f82610534565b9050919050565b5f61057082610555565b9050919050565b61058081610566565b82525050565b5f6020820190506105995f830184610577565b92915050565b5f80fd5b5f80fd5b5f80fd5b5f8083601f8401126105c0576105bf61059f565b5b8235905067ffffffffffffffff8111156105dd576105dc6105a3565b5b6020830191508360018202830111156105f9576105f86105a7565b5b9250929050565b5f805f6040848603121561061757610616610458565b5b5f84013567ffffffffffffffff8111156106345761063361045c565b5b610640868287016105ab565b93509350506020610653868287016104d9565b9150509250925092565b5f6106678261047f565b9050919050565b6106778161065d565b8114610681575f80fd5b50565b5f813590506106928161066e565b92915050565b5f80604083850312156106ae576106ad610458565b5b5f6106bb85828601610684565b92505060206106cc858286016104d9565b9150509250929050565b5f80602083850312156106ec576106eb610458565b5b5f83013567ffffffffffffffff8111156107095761070861045c565b5b610715858286016105ab565b92509250509250929050565b5f61072b82610555565b9050919050565b61073b81610721565b82525050565b5f6020820190506107545f830184610732565b92915050565b6107638161047f565b82525050565b610772816104ba565b82525050565b5f60608201905061078b5f83018661075a565b610798602083018561075a565b6107a56040830184610769565b949350505050565b5f8115159050919050565b6107c1816107ad565b81146107cb575f80fd5b50565b5f815190506107dc816107b8565b92915050565b5f602082840312156107f7576107f6610458565b5b5f610804848285016107ce565b91505092915050565b5f82825260208201905092915050565b7f537761707065723a207472616e7366657246726f6d206661696c6564000000005f82015250565b5f610851601c8361080d565b915061085c8261081d565b602082019050919050565b5f6020820190508181035f83015261087e81610845565b9050919050565b828183375f83830152505050565b5f601f19601f8301169050919050565b5f6108ae838561080d565b93506108bb838584610885565b6108c483610893565b840190509392505050565b5f6080820190508181035f8301526108e88187896108a3565b90506108f7602083018661075a565b610904604083018561075a565b6109116060830184610769565b9695505050505050565b7f537761707065723a207472616e73666572436f696e546f4552433230206661695f8201527f6c65640000000000000000000000000000000000000000000000000000000000602082015250565b5f61097560238361080d565b91506109808261091b565b604082019050919050565b5f6020820190508181035f8301526109a281610969565b9050919050565b5f6080820190506109bc5f830187610732565b6109c9602083018661075a565b6109d6604083018561075a565b6109e36060830184610769565b95945050505050565b7f537761707065723a207472616e736665724552433230546f436f696e206661695f8201527f6c65640000000000000000000000000000000000000000000000000000000000602082015250565b5f610a4660238361080d565b9150610a51826109ec565b604082019050919050565b5f6020820190508181035f830152610a7381610a3a565b9050919050565b5f6020820190508181035f830152610a938184866108a3565b90509392505050565b5f81519050610aaa8161066e565b92915050565b5f60208284031215610ac557610ac4610458565b5b5f610ad284828501610a9c565b9150509291505056fea26469706673582212207ab3aee3982357eeca7f05ecd5f7b028fbb4e4438a4437b2b3294519a7e25bcc64736f6c63430008140033", -} - -// SwapperABI is the input ABI used to generate the binding from. -// Deprecated: Use SwapperMetaData.ABI instead. -var SwapperABI = SwapperMetaData.ABI - -// SwapperBin is the compiled bytecode used for deploying new contracts. -// Deprecated: Use SwapperMetaData.Bin instead. -var SwapperBin = SwapperMetaData.Bin - -// DeploySwapper deploys a new Ethereum contract, binding an instance of Swapper to it. -func DeploySwapper(auth *bind.TransactOpts, backend bind.ContractBackend) (common.Address, *types.Transaction, *Swapper, error) { - parsed, err := SwapperMetaData.GetAbi() - if err != nil { - return common.Address{}, nil, nil, err - } - if parsed == nil { - return common.Address{}, nil, nil, errors.New("GetABI returned nil") - } - - address, tx, contract, err := bind.DeployContract(auth, *parsed, common.FromHex(SwapperBin), backend) - if err != nil { - return common.Address{}, nil, nil, err - } - return address, tx, &Swapper{SwapperCaller: SwapperCaller{contract: contract}, SwapperTransactor: SwapperTransactor{contract: contract}, SwapperFilterer: SwapperFilterer{contract: contract}}, nil -} - -// Swapper is an auto generated Go binding around an Ethereum contract. -type Swapper struct { - SwapperCaller // Read-only binding to the contract - SwapperTransactor // Write-only binding to the contract - SwapperFilterer // Log filterer for contract events -} - -// SwapperCaller is an auto generated read-only Go binding around an Ethereum contract. -type SwapperCaller struct { - contract *bind.BoundContract // Generic contract wrapper for the low level calls -} - -// SwapperTransactor is an auto generated write-only Go binding around an Ethereum contract. -type SwapperTransactor struct { - contract *bind.BoundContract // Generic contract wrapper for the low level calls -} - -// SwapperFilterer is an auto generated log filtering Go binding around an Ethereum contract events. -type SwapperFilterer struct { - contract *bind.BoundContract // Generic contract wrapper for the low level calls -} - -// SwapperSession is an auto generated Go binding around an Ethereum contract, -// with pre-set call and transact options. -type SwapperSession struct { - Contract *Swapper // Generic contract binding to set the session for - CallOpts bind.CallOpts // Call options to use throughout this session - TransactOpts bind.TransactOpts // Transaction auth options to use throughout this session -} - -// SwapperCallerSession is an auto generated read-only Go binding around an Ethereum contract, -// with pre-set call options. -type SwapperCallerSession struct { - Contract *SwapperCaller // Generic contract caller binding to set the session for - CallOpts bind.CallOpts // Call options to use throughout this session -} - -// SwapperTransactorSession is an auto generated write-only Go binding around an Ethereum contract, -// with pre-set transact options. -type SwapperTransactorSession struct { - Contract *SwapperTransactor // Generic contract transactor binding to set the session for - TransactOpts bind.TransactOpts // Transaction auth options to use throughout this session -} - -// SwapperRaw is an auto generated low-level Go binding around an Ethereum contract. -type SwapperRaw struct { - Contract *Swapper // Generic contract binding to access the raw methods on -} - -// SwapperCallerRaw is an auto generated low-level read-only Go binding around an Ethereum contract. -type SwapperCallerRaw struct { - Contract *SwapperCaller // Generic read-only contract binding to access the raw methods on -} - -// SwapperTransactorRaw is an auto generated low-level write-only Go binding around an Ethereum contract. -type SwapperTransactorRaw struct { - Contract *SwapperTransactor // Generic write-only contract binding to access the raw methods on -} - -// NewSwapper creates a new instance of Swapper, bound to a specific deployed contract. -func NewSwapper(address common.Address, backend bind.ContractBackend) (*Swapper, error) { - contract, err := bindSwapper(address, backend, backend, backend) - if err != nil { - return nil, err - } - return &Swapper{SwapperCaller: SwapperCaller{contract: contract}, SwapperTransactor: SwapperTransactor{contract: contract}, SwapperFilterer: SwapperFilterer{contract: contract}}, nil -} - -// NewSwapperCaller creates a new read-only instance of Swapper, bound to a specific deployed contract. -func NewSwapperCaller(address common.Address, caller bind.ContractCaller) (*SwapperCaller, error) { - contract, err := bindSwapper(address, caller, nil, nil) - if err != nil { - return nil, err - } - return &SwapperCaller{contract: contract}, nil -} - -// NewSwapperTransactor creates a new write-only instance of Swapper, bound to a specific deployed contract. -func NewSwapperTransactor(address common.Address, transactor bind.ContractTransactor) (*SwapperTransactor, error) { - contract, err := bindSwapper(address, nil, transactor, nil) - if err != nil { - return nil, err - } - return &SwapperTransactor{contract: contract}, nil -} - -// NewSwapperFilterer creates a new log filterer instance of Swapper, bound to a specific deployed contract. -func NewSwapperFilterer(address common.Address, filterer bind.ContractFilterer) (*SwapperFilterer, error) { - contract, err := bindSwapper(address, nil, nil, filterer) - if err != nil { - return nil, err - } - return &SwapperFilterer{contract: contract}, nil -} - -// bindSwapper binds a generic wrapper to an already deployed contract. -func bindSwapper(address common.Address, caller bind.ContractCaller, transactor bind.ContractTransactor, filterer bind.ContractFilterer) (*bind.BoundContract, error) { - parsed, err := SwapperMetaData.GetAbi() - if err != nil { - return nil, err - } - return bind.NewBoundContract(address, *parsed, caller, transactor, filterer), nil -} - -// Call invokes the (constant) contract method with params as input values and -// sets the output to result. The result type might be a single field for simple -// returns, a slice of interfaces for anonymous returns and a struct for named -// returns. -func (_Swapper *SwapperRaw) Call(opts *bind.CallOpts, result *[]interface{}, method string, params ...interface{}) error { - return _Swapper.Contract.SwapperCaller.contract.Call(opts, result, method, params...) -} - -// Transfer initiates a plain transaction to move funds to the contract, calling -// its default method if one is available. -func (_Swapper *SwapperRaw) Transfer(opts *bind.TransactOpts) (*types.Transaction, error) { - return _Swapper.Contract.SwapperTransactor.contract.Transfer(opts) -} - -// Transact invokes the (paid) contract method with params as input values. -func (_Swapper *SwapperRaw) Transact(opts *bind.TransactOpts, method string, params ...interface{}) (*types.Transaction, error) { - return _Swapper.Contract.SwapperTransactor.contract.Transact(opts, method, params...) -} - -// Call invokes the (constant) contract method with params as input values and -// sets the output to result. The result type might be a single field for simple -// returns, a slice of interfaces for anonymous returns and a struct for named -// returns. -func (_Swapper *SwapperCallerRaw) Call(opts *bind.CallOpts, result *[]interface{}, method string, params ...interface{}) error { - return _Swapper.Contract.contract.Call(opts, result, method, params...) -} - -// Transfer initiates a plain transaction to move funds to the contract, calling -// its default method if one is available. -func (_Swapper *SwapperTransactorRaw) Transfer(opts *bind.TransactOpts) (*types.Transaction, error) { - return _Swapper.Contract.contract.Transfer(opts) -} - -// Transact invokes the (paid) contract method with params as input values. -func (_Swapper *SwapperTransactorRaw) Transact(opts *bind.TransactOpts, method string, params ...interface{}) (*types.Transaction, error) { - return _Swapper.Contract.contract.Transact(opts, method, params...) -} - -// Erc20Module is a free data retrieval call binding the contract method 0x714ba40c. -// -// Solidity: function erc20Module() view returns(address) -func (_Swapper *SwapperCaller) Erc20Module(opts *bind.CallOpts) (common.Address, error) { - var out []interface{} - err := _Swapper.contract.Call(opts, &out, "erc20Module") - - if err != nil { - return *new(common.Address), err - } - - out0 := *abi.ConvertType(out[0], new(common.Address)).(*common.Address) - - return out0, err - -} - -// Erc20Module is a free data retrieval call binding the contract method 0x714ba40c. -// -// Solidity: function erc20Module() view returns(address) -func (_Swapper *SwapperSession) Erc20Module() (common.Address, error) { - return _Swapper.Contract.Erc20Module(&_Swapper.CallOpts) -} - -// Erc20Module is a free data retrieval call binding the contract method 0x714ba40c. -// -// Solidity: function erc20Module() view returns(address) -func (_Swapper *SwapperCallerSession) Erc20Module() (common.Address, error) { - return _Swapper.Contract.Erc20Module(&_Swapper.CallOpts) -} - -// GetPolarisERC20 is a free data retrieval call binding the contract method 0xd6ece467. -// -// Solidity: function getPolarisERC20(string denom) view returns(address) -func (_Swapper *SwapperCaller) GetPolarisERC20(opts *bind.CallOpts, denom string) (common.Address, error) { - var out []interface{} - err := _Swapper.contract.Call(opts, &out, "getPolarisERC20", denom) - - if err != nil { - return *new(common.Address), err - } - - out0 := *abi.ConvertType(out[0], new(common.Address)).(*common.Address) - - return out0, err - -} - -// GetPolarisERC20 is a free data retrieval call binding the contract method 0xd6ece467. -// -// Solidity: function getPolarisERC20(string denom) view returns(address) -func (_Swapper *SwapperSession) GetPolarisERC20(denom string) (common.Address, error) { - return _Swapper.Contract.GetPolarisERC20(&_Swapper.CallOpts, denom) -} - -// GetPolarisERC20 is a free data retrieval call binding the contract method 0xd6ece467. -// -// Solidity: function getPolarisERC20(string denom) view returns(address) -func (_Swapper *SwapperCallerSession) GetPolarisERC20(denom string) (common.Address, error) { - return _Swapper.Contract.GetPolarisERC20(&_Swapper.CallOpts, denom) -} - -// Deposit is a paid mutator transaction binding the contract method 0x47e7ef24. -// -// Solidity: function deposit(address token, uint256 amount) returns() -func (_Swapper *SwapperTransactor) Deposit(opts *bind.TransactOpts, token common.Address, amount *big.Int) (*types.Transaction, error) { - return _Swapper.contract.Transact(opts, "deposit", token, amount) -} - -// Deposit is a paid mutator transaction binding the contract method 0x47e7ef24. -// -// Solidity: function deposit(address token, uint256 amount) returns() -func (_Swapper *SwapperSession) Deposit(token common.Address, amount *big.Int) (*types.Transaction, error) { - return _Swapper.Contract.Deposit(&_Swapper.TransactOpts, token, amount) -} - -// Deposit is a paid mutator transaction binding the contract method 0x47e7ef24. -// -// Solidity: function deposit(address token, uint256 amount) returns() -func (_Swapper *SwapperTransactorSession) Deposit(token common.Address, amount *big.Int) (*types.Transaction, error) { - return _Swapper.Contract.Deposit(&_Swapper.TransactOpts, token, amount) -} - -// Swap is a paid mutator transaction binding the contract method 0x9d456b62. -// -// Solidity: function swap(string denom, uint256 amount) returns() -func (_Swapper *SwapperTransactor) Swap(opts *bind.TransactOpts, denom string, amount *big.Int) (*types.Transaction, error) { - return _Swapper.contract.Transact(opts, "swap", denom, amount) -} - -// Swap is a paid mutator transaction binding the contract method 0x9d456b62. -// -// Solidity: function swap(string denom, uint256 amount) returns() -func (_Swapper *SwapperSession) Swap(denom string, amount *big.Int) (*types.Transaction, error) { - return _Swapper.Contract.Swap(&_Swapper.TransactOpts, denom, amount) -} - -// Swap is a paid mutator transaction binding the contract method 0x9d456b62. -// -// Solidity: function swap(string denom, uint256 amount) returns() -func (_Swapper *SwapperTransactorSession) Swap(denom string, amount *big.Int) (*types.Transaction, error) { - return _Swapper.Contract.Swap(&_Swapper.TransactOpts, denom, amount) -} - -// Swap0 is a paid mutator transaction binding the contract method 0xd004f0f7. -// -// Solidity: function swap(address token, uint256 amount) returns() -func (_Swapper *SwapperTransactor) Swap0(opts *bind.TransactOpts, token common.Address, amount *big.Int) (*types.Transaction, error) { - return _Swapper.contract.Transact(opts, "swap0", token, amount) -} - -// Swap0 is a paid mutator transaction binding the contract method 0xd004f0f7. -// -// Solidity: function swap(address token, uint256 amount) returns() -func (_Swapper *SwapperSession) Swap0(token common.Address, amount *big.Int) (*types.Transaction, error) { - return _Swapper.Contract.Swap0(&_Swapper.TransactOpts, token, amount) -} - -// Swap0 is a paid mutator transaction binding the contract method 0xd004f0f7. -// -// Solidity: function swap(address token, uint256 amount) returns() -func (_Swapper *SwapperTransactorSession) Swap0(token common.Address, amount *big.Int) (*types.Transaction, error) { - return _Swapper.Contract.Swap0(&_Swapper.TransactOpts, token, amount) -} diff --git a/contracts/go.mod b/contracts/go.mod index daac540e6..9660ad98b 100644 --- a/contracts/go.mod +++ b/contracts/go.mod @@ -1,4 +1,4 @@ -module pkg.berachain.dev/polaris/contracts +module github.com/berachain/polaris/contracts go 1.21 diff --git a/cosmos/api/polaris/evm/module/v1alpha1/module.pulsar.go b/cosmos/api/polaris/evm/module/v1alpha1/module.pulsar.go index 59598b7ec..4f0a13ffe 100644 --- a/cosmos/api/polaris/evm/module/v1alpha1/module.pulsar.go +++ b/cosmos/api/polaris/evm/module/v1alpha1/module.pulsar.go @@ -438,27 +438,27 @@ var file_polaris_evm_module_v1alpha1_module_proto_rawDesc = []byte{ 0x72, 0x69, 0x73, 0x2e, 0x65, 0x76, 0x6d, 0x2e, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x2e, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x1a, 0x20, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2f, 0x61, 0x70, 0x70, 0x2f, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x2f, 0x6d, 0x6f, 0x64, - 0x75, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x38, 0x0a, 0x06, 0x4d, 0x6f, 0x64, - 0x75, 0x6c, 0x65, 0x3a, 0x2e, 0xba, 0xc0, 0x96, 0xda, 0x01, 0x28, 0x0a, 0x26, 0x70, 0x6b, 0x67, - 0x2e, 0x62, 0x65, 0x72, 0x61, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x2e, 0x64, 0x65, 0x76, 0x2f, 0x70, - 0x6f, 0x6c, 0x61, 0x72, 0x69, 0x73, 0x2f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2f, 0x78, 0x2f, - 0x65, 0x76, 0x6d, 0x42, 0xfa, 0x01, 0x0a, 0x1f, 0x63, 0x6f, 0x6d, 0x2e, 0x70, 0x6f, 0x6c, 0x61, - 0x72, 0x69, 0x73, 0x2e, 0x65, 0x76, 0x6d, 0x2e, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x2e, 0x76, - 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x42, 0x0b, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x50, - 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x3b, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x73, 0x64, - 0x6b, 0x2e, 0x69, 0x6f, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x70, 0x6f, 0x6c, 0x61, 0x72, 0x69, 0x73, - 0x2f, 0x65, 0x76, 0x6d, 0x2f, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x2f, 0x76, 0x31, 0x61, 0x6c, - 0x70, 0x68, 0x61, 0x31, 0x3b, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x76, 0x31, 0x61, 0x6c, 0x70, - 0x68, 0x61, 0x31, 0xa2, 0x02, 0x03, 0x50, 0x45, 0x4d, 0xaa, 0x02, 0x1b, 0x50, 0x6f, 0x6c, 0x61, - 0x72, 0x69, 0x73, 0x2e, 0x45, 0x76, 0x6d, 0x2e, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x2e, 0x56, - 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0xca, 0x02, 0x1b, 0x50, 0x6f, 0x6c, 0x61, 0x72, 0x69, - 0x73, 0x5c, 0x45, 0x76, 0x6d, 0x5c, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x5c, 0x56, 0x31, 0x61, - 0x6c, 0x70, 0x68, 0x61, 0x31, 0xe2, 0x02, 0x27, 0x50, 0x6f, 0x6c, 0x61, 0x72, 0x69, 0x73, 0x5c, - 0x45, 0x76, 0x6d, 0x5c, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x5c, 0x56, 0x31, 0x61, 0x6c, 0x70, - 0x68, 0x61, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, - 0x02, 0x1e, 0x50, 0x6f, 0x6c, 0x61, 0x72, 0x69, 0x73, 0x3a, 0x3a, 0x45, 0x76, 0x6d, 0x3a, 0x3a, - 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x3a, 0x3a, 0x56, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, - 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x75, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x3b, 0x0a, 0x06, 0x4d, 0x6f, 0x64, + 0x75, 0x6c, 0x65, 0x3a, 0x31, 0xba, 0xc0, 0x96, 0xda, 0x01, 0x2b, 0x0a, 0x29, 0x67, 0x69, 0x74, + 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x62, 0x65, 0x72, 0x61, 0x63, 0x68, 0x61, 0x69, + 0x6e, 0x2f, 0x70, 0x6f, 0x6c, 0x61, 0x72, 0x69, 0x73, 0x2f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, + 0x2f, 0x78, 0x2f, 0x65, 0x76, 0x6d, 0x42, 0xfa, 0x01, 0x0a, 0x1f, 0x63, 0x6f, 0x6d, 0x2e, 0x70, + 0x6f, 0x6c, 0x61, 0x72, 0x69, 0x73, 0x2e, 0x65, 0x76, 0x6d, 0x2e, 0x6d, 0x6f, 0x64, 0x75, 0x6c, + 0x65, 0x2e, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x42, 0x0b, 0x4d, 0x6f, 0x64, 0x75, + 0x6c, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x3b, 0x63, 0x6f, 0x73, 0x6d, 0x6f, + 0x73, 0x73, 0x64, 0x6b, 0x2e, 0x69, 0x6f, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x70, 0x6f, 0x6c, 0x61, + 0x72, 0x69, 0x73, 0x2f, 0x65, 0x76, 0x6d, 0x2f, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x2f, 0x76, + 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x3b, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x76, 0x31, + 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0xa2, 0x02, 0x03, 0x50, 0x45, 0x4d, 0xaa, 0x02, 0x1b, 0x50, + 0x6f, 0x6c, 0x61, 0x72, 0x69, 0x73, 0x2e, 0x45, 0x76, 0x6d, 0x2e, 0x4d, 0x6f, 0x64, 0x75, 0x6c, + 0x65, 0x2e, 0x56, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0xca, 0x02, 0x1b, 0x50, 0x6f, 0x6c, + 0x61, 0x72, 0x69, 0x73, 0x5c, 0x45, 0x76, 0x6d, 0x5c, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x5c, + 0x56, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0xe2, 0x02, 0x27, 0x50, 0x6f, 0x6c, 0x61, 0x72, + 0x69, 0x73, 0x5c, 0x45, 0x76, 0x6d, 0x5c, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x5c, 0x56, 0x31, + 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, + 0x74, 0x61, 0xea, 0x02, 0x1e, 0x50, 0x6f, 0x6c, 0x61, 0x72, 0x69, 0x73, 0x3a, 0x3a, 0x45, 0x76, + 0x6d, 0x3a, 0x3a, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x3a, 0x3a, 0x56, 0x31, 0x61, 0x6c, 0x70, + 0x68, 0x61, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/cosmos/config/config.go b/cosmos/config/config.go index 8fffcae5b..c7bd4c1ac 100644 --- a/cosmos/config/config.go +++ b/cosmos/config/config.go @@ -23,15 +23,15 @@ package config import ( "math/big" + "github.com/berachain/polaris/cosmos/config/flags" + "github.com/berachain/polaris/eth" + "github.com/berachain/polaris/eth/accounts" + "github.com/berachain/polaris/eth/node" + "github.com/berachain/polaris/eth/polar" + sdkflags "github.com/cosmos/cosmos-sdk/client/flags" servertypes "github.com/cosmos/cosmos-sdk/server/types" sdk "github.com/cosmos/cosmos-sdk/types" - - "pkg.berachain.dev/polaris/cosmos/config/flags" - "pkg.berachain.dev/polaris/eth" - "pkg.berachain.dev/polaris/eth/accounts" - "pkg.berachain.dev/polaris/eth/node" - "pkg.berachain.dev/polaris/eth/polar" ) type Config = eth.Config diff --git a/cosmos/config/config_test.go b/cosmos/config/config_test.go index 988da0af1..0cc492e56 100644 --- a/cosmos/config/config_test.go +++ b/cosmos/config/config_test.go @@ -21,12 +21,12 @@ package config_test import ( + sgconfig "github.com/berachain/polaris/cosmos/config" + "github.com/berachain/polaris/eth/accounts" + "github.com/cosmos/cosmos-sdk/crypto/hd" sdk "github.com/cosmos/cosmos-sdk/types" - sgconfig "pkg.berachain.dev/polaris/cosmos/config" - "pkg.berachain.dev/polaris/eth/accounts" - . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cosmos/config/mocks/app_options.go b/cosmos/config/mocks/app_options.go index 9c73a94b2..b86f949fd 100644 --- a/cosmos/config/mocks/app_options.go +++ b/cosmos/config/mocks/app_options.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.36.1. DO NOT EDIT. package mocks diff --git a/cosmos/config/parser.go b/cosmos/config/parser.go index 2dbea539e..126c8f724 100644 --- a/cosmos/config/parser.go +++ b/cosmos/config/parser.go @@ -26,10 +26,10 @@ import ( "github.com/spf13/cast" - servertypes "github.com/cosmos/cosmos-sdk/server/types" + "github.com/berachain/polaris/eth/common" + "github.com/berachain/polaris/eth/common/hexutil" - "pkg.berachain.dev/polaris/eth/common" - "pkg.berachain.dev/polaris/eth/common/hexutil" + servertypes "github.com/cosmos/cosmos-sdk/server/types" ) // baseTen is for the big.Int string conversation. diff --git a/cosmos/config/parser_test.go b/cosmos/config/parser_test.go index 120ea8dc8..bf624b20c 100644 --- a/cosmos/config/parser_test.go +++ b/cosmos/config/parser_test.go @@ -24,9 +24,9 @@ import ( "testing" "time" - "pkg.berachain.dev/polaris/cosmos/config/mocks" - "pkg.berachain.dev/polaris/eth/common" - "pkg.berachain.dev/polaris/eth/common/hexutil" + "github.com/berachain/polaris/cosmos/config/mocks" + "github.com/berachain/polaris/eth/common" + "github.com/berachain/polaris/eth/common/hexutil" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cosmos/crypto/codec/codec.go b/cosmos/crypto/codec/codec.go index c3daf7490..dc18f5f4a 100644 --- a/cosmos/crypto/codec/codec.go +++ b/cosmos/crypto/codec/codec.go @@ -21,10 +21,10 @@ package codec import ( + "github.com/berachain/polaris/cosmos/crypto/keys/ethsecp256k1" + codectypes "github.com/cosmos/cosmos-sdk/codec/types" cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" - - "pkg.berachain.dev/polaris/cosmos/crypto/keys/ethsecp256k1" ) // RegisterInterfaces registers the ethsecp256k1 key types. diff --git a/cosmos/crypto/hd/algo.go b/cosmos/crypto/hd/algo.go index 52f3cd66b..414d40a53 100644 --- a/cosmos/crypto/hd/algo.go +++ b/cosmos/crypto/hd/algo.go @@ -21,11 +21,11 @@ package hd import ( + "github.com/berachain/polaris/cosmos/crypto/keys/ethsecp256k1" + "github.com/cosmos/cosmos-sdk/crypto/hd" "github.com/cosmos/cosmos-sdk/crypto/keyring" cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" - - "pkg.berachain.dev/polaris/cosmos/crypto/keys/ethsecp256k1" ) const ( diff --git a/cosmos/crypto/hd/algo_test.go b/cosmos/crypto/hd/algo_test.go index 6534203f9..000a4b77f 100644 --- a/cosmos/crypto/hd/algo_test.go +++ b/cosmos/crypto/hd/algo_test.go @@ -23,13 +23,13 @@ package hd import ( "strings" - "github.com/cosmos/cosmos-sdk/crypto/keyring" + ethsecp256k1 "github.com/berachain/polaris/cosmos/crypto/keys/ethsecp256k1" + "github.com/berachain/polaris/eth/accounts" + "github.com/berachain/polaris/eth/common" + crypto "github.com/berachain/polaris/eth/crypto" + "github.com/berachain/polaris/lib/utils" - ethsecp256k1 "pkg.berachain.dev/polaris/cosmos/crypto/keys/ethsecp256k1" - "pkg.berachain.dev/polaris/eth/accounts" - "pkg.berachain.dev/polaris/eth/common" - crypto "pkg.berachain.dev/polaris/eth/crypto" - "pkg.berachain.dev/polaris/lib/utils" + "github.com/cosmos/cosmos-sdk/crypto/keyring" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cosmos/crypto/keyring/option.go b/cosmos/crypto/keyring/option.go index c00291622..5056b7b43 100644 --- a/cosmos/crypto/keyring/option.go +++ b/cosmos/crypto/keyring/option.go @@ -21,9 +21,9 @@ package keyring import ( - "github.com/cosmos/cosmos-sdk/crypto/keyring" + "github.com/berachain/polaris/cosmos/crypto/hd" - "pkg.berachain.dev/polaris/cosmos/crypto/hd" + "github.com/cosmos/cosmos-sdk/crypto/keyring" ) // OnlyEthSecp256k1Option defines a function keys options for the ethereum Secp256k1 curve. diff --git a/cosmos/crypto/keyring/option_test.go b/cosmos/crypto/keyring/option_test.go index 190f77ce4..a386f9371 100644 --- a/cosmos/crypto/keyring/option_test.go +++ b/cosmos/crypto/keyring/option_test.go @@ -25,17 +25,17 @@ import ( "strings" "testing" + cryptocodec "github.com/berachain/polaris/cosmos/crypto/codec" + "github.com/berachain/polaris/cosmos/crypto/hd" + accounts "github.com/berachain/polaris/eth/accounts" + "github.com/berachain/polaris/eth/common" + "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/codec/types" "github.com/cosmos/cosmos-sdk/crypto/keyring" cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" "github.com/cosmos/cosmos-sdk/std" - cryptocodec "pkg.berachain.dev/polaris/cosmos/crypto/codec" - "pkg.berachain.dev/polaris/cosmos/crypto/hd" - accounts "pkg.berachain.dev/polaris/eth/accounts" - "pkg.berachain.dev/polaris/eth/common" - . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cosmos/crypto/keys/ethsecp256k1/keys.go b/cosmos/crypto/keys/ethsecp256k1/keys.go index 5636e0aea..35be79530 100644 --- a/cosmos/crypto/keys/ethsecp256k1/keys.go +++ b/cosmos/crypto/keys/ethsecp256k1/keys.go @@ -25,11 +25,11 @@ import ( "crypto/ecdsa" "crypto/subtle" + "github.com/berachain/polaris/eth/crypto" + cmcrypto "github.com/cometbft/cometbft/crypto" cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" - - "pkg.berachain.dev/polaris/eth/crypto" ) const ( diff --git a/cosmos/crypto/keys/ethsecp256k1/keys.pb.go b/cosmos/crypto/keys/ethsecp256k1/keys.pb.go index 7ace5fa0b..a2bea2180 100644 --- a/cosmos/crypto/keys/ethsecp256k1/keys.pb.go +++ b/cosmos/crypto/keys/ethsecp256k1/keys.pb.go @@ -127,19 +127,19 @@ func init() { } var fileDescriptor_e0c989ba1b8717d6 = []byte{ - // 182 bytes of a gzipped FileDescriptorProto + // 185 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xd2, 0x2c, 0xc8, 0xcf, 0x49, 0x2c, 0xca, 0x2c, 0xd6, 0x4f, 0x2e, 0xaa, 0x2c, 0x28, 0xc9, 0xd7, 0x4f, 0x2d, 0xc9, 0x28, 0x4e, 0x4d, 0x2e, 0x30, 0x32, 0x35, 0xcb, 0x36, 0xd4, 0x2f, 0x33, 0xd4, 0xcf, 0x4e, 0xad, 0x2c, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x92, 0x83, 0x2a, 0xd5, 0x83, 0x28, 0xd5, 0x43, 0x56, 0xaa, 0x57, 0x66, 0xa8, 0x24, 0xc5, 0xc5, 0x16, 0x50, 0x9a, 0xe4, 0x9d, 0x5a, 0x29, 0x24, 0xc0, 0xc5, 0x9c, 0x9d, 0x5a, 0x29, 0xc1, 0xa8, 0xc0, 0xa8, 0xc1, 0x13, 0x04, 0x62, 0x2a, 0x49, 0x73, 0xb1, - 0x07, 0x14, 0x65, 0x96, 0x61, 0x95, 0x74, 0x0a, 0x3e, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23, 0x39, + 0x07, 0x14, 0x65, 0x96, 0x61, 0x95, 0x74, 0x0a, 0x3b, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23, 0x39, 0xc6, 0x07, 0x8f, 0xe4, 0x18, 0x27, 0x3c, 0x96, 0x63, 0xb8, 0xf0, 0x58, 0x8e, 0xe1, 0xc6, 0x63, - 0x39, 0x86, 0x28, 0xcb, 0x82, 0xec, 0x74, 0xbd, 0xa4, 0xd4, 0xa2, 0xc4, 0xe4, 0x8c, 0xc4, 0xcc, - 0x3c, 0xbd, 0x94, 0xd4, 0x32, 0x7d, 0xb8, 0x7b, 0xf3, 0x8b, 0x73, 0xf3, 0xe1, 0xce, 0x06, 0x39, - 0x13, 0xc5, 0xed, 0x49, 0x6c, 0x60, 0x47, 0x1b, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x5e, 0xa7, - 0xc8, 0x46, 0xe1, 0x00, 0x00, 0x00, + 0x39, 0x86, 0x28, 0x9b, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, 0xfd, 0xa4, + 0xd4, 0xa2, 0xc4, 0xe4, 0x8c, 0xc4, 0xcc, 0x3c, 0x7d, 0xb8, 0x93, 0xf3, 0x8b, 0x73, 0xf3, 0xe1, + 0x2e, 0x07, 0xb9, 0x14, 0xc5, 0xf9, 0x49, 0x6c, 0x60, 0x77, 0x1b, 0x03, 0x02, 0x00, 0x00, 0xff, + 0xff, 0x17, 0x87, 0x00, 0x80, 0xe4, 0x00, 0x00, 0x00, } func (m *PubKey) Marshal() (dAtA []byte, err error) { diff --git a/cosmos/crypto/keys/ethsecp256k1/keys_test.go b/cosmos/crypto/keys/ethsecp256k1/keys_test.go index 5e4e7b516..f631b7073 100644 --- a/cosmos/crypto/keys/ethsecp256k1/keys_test.go +++ b/cosmos/crypto/keys/ethsecp256k1/keys_test.go @@ -23,9 +23,9 @@ package ethsecp256k1 import ( "testing" - cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" + ethcrypto "github.com/berachain/polaris/eth/crypto" - ethcrypto "pkg.berachain.dev/polaris/eth/crypto" + cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cosmos/crypto/keys/ethsecp256k1/signature_cgo.go b/cosmos/crypto/keys/ethsecp256k1/signature_cgo.go index 0b02aa042..c16febbb2 100644 --- a/cosmos/crypto/keys/ethsecp256k1/signature_cgo.go +++ b/cosmos/crypto/keys/ethsecp256k1/signature_cgo.go @@ -21,7 +21,7 @@ package ethsecp256k1 import ( - "pkg.berachain.dev/polaris/eth/crypto" + "github.com/berachain/polaris/eth/crypto" ) // Sign signs the provided message using the ECDSA private key. It returns an error if the diff --git a/cosmos/crypto/keys/ethsecp256k1/signature_cgo_test.go b/cosmos/crypto/keys/ethsecp256k1/signature_cgo_test.go index 1933a05b8..dd374deb3 100644 --- a/cosmos/crypto/keys/ethsecp256k1/signature_cgo_test.go +++ b/cosmos/crypto/keys/ethsecp256k1/signature_cgo_test.go @@ -23,7 +23,7 @@ package ethsecp256k1 import ( "crypto/ecdsa" - "pkg.berachain.dev/polaris/eth/crypto" + "github.com/berachain/polaris/eth/crypto" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cosmos/go.mod b/cosmos/go.mod index e8f27bf0a..fe04ec6ed 100644 --- a/cosmos/go.mod +++ b/cosmos/go.mod @@ -1,4 +1,4 @@ -module pkg.berachain.dev/polaris/cosmos +module github.com/berachain/polaris/cosmos go 1.21 @@ -19,6 +19,9 @@ require ( cosmossdk.io/store v1.0.0 cosmossdk.io/x/evidence v0.0.0-20230818115413-c402c51a1508 cosmossdk.io/x/tx v0.12.0 + github.com/berachain/polaris/contracts v0.0.0-20231107182447-2b91ecc782a6 + github.com/berachain/polaris/eth v0.0.0-20231107182447-2b91ecc782a6 + github.com/berachain/polaris/lib v0.0.0-20231107182447-2b91ecc782a6 github.com/btcsuite/btcd v0.23.2 github.com/btcsuite/btcd/btcutil v1.1.3 github.com/cometbft/cometbft v0.38.0 @@ -38,9 +41,6 @@ require ( golang.org/x/exp v0.0.0-20231006140011-7918f672742d google.golang.org/grpc v1.59.0 google.golang.org/protobuf v1.31.0 - pkg.berachain.dev/polaris/contracts v0.0.0-20231031220135-f3bf0d0ee45f - pkg.berachain.dev/polaris/eth v0.0.0-20231104204753-faadca38b64d - pkg.berachain.dev/polaris/lib v0.0.0-20231104204753-faadca38b64d ) require ( @@ -65,7 +65,6 @@ require ( github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect github.com/chenzhuoyu/iasm v0.9.0 // indirect github.com/chzyer/readline v1.5.1 // indirect - github.com/cockroachdb/datadriven v1.0.3-0.20230801171734-e384cf455877 // indirect github.com/cockroachdb/errors v1.11.1 // indirect github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect github.com/cockroachdb/pebble v0.0.0-20231101195458-481da04154d6 // indirect diff --git a/cosmos/go.sum b/cosmos/go.sum index 832d8c82b..2dc7f7cda 100644 --- a/cosmos/go.sum +++ b/cosmos/go.sum @@ -115,6 +115,12 @@ github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/berachain/polaris-geth v0.0.0-20231105185655-b78967bb230f h1:9wGV+05KiA6D9mcRxsBm/4hrKUI/LORwvsYlAvMl1Sc= github.com/berachain/polaris-geth v0.0.0-20231105185655-b78967bb230f/go.mod h1:I0U5VewuuTzvBtVzKo7b3hJzDhXOUtn9mJW7SsIPB0Q= +github.com/berachain/polaris/contracts v0.0.0-20231107182447-2b91ecc782a6 h1:mL5OXGE9+QjxDclhqtzgXHTIdxDFxRAj3zxHjbkKyr4= +github.com/berachain/polaris/contracts v0.0.0-20231107182447-2b91ecc782a6/go.mod h1:cZ1kKh7+zVnvn/cKMHdjNoxoaVJt8L71W7GXHw94Hm4= +github.com/berachain/polaris/eth v0.0.0-20231107182447-2b91ecc782a6 h1:nrPpnRGfCFCZ9kmC8jJYAOajNmpWXudvW0aO64HgIlI= +github.com/berachain/polaris/eth v0.0.0-20231107182447-2b91ecc782a6/go.mod h1:qM5tm1wLoaRA2+CyDD2DXHMSxdw9dluJDvdPOoUmsjU= +github.com/berachain/polaris/lib v0.0.0-20231107182447-2b91ecc782a6 h1:cs9ne0fJIUUxHWmF7nC02GMTavviaD/JqEkfVIcS/js= +github.com/berachain/polaris/lib v0.0.0-20231107182447-2b91ecc782a6/go.mod h1:H2fG0HisSeVc8nvFEq/IWRn+pPCHW/Nr8mbPmKy/Xqk= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816 h1:41iFGWnSlI2gVpmOtVTJZNodLdLQLn/KsJqFvXwnd/s= github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= @@ -1495,12 +1501,6 @@ nhooyr.io/websocket v1.8.6/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0 nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50= pgregory.net/rapid v1.1.0 h1:CMa0sjHSru3puNx+J0MIAuiiEV4N0qj8/cMWGBBCsjw= pgregory.net/rapid v1.1.0/go.mod h1:PY5XlDGj0+V1FCq0o192FdRhpKHGTRIWBgqjDBTrq04= -pkg.berachain.dev/polaris/contracts v0.0.0-20231031220135-f3bf0d0ee45f h1:TUIqQfHmD7lsVnf24kxwxlBTxSKOPt5W39t/0Mnk+cU= -pkg.berachain.dev/polaris/contracts v0.0.0-20231031220135-f3bf0d0ee45f/go.mod h1:5Nz9qfw/JZGle4OtEsJBkgWDn9MNWCEZlCW/6pE5yZg= -pkg.berachain.dev/polaris/eth v0.0.0-20231104204753-faadca38b64d h1:ZWEbE2Y7fyjHDE/hZdyrEN9XzPeiFqseHvmP2CCt0sc= -pkg.berachain.dev/polaris/eth v0.0.0-20231104204753-faadca38b64d/go.mod h1:6rSA+gUVrfnlp+RfVLTGQrJGVjEu4j8d2zcr9zeaD2Y= -pkg.berachain.dev/polaris/lib v0.0.0-20231104204753-faadca38b64d h1:LMuJ+fYqzSbzUHdBY1ZtFr1CK1yaiMxBCdnhx9654i0= -pkg.berachain.dev/polaris/lib v0.0.0-20231104204753-faadca38b64d/go.mod h1:6w+5Axb6GV66PLllrYf7h1G3x8Pwu5nvd7ZiibiI3HM= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= diff --git a/cosmos/lib/address.go b/cosmos/lib/address.go index 275986c13..4853bdb1a 100644 --- a/cosmos/lib/address.go +++ b/cosmos/lib/address.go @@ -23,7 +23,7 @@ package lib import ( "cosmossdk.io/core/address" - "pkg.berachain.dev/polaris/eth/common" + "github.com/berachain/polaris/eth/common" ) /* -------------------------------------------------------------------------- */ diff --git a/cosmos/lib/address_test.go b/cosmos/lib/address_test.go index 3a1e9f72b..91879ad24 100644 --- a/cosmos/lib/address_test.go +++ b/cosmos/lib/address_test.go @@ -21,12 +21,12 @@ package lib_test import ( + cosmlib "github.com/berachain/polaris/cosmos/lib" + "github.com/berachain/polaris/eth/common" + addresscodec "github.com/cosmos/cosmos-sdk/codec/address" sdk "github.com/cosmos/cosmos-sdk/types" - cosmlib "pkg.berachain.dev/polaris/cosmos/lib" - "pkg.berachain.dev/polaris/eth/common" - . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cosmos/lib/conversions.go b/cosmos/lib/conversions.go index d780a9bc2..a3f8cdfb7 100644 --- a/cosmos/lib/conversions.go +++ b/cosmos/lib/conversions.go @@ -27,18 +27,18 @@ import ( "cosmossdk.io/core/address" sdkmath "cosmossdk.io/math" + libgenerated "github.com/berachain/polaris/contracts/bindings/cosmos/lib" + "github.com/berachain/polaris/contracts/bindings/cosmos/precompile/governance" + "github.com/berachain/polaris/contracts/bindings/cosmos/precompile/staking" + "github.com/berachain/polaris/cosmos/precompile" + "github.com/berachain/polaris/eth/common" + "github.com/berachain/polaris/lib/utils" + codectypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" v1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - - libgenerated "pkg.berachain.dev/polaris/contracts/bindings/cosmos/lib" - "pkg.berachain.dev/polaris/contracts/bindings/cosmos/precompile/governance" - "pkg.berachain.dev/polaris/contracts/bindings/cosmos/precompile/staking" - "pkg.berachain.dev/polaris/cosmos/precompile" - "pkg.berachain.dev/polaris/eth/common" - "pkg.berachain.dev/polaris/lib/utils" ) /** diff --git a/cosmos/lib/evm.go b/cosmos/lib/evm.go index 811d7bcca..66923a710 100644 --- a/cosmos/lib/evm.go +++ b/cosmos/lib/evm.go @@ -23,14 +23,14 @@ package lib import ( "math/big" - sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/berachain/polaris/cosmos/x/evm/plugins/precompile" + "github.com/berachain/polaris/eth/accounts/abi" + "github.com/berachain/polaris/eth/common" + ethprecompile "github.com/berachain/polaris/eth/core/precompile" + "github.com/berachain/polaris/eth/core/vm" + "github.com/berachain/polaris/lib/utils" - "pkg.berachain.dev/polaris/cosmos/x/evm/plugins/precompile" - "pkg.berachain.dev/polaris/eth/accounts/abi" - "pkg.berachain.dev/polaris/eth/common" - ethprecompile "pkg.berachain.dev/polaris/eth/core/precompile" - "pkg.berachain.dev/polaris/eth/core/vm" - "pkg.berachain.dev/polaris/lib/utils" + sdk "github.com/cosmos/cosmos-sdk/types" ) // TODO: Add these functions to the EVM object itself to allow enforcing calls into diff --git a/cosmos/precompile/bank/bank.go b/cosmos/precompile/bank/bank.go index 27d3210c1..210b7d7f7 100644 --- a/cosmos/precompile/bank/bank.go +++ b/cosmos/precompile/bank/bank.go @@ -26,15 +26,15 @@ import ( "cosmossdk.io/core/address" + "github.com/berachain/polaris/contracts/bindings/cosmos/lib" + bankgenerated "github.com/berachain/polaris/contracts/bindings/cosmos/precompile/bank" + cosmlib "github.com/berachain/polaris/cosmos/lib" + "github.com/berachain/polaris/eth/common" + ethprecompile "github.com/berachain/polaris/eth/core/precompile" + "github.com/berachain/polaris/eth/core/vm" + authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - - "pkg.berachain.dev/polaris/contracts/bindings/cosmos/lib" - bankgenerated "pkg.berachain.dev/polaris/contracts/bindings/cosmos/precompile/bank" - cosmlib "pkg.berachain.dev/polaris/cosmos/lib" - "pkg.berachain.dev/polaris/eth/common" - ethprecompile "pkg.berachain.dev/polaris/eth/core/precompile" - "pkg.berachain.dev/polaris/eth/core/vm" ) // Contract is the precompile contract for the bank module. diff --git a/cosmos/precompile/bank/bank_test.go b/cosmos/precompile/bank/bank_test.go index 08bbf414d..f625415dc 100644 --- a/cosmos/precompile/bank/bank_test.go +++ b/cosmos/precompile/bank/bank_test.go @@ -29,22 +29,22 @@ import ( "cosmossdk.io/log" sdkmath "cosmossdk.io/math" + "github.com/berachain/polaris/cosmos/precompile" + "github.com/berachain/polaris/cosmos/precompile/bank" + testutils "github.com/berachain/polaris/cosmos/testutil" + pclog "github.com/berachain/polaris/cosmos/x/evm/plugins/precompile/log" + evmtypes "github.com/berachain/polaris/cosmos/x/evm/types" + "github.com/berachain/polaris/eth/common" + ethprecompile "github.com/berachain/polaris/eth/core/precompile" + "github.com/berachain/polaris/eth/core/vm" + "github.com/berachain/polaris/lib/utils" + simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims" sdk "github.com/cosmos/cosmos-sdk/types" authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper" bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - "pkg.berachain.dev/polaris/cosmos/precompile" - "pkg.berachain.dev/polaris/cosmos/precompile/bank" - testutils "pkg.berachain.dev/polaris/cosmos/testutil" - pclog "pkg.berachain.dev/polaris/cosmos/x/evm/plugins/precompile/log" - evmtypes "pkg.berachain.dev/polaris/cosmos/x/evm/types" - "pkg.berachain.dev/polaris/eth/common" - ethprecompile "pkg.berachain.dev/polaris/eth/core/precompile" - "pkg.berachain.dev/polaris/eth/core/vm" - "pkg.berachain.dev/polaris/lib/utils" - . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cosmos/precompile/distribution/distribution.go b/cosmos/precompile/distribution/distribution.go index f1e27b4e2..145ebdae2 100644 --- a/cosmos/precompile/distribution/distribution.go +++ b/cosmos/precompile/distribution/distribution.go @@ -25,16 +25,16 @@ import ( "cosmossdk.io/core/address" + "github.com/berachain/polaris/contracts/bindings/cosmos/lib" + generated "github.com/berachain/polaris/contracts/bindings/cosmos/precompile/distribution" + cosmlib "github.com/berachain/polaris/cosmos/lib" + "github.com/berachain/polaris/cosmos/precompile/staking" + "github.com/berachain/polaris/eth/common" + ethprecompile "github.com/berachain/polaris/eth/core/precompile" + "github.com/berachain/polaris/eth/core/vm" + sdk "github.com/cosmos/cosmos-sdk/types" distributiontypes "github.com/cosmos/cosmos-sdk/x/distribution/types" - - "pkg.berachain.dev/polaris/contracts/bindings/cosmos/lib" - generated "pkg.berachain.dev/polaris/contracts/bindings/cosmos/precompile/distribution" - cosmlib "pkg.berachain.dev/polaris/cosmos/lib" - "pkg.berachain.dev/polaris/cosmos/precompile/staking" - "pkg.berachain.dev/polaris/eth/common" - ethprecompile "pkg.berachain.dev/polaris/eth/core/precompile" - "pkg.berachain.dev/polaris/eth/core/vm" ) // Contract is the precompile contract for the distribution module. diff --git a/cosmos/precompile/distribution/distribution_test.go b/cosmos/precompile/distribution/distribution_test.go index b7c542c44..f08eff641 100644 --- a/cosmos/precompile/distribution/distribution_test.go +++ b/cosmos/precompile/distribution/distribution_test.go @@ -29,6 +29,12 @@ import ( sdkmath "cosmossdk.io/math" storetypes "cosmossdk.io/store/types" + testutil "github.com/berachain/polaris/cosmos/testutil" + pclog "github.com/berachain/polaris/cosmos/x/evm/plugins/precompile/log" + ethprecompile "github.com/berachain/polaris/eth/core/precompile" + "github.com/berachain/polaris/eth/core/vm" + "github.com/berachain/polaris/lib/utils" + "github.com/cosmos/cosmos-sdk/runtime" simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims" sdk "github.com/cosmos/cosmos-sdk/types" @@ -45,12 +51,6 @@ import ( "github.com/ethereum/go-ethereum/common" - testutil "pkg.berachain.dev/polaris/cosmos/testutil" - pclog "pkg.berachain.dev/polaris/cosmos/x/evm/plugins/precompile/log" - ethprecompile "pkg.berachain.dev/polaris/eth/core/precompile" - "pkg.berachain.dev/polaris/eth/core/vm" - "pkg.berachain.dev/polaris/lib/utils" - . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cosmos/precompile/governance/governance.go b/cosmos/precompile/governance/governance.go index 953f00952..e01b39fd6 100644 --- a/cosmos/precompile/governance/governance.go +++ b/cosmos/precompile/governance/governance.go @@ -27,19 +27,19 @@ import ( "cosmossdk.io/core/address" + cbindings "github.com/berachain/polaris/contracts/bindings/cosmos/lib" + generated "github.com/berachain/polaris/contracts/bindings/cosmos/precompile/governance" + cosmlib "github.com/berachain/polaris/cosmos/lib" + "github.com/berachain/polaris/cosmos/x/evm/plugins/precompile/log" + "github.com/berachain/polaris/eth/common" + ethprecompile "github.com/berachain/polaris/eth/core/precompile" + "github.com/berachain/polaris/eth/core/vm" + codectypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" v1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" - - cbindings "pkg.berachain.dev/polaris/contracts/bindings/cosmos/lib" - generated "pkg.berachain.dev/polaris/contracts/bindings/cosmos/precompile/governance" - cosmlib "pkg.berachain.dev/polaris/cosmos/lib" - "pkg.berachain.dev/polaris/cosmos/x/evm/plugins/precompile/log" - "pkg.berachain.dev/polaris/eth/common" - ethprecompile "pkg.berachain.dev/polaris/eth/core/precompile" - "pkg.berachain.dev/polaris/eth/core/vm" ) const ( diff --git a/cosmos/precompile/governance/governance_test.go b/cosmos/precompile/governance/governance_test.go index baccf2274..9d1667414 100644 --- a/cosmos/precompile/governance/governance_test.go +++ b/cosmos/precompile/governance/governance_test.go @@ -31,6 +31,14 @@ import ( sdkmath "cosmossdk.io/math" + cbindings "github.com/berachain/polaris/contracts/bindings/cosmos/lib" + generated "github.com/berachain/polaris/contracts/bindings/cosmos/precompile/governance" + testutils "github.com/berachain/polaris/cosmos/testutil" + "github.com/berachain/polaris/eth/common" + ethprecompile "github.com/berachain/polaris/eth/core/precompile" + "github.com/berachain/polaris/eth/core/vm" + "github.com/berachain/polaris/lib/utils" + codectypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper" @@ -41,14 +49,6 @@ import ( governancetypes "github.com/cosmos/cosmos-sdk/x/gov/types" v1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" - cbindings "pkg.berachain.dev/polaris/contracts/bindings/cosmos/lib" - generated "pkg.berachain.dev/polaris/contracts/bindings/cosmos/precompile/governance" - testutils "pkg.berachain.dev/polaris/cosmos/testutil" - "pkg.berachain.dev/polaris/eth/common" - ethprecompile "pkg.berachain.dev/polaris/eth/core/precompile" - "pkg.berachain.dev/polaris/eth/core/vm" - "pkg.berachain.dev/polaris/lib/utils" - . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cosmos/precompile/governance/testutil.go b/cosmos/precompile/governance/testutil.go index d4dfa36d2..fe91bf759 100644 --- a/cosmos/precompile/governance/testutil.go +++ b/cosmos/precompile/governance/testutil.go @@ -29,6 +29,9 @@ import ( "cosmossdk.io/log" storetypes "cosmossdk.io/store/types" + testutils "github.com/berachain/polaris/cosmos/testutil" + "github.com/berachain/polaris/eth/common" + "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/runtime" sdk "github.com/cosmos/cosmos-sdk/types" @@ -44,9 +47,6 @@ import ( v1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - testutils "pkg.berachain.dev/polaris/cosmos/testutil" - "pkg.berachain.dev/polaris/eth/common" - //nolint:stylecheck,revive // Ginkgo is the testing framework. . "github.com/onsi/ginkgo/v2" ) diff --git a/cosmos/precompile/staking/staking.go b/cosmos/precompile/staking/staking.go index 4e175f617..9d049388a 100644 --- a/cosmos/precompile/staking/staking.go +++ b/cosmos/precompile/staking/staking.go @@ -30,17 +30,17 @@ import ( "cosmossdk.io/core/address" sdkmath "cosmossdk.io/math" + cbindings "github.com/berachain/polaris/contracts/bindings/cosmos/lib" + generated "github.com/berachain/polaris/contracts/bindings/cosmos/precompile/staking" + cosmlib "github.com/berachain/polaris/cosmos/lib" + "github.com/berachain/polaris/eth/common" + ethprecompile "github.com/berachain/polaris/eth/core/precompile" + "github.com/berachain/polaris/eth/core/vm" + sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - - cbindings "pkg.berachain.dev/polaris/contracts/bindings/cosmos/lib" - generated "pkg.berachain.dev/polaris/contracts/bindings/cosmos/precompile/staking" - cosmlib "pkg.berachain.dev/polaris/cosmos/lib" - "pkg.berachain.dev/polaris/eth/common" - ethprecompile "pkg.berachain.dev/polaris/eth/core/precompile" - "pkg.berachain.dev/polaris/eth/core/vm" ) type ValidatorStore interface { diff --git a/cosmos/precompile/staking/staking_test.go b/cosmos/precompile/staking/staking_test.go index b0b345c90..57fcbe370 100644 --- a/cosmos/precompile/staking/staking_test.go +++ b/cosmos/precompile/staking/staking_test.go @@ -28,6 +28,17 @@ import ( "cosmossdk.io/log" sdkmath "cosmossdk.io/math" + cbindings "github.com/berachain/polaris/contracts/bindings/cosmos/lib" + generated "github.com/berachain/polaris/contracts/bindings/cosmos/precompile/staking" + cosmlib "github.com/berachain/polaris/cosmos/lib" + testutil "github.com/berachain/polaris/cosmos/testutil" + "github.com/berachain/polaris/eth/accounts/abi" + "github.com/berachain/polaris/eth/common" + ethprecompile "github.com/berachain/polaris/eth/core/precompile" + "github.com/berachain/polaris/eth/core/vm" + "github.com/berachain/polaris/eth/core/vm/mock" + libutils "github.com/berachain/polaris/lib/utils" + cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims" sdk "github.com/cosmos/cosmos-sdk/types" @@ -36,17 +47,6 @@ import ( stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - cbindings "pkg.berachain.dev/polaris/contracts/bindings/cosmos/lib" - generated "pkg.berachain.dev/polaris/contracts/bindings/cosmos/precompile/staking" - cosmlib "pkg.berachain.dev/polaris/cosmos/lib" - testutil "pkg.berachain.dev/polaris/cosmos/testutil" - "pkg.berachain.dev/polaris/eth/accounts/abi" - "pkg.berachain.dev/polaris/eth/common" - ethprecompile "pkg.berachain.dev/polaris/eth/core/precompile" - "pkg.berachain.dev/polaris/eth/core/vm" - "pkg.berachain.dev/polaris/eth/core/vm/mock" - libutils "pkg.berachain.dev/polaris/lib/utils" - . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cosmos/runtime/ante/ante.go b/cosmos/runtime/ante/ante.go index a2832a039..758e5a563 100644 --- a/cosmos/runtime/ante/ante.go +++ b/cosmos/runtime/ante/ante.go @@ -21,10 +21,10 @@ package ante import ( + "github.com/berachain/polaris/cosmos/runtime/txpool" + sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/auth/ante" - - "pkg.berachain.dev/polaris/cosmos/runtime/txpool" ) // NewAnteHandler creates a new instance of AnteHandler with EjectOnRecheckTxDecorator. diff --git a/cosmos/runtime/chain/abci.go b/cosmos/runtime/chain/abci.go index 2ebc6e1c4..7a8ba7ae1 100644 --- a/cosmos/runtime/chain/abci.go +++ b/cosmos/runtime/chain/abci.go @@ -25,14 +25,14 @@ import ( storetypes "cosmossdk.io/store/types" + evmtypes "github.com/berachain/polaris/cosmos/x/evm/types" + "github.com/berachain/polaris/eth/core/types" + abci "github.com/cometbft/cometbft/abci/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/beacon/engine" - - evmtypes "pkg.berachain.dev/polaris/cosmos/x/evm/types" - "pkg.berachain.dev/polaris/eth/core/types" ) func (wbc *WrappedBlockchain) ProcessProposal( diff --git a/cosmos/runtime/chain/chain.go b/cosmos/runtime/chain/chain.go index 6f38f0dae..88a02c2d2 100644 --- a/cosmos/runtime/chain/chain.go +++ b/cosmos/runtime/chain/chain.go @@ -23,8 +23,8 @@ package chain import ( "context" - "pkg.berachain.dev/polaris/eth/core" - "pkg.berachain.dev/polaris/eth/core/types" + "github.com/berachain/polaris/eth/core" + "github.com/berachain/polaris/eth/core/types" ) // WrappedBlockchain is a struct that wraps the core blockchain with additional diff --git a/cosmos/runtime/comet/sync.go b/cosmos/runtime/comet/sync.go index 327432b8a..7017ad059 100644 --- a/cosmos/runtime/comet/sync.go +++ b/cosmos/runtime/comet/sync.go @@ -23,13 +23,13 @@ package comet import ( "context" + "github.com/berachain/polaris/eth/polar" + cmtclient "github.com/cometbft/cometbft/rpc/client" "github.com/cosmos/cosmos-sdk/client" "github.com/ethereum/go-ethereum" - - "pkg.berachain.dev/polaris/eth/polar" ) var _ polar.SyncStatusProvider = (*cometSyncStatus)(nil) diff --git a/cosmos/runtime/logging.go b/cosmos/runtime/logging.go index 5721a4b21..f40e6a8cc 100644 --- a/cosmos/runtime/logging.go +++ b/cosmos/runtime/logging.go @@ -23,7 +23,7 @@ package runtime import ( "cosmossdk.io/log" - ethlog "pkg.berachain.dev/polaris/eth/log" + ethlog "github.com/berachain/polaris/eth/log" ) // LoggerFuncHandler injects the cosmos-sdk logger into geth. diff --git a/cosmos/runtime/miner/interfaces.go b/cosmos/runtime/miner/interfaces.go index ccd8ce77e..fdecb2b7c 100644 --- a/cosmos/runtime/miner/interfaces.go +++ b/cosmos/runtime/miner/interfaces.go @@ -23,13 +23,13 @@ package miner import ( "context" + evmkeeper "github.com/berachain/polaris/cosmos/x/evm/keeper" + abci "github.com/cometbft/cometbft/abci/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/beacon/engine" - - evmkeeper "pkg.berachain.dev/polaris/cosmos/x/evm/keeper" ) // EnvelopeSerializer is used to convert an envelope into a byte slice that represents diff --git a/cosmos/runtime/miner/miner.go b/cosmos/runtime/miner/miner.go index fd4766fa1..9c514426e 100644 --- a/cosmos/runtime/miner/miner.go +++ b/cosmos/runtime/miner/miner.go @@ -26,14 +26,14 @@ import ( "github.com/cosmos/gogoproto/proto" + "github.com/berachain/polaris/eth" + "github.com/berachain/polaris/eth/core/types" + "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/miner" - - "pkg.berachain.dev/polaris/eth" - "pkg.berachain.dev/polaris/eth/core/types" ) // Miner implements the baseapp.TxSelector interface. diff --git a/cosmos/runtime/runtime.go b/cosmos/runtime/runtime.go index b870b8104..c1ba850cd 100644 --- a/cosmos/runtime/runtime.go +++ b/cosmos/runtime/runtime.go @@ -27,6 +27,20 @@ import ( "cosmossdk.io/log" storetypes "cosmossdk.io/store/types" + libtx "github.com/berachain/polaris/cosmos/lib/tx" + antelib "github.com/berachain/polaris/cosmos/runtime/ante" + "github.com/berachain/polaris/cosmos/runtime/chain" + "github.com/berachain/polaris/cosmos/runtime/comet" + "github.com/berachain/polaris/cosmos/runtime/miner" + "github.com/berachain/polaris/cosmos/runtime/txpool" + evmkeeper "github.com/berachain/polaris/cosmos/x/evm/keeper" + evmtypes "github.com/berachain/polaris/cosmos/x/evm/types" + "github.com/berachain/polaris/eth" + "github.com/berachain/polaris/eth/consensus" + "github.com/berachain/polaris/eth/core" + coretypes "github.com/berachain/polaris/eth/core/types" + "github.com/berachain/polaris/eth/node" + abci "github.com/cometbft/cometbft/abci/types" "github.com/cosmos/cosmos-sdk/client" @@ -34,20 +48,6 @@ import ( "github.com/cosmos/cosmos-sdk/types/mempool" "github.com/ethereum/go-ethereum/beacon/engine" - - libtx "pkg.berachain.dev/polaris/cosmos/lib/tx" - antelib "pkg.berachain.dev/polaris/cosmos/runtime/ante" - "pkg.berachain.dev/polaris/cosmos/runtime/chain" - "pkg.berachain.dev/polaris/cosmos/runtime/comet" - "pkg.berachain.dev/polaris/cosmos/runtime/miner" - "pkg.berachain.dev/polaris/cosmos/runtime/txpool" - evmkeeper "pkg.berachain.dev/polaris/cosmos/x/evm/keeper" - evmtypes "pkg.berachain.dev/polaris/cosmos/x/evm/types" - "pkg.berachain.dev/polaris/eth" - "pkg.berachain.dev/polaris/eth/consensus" - "pkg.berachain.dev/polaris/eth/core" - coretypes "pkg.berachain.dev/polaris/eth/core/types" - "pkg.berachain.dev/polaris/eth/node" ) // EVMKeeper is an interface that defines the methods needed for the EVM setup. diff --git a/cosmos/runtime/txpool/ante.go b/cosmos/runtime/txpool/ante.go index 346d6c198..39ee53d89 100644 --- a/cosmos/runtime/txpool/ante.go +++ b/cosmos/runtime/txpool/ante.go @@ -23,14 +23,14 @@ package txpool import ( "errors" + "github.com/berachain/polaris/cosmos/x/evm/types" + "github.com/berachain/polaris/eth/common" + coretypes "github.com/berachain/polaris/eth/core/types" + "github.com/berachain/polaris/lib/utils" + sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/core/txpool" - - "pkg.berachain.dev/polaris/cosmos/x/evm/types" - "pkg.berachain.dev/polaris/eth/common" - coretypes "pkg.berachain.dev/polaris/eth/core/types" - "pkg.berachain.dev/polaris/lib/utils" ) // AnteHandle implements sdk.AnteHandler. diff --git a/cosmos/runtime/txpool/handler.go b/cosmos/runtime/txpool/handler.go index b97492379..d64435d7a 100644 --- a/cosmos/runtime/txpool/handler.go +++ b/cosmos/runtime/txpool/handler.go @@ -27,13 +27,13 @@ import ( "cosmossdk.io/log" + "github.com/berachain/polaris/eth/core" + coretypes "github.com/berachain/polaris/eth/core/types" + sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/ethereum/go-ethereum/event" - - "pkg.berachain.dev/polaris/eth/core" - coretypes "pkg.berachain.dev/polaris/eth/core/types" ) // txChanSize is the size of channel listening to NewTxsEvent. The number is referenced from the diff --git a/cosmos/runtime/txpool/handler_test.go b/cosmos/runtime/txpool/handler_test.go index db4226b2c..3d7f3f0e9 100644 --- a/cosmos/runtime/txpool/handler_test.go +++ b/cosmos/runtime/txpool/handler_test.go @@ -28,9 +28,9 @@ import ( "cosmossdk.io/log" - "pkg.berachain.dev/polaris/cosmos/runtime/txpool/mocks" - "pkg.berachain.dev/polaris/eth/core" - coretypes "pkg.berachain.dev/polaris/eth/core/types" + "github.com/berachain/polaris/cosmos/runtime/txpool/mocks" + "github.com/berachain/polaris/eth/core" + coretypes "github.com/berachain/polaris/eth/core/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cosmos/runtime/txpool/mempool.go b/cosmos/runtime/txpool/mempool.go index db1df4166..cbe3f3775 100644 --- a/cosmos/runtime/txpool/mempool.go +++ b/cosmos/runtime/txpool/mempool.go @@ -26,16 +26,16 @@ import ( "cosmossdk.io/log" + "github.com/berachain/polaris/cosmos/x/evm/types" + "github.com/berachain/polaris/eth" + "github.com/berachain/polaris/eth/core" + coretypes "github.com/berachain/polaris/eth/core/types" + "github.com/berachain/polaris/lib/utils" + sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/mempool" "github.com/ethereum/go-ethereum/core/txpool/legacypool" - - "pkg.berachain.dev/polaris/cosmos/x/evm/types" - "pkg.berachain.dev/polaris/eth" - "pkg.berachain.dev/polaris/eth/core" - coretypes "pkg.berachain.dev/polaris/eth/core/types" - "pkg.berachain.dev/polaris/lib/utils" ) // Mempool implements the mempool.Mempool & Lifecycle interfaces. diff --git a/cosmos/runtime/txpool/mempool_test.go b/cosmos/runtime/txpool/mempool_test.go index ff1d30a67..61e1e074f 100644 --- a/cosmos/runtime/txpool/mempool_test.go +++ b/cosmos/runtime/txpool/mempool_test.go @@ -25,11 +25,11 @@ import ( "github.com/stretchr/testify/mock" - sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/berachain/polaris/cosmos/runtime/txpool/mocks" + evmtypes "github.com/berachain/polaris/cosmos/x/evm/types" + coretypes "github.com/berachain/polaris/eth/core/types" - "pkg.berachain.dev/polaris/cosmos/runtime/txpool/mocks" - evmtypes "pkg.berachain.dev/polaris/cosmos/x/evm/types" - coretypes "pkg.berachain.dev/polaris/eth/core/types" + sdk "github.com/cosmos/cosmos-sdk/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cosmos/runtime/txpool/mocks/geth_tx_pool.go b/cosmos/runtime/txpool/mocks/geth_tx_pool.go index 1f181fd64..5112b1cc4 100644 --- a/cosmos/runtime/txpool/mocks/geth_tx_pool.go +++ b/cosmos/runtime/txpool/mocks/geth_tx_pool.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.36.1. DO NOT EDIT. package mocks diff --git a/cosmos/runtime/txpool/mocks/lifecycle.go b/cosmos/runtime/txpool/mocks/lifecycle.go index ea092e3e2..2934c5ae0 100644 --- a/cosmos/runtime/txpool/mocks/lifecycle.go +++ b/cosmos/runtime/txpool/mocks/lifecycle.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.36.1. DO NOT EDIT. package mocks diff --git a/cosmos/runtime/txpool/mocks/sdk_tx.go b/cosmos/runtime/txpool/mocks/sdk_tx.go index ae28d4c08..08c7226f4 100644 --- a/cosmos/runtime/txpool/mocks/sdk_tx.go +++ b/cosmos/runtime/txpool/mocks/sdk_tx.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.36.1. DO NOT EDIT. package mocks diff --git a/cosmos/runtime/txpool/mocks/subscription.go b/cosmos/runtime/txpool/mocks/subscription.go index 4f9f4703b..71c12a473 100644 --- a/cosmos/runtime/txpool/mocks/subscription.go +++ b/cosmos/runtime/txpool/mocks/subscription.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.36.1. DO NOT EDIT. package mocks diff --git a/cosmos/runtime/txpool/mocks/tx_broadcaster.go b/cosmos/runtime/txpool/mocks/tx_broadcaster.go index c85399b9a..02e339974 100644 --- a/cosmos/runtime/txpool/mocks/tx_broadcaster.go +++ b/cosmos/runtime/txpool/mocks/tx_broadcaster.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.36.1. DO NOT EDIT. package mocks diff --git a/cosmos/runtime/txpool/mocks/tx_serializer.go b/cosmos/runtime/txpool/mocks/tx_serializer.go index d15bece59..5da69d3fa 100644 --- a/cosmos/runtime/txpool/mocks/tx_serializer.go +++ b/cosmos/runtime/txpool/mocks/tx_serializer.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.36.1. DO NOT EDIT. package mocks diff --git a/cosmos/runtime/txpool/mocks/tx_sub_provider.go b/cosmos/runtime/txpool/mocks/tx_sub_provider.go index f136d397a..995cd5a40 100644 --- a/cosmos/runtime/txpool/mocks/tx_sub_provider.go +++ b/cosmos/runtime/txpool/mocks/tx_sub_provider.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.36.1. DO NOT EDIT. package mocks diff --git a/cosmos/store/cachekv/readonly_store.go b/cosmos/store/cachekv/readonly_store.go index 1100b6572..3101f3edb 100644 --- a/cosmos/store/cachekv/readonly_store.go +++ b/cosmos/store/cachekv/readonly_store.go @@ -23,7 +23,7 @@ package cachekv import ( storetypes "cosmossdk.io/store/types" - "pkg.berachain.dev/polaris/eth/core/vm" + "github.com/berachain/polaris/eth/core/vm" ) var _ storetypes.KVStore = (*ReadOnlyStore)(nil) diff --git a/cosmos/store/cachekv/readonly_store_test.go b/cosmos/store/cachekv/readonly_store_test.go index 0b26cfb51..859d9045c 100644 --- a/cosmos/store/cachekv/readonly_store_test.go +++ b/cosmos/store/cachekv/readonly_store_test.go @@ -27,7 +27,7 @@ import ( "cosmossdk.io/store/dbadapter" - "pkg.berachain.dev/polaris/cosmos/store/cachekv" + "github.com/berachain/polaris/cosmos/store/cachekv" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cosmos/store/snapmulti/store.go b/cosmos/store/snapmulti/store.go index 4dfe0e31e..e6d6a1e2e 100644 --- a/cosmos/store/snapmulti/store.go +++ b/cosmos/store/snapmulti/store.go @@ -24,10 +24,10 @@ import ( "cosmossdk.io/store/cachekv" storetypes "cosmossdk.io/store/types" - polariscachekv "pkg.berachain.dev/polaris/cosmos/store/cachekv" - "pkg.berachain.dev/polaris/lib/ds" - "pkg.berachain.dev/polaris/lib/ds/stack" - "pkg.berachain.dev/polaris/lib/utils" + polariscachekv "github.com/berachain/polaris/cosmos/store/cachekv" + "github.com/berachain/polaris/lib/ds" + "github.com/berachain/polaris/lib/ds/stack" + "github.com/berachain/polaris/lib/utils" ) const ( diff --git a/cosmos/testutil/bank.go b/cosmos/testutil/bank.go index 44d432290..ff493a998 100644 --- a/cosmos/testutil/bank.go +++ b/cosmos/testutil/bank.go @@ -26,9 +26,9 @@ import ( sdkmath "cosmossdk.io/math" - sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/berachain/polaris/eth/common" - "pkg.berachain.dev/polaris/eth/common" + sdk "github.com/cosmos/cosmos-sdk/types" ) type BankKeeper interface { diff --git a/cosmos/testutil/setup.go b/cosmos/testutil/setup.go index 45e6086e7..17f1942a4 100644 --- a/cosmos/testutil/setup.go +++ b/cosmos/testutil/setup.go @@ -30,6 +30,9 @@ import ( "cosmossdk.io/store/rootmulti" storetypes "cosmossdk.io/store/types" + evmtypes "github.com/berachain/polaris/cosmos/x/evm/types" + "github.com/berachain/polaris/eth/common" + cometproto "github.com/cometbft/cometbft/proto/tendermint/types" "github.com/cosmos/cosmos-sdk/client" @@ -53,9 +56,6 @@ import ( "github.com/cosmos/cosmos-sdk/x/staking" stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - - evmtypes "pkg.berachain.dev/polaris/cosmos/x/evm/types" - "pkg.berachain.dev/polaris/eth/common" ) var ( diff --git a/cosmos/x/evm/depinject.go b/cosmos/x/evm/depinject.go index cdf5b4433..bcb6c97e9 100644 --- a/cosmos/x/evm/depinject.go +++ b/cosmos/x/evm/depinject.go @@ -25,13 +25,13 @@ import ( "cosmossdk.io/depinject" store "cosmossdk.io/store/types" + modulev1alpha1 "github.com/berachain/polaris/cosmos/api/polaris/evm/module/v1alpha1" + "github.com/berachain/polaris/cosmos/config" + "github.com/berachain/polaris/cosmos/x/evm/keeper" + ethprecompile "github.com/berachain/polaris/eth/core/precompile" + servertypes "github.com/cosmos/cosmos-sdk/server/types" sdk "github.com/cosmos/cosmos-sdk/types" - - modulev1alpha1 "pkg.berachain.dev/polaris/cosmos/api/polaris/evm/module/v1alpha1" - "pkg.berachain.dev/polaris/cosmos/config" - "pkg.berachain.dev/polaris/cosmos/x/evm/keeper" - ethprecompile "pkg.berachain.dev/polaris/eth/core/precompile" ) //nolint:gochecknoinits // GRRRR fix later. diff --git a/cosmos/x/evm/genesis.go b/cosmos/x/evm/genesis.go index 2ac0db955..aec5d036e 100644 --- a/cosmos/x/evm/genesis.go +++ b/cosmos/x/evm/genesis.go @@ -23,13 +23,13 @@ package evm import ( "encoding/json" + "github.com/berachain/polaris/eth/core" + abci "github.com/cometbft/cometbft/abci/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" - - "pkg.berachain.dev/polaris/eth/core" ) // DefaultGenesis returns default genesis state as raw bytes for the evm diff --git a/cosmos/x/evm/genesis_test.go b/cosmos/x/evm/genesis_test.go index ab654aa37..65718c6bd 100644 --- a/cosmos/x/evm/genesis_test.go +++ b/cosmos/x/evm/genesis_test.go @@ -27,20 +27,20 @@ import ( "cosmossdk.io/log" + "github.com/berachain/polaris/cosmos/config" + "github.com/berachain/polaris/cosmos/runtime/chain" + testutil "github.com/berachain/polaris/cosmos/testutil" + "github.com/berachain/polaris/cosmos/x/evm" + "github.com/berachain/polaris/cosmos/x/evm/keeper" + "github.com/berachain/polaris/cosmos/x/evm/plugins/state" + "github.com/berachain/polaris/eth/core" + ethprecompile "github.com/berachain/polaris/eth/core/precompile" + "github.com/berachain/polaris/eth/params" + sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/consensus/beacon" - "pkg.berachain.dev/polaris/cosmos/config" - "pkg.berachain.dev/polaris/cosmos/runtime/chain" - testutil "pkg.berachain.dev/polaris/cosmos/testutil" - "pkg.berachain.dev/polaris/cosmos/x/evm" - "pkg.berachain.dev/polaris/cosmos/x/evm/keeper" - "pkg.berachain.dev/polaris/cosmos/x/evm/plugins/state" - "pkg.berachain.dev/polaris/eth/core" - ethprecompile "pkg.berachain.dev/polaris/eth/core/precompile" - "pkg.berachain.dev/polaris/eth/params" - . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cosmos/x/evm/keeper/genesis.go b/cosmos/x/evm/keeper/genesis.go index f8df65efd..c118f5c45 100644 --- a/cosmos/x/evm/keeper/genesis.go +++ b/cosmos/x/evm/keeper/genesis.go @@ -21,11 +21,11 @@ package keeper import ( - sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/berachain/polaris/cosmos/x/evm/plugins" + "github.com/berachain/polaris/eth/core" + "github.com/berachain/polaris/lib/utils" - "pkg.berachain.dev/polaris/cosmos/x/evm/plugins" - "pkg.berachain.dev/polaris/eth/core" - "pkg.berachain.dev/polaris/lib/utils" + sdk "github.com/cosmos/cosmos-sdk/types" ) // InitGenesis is called during the InitGenesis. diff --git a/cosmos/x/evm/keeper/host.go b/cosmos/x/evm/keeper/host.go index a61ab5951..725a490a2 100644 --- a/cosmos/x/evm/keeper/host.go +++ b/cosmos/x/evm/keeper/host.go @@ -23,16 +23,16 @@ package keeper import ( storetypes "cosmossdk.io/store/types" - sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/berachain/polaris/cosmos/config" + "github.com/berachain/polaris/cosmos/x/evm/plugins/block" + "github.com/berachain/polaris/cosmos/x/evm/plugins/historical" + "github.com/berachain/polaris/cosmos/x/evm/plugins/precompile" + pclog "github.com/berachain/polaris/cosmos/x/evm/plugins/precompile/log" + "github.com/berachain/polaris/cosmos/x/evm/plugins/state" + "github.com/berachain/polaris/eth/core" + ethprecompile "github.com/berachain/polaris/eth/core/precompile" - "pkg.berachain.dev/polaris/cosmos/config" - "pkg.berachain.dev/polaris/cosmos/x/evm/plugins/block" - "pkg.berachain.dev/polaris/cosmos/x/evm/plugins/historical" - "pkg.berachain.dev/polaris/cosmos/x/evm/plugins/precompile" - pclog "pkg.berachain.dev/polaris/cosmos/x/evm/plugins/precompile/log" - "pkg.berachain.dev/polaris/cosmos/x/evm/plugins/state" - "pkg.berachain.dev/polaris/eth/core" - ethprecompile "pkg.berachain.dev/polaris/eth/core/precompile" + sdk "github.com/cosmos/cosmos-sdk/types" ) // Compile-time interface assertion. diff --git a/cosmos/x/evm/keeper/keeper.go b/cosmos/x/evm/keeper/keeper.go index 8fb036d9f..b733ee801 100644 --- a/cosmos/x/evm/keeper/keeper.go +++ b/cosmos/x/evm/keeper/keeper.go @@ -26,15 +26,15 @@ import ( "cosmossdk.io/log" storetypes "cosmossdk.io/store/types" - sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/berachain/polaris/cosmos/config" + "github.com/berachain/polaris/cosmos/x/evm/plugins/state" + "github.com/berachain/polaris/cosmos/x/evm/types" + "github.com/berachain/polaris/eth/core" + ethprecompile "github.com/berachain/polaris/eth/core/precompile" + coretypes "github.com/berachain/polaris/eth/core/types" + "github.com/berachain/polaris/eth/params" - "pkg.berachain.dev/polaris/cosmos/config" - "pkg.berachain.dev/polaris/cosmos/x/evm/plugins/state" - "pkg.berachain.dev/polaris/cosmos/x/evm/types" - "pkg.berachain.dev/polaris/eth/core" - ethprecompile "pkg.berachain.dev/polaris/eth/core/precompile" - coretypes "pkg.berachain.dev/polaris/eth/core/types" - "pkg.berachain.dev/polaris/eth/params" + sdk "github.com/cosmos/cosmos-sdk/types" ) type WrappedBlockchain interface { diff --git a/cosmos/x/evm/keeper/processor.go b/cosmos/x/evm/keeper/processor.go index 19823ea93..84a9fb0e4 100644 --- a/cosmos/x/evm/keeper/processor.go +++ b/cosmos/x/evm/keeper/processor.go @@ -26,12 +26,12 @@ import ( storetypes "cosmossdk.io/store/types" + evmtypes "github.com/berachain/polaris/cosmos/x/evm/types" + "github.com/berachain/polaris/eth/core/types" + sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/beacon/engine" - - evmtypes "pkg.berachain.dev/polaris/cosmos/x/evm/types" - "pkg.berachain.dev/polaris/eth/core/types" ) func (k *Keeper) ProcessPayloadEnvelope( diff --git a/cosmos/x/evm/module.go b/cosmos/x/evm/module.go index 82fb1301e..583766bf9 100644 --- a/cosmos/x/evm/module.go +++ b/cosmos/x/evm/module.go @@ -29,14 +29,14 @@ import ( "cosmossdk.io/core/appmodule" + "github.com/berachain/polaris/cosmos/x/evm/keeper" + "github.com/berachain/polaris/cosmos/x/evm/types" + "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" cdctypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - - "pkg.berachain.dev/polaris/cosmos/x/evm/keeper" - "pkg.berachain.dev/polaris/cosmos/x/evm/types" ) // ConsensusVersion defines the current x/evm module consensus version. diff --git a/cosmos/x/evm/plugins/base.go b/cosmos/x/evm/plugins/base.go index 7deb31287..dfd02b175 100644 --- a/cosmos/x/evm/plugins/base.go +++ b/cosmos/x/evm/plugins/base.go @@ -21,9 +21,9 @@ package plugins import ( - sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/berachain/polaris/eth/core" - "pkg.berachain.dev/polaris/eth/core" + sdk "github.com/cosmos/cosmos-sdk/types" ) // HasGenesis represents the base class that all x/evm Polaris plugins which have diff --git a/cosmos/x/evm/plugins/block/genesis.go b/cosmos/x/evm/plugins/block/genesis.go index 75e5eb61c..8e525eb06 100644 --- a/cosmos/x/evm/plugins/block/genesis.go +++ b/cosmos/x/evm/plugins/block/genesis.go @@ -21,10 +21,10 @@ package block import ( - sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/berachain/polaris/eth/core" + "github.com/berachain/polaris/eth/core/types" - "pkg.berachain.dev/polaris/eth/core" - "pkg.berachain.dev/polaris/eth/core/types" + sdk "github.com/cosmos/cosmos-sdk/types" ) // InitGenesis stores the genesis block header in the KVStore under its own genesis key. diff --git a/cosmos/x/evm/plugins/block/header.go b/cosmos/x/evm/plugins/block/header.go index 2c92b8cf7..95babffc1 100644 --- a/cosmos/x/evm/plugins/block/header.go +++ b/cosmos/x/evm/plugins/block/header.go @@ -25,11 +25,11 @@ import ( "fmt" "math/big" - "pkg.berachain.dev/polaris/cosmos/x/evm/types" - "pkg.berachain.dev/polaris/eth/common" - "pkg.berachain.dev/polaris/eth/core" - coretypes "pkg.berachain.dev/polaris/eth/core/types" - errorslib "pkg.berachain.dev/polaris/lib/errors" + "github.com/berachain/polaris/cosmos/x/evm/types" + "github.com/berachain/polaris/eth/common" + "github.com/berachain/polaris/eth/core" + coretypes "github.com/berachain/polaris/eth/core/types" + errorslib "github.com/berachain/polaris/lib/errors" ) // prevHeaderHashes is the number of previous header hashes being stored on chain. diff --git a/cosmos/x/evm/plugins/block/header_test.go b/cosmos/x/evm/plugins/block/header_test.go index 38df63b29..d33d62c0f 100644 --- a/cosmos/x/evm/plugins/block/header_test.go +++ b/cosmos/x/evm/plugins/block/header_test.go @@ -27,14 +27,14 @@ import ( "cosmossdk.io/log" storetypes "cosmossdk.io/store/types" - sdk "github.com/cosmos/cosmos-sdk/types" + testutil "github.com/berachain/polaris/cosmos/testutil" + evmtypes "github.com/berachain/polaris/cosmos/x/evm/types" + "github.com/berachain/polaris/eth/common" + "github.com/berachain/polaris/eth/core" + "github.com/berachain/polaris/eth/core/types" + "github.com/berachain/polaris/lib/utils" - testutil "pkg.berachain.dev/polaris/cosmos/testutil" - evmtypes "pkg.berachain.dev/polaris/cosmos/x/evm/types" - "pkg.berachain.dev/polaris/eth/common" - "pkg.berachain.dev/polaris/eth/core" - "pkg.berachain.dev/polaris/eth/core/types" - "pkg.berachain.dev/polaris/lib/utils" + sdk "github.com/cosmos/cosmos-sdk/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cosmos/x/evm/plugins/block/keys.go b/cosmos/x/evm/plugins/block/keys.go index ff54198c4..53c62b597 100644 --- a/cosmos/x/evm/plugins/block/keys.go +++ b/cosmos/x/evm/plugins/block/keys.go @@ -21,9 +21,9 @@ package block import ( - sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/berachain/polaris/cosmos/x/evm/types" - "pkg.berachain.dev/polaris/cosmos/x/evm/types" + sdk "github.com/cosmos/cosmos-sdk/types" ) // headerHashKeySize is the number of bytes in the header hash key: 1 (prefix) + 8 (block height). diff --git a/cosmos/x/evm/plugins/block/plugin.go b/cosmos/x/evm/plugins/block/plugin.go index 316dddc01..95ef201cc 100644 --- a/cosmos/x/evm/plugins/block/plugin.go +++ b/cosmos/x/evm/plugins/block/plugin.go @@ -25,10 +25,10 @@ import ( storetypes "cosmossdk.io/store/types" - sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/berachain/polaris/cosmos/x/evm/plugins" + "github.com/berachain/polaris/eth/core" - "pkg.berachain.dev/polaris/cosmos/x/evm/plugins" - "pkg.berachain.dev/polaris/eth/core" + sdk "github.com/cosmos/cosmos-sdk/types" ) type Plugin interface { diff --git a/cosmos/x/evm/plugins/historical/genesis.go b/cosmos/x/evm/plugins/historical/genesis.go index bc3eed517..9d64471a6 100644 --- a/cosmos/x/evm/plugins/historical/genesis.go +++ b/cosmos/x/evm/plugins/historical/genesis.go @@ -21,9 +21,9 @@ package historical import ( - sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/berachain/polaris/eth/core" - "pkg.berachain.dev/polaris/eth/core" + sdk "github.com/cosmos/cosmos-sdk/types" ) func (p *plugin) InitGenesis(ctx sdk.Context, ethGen *core.Genesis) error { diff --git a/cosmos/x/evm/plugins/historical/historical_data.go b/cosmos/x/evm/plugins/historical/historical_data.go index e84afc42b..16f73ad29 100644 --- a/cosmos/x/evm/plugins/historical/historical_data.go +++ b/cosmos/x/evm/plugins/historical/historical_data.go @@ -25,15 +25,15 @@ import ( "cosmossdk.io/store/prefix" + "github.com/berachain/polaris/cosmos/x/evm/types" + "github.com/berachain/polaris/eth/common" + "github.com/berachain/polaris/eth/core" + coretypes "github.com/berachain/polaris/eth/core/types" + errorslib "github.com/berachain/polaris/lib/errors" + sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/rlp" - - "pkg.berachain.dev/polaris/cosmos/x/evm/types" - "pkg.berachain.dev/polaris/eth/common" - "pkg.berachain.dev/polaris/eth/core" - coretypes "pkg.berachain.dev/polaris/eth/core/types" - errorslib "pkg.berachain.dev/polaris/lib/errors" ) // TODO: WHO WROTE THIS CODE THE FIRST TIME BLS FIX IT IS HORRIBLE. diff --git a/cosmos/x/evm/plugins/historical/plugin.go b/cosmos/x/evm/plugins/historical/plugin.go index 335c80017..38a3006f0 100644 --- a/cosmos/x/evm/plugins/historical/plugin.go +++ b/cosmos/x/evm/plugins/historical/plugin.go @@ -25,11 +25,11 @@ import ( storetypes "cosmossdk.io/store/types" - sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/berachain/polaris/cosmos/x/evm/plugins" + "github.com/berachain/polaris/eth/core" + "github.com/berachain/polaris/eth/params" - "pkg.berachain.dev/polaris/cosmos/x/evm/plugins" - "pkg.berachain.dev/polaris/eth/core" - "pkg.berachain.dev/polaris/eth/params" + sdk "github.com/cosmos/cosmos-sdk/types" ) // Plugin is the interface that must be implemented by the plugin. diff --git a/cosmos/x/evm/plugins/historical/plugin_test.go b/cosmos/x/evm/plugins/historical/plugin_test.go index a89b0f1e6..19d4ac48e 100644 --- a/cosmos/x/evm/plugins/historical/plugin_test.go +++ b/cosmos/x/evm/plugins/historical/plugin_test.go @@ -26,18 +26,18 @@ import ( "cosmossdk.io/log" + testutil "github.com/berachain/polaris/cosmos/testutil" + "github.com/berachain/polaris/eth/common" + "github.com/berachain/polaris/eth/core" + "github.com/berachain/polaris/eth/core/mock" + coretypes "github.com/berachain/polaris/eth/core/types" + "github.com/berachain/polaris/eth/params" + "github.com/berachain/polaris/lib/utils" + sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/trie" - testutil "pkg.berachain.dev/polaris/cosmos/testutil" - "pkg.berachain.dev/polaris/eth/common" - "pkg.berachain.dev/polaris/eth/core" - "pkg.berachain.dev/polaris/eth/core/mock" - coretypes "pkg.berachain.dev/polaris/eth/core/types" - "pkg.berachain.dev/polaris/eth/params" - "pkg.berachain.dev/polaris/lib/utils" - . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cosmos/x/evm/plugins/precompile/log/attributes.go b/cosmos/x/evm/plugins/precompile/log/attributes.go index afa3d1d95..e2fa0e53e 100644 --- a/cosmos/x/evm/plugins/precompile/log/attributes.go +++ b/cosmos/x/evm/plugins/precompile/log/attributes.go @@ -23,16 +23,16 @@ package log import ( "strconv" + cosmlib "github.com/berachain/polaris/cosmos/lib" + "github.com/berachain/polaris/eth/accounts/abi" + "github.com/berachain/polaris/eth/common" + "github.com/berachain/polaris/eth/core/precompile" + abci "github.com/cometbft/cometbft/abci/types" sdk "github.com/cosmos/cosmos-sdk/types" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - - cosmlib "pkg.berachain.dev/polaris/cosmos/lib" - "pkg.berachain.dev/polaris/eth/accounts/abi" - "pkg.berachain.dev/polaris/eth/common" - "pkg.berachain.dev/polaris/eth/core/precompile" ) const ( diff --git a/cosmos/x/evm/plugins/precompile/log/attributes_test.go b/cosmos/x/evm/plugins/precompile/log/attributes_test.go index 5f20d62f7..be84eabf9 100644 --- a/cosmos/x/evm/plugins/precompile/log/attributes_test.go +++ b/cosmos/x/evm/plugins/precompile/log/attributes_test.go @@ -26,13 +26,13 @@ import ( sdkmath "cosmossdk.io/math" + libgenerated "github.com/berachain/polaris/contracts/bindings/cosmos/lib" + libutils "github.com/berachain/polaris/lib/utils" + abci "github.com/cometbft/cometbft/abci/types" sdk "github.com/cosmos/cosmos-sdk/types" - libgenerated "pkg.berachain.dev/polaris/contracts/bindings/cosmos/lib" - libutils "pkg.berachain.dev/polaris/lib/utils" - . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cosmos/x/evm/plugins/precompile/log/factory.go b/cosmos/x/evm/plugins/precompile/log/factory.go index 80f22c153..0d6f96edf 100644 --- a/cosmos/x/evm/plugins/precompile/log/factory.go +++ b/cosmos/x/evm/plugins/precompile/log/factory.go @@ -21,14 +21,14 @@ package log import ( - sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/berachain/polaris/cosmos/x/evm/plugins/state/events" + "github.com/berachain/polaris/eth/core/precompile" + coretypes "github.com/berachain/polaris/eth/core/types" + "github.com/berachain/polaris/lib/registry" + libtypes "github.com/berachain/polaris/lib/types" + "github.com/berachain/polaris/lib/utils" - "pkg.berachain.dev/polaris/cosmos/x/evm/plugins/state/events" - "pkg.berachain.dev/polaris/eth/core/precompile" - coretypes "pkg.berachain.dev/polaris/eth/core/types" - "pkg.berachain.dev/polaris/lib/registry" - libtypes "pkg.berachain.dev/polaris/lib/types" - "pkg.berachain.dev/polaris/lib/utils" + sdk "github.com/cosmos/cosmos-sdk/types" ) // Factory is a `PrecompileLogFactory` that builds Ethereum logs from Cosmos events. All Ethereum diff --git a/cosmos/x/evm/plugins/precompile/log/factory_test.go b/cosmos/x/evm/plugins/precompile/log/factory_test.go index 7b74eb6d1..b3f6311c6 100644 --- a/cosmos/x/evm/plugins/precompile/log/factory_test.go +++ b/cosmos/x/evm/plugins/precompile/log/factory_test.go @@ -27,17 +27,17 @@ import ( "cosmossdk.io/log" sdkmath "cosmossdk.io/math" + cosmlib "github.com/berachain/polaris/cosmos/lib" + testutil "github.com/berachain/polaris/cosmos/testutil" + "github.com/berachain/polaris/eth/accounts/abi" + "github.com/berachain/polaris/eth/common" + "github.com/berachain/polaris/eth/core/precompile" + "github.com/berachain/polaris/eth/core/precompile/mock" + "github.com/berachain/polaris/eth/crypto" + sdk "github.com/cosmos/cosmos-sdk/types" stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" - cosmlib "pkg.berachain.dev/polaris/cosmos/lib" - testutil "pkg.berachain.dev/polaris/cosmos/testutil" - "pkg.berachain.dev/polaris/eth/accounts/abi" - "pkg.berachain.dev/polaris/eth/common" - "pkg.berachain.dev/polaris/eth/core/precompile" - "pkg.berachain.dev/polaris/eth/core/precompile/mock" - "pkg.berachain.dev/polaris/eth/crypto" - . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cosmos/x/evm/plugins/precompile/log/log.go b/cosmos/x/evm/plugins/precompile/log/log.go index 2181b60c5..5fb527109 100644 --- a/cosmos/x/evm/plugins/precompile/log/log.go +++ b/cosmos/x/evm/plugins/precompile/log/log.go @@ -21,9 +21,9 @@ package log import ( - "pkg.berachain.dev/polaris/eth/accounts/abi" - "pkg.berachain.dev/polaris/eth/common" - libtypes "pkg.berachain.dev/polaris/lib/types" + "github.com/berachain/polaris/eth/accounts/abi" + "github.com/berachain/polaris/eth/common" + libtypes "github.com/berachain/polaris/lib/types" ) // Compile-time assertion. diff --git a/cosmos/x/evm/plugins/precompile/log/log_test.go b/cosmos/x/evm/plugins/precompile/log/log_test.go index 144f69f88..19ed3b8e2 100644 --- a/cosmos/x/evm/plugins/precompile/log/log_test.go +++ b/cosmos/x/evm/plugins/precompile/log/log_test.go @@ -23,9 +23,9 @@ package log import ( "testing" - "pkg.berachain.dev/polaris/eth/accounts/abi" - "pkg.berachain.dev/polaris/eth/common" - "pkg.berachain.dev/polaris/eth/crypto" + "github.com/berachain/polaris/eth/accounts/abi" + "github.com/berachain/polaris/eth/common" + "github.com/berachain/polaris/eth/crypto" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cosmos/x/evm/plugins/precompile/log/translator.go b/cosmos/x/evm/plugins/precompile/log/translator.go index 606de40a9..5c35e7955 100644 --- a/cosmos/x/evm/plugins/precompile/log/translator.go +++ b/cosmos/x/evm/plugins/precompile/log/translator.go @@ -21,12 +21,12 @@ package log import ( - sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/berachain/polaris/eth/accounts/abi" + "github.com/berachain/polaris/eth/common" + "github.com/berachain/polaris/eth/core/precompile" + "github.com/berachain/polaris/lib/errors" - "pkg.berachain.dev/polaris/eth/accounts/abi" - "pkg.berachain.dev/polaris/eth/common" - "pkg.berachain.dev/polaris/eth/core/precompile" - "pkg.berachain.dev/polaris/lib/errors" + sdk "github.com/cosmos/cosmos-sdk/types" ) // makeTopics generates the Ethereum log `Topics` field for a valid cosmos event. `Topics` is a diff --git a/cosmos/x/evm/plugins/precompile/plugin.go b/cosmos/x/evm/plugins/precompile/plugin.go index 939d3a7b0..a625f546e 100644 --- a/cosmos/x/evm/plugins/precompile/plugin.go +++ b/cosmos/x/evm/plugins/precompile/plugin.go @@ -26,18 +26,18 @@ import ( storetypes "cosmossdk.io/store/types" - sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/berachain/polaris/cosmos/x/evm/plugins/state" + "github.com/berachain/polaris/eth/common" + "github.com/berachain/polaris/eth/core" + ethprecompile "github.com/berachain/polaris/eth/core/precompile" + ethstate "github.com/berachain/polaris/eth/core/state" + "github.com/berachain/polaris/eth/core/vm" + "github.com/berachain/polaris/eth/params" + "github.com/berachain/polaris/lib/registry" + libtypes "github.com/berachain/polaris/lib/types" + "github.com/berachain/polaris/lib/utils" - "pkg.berachain.dev/polaris/cosmos/x/evm/plugins/state" - "pkg.berachain.dev/polaris/eth/common" - "pkg.berachain.dev/polaris/eth/core" - ethprecompile "pkg.berachain.dev/polaris/eth/core/precompile" - ethstate "pkg.berachain.dev/polaris/eth/core/state" - "pkg.berachain.dev/polaris/eth/core/vm" - "pkg.berachain.dev/polaris/eth/params" - "pkg.berachain.dev/polaris/lib/registry" - libtypes "pkg.berachain.dev/polaris/lib/types" - "pkg.berachain.dev/polaris/lib/utils" + sdk "github.com/cosmos/cosmos-sdk/types" ) // Plugin is the interface that must be implemented by the plugin. diff --git a/cosmos/x/evm/plugins/precompile/plugin_test.go b/cosmos/x/evm/plugins/precompile/plugin_test.go index cb2cdff89..f351f8f7a 100644 --- a/cosmos/x/evm/plugins/precompile/plugin_test.go +++ b/cosmos/x/evm/plugins/precompile/plugin_test.go @@ -29,18 +29,18 @@ import ( "cosmossdk.io/log" storetypes "cosmossdk.io/store/types" - sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/berachain/polaris/cosmos/store/snapmulti" + testutil "github.com/berachain/polaris/cosmos/testutil" + "github.com/berachain/polaris/cosmos/x/evm/plugins/state" + "github.com/berachain/polaris/cosmos/x/evm/plugins/state/events" + "github.com/berachain/polaris/cosmos/x/evm/plugins/state/events/mock" + "github.com/berachain/polaris/eth/common" + ethstate "github.com/berachain/polaris/eth/core/state" + coretypes "github.com/berachain/polaris/eth/core/types" + "github.com/berachain/polaris/eth/core/vm" + "github.com/berachain/polaris/lib/utils" - "pkg.berachain.dev/polaris/cosmos/store/snapmulti" - testutil "pkg.berachain.dev/polaris/cosmos/testutil" - "pkg.berachain.dev/polaris/cosmos/x/evm/plugins/state" - "pkg.berachain.dev/polaris/cosmos/x/evm/plugins/state/events" - "pkg.berachain.dev/polaris/cosmos/x/evm/plugins/state/events/mock" - "pkg.berachain.dev/polaris/eth/common" - ethstate "pkg.berachain.dev/polaris/eth/core/state" - coretypes "pkg.berachain.dev/polaris/eth/core/types" - "pkg.berachain.dev/polaris/eth/core/vm" - "pkg.berachain.dev/polaris/lib/utils" + sdk "github.com/cosmos/cosmos-sdk/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cosmos/x/evm/plugins/precompile/recovery.go b/cosmos/x/evm/plugins/precompile/recovery.go index 3e9b74cc2..ace605fdd 100644 --- a/cosmos/x/evm/plugins/precompile/recovery.go +++ b/cosmos/x/evm/plugins/precompile/recovery.go @@ -25,8 +25,8 @@ import ( storetypes "cosmossdk.io/store/types" - "pkg.berachain.dev/polaris/eth/core/vm" - "pkg.berachain.dev/polaris/lib/utils" + "github.com/berachain/polaris/eth/core/vm" + "github.com/berachain/polaris/lib/utils" ) // RecoveryHandler is used to recover from any WriteProtection and gas consumption panics that diff --git a/cosmos/x/evm/plugins/state/events/interfaces.go b/cosmos/x/evm/plugins/state/events/interfaces.go index e0b8de6d3..7fb3aeb89 100644 --- a/cosmos/x/evm/plugins/state/events/interfaces.go +++ b/cosmos/x/evm/plugins/state/events/interfaces.go @@ -21,9 +21,9 @@ package events import ( - sdk "github.com/cosmos/cosmos-sdk/types" + coretypes "github.com/berachain/polaris/eth/core/types" - coretypes "pkg.berachain.dev/polaris/eth/core/types" + sdk "github.com/cosmos/cosmos-sdk/types" ) type ( diff --git a/cosmos/x/evm/plugins/state/events/manager.go b/cosmos/x/evm/plugins/state/events/manager.go index 89a6fb4f1..37d94eec8 100644 --- a/cosmos/x/evm/plugins/state/events/manager.go +++ b/cosmos/x/evm/plugins/state/events/manager.go @@ -23,11 +23,11 @@ package events import ( "errors" - sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/berachain/polaris/eth/core/vm" + errlib "github.com/berachain/polaris/lib/errors" + "github.com/berachain/polaris/lib/utils" - "pkg.berachain.dev/polaris/eth/core/vm" - errlib "pkg.berachain.dev/polaris/lib/errors" - "pkg.berachain.dev/polaris/lib/utils" + sdk "github.com/cosmos/cosmos-sdk/types" ) const ( diff --git a/cosmos/x/evm/plugins/state/events/manager_test.go b/cosmos/x/evm/plugins/state/events/manager_test.go index f6f1e1921..06b117ba2 100644 --- a/cosmos/x/evm/plugins/state/events/manager_test.go +++ b/cosmos/x/evm/plugins/state/events/manager_test.go @@ -20,12 +20,12 @@ package events_test import ( "cosmossdk.io/log" - sdk "github.com/cosmos/cosmos-sdk/types" + testutil "github.com/berachain/polaris/cosmos/testutil" + "github.com/berachain/polaris/cosmos/x/evm/plugins/state" + "github.com/berachain/polaris/cosmos/x/evm/plugins/state/events" + "github.com/berachain/polaris/cosmos/x/evm/plugins/state/events/mock" - testutil "pkg.berachain.dev/polaris/cosmos/testutil" - "pkg.berachain.dev/polaris/cosmos/x/evm/plugins/state" - "pkg.berachain.dev/polaris/cosmos/x/evm/plugins/state/events" - "pkg.berachain.dev/polaris/cosmos/x/evm/plugins/state/events/mock" + sdk "github.com/cosmos/cosmos-sdk/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cosmos/x/evm/plugins/state/events/mock/log_factory.go b/cosmos/x/evm/plugins/state/events/mock/log_factory.go index 79362b5cb..2e3f71c21 100644 --- a/cosmos/x/evm/plugins/state/events/mock/log_factory.go +++ b/cosmos/x/evm/plugins/state/events/mock/log_factory.go @@ -23,9 +23,9 @@ package mock import ( "errors" - sdk "github.com/cosmos/cosmos-sdk/types" + coretypes "github.com/berachain/polaris/eth/core/types" - coretypes "pkg.berachain.dev/polaris/eth/core/types" + sdk "github.com/cosmos/cosmos-sdk/types" ) //go:generate moq -out ./log_factory.mock.go -pkg mock ../ PrecompileLogFactory diff --git a/cosmos/x/evm/plugins/state/events/mock/log_factory.mock.go b/cosmos/x/evm/plugins/state/events/mock/log_factory.mock.go index 96a4e8e1e..739ddb9ee 100644 --- a/cosmos/x/evm/plugins/state/events/mock/log_factory.mock.go +++ b/cosmos/x/evm/plugins/state/events/mock/log_factory.mock.go @@ -4,9 +4,9 @@ package mock import ( + "github.com/berachain/polaris/cosmos/x/evm/plugins/state/events" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/core/types" - "pkg.berachain.dev/polaris/cosmos/x/evm/plugins/state/events" "sync" ) diff --git a/cosmos/x/evm/plugins/state/events/mock/logsdb.go b/cosmos/x/evm/plugins/state/events/mock/logsdb.go index ba5fdf266..ba4bcc8d3 100644 --- a/cosmos/x/evm/plugins/state/events/mock/logsdb.go +++ b/cosmos/x/evm/plugins/state/events/mock/logsdb.go @@ -21,7 +21,7 @@ package mock import ( - coretypes "pkg.berachain.dev/polaris/eth/core/types" + coretypes "github.com/berachain/polaris/eth/core/types" ) //go:generate moq -out ./logsdb.mock.go -pkg mock ../ LogsDB diff --git a/cosmos/x/evm/plugins/state/events/mock/logsdb.mock.go b/cosmos/x/evm/plugins/state/events/mock/logsdb.mock.go index 401e6267d..74fdf4c86 100644 --- a/cosmos/x/evm/plugins/state/events/mock/logsdb.mock.go +++ b/cosmos/x/evm/plugins/state/events/mock/logsdb.mock.go @@ -4,8 +4,8 @@ package mock import ( + "github.com/berachain/polaris/cosmos/x/evm/plugins/state/events" "github.com/ethereum/go-ethereum/core/types" - "pkg.berachain.dev/polaris/cosmos/x/evm/plugins/state/events" "sync" ) diff --git a/cosmos/x/evm/plugins/state/genesis.go b/cosmos/x/evm/plugins/state/genesis.go index e25152ba3..08ed276fd 100644 --- a/cosmos/x/evm/plugins/state/genesis.go +++ b/cosmos/x/evm/plugins/state/genesis.go @@ -26,10 +26,10 @@ import ( "golang.org/x/exp/slices" - sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/berachain/polaris/eth/common" + "github.com/berachain/polaris/eth/core" - "pkg.berachain.dev/polaris/eth/common" - "pkg.berachain.dev/polaris/eth/core" + sdk "github.com/cosmos/cosmos-sdk/types" ) // InitGenesis takes in a pointer to a genesis state object and populates the KV store. diff --git a/cosmos/x/evm/plugins/state/genesis_test.go b/cosmos/x/evm/plugins/state/genesis_test.go index e7b7456b1..e5933c9de 100644 --- a/cosmos/x/evm/plugins/state/genesis_test.go +++ b/cosmos/x/evm/plugins/state/genesis_test.go @@ -25,13 +25,13 @@ import ( "cosmossdk.io/log" - sdk "github.com/cosmos/cosmos-sdk/types" + testutil "github.com/berachain/polaris/cosmos/testutil" + "github.com/berachain/polaris/cosmos/x/evm/plugins/state" + "github.com/berachain/polaris/eth/common" + "github.com/berachain/polaris/eth/core" + "github.com/berachain/polaris/eth/crypto" - testutil "pkg.berachain.dev/polaris/cosmos/testutil" - "pkg.berachain.dev/polaris/cosmos/x/evm/plugins/state" - "pkg.berachain.dev/polaris/eth/common" - "pkg.berachain.dev/polaris/eth/core" - "pkg.berachain.dev/polaris/eth/crypto" + sdk "github.com/cosmos/cosmos-sdk/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cosmos/x/evm/plugins/state/interfaces.go b/cosmos/x/evm/plugins/state/interfaces.go index 1d548ae9c..10bf3ceda 100644 --- a/cosmos/x/evm/plugins/state/interfaces.go +++ b/cosmos/x/evm/plugins/state/interfaces.go @@ -26,10 +26,10 @@ import ( "cosmossdk.io/core/address" storetypes "cosmossdk.io/store/types" - sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/berachain/polaris/cosmos/x/evm/plugins/state/events" + libtypes "github.com/berachain/polaris/lib/types" - "pkg.berachain.dev/polaris/cosmos/x/evm/plugins/state/events" - libtypes "pkg.berachain.dev/polaris/lib/types" + sdk "github.com/cosmos/cosmos-sdk/types" ) // ControllableEventManager defines a cache EventManager that is controllable (snapshottable diff --git a/cosmos/x/evm/plugins/state/keys.go b/cosmos/x/evm/plugins/state/keys.go index fe1889759..ed5b25f90 100644 --- a/cosmos/x/evm/plugins/state/keys.go +++ b/cosmos/x/evm/plugins/state/keys.go @@ -21,8 +21,8 @@ package state import ( - types "pkg.berachain.dev/polaris/cosmos/x/evm/types" - "pkg.berachain.dev/polaris/eth/common" + types "github.com/berachain/polaris/cosmos/x/evm/types" + "github.com/berachain/polaris/eth/common" ) // NOTE: we use copy to build keys for max performance: https://github.com/golang/go/issues/55905 diff --git a/cosmos/x/evm/plugins/state/keys_test.go b/cosmos/x/evm/plugins/state/keys_test.go index d321cb348..208ebd8bd 100644 --- a/cosmos/x/evm/plugins/state/keys_test.go +++ b/cosmos/x/evm/plugins/state/keys_test.go @@ -21,8 +21,8 @@ package state import ( - "pkg.berachain.dev/polaris/cosmos/x/evm/types" - "pkg.berachain.dev/polaris/eth/common" + "github.com/berachain/polaris/cosmos/x/evm/types" + "github.com/berachain/polaris/eth/common" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cosmos/x/evm/plugins/state/plugin.go b/cosmos/x/evm/plugins/state/plugin.go index d3102279c..659a7487b 100644 --- a/cosmos/x/evm/plugins/state/plugin.go +++ b/cosmos/x/evm/plugins/state/plugin.go @@ -28,18 +28,18 @@ import ( storetypes "cosmossdk.io/store/types" - sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/berachain/polaris/cosmos/store/snapmulti" + "github.com/berachain/polaris/cosmos/x/evm/plugins" + "github.com/berachain/polaris/cosmos/x/evm/plugins/state/events" + "github.com/berachain/polaris/cosmos/x/evm/types" + "github.com/berachain/polaris/eth/common" + "github.com/berachain/polaris/eth/core" + ethstate "github.com/berachain/polaris/eth/core/state" + "github.com/berachain/polaris/eth/crypto" + "github.com/berachain/polaris/lib/snapshot" + libtypes "github.com/berachain/polaris/lib/types" - "pkg.berachain.dev/polaris/cosmos/store/snapmulti" - "pkg.berachain.dev/polaris/cosmos/x/evm/plugins" - "pkg.berachain.dev/polaris/cosmos/x/evm/plugins/state/events" - "pkg.berachain.dev/polaris/cosmos/x/evm/types" - "pkg.berachain.dev/polaris/eth/common" - "pkg.berachain.dev/polaris/eth/core" - ethstate "pkg.berachain.dev/polaris/eth/core/state" - "pkg.berachain.dev/polaris/eth/crypto" - "pkg.berachain.dev/polaris/lib/snapshot" - libtypes "pkg.berachain.dev/polaris/lib/types" + sdk "github.com/cosmos/cosmos-sdk/types" ) const pluginRegistryKey = `statePlugin` diff --git a/cosmos/x/evm/plugins/state/plugin_benchmark_test.go b/cosmos/x/evm/plugins/state/plugin_benchmark_test.go index 0155a1994..e71e1b490 100644 --- a/cosmos/x/evm/plugins/state/plugin_benchmark_test.go +++ b/cosmos/x/evm/plugins/state/plugin_benchmark_test.go @@ -26,10 +26,10 @@ import ( "cosmossdk.io/log" - testutil "pkg.berachain.dev/polaris/cosmos/testutil" - "pkg.berachain.dev/polaris/cosmos/x/evm/plugins/state" - "pkg.berachain.dev/polaris/eth/common" - "pkg.berachain.dev/polaris/eth/core" + testutil "github.com/berachain/polaris/cosmos/testutil" + "github.com/berachain/polaris/cosmos/x/evm/plugins/state" + "github.com/berachain/polaris/eth/common" + "github.com/berachain/polaris/eth/core" ) var ( diff --git a/cosmos/x/evm/plugins/state/plugin_test.go b/cosmos/x/evm/plugins/state/plugin_test.go index 2a80548e2..7de6040ab 100644 --- a/cosmos/x/evm/plugins/state/plugin_test.go +++ b/cosmos/x/evm/plugins/state/plugin_test.go @@ -25,13 +25,13 @@ import ( "cosmossdk.io/log" - sdk "github.com/cosmos/cosmos-sdk/types" + testutil "github.com/berachain/polaris/cosmos/testutil" + "github.com/berachain/polaris/cosmos/x/evm/plugins/state" + "github.com/berachain/polaris/eth/common" + coretypes "github.com/berachain/polaris/eth/core/types" + "github.com/berachain/polaris/eth/crypto" - testutil "pkg.berachain.dev/polaris/cosmos/testutil" - "pkg.berachain.dev/polaris/cosmos/x/evm/plugins/state" - "pkg.berachain.dev/polaris/eth/common" - coretypes "pkg.berachain.dev/polaris/eth/core/types" - "pkg.berachain.dev/polaris/eth/crypto" + sdk "github.com/cosmos/cosmos-sdk/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/cosmos/x/evm/types/tx.go b/cosmos/x/evm/types/tx.go index 7b78140d5..28788fb96 100644 --- a/cosmos/x/evm/types/tx.go +++ b/cosmos/x/evm/types/tx.go @@ -23,9 +23,9 @@ package types import ( "fmt" - "github.com/ethereum/go-ethereum/beacon/engine" + coretypes "github.com/berachain/polaris/eth/core/types" - coretypes "pkg.berachain.dev/polaris/eth/core/types" + "github.com/ethereum/go-ethereum/beacon/engine" ) // WrapTx sets the transaction data from an `coretypes.Transaction`. diff --git a/cosmos/x/evm/types/tx.pb.go b/cosmos/x/evm/types/tx.pb.go index f5cb70da2..fa5be3b61 100644 --- a/cosmos/x/evm/types/tx.pb.go +++ b/cosmos/x/evm/types/tx.pb.go @@ -248,32 +248,32 @@ func init() { proto.RegisterFile("polaris/evm/v1alpha1/tx.proto", fileDescriptor var fileDescriptor_d8b33d2a2c64400f = []byte{ // 407 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x92, 0x4f, 0x8b, 0xd3, 0x40, - 0x18, 0xc6, 0x93, 0x45, 0x7b, 0x18, 0xa4, 0x94, 0x51, 0x76, 0x35, 0xb8, 0xa1, 0xf4, 0x24, 0x4b, - 0x49, 0xb6, 0xeb, 0xe2, 0x5d, 0xd3, 0x59, 0x28, 0x68, 0x2d, 0x99, 0x44, 0xc5, 0x4b, 0x99, 0x4d, - 0x5e, 0x9a, 0x60, 0x92, 0x19, 0x66, 0xa6, 0xa1, 0x15, 0x0f, 0x7e, 0x01, 0xc1, 0x8f, 0xe2, 0xc7, - 0xf0, 0xd8, 0xa3, 0x47, 0x69, 0x0f, 0x7e, 0x0d, 0x31, 0x4d, 0x41, 0x4a, 0xba, 0xd0, 0xd3, 0x0c, - 0xef, 0xf3, 0x7b, 0x5f, 0xde, 0x3f, 0x0f, 0x3a, 0x17, 0x3c, 0x63, 0x32, 0x55, 0x2e, 0x94, 0xb9, - 0x5b, 0x0e, 0x58, 0x26, 0x12, 0x36, 0x70, 0xf5, 0xc2, 0x11, 0x92, 0x6b, 0x8e, 0x1f, 0xd5, 0xb2, - 0x03, 0x65, 0xee, 0xec, 0x64, 0xeb, 0x2c, 0xe2, 0x2a, 0xe7, 0xca, 0xcd, 0xd5, 0xcc, 0x2d, 0x07, - 0xff, 0x9e, 0x2d, 0xde, 0xbb, 0x44, 0xd6, 0x7b, 0xc9, 0x84, 0x80, 0x98, 0xe8, 0x04, 0x24, 0xcc, - 0xf3, 0x40, 0xb2, 0x42, 0xb1, 0x48, 0xa7, 0xbc, 0xc0, 0x18, 0xdd, 0x8b, 0x99, 0x66, 0x8f, 0xcd, - 0xae, 0xf9, 0xec, 0x81, 0x5f, 0xfd, 0x7b, 0x7d, 0x74, 0x5a, 0x67, 0x4c, 0xd8, 0x32, 0xe3, 0x2c, - 0x26, 0x45, 0x09, 0x19, 0x17, 0xd0, 0x48, 0x77, 0x91, 0xdd, 0x4c, 0xfb, 0xa0, 0x04, 0x2f, 0x14, - 0xf4, 0x3e, 0xa0, 0xee, 0xe1, 0x0e, 0x7c, 0x50, 0xf3, 0x4c, 0xe3, 0x6b, 0xd4, 0x52, 0x9a, 0xe9, - 0xb9, 0xaa, 0x6a, 0xb7, 0xaf, 0x9e, 0x3a, 0x4d, 0x53, 0x3a, 0xb4, 0x62, 0xfc, 0x9a, 0xbd, 0x08, - 0x50, 0x6b, 0x1b, 0xc1, 0xe7, 0xe8, 0x09, 0x0d, 0x5e, 0x06, 0x21, 0x9d, 0xfa, 0xe4, 0x1d, 0xf1, - 0x83, 0x69, 0x38, 0xa6, 0x13, 0xe2, 0x8d, 0x6e, 0x46, 0x64, 0xd8, 0x31, 0x30, 0x46, 0xed, 0x5a, - 0xa6, 0xa1, 0xe7, 0x11, 0x4a, 0x3b, 0x26, 0x3e, 0x43, 0x0f, 0xeb, 0xd8, 0xf8, 0x6d, 0x30, 0x1d, - 0x8d, 0xbd, 0xd7, 0xe1, 0x90, 0x0c, 0x3b, 0x27, 0x57, 0xdf, 0x4e, 0x10, 0x7a, 0xa3, 0x66, 0x14, - 0x64, 0x99, 0x46, 0x80, 0x3f, 0xa3, 0x36, 0xd1, 0xc9, 0xff, 0x4b, 0xbb, 0x6c, 0x6e, 0xee, 0xf0, - 0x90, 0xd6, 0x8b, 0x63, 0x33, 0xea, 0xb5, 0x7c, 0x41, 0xa7, 0x13, 0xc9, 0x23, 0x50, 0x6a, 0xff, - 0x14, 0xfd, 0x3b, 0x2b, 0xee, 0xd1, 0xd6, 0xf5, 0x31, 0xf4, 0xee, 0x70, 0xd6, 0xfd, 0xaf, 0x7f, - 0x7e, 0x5c, 0x98, 0xaf, 0x6e, 0x7e, 0xae, 0x6d, 0x73, 0xb5, 0xb6, 0xcd, 0xdf, 0x6b, 0xdb, 0xfc, - 0xbe, 0xb1, 0x8d, 0xd5, 0xc6, 0x36, 0x7e, 0x6d, 0x6c, 0xe3, 0x63, 0x5f, 0x7c, 0x9a, 0x39, 0xb7, - 0x20, 0x59, 0x94, 0xb0, 0xb4, 0x70, 0x62, 0x28, 0xdd, 0x9d, 0x77, 0x6b, 0x3b, 0x2e, 0x2a, 0x13, - 0xeb, 0xa5, 0x00, 0x75, 0xdb, 0xaa, 0x0c, 0xf9, 0xfc, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x49, - 0x1a, 0xf4, 0xc3, 0xe0, 0x02, 0x00, 0x00, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x92, 0xcf, 0xaa, 0xd3, 0x40, + 0x14, 0xc6, 0x93, 0x8b, 0x76, 0x31, 0x48, 0x29, 0xa3, 0xdc, 0xab, 0xc1, 0x1b, 0x4a, 0x57, 0x72, + 0xb9, 0x64, 0xda, 0x5a, 0xdc, 0x6b, 0x3a, 0x42, 0x40, 0x6b, 0xc9, 0x24, 0x2a, 0x6e, 0xca, 0x34, + 0x1d, 0x9a, 0x40, 0x92, 0x19, 0x66, 0x26, 0xa1, 0x15, 0x17, 0xbe, 0x80, 0xe0, 0xa3, 0xf8, 0x18, + 0x2e, 0xbb, 0x74, 0x29, 0xed, 0xc2, 0xd7, 0x10, 0xd3, 0x14, 0xa4, 0xa4, 0x17, 0xba, 0x9a, 0xe1, + 0x7c, 0xbf, 0x73, 0x38, 0x7f, 0x3e, 0x70, 0x2d, 0x78, 0x4a, 0x65, 0xa2, 0x10, 0x2b, 0x33, 0x54, + 0x0e, 0x68, 0x2a, 0x62, 0x3a, 0x40, 0x7a, 0xe5, 0x08, 0xc9, 0x35, 0x87, 0x8f, 0x6a, 0xd9, 0x61, + 0x65, 0xe6, 0x1c, 0x64, 0xeb, 0x2a, 0xe2, 0x2a, 0xe3, 0x0a, 0x65, 0x6a, 0x89, 0xca, 0xc1, 0xbf, + 0x67, 0x8f, 0xf7, 0xfa, 0xc0, 0xfa, 0x20, 0xa9, 0x10, 0x6c, 0x81, 0x75, 0xcc, 0x24, 0x2b, 0xb2, + 0x40, 0xd2, 0x5c, 0xd1, 0x48, 0x27, 0x3c, 0x87, 0x10, 0xdc, 0x5b, 0x50, 0x4d, 0x1f, 0x9b, 0x5d, + 0xf3, 0xd9, 0x03, 0xbf, 0xfa, 0xf7, 0x6e, 0xc1, 0x65, 0x9d, 0x31, 0xa5, 0xeb, 0x94, 0xd3, 0x05, + 0xce, 0x4b, 0x96, 0x72, 0xc1, 0x1a, 0xe9, 0x2e, 0xb0, 0x9b, 0x69, 0x9f, 0x29, 0xc1, 0x73, 0xc5, + 0x7a, 0x1f, 0x41, 0xf7, 0x74, 0x07, 0x3e, 0x53, 0x45, 0xaa, 0xe1, 0x08, 0xb4, 0x94, 0xa6, 0xba, + 0x50, 0x55, 0xed, 0xf6, 0xf0, 0xa9, 0xd3, 0x34, 0xa5, 0x43, 0x2a, 0xc6, 0xaf, 0xd9, 0x9b, 0x00, + 0xb4, 0xf6, 0x11, 0x78, 0x0d, 0x9e, 0x90, 0xe0, 0x65, 0x10, 0x92, 0x99, 0x8f, 0xdf, 0x63, 0x3f, + 0x98, 0x85, 0x13, 0x32, 0xc5, 0xae, 0xf7, 0xda, 0xc3, 0xe3, 0x8e, 0x01, 0x21, 0x68, 0xd7, 0x32, + 0x09, 0x5d, 0x17, 0x13, 0xd2, 0x31, 0xe1, 0x15, 0x78, 0x58, 0xc7, 0x26, 0xef, 0x82, 0x99, 0x37, + 0x71, 0xdf, 0x84, 0x63, 0x3c, 0xee, 0x5c, 0x0c, 0xbf, 0x5d, 0x00, 0xf0, 0x56, 0x2d, 0x09, 0x93, + 0x65, 0x12, 0x31, 0xf8, 0x19, 0xb4, 0xb1, 0x8e, 0xff, 0x5f, 0x5a, 0xbf, 0xb9, 0xb9, 0xd3, 0x43, + 0x5a, 0x2f, 0xce, 0xcd, 0xa8, 0xd7, 0xf2, 0x05, 0x5c, 0x4e, 0x25, 0x8f, 0x98, 0x52, 0xc7, 0xa7, + 0xb8, 0xbd, 0xb3, 0xe2, 0x11, 0x6d, 0x8d, 0xce, 0xa1, 0x0f, 0x87, 0xb3, 0xee, 0x7f, 0xfd, 0xf3, + 0xe3, 0xc6, 0x7c, 0xe5, 0xfd, 0xdc, 0xda, 0xe6, 0x66, 0x6b, 0x9b, 0xbf, 0xb7, 0xb6, 0xf9, 0x7d, + 0x67, 0x1b, 0x9b, 0x9d, 0x6d, 0xfc, 0xda, 0xd9, 0xc6, 0x27, 0xb4, 0x4c, 0x74, 0x5c, 0xcc, 0x9d, + 0x88, 0x67, 0x68, 0xce, 0x24, 0x8d, 0x62, 0x9a, 0xe4, 0xe8, 0x60, 0xdf, 0xda, 0x91, 0xab, 0xca, + 0xc7, 0x7a, 0x2d, 0x98, 0x9a, 0xb7, 0x2a, 0x4f, 0x3e, 0xff, 0x1b, 0x00, 0x00, 0xff, 0xff, 0x93, + 0x26, 0xf6, 0x2b, 0xe3, 0x02, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/e2e/localnet/go.mod b/e2e/localnet/go.mod index de06061c5..232de74e8 100644 --- a/e2e/localnet/go.mod +++ b/e2e/localnet/go.mod @@ -1,15 +1,15 @@ -module pkg.berachain.dev/polaris/e2e/localnet +module github.com/berachain/polaris/e2e/localnet go 1.21 require ( + github.com/berachain/polaris/contracts v0.0.0-20231107182447-2b91ecc782a6 + github.com/berachain/polaris/eth v0.0.0-20231107182447-2b91ecc782a6 github.com/docker/docker v24.0.7+incompatible github.com/ethereum/go-ethereum v1.13.4 github.com/onsi/ginkgo/v2 v2.13.0 github.com/onsi/gomega v1.27.10 github.com/ory/dockertest v3.3.5+incompatible - pkg.berachain.dev/polaris/contracts v0.0.0-20231104204753-faadca38b64d - pkg.berachain.dev/polaris/eth v0.0.0-20231104204753-faadca38b64d ) require ( @@ -19,7 +19,6 @@ require ( github.com/bits-and-blooms/bitset v1.11.0 // indirect github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect github.com/cenkalti/backoff v2.2.1+incompatible // indirect - github.com/cockroachdb/pebble v0.0.0-20231101195458-481da04154d6 // indirect github.com/consensys/bavard v0.1.13 // indirect github.com/consensys/gnark-crypto v0.12.1 // indirect github.com/containerd/continuity v0.3.0 // indirect @@ -31,7 +30,6 @@ require ( github.com/docker/go-units v0.5.0 // indirect github.com/ethereum/c-kzg-4844 v0.4.0 // indirect github.com/fsnotify/fsnotify v1.7.0 // indirect - github.com/getsentry/sentry-go v0.25.0 // indirect github.com/go-logr/logr v1.2.4 // indirect github.com/go-ole/go-ole v1.3.0 // indirect github.com/go-stack/stack v1.8.1 // indirect @@ -43,9 +41,7 @@ require ( github.com/gorilla/websocket v1.5.1 // indirect github.com/gotestyourself/gotestyourself v2.2.0+incompatible // indirect github.com/holiman/uint256 v1.2.3 // indirect - github.com/klauspost/compress v1.17.2 // indirect github.com/lib/pq v1.10.9 // indirect - github.com/mattn/go-isatty v0.0.20 // indirect github.com/mmcloughlin/addchain v0.4.0 // indirect github.com/moby/term v0.5.0 // indirect github.com/morikuni/aec v1.0.0 // indirect @@ -53,10 +49,6 @@ require ( github.com/opencontainers/image-spec v1.1.0-rc4 // indirect github.com/opencontainers/runc v1.1.5 // indirect github.com/pkg/errors v0.9.1 // indirect - github.com/prometheus/client_golang v1.17.0 // indirect - github.com/prometheus/client_model v0.5.0 // indirect - github.com/prometheus/common v0.45.0 // indirect - github.com/prometheus/procfs v0.12.0 // indirect github.com/shirou/gopsutil v3.21.11+incompatible // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/supranational/blst v0.3.11 // indirect diff --git a/e2e/localnet/go.sum b/e2e/localnet/go.sum index 59e096937..18cbf902b 100644 --- a/e2e/localnet/go.sum +++ b/e2e/localnet/go.sum @@ -11,6 +11,10 @@ github.com/VictoriaMetrics/fastcache v1.12.1 h1:i0mICQuojGDL3KblA7wUNlY5lOK6a4bw github.com/VictoriaMetrics/fastcache v1.12.1/go.mod h1:tX04vaqcNoQeGLD+ra5pU5sWkuxnzWhEzLwhP9w653o= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= +github.com/berachain/polaris/contracts v0.0.0-20231107182447-2b91ecc782a6 h1:mL5OXGE9+QjxDclhqtzgXHTIdxDFxRAj3zxHjbkKyr4= +github.com/berachain/polaris/contracts v0.0.0-20231107182447-2b91ecc782a6/go.mod h1:cZ1kKh7+zVnvn/cKMHdjNoxoaVJt8L71W7GXHw94Hm4= +github.com/berachain/polaris/eth v0.0.0-20231107182447-2b91ecc782a6 h1:nrPpnRGfCFCZ9kmC8jJYAOajNmpWXudvW0aO64HgIlI= +github.com/berachain/polaris/eth v0.0.0-20231107182447-2b91ecc782a6/go.mod h1:qM5tm1wLoaRA2+CyDD2DXHMSxdw9dluJDvdPOoUmsjU= github.com/bits-and-blooms/bitset v1.11.0 h1:RMyy2mBBShArUAhfVRZJ2xyBO58KCBCtZFShw3umo6k= github.com/bits-and-blooms/bitset v1.11.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8= github.com/btcsuite/btcd/btcec/v2 v2.3.2 h1:5n0X6hX0Zk+6omWcihdYvdAlGf2DfasC0GMf7DClJ3U= @@ -150,7 +154,7 @@ github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWE github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U= github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= -github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= +github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 h1:I0XW9+e1XWDxdcEniV4rQAIOPUGDq67JSCiRCgGCZLI= github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 h1:jWpvCLoY8Z/e3VKvlsiIGKtc+UG6U5vzxaoagmhXfyg= github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0/go.mod h1:QUyp042oQthUoa9bqDv0ER0wrtXnBruoNd7aNjkbP+k= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= @@ -280,7 +284,6 @@ golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20211116061358-0a5406a5449c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q= @@ -321,9 +324,5 @@ gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= gotest.tools/v3 v3.5.1 h1:EENdUnS3pdur5nybKYIh2Vfgc8IUNBjxDPSjtiJcOzU= gotest.tools/v3 v3.5.1/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU= -pkg.berachain.dev/polaris/contracts v0.0.0-20231104204753-faadca38b64d h1:nhHvQsD6mODe2D/mcQB/l0QRfRc91VmfDSMpdn0dPAI= -pkg.berachain.dev/polaris/contracts v0.0.0-20231104204753-faadca38b64d/go.mod h1:5Nz9qfw/JZGle4OtEsJBkgWDn9MNWCEZlCW/6pE5yZg= -pkg.berachain.dev/polaris/eth v0.0.0-20231104204753-faadca38b64d h1:ZWEbE2Y7fyjHDE/hZdyrEN9XzPeiFqseHvmP2CCt0sc= -pkg.berachain.dev/polaris/eth v0.0.0-20231104204753-faadca38b64d/go.mod h1:6rSA+gUVrfnlp+RfVLTGQrJGVjEu4j8d2zcr9zeaD2Y= rsc.io/tmplfunc v0.0.3 h1:53XFQh69AfOa8Tw0Jm7t+GV7KZhOi6jzsCzTtKbMvzU= rsc.io/tmplfunc v0.0.3/go.mod h1:AG3sTPzElb1Io3Yg4voV9AGZJuleGAwaVRxL9M49PhA= diff --git a/e2e/localnet/network/fixture.go b/e2e/localnet/network/fixture.go index 79512f58d..22d0b413f 100644 --- a/e2e/localnet/network/fixture.go +++ b/e2e/localnet/network/fixture.go @@ -31,10 +31,10 @@ import ( ginkgo "github.com/onsi/ginkgo/v2" - "github.com/ethereum/go-ethereum/accounts/abi/bind" + "github.com/berachain/polaris/eth/common" + "github.com/berachain/polaris/eth/crypto" - "pkg.berachain.dev/polaris/eth/common" - "pkg.berachain.dev/polaris/eth/crypto" + "github.com/ethereum/go-ethereum/accounts/abi/bind" ) const ( diff --git a/e2e/localnet/network/fixture_test.go b/e2e/localnet/network/fixture_test.go index 8421c18b8..22930b2a3 100644 --- a/e2e/localnet/network/fixture_test.go +++ b/e2e/localnet/network/fixture_test.go @@ -29,20 +29,20 @@ import ( "context" "math/big" + tbindings "github.com/berachain/polaris/contracts/bindings/testing" + localnet "github.com/berachain/polaris/e2e/localnet/network" + "github.com/berachain/polaris/eth/common" + coretypes "github.com/berachain/polaris/eth/core/types" + geth "github.com/ethereum/go-ethereum" "github.com/ethereum/go-ethereum/accounts/abi/bind" gethtypes "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/ethclient" gethrpc "github.com/ethereum/go-ethereum/rpc" - tbindings "pkg.berachain.dev/polaris/contracts/bindings/testing" - localnet "pkg.berachain.dev/polaris/e2e/localnet/network" - "pkg.berachain.dev/polaris/eth/common" - coretypes "pkg.berachain.dev/polaris/eth/core/types" - + . "github.com/berachain/polaris/e2e/localnet/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "pkg.berachain.dev/polaris/e2e/localnet/utils" ) var _ = Describe("JSON RPC tests", func() { diff --git a/e2e/localnet/network/node.go b/e2e/localnet/network/node.go index 5911b7c56..9633e9e51 100644 --- a/e2e/localnet/network/node.go +++ b/e2e/localnet/network/node.go @@ -30,10 +30,10 @@ import ( "errors" "time" + "github.com/berachain/polaris/e2e/localnet/container" + "github.com/ethereum/go-ethereum/ethclient" gethrpc "github.com/ethereum/go-ethereum/rpc" - - "pkg.berachain.dev/polaris/e2e/localnet/container" ) const ( diff --git a/e2e/localnet/network/node_test.go b/e2e/localnet/network/node_test.go index bbdd07a49..9cbd189f8 100644 --- a/e2e/localnet/network/node_test.go +++ b/e2e/localnet/network/node_test.go @@ -30,8 +30,8 @@ import ( "fmt" "math/big" - localnet "pkg.berachain.dev/polaris/e2e/localnet/network" - coretypes "pkg.berachain.dev/polaris/eth/core/types" + localnet "github.com/berachain/polaris/e2e/localnet/network" + coretypes "github.com/berachain/polaris/eth/core/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/e2e/localnet/utils/utils.go b/e2e/localnet/utils/utils.go index 6ab469c95..27f0e8ee7 100644 --- a/e2e/localnet/utils/utils.go +++ b/e2e/localnet/utils/utils.go @@ -25,13 +25,13 @@ import ( "math/big" "time" + bindings "github.com/berachain/polaris/contracts/bindings/testing" + "github.com/berachain/polaris/eth/common" + coretypes "github.com/berachain/polaris/eth/core/types" + "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/ethclient" - bindings "pkg.berachain.dev/polaris/contracts/bindings/testing" - "pkg.berachain.dev/polaris/eth/common" - coretypes "pkg.berachain.dev/polaris/eth/core/types" - . "github.com/onsi/gomega" //nolint:stylecheck,revive,gostaticcheck // Gomega makes sense in tests. ) diff --git a/e2e/precompile/contracts/bank/bank_test.go b/e2e/precompile/contracts/bank/bank_test.go index c4215005c..9bbcf8ef6 100644 --- a/e2e/precompile/contracts/bank/bank_test.go +++ b/e2e/precompile/contracts/bank/bank_test.go @@ -29,14 +29,14 @@ import ( "math/big" "testing" - bindings "pkg.berachain.dev/polaris/contracts/bindings/cosmos/precompile/bank" - localnet "pkg.berachain.dev/polaris/e2e/localnet/network" - utils "pkg.berachain.dev/polaris/e2e/precompile" - "pkg.berachain.dev/polaris/eth/common" + bindings "github.com/berachain/polaris/contracts/bindings/cosmos/precompile/bank" + localnet "github.com/berachain/polaris/e2e/localnet/network" + utils "github.com/berachain/polaris/e2e/precompile" + "github.com/berachain/polaris/eth/common" + . "github.com/berachain/polaris/e2e/localnet/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "pkg.berachain.dev/polaris/e2e/localnet/utils" ) func TestCosmosPrecompiles(t *testing.T) { diff --git a/e2e/precompile/contracts/distribution/distribution_test.go b/e2e/precompile/contracts/distribution/distribution_test.go index 68db70c7e..f9640ff53 100644 --- a/e2e/precompile/contracts/distribution/distribution_test.go +++ b/e2e/precompile/contracts/distribution/distribution_test.go @@ -29,21 +29,21 @@ import ( "math/big" "testing" + bbindings "github.com/berachain/polaris/contracts/bindings/cosmos/precompile/bank" + bindings "github.com/berachain/polaris/contracts/bindings/cosmos/precompile/distribution" + sbindings "github.com/berachain/polaris/contracts/bindings/cosmos/precompile/staking" + tbindings "github.com/berachain/polaris/contracts/bindings/testing" + network "github.com/berachain/polaris/e2e/localnet/network" + utils "github.com/berachain/polaris/e2e/precompile" + "github.com/berachain/polaris/eth/common" + sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - bbindings "pkg.berachain.dev/polaris/contracts/bindings/cosmos/precompile/bank" - bindings "pkg.berachain.dev/polaris/contracts/bindings/cosmos/precompile/distribution" - sbindings "pkg.berachain.dev/polaris/contracts/bindings/cosmos/precompile/staking" - tbindings "pkg.berachain.dev/polaris/contracts/bindings/testing" - network "pkg.berachain.dev/polaris/e2e/localnet/network" - utils "pkg.berachain.dev/polaris/e2e/precompile" - "pkg.berachain.dev/polaris/eth/common" - + . "github.com/berachain/polaris/e2e/localnet/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "pkg.berachain.dev/polaris/e2e/localnet/utils" ) func TestDistributionPrecompile(t *testing.T) { diff --git a/e2e/precompile/contracts/gov/governance_test.go b/e2e/precompile/contracts/gov/governance_test.go index 4edf93252..592ffbf1a 100644 --- a/e2e/precompile/contracts/gov/governance_test.go +++ b/e2e/precompile/contracts/gov/governance_test.go @@ -31,20 +31,20 @@ import ( "github.com/cosmos/gogoproto/proto" + bbindings "github.com/berachain/polaris/contracts/bindings/cosmos/precompile/bank" + bindings "github.com/berachain/polaris/contracts/bindings/cosmos/precompile/governance" + tbindings "github.com/berachain/polaris/contracts/bindings/testing/governance" + network "github.com/berachain/polaris/e2e/localnet/network" + utils "github.com/berachain/polaris/e2e/precompile" + "github.com/berachain/polaris/eth/common" + "github.com/berachain/polaris/eth/core/types" + authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - bbindings "pkg.berachain.dev/polaris/contracts/bindings/cosmos/precompile/bank" - bindings "pkg.berachain.dev/polaris/contracts/bindings/cosmos/precompile/governance" - tbindings "pkg.berachain.dev/polaris/contracts/bindings/testing/governance" - network "pkg.berachain.dev/polaris/e2e/localnet/network" - utils "pkg.berachain.dev/polaris/e2e/precompile" - "pkg.berachain.dev/polaris/eth/common" - "pkg.berachain.dev/polaris/eth/core/types" - + . "github.com/berachain/polaris/e2e/localnet/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "pkg.berachain.dev/polaris/e2e/localnet/utils" ) func TestGovernancePrecompile(t *testing.T) { diff --git a/e2e/precompile/contracts/misc/precompile_constructor_test.go b/e2e/precompile/contracts/misc/precompile_constructor_test.go index 74155606b..06bafb8ea 100644 --- a/e2e/precompile/contracts/misc/precompile_constructor_test.go +++ b/e2e/precompile/contracts/misc/precompile_constructor_test.go @@ -28,13 +28,13 @@ package misc_test import ( "testing" - tbindings "pkg.berachain.dev/polaris/contracts/bindings/testing" - network "pkg.berachain.dev/polaris/e2e/localnet/network" - utils "pkg.berachain.dev/polaris/e2e/precompile" + tbindings "github.com/berachain/polaris/contracts/bindings/testing" + network "github.com/berachain/polaris/e2e/localnet/network" + utils "github.com/berachain/polaris/e2e/precompile" + . "github.com/berachain/polaris/e2e/localnet/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "pkg.berachain.dev/polaris/e2e/localnet/utils" ) func TestMiscellaneousPrecompile(t *testing.T) { diff --git a/e2e/precompile/contracts/staking/staking_test.go b/e2e/precompile/contracts/staking/staking_test.go index 0f7c6e513..bcf392a14 100644 --- a/e2e/precompile/contracts/staking/staking_test.go +++ b/e2e/precompile/contracts/staking/staking_test.go @@ -30,19 +30,19 @@ import ( "testing" "time" + bbindings "github.com/berachain/polaris/contracts/bindings/cosmos/precompile/bank" + bindings "github.com/berachain/polaris/contracts/bindings/cosmos/precompile/staking" + tbindings "github.com/berachain/polaris/contracts/bindings/testing" + network "github.com/berachain/polaris/e2e/localnet/network" + utils "github.com/berachain/polaris/e2e/precompile" + "github.com/berachain/polaris/eth/common" + authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - bbindings "pkg.berachain.dev/polaris/contracts/bindings/cosmos/precompile/bank" - bindings "pkg.berachain.dev/polaris/contracts/bindings/cosmos/precompile/staking" - tbindings "pkg.berachain.dev/polaris/contracts/bindings/testing" - network "pkg.berachain.dev/polaris/e2e/localnet/network" - utils "pkg.berachain.dev/polaris/e2e/precompile" - "pkg.berachain.dev/polaris/eth/common" - + . "github.com/berachain/polaris/e2e/localnet/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "pkg.berachain.dev/polaris/e2e/localnet/utils" ) func TestStakingPrecompile(t *testing.T) { diff --git a/e2e/precompile/go.mod b/e2e/precompile/go.mod index 3cc590232..ac28d4031 100644 --- a/e2e/precompile/go.mod +++ b/e2e/precompile/go.mod @@ -1,4 +1,4 @@ -module pkg.berachain.dev/polaris/e2e/precompile +module github.com/berachain/polaris/e2e/precompile go 1.21 @@ -6,13 +6,13 @@ go 1.21 replace github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 require ( + github.com/berachain/polaris/contracts v0.0.0-20231107182447-2b91ecc782a6 + github.com/berachain/polaris/e2e/localnet v0.0.0-20231107182447-2b91ecc782a6 + github.com/berachain/polaris/eth v0.0.0-20231107182447-2b91ecc782a6 github.com/cosmos/cosmos-sdk v0.50.0-rc.1.0.20231103111158-e83a20081ced github.com/cosmos/gogoproto v1.4.11 github.com/onsi/ginkgo/v2 v2.13.0 github.com/onsi/gomega v1.27.10 - pkg.berachain.dev/polaris/contracts v0.0.0-20231104204753-faadca38b64d - pkg.berachain.dev/polaris/e2e/localnet v0.0.0-20231104204753-faadca38b64d - pkg.berachain.dev/polaris/eth v0.0.0-20231104204753-faadca38b64d ) require ( @@ -40,7 +40,6 @@ require ( github.com/cenkalti/backoff/v4 v4.2.0 // indirect github.com/cespare/xxhash v1.1.0 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect - github.com/cockroachdb/datadriven v1.0.3-0.20230801171734-e384cf455877 // indirect github.com/cockroachdb/errors v1.11.1 // indirect github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect github.com/cockroachdb/pebble v0.0.0-20231101195458-481da04154d6 // indirect diff --git a/e2e/precompile/go.sum b/e2e/precompile/go.sum index aa1bd823c..694b20e59 100644 --- a/e2e/precompile/go.sum +++ b/e2e/precompile/go.sum @@ -102,6 +102,12 @@ github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= +github.com/berachain/polaris/contracts v0.0.0-20231107182447-2b91ecc782a6 h1:mL5OXGE9+QjxDclhqtzgXHTIdxDFxRAj3zxHjbkKyr4= +github.com/berachain/polaris/contracts v0.0.0-20231107182447-2b91ecc782a6/go.mod h1:cZ1kKh7+zVnvn/cKMHdjNoxoaVJt8L71W7GXHw94Hm4= +github.com/berachain/polaris/e2e/localnet v0.0.0-20231107182447-2b91ecc782a6 h1:xQ8G7u5kA2aCaL8gsBI2S30Ww5V6WmpYX/7Da9tyPBU= +github.com/berachain/polaris/e2e/localnet v0.0.0-20231107182447-2b91ecc782a6/go.mod h1:5kTiiw+chO6yj5JZQsWK2qNZtbxYaG0t78uSOJZJ2PE= +github.com/berachain/polaris/eth v0.0.0-20231107182447-2b91ecc782a6 h1:nrPpnRGfCFCZ9kmC8jJYAOajNmpWXudvW0aO64HgIlI= +github.com/berachain/polaris/eth v0.0.0-20231107182447-2b91ecc782a6/go.mod h1:qM5tm1wLoaRA2+CyDD2DXHMSxdw9dluJDvdPOoUmsjU= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816 h1:41iFGWnSlI2gVpmOtVTJZNodLdLQLn/KsJqFvXwnd/s= github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= @@ -1405,12 +1411,6 @@ nhooyr.io/websocket v1.8.6 h1:s+C3xAMLwGmlI31Nyn/eAehUlZPwfYZu2JXM621Q5/k= nhooyr.io/websocket v1.8.6/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0= pgregory.net/rapid v1.1.0 h1:CMa0sjHSru3puNx+J0MIAuiiEV4N0qj8/cMWGBBCsjw= pgregory.net/rapid v1.1.0/go.mod h1:PY5XlDGj0+V1FCq0o192FdRhpKHGTRIWBgqjDBTrq04= -pkg.berachain.dev/polaris/contracts v0.0.0-20231104204753-faadca38b64d h1:nhHvQsD6mODe2D/mcQB/l0QRfRc91VmfDSMpdn0dPAI= -pkg.berachain.dev/polaris/contracts v0.0.0-20231104204753-faadca38b64d/go.mod h1:5Nz9qfw/JZGle4OtEsJBkgWDn9MNWCEZlCW/6pE5yZg= -pkg.berachain.dev/polaris/e2e/localnet v0.0.0-20231104204753-faadca38b64d h1:pMyGF8+3MdK/hOvnj1qoIBK2D6jO6WAVeIHB9njtTss= -pkg.berachain.dev/polaris/e2e/localnet v0.0.0-20231104204753-faadca38b64d/go.mod h1:SuGFgv6kr/l1rG0wNtw/EZGovaTo8fvcttLgGTl+R2I= -pkg.berachain.dev/polaris/eth v0.0.0-20231104204753-faadca38b64d h1:ZWEbE2Y7fyjHDE/hZdyrEN9XzPeiFqseHvmP2CCt0sc= -pkg.berachain.dev/polaris/eth v0.0.0-20231104204753-faadca38b64d/go.mod h1:6rSA+gUVrfnlp+RfVLTGQrJGVjEu4j8d2zcr9zeaD2Y= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= diff --git a/e2e/precompile/utils.go b/e2e/precompile/utils.go index 166bf2949..5e557206f 100644 --- a/e2e/precompile/utils.go +++ b/e2e/precompile/utils.go @@ -25,7 +25,7 @@ package utils -import network "pkg.berachain.dev/polaris/e2e/localnet/network" +import network "github.com/berachain/polaris/e2e/localnet/network" const ( polardConfigPath = "polard/config/" diff --git a/e2e/testapp/app.go b/e2e/testapp/app.go index edc6ba092..727d9f604 100644 --- a/e2e/testapp/app.go +++ b/e2e/testapp/app.go @@ -33,6 +33,14 @@ import ( evidencekeeper "cosmossdk.io/x/evidence/keeper" upgradekeeper "cosmossdk.io/x/upgrade/keeper" + evmv1alpha1 "github.com/berachain/polaris/cosmos/api/polaris/evm/v1alpha1" + evmconfig "github.com/berachain/polaris/cosmos/config" + ethcryptocodec "github.com/berachain/polaris/cosmos/crypto/codec" + signinglib "github.com/berachain/polaris/cosmos/lib/signing" + polarruntime "github.com/berachain/polaris/cosmos/runtime" + "github.com/berachain/polaris/cosmos/runtime/miner" + evmkeeper "github.com/berachain/polaris/cosmos/x/evm/keeper" + "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" @@ -52,14 +60,6 @@ import ( mintkeeper "github.com/cosmos/cosmos-sdk/x/mint/keeper" slashingkeeper "github.com/cosmos/cosmos-sdk/x/slashing/keeper" stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" - - evmv1alpha1 "pkg.berachain.dev/polaris/cosmos/api/polaris/evm/v1alpha1" - evmconfig "pkg.berachain.dev/polaris/cosmos/config" - ethcryptocodec "pkg.berachain.dev/polaris/cosmos/crypto/codec" - signinglib "pkg.berachain.dev/polaris/cosmos/lib/signing" - polarruntime "pkg.berachain.dev/polaris/cosmos/runtime" - "pkg.berachain.dev/polaris/cosmos/runtime/miner" - evmkeeper "pkg.berachain.dev/polaris/cosmos/x/evm/keeper" ) //nolint:gochecknoinits // from sdk. diff --git a/e2e/testapp/app_config.go b/e2e/testapp/app_config.go index 97b9d1c9f..0f0b25e6a 100644 --- a/e2e/testapp/app_config.go +++ b/e2e/testapp/app_config.go @@ -42,6 +42,9 @@ import ( evidencetypes "cosmossdk.io/x/evidence/types" upgradetypes "cosmossdk.io/x/upgrade/types" + evmmodulev1alpha1 "github.com/berachain/polaris/cosmos/api/polaris/evm/module/v1alpha1" + evmtypes "github.com/berachain/polaris/cosmos/x/evm/types" + "github.com/cosmos/cosmos-sdk/runtime" "github.com/cosmos/cosmos-sdk/types/module" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" @@ -57,11 +60,9 @@ import ( slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - evmmodulev1alpha1 "pkg.berachain.dev/polaris/cosmos/api/polaris/evm/module/v1alpha1" - evmtypes "pkg.berachain.dev/polaris/cosmos/x/evm/types" - _ "cosmossdk.io/x/evidence" // import for side-effects _ "cosmossdk.io/x/upgrade" // import for side-effects + _ "github.com/berachain/polaris/cosmos/x/evm" // import for side-effects _ "github.com/cosmos/cosmos-sdk/x/auth/tx/config" // import for side-effects _ "github.com/cosmos/cosmos-sdk/x/auth/vesting" // import for side-effects _ "github.com/cosmos/cosmos-sdk/x/bank" // import for side-effects @@ -71,7 +72,6 @@ import ( _ "github.com/cosmos/cosmos-sdk/x/mint" // import for side-effects _ "github.com/cosmos/cosmos-sdk/x/slashing" // import for side-effects _ "github.com/cosmos/cosmos-sdk/x/staking" // import for side-effects - _ "pkg.berachain.dev/polaris/cosmos/x/evm" // import for side-effects ) var ( diff --git a/e2e/testapp/go.mod b/e2e/testapp/go.mod index e6f169ccf..7d9bcb09b 100644 --- a/e2e/testapp/go.mod +++ b/e2e/testapp/go.mod @@ -1,4 +1,4 @@ -module pkg.berachain.dev/polaris/e2e/testapp +module github.com/berachain/polaris/e2e/testapp go 1.21 @@ -20,6 +20,8 @@ require ( cosmossdk.io/tools/confix v0.0.0-20230818115413-c402c51a1508 cosmossdk.io/x/evidence v0.0.0-20230818115413-c402c51a1508 cosmossdk.io/x/upgrade v0.0.0-20230915171831-2196edacb99d + github.com/berachain/polaris/cosmos v0.0.0-20231107182447-2b91ecc782a6 + github.com/berachain/polaris/eth v0.0.0-20231107182447-2b91ecc782a6 github.com/cometbft/cometbft v0.38.0 github.com/cosmos/cosmos-db v1.0.0 github.com/cosmos/cosmos-sdk v0.50.0-rc.1.0.20231103111158-e83a20081ced @@ -27,8 +29,6 @@ require ( github.com/onsi/gomega v1.27.10 github.com/spf13/cobra v1.7.0 github.com/spf13/viper v1.16.0 - pkg.berachain.dev/polaris/cosmos v0.0.0-20231104204753-faadca38b64d - pkg.berachain.dev/polaris/eth v0.0.0-20231104204753-faadca38b64d ) require ( @@ -50,6 +50,8 @@ require ( github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect github.com/aws/aws-sdk-go v1.44.224 // indirect github.com/beorn7/perks v1.0.1 // indirect + github.com/berachain/polaris/contracts v0.0.0-20231107182032-06b7434b1567 // indirect + github.com/berachain/polaris/lib v0.0.0-20231107182032-06b7434b1567 // indirect github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816 // indirect github.com/bits-and-blooms/bitset v1.11.0 // indirect @@ -65,7 +67,6 @@ require ( github.com/chenzhuoyu/iasm v0.9.0 // indirect github.com/chzyer/readline v1.5.1 // indirect github.com/cockroachdb/apd/v2 v2.0.2 // indirect - github.com/cockroachdb/datadriven v1.0.3-0.20230801171734-e384cf455877 // indirect github.com/cockroachdb/errors v1.11.1 // indirect github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect github.com/cockroachdb/pebble v0.0.0-20231101195458-481da04154d6 // indirect @@ -271,8 +272,6 @@ require ( gotest.tools/v3 v3.5.1 // indirect nhooyr.io/websocket v1.8.6 // indirect pgregory.net/rapid v1.1.0 // indirect - pkg.berachain.dev/polaris/contracts v0.0.0-20231031220135-f3bf0d0ee45f // indirect - pkg.berachain.dev/polaris/lib v0.0.0-20231031220135-f3bf0d0ee45f // indirect rsc.io/tmplfunc v0.0.3 // indirect sigs.k8s.io/yaml v1.3.0 // indirect ) diff --git a/e2e/testapp/go.sum b/e2e/testapp/go.sum index a96803394..d74439411 100644 --- a/e2e/testapp/go.sum +++ b/e2e/testapp/go.sum @@ -276,6 +276,14 @@ github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/berachain/polaris-geth v0.0.0-20231105185655-b78967bb230f h1:9wGV+05KiA6D9mcRxsBm/4hrKUI/LORwvsYlAvMl1Sc= github.com/berachain/polaris-geth v0.0.0-20231105185655-b78967bb230f/go.mod h1:I0U5VewuuTzvBtVzKo7b3hJzDhXOUtn9mJW7SsIPB0Q= +github.com/berachain/polaris/contracts v0.0.0-20231107182032-06b7434b1567 h1:RnfGz1Zb1FYJx3iRZVDDU3XAx+JrOoaRdDkv8CIlZzY= +github.com/berachain/polaris/contracts v0.0.0-20231107182032-06b7434b1567/go.mod h1:cZ1kKh7+zVnvn/cKMHdjNoxoaVJt8L71W7GXHw94Hm4= +github.com/berachain/polaris/cosmos v0.0.0-20231107182447-2b91ecc782a6 h1:92D3+rbXAcsQHx9SKYFs+oz+d1d/y6Qku4k0fb09ajc= +github.com/berachain/polaris/cosmos v0.0.0-20231107182447-2b91ecc782a6/go.mod h1:0r/gooN/eZyGyIgiUHQo4ccfw0+RR30TWoseKlNcLuQ= +github.com/berachain/polaris/eth v0.0.0-20231107182447-2b91ecc782a6 h1:nrPpnRGfCFCZ9kmC8jJYAOajNmpWXudvW0aO64HgIlI= +github.com/berachain/polaris/eth v0.0.0-20231107182447-2b91ecc782a6/go.mod h1:qM5tm1wLoaRA2+CyDD2DXHMSxdw9dluJDvdPOoUmsjU= +github.com/berachain/polaris/lib v0.0.0-20231107182032-06b7434b1567 h1:bW3CAESDF1I1apPhzOQr1secXf4ZwSRQ4XTwA0LO/xk= +github.com/berachain/polaris/lib v0.0.0-20231107182032-06b7434b1567/go.mod h1:H2fG0HisSeVc8nvFEq/IWRn+pPCHW/Nr8mbPmKy/Xqk= github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d h1:xDfNPAt8lFiC1UJrqV3uuy861HCTo708pDMbjHHdCas= github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d/go.mod h1:6QX/PXZ00z/TKoufEY6K/a0k6AhaJrQKdFe6OfVXsa4= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= @@ -1886,14 +1894,6 @@ nhooyr.io/websocket v1.8.6/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0 nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50= pgregory.net/rapid v1.1.0 h1:CMa0sjHSru3puNx+J0MIAuiiEV4N0qj8/cMWGBBCsjw= pgregory.net/rapid v1.1.0/go.mod h1:PY5XlDGj0+V1FCq0o192FdRhpKHGTRIWBgqjDBTrq04= -pkg.berachain.dev/polaris/contracts v0.0.0-20231031220135-f3bf0d0ee45f h1:TUIqQfHmD7lsVnf24kxwxlBTxSKOPt5W39t/0Mnk+cU= -pkg.berachain.dev/polaris/contracts v0.0.0-20231031220135-f3bf0d0ee45f/go.mod h1:5Nz9qfw/JZGle4OtEsJBkgWDn9MNWCEZlCW/6pE5yZg= -pkg.berachain.dev/polaris/cosmos v0.0.0-20231104204753-faadca38b64d h1:Np+A0OqlhFjFHKK2ZfeDV8D6qtc6YRYKA37fxq/GrLQ= -pkg.berachain.dev/polaris/cosmos v0.0.0-20231104204753-faadca38b64d/go.mod h1:rwvWL1M9Lo4iIDR1JEBx3rVZR7bgepxV+KI3y8HpxhY= -pkg.berachain.dev/polaris/eth v0.0.0-20231104204753-faadca38b64d h1:ZWEbE2Y7fyjHDE/hZdyrEN9XzPeiFqseHvmP2CCt0sc= -pkg.berachain.dev/polaris/eth v0.0.0-20231104204753-faadca38b64d/go.mod h1:6rSA+gUVrfnlp+RfVLTGQrJGVjEu4j8d2zcr9zeaD2Y= -pkg.berachain.dev/polaris/lib v0.0.0-20231031220135-f3bf0d0ee45f h1:mho28mqM87UH9A3fBeC3qugV2u9QgOpYJnc1zZkfZQs= -pkg.berachain.dev/polaris/lib v0.0.0-20231031220135-f3bf0d0ee45f/go.mod h1:6w+5Axb6GV66PLllrYf7h1G3x8Pwu5nvd7ZiibiI3HM= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= diff --git a/e2e/testapp/helpers.go b/e2e/testapp/helpers.go index 18cb8b467..afedfb2cd 100644 --- a/e2e/testapp/helpers.go +++ b/e2e/testapp/helpers.go @@ -21,17 +21,17 @@ package testapp import ( + evmconfig "github.com/berachain/polaris/cosmos/config" + bankprecompile "github.com/berachain/polaris/cosmos/precompile/bank" + distrprecompile "github.com/berachain/polaris/cosmos/precompile/distribution" + govprecompile "github.com/berachain/polaris/cosmos/precompile/governance" + stakingprecompile "github.com/berachain/polaris/cosmos/precompile/staking" + ethprecompile "github.com/berachain/polaris/eth/core/precompile" + sdk "github.com/cosmos/cosmos-sdk/types" bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" distrkeeper "github.com/cosmos/cosmos-sdk/x/distribution/keeper" govkeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper" - - evmconfig "pkg.berachain.dev/polaris/cosmos/config" - bankprecompile "pkg.berachain.dev/polaris/cosmos/precompile/bank" - distrprecompile "pkg.berachain.dev/polaris/cosmos/precompile/distribution" - govprecompile "pkg.berachain.dev/polaris/cosmos/precompile/governance" - stakingprecompile "pkg.berachain.dev/polaris/cosmos/precompile/staking" - ethprecompile "pkg.berachain.dev/polaris/eth/core/precompile" ) // PrecompilesToInject returns a function that provides the initialization of the standard diff --git a/e2e/testapp/polard/cmd/root.go b/e2e/testapp/polard/cmd/root.go index 9334a7ef3..dfaa18cb8 100644 --- a/e2e/testapp/polard/cmd/root.go +++ b/e2e/testapp/polard/cmd/root.go @@ -36,6 +36,13 @@ import ( "cosmossdk.io/log" confixcmd "cosmossdk.io/tools/confix/cmd" + evmv1alpha1 "github.com/berachain/polaris/cosmos/api/polaris/evm/v1alpha1" + evmconfig "github.com/berachain/polaris/cosmos/config" + ethcryptocodec "github.com/berachain/polaris/cosmos/crypto/codec" + "github.com/berachain/polaris/cosmos/crypto/keyring" + signinglib "github.com/berachain/polaris/cosmos/lib/signing" + testapp "github.com/berachain/polaris/e2e/testapp" + cmtcfg "github.com/cometbft/cometbft/config" "github.com/cosmos/cosmos-sdk/client" @@ -60,13 +67,6 @@ import ( "github.com/cosmos/cosmos-sdk/x/auth/types" "github.com/cosmos/cosmos-sdk/x/crisis" genutilcli "github.com/cosmos/cosmos-sdk/x/genutil/client/cli" - - evmv1alpha1 "pkg.berachain.dev/polaris/cosmos/api/polaris/evm/v1alpha1" - evmconfig "pkg.berachain.dev/polaris/cosmos/config" - ethcryptocodec "pkg.berachain.dev/polaris/cosmos/crypto/codec" - "pkg.berachain.dev/polaris/cosmos/crypto/keyring" - signinglib "pkg.berachain.dev/polaris/cosmos/lib/signing" - testapp "pkg.berachain.dev/polaris/e2e/testapp" ) // NewRootCmd creates a new root command for simd. It is called once in the main function. diff --git a/e2e/testapp/polard/cmd/root_test.go b/e2e/testapp/polard/cmd/root_test.go index d24e1ac29..c3fcfe2ec 100644 --- a/e2e/testapp/polard/cmd/root_test.go +++ b/e2e/testapp/polard/cmd/root_test.go @@ -25,13 +25,13 @@ import ( "os" "testing" + testapp "github.com/berachain/polaris/e2e/testapp" + "github.com/berachain/polaris/e2e/testapp/polard/cmd" + "github.com/cosmos/cosmos-sdk/client/flags" svrcmd "github.com/cosmos/cosmos-sdk/server/cmd" "github.com/cosmos/cosmos-sdk/x/genutil/client/cli" - testapp "pkg.berachain.dev/polaris/e2e/testapp" - "pkg.berachain.dev/polaris/e2e/testapp/polard/cmd" - . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/e2e/testapp/polard/main.go b/e2e/testapp/polard/main.go index 02bc9f9db..238d0ebdb 100644 --- a/e2e/testapp/polard/main.go +++ b/e2e/testapp/polard/main.go @@ -25,11 +25,11 @@ import ( "cosmossdk.io/log" - svrcmd "github.com/cosmos/cosmos-sdk/server/cmd" + "github.com/berachain/polaris/cosmos/config" + testapp "github.com/berachain/polaris/e2e/testapp" + "github.com/berachain/polaris/e2e/testapp/polard/cmd" - "pkg.berachain.dev/polaris/cosmos/config" - testapp "pkg.berachain.dev/polaris/e2e/testapp" - "pkg.berachain.dev/polaris/e2e/testapp/polard/cmd" + svrcmd "github.com/cosmos/cosmos-sdk/server/cmd" ) func main() { diff --git a/eth/accounts/abi/abi_test.go b/eth/accounts/abi/abi_test.go index 2bd0b1b05..06b3bc606 100644 --- a/eth/accounts/abi/abi_test.go +++ b/eth/accounts/abi/abi_test.go @@ -23,7 +23,7 @@ package abi_test import ( "testing" - "pkg.berachain.dev/polaris/eth/accounts/abi" + "github.com/berachain/polaris/eth/accounts/abi" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/eth/consensus/dummy_eth_one.go b/eth/consensus/dummy_eth_one.go index 3c4e819b7..08c3975aa 100644 --- a/eth/consensus/dummy_eth_one.go +++ b/eth/consensus/dummy_eth_one.go @@ -24,13 +24,13 @@ package consensus import ( "math/big" + "github.com/berachain/polaris/eth/common" + "github.com/berachain/polaris/eth/core/state" + "github.com/berachain/polaris/eth/core/types" + "github.com/berachain/polaris/eth/rpc" + "github.com/ethereum/go-ethereum/consensus" "github.com/ethereum/go-ethereum/trie" - - "pkg.berachain.dev/polaris/eth/common" - "pkg.berachain.dev/polaris/eth/core/state" - "pkg.berachain.dev/polaris/eth/core/types" - "pkg.berachain.dev/polaris/eth/rpc" ) type Engine consensus.Engine diff --git a/eth/core/chain.go b/eth/core/chain.go index 53fcf2816..1f6566f88 100644 --- a/eth/core/chain.go +++ b/eth/core/chain.go @@ -26,18 +26,18 @@ import ( "math/big" "sync/atomic" + "github.com/berachain/polaris/eth/common" + "github.com/berachain/polaris/eth/consensus" + "github.com/berachain/polaris/eth/core/state" + "github.com/berachain/polaris/eth/core/types" + "github.com/berachain/polaris/eth/core/vm" + "github.com/berachain/polaris/eth/log" + "github.com/berachain/polaris/eth/params" + lru "github.com/ethereum/go-ethereum/common/lru" "github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/event" "github.com/ethereum/go-ethereum/trie" - - "pkg.berachain.dev/polaris/eth/common" - "pkg.berachain.dev/polaris/eth/consensus" - "pkg.berachain.dev/polaris/eth/core/state" - "pkg.berachain.dev/polaris/eth/core/types" - "pkg.berachain.dev/polaris/eth/core/vm" - "pkg.berachain.dev/polaris/eth/log" - "pkg.berachain.dev/polaris/eth/params" ) // By default we are storing up to 1024 items in each cache. diff --git a/eth/core/chain_context.go b/eth/core/chain_context.go index 5bc7648b1..ba9660cd5 100644 --- a/eth/core/chain_context.go +++ b/eth/core/chain_context.go @@ -21,10 +21,10 @@ package core import ( - "github.com/ethereum/go-ethereum/consensus" + "github.com/berachain/polaris/eth/common" + "github.com/berachain/polaris/eth/core/types" - "pkg.berachain.dev/polaris/eth/common" - "pkg.berachain.dev/polaris/eth/core/types" + "github.com/ethereum/go-ethereum/consensus" ) // GetHeader returns the header for the given hash or number. This is used by the `GetHashFn`. diff --git a/eth/core/chain_helpers.go b/eth/core/chain_helpers.go index 623374513..60a07ef59 100644 --- a/eth/core/chain_helpers.go +++ b/eth/core/chain_helpers.go @@ -21,8 +21,8 @@ package core import ( - "pkg.berachain.dev/polaris/eth/common" - "pkg.berachain.dev/polaris/eth/core/types" + "github.com/berachain/polaris/eth/common" + "github.com/berachain/polaris/eth/core/types" ) // deriveReceipts derives the receipts from the block. diff --git a/eth/core/chain_reader.go b/eth/core/chain_reader.go index b284e0076..9fe868cf5 100644 --- a/eth/core/chain_reader.go +++ b/eth/core/chain_reader.go @@ -23,9 +23,9 @@ package core import ( "math/big" - "pkg.berachain.dev/polaris/eth/common" - "pkg.berachain.dev/polaris/eth/core/types" - "pkg.berachain.dev/polaris/lib/utils" + "github.com/berachain/polaris/eth/common" + "github.com/berachain/polaris/eth/core/types" + "github.com/berachain/polaris/lib/utils" ) // ChainReader defines methods that are used to read the state and blocks of the chain. diff --git a/eth/core/chain_resources.go b/eth/core/chain_resources.go index cd14c21ed..5c55b6adf 100644 --- a/eth/core/chain_resources.go +++ b/eth/core/chain_resources.go @@ -23,10 +23,10 @@ package core import ( "errors" - "pkg.berachain.dev/polaris/eth/common" - "pkg.berachain.dev/polaris/eth/core/state" - "pkg.berachain.dev/polaris/eth/core/vm" - "pkg.berachain.dev/polaris/eth/params" + "github.com/berachain/polaris/eth/common" + "github.com/berachain/polaris/eth/core/state" + "github.com/berachain/polaris/eth/core/vm" + "github.com/berachain/polaris/eth/params" ) // ChainResources is the interface that defines functions for code paths within the chain to diff --git a/eth/core/chain_subscriber.go b/eth/core/chain_subscriber.go index 27b31ab98..a2dcc038e 100644 --- a/eth/core/chain_subscriber.go +++ b/eth/core/chain_subscriber.go @@ -21,9 +21,9 @@ package core import ( - "github.com/ethereum/go-ethereum/event" + "github.com/berachain/polaris/eth/core/types" - "pkg.berachain.dev/polaris/eth/core/types" + "github.com/ethereum/go-ethereum/event" ) type ChainSubscriber interface { diff --git a/eth/core/chain_writer.go b/eth/core/chain_writer.go index 78230fa32..cf5797c05 100644 --- a/eth/core/chain_writer.go +++ b/eth/core/chain_writer.go @@ -24,11 +24,11 @@ import ( "context" "errors" - "github.com/ethereum/go-ethereum/core" + "github.com/berachain/polaris/eth/core/state" + "github.com/berachain/polaris/eth/core/types" + "github.com/berachain/polaris/eth/log" - "pkg.berachain.dev/polaris/eth/core/state" - "pkg.berachain.dev/polaris/eth/core/types" - "pkg.berachain.dev/polaris/eth/log" + "github.com/ethereum/go-ethereum/core" ) // ChainWriter defines methods that are used to perform state and block transitions. diff --git a/eth/core/genesis.go b/eth/core/genesis.go index 4a598d66e..56d935020 100644 --- a/eth/core/genesis.go +++ b/eth/core/genesis.go @@ -23,11 +23,11 @@ package core import ( "math/big" - "github.com/ethereum/go-ethereum/core" + "github.com/berachain/polaris/eth/common" + "github.com/berachain/polaris/eth/common/hexutil" + "github.com/berachain/polaris/eth/core/types" - "pkg.berachain.dev/polaris/eth/common" - "pkg.berachain.dev/polaris/eth/common/hexutil" - "pkg.berachain.dev/polaris/eth/core/types" + "github.com/ethereum/go-ethereum/core" ) type ( diff --git a/eth/core/host.go b/eth/core/host.go index 2fc19c8ff..df22aa96c 100644 --- a/eth/core/host.go +++ b/eth/core/host.go @@ -21,11 +21,11 @@ package core import ( - "pkg.berachain.dev/polaris/eth/common" - "pkg.berachain.dev/polaris/eth/core/precompile" - "pkg.berachain.dev/polaris/eth/core/state" - "pkg.berachain.dev/polaris/eth/core/types" - libtypes "pkg.berachain.dev/polaris/lib/types" + "github.com/berachain/polaris/eth/common" + "github.com/berachain/polaris/eth/core/precompile" + "github.com/berachain/polaris/eth/core/state" + "github.com/berachain/polaris/eth/core/types" + libtypes "github.com/berachain/polaris/lib/types" ) // PolarisHostChain defines the plugins that the chain running the Polaris EVM should implement. diff --git a/eth/core/mock/block_plugin.mock.go b/eth/core/mock/block_plugin.mock.go index 4f944abd3..18f2cb0e9 100644 --- a/eth/core/mock/block_plugin.mock.go +++ b/eth/core/mock/block_plugin.mock.go @@ -5,9 +5,9 @@ package mock import ( "context" + "github.com/berachain/polaris/eth/core" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" - "pkg.berachain.dev/polaris/eth/core" "sync" ) diff --git a/eth/core/mock/historical_plugin.mock.go b/eth/core/mock/historical_plugin.mock.go index ad73237f6..9c4b68843 100644 --- a/eth/core/mock/historical_plugin.mock.go +++ b/eth/core/mock/historical_plugin.mock.go @@ -5,10 +5,10 @@ package mock import ( "context" + "github.com/berachain/polaris/eth/core" + ethcoretypes "github.com/berachain/polaris/eth/core/types" "github.com/ethereum/go-ethereum/common" ethereumcoretypes "github.com/ethereum/go-ethereum/core/types" - "pkg.berachain.dev/polaris/eth/core" - ethcoretypes "pkg.berachain.dev/polaris/eth/core/types" "sync" ) diff --git a/eth/core/mock/precompile_plugin.go b/eth/core/mock/precompile_plugin.go index 90b25e472..2cf24f5d6 100644 --- a/eth/core/mock/precompile_plugin.go +++ b/eth/core/mock/precompile_plugin.go @@ -21,7 +21,7 @@ package mock import ( - "pkg.berachain.dev/polaris/eth/core/vm" + "github.com/berachain/polaris/eth/core/vm" ) //go:generate moq -out ./precompile_plugin.mock.go -pkg mock ../ PrecompilePlugin diff --git a/eth/core/mock/precompile_plugin.mock.go b/eth/core/mock/precompile_plugin.mock.go index cae4a6865..c7ebee661 100644 --- a/eth/core/mock/precompile_plugin.mock.go +++ b/eth/core/mock/precompile_plugin.mock.go @@ -4,11 +4,11 @@ package mock import ( + "github.com/berachain/polaris/eth/core" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/vm" "github.com/ethereum/go-ethereum/params" "math/big" - "pkg.berachain.dev/polaris/eth/core" "sync" ) diff --git a/eth/core/mock/state_plugin.mock.go b/eth/core/mock/state_plugin.mock.go index b5c8d81a1..2f635e1fa 100644 --- a/eth/core/mock/state_plugin.mock.go +++ b/eth/core/mock/state_plugin.mock.go @@ -5,10 +5,10 @@ package mock import ( "context" + "github.com/berachain/polaris/eth/core" + "github.com/berachain/polaris/eth/core/state" "github.com/ethereum/go-ethereum/common" "math/big" - "pkg.berachain.dev/polaris/eth/core" - "pkg.berachain.dev/polaris/eth/core/state" "sync" ) diff --git a/eth/core/precompile/base_contract.go b/eth/core/precompile/base_contract.go index 0108db3d1..42faea5a6 100644 --- a/eth/core/precompile/base_contract.go +++ b/eth/core/precompile/base_contract.go @@ -21,8 +21,8 @@ package precompile import ( - "pkg.berachain.dev/polaris/eth/accounts/abi" - "pkg.berachain.dev/polaris/eth/common" + "github.com/berachain/polaris/eth/accounts/abi" + "github.com/berachain/polaris/eth/common" ) // ============================================================================== diff --git a/eth/core/precompile/default_plugin.go b/eth/core/precompile/default_plugin.go index 8aae3102f..366f05a4b 100644 --- a/eth/core/precompile/default_plugin.go +++ b/eth/core/precompile/default_plugin.go @@ -24,11 +24,11 @@ import ( "context" "math/big" - "pkg.berachain.dev/polaris/eth/common" - "pkg.berachain.dev/polaris/eth/core/vm" - "pkg.berachain.dev/polaris/eth/params" - "pkg.berachain.dev/polaris/lib/registry" - libtypes "pkg.berachain.dev/polaris/lib/types" + "github.com/berachain/polaris/eth/common" + "github.com/berachain/polaris/eth/core/vm" + "github.com/berachain/polaris/eth/params" + "github.com/berachain/polaris/lib/registry" + libtypes "github.com/berachain/polaris/lib/types" ) // defaultPlugin is the default precompile plugin, should any chain running Polaris EVM not diff --git a/eth/core/precompile/factories.go b/eth/core/precompile/factories.go index 00724058e..27383f2c1 100644 --- a/eth/core/precompile/factories.go +++ b/eth/core/precompile/factories.go @@ -23,9 +23,9 @@ package precompile import ( "reflect" - "pkg.berachain.dev/polaris/eth/core/vm" - errorslib "pkg.berachain.dev/polaris/lib/errors" - "pkg.berachain.dev/polaris/lib/utils" + "github.com/berachain/polaris/eth/core/vm" + errorslib "github.com/berachain/polaris/lib/errors" + "github.com/berachain/polaris/lib/utils" ) const ( diff --git a/eth/core/precompile/factories_test.go b/eth/core/precompile/factories_test.go index 78515677b..85c64aabd 100644 --- a/eth/core/precompile/factories_test.go +++ b/eth/core/precompile/factories_test.go @@ -25,11 +25,11 @@ import ( "errors" "math/big" - solidity "pkg.berachain.dev/polaris/contracts/bindings/testing" - "pkg.berachain.dev/polaris/eth/accounts/abi" - "pkg.berachain.dev/polaris/eth/common" - "pkg.berachain.dev/polaris/eth/core/types" - "pkg.berachain.dev/polaris/eth/core/vm" + solidity "github.com/berachain/polaris/contracts/bindings/testing" + "github.com/berachain/polaris/eth/accounts/abi" + "github.com/berachain/polaris/eth/common" + "github.com/berachain/polaris/eth/core/types" + "github.com/berachain/polaris/eth/core/vm" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/eth/core/precompile/interfaces.go b/eth/core/precompile/interfaces.go index ff379538b..9bc95e745 100644 --- a/eth/core/precompile/interfaces.go +++ b/eth/core/precompile/interfaces.go @@ -21,10 +21,10 @@ package precompile import ( - "pkg.berachain.dev/polaris/eth/accounts/abi" - "pkg.berachain.dev/polaris/eth/common" - "pkg.berachain.dev/polaris/eth/core/vm" - libtypes "pkg.berachain.dev/polaris/lib/types" + "github.com/berachain/polaris/eth/accounts/abi" + "github.com/berachain/polaris/eth/common" + "github.com/berachain/polaris/eth/core/vm" + libtypes "github.com/berachain/polaris/lib/types" ) type ( diff --git a/eth/core/precompile/method.go b/eth/core/precompile/method.go index 84e3850fe..cd4d4cc45 100644 --- a/eth/core/precompile/method.go +++ b/eth/core/precompile/method.go @@ -25,10 +25,10 @@ import ( "errors" "reflect" - "pkg.berachain.dev/polaris/eth/accounts/abi" - "pkg.berachain.dev/polaris/eth/core/vm" - errorslib "pkg.berachain.dev/polaris/lib/errors" - "pkg.berachain.dev/polaris/lib/utils" + "github.com/berachain/polaris/eth/accounts/abi" + "github.com/berachain/polaris/eth/core/vm" + errorslib "github.com/berachain/polaris/lib/errors" + "github.com/berachain/polaris/lib/utils" ) // methodID is a fixed length byte array that represents the method ID of a precompile method. diff --git a/eth/core/precompile/method_helpers.go b/eth/core/precompile/method_helpers.go index 185e27fc1..dd6e338ff 100644 --- a/eth/core/precompile/method_helpers.go +++ b/eth/core/precompile/method_helpers.go @@ -24,7 +24,7 @@ import ( "reflect" "unicode" - "pkg.berachain.dev/polaris/eth/accounts/abi" + "github.com/berachain/polaris/eth/accounts/abi" ) // this function finds the ABI method that matches the given impl method. It returns the key in the diff --git a/eth/core/precompile/method_test.go b/eth/core/precompile/method_test.go index b33ccd3e0..649396079 100644 --- a/eth/core/precompile/method_test.go +++ b/eth/core/precompile/method_test.go @@ -25,10 +25,10 @@ import ( "math/big" "reflect" - "pkg.berachain.dev/polaris/eth/accounts/abi" - "pkg.berachain.dev/polaris/eth/common" - "pkg.berachain.dev/polaris/eth/core/vm" - vmmock "pkg.berachain.dev/polaris/eth/core/vm/mock" + "github.com/berachain/polaris/eth/accounts/abi" + "github.com/berachain/polaris/eth/common" + "github.com/berachain/polaris/eth/core/vm" + vmmock "github.com/berachain/polaris/eth/core/vm/mock" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/eth/core/precompile/method_validation.go b/eth/core/precompile/method_validation.go index f311dee38..8eadb5838 100644 --- a/eth/core/precompile/method_validation.go +++ b/eth/core/precompile/method_validation.go @@ -30,7 +30,7 @@ import ( "fmt" "reflect" - "pkg.berachain.dev/polaris/eth/accounts/abi" + "github.com/berachain/polaris/eth/accounts/abi" ) // validateArg uses reflection to verify the implementation arg matches the ABI arg. diff --git a/eth/core/precompile/method_validation_test.go b/eth/core/precompile/method_validation_test.go index 4aa9fa42b..c9761397d 100644 --- a/eth/core/precompile/method_validation_test.go +++ b/eth/core/precompile/method_validation_test.go @@ -25,9 +25,9 @@ import ( "math/big" "reflect" - "pkg.berachain.dev/polaris/contracts/bindings/testing" - "pkg.berachain.dev/polaris/eth/accounts/abi" - "pkg.berachain.dev/polaris/eth/common" + "github.com/berachain/polaris/contracts/bindings/testing" + "github.com/berachain/polaris/eth/accounts/abi" + "github.com/berachain/polaris/eth/common" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/eth/core/precompile/mock/stateful_impl.go b/eth/core/precompile/mock/stateful_impl.go index f82bd909d..3323256cb 100644 --- a/eth/core/precompile/mock/stateful_impl.go +++ b/eth/core/precompile/mock/stateful_impl.go @@ -21,10 +21,10 @@ package mock import ( - "github.com/ethereum/go-ethereum/accounts/abi" + "github.com/berachain/polaris/eth/common" + "github.com/berachain/polaris/eth/core/precompile" - "pkg.berachain.dev/polaris/eth/common" - "pkg.berachain.dev/polaris/eth/core/precompile" + "github.com/ethereum/go-ethereum/accounts/abi" ) //go:generate moq -out ./stateful_impl.mock.go -skip-ensure -pkg mock ../ StatefulImpl diff --git a/eth/core/precompile/mock/stateful_impl.mock.go b/eth/core/precompile/mock/stateful_impl.mock.go index 06edd1705..20d522b3f 100644 --- a/eth/core/precompile/mock/stateful_impl.mock.go +++ b/eth/core/precompile/mock/stateful_impl.mock.go @@ -4,9 +4,9 @@ package mock import ( + "github.com/berachain/polaris/eth/core/precompile" "github.com/ethereum/go-ethereum/accounts/abi" "github.com/ethereum/go-ethereum/common" - "pkg.berachain.dev/polaris/eth/core/precompile" "sync" ) diff --git a/eth/core/precompile/stateful_container.go b/eth/core/precompile/stateful_container.go index e24b24559..72a4c1dd6 100644 --- a/eth/core/precompile/stateful_container.go +++ b/eth/core/precompile/stateful_container.go @@ -24,8 +24,8 @@ import ( "context" "math/big" - "pkg.berachain.dev/polaris/eth/common" - "pkg.berachain.dev/polaris/eth/core/vm" + "github.com/berachain/polaris/eth/common" + "github.com/berachain/polaris/eth/core/vm" ) // NumBytesMethodID is the number of bytes used to represent a ABI method's ID. diff --git a/eth/core/precompile/stateful_container_test.go b/eth/core/precompile/stateful_container_test.go index e6e490175..0253427e2 100644 --- a/eth/core/precompile/stateful_container_test.go +++ b/eth/core/precompile/stateful_container_test.go @@ -25,10 +25,10 @@ import ( "math/big" "reflect" - solidity "pkg.berachain.dev/polaris/contracts/bindings/testing" - "pkg.berachain.dev/polaris/eth/common" - "pkg.berachain.dev/polaris/eth/core/vm" - vmmock "pkg.berachain.dev/polaris/eth/core/vm/mock" + solidity "github.com/berachain/polaris/contracts/bindings/testing" + "github.com/berachain/polaris/eth/common" + "github.com/berachain/polaris/eth/core/vm" + vmmock "github.com/berachain/polaris/eth/core/vm/mock" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/eth/core/state/interfaces.go b/eth/core/state/interfaces.go index cbf2b10d1..83d6a8360 100644 --- a/eth/core/state/interfaces.go +++ b/eth/core/state/interfaces.go @@ -24,8 +24,8 @@ import ( "context" "math/big" - "pkg.berachain.dev/polaris/eth/common" - libtypes "pkg.berachain.dev/polaris/lib/types" + "github.com/berachain/polaris/eth/common" + libtypes "github.com/berachain/polaris/lib/types" ) // Plugin is a plugin which tracks the accounts (balances, nonces, codes, states) in the native diff --git a/eth/core/state/journal/access_list.go b/eth/core/state/journal/access_list.go index 14b54117f..74d766751 100644 --- a/eth/core/state/journal/access_list.go +++ b/eth/core/state/journal/access_list.go @@ -21,9 +21,9 @@ package journal import ( - "pkg.berachain.dev/polaris/eth/common" - libtypes "pkg.berachain.dev/polaris/lib/types" - "pkg.berachain.dev/polaris/lib/utils" + "github.com/berachain/polaris/eth/common" + libtypes "github.com/berachain/polaris/lib/types" + "github.com/berachain/polaris/lib/utils" ) type Accesslist interface { diff --git a/eth/core/state/journal/access_list_test.go b/eth/core/state/journal/access_list_test.go index b34ab36bb..d5fe18723 100644 --- a/eth/core/state/journal/access_list_test.go +++ b/eth/core/state/journal/access_list_test.go @@ -21,8 +21,8 @@ package journal import ( - "pkg.berachain.dev/polaris/eth/common" - "pkg.berachain.dev/polaris/lib/utils" + "github.com/berachain/polaris/eth/common" + "github.com/berachain/polaris/lib/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/eth/core/state/journal/base.go b/eth/core/state/journal/base.go index af87a40c3..9835a7952 100644 --- a/eth/core/state/journal/base.go +++ b/eth/core/state/journal/base.go @@ -21,8 +21,8 @@ package journal import ( - "pkg.berachain.dev/polaris/lib/ds" - "pkg.berachain.dev/polaris/lib/ds/stack" + "github.com/berachain/polaris/lib/ds" + "github.com/berachain/polaris/lib/ds/stack" ) // baseJournal is a struct that holds a stack of items. diff --git a/eth/core/state/journal/logs.go b/eth/core/state/journal/logs.go index 68ccf94df..3f0ff7178 100644 --- a/eth/core/state/journal/logs.go +++ b/eth/core/state/journal/logs.go @@ -21,9 +21,9 @@ package journal import ( - "pkg.berachain.dev/polaris/eth/common" - coretypes "pkg.berachain.dev/polaris/eth/core/types" - libtypes "pkg.berachain.dev/polaris/lib/types" + "github.com/berachain/polaris/eth/common" + coretypes "github.com/berachain/polaris/eth/core/types" + libtypes "github.com/berachain/polaris/lib/types" ) // Log defines the interface for tracking logs created during a state transition. diff --git a/eth/core/state/journal/logs_test.go b/eth/core/state/journal/logs_test.go index 01091bbf9..cb8bb0217 100644 --- a/eth/core/state/journal/logs_test.go +++ b/eth/core/state/journal/logs_test.go @@ -21,9 +21,9 @@ package journal import ( - "pkg.berachain.dev/polaris/eth/common" - coretypes "pkg.berachain.dev/polaris/eth/core/types" - "pkg.berachain.dev/polaris/lib/utils" + "github.com/berachain/polaris/eth/common" + coretypes "github.com/berachain/polaris/eth/core/types" + "github.com/berachain/polaris/lib/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/eth/core/state/journal/mock/state_plugin.go b/eth/core/state/journal/mock/state_plugin.go index 72e69ac1c..412b5361f 100644 --- a/eth/core/state/journal/mock/state_plugin.go +++ b/eth/core/state/journal/mock/state_plugin.go @@ -23,7 +23,7 @@ package mock import ( "math/big" - "pkg.berachain.dev/polaris/eth/common" + "github.com/berachain/polaris/eth/common" ) //go:generate moq -out ./state_plugin.mock.go -skip-ensure -pkg mock ../ selfDestructStatePlugin diff --git a/eth/core/state/journal/mocks/accesslist.go b/eth/core/state/journal/mocks/accesslist.go index a847df855..60a998237 100644 --- a/eth/core/state/journal/mocks/accesslist.go +++ b/eth/core/state/journal/mocks/accesslist.go @@ -1,10 +1,10 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.36.1. DO NOT EDIT. package mocks import ( + journal "github.com/berachain/polaris/eth/core/state/journal" common "github.com/ethereum/go-ethereum/common" - journal "pkg.berachain.dev/polaris/eth/core/state/journal" mock "github.com/stretchr/testify/mock" ) diff --git a/eth/core/state/journal/mocks/log.go b/eth/core/state/journal/mocks/log.go index 706346a32..8b9b082ec 100644 --- a/eth/core/state/journal/mocks/log.go +++ b/eth/core/state/journal/mocks/log.go @@ -1,10 +1,10 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.36.1. DO NOT EDIT. package mocks import ( + journal "github.com/berachain/polaris/eth/core/state/journal" common "github.com/ethereum/go-ethereum/common" - journal "pkg.berachain.dev/polaris/eth/core/state/journal" mock "github.com/stretchr/testify/mock" diff --git a/eth/core/state/journal/mocks/refund.go b/eth/core/state/journal/mocks/refund.go index 8a41601a3..48c543310 100644 --- a/eth/core/state/journal/mocks/refund.go +++ b/eth/core/state/journal/mocks/refund.go @@ -1,10 +1,10 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.36.1. DO NOT EDIT. package mocks import ( + journal "github.com/berachain/polaris/eth/core/state/journal" mock "github.com/stretchr/testify/mock" - journal "pkg.berachain.dev/polaris/eth/core/state/journal" ) // Refund is an autogenerated mock type for the Refund type diff --git a/eth/core/state/journal/mocks/self_destruct_state_plugin.go b/eth/core/state/journal/mocks/self_destruct_state_plugin.go index 92757402d..9a52bdbbc 100644 --- a/eth/core/state/journal/mocks/self_destruct_state_plugin.go +++ b/eth/core/state/journal/mocks/self_destruct_state_plugin.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.36.1. DO NOT EDIT. package mocks diff --git a/eth/core/state/journal/mocks/self_destructs.go b/eth/core/state/journal/mocks/self_destructs.go index c611cce41..bb60199a0 100644 --- a/eth/core/state/journal/mocks/self_destructs.go +++ b/eth/core/state/journal/mocks/self_destructs.go @@ -1,10 +1,10 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.36.1. DO NOT EDIT. package mocks import ( + journal "github.com/berachain/polaris/eth/core/state/journal" common "github.com/ethereum/go-ethereum/common" - journal "pkg.berachain.dev/polaris/eth/core/state/journal" mock "github.com/stretchr/testify/mock" ) diff --git a/eth/core/state/journal/mocks/transient_storage.go b/eth/core/state/journal/mocks/transient_storage.go index cb80ff594..c2c61edce 100644 --- a/eth/core/state/journal/mocks/transient_storage.go +++ b/eth/core/state/journal/mocks/transient_storage.go @@ -1,10 +1,10 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.36.1. DO NOT EDIT. package mocks import ( + journal "github.com/berachain/polaris/eth/core/state/journal" common "github.com/ethereum/go-ethereum/common" - journal "pkg.berachain.dev/polaris/eth/core/state/journal" mock "github.com/stretchr/testify/mock" ) diff --git a/eth/core/state/journal/refund.go b/eth/core/state/journal/refund.go index 47a4d9249..dd5821fd8 100644 --- a/eth/core/state/journal/refund.go +++ b/eth/core/state/journal/refund.go @@ -21,7 +21,7 @@ package journal import ( - libtypes "pkg.berachain.dev/polaris/lib/types" + libtypes "github.com/berachain/polaris/lib/types" ) // Refund is a `Store` that tracks the refund counter. diff --git a/eth/core/state/journal/refund_test.go b/eth/core/state/journal/refund_test.go index 31947c574..b26d934d4 100644 --- a/eth/core/state/journal/refund_test.go +++ b/eth/core/state/journal/refund_test.go @@ -21,7 +21,7 @@ package journal import ( - "pkg.berachain.dev/polaris/lib/utils" + "github.com/berachain/polaris/lib/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/eth/core/state/journal/selfdestruct_test.go b/eth/core/state/journal/selfdestruct_test.go index 1f93e9e93..bcb922cea 100644 --- a/eth/core/state/journal/selfdestruct_test.go +++ b/eth/core/state/journal/selfdestruct_test.go @@ -21,9 +21,9 @@ package journal import ( - "pkg.berachain.dev/polaris/eth/common" - "pkg.berachain.dev/polaris/eth/core/state/journal/mock" - "pkg.berachain.dev/polaris/lib/utils" + "github.com/berachain/polaris/eth/common" + "github.com/berachain/polaris/eth/core/state/journal/mock" + "github.com/berachain/polaris/lib/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/eth/core/state/journal/selfdestructs.go b/eth/core/state/journal/selfdestructs.go index 5490908cb..7a6a4fbe2 100644 --- a/eth/core/state/journal/selfdestructs.go +++ b/eth/core/state/journal/selfdestructs.go @@ -23,10 +23,10 @@ package journal import ( "math/big" - "pkg.berachain.dev/polaris/eth/common" - "pkg.berachain.dev/polaris/eth/crypto" - libtypes "pkg.berachain.dev/polaris/lib/types" - "pkg.berachain.dev/polaris/lib/utils" + "github.com/berachain/polaris/eth/common" + "github.com/berachain/polaris/eth/crypto" + libtypes "github.com/berachain/polaris/lib/types" + "github.com/berachain/polaris/lib/utils" ) // emptyCodeHash is the Keccak256 Hash of empty code diff --git a/eth/core/state/journal/transient_storage.go b/eth/core/state/journal/transient_storage.go index e7554b10e..ca672d670 100644 --- a/eth/core/state/journal/transient_storage.go +++ b/eth/core/state/journal/transient_storage.go @@ -21,10 +21,10 @@ package journal import ( - "github.com/ethereum/go-ethereum/common" + "github.com/berachain/polaris/lib/ds/stack" + libtypes "github.com/berachain/polaris/lib/types" - "pkg.berachain.dev/polaris/lib/ds/stack" - libtypes "pkg.berachain.dev/polaris/lib/types" + "github.com/ethereum/go-ethereum/common" ) // transientState is a representation of EIP-1153 "Transient Storage". diff --git a/eth/core/state/journal/transient_storage_test.go b/eth/core/state/journal/transient_storage_test.go index 3ec5eb88c..66eb51e29 100644 --- a/eth/core/state/journal/transient_storage_test.go +++ b/eth/core/state/journal/transient_storage_test.go @@ -21,8 +21,8 @@ package journal import ( - "pkg.berachain.dev/polaris/eth/common" - "pkg.berachain.dev/polaris/lib/utils" + "github.com/berachain/polaris/eth/common" + "github.com/berachain/polaris/lib/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/eth/core/state/mock/state.go b/eth/core/state/mock/state.go index 51f89ab57..1c4e2e56f 100644 --- a/eth/core/state/mock/state.go +++ b/eth/core/state/mock/state.go @@ -23,9 +23,9 @@ package mock import ( "math/big" - "pkg.berachain.dev/polaris/eth/common" - "pkg.berachain.dev/polaris/eth/core/state" - "pkg.berachain.dev/polaris/eth/crypto" + "github.com/berachain/polaris/eth/common" + "github.com/berachain/polaris/eth/core/state" + "github.com/berachain/polaris/eth/crypto" ) //go:generate moq -out ./state.mock.go -skip-ensure -pkg mock ../ Plugin diff --git a/eth/core/state/mock/state.mock.go b/eth/core/state/mock/state.mock.go index e937e057b..f5d33b255 100644 --- a/eth/core/state/mock/state.mock.go +++ b/eth/core/state/mock/state.mock.go @@ -5,9 +5,9 @@ package mock import ( "context" + "github.com/berachain/polaris/eth/core/state" "github.com/ethereum/go-ethereum/common" "math/big" - "pkg.berachain.dev/polaris/eth/core/state" "sync" ) diff --git a/eth/core/state/mocks/plugin.go b/eth/core/state/mocks/plugin.go index bf7fd72d0..f2b183535 100644 --- a/eth/core/state/mocks/plugin.go +++ b/eth/core/state/mocks/plugin.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.36.1. DO NOT EDIT. package mocks @@ -10,7 +10,7 @@ import ( mock "github.com/stretchr/testify/mock" - state "pkg.berachain.dev/polaris/eth/core/state" + state "github.com/berachain/polaris/eth/core/state" ) // Plugin is an autogenerated mock type for the Plugin type diff --git a/eth/core/state/mocks/polar_state_db.go b/eth/core/state/mocks/polar_state_db.go index d08ee01ea..fe130a3d8 100644 --- a/eth/core/state/mocks/polar_state_db.go +++ b/eth/core/state/mocks/polar_state_db.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.36.1. DO NOT EDIT. package mocks diff --git a/eth/core/state/mocks/precompile_plugin.go b/eth/core/state/mocks/precompile_plugin.go index 9ad9ea4e2..79db521ac 100644 --- a/eth/core/state/mocks/precompile_plugin.go +++ b/eth/core/state/mocks/precompile_plugin.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.36.0. DO NOT EDIT. +// Code generated by mockery v2.36.1. DO NOT EDIT. package mocks diff --git a/eth/core/state/statedb.go b/eth/core/state/statedb.go index b943bb7b8..d873ec58f 100644 --- a/eth/core/state/statedb.go +++ b/eth/core/state/statedb.go @@ -23,15 +23,15 @@ package state import ( "context" - "github.com/ethereum/go-ethereum/core/state" + "github.com/berachain/polaris/eth/common" + "github.com/berachain/polaris/eth/core/precompile" + "github.com/berachain/polaris/eth/core/state/journal" + coretypes "github.com/berachain/polaris/eth/core/types" + "github.com/berachain/polaris/eth/params" + "github.com/berachain/polaris/lib/snapshot" + libtypes "github.com/berachain/polaris/lib/types" - "pkg.berachain.dev/polaris/eth/common" - "pkg.berachain.dev/polaris/eth/core/precompile" - "pkg.berachain.dev/polaris/eth/core/state/journal" - coretypes "pkg.berachain.dev/polaris/eth/core/types" - "pkg.berachain.dev/polaris/eth/params" - "pkg.berachain.dev/polaris/lib/snapshot" - libtypes "pkg.berachain.dev/polaris/lib/types" + "github.com/ethereum/go-ethereum/core/state" ) // For mocks. diff --git a/eth/core/state/statedb_test.go b/eth/core/state/statedb_test.go index 2e95bd40e..153784368 100644 --- a/eth/core/state/statedb_test.go +++ b/eth/core/state/statedb_test.go @@ -27,12 +27,12 @@ import ( tmock "github.com/stretchr/testify/mock" - "pkg.berachain.dev/polaris/eth/common" - "pkg.berachain.dev/polaris/eth/core/state" - "pkg.berachain.dev/polaris/eth/core/state/mock" - "pkg.berachain.dev/polaris/eth/core/state/mocks" - coretypes "pkg.berachain.dev/polaris/eth/core/types" - "pkg.berachain.dev/polaris/eth/params" + "github.com/berachain/polaris/eth/common" + "github.com/berachain/polaris/eth/core/state" + "github.com/berachain/polaris/eth/core/state/mock" + "github.com/berachain/polaris/eth/core/state/mocks" + coretypes "github.com/berachain/polaris/eth/core/types" + "github.com/berachain/polaris/eth/params" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/eth/core/types/receipts.go b/eth/core/types/receipts.go index 45731531e..762ff0c8d 100644 --- a/eth/core/types/receipts.go +++ b/eth/core/types/receipts.go @@ -24,11 +24,11 @@ import ( "math/big" "unsafe" + "github.com/berachain/polaris/eth/params" + "github.com/ethereum/go-ethereum/consensus/misc/eip4844" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/rlp" - - "pkg.berachain.dev/polaris/eth/params" ) // DeriveReceiptsFromBlock is a helper function for deriving receipts from a block. diff --git a/eth/core/types/transaction.go b/eth/core/types/transaction.go index 90f20d376..7efb24c99 100644 --- a/eth/core/types/transaction.go +++ b/eth/core/types/transaction.go @@ -21,9 +21,9 @@ package types import ( - "github.com/ethereum/go-ethereum/rlp" + "github.com/berachain/polaris/eth/common" - "pkg.berachain.dev/polaris/eth/common" + "github.com/ethereum/go-ethereum/rlp" ) // TxLookupEntry is a positional metadata to help looking up a transaction by hash. diff --git a/eth/core/vm/context.go b/eth/core/vm/context.go index 13e476b26..382054bef 100644 --- a/eth/core/vm/context.go +++ b/eth/core/vm/context.go @@ -25,8 +25,8 @@ import ( "math/big" "time" - "pkg.berachain.dev/polaris/eth/common" - "pkg.berachain.dev/polaris/lib/utils" + "github.com/berachain/polaris/eth/common" + "github.com/berachain/polaris/lib/utils" ) // ContextKey defines a type alias for a stdlib Context key. diff --git a/eth/core/vm/mock/evm.go b/eth/core/vm/mock/evm.go index 563a7c582..f7a974547 100644 --- a/eth/core/vm/mock/evm.go +++ b/eth/core/vm/mock/evm.go @@ -23,7 +23,7 @@ package mock import ( "math/big" - "pkg.berachain.dev/polaris/eth/core/vm" + "github.com/berachain/polaris/eth/core/vm" ) //go:generate moq -out ./evm.mock.go -skip-ensure -pkg mock ../ PrecompileEVM diff --git a/eth/core/vm/mock/statedb.go b/eth/core/vm/mock/statedb.go index c48e2a583..e8a883dd6 100644 --- a/eth/core/vm/mock/statedb.go +++ b/eth/core/vm/mock/statedb.go @@ -23,10 +23,10 @@ package mock import ( "math/big" - "github.com/ethereum/go-ethereum/params" + "github.com/berachain/polaris/eth/common" + "github.com/berachain/polaris/eth/core/types" - "pkg.berachain.dev/polaris/eth/common" - "pkg.berachain.dev/polaris/eth/core/types" + "github.com/ethereum/go-ethereum/params" ) //go:generate moq -out ./statedb.mock.go -pkg mock ../ PolarStateDB diff --git a/eth/core/vm/mock/statedb.mock.go b/eth/core/vm/mock/statedb.mock.go index 160ef0376..f7bd5c199 100644 --- a/eth/core/vm/mock/statedb.mock.go +++ b/eth/core/vm/mock/statedb.mock.go @@ -5,11 +5,11 @@ package mock import ( "context" + "github.com/berachain/polaris/eth/core/vm" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/params" "math/big" - "pkg.berachain.dev/polaris/eth/core/vm" "sync" ) diff --git a/eth/eth.go b/eth/eth.go index 1b85b3c9a..66979c7b8 100644 --- a/eth/eth.go +++ b/eth/eth.go @@ -24,18 +24,18 @@ import ( "fmt" "net/http" + "github.com/berachain/polaris/eth/common" + "github.com/berachain/polaris/eth/consensus" + "github.com/berachain/polaris/eth/core" + coretypes "github.com/berachain/polaris/eth/core/types" + "github.com/berachain/polaris/eth/log" + "github.com/berachain/polaris/eth/node" + "github.com/berachain/polaris/eth/polar" + "github.com/berachain/polaris/eth/rpc" + "github.com/ethereum/go-ethereum/core/txpool" "github.com/ethereum/go-ethereum/event" "github.com/ethereum/go-ethereum/miner" - - "pkg.berachain.dev/polaris/eth/common" - "pkg.berachain.dev/polaris/eth/consensus" - "pkg.berachain.dev/polaris/eth/core" - coretypes "pkg.berachain.dev/polaris/eth/core/types" - "pkg.berachain.dev/polaris/eth/log" - "pkg.berachain.dev/polaris/eth/node" - "pkg.berachain.dev/polaris/eth/polar" - "pkg.berachain.dev/polaris/eth/rpc" ) type ( diff --git a/eth/go.mod b/eth/go.mod index fd52e25ef..54d150997 100644 --- a/eth/go.mod +++ b/eth/go.mod @@ -1,4 +1,4 @@ -module pkg.berachain.dev/polaris/eth +module github.com/berachain/polaris/eth go 1.21 @@ -9,14 +9,14 @@ replace ( ) require ( + github.com/berachain/polaris/contracts v0.0.0-20231107182447-2b91ecc782a6 + github.com/berachain/polaris/lib v0.0.0-20231107182447-2b91ecc782a6 github.com/ethereum/go-ethereum v1.13.4 github.com/holiman/uint256 v1.2.3 github.com/onsi/ginkgo/v2 v2.13.0 github.com/onsi/gomega v1.27.10 github.com/stretchr/testify v1.8.4 golang.org/x/text v0.13.0 - pkg.berachain.dev/polaris/contracts v0.0.0-20231104204753-faadca38b64d - pkg.berachain.dev/polaris/lib v0.0.0-20231104204753-faadca38b64d ) require ( diff --git a/eth/go.sum b/eth/go.sum index 920c8f2e7..ea7beafd3 100644 --- a/eth/go.sum +++ b/eth/go.sum @@ -14,6 +14,10 @@ github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/berachain/polaris-geth v0.0.0-20231105185655-b78967bb230f h1:9wGV+05KiA6D9mcRxsBm/4hrKUI/LORwvsYlAvMl1Sc= github.com/berachain/polaris-geth v0.0.0-20231105185655-b78967bb230f/go.mod h1:I0U5VewuuTzvBtVzKo7b3hJzDhXOUtn9mJW7SsIPB0Q= +github.com/berachain/polaris/contracts v0.0.0-20231107182447-2b91ecc782a6 h1:mL5OXGE9+QjxDclhqtzgXHTIdxDFxRAj3zxHjbkKyr4= +github.com/berachain/polaris/contracts v0.0.0-20231107182447-2b91ecc782a6/go.mod h1:cZ1kKh7+zVnvn/cKMHdjNoxoaVJt8L71W7GXHw94Hm4= +github.com/berachain/polaris/lib v0.0.0-20231107182447-2b91ecc782a6 h1:cs9ne0fJIUUxHWmF7nC02GMTavviaD/JqEkfVIcS/js= +github.com/berachain/polaris/lib v0.0.0-20231107182447-2b91ecc782a6/go.mod h1:H2fG0HisSeVc8nvFEq/IWRn+pPCHW/Nr8mbPmKy/Xqk= github.com/bits-and-blooms/bitset v1.11.0 h1:RMyy2mBBShArUAhfVRZJ2xyBO58KCBCtZFShw3umo6k= github.com/bits-and-blooms/bitset v1.11.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8= github.com/bmatcuk/doublestar v1.1.1/go.mod h1:UD6OnuiIn0yFxxA2le/rnRU1G4RaI4UvFv1sNto9p6w= @@ -436,10 +440,6 @@ gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50= -pkg.berachain.dev/polaris/contracts v0.0.0-20231104204753-faadca38b64d h1:nhHvQsD6mODe2D/mcQB/l0QRfRc91VmfDSMpdn0dPAI= -pkg.berachain.dev/polaris/contracts v0.0.0-20231104204753-faadca38b64d/go.mod h1:5Nz9qfw/JZGle4OtEsJBkgWDn9MNWCEZlCW/6pE5yZg= -pkg.berachain.dev/polaris/lib v0.0.0-20231104204753-faadca38b64d h1:LMuJ+fYqzSbzUHdBY1ZtFr1CK1yaiMxBCdnhx9654i0= -pkg.berachain.dev/polaris/lib v0.0.0-20231104204753-faadca38b64d/go.mod h1:6w+5Axb6GV66PLllrYf7h1G3x8Pwu5nvd7ZiibiI3HM= rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= rsc.io/tmplfunc v0.0.3 h1:53XFQh69AfOa8Tw0Jm7t+GV7KZhOi6jzsCzTtKbMvzU= rsc.io/tmplfunc v0.0.3/go.mod h1:AG3sTPzElb1Io3Yg4voV9AGZJuleGAwaVRxL9M49PhA= diff --git a/eth/polar/api/net.go b/eth/polar/api/net.go index cd3f295f4..af1e5df51 100644 --- a/eth/polar/api/net.go +++ b/eth/polar/api/net.go @@ -21,7 +21,7 @@ package polarapi import ( - "pkg.berachain.dev/polaris/eth/common/hexutil" + "github.com/berachain/polaris/eth/common/hexutil" ) // NetBackend is the collection of methods required to satisfy the net diff --git a/eth/polar/api/web3.go b/eth/polar/api/web3.go index 1af6fde8d..661ac102a 100644 --- a/eth/polar/api/web3.go +++ b/eth/polar/api/web3.go @@ -21,8 +21,8 @@ package polarapi import ( - "pkg.berachain.dev/polaris/eth/common/hexutil" - "pkg.berachain.dev/polaris/eth/crypto" + "github.com/berachain/polaris/eth/common/hexutil" + "github.com/berachain/polaris/eth/crypto" ) // Web3Backend is the collection of methods required to satisfy the net diff --git a/eth/polar/api_backend.go b/eth/polar/api_backend.go index 337ddcb71..0d4d3d146 100644 --- a/eth/polar/api_backend.go +++ b/eth/polar/api_backend.go @@ -26,6 +26,17 @@ import ( "math/big" "time" + "github.com/berachain/polaris/eth/common" + "github.com/berachain/polaris/eth/common/hexutil" + "github.com/berachain/polaris/eth/core" + "github.com/berachain/polaris/eth/core/state" + "github.com/berachain/polaris/eth/core/types" + "github.com/berachain/polaris/eth/core/vm" + "github.com/berachain/polaris/eth/log" + "github.com/berachain/polaris/eth/params" + polarapi "github.com/berachain/polaris/eth/polar/api" + "github.com/berachain/polaris/eth/version" + "github.com/ethereum/go-ethereum" "github.com/ethereum/go-ethereum/accounts" "github.com/ethereum/go-ethereum/consensus" @@ -34,17 +45,6 @@ import ( "github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/event" "github.com/ethereum/go-ethereum/rpc" - - "pkg.berachain.dev/polaris/eth/common" - "pkg.berachain.dev/polaris/eth/common/hexutil" - "pkg.berachain.dev/polaris/eth/core" - "pkg.berachain.dev/polaris/eth/core/state" - "pkg.berachain.dev/polaris/eth/core/types" - "pkg.berachain.dev/polaris/eth/core/vm" - "pkg.berachain.dev/polaris/eth/log" - "pkg.berachain.dev/polaris/eth/params" - polarapi "pkg.berachain.dev/polaris/eth/polar/api" - "pkg.berachain.dev/polaris/eth/version" ) // Backend represents the backend object for a Polaris chain. It extends the standard diff --git a/eth/polar/backend.go b/eth/polar/backend.go index babdef9fb..51630ed0c 100644 --- a/eth/polar/backend.go +++ b/eth/polar/backend.go @@ -23,6 +23,14 @@ package polar import ( "math/big" + "github.com/berachain/polaris/eth/common" + "github.com/berachain/polaris/eth/consensus" + "github.com/berachain/polaris/eth/core" + "github.com/berachain/polaris/eth/core/types" + "github.com/berachain/polaris/eth/log" + polarapi "github.com/berachain/polaris/eth/polar/api" + "github.com/berachain/polaris/eth/rpc" + "github.com/ethereum/go-ethereum/cmd/utils" "github.com/ethereum/go-ethereum/consensus/beacon" "github.com/ethereum/go-ethereum/core/txpool" @@ -32,14 +40,6 @@ import ( "github.com/ethereum/go-ethereum/event" "github.com/ethereum/go-ethereum/miner" "github.com/ethereum/go-ethereum/node" - - "pkg.berachain.dev/polaris/eth/common" - "pkg.berachain.dev/polaris/eth/consensus" - "pkg.berachain.dev/polaris/eth/core" - "pkg.berachain.dev/polaris/eth/core/types" - "pkg.berachain.dev/polaris/eth/log" - polarapi "pkg.berachain.dev/polaris/eth/polar/api" - "pkg.berachain.dev/polaris/eth/rpc" ) // TODO: break out the node into a separate package and then fully use the diff --git a/eth/polar/config.go b/eth/polar/config.go index 2f25f038e..89780c079 100644 --- a/eth/polar/config.go +++ b/eth/polar/config.go @@ -24,14 +24,14 @@ import ( "math/big" "time" + "github.com/berachain/polaris/eth/common" + "github.com/berachain/polaris/eth/log" + "github.com/berachain/polaris/eth/params" + "github.com/ethereum/go-ethereum/core/txpool/legacypool" "github.com/ethereum/go-ethereum/eth/ethconfig" "github.com/ethereum/go-ethereum/eth/gasprice" "github.com/ethereum/go-ethereum/miner" - - "pkg.berachain.dev/polaris/eth/common" - "pkg.berachain.dev/polaris/eth/log" - "pkg.berachain.dev/polaris/eth/params" ) const ( diff --git a/eth/version/version.go b/eth/version/version.go index 739dd481e..597422923 100644 --- a/eth/version/version.go +++ b/eth/version/version.go @@ -27,13 +27,13 @@ import ( "golang.org/x/text/cases" "golang.org/x/text/language" - "pkg.berachain.dev/polaris/eth/params" + "github.com/berachain/polaris/eth/params" ) const ( govcsTimeLayout = "2006-01-02T15:04:05Z" ourTimeLayout = "20060102" - ourPath = "pkg.berachain.dev/polaris/eth" // Path to our module + ourPath = "github.com/berachain/polaris/eth" // Path to our module ) // These variables are set at build-time by the linker when the build is diff --git a/go.work.sum b/go.work.sum index 10aa35fab..caeef2dfb 100644 --- a/go.work.sum +++ b/go.work.sum @@ -1,5 +1,3 @@ -cloud.google.com/go v0.0.0-20170206221025-ce650573d812/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.110.2/go.mod h1:k04UEeEtb6ZBRTv3dZz4CeJC3jKGxyhl0sAiVVquxiw= cloud.google.com/go/accessapproval v1.7.2 h1:W55SFrY6EVlcmmRGUk0rGhuy3j4fn7UtEocib/zADVE= cloud.google.com/go/accessapproval v1.7.2/go.mod h1:/gShiq9/kK/h8T/eEn1BTzalDvk0mZxJlhfw0p+Xuc0= cloud.google.com/go/accesscontextmanager v1.8.2 h1:jcOXen2u13aHgOHibUjxyPI+fZzVhElxy2gzJJlOOHg= @@ -48,9 +46,6 @@ cloud.google.com/go/clouddms v1.7.1 h1:LrtqeR2xKV3juG5N7eeUgW+PqdMClOWH2U9PN3Epf cloud.google.com/go/clouddms v1.7.1/go.mod h1:o4SR8U95+P7gZ/TX+YbJxehOCsM+fe6/brlrFquiszk= cloud.google.com/go/cloudtasks v1.12.2 h1:IoJI49JClvv2+NYvcABRgTO9y4veAUFlaOTigm+xXqE= cloud.google.com/go/cloudtasks v1.12.2/go.mod h1:A7nYkjNlW2gUoROg1kvJrQGhJP/38UaWwsnuBDOBVUk= -cloud.google.com/go/compute v1.19.3/go.mod h1:qxvISKp/gYnXkSAD1ppcSOveRAmzxicEv/JlizULFrI= -cloud.google.com/go/compute v1.20.1/go.mod h1:4tCnrn48xsqlwSAiLf1HXMQk8CONslYbdiEZc9FEIbM= -cloud.google.com/go/compute v1.23.0/go.mod h1:4tCnrn48xsqlwSAiLf1HXMQk8CONslYbdiEZc9FEIbM= cloud.google.com/go/contactcenterinsights v1.11.1 h1:dEfCjtdYjS3n8/1HEKbJaOL31l3dEs3q9aeaNsyrJBc= cloud.google.com/go/contactcenterinsights v1.11.1/go.mod h1:FeNP3Kg8iteKM80lMwSk3zZZKVxr+PGnAId6soKuXwE= cloud.google.com/go/container v1.26.1 h1:1CXjOL/dZZ2jXX1CYWqlxmXqJbZo8HwQX4DJxLzgQWo= @@ -113,8 +108,6 @@ cloud.google.com/go/gkemulticloud v1.0.1/go.mod h1:AcrGoin6VLKT/fwZEYuqvVominLri cloud.google.com/go/grafeas v0.2.0 h1:CYjC+xzdPvbV65gi6Dr4YowKcmLo045pm18L0DhdELM= cloud.google.com/go/gsuiteaddons v1.6.2 h1:vR7E1gR85x0wlbUek3cZYJ67U67GpNrboNCRiF/VSSc= cloud.google.com/go/gsuiteaddons v1.6.2/go.mod h1:K65m9XSgs8hTF3X9nNTPi8IQueljSdYo9F+Mi+s4MyU= -cloud.google.com/go/iam v0.13.0/go.mod h1:ljOg+rcNfzZ5d6f1nAUJ8ZIxOaZUVoS14bKCtaLZ/D0= -cloud.google.com/go/iam v1.1.2/go.mod h1:A5avdyVL2tCppe4unb0951eI9jreack+RJ0/d+KUZOU= cloud.google.com/go/iap v1.9.1 h1:J5r6CL6EakRmsMRIm2yV0PF5zfIm4sMQbQfPhSTnRzA= cloud.google.com/go/iap v1.9.1/go.mod h1:SIAkY7cGMLohLSdBR25BuIxO+I4fXJiL06IBL7cy/5Q= cloud.google.com/go/ids v1.4.2 h1:KqvR28pAnIss6d2pmGOQ+Fcsi3FOWDVhqdr6QaVvqsI= @@ -129,7 +122,6 @@ cloud.google.com/go/lifesciences v0.9.2 h1:0naTq5qUWoRt/b5P+SZ/0mun7ZTlhpJZJsUxh cloud.google.com/go/lifesciences v0.9.2/go.mod h1:QHEOO4tDzcSAzeJg7s2qwnLM2ji8IRpQl4p6m5Z9yTA= cloud.google.com/go/logging v1.8.1 h1:26skQWPeYhvIasWKm48+Eq7oUqdcdbwsCVwz5Ys0FvU= cloud.google.com/go/logging v1.8.1/go.mod h1:TJjR+SimHwuC8MZ9cjByQulAMgni+RkXeI3wwctHJEI= -cloud.google.com/go/longrunning v0.5.0/go.mod h1:0JNuqRShmscVAhIACGtskSAWtqtOoPkwP0YF1oVEchc= cloud.google.com/go/longrunning v0.5.2 h1:u+oFqfEwwU7F9dIELigxbe0XVnBAo9wqMuQLA50CZ5k= cloud.google.com/go/longrunning v0.5.2/go.mod h1:nqo6DQbNV2pXhGDbDMoN2bWz68MjZUzqv2YttZiveCs= cloud.google.com/go/managedidentities v1.6.2 h1:QijSmmWHb3EzYQr8SrjWe941ba9G5sTCF5PvhhMM8CM= @@ -236,38 +228,23 @@ cloud.google.com/go/websecurityscanner v1.6.2 h1:V7PhbJ2OvpGHINL67RBhpwU3+g4MOoq cloud.google.com/go/websecurityscanner v1.6.2/go.mod h1:7YgjuU5tun7Eg2kpKgGnDuEOXWIrh8x8lWrJT4zfmas= cloud.google.com/go/workflows v1.12.1 h1:jvhSfcfAoOt0nILm7aZPJAHdpoe571qrJyc2ZlngaJk= cloud.google.com/go/workflows v1.12.1/go.mod h1:5A95OhD/edtOhQd/O741NSfIMezNTbCwLM1P1tBRGHM= -cosmossdk.io/log v1.2.0/go.mod h1:GNSCc/6+DhFIj1aLn/j7Id7PaO8DzNylUZoOYBL9+I4= -cosmossdk.io/store v1.0.0-rc.0/go.mod h1:FtBDOJmwtOZfmKKF65bKZbTYgS3bDNjjo3nP76dAegk= -cosmossdk.io/x/tx v0.11.0/go.mod h1:tzuC7JlfGivYuIO32JbvvY3Ft9s6FK1+r0/nGHiHwtM= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9 h1:VpgP7xuJadIUuKccphEpTJnWhS2jkQyMt6Y7pJCD7fY= -gioui.org v0.0.0-20210308172011-57750fc8a0a6/go.mod h1:RSH6KIUZ0p2xy5zHDxgAM4zumjgTw83q2ge/PI+yyw8= -git.sr.ht/~sbinet/gg v0.3.1/go.mod h1:KGYtlADtqsqANL9ueOFkWymvzUvLMQllU5Ixo+8v3pc= -github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8= -github.com/Azure/azure-sdk-for-go/sdk/azcore v0.21.1/go.mod h1:fBF9PQNqB8scdgpZ3ufzaLntG0AG7C1WjPMsiFOmfHM= github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.0 h1:8q4SaHjFsClSvuVne0ID/5Ka8u3fcIHyqkLjcFpNRHQ= github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.0/go.mod h1:bjGvMhVMb+EEm3VRNQawDMUyMMjo+S5ewNjflkep/0Q= -github.com/Azure/azure-sdk-for-go/sdk/internal v0.8.3/go.mod h1:KLF4gFr6DcKFZwSuH8w8yEK6DpFl3LP5rhdvAb7Yz5I= github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0 h1:sXr+ck84g/ZlZUOZiNELInmMgOsuGwdjjVkEIde0OtY= github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0/go.mod h1:okt5dMMTOFjX/aovMlrjvvXoPMBVSPzk9185BT0+eZM= -github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.3.0/go.mod h1:tPaiy8S5bQ+S5sOiDlINkp7+Ef339+Nz5L5XO+cnOHo= github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.2.0 h1:gggzg0SUMs6SQbEw+3LoSsYf9YMjkupeAnHMX8O9mmY= github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.2.0/go.mod h1:+6KLcKIVgxoBDMqMO/Nvy7bZ9a0nbU3I1DtFQK3YvB4= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802 h1:1BDTz0u9nC3//pOCMdNH+CiXJVYJh5UQNCOBG7jbELc= -github.com/CloudyKit/fastprinter v0.0.0-20170127035650-74b38d55f37a/go.mod h1:EFZQ978U7x8IRnstaskI3IysnWY5Ao3QgZUKOXlsAdw= github.com/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53 h1:sR+/8Yb4slttB4vD+b9btVEnWgL3Q00OBTzVT8B9C0c= github.com/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53/go.mod h1:+3IMCy2vIlbG1XG/0ggNQv0SvxCAIpPM5b1nCz56Xno= -github.com/CloudyKit/jet v2.1.3-0.20180809161101-62edd43e4f88+incompatible/go.mod h1:HPYO+50pSWkPoj9Q/eq0aRGByCL6ScRlUmiEX5Zgm+w= github.com/CloudyKit/jet/v6 v6.2.0 h1:EpcZ6SR9n28BUGtNJSvlBqf90IpjeFr36Tizxhn/oME= github.com/CloudyKit/jet/v6 v6.2.0/go.mod h1:d3ypHeIRNo2+XyqnGA8s+aphtcVpjP5hPwP/Lzo7Ro4= github.com/DataDog/datadog-go v3.2.0+incompatible h1:qSG2N4FghB1He/r2mFrWKCaL7dXCilEuNEeAn20fdD4= -github.com/DataDog/zstd v1.4.5/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo= github.com/GaijinEntertainment/go-exhaustruct/v2 v2.3.0 h1:+r1rSv4gvYn0wmRjC8X7IAzX8QezqtFV9m0MUHFJgts= github.com/GaijinEntertainment/go-exhaustruct/v2 v2.3.0/go.mod h1:b3g59n2Y+T5xmcxJL+UEG2f8cQploZm1mR/v6BW0mU0= -github.com/GoogleCloudPlatform/cloudsql-proxy v0.0.0-20190129172621-c8b1d7a94ddf/go.mod h1:aJ4qN3TfrelA6NZ6AXsXRfmEVaYin3EDbSPJrKS8OXo= github.com/HdrHistogram/hdrhistogram-go v1.1.2 h1:5IcZpTvzydCQeHzK4Ef/D5rrSqwxob0t8PQPMybUNFM= github.com/HdrHistogram/hdrhistogram-go v1.1.2/go.mod h1:yDgFjdqOqDEKOvasDdhWNXYg9BVp4O+o5f6V/ehm6Oo= -github.com/Joker/hpp v1.0.0/go.mod h1:8x5n+M1Hp5hC0g8okX3sR3vFQwynaX/UgSOM9MeBKzY= -github.com/Joker/jade v1.0.1-0.20190614124447-d475f43051e7/go.mod h1:6E6s8o2AE4KhCrqr6GRJjdC/gNfTdxkIXvuGZZda2VM= github.com/Joker/jade v1.1.3 h1:Qbeh12Vq6BxURXT1qZBRHsDxeURB8ztcL6f3EXSGeHk= github.com/Joker/jade v1.1.3/go.mod h1:T+2WLyt7VH6Lp0TRxQrUYEs64nRc83wkMQrfeIQKduM= github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible h1:1G1pk05UrOh0NlF1oeaaix1x8XzrfjIDK47TY0Zehcw= @@ -278,33 +255,23 @@ github.com/OpenPeeDeeP/depguard v1.1.1/go.mod h1:JtAMzWkmFEzDPyAd+W0NHl1lvpQKTvT github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8 h1:wPbRQzjjwFc0ih8puEVAOFGELsn1zoIIYdxvML7mDxA= github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8/go.mod h1:I0gYDMZ6Z5GRU7l58bNFSkPTFN6Yl12dsUlAZ8xy98g= github.com/RaveNoX/go-jsoncommentstrip v1.0.0 h1:t527LHHE3HmiHrq74QMpNPZpGCIJzTx+apLkMKt4HC0= -github.com/Shopify/goreferrer v0.0.0-20181106222321-ec9c9a553398/go.mod h1:a1uqRtAwp2Xwc6WNPJEufxJ7fx3npB4UV/JOLmbu5I0= github.com/Shopify/goreferrer v0.0.0-20220729165902-8cddb4f5de06 h1:KkH3I3sJuOLP3TjA/dfr4NAY8bghDwnXiU7cTKxQqo0= github.com/Shopify/goreferrer v0.0.0-20220729165902-8cddb4f5de06/go.mod h1:7erjKLwalezA0k99cWs5L11HWOAPNjdUZ6RxH1BXbbM= github.com/Shopify/sarama v1.19.0 h1:9oksLxC6uxVPHPVYUmq6xhr1BOF/hHobWH2UzO67z1s= github.com/Shopify/toxiproxy v2.1.4+incompatible h1:TKdv8HiTLgE5wdJuEML90aBgNWsokNbMijUGhmcoBJc= github.com/StackExchange/wmi v1.2.1 h1:VIkavFPXSjcnS+O8yTq7NI32k0R5Aj+v39y29VYDOSA= github.com/StackExchange/wmi v1.2.1/go.mod h1:rcmrprowKIVzvc+NUiLncP2uuArMWLCbu9SBzvHz7e8= -github.com/VictoriaMetrics/fastcache v1.6.0/go.mod h1:0qHz5QP0GMX4pfmMA/zt5RgfNuXJrTP0zS7DqpHGGTw= -github.com/aclements/go-gg v0.0.0-20170118225347-6dbb4e4fefb0/go.mod h1:55qNq4vcpkIuHowELi5C8e+1yUHtoLoOUR9QU5j7Tes= github.com/aclements/go-moremath v0.0.0-20210112150236-f10218a38794 h1:xlwdaKcTNVW4PtpQb8aKA4Pjy0CdJHEqvFbAnvR5m2g= github.com/aclements/go-moremath v0.0.0-20210112150236-f10218a38794/go.mod h1:7e+I0LQFUI9AXWxOfsQROs9xPhoJtbsyWcjJqDd4KPY= github.com/acomagu/bufpipe v1.0.4 h1:e3H4WUzM3npvo5uv95QuJM3cQspFNtFBzvJ2oNjKIDQ= github.com/acomagu/bufpipe v1.0.4/go.mod h1:mxdxdup/WdsKVreO5GpW4+M/1CE2sMG4jeGJ2sYmHc4= github.com/aead/siphash v1.0.1 h1:FwHfE/T45KPKYuuSAKyyvE+oPWcaQ+CUmFW0bPlM+kg= github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5 h1:rFw4nCn9iMW+Vajsk51NtYIcwSTkXr+JGrMd36kTDJw= -github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY= -github.com/ajstarks/deck v0.0.0-20200831202436-30c9fc6549a9/go.mod h1:JynElWSGnm/4RlzPXRlREEwqTHAN3T56Bv2ITsFT3gY= -github.com/ajstarks/deck/generate v0.0.0-20210309230005-c3f852c02e19/go.mod h1:T13YZdzov6OU0A1+RfKZiZN9ca6VeKdBdyDV+BY97Tk= -github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw= -github.com/ajstarks/svgo v0.0.0-20210923152817-c3b6e2f0c527/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw= -github.com/ajstarks/svgo v0.0.0-20211024235047-1546f124cd8b/go.mod h1:1KcenG0jGWcpt8ov532z81sp/kMMUG485J2InIOyADM= github.com/alecthomas/kingpin/v2 v2.3.2 h1:H0aULhgmSzN8xQ3nX1uxtdlTHYoPLu5AhHxWrKI6ocU= github.com/alecthomas/kingpin/v2 v2.3.2/go.mod h1:0gyi0zQnjuFk8xrkNKamJoyUo382HRL7ATRpFZCw6tE= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 h1:JYp7IbQjafoB+tBA3gMyHYHrpOtNuDiK/uB5uXxq5wM= github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 h1:s6gZFSlWYmbqAuRjVTiNNhvNRfY2Wxp9nhfyel4rklc= github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE= -github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= github.com/andybalholm/brotli v1.0.5 h1:8uQZIdzKmjc/iuPu7O2ioW48L81FgatrcpfFmiq/cCs= github.com/andybalholm/brotli v1.0.5/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= github.com/antihax/optional v1.0.0 h1:xK2lYat7ZLaVVcIuj82J8kIro4V6kDe0AUDFboUCwcg= @@ -316,17 +283,12 @@ github.com/armon/go-metrics v0.4.0/go.mod h1:E6amYzXo6aW1tqzoZGT755KkbgrJsSdpwZ+ github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310 h1:BUAU3CGlLvorLI26FmByPp2eC2qla6E1Tw+scpcg/to= github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a h1:pv34s756C4pEXnjgPfGYgdhg/ZdajGhyOvzx8k+23nw= github.com/aws/aws-lambda-go v1.13.3 h1:SuCy7H3NLyp+1Mrfp+m80jcbi9KYWAs9/BXwppwRDzY= -github.com/aws/aws-sdk-go-v2 v1.2.0/go.mod h1:zEQs02YRBw1DjK0PoJv3ygDYOFTre1ejlJWl8FwAuQo= -github.com/aws/aws-sdk-go-v2 v1.9.1/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4= github.com/aws/aws-sdk-go-v2 v1.21.2 h1:+LXZ0sgo8quN9UOKXXzAWRT3FWd4NxeXWOZom9pE7GA= github.com/aws/aws-sdk-go-v2 v1.21.2/go.mod h1:ErQhvNuEMhJjweavOYhxVkn2RUx7kQXVATHrjKtxIpM= -github.com/aws/aws-sdk-go-v2/config v1.1.1/go.mod h1:0XsVy9lBI/BCXm+2Tuvt39YmdHwS5unDQmxZOYe8F5Y= github.com/aws/aws-sdk-go-v2/config v1.18.45 h1:Aka9bI7n8ysuwPeFdm77nfbyHCAKQ3z9ghB3S/38zes= github.com/aws/aws-sdk-go-v2/config v1.18.45/go.mod h1:ZwDUgFnQgsazQTnWfeLWk5GjeqTQTL8lMkoE1UXzxdE= -github.com/aws/aws-sdk-go-v2/credentials v1.1.1/go.mod h1:mM2iIjwl7LULWtS6JCACyInboHirisUUdkBPoTHMOUo= github.com/aws/aws-sdk-go-v2/credentials v1.13.43 h1:LU8vo40zBlo3R7bAvBVy/ku4nxGEyZe9N8MqAeFTzF8= github.com/aws/aws-sdk-go-v2/credentials v1.13.43/go.mod h1:zWJBz1Yf1ZtX5NGax9ZdNjhhI4rgjfgsyk6vTY1yfVg= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.0.2/go.mod h1:3hGg3PpiEjHnrkrlasTfxFqUsZ2GCk/fMUn4CbKgSkM= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.13 h1:PIktER+hwIG286DqXyvVENjgLTAwGgoeriLDD5C+YlQ= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.13/go.mod h1:f/Ib/qYjhV2/qdsf79H3QP/eRE4AkVyEf6sk7XfZ1tg= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.43 h1:nFBQlGtkbPzp/NjZLuFxRqmT91rLJkgvsEQs68h962Y= @@ -337,36 +299,24 @@ github.com/aws/aws-sdk-go-v2/internal/ini v1.3.45 h1:hze8YsjSh8Wl1rYa1CJpRmXP21B github.com/aws/aws-sdk-go-v2/internal/ini v1.3.45/go.mod h1:lD5M20o09/LCuQ2mE62Mb/iSdSlCNuj6H5ci7tW7OsE= github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.8.1 h1:w/fPGB0t5rWwA43mux4e9ozFSH5zF1moQemlA131PWc= github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.8.1/go.mod h1:CM+19rL1+4dFWnOQKwDc7H1KwXTz+h61oUSHyhV0b3o= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.0.2/go.mod h1:45MfaXZ0cNbeuT0KQ1XJylq8A6+OpVV2E5kvY/Kq+u8= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.37 h1:WWZA/I2K4ptBS1kg0kV1JbBtG/umed0vwHRrmcr9z7k= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.37/go.mod h1:vBmDnwWXWxNPFRMmG2m/3MKOe+xEcMDo1tanpaWCcck= -github.com/aws/aws-sdk-go-v2/service/route53 v1.1.1/go.mod h1:rLiOUrPLW/Er5kRcQ7NkwbjlijluLsrIbu/iyl35RO4= github.com/aws/aws-sdk-go-v2/service/route53 v1.30.2 h1:/RPQNjh1sDIezpXaFIkZb7MlXnSyAqjVdAwcJuGYTqg= github.com/aws/aws-sdk-go-v2/service/route53 v1.30.2/go.mod h1:TQZBt/WaQy+zTHoW++rnl8JBrmZ0VO6EUbVua1+foCA= -github.com/aws/aws-sdk-go-v2/service/sso v1.1.1/go.mod h1:SuZJxklHxLAXgLTc1iFXbEWkXs7QRTQpCLGaKIprQW0= github.com/aws/aws-sdk-go-v2/service/sso v1.15.2 h1:JuPGc7IkOP4AaqcZSIcyqLpFSqBWK32rM9+a1g6u73k= github.com/aws/aws-sdk-go-v2/service/sso v1.15.2/go.mod h1:gsL4keucRCgW+xA85ALBpRFfdSLH4kHOVSnLMSuBECo= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.3 h1:HFiiRkf1SdaAmV3/BHOFZ9DjFynPHj8G/UIO1lQS+fk= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.3/go.mod h1:a7bHA82fyUXOm+ZSWKU6PIoBxrjSprdLoM8xPYvzYVg= -github.com/aws/aws-sdk-go-v2/service/sts v1.1.1/go.mod h1:Wi0EBZwiz/K44YliU0EKxqTCJGUfYTWXrrBwkq736bM= github.com/aws/aws-sdk-go-v2/service/sts v1.23.2 h1:0BkLfgeDjfZnZ+MhB3ONb01u9pwFYTCZVhlsSSBvlbU= github.com/aws/aws-sdk-go-v2/service/sts v1.23.2/go.mod h1:Eows6e1uQEsc4ZaHANmsPRzAKcVDrcmjjWiih2+HUUQ= -github.com/aws/smithy-go v1.1.0/go.mod h1:EzMw8dbp/YJL4A5/sbhGddag+NPT7q084agLbB9LgIw= -github.com/aws/smithy-go v1.8.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/aws/smithy-go v1.15.0 h1:PS/durmlzvAFpQHDs4wi4sNNP9ExsqZh6IlfdHXgKK8= github.com/aws/smithy-go v1.15.0/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= -github.com/aymerick/raymond v2.0.3-0.20180322193309-b565731e1464+incompatible/go.mod h1:osfaiScAUVup+UC9Nfq76eWqDhXlp+4UYaA8uhTBO6g= -github.com/berachain/polaris-geth v0.0.0-20231024060913-70d774cdaecb h1:4oWKO5gaauAaOqAuVFz1J0/5+raBtr+SZuFNOU9HQn0= -github.com/berachain/polaris-geth v0.0.0-20231024060913-70d774cdaecb/go.mod h1:gkQ5Ygi64ZBh9M/4iXY1R8WqoNCx1Ey0CkYn2BD4/fw= -github.com/bits-and-blooms/bitset v1.5.0/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA= -github.com/bits-and-blooms/bitset v1.7.0/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA= -github.com/bits-and-blooms/bitset v1.8.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8= +github.com/berachain/polaris/contracts v0.0.0-20231107182032-06b7434b1567/go.mod h1:cZ1kKh7+zVnvn/cKMHdjNoxoaVJt8L71W7GXHw94Hm4= +github.com/berachain/polaris/cosmos v0.0.0-20231107182447-2b91ecc782a6/go.mod h1:0r/gooN/eZyGyIgiUHQo4ccfw0+RR30TWoseKlNcLuQ= +github.com/berachain/polaris/lib v0.0.0-20231107182032-06b7434b1567/go.mod h1:H2fG0HisSeVc8nvFEq/IWRn+pPCHW/Nr8mbPmKy/Xqk= github.com/bmatcuk/doublestar v1.1.1 h1:YroD6BJCZBYx06yYFEWvUuKVWQn3vLLQAVmDmvTSaiQ= -github.com/boombuler/barcode v1.0.0/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= -github.com/boombuler/barcode v1.0.1/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= -github.com/btcsuite/btcd/btcec/v2 v2.2.0/go.mod h1:U7MHm051Al6XmscBQ0BoNydpOTsFAn707034b5nY8zU= github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f h1:bAs4lUbRJpnnkd9VhRV3jjAVU7DJVjMaK+IsvSeZvFo= github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d h1:yJzD/yFppdVCf6ApMkVy8cUxV0XrxdP9rVf6D87/Mng= github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd h1:R/opQEbFEy9JGkIguV40SvRY1uliPX8ifOvi6ICsFCw= @@ -374,16 +324,11 @@ github.com/btcsuite/goleveldb v1.0.0 h1:Tvd0BfvqX9o823q1j2UZ/epQo09eJh6dTcRp79il github.com/btcsuite/snappy-go v1.0.0 h1:ZxaA6lo2EpxGddsA8JwWOcxlzRybb444sgmeJQMJGQE= github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792 h1:R8vQdOQdZ9Y3SkEwmHoWBmX1DNXhXZqlTpq6s4tyJGc= github.com/btcsuite/winsvc v1.0.0 h1:J9B4L7e3oqhXOcm+2IuNApwzQec85lE+QaikUcCs+dk= -github.com/bufbuild/protocompile v0.4.0/go.mod h1:3v93+mbWn/v3xzN+31nwkJfrEpAUwp+BagBSZWx+TP8= -github.com/bytedance/sonic v1.9.1/go.mod h1:i736AoUSYt75HyZLoJW9ERYxcy6eaN6h4BZXU064P/U= -github.com/bytedance/sonic v1.10.0-rc3/go.mod h1:iZcSUejdk5aukTND/Eu/ivjQuEL0Cu9/rf50Hi0u/g4= github.com/casbin/casbin/v2 v2.37.0 h1:/poEwPSovi4bTOcP752/CsTQiRz2xycyVKFG7GUhbDw= github.com/casbin/casbin/v2 v2.37.0/go.mod h1:vByNa/Fchek0KZUgG5wEsl7iFsiviAYKRtgrQfcJqHg= -github.com/cenkalti/backoff/v4 v4.1.3/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= github.com/census-instrumentation/opencensus-proto v0.4.1 h1:iKLQ0xPNFxR/2hzXZMrBo8f1j86j5WHzznCCQxV/b8g= github.com/census-instrumentation/opencensus-proto v0.4.1/go.mod h1:4T9NM4+4Vw91VeyqjLS6ao50K5bOcLKN6Q42XnYaRYw= github.com/checkpoint-restore/go-criu/v5 v5.3.0 h1:wpFFOoomK3389ue2lAb0Boag6XPht5QYpipxmSNL4d8= -github.com/cheekybits/is v0.0.0-20150225183255-68e9c0620927/go.mod h1:h/aW8ynjgkuj+NQRlZcDbAbM1ORAbXjXX77sX7T289U= github.com/cheggaaa/pb v1.0.27 h1:wIkZHkNfC7R6GI5w7l/PdAdzXzlrbcI3p8OAlnkTsnc= github.com/chromedp/cdproto v0.0.0-20230802225258-3cf4e6d46a89 h1:aPflPkRFkVwbW6dmcVqfgwp1i+UWGFH6VgR1Jim5Ygc= github.com/chromedp/cdproto v0.0.0-20230802225258-3cf4e6d46a89/go.mod h1:GKljq0VrfU4D5yc+2qA6OVr8pmO/MBbPEWqWQ/oqGEs= @@ -391,9 +336,6 @@ github.com/chromedp/chromedp v0.9.2 h1:dKtNz4kApb06KuSXoTQIyUC2TrA0fhGDwNZf3bcgf github.com/chromedp/chromedp v0.9.2/go.mod h1:LkSXJKONWTCHAfQasKFUZI+mxqS4tZqhmtGzzhLsnLs= github.com/chromedp/sysutil v1.0.0 h1:+ZxhTpfpZlmchB58ih/LBHX52ky7w2VhQVKQMucy3Ic= github.com/chromedp/sysutil v1.0.0/go.mod h1:kgWmDdq8fTzXYcKIBqIYvRRTnYb9aNS9moAV0xufSww= -github.com/chzyer/logex v1.2.0/go.mod h1:9+9sk7u7pGNWYMkh0hdiL++6OeibzJccyQU4p4MedaY= -github.com/chzyer/readline v1.5.0/go.mod h1:x22KAscuvRqlLoK9CsoYsmxoXZMMFVyOl86cAH8qUic= -github.com/chzyer/test v0.0.0-20210722231415-061457976a23/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/cilium/ebpf v0.7.0 h1:1k/q3ATgxSXRdrmPfH8d7YK0GfqVsEKZAX9dQZvs56k= github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible h1:C29Ae4G5GtYyYMm1aztcyj/J5ckgJm2zwdDajFbx1NY= github.com/circonus-labs/circonusllhist v0.1.3 h1:TJH+oke8D16535+jHExHj4nQvzlZrj7ug5D7I/orNUA= @@ -403,137 +345,73 @@ github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec h1:EdRZT3IeKQmfCSrgo github.com/client9/misspell v0.3.4 h1:ta993UF76GwbvJcIo3Y68y/M3WxlpEHPWIGDkJYwzJI= github.com/cloudflare/circl v1.3.1 h1:4OVCZRL62ijwEwxnF6I7hLwxvIYi3VaZt8TflkqtrtA= github.com/cloudflare/circl v1.3.1/go.mod h1:+CauBF6R70Jqcyl8N2hC8pAXYbWkGIezuSbuGLtRhnw= -github.com/cloudflare/cloudflare-go v0.14.0/go.mod h1:EnwdgGMaFOruiPZRFSgn+TsQ3hQ7C/YWzIGLeu5c304= github.com/cloudflare/cloudflare-go v0.79.0 h1:ErwCYDjFCYppDJlDJ/5WhsSmzegAUe2+K9qgFyQDg3M= github.com/cloudflare/cloudflare-go v0.79.0/go.mod h1:gkHQf9xEubaQPEuerBuoinR9P8bf8a05Lq0X6WKy1Oc= github.com/cncf/udpa/go v0.0.0-20220112060539-c52dc94e7fbe h1:QQ3GSy+MqSHxm/d8nCtnAiZdYFd45cYZPs8vOOIYKfk= github.com/cncf/udpa/go v0.0.0-20220112060539-c52dc94e7fbe/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI= github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4 h1:/inchEIKaYC1Akx+H+gqO04wryn5h75LSazbRlnya1k= github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cockroachdb/datadriven v1.0.0/go.mod h1:5Ib8Meh+jk1RlHIXej6Pzevx/NLlNvQB9pmSBZErGA4= -github.com/cockroachdb/datadriven v1.0.2/go.mod h1:a9RdTaap04u637JoCzcUoIcDmvwSUtcUFtT/C3kJlTU= -github.com/cockroachdb/datadriven v1.0.3-0.20230413201302-be42291fc80f/go.mod h1:a9RdTaap04u637JoCzcUoIcDmvwSUtcUFtT/C3kJlTU= -github.com/cockroachdb/errors v1.6.1/go.mod h1:tm6FTP5G81vwJ5lC0SizQo374JNCOPrHyXGitRJoDqM= -github.com/cockroachdb/errors v1.8.1/go.mod h1:qGwQn6JmZ+oMjuLwjWzUNqblqk0xl4CVV3SQbGwK7Ac= -github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI= -github.com/cockroachdb/pebble v0.0.0-20220817183557-09c6e030a677/go.mod h1:890yq1fUb9b6dGNwssgeUO5vQV9qfXnCPxAJhBQfXw0= -github.com/cockroachdb/pebble v0.0.0-20230525220056-bb4fc9527b3b/go.mod h1:TkdVsGYRqtULUppt2RbC+YaKtTHnHoWa2apfFrSKABw= -github.com/cockroachdb/pebble v0.0.0-20230906160148-46873a6a7a06/go.mod h1:bynZ3gvVyhlvjLI7PT6dmZ7g76xzJ7HpxfjgkzCGz6s= -github.com/cockroachdb/redact v1.0.8/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= github.com/cockroachdb/sentry-go v0.6.1-cockroachdb.2 h1:IKgmqgMQlVJIZj19CdocBeSfSaiCbEBZGKODaixqtHM= github.com/cockroachdb/sentry-go v0.6.1-cockroachdb.2/go.mod h1:8BT+cPK6xvFOcRlk0R8eg+OTkcqI6baNH4xAkpiYVvQ= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd h1:qMd81Ts1T2OTKmB4acZcyKaMtRnY5Y44NuXGX2GFJ1w= github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0 h1:sDMmm+q/3+BukdIpxwO365v/Rbspp2Nt5XntgQRXq8Q= github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod h1:4Zcjuz89kmFXt9morQgcfYZAYZ5n8WHjt81YYWIwtTM= -github.com/cometbft/cometbft-db v0.7.0/go.mod h1:yiKJIm2WKrt6x8Cyxtq9YTEcIMPcEe4XPxhgX59Fzf0= -github.com/consensys/gnark-crypto v0.10.0/go.mod h1:Iq/P3HHl0ElSjsg2E1gsMwhAyxnxoKK5nVyZKd+/KhU= -github.com/consensys/gnark-crypto v0.12.0/go.mod h1:v2Gy7L/4ZRosZ7Ivs+9SfUDr0f5UlG+EM5t7MPHiLuY= github.com/containerd/console v1.0.3 h1:lIr7SlA5PxZyMV30bDW0MGbiOPXwc63yRuCP0ARubLw= -github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= github.com/coreos/etcd v3.3.10+incompatible h1:jFneRYjIvLMLhDLCzuTuU4rSJUjRplcJQ7pD7MnhC04= github.com/coreos/go-etcd v2.0.0+incompatible h1:bXhRBIXoTm9BYHS3gE0TtQuyNZyeEMux2sDi4oo5YOo= github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmfM= github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7 h1:u9SHYsPQNyt5tgDm3YN7+9dYrpK96E5wFilTFWIDZOM= -github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs= github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf h1:CAKfRE2YtTUIjjh1bkBtyYFaUT/WmOqsJjgtihT0vMI= -github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= -github.com/cosmos/cosmos-sdk v0.50.0-rc.1.0.20231023194456-42dbfc4d7087/go.mod h1:FxbXMhS/Fz47QeviJ3yi1JgB0qCzgclMQ8s7MjD/I88= -github.com/cosmos/gogoproto v1.4.3/go.mod h1:0hLIG5TR7IvV1fme1HCFKjfzW9X2x0Mo+RooWXCnOWU= -github.com/cosmos/iavl v1.0.0-rc.1/go.mod h1:CmTGqMnRnucjxbjduneZXT+0vPgNElYvdefjX2q9tYc= -github.com/cosmos/ledger-cosmos-go v0.13.2/go.mod h1:HENcEP+VtahZFw38HZ3+LS3Iv5XV6svsnkk9vdJtLr8= -github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/crate-crypto/go-ipa v0.0.0-20230601170251-1830d0757c80 h1:DuBDHVjgGMPki7bAyh91+3cF1Vh34sAEdH8JQgbc2R0= github.com/crate-crypto/go-ipa v0.0.0-20230601170251-1830d0757c80/go.mod h1:gzbVz57IDJgQ9rLQwfSk696JGWof8ftznEL9GoAv3NI= -github.com/crate-crypto/go-kzg-4844 v0.3.0/go.mod h1:SBP7ikXEgDnUPONgm33HtuDZEDtWa3L4QtN1ocJSEQ4= github.com/creachadair/command v0.0.0-20220916173946-56a74cdd66b6 h1:uKuolOJonQOb/2+z/wFSJeVREP6fSoigr/X4Wlfhwwg= github.com/creachadair/command v0.0.0-20220916173946-56a74cdd66b6/go.mod h1:jN7ZJM5YSVtD3SHmkAdN/cOC1dXiqg2Y9K5Sr5a8Nxw= github.com/cristalhq/acmd v0.11.1 h1:DJ4fh2Pv0nPKmqT646IU/0Vh5FNdGblxvF+3/W3NAUI= github.com/cristalhq/acmd v0.11.1/go.mod h1:LG5oa43pE/BbxtfMoImHCQN++0Su7dzipdgBjMCBVDQ= -github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c/go.mod h1:GyV+0YP4qX0UQ7r2MoYZ+AvYDp12OF5yg4q8rGnyNh4= github.com/cyphar/filepath-securejoin v0.2.3 h1:YX6ebbZCZP7VkM3scTTokDgBL2TY741X51MTk3ycuNI= -github.com/danieljoos/wincred v1.1.2/go.mod h1:GijpziifJoIBfYh+S7BbkdUTU4LfM+QnGqR5Vl2tAx0= -github.com/deckarep/golang-set/v2 v2.1.0/go.mod h1:VAky9rY/yGXJOLEDv3OMci+7wtDpOF4IN+y82NBOac4= github.com/decred/dcrd/lru v1.0.0 h1:Kbsb1SFDsIlaupWPwsPp+dkxiBY1frcS07PCPgotKz8= -github.com/deepmap/oapi-codegen v1.6.0/go.mod h1:ryDa9AgbELGeB+YEXE1dR53yAjHwFvE9iAUlWl9Al3M= -github.com/deepmap/oapi-codegen v1.8.2/go.mod h1:YLgSKSDv/bZQB7N4ws6luhozi3cEdRktEqrX88CvjIw= -github.com/dgraph-io/badger v1.6.0/go.mod h1:zwt7syl517jmP8s94KqSxTlM6IMsdhYy6psNgSztDR4= github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM= -github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= -github.com/djherbis/atime v1.1.0/go.mod h1:28OF6Y8s3NQWwacXc5eZTsEsiMzp7LF8MbXE+XJPdBE= -github.com/dlclark/regexp2 v1.4.1-0.20201116162257-a2a8dda75c91/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc= github.com/dlclark/regexp2 v1.7.0 h1:7lJfhqlPssTb1WQx4yvTHN0uElPEv52sbaECrAQxjAo= github.com/dlclark/regexp2 v1.7.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8= -github.com/dnaeon/go-vcr v1.1.0/go.mod h1:M7tiix8f0r6mKKJ3Yq/kqU1OYf3MnfmBWVbPx/yU9ko= -github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ= -github.com/docker/docker v24.0.5+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/dop251/goja v0.0.0-20211022113120-dc8c55024d06/go.mod h1:R9ET47fwRVRPZnOGvHxxhuZcbrMCuiqOz3Rlrh4KSnk= github.com/dop251/goja v0.0.0-20230806174421-c933cf95e127 h1:qwcF+vdFrvPSEUDSX5RVoRccG8a5DhOdWdQ4zN62zzo= github.com/dop251/goja v0.0.0-20230806174421-c933cf95e127/go.mod h1:QMWlm50DNe14hD7t24KEqZuUdC9sOTy8W6XbCU1mlw4= -github.com/dop251/goja_nodejs v0.0.0-20210225215109-d91c329300e7/go.mod h1:hn7BA7c8pLvoGndExHudxTDKZ84Pyvv+90pbBjbTz0Y= -github.com/dop251/goja_nodejs v0.0.0-20211022123610-8dd9abb0616d/go.mod h1:DngW8aVqWbuLRMHItjPUyqdj+HWPvnQe8V8y1nDpIbM= github.com/eapache/go-resiliency v1.1.0 h1:1NtRmCAqadE2FN4ZcN6g90TP3uk8cg9rn9eNK2197aU= github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 h1:YEetp8/yCZMuEPMUDHG0CW/brkkEp8mzqk2+ODEitlw= github.com/eapache/queue v1.1.0 h1:YOEu7KNc61ntiQlcEeUIoDTJ2o8mQznoNvUhiigpIqc= github.com/edsrzf/mmap-go v1.0.0 h1:CEBF7HpRnUCSJgGUb5h1Gm7e3VkmVDrR8lvWVLtrOFw= github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385 h1:clC1lXBpe2kTj2VHdaIu9ajZQe4kcEY9j0NsnDDBZ3o= github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385/go.mod h1:0vRUJqYpeSZifjYj7uP3BG/gKcuzL9xWVV/Y+cK33KM= -github.com/emicklei/dot v1.4.2/go.mod h1:DeV7GvQtIw4h2u73RKBkkFdvVAz0D9fzeJrgPW6gy/s= github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc= github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ= github.com/envoyproxy/go-control-plane v0.11.1 h1:wSUXTlLfiAQRWs2F+p+EKOY9rUyis1MyGqJ2DIk5HpM= github.com/envoyproxy/go-control-plane v0.11.1/go.mod h1:uhMcXKCQMEJHiAb0w+YGefQLaTEw+YhGluxZkrTmD0g= github.com/envoyproxy/protoc-gen-validate v1.0.2 h1:QkIBuU5k+x7/QXPvPPnWXWlCdaBFApVqftFV6k087DA= github.com/envoyproxy/protoc-gen-validate v1.0.2/go.mod h1:GpiZQP3dDbg4JouG/NNS7QWXpgx6x8QiMKdmN72jogE= -github.com/etcd-io/bbolt v1.3.3/go.mod h1:ZF2nL25h33cCyBtcyWeZ2/I3HQOfTP+0PIEvHjkjCrw= -github.com/ethereum/c-kzg-4844 v0.3.1/go.mod h1:VewdlzQmpT5QSrVhbBuGoCdFJkpaJlO1aQputP83wc0= github.com/facebookgo/ensure v0.0.0-20200202191622-63f1cf65ac4c h1:8ISkoahWXwZR41ois5lSJBSVw4D0OV19Ht/JSTzvSv0= github.com/facebookgo/ensure v0.0.0-20200202191622-63f1cf65ac4c/go.mod h1:Yg+htXGokKKdzcwhuNDwVvN+uBxDGXJ7G/VN1d8fa64= github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 h1:JWuenKqqX8nojtoVVWjGfOF9635RETekkoH6Cc9SX0A= github.com/facebookgo/stack v0.0.0-20160209184415-751773369052/go.mod h1:UbMTZqLaRiH3MsBH8va0n7s1pQYcu3uTb8G4tygF4Zg= github.com/facebookgo/subset v0.0.0-20200203212716-c811ad88dec4 h1:7HZCaLC5+BZpmbhCOZJ293Lz68O7PYrF2EzeiFMwCLk= github.com/facebookgo/subset v0.0.0-20200203212716-c811ad88dec4/go.mod h1:5tD+neXqOorC30/tWg0LCSkrqj/AR6gu8yY8/fpw1q0= -github.com/fasthttp-contrib/websocket v0.0.0-20160511215533-1f3b11f56072/go.mod h1:duJ4Jxv5lDcvg4QuQr0oowTf7dz4/CR8NtyCooz9HL8= github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo= github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M= github.com/fjl/gencodec v0.0.0-20230517082657-f9840df7b83e h1:bBLctRc7kr01YGvaDfgLbTwjFNW5jdp5y5rj8XXBHfY= github.com/fjl/gencodec v0.0.0-20230517082657-f9840df7b83e/go.mod h1:AzA8Lj6YtixmJWL+wkKoBGsLWy9gFrAzi4g+5bCKwpY= -github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0= -github.com/flosch/pongo2 v0.0.0-20190707114632-bbf5a6c351f4/go.mod h1:T9YF2M40nIgbVgp3rreNmTged+9HrbNTIQf1PsaIiTA= github.com/flosch/pongo2/v4 v4.0.2 h1:gv+5Pe3vaSVmiJvh/BZa82b7/00YUGm0PIyVVLop0Hw= github.com/flosch/pongo2/v4 v4.0.2/go.mod h1:B5ObFANs/36VwxxlgKpdchIJHMvHB562PW+BWPhwZD8= -github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= -github.com/fogleman/gg v1.3.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db h1:gb2Z18BhTPJPpLQWj4T+rfKHYCHxRHCtRxhKKjRidVw= github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8 h1:a9ENSRDFBUPkJ5lCgVZh26+ZbGyoVJG7yb5SSzF5H54= -github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= github.com/garslo/gogen v0.0.0-20170306192744-1d203ffc1f61 h1:IZqZOB2fydHte3kUgxrzK5E1fW7RQGeDwE8F/ZZnUYc= github.com/garslo/gogen v0.0.0-20170306192744-1d203ffc1f61/go.mod h1:Q0X6pkwTILDlzrGEckF6HKjXe48EgsY/l7K7vhY4MW8= -github.com/gavv/httpexpect v2.0.0+incompatible/go.mod h1:x+9tiU1YnrOvnB725RkpoLv1M62hOWzwo5OXotisrKc= -github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff/go.mod h1:x7DCsMOv1taUwEWCzT4cmDeAkigA5/QCwUodaVOe8Ww= github.com/gballet/go-verkle v0.0.0-20230607174250-df487255f46b h1:vMT47RYsrftsHSTQhqXwC3BYflo38OLC3Y4LtXtLyU0= github.com/gballet/go-verkle v0.0.0-20230607174250-df487255f46b/go.mod h1:CDncRYVRSDqwakm282WEkjfaAj1hxU/v5RXxk5nXOiI= -github.com/getkin/kin-openapi v0.53.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4= -github.com/getkin/kin-openapi v0.61.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4= github.com/getkin/kin-openapi v0.118.0 h1:z43njxPmJ7TaPpMSCQb7PN0dEYno4tyBPQcrFdHoLuM= github.com/getkin/kin-openapi v0.118.0/go.mod h1:l5e9PaFUo9fyLJCPGQeXI2ML8c3P8BHOEV2VaAVf/pc= -github.com/getsentry/sentry-go v0.18.0/go.mod h1:Kgon4Mby+FJ7ZWHFUAZgVaIa8sxHtnRJRLTXZr51aKQ= -github.com/getsentry/sentry-go v0.23.0/go.mod h1:lc76E2QywIyW8WuBnwl8Lc4bkmQH4+w1gwTf25trprY= github.com/ghemawat/stream v0.0.0-20171120220530-696b145b53b9 h1:r5GgOLGbza2wVHRzK7aAj6lWZjfbAwiu/RDCVOKjRyM= github.com/ghemawat/stream v0.0.0-20171120220530-696b145b53b9/go.mod h1:106OIgooyS7OzLDOpUGgm9fA3bQENb/cFSyyBmMoJDs= github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= -github.com/gin-contrib/sse v0.0.0-20190301062529-5545eab6dad3/go.mod h1:VJ0WA2NBN22VlZ2dKZQPAPnyWw5XTlK1KymzLKsr59s= -github.com/gin-gonic/gin v1.4.0/go.mod h1:OW2EZn3DO8Ln9oIKOvM++LBO+5UPHJJDH72/q/3rZdM= -github.com/gin-gonic/gin v1.8.1/go.mod h1:ji8BvRH1azfM+SYow9zQ6SZMvR8qOMZHmsCuWR9tTTk= -github.com/go-check/check v0.0.0-20180628173108-788fd7840127/go.mod h1:9ES+weclKsC9YodN5RgxqK/VD9HM9JsCSh7rNhMZE98= -github.com/go-chi/chi/v5 v5.0.0/go.mod h1:BBug9lr0cqtdAhsu6R4AAdvufI0/XBzAQSsUqJpoZOs= -github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q= -github.com/go-fonts/dejavu v0.1.0/go.mod h1:4Wt4I4OU2Nq9asgDCteaAaWZOV24E+0/Pwo0gppep4g= -github.com/go-fonts/latin-modern v0.2.0/go.mod h1:rQVLdDMK+mK1xscDwsqM5J8U2jrRa3T0ecnM9pNujks= -github.com/go-fonts/liberation v0.1.1/go.mod h1:K6qoJYypsmfVjWg8KOVDQhLc8UDgIK2HYqyqAO9z7GY= -github.com/go-fonts/liberation v0.2.0/go.mod h1:K6qoJYypsmfVjWg8KOVDQhLc8UDgIK2HYqyqAO9z7GY= -github.com/go-fonts/stix v0.1.0/go.mod h1:w/c1f0ldAUlJmLBvlbkvVXLAD+tAMqobIIQpmnUIzUY= github.com/go-git/gcfg v1.5.0 h1:Q5ViNfGF8zFgyJWPqYwA7qGFoMTEiBmdlkcfRmpIMa4= github.com/go-git/gcfg v1.5.0/go.mod h1:5m20vg6GwYabIxaOonVkTdrILxQMpEShl1xiMF4ua+E= github.com/go-git/go-billy/v5 v5.4.1 h1:Uwp5tDRkPr+l/TnbHOQzp+tmJfLceOlbVucgpTz8ix4= @@ -542,92 +420,46 @@ github.com/go-git/go-git/v5 v5.6.1 h1:q4ZRqQl4pR/ZJHc1L5CFjGA1a10u76aV1iC+nh+bHs github.com/go-git/go-git/v5 v5.6.1/go.mod h1:mvyoL6Unz0PiTQrGQfSfiLFhBH1c1e84ylC2MDs4ee8= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1 h1:QbL/5oDUmRBzO9/Z7Seo6zf912W/a6Sr4Eu0G/3Jho0= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4 h1:WtGNWLvXpe6ZudgnXrq0barxBImvnnJoMEhXAzcbM0I= -github.com/go-latex/latex v0.0.0-20210118124228-b3d85cf34e07/go.mod h1:CO1AlKB2CSIqUrmQPqA0gdRIlnLEY0gK5JGjh37zN5U= -github.com/go-latex/latex v0.0.0-20210823091927-c0d11ff05a81/go.mod h1:SX0U8uGpxhq9o2S/CELCSUxEWWAuoCUcVCQWv7G2OCk= -github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab h1:xveKWz2iaueeTaUgdetzel+U7exyigDYBryyVfV/rZk= github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab/go.mod h1:/P9AEU963A2AYjv4d1V5eVL1CQbEJq6aCNHDDjibzu8= -github.com/go-ole/go-ole v1.2.5/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= -github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= github.com/go-openapi/jsonpointer v0.20.0 h1:ESKJdU9ASRfaPNOPRx12IUyA1vn3R9GiE3KYD14BXdQ= github.com/go-openapi/jsonpointer v0.20.0/go.mod h1:6PGzBjjIIumbLYysB73Klnms1mwnU4G3YHOECG3CedA= -github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-openapi/swag v0.22.4 h1:QLMzNJnMGPRNDCbySlcj1x01tzU8/9LTTL9hZZZogBU= github.com/go-openapi/swag v0.22.4/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14= -github.com/go-pdf/fpdf v0.5.0/go.mod h1:HzcnA+A23uwogo0tp9yU+l3V+KXhiESpt1PMayhOh5M= -github.com/go-pdf/fpdf v0.6.0/go.mod h1:HzcnA+A23uwogo0tp9yU+l3V+KXhiESpt1PMayhOh5M= -github.com/go-playground/locales v0.14.0/go.mod h1:sawfccIbzZTqEDETgFXqTho0QybSa7l++s0DH+LDiLs= -github.com/go-playground/universal-translator v0.18.0/go.mod h1:UvRDBj+xPUEGrFYl+lu/H90nyDXpg0fqeB/AQUGNTVA= -github.com/go-playground/validator/v10 v10.11.1/go.mod h1:i+3WkQ1FvaUjjxh1kSvIA4dMGDBiPU55YFDl0WbKdWU= -github.com/go-playground/validator/v10 v10.14.0/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU= -github.com/go-playground/validator/v10 v10.14.1/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU= github.com/go-sourcemap/sourcemap v2.1.3+incompatible h1:W1iEw64niKVGogNgBN3ePyLFfuisuzeidWPMPWmECqU= github.com/go-sourcemap/sourcemap v2.1.3+incompatible/go.mod h1:F8jJfvm2KbVjc5NqelyYJmf/v5J0dwNLS2mL4sNA1Jg= -github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-sql-driver/mysql v1.7.0 h1:ueSltNNllEqE3qcWBTD0iQd3IpL/6U+mJxLkazJ7YPc= github.com/go-sql-driver/mysql v1.7.0/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI= -github.com/go-test/deep v1.0.8/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE= github.com/go-zookeeper/zk v1.0.2 h1:4mx0EYENAdX/B/rbunjlt5+4RTA/a9SMHBRuSKdGxPM= github.com/go-zookeeper/zk v1.0.2/go.mod h1:nOB03cncLtlp4t+UAkGSV+9beXP/akpekBwL+UX1Qcw= -github.com/goccy/go-json v0.9.11/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= github.com/godbus/dbus/v5 v5.0.6 h1:mkgN1ofwASrYnJ5W6U/BxG15eXXXjirgZc7CLqkcaro= github.com/gofiber/fiber/v2 v2.48.0 h1:cRVMCb9aUJDsyHxGFLwz/sGzDggdailZZyptU9F9cU0= github.com/gofiber/fiber/v2 v2.48.0/go.mod h1:xqJgfqrc23FJuqGOW6DVgi3HyZEm2Mn9pRqUb2kHSX8= github.com/gofrs/uuid v4.4.0+incompatible h1:3qXRTX8/NbyulANqlc0lchS1gqAVxRgsuW1YrTJupqA= github.com/gofrs/uuid v4.4.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= -github.com/gogo/googleapis v0.0.0-20180223154316-0cd9801be74a/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= github.com/gogo/status v1.1.0 h1:+eIkrewn5q6b30y+g/BJINVVdi2xH7je5MPJ3ZPK3JA= github.com/gogo/status v1.1.0/go.mod h1:BFv9nrluPLmrS0EmGVvLaPNmRosr9KapBYd5/hpY1WM= github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY= github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I= -github.com/golang-jwt/jwt/v4 v4.3.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= -github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= -github.com/golang/glog v1.1.0/go.mod h1:pfYeQZ3JWZoXTV5sFc986z3HTpwQs9At6P4ImfuP3NQ= -github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golangci/lint-1 v0.0.0-20181222135242-d2cdd8c08219/go.mod h1:/X8TswGSh1pIozq4ZwCfxS0WA5JGXguxk94ar/4c87Y= -github.com/gomodule/redigo v1.7.1-0.20190724094224-574c33c3df38/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4= -github.com/gonum/blas v0.0.0-20181208220705-f22b278b28ac/go.mod h1:P32wAyui1PQ58Oce/KYkOqQv8cVw1zAapXOl+dRFGbc= -github.com/gonum/floats v0.0.0-20181209220543-c233463c7e82/go.mod h1:PxC8OnwL11+aosOB5+iEPoV3picfs8tUpkVd0pDo+Kg= -github.com/gonum/internal v0.0.0-20181124074243-f884aa714029/go.mod h1:Pu4dmpkhSyOzRwuXkOgAvijx4o+4YMUJJo9OvPYMkks= -github.com/gonum/lapack v0.0.0-20181123203213-e4cdc5a0bff9/go.mod h1:XA3DeT6rxh2EAE789SSiSJNqxPaC0aE9J8NTOI0Jo/A= -github.com/gonum/matrix v0.0.0-20181209220409-c518dec07be9/go.mod h1:0EXg4mc1CNP0HCqCz+K4ts155PXIlUywf0wqN+GfPZw= github.com/google/go-pkcs11 v0.2.0 h1:5meDPB26aJ98f+K9G21f0AqZwo/S5BJMJh8nuhMbdsI= github.com/google/go-pkcs11 v0.2.0/go.mod h1:6eQoGcuNJpa7jnd5pMGdkSaQpNDYvPlXWMcjXXThLlY= -github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8= github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU= -github.com/google/gofuzz v1.1.1-0.20200604201612-c04b05f3adfa/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/pprof v0.0.0-20230207041349-798e818bf904/go.mod h1:uglQLonpP8qtYCYyzA+8c/9qtqgA3qsXGYqCPKARAFg= github.com/google/renameio v0.1.0 h1:GOZbcHa3HfsPKPlmyPyN2KEohoMXOhdMbHrvbpl2QaA= -github.com/google/s2a-go v0.1.4/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A= -github.com/google/safehtml v0.0.2/go.mod h1:L4KWwDsUJdECRAEpZoBn3O64bQaywRscowZjJAzjHnU= github.com/google/subcommands v1.2.0 h1:vWQspBTo2nEqTUFita5/KeEWlUL8kQObDFbub/EN9oE= -github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/googleapis/enterprise-certificate-proxy v0.2.4/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k= -github.com/googleapis/gax-go v0.0.0-20161107002406-da06d194a00e h1:CYRpN206UTHUinz3VJoLaBdy1gEGeJNsqT0mvswDcMw= -github.com/googleapis/gax-go v0.0.0-20161107002406-da06d194a00e/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY= github.com/googleapis/go-type-adapters v1.0.0 h1:9XdMn+d/G57qq1s8dNc5IesGCXHf6V2HZ2JwRxfA2tA= github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8 h1:tlyzajkF3030q6M8SvmJSemC9DTHL/xaMa18b65+JM4= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8= github.com/gorilla/context v1.1.1 h1:AWwleXJkX/nhcU9bZSnZoi3h/qGYqQAGhq6zZe/aQW8= github.com/gorilla/css v1.0.0 h1:BQqNyPTi50JCFMTw/b67hByjMVXZRwGha6wxVGkeihY= github.com/gorilla/css v1.0.0/go.mod h1:Dn721qIggHpt4+EFCcTLTU/vk5ySda2ReITrtgBl60c= -github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= -github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= -github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= -github.com/graph-gophers/graphql-go v1.3.0/go.mod h1:9CQHMSxwO4MprSdzoIEobiHpoLtHm77vfxsvsIN5Vuc= -github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho= -github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/guptarohit/asciigraph v0.5.5 h1:ccFnUF8xYIOUPPY3tmdvRyHqmn1MYI9iv1pLKX+/ZkQ= github.com/guptarohit/asciigraph v0.5.5/go.mod h1:dYl5wwK4gNsnFf9Zp+l06rFiDZ5YtXM6x7SRWZ3KGag= github.com/hashicorp/consul/api v1.20.0 h1:9IHTjNVSZ7MIwjlW3N3a7iGiykCMDpxZu8jsxFJh0yc= github.com/hashicorp/consul/api v1.20.0/go.mod h1:nR64eD44KQ59Of/ECwt2vUmIK2DKsDzAwTmwmLl8Wpo= github.com/hashicorp/consul/sdk v0.3.0 h1:UOxjlb4xVNF93jak1mzzoBatyFju9nrkxpVwIp/QqxQ= -github.com/hashicorp/go-bexpr v0.1.10/go.mod h1:oxlubA2vC/gFVfX1A6JGp7ls7uCDlfJn732ehYYg+g0= -github.com/hashicorp/go-hclog v0.14.1/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= github.com/hashicorp/go-msgpack v0.5.3 h1:zKjpN5BK/P5lMYrLmBHdBULWbJ0XpYR+7NGzqkZzoD4= -github.com/hashicorp/go-plugin v1.5.1/go.mod h1:w1sAEES3g3PuV/RzUrgow20W2uErMly84hhD3um1WL4= github.com/hashicorp/go-retryablehttp v0.7.4 h1:ZQgVdpTdAL7WpMIwLzCfbalOcSUdkDZnpUv3/+BxzFA= github.com/hashicorp/go-retryablehttp v0.7.4/go.mod h1:Jy/gPYAdjqffZ/yFGCFV2doI5wjtH1ewM9u8iYVjtX8= github.com/hashicorp/go-rootcerts v1.0.2 h1:jzhAVGtqPKbwpyCPELlgNWhE1znq+qwJtW5Oi2viEzc= @@ -640,30 +472,19 @@ github.com/hashicorp/mdns v1.0.0 h1:WhIgCr5a7AaVH6jPUwjtRuuE7/RDufnUvzIr48smyxs= github.com/hashicorp/memberlist v0.1.3 h1:EmmoJme1matNzb+hMpDuR/0sbJSUisxyqBGG676r31M= github.com/hashicorp/serf v0.10.1 h1:Z1H2J60yRKvfDYAOZLd2MU0ND4AH/WDz7xYHDWQsIPY= github.com/hashicorp/serf v0.10.1/go.mod h1:yL2t6BqATOLGc5HF7qbFkTfXoPIY0WZdWHfEvMqbG+4= -github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= github.com/hudl/fargo v1.4.0 h1:ZDDILMbB37UlAVLlWcJ2Iz1XuahZZTDZfdCKeclfq2s= github.com/hudl/fargo v1.4.0/go.mod h1:9Ai6uvFy5fQNq6VPKtg+Ceq1+eTY4nKUlR2JElEOcDo= -github.com/hydrogen18/memlistener v0.0.0-20141126152155-54553eb933fb/go.mod h1:qEIFzExnS6016fRpRfxrExeVn2gbClQA99gQhnIcdhE= github.com/hydrogen18/memlistener v1.0.0 h1:JR7eDj8HD6eXrc5fWLbSUnfcQFL06PYvCc0DKQnWfaU= github.com/hydrogen18/memlistener v1.0.0/go.mod h1:qEIFzExnS6016fRpRfxrExeVn2gbClQA99gQhnIcdhE= -github.com/ianlancetaylor/demangle v0.0.0-20220319035150-800ac71e25c2/go.mod h1:aYm2/VgdVmcIU8iMfdMvDMsRAQjcfZSKFby6HOFvi/w= github.com/ianlancetaylor/demangle v0.0.0-20230524184225-eabc099b10ab h1:BA4a7pe6ZTd9F8kXETBoijjFJ/ntaa//1wiH9BZu4zU= github.com/ianlancetaylor/demangle v0.0.0-20230524184225-eabc099b10ab/go.mod h1:gx7rwoVhcfuVKG5uya9Hs3Sxj7EIvldVofAWIUtGouw= github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk= github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg= -github.com/imkira/go-interpol v1.1.0/go.mod h1:z0h2/2T3XF8kyEPpRgJ3kmNv+C43p+I/CoI+jC3w2iA= -github.com/influxdata/influxdb-client-go/v2 v2.4.0/go.mod h1:vLNHdxTJkIf2mSLvGrpj8TCcISApPoXkaxP8g9uRlW8= -github.com/influxdata/line-protocol v0.0.0-20200327222509-2487e7298839/go.mod h1:xaLFMmpvUxqXtVkUJfg9QmT88cDaCJ3ZKgdZ78oO8Qo= github.com/informalsystems/tm-load-test v1.3.0 h1:FGjKy7vBw6mXNakt+wmNWKggQZRsKkEYpaFk/zR64VA= github.com/informalsystems/tm-load-test v1.3.0/go.mod h1:OQ5AQ9TbT5hKWBNIwsMjn6Bf4O0U4b1kRc+0qZlQJKw= -github.com/invopop/yaml v0.1.0/go.mod h1:2XuRLgs/ouIrW3XNzuNj7J3Nvu/Dig5MXvbCEdiBN3Q= github.com/invopop/yaml v0.2.0 h1:7zky/qH+O0DwAyoobXUqvVBwgBFRxKoQ/3FjcVpjTMY= github.com/invopop/yaml v0.2.0/go.mod h1:2XuRLgs/ouIrW3XNzuNj7J3Nvu/Dig5MXvbCEdiBN3Q= -github.com/iris-contrib/blackfriday v2.0.0+incompatible/go.mod h1:UzZ2bDEoaSGPbkg6SAB4att1aAwTmVIx/5gCVqeyUdI= -github.com/iris-contrib/go.uuid v2.0.0+incompatible/go.mod h1:iz2lgM/1UnEf1kP0L/+fafWORmlnuysV2EMP8MW+qe0= -github.com/iris-contrib/i18n v0.0.0-20171121225848-987a633949d0/go.mod h1:pMCz62A0xJL6I+umB2YTlFRwWXaDFA0jy+5HzGiJjqI= -github.com/iris-contrib/schema v0.0.1/go.mod h1:urYA3uvUNG1TIIjOSCzHr9/LmbQo8LrOcOqfqxa4hXw= github.com/iris-contrib/schema v0.0.6 h1:CPSBLyx2e91H2yJzPuhGuifVRnZBBJ3pCOMbOvPZaTw= github.com/iris-contrib/schema v0.0.6/go.mod h1:iYszG0IOsuIsfzjymw1kMzTL8YQcCWlm65f3wX8J5iA= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A= @@ -671,13 +492,10 @@ github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i github.com/jedisct1/go-minisign v0.0.0-20230811132847-661be99b8267 h1:TMtDYDHKYY15rFihtRfck/bfFqNfvcabqvXAFQfAUpY= github.com/jedisct1/go-minisign v0.0.0-20230811132847-661be99b8267/go.mod h1:h1nSAbGFqGVzn6Jyl1R/iCcBUHN4g+gW1u9CoBTrb9E= github.com/jessevdk/go-flags v1.4.0 h1:4IU2WS7AumrZ/40jfhf4QVDMsQwqA7VEHozFRrGARJA= -github.com/jhump/gopoet v0.0.0-20190322174617-17282ff210b3/go.mod h1:me9yfT6IJSlOL3FCfrg+L6yzUEZ+5jW6WHt4Sk+UPUI= github.com/jhump/gopoet v0.1.0 h1:gYjOPnzHd2nzB37xYQZxj4EIQNpBrBskRqQQ3q4ZgSg= github.com/jhump/gopoet v0.1.0/go.mod h1:me9yfT6IJSlOL3FCfrg+L6yzUEZ+5jW6WHt4Sk+UPUI= github.com/jhump/goprotoc v0.5.0 h1:Y1UgUX+txUznfqcGdDef8ZOVlyQvnV0pKWZH08RmZuo= github.com/jhump/goprotoc v0.5.0/go.mod h1:VrbvcYrQOrTi3i0Vf+m+oqQWk9l72mjkJCYo7UvLHRQ= -github.com/jhump/protoreflect v1.11.0/go.mod h1:U7aMIjN0NWq9swDP7xDdoMfRHb35uiuTd3Z9nFXJf5E= -github.com/jhump/protoreflect v1.15.1/go.mod h1:jD/2GMKKE6OqX8qTjhADU1e6DShO+gavG9e0Q693nKo= github.com/jmoiron/sqlx v1.3.5 h1:vFFPA71p1o5gAeqtEAwLU4dnX2napprKtHr7PYIcN3g= github.com/jmoiron/sqlx v1.3.5/go.mod h1:nRVWtLre0KfCLJvgxzCsLVMogSvQ1zNJtpYr2Ccp0mQ= github.com/jonboulle/clockwork v0.1.0 h1:VKV+ZcuP6l3yW9doeqz6ziZGgcynBVQO+obU0+0hcPo= @@ -687,27 +505,17 @@ github.com/jpillora/backoff v1.0.0 h1:uvFg412JmmHBHw7iwprIxkPMI+sGQ4kzOWsMeHnm2E github.com/jrick/logrotate v1.0.0 h1:lQ1bL/n9mBNeIXoTUoYRlK4dHuNJVofX9oWqBtPnSzI= github.com/jstemmer/go-junit-report v0.9.1 h1:6QPYqodiu3GuPL+7mfx+NwDdp2eTkp9IfEUpgAwUN0o= github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= -github.com/juju/errors v0.0.0-20181118221551-089d3ea4e4d5/go.mod h1:W54LbzXuIE0boCoNJfwqpmkKJ1O4TCTZMetAt6jGk7Q= github.com/juju/gnuflag v0.0.0-20171113085948-2ce1bb71843d h1:c93kUJDtVAXFEhsCh5jSxyOJmFHuzcihnslQiX8Urwo= -github.com/juju/loggo v0.0.0-20180524022052-584905176618/go.mod h1:vgyd7OREkbtVEN/8IXZe5Ooef3LQePvuBm9UWj6ZL8U= -github.com/juju/testing v0.0.0-20180920084828-472a3e8b2073/go.mod h1:63prj8cnj0tU0S9OHjGJn+b1h0ZghCndfnbQolrYTwA= -github.com/jung-kurt/gofpdf v1.0.0/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes= -github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes= github.com/junk1tm/musttag v0.5.0 h1:bV1DTdi38Hi4pG4OVWa7Kap0hi0o7EczuK6wQt9zPOM= github.com/junk1tm/musttag v0.5.0/go.mod h1:PcR7BA+oREQYvHwgjIDmw3exJeds5JzRcvEJTfjrA0M= -github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k= github.com/karalabe/usb v0.0.2 h1:M6QQBNxF+CQ8OFvxrT90BA0qBOXymndZnk5q235mFc4= github.com/karalabe/usb v0.0.2/go.mod h1:Od972xHfMJowv7NGVDiWVxk2zxnWgjLlJzE+F4F7AGU= github.com/kataras/blocks v0.0.7 h1:cF3RDY/vxnSRezc7vLFlQFTYXG/yAr1o7WImJuZbzC4= github.com/kataras/blocks v0.0.7/go.mod h1:UJIU97CluDo0f+zEjbnbkeMRlvYORtmc1304EeyXf4I= -github.com/kataras/golog v0.0.9/go.mod h1:12HJgwBIZFNGL0EJnMRhmvGA0PQGx8VFwrZtM4CqbAk= github.com/kataras/golog v0.1.8 h1:isP8th4PJH2SrbkciKnylaND9xoTtfxv++NB+DF0l9g= github.com/kataras/golog v0.1.8/go.mod h1:rGPAin4hYROfk1qT9wZP6VY2rsb4zzc37QpdPjdkqVw= -github.com/kataras/iris/v12 v12.0.1/go.mod h1:udK4vLQKkdDqMGJJVd/msuMtN6hpYJhg/lSzuxjhO+U= github.com/kataras/iris/v12 v12.2.0 h1:WzDY5nGuW/LgVaFS5BtTkW3crdSKJ/FEgWnxPnIVVLI= github.com/kataras/iris/v12 v12.2.0/go.mod h1:BLzBpEunc41GbE68OUaQlqX4jzi791mx5HU04uPb90Y= -github.com/kataras/neffos v0.0.10/go.mod h1:ZYmJC07hQPW67eKuzlfY7SO3bC0mw83A3j6im82hfqw= -github.com/kataras/pio v0.0.0-20190103105442-ea782b38602d/go.mod h1:NV88laa9UiiDuX9AhMbDPkGYSPugBOV6yTZB1l2K9Z0= github.com/kataras/pio v0.0.11 h1:kqreJ5KOEXGMwHAWHDwIl+mjfNCPhAwZPa8gK7MKlyw= github.com/kataras/pio v0.0.11/go.mod h1:38hH6SWH6m4DKSYmRhlrCJ5WItwWgCVrTNU62XZyUvI= github.com/kataras/sitemap v0.0.6 h1:w71CRMMKYMJh6LR2wTgnk5hSgjVNB9KL60n5e2KHvLY= @@ -719,29 +527,11 @@ github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF github.com/kilic/bls12-381 v0.1.0 h1:encrdjqKMEvabVQ7qYOKu1OvhqpK4s47wDYtNiPtlp4= github.com/kilic/bls12-381 v0.1.0/go.mod h1:vDTTHJONJ6G+P2R74EhnyotQDTliQDnFEwhdmfzw1ig= github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23 h1:FOOIBWrEkLgmlgGfMuZT83xIwfPDxEI2OHu6xUmJMFE= -github.com/klauspost/compress v1.8.2/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= -github.com/klauspost/compress v1.9.0/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= -github.com/klauspost/compress v1.15.0/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= -github.com/klauspost/compress v1.15.9/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU= -github.com/klauspost/compress v1.15.15/go.mod h1:ZcK2JAFqKOpnBlxcLsJzYfrS9X1akm9fHZNnD9+Vo/4= -github.com/klauspost/compress v1.16.0/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= -github.com/klauspost/compress v1.16.3/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= -github.com/klauspost/compress v1.16.5/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= -github.com/klauspost/compress v1.16.7/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= -github.com/klauspost/cpuid v1.2.1/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= -github.com/klauspost/cpuid/v2 v2.2.4/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY= github.com/knz/go-libedit v1.10.1 h1:0pHpWtx9vcvC0xGZqEQlQdfSQs7WRlAjuPvk3fOZDCo= github.com/konsorten/go-windows-terminal-sequences v1.0.3 h1:CE8S1cTafDpPvMhIxNJKvHsGVBgn1xWYf1NbHQhywc8= github.com/kr/fs v0.1.0 h1:Jskdu9ieNAYnjxsi0LbQp1ulIKZV1LAFgK1tWhpZgl8= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515 h1:T+h1c/A9Gawja4Y9mFVWj2vyii2bbUNDw3kt9VxK2EY= -github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= github.com/kr/pty v1.1.1 h1:VkoXIwSboBpnk99O/KFauAEILuNHv5DVFKZMBN/gUgw= -github.com/labstack/echo/v4 v4.1.11/go.mod h1:i541M3Fj6f76NZtHSj7TXnyM8n2gaodfvfxNnFqi74g= -github.com/labstack/echo/v4 v4.2.1/go.mod h1:AA49e0DZ8kk5jTOOCKNuPR6oTnBS0dYiM4FW1e6jwpg= -github.com/labstack/echo/v4 v4.10.0/go.mod h1:S/T/5fy/GigaXnHTkh0ZGe4LpkkQysvRjFMSUTkDRNQ= -github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k= -github.com/ledongthuc/pdf v0.0.0-20220302134840-0c2507a12d80/go.mod h1:imJHygn/1yfhB7XSJJKlFZKl/J+dCPAknuiaGOshXAs= -github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY= github.com/lestrrat-go/backoff/v2 v2.0.8 h1:oNb5E5isby2kiro9AgdHLv5N5tint1AnDVVf2E2un5A= github.com/lestrrat-go/backoff/v2 v2.0.8/go.mod h1:rHP/q/r9aT27n24JQLa7JhSQZCKBBOiM/uP402WwN8Y= github.com/lestrrat-go/blackmagic v1.0.1 h1:lS5Zts+5HIC/8og6cGHb0uCcNCa3OUt1ygh3Qz2Fe80= @@ -752,15 +542,10 @@ github.com/lestrrat-go/iter v1.0.2 h1:gMXo1q4c2pHmC3dn8LzRhJfP1ceCbgSiT9lUydIzlt github.com/lestrrat-go/iter v1.0.2/go.mod h1:Momfcq3AnRlRjI5b5O8/G5/BvpzrhoFTZcn06fEOPt4= github.com/lestrrat-go/jwx v1.2.26 h1:4iFo8FPRZGDYe1t19mQP0zTRqA7n8HnJ5lkIiDvJcB0= github.com/lestrrat-go/jwx v1.2.26/go.mod h1:MaiCdGbn3/cckbOFSCluJlJMmp9dmZm5hDuIkx8ftpQ= -github.com/lestrrat-go/option v1.0.0/go.mod h1:5ZHFbivi4xwXxhxY9XHDe2FHo6/Z7WWmtT7T5nBBp3I= github.com/lestrrat-go/option v1.0.1 h1:oAzP2fvZGQKWkvHa1/SAcFolBEca1oN+mQ7eooNBEYU= github.com/lestrrat-go/option v1.0.1/go.mod h1:5ZHFbivi4xwXxhxY9XHDe2FHo6/Z7WWmtT7T5nBBp3I= -github.com/lib/pq v1.10.7/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743 h1:143Bb8f8DuGWck/xpNUOckBVYfFbBTnLevfRZ1aVVqo= github.com/lightstep/lightstep-tracer-go v0.18.1 h1:vi1F1IQ8N7hNWytK9DpJsUfQhGuNSc19z330K6vl4zk= -github.com/linxGnu/grocksdb v1.7.15/go.mod h1:pY55D0o+r8yUYLq70QmhdudxYvoDb9F+9puf4m3/W+U= -github.com/linxGnu/grocksdb v1.7.16/go.mod h1:JkS7pl5qWpGpuVb3bPqTz8nC12X3YtPZT+Xq7+QfQo4= -github.com/linxGnu/grocksdb v1.8.0/go.mod h1:09CeBborffXhXdNpEcOeZrLKEnRtrZFEpFdPNI9Zjjg= github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4= github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I= github.com/lyft/protoc-gen-validate v0.0.13 h1:KNt/RhmQTOLr7Aj8PsJ7mTronaFyx80mRTT9qF261dA= @@ -768,30 +553,11 @@ github.com/magefile/mage v1.14.0 h1:6QDX3g6z1YvJ4olPhT1wksUcSa/V0a1B+pJb73fBjyo= github.com/magefile/mage v1.14.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A= github.com/mailgun/raymond/v2 v2.0.48 h1:5dmlB680ZkFG2RN/0lvTAghrSxIESeu9/2aeDqACtjw= github.com/mailgun/raymond/v2 v2.0.48/go.mod h1:lsgvL50kgt1ylcFJYZiULi5fjPBkkhNfj4KA0W54Z18= -github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= -github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= -github.com/matryer/moq v0.0.0-20190312154309-6cfb0558e1bd/go.mod h1:9ELz6aaclSIGnZBoaSLZ3NAl1VTufbOrXBPvtcy6WiQ= -github.com/matryer/try v0.0.0-20161228173917-9ac251b645a2/go.mod h1:0KeJpeMD6o+O4hW7qJOT7vyQPKrWmj26uf5wMc/IiIs= -github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= -github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= -github.com/mattn/go-colorable v0.1.7/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= -github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= -github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= -github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= -github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ= -github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84= -github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= -github.com/mattn/go-sqlite3 v1.14.5/go.mod h1:WVKg1VTActs4Qso6iwGbiFih2UIHo0ENGwNd0Lj+XmI= -github.com/mattn/goveralls v0.0.2/go.mod h1:8d1ZMHsd7fW6IRPKQh46F2WRpyib5/X4FOpevwGNQEw= -github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= -github.com/mediocregopher/mediocre-go-lib v0.0.0-20181029021733-cb65787f37ed/go.mod h1:dSsfyI2zABAdhcbvkXqgxOxrCsbYeHCPgrZkku60dSg= -github.com/mediocregopher/radix/v3 v3.3.0/go.mod h1:EmfVyvspXz1uZEyPBMyGK+kjWiKQGvsUt6O3Pj+LDCQ= github.com/mgechev/dots v0.0.0-20210922191527-e955255bf517 h1:zpIH83+oKzcpryru8ceC6BxnoG8TBrhgAvRg8obzup0= github.com/mgechev/dots v0.0.0-20210922191527-e955255bf517/go.mod h1:KQ7+USdGKfpPjXk4Ga+5XxQM4Lm4e3gAogrreFAYpOg= -github.com/microcosm-cc/bluemonday v1.0.2/go.mod h1:iVP4YcDBq+n/5fb23BhYFvIMq/leAFZyRl6bYmGDlGc= github.com/microcosm-cc/bluemonday v1.0.23 h1:SMZe2IGa0NuHvnVNAZ+6B38gsTbi5e4sViiWJyDDqFY= github.com/microcosm-cc/bluemonday v1.0.23/go.mod h1:mN70sk7UkkF8TUr2IGBpNN0jAgStuPzlK76QuruE/z4= github.com/miekg/dns v1.1.43 h1:JKfpVSCB84vrAmHzyrsxB5NAr5kLoMXZArPSw7Qlgyg= @@ -799,16 +565,12 @@ github.com/miekg/dns v1.1.43/go.mod h1:+evo5L0630/F6ca/Z9+GAqzhjGyn8/c+TBaOyfEl0 github.com/mitchellh/cli v1.0.0 h1:iGBIsUe3+HZ/AD/Vd7DErOt5sU9fa8Uj7A2s1aggv1Y= github.com/mitchellh/go-ps v1.0.0 h1:i6ampVEEF4wQFF+bkYfwYgY+F/uYJDktmvLPf7qIgjc= github.com/mitchellh/go-ps v1.0.0/go.mod h1:J4lOc8z8yJs6vUwklHw2XEIiT4z4C40KtWVN3nvg8Pg= -github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= github.com/mitchellh/gox v0.4.0 h1:lfGJxY7ToLJQjHHwi0EX6uYBdK78egf954SQl13PQJc= github.com/mitchellh/iochan v1.0.0 h1:C+X3KsSTLFVBr/tK1eYN/vs4rJcvsiLU338UhYPJWeY= -github.com/mitchellh/pointerstructure v1.2.0/go.mod h1:BRAsLI5zgXmw97Lf6s25bs8ohIXc3tViBH44KcwB2g4= github.com/mmcloughlin/profile v0.1.1 h1:jhDmAqPyebOsVDOCICJoINoLb/AnLBaUw58nFzxWS2w= github.com/moby/sys/mountinfo v0.5.0 h1:2Ks8/r6lopsxWi9m58nlwjaeSzUX9iiL1vj5qB/9ObI= -github.com/modocache/gover v0.0.0-20171022184752-b58185e213c5/go.mod h1:caMODM3PzxT8aQXRPkAt8xlV/e7d7w8GM5g0fa5F0D8= github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9M+97sNutRR1RKhG96O6jWumTTnw= github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8= -github.com/moul/http2curl v1.0.0/go.mod h1:8UbvGypXm98wA/IqH45anm5Y2Z6ep6O31QGOAZ3H0fQ= github.com/mozilla/tls-observatory v0.0.0-20210609171429-7bc42856d2e5 h1:0KqC6/sLy7fDpBdybhVkkv4Yz+PmB7c9Dz9z3dLW804= github.com/mozilla/tls-observatory v0.0.0-20210609171429-7bc42856d2e5/go.mod h1:FUqVoUPHSEdDR0MnFM3Dh8AU0pZHLXUD127SAJGER/s= github.com/mrunalp/fileutils v0.5.0 h1:NKzVxiH7eSk+OQ4M+ZYW1K6h27RUV3MI6NUTsHhU6Z4= @@ -822,21 +584,13 @@ github.com/nats-io/jwt/v2 v2.0.3 h1:i/O6cmIsjpcQyWDYNcq2JyZ3/VTF8SJ4JWluI5OhpvI= github.com/nats-io/jwt/v2 v2.0.3/go.mod h1:VRP+deawSXyhNjXmxPCHskrR6Mq50BqpEI5SEcNiGlY= github.com/nats-io/nats-server/v2 v2.5.0 h1:wsnVaaXH9VRSg+A2MVg5Q727/CqxnmPLGFQ3YZYKTQg= github.com/nats-io/nats-server/v2 v2.5.0/go.mod h1:Kj86UtrXAL6LwYRA6H4RqzkHhK0Vcv2ZnKD5WbQ1t3g= -github.com/nats-io/nats.go v1.8.1/go.mod h1:BrFz9vVn0fU3AcH9Vn4Kd7W0NpJ651tD5omQ3M8LwxM= github.com/nats-io/nats.go v1.12.1 h1:+0ndxwUPz3CmQ2vjbXdkC1fo3FdiOQDim4gl3Mge8Qo= github.com/nats-io/nats.go v1.12.1/go.mod h1:BPko4oXsySz4aSWeFgOHLZs3G4Jq4ZAyE6/zMCxRT6w= -github.com/nats-io/nkeys v0.0.2/go.mod h1:dab7URMsZm6Z/jp9Z5UGa87Uutgc2mVpXLC4B7TDb/4= github.com/nats-io/nkeys v0.3.0 h1:cgM5tL53EvYRU+2YLXIK0G2mJtK12Ft9oeooSZMA2G8= github.com/nats-io/nkeys v0.3.0/go.mod h1:gvUNGjVcM2IPr5rCsRsC6Wb3Hr2CQAm08dsxtV6A5y4= github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= -github.com/oasisprotocol/curve25519-voi v0.0.0-20220708102147-0a8a51822cae/go.mod h1:hVoHR2EVESiICEMbg137etN/Lx+lSrHPTD39Z/uE+2s= -github.com/oasisprotocol/curve25519-voi v0.0.0-20230110094441-db37f07504ce/go.mod h1:hVoHR2EVESiICEMbg137etN/Lx+lSrHPTD39Z/uE+2s= github.com/oklog/oklog v0.3.2 h1:wVfs8F+in6nTBMkA7CbRw+zZMIB7nNM825cM1wuzoTk= -github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= -github.com/onsi/ginkgo v1.13.0/go.mod h1:+REjRxOmWfHCjfv9TTWB1jD1Frx4XydAD3zm1lskyM0= -github.com/onsi/ginkgo/v2 v2.11.0/go.mod h1:ZhrRA5XmEE3x3rhlzamx/JJvujdZoJ2uvgI7kR0iZvM= -github.com/onsi/gomega v1.26.0/go.mod h1:r+zV744Re+DiYCIPRlYOTxn0YkOLcAnW8k1xXdMPGhM= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 h1:lDH9UUVJtmYCjyT0CI4q8xvlXPxeZ0gYCVvWbmPlp88= github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417 h1:3snG66yBm59tKhhSPQrQ/0bCrv1LQbKt40LnUPiUxdc= github.com/opencontainers/selinux v1.10.0 h1:rAiKF8hTcgLI3w0DHm6i0ylVVcOrlgR1kK99DRLDhyU= @@ -846,29 +600,19 @@ github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+ github.com/openzipkin-contrib/zipkin-go-opentracing v0.4.5 h1:ZCnq+JUrvXcDVhX/xRolRBZifmabN1HcS1wrPSvxhrU= github.com/openzipkin/zipkin-go v0.2.5 h1:UwtQQx2pyPIgWYHRg+epgdx1/HnBQTgN3/oIYEJTQzU= github.com/openzipkin/zipkin-go v0.2.5/go.mod h1:KpXfKdgRDnnhsxw4pNIH9Md5lyFqKUa4YDFlwRYAMyE= -github.com/orisano/pixelmatch v0.0.0-20220722002657-fb0b55479cde/go.mod h1:nZgzbfBr3hhjoZnS66nKrHmduYNpc34ny7RK4z5/HM0= github.com/otiai10/curr v1.0.0 h1:TJIWdbX0B+kpNagQrjgq8bCMrbhiuX73M2XwgtDMoOI= github.com/otiai10/mint v1.3.1 h1:BCmzIS3n71sGfHB5NMNDB3lHYPz8fWSkCAErHed//qc= github.com/pact-foundation/pact-go v1.0.4 h1:OYkFijGHoZAYbOIb1LWXrwKQbMMRUv1oQ89blD2Mh2Q= github.com/pborman/uuid v1.2.0 h1:J7Q5mO4ysT1dv8hyrUGHb9+ooztCXu1D8MY8DZYsu3g= github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8= github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= -github.com/pelletier/go-toml/v2 v2.0.5/go.mod h1:OMHamSCAODeSsVrwwvcJOaoN0LIUIaFVNZzmWyNfXas= -github.com/pelletier/go-toml/v2 v2.0.8/go.mod h1:vuYfssBdrU2XDZ9bYydBu6t+6a6PYNcZljzZR9VXg+4= github.com/performancecopilot/speed v3.0.0+incompatible h1:2WnRzIquHa5QxaJKShDkLM+sc0JPuwhXzK8OYOyt3Vg= github.com/performancecopilot/speed/v4 v4.0.0 h1:VxEDCmdkfbQYDlcr/GC9YoN9PQ6p8ulk9xVsepYy9ZY= github.com/performancecopilot/speed/v4 v4.0.0/go.mod h1:qxrSyuDGrTOWfV+uKRFhfxw6h/4HXRGUiZiufxo49BM= -github.com/perimeterx/marshmallow v1.1.4/go.mod h1:dsXbUu8CRzfYP5a87xpp0xq9S3u0Vchtcl8we9tYaXw= github.com/perimeterx/marshmallow v1.1.5 h1:a2LALqQ1BlHM8PZblsDdidgv1mWi1DgC2UmX50IvK2s= github.com/perimeterx/marshmallow v1.1.5/go.mod h1:dsXbUu8CRzfYP5a87xpp0xq9S3u0Vchtcl8we9tYaXw= -github.com/peterh/liner v1.1.1-0.20190123174540-a2c9a5303de7/go.mod h1:CRroGNssyjTd/qIG2FyxByd2S8JEAZXBl4qUrZf8GS0= -github.com/petermattis/goid v0.0.0-20221215004737-a150e88a970d/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4= -github.com/petermattis/goid v0.0.0-20230808133559-b036b712a89b/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4= github.com/phayes/checkstyle v0.0.0-20170904204023-bfd46e6a821d h1:CdDQnGF8Nq9ocOS/xlSptM1N3BbrA6/kmaep5ggwaIA= github.com/phayes/checkstyle v0.0.0-20170904204023-bfd46e6a821d/go.mod h1:3OzsM7FXDQlpCiw2j81fOmAwQLnZnLGXVKUzeKQXIAw= -github.com/phpdave11/gofpdf v1.4.2/go.mod h1:zpO6xFn9yxo3YLyMvW8HcKWVdbNqgIfOOp2dXMnm1mY= -github.com/phpdave11/gofpdi v1.0.12/go.mod h1:vBmVV0Do6hSBHC8uKUQ71JGW+ZGQq74llk/7bXwjDoI= -github.com/phpdave11/gofpdi v1.0.13/go.mod h1:vBmVV0Do6hSBHC8uKUQ71JGW+ZGQq74llk/7bXwjDoI= github.com/pierrec/lz4 v2.0.5+incompatible h1:2xWsjqPFWcplujydGg4WmhC/6fZqK42wMM8aXeqhl0I= github.com/pjbgf/sha1cd v0.3.0 h1:4D5XXmUUBUl/xQ6IjCkEAbqXskkq/4O7LmGn0AqMDs4= github.com/pjbgf/sha1cd v0.3.0/go.mod h1:nZ1rrWOcGJ5uZgEEVL1VUM9iRQiZvWdbZjkKyFzPPsI= @@ -883,18 +627,6 @@ github.com/pointlander/peg v1.0.1/go.mod h1:5hsGDQR2oZI4QoWz0/Kdg3VSVEC31iJw/b7W github.com/posener/complete v1.1.1 h1:ccV59UEOTzVDnDUEFdT95ZzHVZ+5+158q8+SJb2QV5w= github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw= github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE= -github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= -github.com/prometheus/client_golang v1.12.0/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= -github.com/prometheus/client_golang v1.16.0/go.mod h1:Zsulrv/L9oM40tJ7T815tM89lFEugiJ9HzIqaAx4LKc= -github.com/prometheus/client_model v0.2.1-0.20210607210712-147c58e9608a/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w= -github.com/prometheus/client_model v0.4.0/go.mod h1:oMQmHW1/JoDwqLtg57MGgP/Fb1CJEYF2imWWhWtMkYU= -github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16/go.mod h1:oMQmHW1/JoDwqLtg57MGgP/Fb1CJEYF2imWWhWtMkYU= -github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= -github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= -github.com/prometheus/common v0.44.0/go.mod h1:ofAIvZbQ1e/nugmZGz4/qCb9Ap1VoSTIO7x0VV9VvuY= -github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= -github.com/prometheus/procfs v0.11.1/go.mod h1:eesXgaPo1q7lBpVMoMy0ZOFTth9hBn4W/y0/p/ScXhY= -github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= github.com/protolambda/bls12-381-util v0.0.0-20220416220906-d8552aa452c7 h1:cZC+usqsYgHtlBaGulVnZ1hfKAi8iWtujBnRLQE698c= github.com/protolambda/bls12-381-util v0.0.0-20220416220906-d8552aa452c7/go.mod h1:IToEjHuttnUzwZI5KBSM/LOOW3qLbbrHOEfp3SbECGY= github.com/quasilyte/go-ruleguard/dsl v0.3.22 h1:wd8zkOhSNr+I+8Qeciml08ivDt1pSXe60+5DqOpCjPE= @@ -908,17 +640,9 @@ github.com/remyoudompheng/go-liblzma v0.0.0-20190506200333-81bf2d431b96/go.mod h github.com/remyoudompheng/go-misc v0.0.0-20190427085024-2d6ac652a50e h1:eTWZyPUnHcuGRDiryS/l2I7FfKjbU3IBx3IjqHPxuKU= github.com/remyoudompheng/go-misc v0.0.0-20190427085024-2d6ac652a50e/go.mod h1:80FQABjoFzZ2M5uEa6FUaJYEmqU2UOKojlFVak1UAwI= github.com/rogpeppe/fastuuid v1.2.0 h1:Ppwyp6VYCF1nvBTXL3trRso7mXMlRrw9ooo375wvi2s= -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.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= -github.com/rs/cors v1.8.3/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= github.com/rs/xid v1.5.0 h1:mKX4bl4iPYJtEIxp6CYiUuLQ/8DYMoz0PUdtGgMFRVc= -github.com/rs/zerolog v1.30.0/go.mod h1:/tk+P47gFdPXq4QYjvCmT5/Gsug2nagsFWBWhAiSi1w= github.com/russross/blackfriday v1.6.0/go.mod h1:ti0ldHuxg49ri4ksnFxlkCfN+hvslNlmVHqNRXXJNAY= -github.com/ruudk/golang-pdf417 v0.0.0-20181029194003-1af4ab5afa58/go.mod h1:6lfFZQK844Gfx8o5WFuvpxWRwnSoipWe/p622j1v06w= -github.com/ruudk/golang-pdf417 v0.0.0-20201230142125-a7e3863a1245/go.mod h1:pQAZKsJ8yyVxGRWYNEm9oFB8ieLgKFnamEyDmSA0BRk= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f h1:UFr9zpz4xgTnIE5yIMtWAMngCdZ9p/+q6lTbgelo80M= -github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/sagikazarmark/crypt v0.10.0 h1:96E1qrToLBU6fGzo+PRRz7KGOc9FkYFiPnR3/zf8Smg= github.com/sagikazarmark/crypt v0.10.0/go.mod h1:gwTNHQVoOS3xp9Xvz5LLR+1AauC5M6880z5NWzdhOyQ= github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da h1:p3Vo3i64TCLY7gIfzeQaUJ+kppEO5WQG3cL8iE8tGHU= @@ -926,13 +650,10 @@ github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww= github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= github.com/schollz/closestmatch v2.1.0+incompatible h1:Uel2GXEpJqOWBrlyI+oY9LTiyyjYS17cCYRqP13/SHk= github.com/schollz/closestmatch v2.1.0+incompatible/go.mod h1:RtP1ddjLong6gTkbtmuhtR2uUrrJOpYzYRvbcPAid+g= -github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I= github.com/seccomp/libseccomp-golang v0.9.2-0.20220502022130-f33da4d89646 h1:RpforrEYXWkmGwJHIGnLZ3tTWStkjVVstwzNGqxX2Ds= -github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ= github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= -github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= github.com/shirou/gopsutil/v3 v3.23.7 h1:C+fHO8hfIppoJ1WdsVm1RoI0RwXoNdfTK7yWXV0wVj4= github.com/shirou/gopsutil/v3 v3.23.7/go.mod h1:c4gnmoRC0hQuaLqvxnx1//VXQ0Ms/X9UnJF8pddY5z4= github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM= @@ -948,42 +669,27 @@ github.com/snikch/goodman v0.0.0-20171125024755-10e37e294daa h1:YJfZp12Z3AFhSBeX github.com/snikch/goodman v0.0.0-20171125024755-10e37e294daa/go.mod h1:oJyF+mSPHbB5mVY2iO9KV3pTt/QbIkGaO8gQ2WrDbP4= github.com/soheilhy/cmux v0.1.4 h1:0HKaf1o97UwFjHH9o5XsHUOF+tqmdA7KEzXLpiyaw0E= github.com/sony/gobreaker v0.4.1 h1:oMnRNZXX5j85zso6xCPRNPtmAycat+WcoKbklScLDgQ= -github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= -github.com/spf13/cobra v1.5.0/go.mod h1:dWXEIy2H428czQCjInthrTRUg7yKbok+2Qi/yBIJoUM= -github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE= github.com/spkg/bom v0.0.0-20160624110644-59b7046e48ad h1:fiWzISvDn0Csy5H0iwgAuJGQTUpVfEMJJd4nRFXogbc= github.com/streadway/amqp v1.0.0 h1:kuuDrUJFZL1QYL9hUNuCxNObNzB0bV/ZG5jV3RWAQgo= github.com/streadway/amqp v1.0.0/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/handy v0.0.0-20200128134331-0f66f006fb2e h1:mOtuXaRAbVZsxAHVdPR3IjfmN8T1h2iczJLynhLybf8= github.com/streadway/handy v0.0.0-20200128134331-0f66f006fb2e/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI= -github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 h1:kdXcSzyDtseVEc4yCz2qF8ZrQvIDBJLl4S1c3GCXmoI= github.com/tdewolff/minify/v2 v2.12.4 h1:kejsHQMM17n6/gwdw53qsi6lg0TGddZADVyQOz1KMdE= github.com/tdewolff/minify/v2 v2.12.4/go.mod h1:h+SRvSIX3kwgwTFOpSckvSxgax3uy8kZTSF1Ojrr3bk= github.com/tdewolff/parse/v2 v2.6.4 h1:KCkDvNUMof10e3QExio9OPZJT8SbdKojLBumw8YZycQ= github.com/tdewolff/parse/v2 v2.6.4/go.mod h1:woz0cgbLwFdtbjJu8PIKxhW05KplTFQkOdX78o+Jgrs= -github.com/tdewolff/test v1.0.7/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE= github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c h1:g+WoO5jjkqGAzHWCjJB1zZfXPIAaDpzXIEJ0eS6B5Ok= github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c/go.mod h1:ahpPrc7HpcfEWDQRZEmnXMzHY03mLDYMCxeDzy46i+8= github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8 h1:ndzgwNDnKIqyCvHTXaCqh9KlOWKvBry6nuXMJmonVsE= -github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926 h1:G3dpKMzFDjgEh2q1Z7zUUtKa8ViPtH+ocF0bE0g00O8= -github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= -github.com/ugorji/go v1.2.7 h1:qYhyWUUd6WbiM+C6JZAUkIJt/1WrjzNHY9+KCIjVqTo= -github.com/ugorji/go v1.2.7/go.mod h1:nF9osbDWLy6bDVv/Rtoh6QgnvNDpmCalQV5urGCCS6M= -github.com/ugorji/go/codec v1.2.7/go.mod h1:WGN1fab3R1fzQlVQTkfxVtIBhWDRqOviHU95kRgeqEY= github.com/urfave/cli v1.22.12 h1:igJgVw1JdKH+trcLWLeLwZjU9fEfPesQ+9/e4MQ44S8= -github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI= github.com/urfave/negroni v1.0.0 h1:kIimOitoypq34K7TG7DUaJ9kq/N4Ofuwi1sjz0KipXc= github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4= -github.com/valyala/fasthttp v1.6.0/go.mod h1:FstJa9V+Pj9vQ7OJie2qMHdwemEDaDiSdBnvPM1Su9w= -github.com/valyala/fasthttp v1.40.0/go.mod h1:t/G+3rLek+CyY9bnIE+YlMRddxVAAGjhxndDB4i4C0I= github.com/valyala/fasthttp v1.48.0 h1:oJWvHb9BIZToTQS3MuQ2R3bJZiNSa2KiNdeI8A+79Tc= github.com/valyala/fasthttp v1.48.0/go.mod h1:k2zXd82h/7UZc3VOdJ2WaUqt1uZ/XpXAfE9i+HBC3lA= -github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8= github.com/valyala/quicktemplate v1.7.0 h1:LUPTJmlVcb46OOUY3IeD9DojFpAVbsG+5WFTcjMJzCM= github.com/valyala/quicktemplate v1.7.0/go.mod h1:sqKJnoaOF88V07vkO+9FL8fb9uZg/VPSJnLYn+LmLk8= -github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio= github.com/valyala/tcplisten v1.0.0 h1:rBHj/Xf+E1tRGZyWIWwJDiRY0zc1Js+CV5DqwacVSA8= github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc= github.com/vishvananda/netlink v1.1.0 h1:1iyaYNBLmP6L0220aDnYQpo1QEV4t4hJ+xEEhhJH8j0= @@ -1004,14 +710,9 @@ github.com/xhit/go-str2duration/v2 v2.1.0 h1:lxklc02Drh6ynqX+DdPyp5pCKLUQpRT8bp8 github.com/xhit/go-str2duration/v2 v2.1.0/go.mod h1:ohY8p+0f07DiV6Em5LKB0s2YpLtXVyJfNt1+BlmyAsU= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 h1:eY9dn8+vbi4tKz5Qo6v2eYzo7kUS51QINcR5jNpbZS8= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77 h1:ESFSdwYZvkeru3RtdrYueztKhOBCSAAzS4Gf+k0tEow= -github.com/yalp/jsonpath v0.0.0-20180802001716-5cc68e5049a0/go.mod h1:/LWChgwKmvncFJFHJ7Gvn9wZArjbV5/FppcK2fKk/tI= github.com/yosssi/ace v0.0.5 h1:tUkIP/BLdKqrlrPwcmH0shwEEhTRHoGnc1wFIWmaBUA= github.com/yosssi/ace v0.0.5/go.mod h1:ALfIzm2vT7t5ZE7uoIZqF3TQ7SAOyupFZnkrF5id+K0= -github.com/yudai/gojsondiff v1.0.0/go.mod h1:AY32+k2cwILAkW1fbgxQ5mUmMiZFgLIV+FBNExI05xg= -github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82/go.mod h1:lgjkn3NuSvDfVJdfcVVdX+jpBxNmX4rDAzaS45IcYoM= -github.com/yudai/pp v2.0.1+incompatible/go.mod h1:PuxR/8QJ7cyCkFp/aUDS+JY727OFEZkTdatxwunjIkc= github.com/yuin/goldmark v1.4.13 h1:fVcFKWvrslecOb/tg+Cc05dkeYx540o0FuFt3nUVDoE= -go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738 h1:VcrIfasaLFkyjk6KNlXQSzO+B0fZcnECiDrKJsfxka0= go.etcd.io/etcd/api/v3 v3.5.9 h1:4wSsluwyTbGGmyjJktOf3wFQoTBIURXHnq9n/G/JQHs= go.etcd.io/etcd/api/v3 v3.5.9/go.mod h1:uyAal843mC8uUVSLWz6eHa/d971iDGnCRpmKd2Z+X8k= @@ -1027,171 +728,24 @@ go.opentelemetry.io/proto/otlp v0.7.0 h1:rwOQPCuKAKmwGKq2aVNnYIibI6wnV7EvzgfTCzc go.uber.org/automaxprocs v1.5.2 h1:2LxUOGiR3O6tw8ui5sZa2LAaHnsviZdVOUZw4fvbnME= go.uber.org/automaxprocs v1.5.2/go.mod h1:eRbA25aqJrxAbsLO0xy5jVwPt7FQnRgjW+efnwa1WM0= go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee h1:0mgffUl7nfd+FpvXMVz4IDEaUSmT1ysygQC7qYo7sG4= -golang.org/x/arch v0.3.0/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= -golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= -golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.0.0-20220314234659-1baeb1ce4c0b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.0.0-20220321153916-2c7772ba3064/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= -golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0= -golang.org/x/crypto v0.10.0/go.mod h1:o4eNf7Ede1fv+hwOwZsTHl9EsPFO6q6ZvYR8vYfY45I= -golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio= -golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw= -golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20191002040644-a1355ae1e2c3/go.mod h1:NOZ3BPKG0ec/BKJQgnvsSFpcKLM5xXVWnvZS97DWHgE= -golang.org/x/exp v0.0.0-20200513190911-00229845015e/go.mod h1:4M0jN8W1tt0AVLNr8HDosyJCDCDuyL9N9+3m7wDWgKw= -golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e/go.mod h1:Kr81I6Kryrl9sr8s2FK3vxD90NdsKWRuOIl2O4CvYbA= -golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc= -golang.org/x/exp v0.0.0-20230810033253-352e893a4cad/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc= -golang.org/x/exp v0.0.0-20230811145659-89c5cff77bcb/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc= -golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63/go.mod h1:0v4NqG35kSWCMzLaMeX+IQrlSnVE/bqGSyC2cz/9Le8= -golang.org/x/exp v0.0.0-20230905200255-921286631fa9/go.mod h1:S2oDrQGGwySpoQPVqRShND87VCbxmc6bL1Yd2oYrm6k= -golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs= golang.org/x/image v0.0.0-20190802002840-cff245a6509b h1:+qEpEAPhDZ1o0x3tHzZTQDArnOixOzGD9HUJfcg0mb4= -golang.org/x/image v0.0.0-20190910094157-69e4b8554b2a/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= -golang.org/x/image v0.0.0-20200119044424-58c23975cae1/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= -golang.org/x/image v0.0.0-20200430140353-33d19683fad8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= -golang.org/x/image v0.0.0-20200618115811-c13761719519/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= -golang.org/x/image v0.0.0-20201208152932-35266b937fa6/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= -golang.org/x/image v0.0.0-20210216034530-4410531fe030/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= -golang.org/x/image v0.0.0-20210607152325-775e3b0c77b9/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM= -golang.org/x/image v0.0.0-20210628002857-a66eb6448b8d/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM= -golang.org/x/image v0.0.0-20211028202545-6944b10bf410/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM= -golang.org/x/image v0.0.0-20220302094943-723b81ca9867/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM= golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 h1:VLliZ0d+/avPrXXH+OakdXhpJuEoBZuwh1m2j7U6Iug= golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028 h1:4+4C/Iv2U4fMZBiMCc98MG1In4gJY5YRhtpDNeDeHWs= -golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/mod v0.11.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/mod v0.13.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= -golang.org/x/net v0.0.0-20190327091125-710a502c58a2/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= -golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20201010224723-4f7140c49acb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20210220033124-5f55cee0dc0d/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210610132358-84b48f89b13b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= -golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns= -golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= -golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA= -golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI= -golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= -golang.org/x/net v0.16.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= -golang.org/x/oauth2 v0.0.0-20170207211851-4464e7848382/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/oauth2 v0.8.0/go.mod h1:yr7u4HXZRm1R1kBWqr/xKNqewf0plRYoB7sla+BCIXE= -golang.org/x/oauth2 v0.10.0/go.mod h1:kTpgurOux7LqtuxjuyZa4Gj2gdezIt/jQtGnNFfypQI= -golang.org/x/oauth2 v0.11.0/go.mod h1:LdF7O/8bLR/qWK9DrpXmbHLTouvRHK0SgJl0GmDBchk= golang.org/x/perf v0.0.0-20230113213139-801c7ef9e5c5 h1:ObuXPmIgI4ZMyQLIz48cJYgSyWdjUXc2SZAdyJMwEAU= golang.org/x/perf v0.0.0-20230113213139-801c7ef9e5c5/go.mod h1:UBKtEnL8aqnd+0JHqZ+2qoMDwtuy6cYhhKNoHLBiTQc= -golang.org/x/sync v0.2.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= -golang.org/x/sync v0.4.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= -golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200826173525-f9321e4c35a6/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201101102859-da207088b7d1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210304124612-50617c2ba197/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210819135213-f52c844e1c1c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210909193231-528a39cd75f3/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-20220325203850-36772127a21f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= -golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= -golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= -golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= -golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= -golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= -golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= -golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20181221001348-537d06c36207/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190327201419-c70d86f8b7cf/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190927191325-030b2cf1153e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.9.1/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc= -golang.org/x/tools v0.9.3/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc= -golang.org/x/tools v0.11.1/go.mod h1:anzJrxPjNtfgiYQYirP2CPGzGLxrH2u2QBhn6Bf3qY8= -golang.org/x/tools v0.12.0/go.mod h1:Sc0INKfu04TlqNoRA1hgpFZbhYXHPr4V5DzpSBTPqQM= -golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58= -gonum.org/v1/gonum v0.0.0-20180816165407-929014505bf4/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo= -gonum.org/v1/gonum v0.8.2/go.mod h1:oe/vMfY3deqTw+1EZJhuvEW2iwGF1bW9wwu7XCu0+v0= -gonum.org/v1/gonum v0.9.3/go.mod h1:TZumC3NeyVQskjXqmyWt4S3bINhy7B4eYwW69EbyX+0= -gonum.org/v1/gonum v0.11.0/go.mod h1:fSG4YDCxxUZQJ7rKsQrj0gMOg00Il0Z96/qMA4bVQhA= gonum.org/v1/gonum v0.12.0 h1:xKuo6hzt+gMav00meVPUlXwSdoEJP46BR+wdxQEFK2o= gonum.org/v1/gonum v0.12.0/go.mod h1:73TDxJfAAHeA8Mk9mf8NlIppyhQNo5GLTcYeqgo2lvY= -gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw= -gonum.org/v1/plot v0.0.0-20190515093506-e2840ee46a6b/go.mod h1:Wt8AAjI+ypCyYX3nZBvf6cAIx93T+c/OS2HFAYskSZc= -gonum.org/v1/plot v0.9.0/go.mod h1:3Pcqqmp6RHvJI72kgb8fThyUnav364FOsdDo2aGW5lY= -gonum.org/v1/plot v0.10.0/go.mod h1:JWIHJ7U20drSQb/aDpTetJzfC1KlAPldJLpkSy88dvQ= -gonum.org/v1/plot v0.10.1/go.mod h1:VZW5OlhkL1mysU9vaqNHnsy86inf6Ot+jB3r+BczCEo= -google.golang.org/api v0.0.0-20170206182103-3d017632ea10/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= -google.golang.org/api v0.128.0/go.mod h1:Y611qgqaE92On/7g65MQgxYul3c0rEB894kniWLY750= -google.golang.org/genproto v0.0.0-20180518175338-11a468237815/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM= -google.golang.org/genproto v0.0.0-20230227214838-9b19f0bdc514/go.mod h1:TvhZT5f700eVlTNwND1xoEZQeWTB2RY/65kplwl/bFA= -google.golang.org/genproto v0.0.0-20230530153820-e85fd2cbaebc/go.mod h1:xZnkP7mREFX5MORlOPEzLMr+90PPZQ2QWzrVTWfAq64= -google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5/go.mod h1:oH/ZOT02u4kWEp7oYBGYFFkCdKS/uYR9Z7+0/xuuFp8= -google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d/go.mod h1:yZTlhN0tQnXo3h00fuXNCxJdLdIdnVFVBaRJ5LWBbw4= -google.golang.org/genproto v0.0.0-20231002182017-d307bd883b97/go.mod h1:t1VqOqqvce95G3hIDCT5FeO3YUc6Q4Oe24L/+rNMxRk= -google.golang.org/genproto v0.0.0-20231012201019-e917dd12ba7a/go.mod h1:EMfReVxb80Dq1hhioy0sOsY9jCE46YDgHlJ7fWVUWRE= -google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc/go.mod h1:vHYtlOoi6TsQ3Uk2yxR7NI5z8uoV+3pZtR4jmHIkRig= -google.golang.org/genproto/googleapis/api v0.0.0-20230803162519-f966b187b2e5/go.mod h1:5DZzOUPCLYL3mNkQ0ms0F3EuUNZ7py1Bqeq6sxzI7/Q= -google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d/go.mod h1:KjSP20unUpOx5kyQUFa7k4OJg0qeJ7DEZflGDu2p6Bk= -google.golang.org/genproto/googleapis/api v0.0.0-20231002182017-d307bd883b97/go.mod h1:iargEX0SFPm3xcfMI0d1domjg0ZF4Aa0p2awqyxhvF0= google.golang.org/genproto/googleapis/bytestream v0.0.0-20230807174057-1744710a1577 h1:ZX0eQu2J+jOO87sq8fQG8J/Nfp7D7BhHpixIE5EYK/k= google.golang.org/genproto/googleapis/bytestream v0.0.0-20230807174057-1744710a1577/go.mod h1:NjCQG/D8JandXxM57PZbAJL1DCNL6EypA0vPPwfsc7c= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19/go.mod h1:66JfowdXAEgad5O9NnYcsNPLCPZJD++2L9X0PCMODrA= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc/go.mod h1:66JfowdXAEgad5O9NnYcsNPLCPZJD++2L9X0PCMODrA= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230815205213-6bfd019c3878/go.mod h1:+Bk1OCOj40wS2hwAMA+aCW9ypzm63QTBBHp6lQ3p+9M= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d/go.mod h1:+Bk1OCOj40wS2hwAMA+aCW9ypzm63QTBBHp6lQ3p+9M= -google.golang.org/genproto/googleapis/rpc v0.0.0-20231002182017-d307bd883b97/go.mod h1:v7nGkzlmW8P3n/bKmWBn2WpBjpOEx8Q6gMueudAmKfY= -google.golang.org/genproto/googleapis/rpc v0.0.0-20231009173412-8bfb1ae86b6c/go.mod h1:4cYg8o5yUbm77w8ZX00LhMVNl/YVBFJRYWDc0uYWMs0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20231012201019-e917dd12ba7a/go.mod h1:4cYg8o5yUbm77w8ZX00LhMVNl/YVBFJRYWDc0uYWMs0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20231016165738-49dd2c1f3d0b/go.mod h1:swOH3j0KzcDDgGUWr+SNpyTen5YrXjS3eyPzFYKc6lc= -google.golang.org/grpc v0.0.0-20170208002647-2a6bf6142e96/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= -google.golang.org/grpc v1.12.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= -google.golang.org/grpc v1.53.0/go.mod h1:OnIrk0ipVdj4N5d9IUoFUx72/VlD7+jUsHwZgwSMQpw= -google.golang.org/grpc v1.56.1/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s= -google.golang.org/grpc v1.57.0/go.mod h1:Sd+9RMTACXwmub0zcNY2c4arhtrbBYD1AUHI/dt16Mo= -google.golang.org/grpc v1.58.2/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0= -google.golang.org/grpc v1.58.3/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0 h1:M1YKkFIboKNieVO5DLUEVzQfGwJD30Nv2jfUgzb5UcE= -google.golang.org/protobuf v1.28.2-0.20230222093303-bc1253ad3743/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -google.golang.org/protobuf v1.29.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/alecthomas/kingpin.v2 v2.2.6 h1:jMFz6MfLP0/4fUyZle81rXUoxOBFi19VUFKVDOQfozc= -gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/cheggaaa/pb.v1 v1.0.27 h1:kJdccidYzt3CaHD1crCFTS1hxyhSi059NhOFUf03YFo= gopkg.in/errgo.v2 v2.1.0 h1:0vLT13EuvQ0hNvakwLuFZ/jYrLp5F3kcWHXdRggjCE8= gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4= gopkg.in/gcfg.v1 v1.2.3 h1:m8OOJ4ccYHnx2f4gQwpno8nAX5OGOh7RLaaz0pj3Ogs= -gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE= -gopkg.in/go-playground/validator.v8 v8.18.2/go.mod h1:RX2a/7Ha8BgOhfk7j780h4/u/RRjR0eouCJSH80/M2Y= -gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA= -gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= gopkg.in/resty.v1 v1.12.0 h1:CuXP0Pjfw9rOuY6EP+UvtNvt5DSqHpIxILZKT/quCZI= gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME= -gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gotest.tools/v3 v3.5.0/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU= -honnef.co/go/tools v0.1.3/go.mod h1:NgwopIslSNH47DimFoV78dnkksY2EFtX0ajyb3K/las= nullprogram.com/x/optparse v1.0.0 h1:xGFgVi5ZaWOnYdac2foDT3vg0ZZC9ErXFV57mr4OHrI= -pkg.berachain.dev/polaris/contracts v0.0.0-20231023174626-bf146d519cd3/go.mod h1:YZZ0c17iFXlmnPyi59b/uaTD4IH71YrMQVn6W9PCVsY= -pkg.berachain.dev/polaris/cosmos v0.0.0-20231101202254-949a826ae454/go.mod h1:rwvWL1M9Lo4iIDR1JEBx3rVZR7bgepxV+KI3y8HpxhY= -pkg.berachain.dev/polaris/eth v0.0.0-20231031220135-f3bf0d0ee45f/go.mod h1:oMkuuC++8LHdw05BX+QHtzX/YHMAKZHnE/fWBMMa+P8= rsc.io/binaryregexp v0.2.0 h1:HfqmD5MEmC0zvwBuF187nq9mdnXjXsSivRiXN7SmRkE= rsc.io/pdf v0.1.1 h1:k1MczvYDUvJBe93bYd7wrZLLUEcLZAuF824/I4e5Xr4= rsc.io/quote/v3 v3.1.0 h1:9JKUTTIUgS6kzR9mK1YuGKv6Nl+DijDNIc0ghT58FaY= diff --git a/lib/ds/ds.go b/lib/ds/ds.go index 1bf13dd9f..9e8f0a40b 100644 --- a/lib/ds/ds.go +++ b/lib/ds/ds.go @@ -26,7 +26,7 @@ package ds import ( - libtypes "pkg.berachain.dev/polaris/lib/types" + libtypes "github.com/berachain/polaris/lib/types" ) type StackFactory[T any] interface { diff --git a/lib/ds/stack/appendable_stack.go b/lib/ds/stack/appendable_stack.go index a28c0d601..5893a2eac 100644 --- a/lib/ds/stack/appendable_stack.go +++ b/lib/ds/stack/appendable_stack.go @@ -15,7 +15,7 @@ //nolint:ireturn // Stack uses generics. package stack -import "pkg.berachain.dev/polaris/lib/ds" +import "github.com/berachain/polaris/lib/ds" // aStack is a struct that holds a slice of Items as a last in, first out data structure. // It is implemented by the built-in `append` operation. diff --git a/lib/ds/stack/appendable_stack_test.go b/lib/ds/stack/appendable_stack_test.go index e793ada76..3442d3bc9 100644 --- a/lib/ds/stack/appendable_stack_test.go +++ b/lib/ds/stack/appendable_stack_test.go @@ -26,8 +26,8 @@ package stack_test import ( - "pkg.berachain.dev/polaris/lib/ds" - "pkg.berachain.dev/polaris/lib/ds/stack" + "github.com/berachain/polaris/lib/ds" + "github.com/berachain/polaris/lib/ds/stack" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/lib/ds/stack/cloneable_stack.go b/lib/ds/stack/cloneable_stack.go index 1a77b7dd1..3e9a6c0a2 100644 --- a/lib/ds/stack/cloneable_stack.go +++ b/lib/ds/stack/cloneable_stack.go @@ -26,8 +26,8 @@ package stack import ( - "pkg.berachain.dev/polaris/lib/ds" - libtypes "pkg.berachain.dev/polaris/lib/types" + "github.com/berachain/polaris/lib/ds" + libtypes "github.com/berachain/polaris/lib/types" ) // cloneableStack is a struct that holds a slice of CacheEntry instances. diff --git a/lib/ds/stack/cloneable_stack_test.go b/lib/ds/stack/cloneable_stack_test.go index 7e1892997..42c4a73e7 100644 --- a/lib/ds/stack/cloneable_stack_test.go +++ b/lib/ds/stack/cloneable_stack_test.go @@ -26,9 +26,9 @@ package stack_test import ( - "pkg.berachain.dev/polaris/lib/ds" - "pkg.berachain.dev/polaris/lib/ds/stack" - typesmock "pkg.berachain.dev/polaris/lib/types/mock" + "github.com/berachain/polaris/lib/ds" + "github.com/berachain/polaris/lib/ds/stack" + typesmock "github.com/berachain/polaris/lib/types/mock" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/lib/ds/stack/stack.go b/lib/ds/stack/stack.go index 23b15f0af..355c18d10 100644 --- a/lib/ds/stack/stack.go +++ b/lib/ds/stack/stack.go @@ -16,7 +16,7 @@ package stack import ( - "pkg.berachain.dev/polaris/lib/ds" + "github.com/berachain/polaris/lib/ds" ) const ( diff --git a/lib/ds/stack/stack_benchmark_test.go b/lib/ds/stack/stack_benchmark_test.go index 02ed2bc10..bb85b555d 100644 --- a/lib/ds/stack/stack_benchmark_test.go +++ b/lib/ds/stack/stack_benchmark_test.go @@ -17,7 +17,7 @@ package stack_test import ( "testing" - "pkg.berachain.dev/polaris/lib/ds/stack" + "github.com/berachain/polaris/lib/ds/stack" ) const ( diff --git a/lib/ds/stack/stack_test.go b/lib/ds/stack/stack_test.go index e616a95ef..397ed324f 100644 --- a/lib/ds/stack/stack_test.go +++ b/lib/ds/stack/stack_test.go @@ -28,8 +28,8 @@ package stack_test import ( "testing" - "pkg.berachain.dev/polaris/lib/ds" - "pkg.berachain.dev/polaris/lib/ds/stack" + "github.com/berachain/polaris/lib/ds" + "github.com/berachain/polaris/lib/ds/stack" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/lib/encoding/json_test.go b/lib/encoding/json_test.go index d0a943d32..448e58d83 100644 --- a/lib/encoding/json_test.go +++ b/lib/encoding/json_test.go @@ -26,7 +26,7 @@ package encoding_test import ( - enclib "pkg.berachain.dev/polaris/lib/encoding" + enclib "github.com/berachain/polaris/lib/encoding" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/lib/errors/debug/debug_test.go b/lib/errors/debug/debug_test.go index 8361bd866..8187a2dfa 100644 --- a/lib/errors/debug/debug_test.go +++ b/lib/errors/debug/debug_test.go @@ -28,7 +28,7 @@ package debug_test import ( "testing" - "pkg.berachain.dev/polaris/lib/errors/debug" + "github.com/berachain/polaris/lib/errors/debug" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/lib/errors/errors_test.go b/lib/errors/errors_test.go index 155bc9600..367bf5dfd 100644 --- a/lib/errors/errors_test.go +++ b/lib/errors/errors_test.go @@ -29,7 +29,7 @@ import ( "errors" "testing" - liberrors "pkg.berachain.dev/polaris/lib/errors" + liberrors "github.com/berachain/polaris/lib/errors" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/lib/go.mod b/lib/go.mod index 5ea2da27b..6db939aec 100644 --- a/lib/go.mod +++ b/lib/go.mod @@ -1,4 +1,4 @@ -module pkg.berachain.dev/polaris/lib +module github.com/berachain/polaris/lib go 1.21 diff --git a/lib/registry/map.go b/lib/registry/map.go index c6a7a9425..67a814a57 100644 --- a/lib/registry/map.go +++ b/lib/registry/map.go @@ -26,7 +26,7 @@ package registry import ( - libtypes "pkg.berachain.dev/polaris/lib/types" + libtypes "github.com/berachain/polaris/lib/types" ) // mapRegistry is a simple implementation of `Registry` that uses a map as the underlying data diff --git a/lib/registry/map_test.go b/lib/registry/map_test.go index c66f852b3..5f4a8eb5f 100644 --- a/lib/registry/map_test.go +++ b/lib/registry/map_test.go @@ -26,9 +26,9 @@ package registry_test import ( - "pkg.berachain.dev/polaris/lib/registry" - "pkg.berachain.dev/polaris/lib/registry/mock" - libtypes "pkg.berachain.dev/polaris/lib/types" + "github.com/berachain/polaris/lib/registry" + "github.com/berachain/polaris/lib/registry/mock" + libtypes "github.com/berachain/polaris/lib/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/lib/registry/mock/registrable.go b/lib/registry/mock/registrable.go index 47cf4b167..7be5439f3 100644 --- a/lib/registry/mock/registrable.go +++ b/lib/registry/mock/registrable.go @@ -25,7 +25,7 @@ package mock -import libtypes "pkg.berachain.dev/polaris/lib/types" +import libtypes "github.com/berachain/polaris/lib/types" // Assert that `MockRegistrable` implements `Registrable`. var _ libtypes.Registrable[string] = &Registrable{} diff --git a/lib/snapshot/controller.go b/lib/snapshot/controller.go index 1816d7d2f..ce5b9092b 100644 --- a/lib/snapshot/controller.go +++ b/lib/snapshot/controller.go @@ -26,10 +26,10 @@ package snapshot import ( - "pkg.berachain.dev/polaris/lib/ds" - "pkg.berachain.dev/polaris/lib/ds/stack" - "pkg.berachain.dev/polaris/lib/registry" - libtypes "pkg.berachain.dev/polaris/lib/types" + "github.com/berachain/polaris/lib/ds" + "github.com/berachain/polaris/lib/ds/stack" + "github.com/berachain/polaris/lib/registry" + libtypes "github.com/berachain/polaris/lib/types" ) // initJournalCapacity is the initial capacity of the `journal` stack. diff --git a/lib/snapshot/controller_test.go b/lib/snapshot/controller_test.go index e72d93430..f570364b7 100644 --- a/lib/snapshot/controller_test.go +++ b/lib/snapshot/controller_test.go @@ -28,9 +28,9 @@ package snapshot import ( "testing" - libtypes "pkg.berachain.dev/polaris/lib/types" - typesmock "pkg.berachain.dev/polaris/lib/types/mock" - "pkg.berachain.dev/polaris/lib/utils" + libtypes "github.com/berachain/polaris/lib/types" + typesmock "github.com/berachain/polaris/lib/types/mock" + "github.com/berachain/polaris/lib/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/lib/types/mock/cloneable.go b/lib/types/mock/cloneable.go index 03b91a433..f49b57881 100644 --- a/lib/types/mock/cloneable.go +++ b/lib/types/mock/cloneable.go @@ -25,7 +25,7 @@ package mock -import libtypes "pkg.berachain.dev/polaris/lib/types" +import libtypes "github.com/berachain/polaris/lib/types" //go:generate moq -out ./cloneable.mock.go -pkg mock ../ Cloneable diff --git a/lib/types/mock/cloneable.mock.go b/lib/types/mock/cloneable.mock.go index 7b3a07f70..d609d2adf 100644 --- a/lib/types/mock/cloneable.mock.go +++ b/lib/types/mock/cloneable.mock.go @@ -4,7 +4,7 @@ package mock import ( - "pkg.berachain.dev/polaris/lib/types" + "github.com/berachain/polaris/lib/types" "sync" ) diff --git a/lib/types/mock/snapshottable.mock.go b/lib/types/mock/snapshottable.mock.go index 08f6838a0..9b0a18dfc 100644 --- a/lib/types/mock/snapshottable.mock.go +++ b/lib/types/mock/snapshottable.mock.go @@ -4,7 +4,7 @@ package mock import ( - "pkg.berachain.dev/polaris/lib/types" + "github.com/berachain/polaris/lib/types" "sync" ) diff --git a/proto/polaris/crypto/ethsecp256k1/v1/keys.proto b/proto/polaris/crypto/ethsecp256k1/v1/keys.proto index e6414ace2..c52c3b37d 100644 --- a/proto/polaris/crypto/ethsecp256k1/v1/keys.proto +++ b/proto/polaris/crypto/ethsecp256k1/v1/keys.proto @@ -22,7 +22,7 @@ syntax = "proto3"; package polaris.crypto.ethsecp256k1.v1; -option go_package = "pkg.berachain.dev/polaris/cosmos/crypto/keys/ethsecp256k1"; +option go_package = "github.com/berachain/polaris/cosmos/crypto/keys/ethsecp256k1"; // `PubKey` defines a type alias for an `ecdsa.PublicKey` that implements // CometBFT's `PubKey` interface. It represents the 33-byte compressed public diff --git a/proto/polaris/evm/module/v1alpha1/module.proto b/proto/polaris/evm/module/v1alpha1/module.proto index de2a1cf54..f63c42101 100644 --- a/proto/polaris/evm/module/v1alpha1/module.proto +++ b/proto/polaris/evm/module/v1alpha1/module.proto @@ -26,5 +26,5 @@ import "cosmos/app/v1alpha1/module.proto"; // Module is the config object of the evm module. message Module { - option (cosmos.app.v1alpha1.module) = {go_import: "pkg.berachain.dev/polaris/cosmos/x/evm"}; + option (cosmos.app.v1alpha1.module) = {go_import: "github.com/berachain/polaris/cosmos/x/evm"}; } diff --git a/proto/polaris/evm/v1alpha1/tx.proto b/proto/polaris/evm/v1alpha1/tx.proto index d2fa4897f..50be6ab3e 100644 --- a/proto/polaris/evm/v1alpha1/tx.proto +++ b/proto/polaris/evm/v1alpha1/tx.proto @@ -23,7 +23,7 @@ package polaris.evm.v1alpha1; import "cosmos/msg/v1/msg.proto"; -option go_package = "pkg.berachain.dev/polaris/cosmos/x/evm/types"; +option go_package = "github.com/berachain/polaris/cosmos/x/evm/types"; // Msg defines the x/evm Msg service. service MsgService {