diff --git a/Makefile b/Makefile index 8ef4c54a..fab30abf 100755 --- a/Makefile +++ b/Makefile @@ -140,7 +140,7 @@ docker-build: # update old container docker rm ethermint || true # create a new container from the latest image - docker create --name ethermint -t -i tharsis/ethermint:latest ethermint + docker create --name ethermint -t -i cerc-io/laconicd:latest ethermint # move the binaries to the ./build directory mkdir -p ./build/ docker cp ethermint:/usr/bin/ethermintd ./build/ @@ -166,7 +166,7 @@ build-all: tools build lint test ### Releasing ### ############################################################################### -PACKAGE_NAME:=github.com/tharsis/ethermint +PACKAGE_NAME:=github.com/cerc-io/laconicd GOLANG_CROSS_VERSION = v1.17.1 GOPATH ?= '$(HOME)/go' release-dry-run: @@ -299,7 +299,7 @@ update-swagger-docs: statik .PHONY: update-swagger-docs godocs: - @echo "--> Wait a few seconds and visit http://localhost:6060/pkg/github.com/tharsis/ethermint/types" + @echo "--> Wait a few seconds and visit http://localhost:6060/pkg/github.com/cerc-io/laconicd/types" godoc -http=:6060 ############################################################################### @@ -333,7 +333,7 @@ else endif test-import: - go test -run TestImporterTestSuite -v --vet=off github.com/tharsis/ethermint/tests/importer + go test -run TestImporterTestSuite -v --vet=off github.com/cerc-io/laconicd/tests/importer test-rpc: ./scripts/integration-test-all.sh -t "rpc" -q 1 -z 1 -s 2 -m "rpc" -r "true" diff --git a/README.md b/README.md index 6344e36f..c9fd021a 100644 --- a/README.md +++ b/README.md @@ -10,31 +10,31 @@ parent: ![banner](docs/ethermint.jpg)
- - Version + + Version - - License: Apache-2.0 + + License: Apache-2.0 - - GoDoc + + GoDoc - - Go report card + + Go report card - Lines of code + Lines of code
Discord - - Lint Status + + Lint Status - - Code Coverage + + Code Coverage
@@ -50,7 +50,7 @@ For prerequisites and detailed build instructions please read the Evmos [Install make install ``` -Or check out the latest [release](https://github.com/tharsis/ethermint/releases). +Or check out the latest [release](https://github.com/cerc-io/laconicd/releases). ## Quick Start @@ -69,7 +69,7 @@ The following chat channels and forums are a great spot to ask questions about E ## Contributing -Looking for a good place to start contributing? Check out some [`good first issues`](https://github.com/tharsis/ethermint/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22). +Looking for a good place to start contributing? Check out some [`good first issues`](https://github.com/cerc-io/laconicd/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22). For additional instructions, standards and style guides, please refer to the [Contributing](./CONTRIBUTING.md) document. diff --git a/app/addr_prefixes.go b/app/addr_prefixes.go index 143a15eb..4d59feb1 100644 --- a/app/addr_prefixes.go +++ b/app/addr_prefixes.go @@ -3,7 +3,7 @@ package app import ( sdk "github.com/cosmos/cosmos-sdk/types" - cmdcfg "github.com/tharsis/ethermint/cmd/config" + cmdcfg "github.com/cerc-io/laconicd/cmd/config" ) // sdk config diff --git a/app/ante/ante.go b/app/ante/ante.go index fbf1e9c7..86636a5c 100644 --- a/app/ante/ante.go +++ b/app/ante/ante.go @@ -12,7 +12,7 @@ import ( authante "github.com/cosmos/cosmos-sdk/x/auth/ante" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - "github.com/tharsis/ethermint/crypto/ethsecp256k1" + "github.com/cerc-io/laconicd/crypto/ethsecp256k1" ) const ( diff --git a/app/ante/ante_test.go b/app/ante/ante_test.go index 2548ba30..d28ae473 100644 --- a/app/ante/ante_test.go +++ b/app/ante/ante_test.go @@ -1,16 +1,17 @@ package ante_test import ( - "github.com/cosmos/cosmos-sdk/types/tx/signing" "math/big" "strings" + "github.com/cosmos/cosmos-sdk/types/tx/signing" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cerc-io/laconicd/tests" + evmtypes "github.com/cerc-io/laconicd/x/evm/types" "github.com/ethereum/go-ethereum/core/types" ethparams "github.com/ethereum/go-ethereum/params" - "github.com/tharsis/ethermint/tests" - evmtypes "github.com/tharsis/ethermint/x/evm/types" ) func (suite AnteTestSuite) TestAnteHandler() { diff --git a/app/ante/eip712.go b/app/ante/eip712.go index 664bafc6..100532e0 100644 --- a/app/ante/eip712.go +++ b/app/ante/eip712.go @@ -13,12 +13,12 @@ import ( "github.com/cosmos/cosmos-sdk/x/auth/migrations/legacytx" authsigning "github.com/cosmos/cosmos-sdk/x/auth/signing" + "github.com/cerc-io/laconicd/crypto/ethsecp256k1" + "github.com/cerc-io/laconicd/ethereum/eip712" + ethermint "github.com/cerc-io/laconicd/types" + evmtypes "github.com/cerc-io/laconicd/x/evm/types" ethcrypto "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/crypto/secp256k1" - "github.com/tharsis/ethermint/crypto/ethsecp256k1" - "github.com/tharsis/ethermint/ethereum/eip712" - ethermint "github.com/tharsis/ethermint/types" - evmtypes "github.com/tharsis/ethermint/x/evm/types" ) var ethermintCodec codec.ProtoCodecMarshaler diff --git a/app/ante/eth.go b/app/ante/eth.go index 27350448..fee59ab9 100644 --- a/app/ante/eth.go +++ b/app/ante/eth.go @@ -8,10 +8,10 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" authante "github.com/cosmos/cosmos-sdk/x/auth/ante" - ethermint "github.com/tharsis/ethermint/types" - evmkeeper "github.com/tharsis/ethermint/x/evm/keeper" - "github.com/tharsis/ethermint/x/evm/statedb" - evmtypes "github.com/tharsis/ethermint/x/evm/types" + ethermint "github.com/cerc-io/laconicd/types" + evmkeeper "github.com/cerc-io/laconicd/x/evm/keeper" + "github.com/cerc-io/laconicd/x/evm/statedb" + evmtypes "github.com/cerc-io/laconicd/x/evm/types" "github.com/ethereum/go-ethereum/common" ethtypes "github.com/ethereum/go-ethereum/core/types" diff --git a/app/ante/eth_test.go b/app/ante/eth_test.go index 2c1aa4e0..199fa19a 100644 --- a/app/ante/eth_test.go +++ b/app/ante/eth_test.go @@ -5,11 +5,11 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/tharsis/ethermint/app/ante" - "github.com/tharsis/ethermint/server/config" - "github.com/tharsis/ethermint/tests" - "github.com/tharsis/ethermint/x/evm/statedb" - evmtypes "github.com/tharsis/ethermint/x/evm/types" + "github.com/cerc-io/laconicd/app/ante" + "github.com/cerc-io/laconicd/server/config" + "github.com/cerc-io/laconicd/tests" + "github.com/cerc-io/laconicd/x/evm/statedb" + evmtypes "github.com/cerc-io/laconicd/x/evm/types" ethtypes "github.com/ethereum/go-ethereum/core/types" ) diff --git a/app/ante/handler_options.go b/app/ante/handler_options.go index 1aa6cd09..b5c80541 100644 --- a/app/ante/handler_options.go +++ b/app/ante/handler_options.go @@ -11,7 +11,7 @@ import ( ibcante "github.com/cosmos/ibc-go/v3/modules/core/ante" ibckeeper "github.com/cosmos/ibc-go/v3/modules/core/keeper" - evmtypes "github.com/tharsis/ethermint/x/evm/types" + evmtypes "github.com/cerc-io/laconicd/x/evm/types" ) // HandlerOptions extend the SDK's AnteHandler options by requiring the IBC diff --git a/app/ante/interfaces.go b/app/ante/interfaces.go index 3e7cebcc..cfb91412 100644 --- a/app/ante/interfaces.go +++ b/app/ante/interfaces.go @@ -3,14 +3,14 @@ package ante import ( "math/big" + "github.com/cerc-io/laconicd/x/evm/statedb" + evmtypes "github.com/cerc-io/laconicd/x/evm/types" sdk "github.com/cosmos/cosmos-sdk/types" tx "github.com/cosmos/cosmos-sdk/types/tx" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/core/vm" "github.com/ethereum/go-ethereum/params" - "github.com/tharsis/ethermint/x/evm/statedb" - evmtypes "github.com/tharsis/ethermint/x/evm/types" ) // EVMKeeper defines the expected keeper interface used on the Eth AnteHandler diff --git a/app/ante/reject_msgs.go b/app/ante/reject_msgs.go index fafb159e..97409c28 100644 --- a/app/ante/reject_msgs.go +++ b/app/ante/reject_msgs.go @@ -1,9 +1,9 @@ package ante import ( + evmtypes "github.com/cerc-io/laconicd/x/evm/types" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - evmtypes "github.com/tharsis/ethermint/x/evm/types" ) // RejectMessagesDecorator prevents invalid msg types from being executed diff --git a/app/ante/sigs_test.go b/app/ante/sigs_test.go index f07d0986..78cf75be 100644 --- a/app/ante/sigs_test.go +++ b/app/ante/sigs_test.go @@ -3,9 +3,9 @@ package ante_test import ( "math/big" - "github.com/tharsis/ethermint/tests" - "github.com/tharsis/ethermint/x/evm/statedb" - evmtypes "github.com/tharsis/ethermint/x/evm/types" + "github.com/cerc-io/laconicd/tests" + "github.com/cerc-io/laconicd/x/evm/statedb" + evmtypes "github.com/cerc-io/laconicd/x/evm/types" ) func (suite AnteTestSuite) TestSignatures() { diff --git a/app/ante/utils_test.go b/app/ante/utils_test.go index a12e41ad..61b3fffb 100644 --- a/app/ante/utils_test.go +++ b/app/ante/utils_test.go @@ -5,13 +5,13 @@ import ( "testing" "time" + "github.com/cerc-io/laconicd/ethereum/eip712" + "github.com/cerc-io/laconicd/types" "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/x/auth/migrations/legacytx" types2 "github.com/cosmos/cosmos-sdk/x/bank/types" types3 "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/ethereum/go-ethereum/crypto" - "github.com/tharsis/ethermint/ethereum/eip712" - "github.com/tharsis/ethermint/types" "github.com/ethereum/go-ethereum/common" ethtypes "github.com/ethereum/go-ethereum/core/types" @@ -30,13 +30,13 @@ import ( authtx "github.com/cosmos/cosmos-sdk/x/auth/tx" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - "github.com/tharsis/ethermint/app" - ante "github.com/tharsis/ethermint/app/ante" - "github.com/tharsis/ethermint/encoding" - "github.com/tharsis/ethermint/tests" - "github.com/tharsis/ethermint/x/evm/statedb" - evmtypes "github.com/tharsis/ethermint/x/evm/types" - feemarkettypes "github.com/tharsis/ethermint/x/feemarket/types" + "github.com/cerc-io/laconicd/app" + ante "github.com/cerc-io/laconicd/app/ante" + "github.com/cerc-io/laconicd/encoding" + "github.com/cerc-io/laconicd/tests" + "github.com/cerc-io/laconicd/x/evm/statedb" + evmtypes "github.com/cerc-io/laconicd/x/evm/types" + feemarkettypes "github.com/cerc-io/laconicd/x/feemarket/types" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" ) diff --git a/app/app.go b/app/app.go index df95b394..8b9815e0 100644 --- a/app/app.go +++ b/app/app.go @@ -11,6 +11,8 @@ import ( "github.com/rakyll/statik/fs" "github.com/spf13/cast" + "github.com/cerc-io/laconicd/app/ante" + evmtypes "github.com/cerc-io/laconicd/x/evm/types" "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/grpc/tmservice" @@ -22,8 +24,6 @@ import ( servertypes "github.com/cosmos/cosmos-sdk/server/types" "github.com/cosmos/cosmos-sdk/simapp" govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" - "github.com/tharsis/ethermint/app/ante" - evmtypes "github.com/tharsis/ethermint/x/evm/types" simappparams "github.com/cosmos/cosmos-sdk/simapp/params" "github.com/cosmos/cosmos-sdk/store/streaming" @@ -102,31 +102,31 @@ import ( ibckeeper "github.com/cosmos/ibc-go/v3/modules/core/keeper" // unnamed import of statik for swagger UI support - _ "github.com/tharsis/ethermint/client/docs/statik" + _ "github.com/cerc-io/laconicd/client/docs/statik" - srvflags "github.com/tharsis/ethermint/server/flags" - ethermint "github.com/tharsis/ethermint/types" - "github.com/tharsis/ethermint/x/evm" + srvflags "github.com/cerc-io/laconicd/server/flags" + ethermint "github.com/cerc-io/laconicd/types" + "github.com/cerc-io/laconicd/x/evm" - // evmrest "github.com/tharsis/ethermint/x/evm/client/rest" - evmkeeper "github.com/tharsis/ethermint/x/evm/keeper" - "github.com/tharsis/ethermint/x/feemarket" - feemarketkeeper "github.com/tharsis/ethermint/x/feemarket/keeper" - feemarkettypes "github.com/tharsis/ethermint/x/feemarket/types" + // evmrest "github.com/cerc-io/laconicd/x/evm/client/rest" + evmkeeper "github.com/cerc-io/laconicd/x/evm/keeper" + "github.com/cerc-io/laconicd/x/feemarket" + feemarketkeeper "github.com/cerc-io/laconicd/x/feemarket/keeper" + feemarkettypes "github.com/cerc-io/laconicd/x/feemarket/types" // Force-load the tracer engines to trigger registration due to Go-Ethereum v1.10.15 changes _ "github.com/ethereum/go-ethereum/eth/tracers/js" _ "github.com/ethereum/go-ethereum/eth/tracers/native" - "github.com/tharsis/ethermint/x/auction" - auctionkeeper "github.com/tharsis/ethermint/x/auction/keeper" - auctiontypes "github.com/tharsis/ethermint/x/auction/types" - "github.com/tharsis/ethermint/x/bond" - bondkeeper "github.com/tharsis/ethermint/x/bond/keeper" - bondtypes "github.com/tharsis/ethermint/x/bond/types" - "github.com/tharsis/ethermint/x/nameservice" - nameservicekeeper "github.com/tharsis/ethermint/x/nameservice/keeper" - nameservicetypes "github.com/tharsis/ethermint/x/nameservice/types" + "github.com/cerc-io/laconicd/x/auction" + auctionkeeper "github.com/cerc-io/laconicd/x/auction/keeper" + auctiontypes "github.com/cerc-io/laconicd/x/auction/types" + "github.com/cerc-io/laconicd/x/bond" + bondkeeper "github.com/cerc-io/laconicd/x/bond/keeper" + bondtypes "github.com/cerc-io/laconicd/x/bond/types" + "github.com/cerc-io/laconicd/x/nameservice" + nameservicekeeper "github.com/cerc-io/laconicd/x/nameservice/keeper" + nameservicetypes "github.com/cerc-io/laconicd/x/nameservice/types" ) func init() { diff --git a/app/app_test.go b/app/app_test.go index 0ceb1f0e..6b54b850 100644 --- a/app/app_test.go +++ b/app/app_test.go @@ -8,7 +8,7 @@ import ( "github.com/tendermint/tendermint/libs/log" - "github.com/tharsis/ethermint/encoding" + "github.com/cerc-io/laconicd/encoding" ) func TestEthermintAppExport(t *testing.T) { diff --git a/app/benchmark_test.go b/app/benchmark_test.go index 5b2bb159..64485381 100644 --- a/app/benchmark_test.go +++ b/app/benchmark_test.go @@ -4,11 +4,11 @@ import ( "encoding/json" "testing" + "github.com/cerc-io/laconicd/encoding" "github.com/cosmos/cosmos-sdk/db/memdb" "github.com/cosmos/cosmos-sdk/simapp" abci "github.com/tendermint/tendermint/abci/types" "github.com/tendermint/tendermint/libs/log" - "github.com/tharsis/ethermint/encoding" ) func BenchmarkEthermintApp_ExportAppStateAndValidators(b *testing.B) { diff --git a/app/simulation_test.go b/app/simulation_test.go index 5dad080f..3b3c2085 100644 --- a/app/simulation_test.go +++ b/app/simulation_test.go @@ -27,6 +27,7 @@ import ( slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" + evmenc "github.com/cerc-io/laconicd/encoding" "github.com/cosmos/cosmos-sdk/db/memdb" storetypes "github.com/cosmos/cosmos-sdk/store/types" ibctransfertypes "github.com/cosmos/ibc-go/v3/modules/apps/transfer/types" @@ -34,7 +35,6 @@ import ( abci "github.com/tendermint/tendermint/abci/types" "github.com/tendermint/tendermint/libs/log" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - evmenc "github.com/tharsis/ethermint/encoding" ) // MakeEncodingConfig creates the EncodingConfig diff --git a/app/test_helpers.go b/app/test_helpers.go index 31312207..efa77240 100644 --- a/app/test_helpers.go +++ b/app/test_helpers.go @@ -15,12 +15,12 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" + "github.com/cerc-io/laconicd/crypto/ethsecp256k1" + "github.com/cerc-io/laconicd/encoding" + ethermint "github.com/cerc-io/laconicd/types" "github.com/cosmos/cosmos-sdk/simapp/params" "github.com/stretchr/testify/require" tmjson "github.com/tendermint/tendermint/libs/json" - "github.com/tharsis/ethermint/crypto/ethsecp256k1" - "github.com/tharsis/ethermint/encoding" - ethermint "github.com/tharsis/ethermint/types" "github.com/cosmos/cosmos-sdk/db/memdb" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" diff --git a/client/config.go b/client/config.go index 6edb08bf..05b5b272 100644 --- a/client/config.go +++ b/client/config.go @@ -12,7 +12,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" - ethermint "github.com/tharsis/ethermint/types" + ethermint "github.com/cerc-io/laconicd/types" ) // InitConfig adds the chain-id, encoding and output flags to the persistent flag set. @@ -26,7 +26,7 @@ func InitConfig(cmd *cobra.Command) error { _, err = os.Stat(configFile) if err != nil && !os.IsNotExist(err) { // Immediately return if the error isn't related to the file not existing. - // See issue https://github.com/tharsis/ethermint/issues/539 + // See issue https://github.com/cerc-io/laconicd/issues/539 return err } if err == nil { diff --git a/client/docs/statik/init.go b/client/docs/statik/init.go index 49c0d09e..8fca19d9 100644 --- a/client/docs/statik/init.go +++ b/client/docs/statik/init.go @@ -1,3 +1,3 @@ package statik -// This just for fixing the error in importing empty github.com/tharsis/ethermint/client/docs/statik +// This just for fixing the error in importing empty github.com/cerc-io/laconicd/client/docs/statik diff --git a/client/export.go b/client/export.go index fc85920e..e606dcc2 100644 --- a/client/export.go +++ b/client/export.go @@ -14,9 +14,9 @@ import ( ethcrypto "github.com/ethereum/go-ethereum/crypto" "github.com/spf13/cobra" + "github.com/cerc-io/laconicd/crypto/ethsecp256k1" + "github.com/cerc-io/laconicd/crypto/hd" "github.com/cosmos/cosmos-sdk/crypto/keyring" - "github.com/tharsis/ethermint/crypto/ethsecp256k1" - "github.com/tharsis/ethermint/crypto/hd" ) // UnsafeExportEthKeyCommand exports a key with the given name as a private key in hex format. diff --git a/client/import.go b/client/import.go index 3dbaa3a3..1bd83da6 100644 --- a/client/import.go +++ b/client/import.go @@ -5,6 +5,7 @@ import ( "github.com/spf13/cobra" + "github.com/cerc-io/laconicd/crypto/ethsecp256k1" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/input" @@ -12,9 +13,8 @@ import ( "github.com/cosmos/cosmos-sdk/crypto/keyring" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/common" - "github.com/tharsis/ethermint/crypto/ethsecp256k1" - "github.com/tharsis/ethermint/crypto/hd" + "github.com/cerc-io/laconicd/crypto/hd" ) // UnsafeImportKeyCommand imports private keys from a keyfile. diff --git a/client/keys.go b/client/keys.go index 929cd2e2..9416a689 100644 --- a/client/keys.go +++ b/client/keys.go @@ -10,9 +10,9 @@ import ( "github.com/spf13/cobra" "github.com/tendermint/tendermint/libs/cli" + clientkeys "github.com/cerc-io/laconicd/client/keys" + "github.com/cerc-io/laconicd/crypto/hd" "github.com/cosmos/cosmos-sdk/crypto/keyring" - clientkeys "github.com/tharsis/ethermint/client/keys" - "github.com/tharsis/ethermint/crypto/hd" ) // KeyCommands registers a sub-tree of commands to interact with diff --git a/client/keys/add.go b/client/keys/add.go index 910977ab..88f2f3f4 100644 --- a/client/keys/add.go +++ b/client/keys/add.go @@ -7,7 +7,7 @@ import ( "fmt" "sort" - etherminthd "github.com/tharsis/ethermint/crypto/hd" + etherminthd "github.com/cerc-io/laconicd/crypto/hd" bip39 "github.com/cosmos/go-bip39" "github.com/spf13/cobra" diff --git a/client/testnet.go b/client/testnet.go index 50172d2e..f593df75 100644 --- a/client/testnet.go +++ b/client/testnet.go @@ -40,13 +40,13 @@ import ( mintypes "github.com/cosmos/cosmos-sdk/x/mint/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/tharsis/ethermint/crypto/hd" - "github.com/tharsis/ethermint/server/config" - srvflags "github.com/tharsis/ethermint/server/flags" - ethermint "github.com/tharsis/ethermint/types" - evmtypes "github.com/tharsis/ethermint/x/evm/types" + "github.com/cerc-io/laconicd/crypto/hd" + "github.com/cerc-io/laconicd/server/config" + srvflags "github.com/cerc-io/laconicd/server/flags" + ethermint "github.com/cerc-io/laconicd/types" + evmtypes "github.com/cerc-io/laconicd/x/evm/types" - "github.com/tharsis/ethermint/testutil/network" + "github.com/cerc-io/laconicd/testutil/network" ) var ( diff --git a/cmd/chibaclonkd/cmd_test.go b/cmd/chibaclonkd/cmd_test.go index 6a342519..49a2f6cf 100644 --- a/cmd/chibaclonkd/cmd_test.go +++ b/cmd/chibaclonkd/cmd_test.go @@ -10,8 +10,8 @@ import ( svrcmd "github.com/cosmos/cosmos-sdk/server/cmd" "github.com/cosmos/cosmos-sdk/x/genutil/client/cli" - "github.com/tharsis/ethermint/app" - chibaclonkd "github.com/tharsis/ethermint/cmd/chibaclonkd" + "github.com/cerc-io/laconicd/app" + chibaclonkd "github.com/cerc-io/laconicd/cmd/chibaclonkd" ) func TestInitCmd(t *testing.T) { diff --git a/cmd/chibaclonkd/flags.go b/cmd/chibaclonkd/flags.go index 098bc063..660fea8b 100644 --- a/cmd/chibaclonkd/flags.go +++ b/cmd/chibaclonkd/flags.go @@ -5,7 +5,7 @@ import ( "github.com/spf13/cobra" - "github.com/tharsis/ethermint/version" + "github.com/cerc-io/laconicd/version" ) const ( diff --git a/cmd/chibaclonkd/genaccounts.go b/cmd/chibaclonkd/genaccounts.go index fdf358d8..cfb34be9 100644 --- a/cmd/chibaclonkd/genaccounts.go +++ b/cmd/chibaclonkd/genaccounts.go @@ -20,9 +20,9 @@ import ( "github.com/cosmos/cosmos-sdk/x/genutil" genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types" - "github.com/tharsis/ethermint/crypto/hd" - ethermint "github.com/tharsis/ethermint/types" - evmtypes "github.com/tharsis/ethermint/x/evm/types" + "github.com/cerc-io/laconicd/crypto/hd" + ethermint "github.com/cerc-io/laconicd/types" + evmtypes "github.com/cerc-io/laconicd/x/evm/types" ) const ( diff --git a/cmd/chibaclonkd/main.go b/cmd/chibaclonkd/main.go index f888a0cd..20bd51e5 100644 --- a/cmd/chibaclonkd/main.go +++ b/cmd/chibaclonkd/main.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/server" svrcmd "github.com/cosmos/cosmos-sdk/server/cmd" - "github.com/tharsis/ethermint/app" + "github.com/cerc-io/laconicd/app" ) func main() { diff --git a/cmd/chibaclonkd/root.go b/cmd/chibaclonkd/root.go index 003b60d5..8428ced8 100644 --- a/cmd/chibaclonkd/root.go +++ b/cmd/chibaclonkd/root.go @@ -31,15 +31,15 @@ import ( tmcli "github.com/tendermint/tendermint/libs/cli" tmlog "github.com/tendermint/tendermint/libs/log" - "github.com/tharsis/ethermint/app" - ethermintclient "github.com/tharsis/ethermint/client" - "github.com/tharsis/ethermint/client/debug" - "github.com/tharsis/ethermint/crypto/hd" - "github.com/tharsis/ethermint/encoding" - "github.com/tharsis/ethermint/server" - servercfg "github.com/tharsis/ethermint/server/config" - srvflags "github.com/tharsis/ethermint/server/flags" - ethermint "github.com/tharsis/ethermint/types" + "github.com/cerc-io/laconicd/app" + ethermintclient "github.com/cerc-io/laconicd/client" + "github.com/cerc-io/laconicd/client/debug" + "github.com/cerc-io/laconicd/crypto/hd" + "github.com/cerc-io/laconicd/encoding" + "github.com/cerc-io/laconicd/server" + servercfg "github.com/cerc-io/laconicd/server/config" + srvflags "github.com/cerc-io/laconicd/server/flags" + ethermint "github.com/cerc-io/laconicd/types" ) const EnvPrefix = "CHIBACLONK" diff --git a/cmd/config/config.go b/cmd/config/config.go index b2d3dc01..c199da37 100644 --- a/cmd/config/config.go +++ b/cmd/config/config.go @@ -3,7 +3,7 @@ package config import ( sdk "github.com/cosmos/cosmos-sdk/types" - ethermint "github.com/tharsis/ethermint/types" + ethermint "github.com/cerc-io/laconicd/types" ) const ( diff --git a/cmd/config/config_test.go b/cmd/config/config_test.go index 187031a2..f82d769c 100644 --- a/cmd/config/config_test.go +++ b/cmd/config/config_test.go @@ -3,8 +3,8 @@ package config import ( "testing" + ethermint "github.com/cerc-io/laconicd/types" "github.com/stretchr/testify/require" - ethermint "github.com/tharsis/ethermint/types" "github.com/cosmos/cosmos-sdk/crypto/hd" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/crypto/codec/amino.go b/crypto/codec/amino.go index 06a83397..e13a9bba 100644 --- a/crypto/codec/amino.go +++ b/crypto/codec/amino.go @@ -7,7 +7,7 @@ import ( cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec" "github.com/cosmos/cosmos-sdk/crypto/keyring" - "github.com/tharsis/ethermint/crypto/ethsecp256k1" + "github.com/cerc-io/laconicd/crypto/ethsecp256k1" ) // RegisterCrypto registers all crypto dependency types with the provided Amino diff --git a/crypto/codec/codec.go b/crypto/codec/codec.go index 9731d91a..ca0acbba 100644 --- a/crypto/codec/codec.go +++ b/crypto/codec/codec.go @@ -4,7 +4,7 @@ import ( codectypes "github.com/cosmos/cosmos-sdk/codec/types" cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" - "github.com/tharsis/ethermint/crypto/ethsecp256k1" + "github.com/cerc-io/laconicd/crypto/ethsecp256k1" ) // RegisterInterfaces register the Ethermint key concrete types. diff --git a/crypto/hd/algorithm.go b/crypto/hd/algorithm.go index 53b92a0c..cea54163 100644 --- a/crypto/hd/algorithm.go +++ b/crypto/hd/algorithm.go @@ -12,7 +12,7 @@ import ( "github.com/cosmos/cosmos-sdk/crypto/keyring" cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" - "github.com/tharsis/ethermint/crypto/ethsecp256k1" + "github.com/cerc-io/laconicd/crypto/ethsecp256k1" ) const ( diff --git a/crypto/hd/algorithm_test.go b/crypto/hd/algorithm_test.go index 98b93697..aefd3598 100644 --- a/crypto/hd/algorithm_test.go +++ b/crypto/hd/algorithm_test.go @@ -11,10 +11,10 @@ import ( hdwallet "github.com/miguelmota/go-ethereum-hdwallet" + cryptocodec "github.com/cerc-io/laconicd/crypto/codec" + ethermint "github.com/cerc-io/laconicd/types" "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/crypto/keyring" - cryptocodec "github.com/tharsis/ethermint/crypto/codec" - ethermint "github.com/tharsis/ethermint/types" ) var protoCodec codec.Codec diff --git a/crypto/hd/benchmark_test.go b/crypto/hd/benchmark_test.go index 0ad376ce..f8f7dd6d 100644 --- a/crypto/hd/benchmark_test.go +++ b/crypto/hd/benchmark_test.go @@ -3,8 +3,8 @@ package hd import ( "testing" + ethermint "github.com/cerc-io/laconicd/types" "github.com/cosmos/cosmos-sdk/crypto/keyring" - ethermint "github.com/tharsis/ethermint/types" ) func BenchmarkEthSecp256k1Algo_Derive(b *testing.B) { diff --git a/encoding/codec/codec.go b/encoding/codec/codec.go index 6a6a9bdd..bab7e268 100644 --- a/encoding/codec/codec.go +++ b/encoding/codec/codec.go @@ -5,8 +5,8 @@ import ( codectypes "github.com/cosmos/cosmos-sdk/codec/types" "github.com/cosmos/cosmos-sdk/std" - cryptocodec "github.com/tharsis/ethermint/crypto/codec" - ethermint "github.com/tharsis/ethermint/types" + cryptocodec "github.com/cerc-io/laconicd/crypto/codec" + ethermint "github.com/cerc-io/laconicd/types" ) // RegisterLegacyAminoCodec registers Interfaces from types, crypto, and SDK std. diff --git a/encoding/config.go b/encoding/config.go index 56a12811..390350a3 100644 --- a/encoding/config.go +++ b/encoding/config.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" "github.com/cosmos/cosmos-sdk/x/auth/tx" - enccodec "github.com/tharsis/ethermint/encoding/codec" + enccodec "github.com/cerc-io/laconicd/encoding/codec" ) // MakeConfig creates an EncodingConfig for testing diff --git a/encoding/config_test.go b/encoding/config_test.go index bcd086cc..132d1e6a 100644 --- a/encoding/config_test.go +++ b/encoding/config_test.go @@ -8,10 +8,10 @@ import ( ethtypes "github.com/ethereum/go-ethereum/core/types" - "github.com/tharsis/ethermint/app" - "github.com/tharsis/ethermint/encoding" - "github.com/tharsis/ethermint/tests" - evmtypes "github.com/tharsis/ethermint/x/evm/types" + "github.com/cerc-io/laconicd/app" + "github.com/cerc-io/laconicd/encoding" + "github.com/cerc-io/laconicd/tests" + evmtypes "github.com/cerc-io/laconicd/x/evm/types" ) func TestTxEncoding(t *testing.T) { diff --git a/go.mod b/go.mod index dbeb371c..f53cc5b5 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/tharsis/ethermint +module github.com/cerc-io/laconicd go 1.17 @@ -209,8 +209,8 @@ replace ( github.com/99designs/keyring => github.com/cosmos/keyring v1.1.7-0.20210622111912-ef00f8ac3d76 // replace cosmos - github.com/cosmos/cosmos-sdk => github.com/vulcanize/cosmos-sdk v0.46.0-smt-0.0.5-alpha - github.com/cosmos/cosmos-sdk/db => github.com/vulcanize/cosmos-sdk/db v1.0.0-beta.1 + github.com/cosmos/cosmos-sdk => github.com/cerc-io/cosmos-sdk v0.46.0-smt-0.0.5-alpha + github.com/cosmos/cosmos-sdk/db => github.com/cerc-io/cosmos-sdk/db v1.0.0-beta.1 github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 google.golang.org/grpc => google.golang.org/grpc v1.44.0 ) diff --git a/go.sum b/go.sum index 492c0d72..2b408f31 100644 --- a/go.sum +++ b/go.sum @@ -269,6 +269,10 @@ github.com/cenkalti/backoff/v4 v4.1.1 h1:G2HAfAmvm/GcKan2oOQpBXOd2tT2G57ZnZGWa1P github.com/cenkalti/backoff/v4 v4.1.1/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/cerc-io/cosmos-sdk v0.46.0-smt-0.0.5-alpha h1:rfMUv+8w1fEky66eseXEUhXo8qaIyjI9/6WsIZftujM= +github.com/cerc-io/cosmos-sdk v0.46.0-smt-0.0.5-alpha/go.mod h1:n6VE/k+jRjm0Ij0c6pirmxPcOcdT3RLyR3oW1UoY0rg= +github.com/cerc-io/cosmos-sdk/db v1.0.0-beta.1 h1:6Se3pPCkXu+rQe8CX3LCkf2XptaNirk2BC+kh+/nT/Q= +github.com/cerc-io/cosmos-sdk/db v1.0.0-beta.1/go.mod h1:n79xAGrkFZLzudBwLIgQCa62PTHx9mCymwC+lSvoR2s= github.com/cespare/cp v0.1.0 h1:SE+dxFebS7Iik5LK0tsi1k9ZCxEaFX4AjQmoyA+1dJk= github.com/cespare/cp v0.1.0/go.mod h1:SOGHArjBr4JWaSDEVpWpo/hNg6RoKrls6Oh40hiwW+s= github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= @@ -1529,10 +1533,6 @@ github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYp github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU= github.com/vmihailenco/msgpack/v5 v5.3.5/go.mod h1:7xyJ9e+0+9SaZT0Wt1RGleJXzli6Q/V5KbhBonMG9jc= github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds= -github.com/vulcanize/cosmos-sdk v0.46.0-smt-0.0.5-alpha h1:ffjYJoKmXel0TREjVV+uAXnV92EV1M0MCRv+bqQ6FR8= -github.com/vulcanize/cosmos-sdk v0.46.0-smt-0.0.5-alpha/go.mod h1:n6VE/k+jRjm0Ij0c6pirmxPcOcdT3RLyR3oW1UoY0rg= -github.com/vulcanize/cosmos-sdk/db v1.0.0-beta.1 h1:fLVdRk/JEWN5SGdOERhjHWU/zq3Efxeofu3VmJsrk90= -github.com/vulcanize/cosmos-sdk/db v1.0.0-beta.1/go.mod h1:n79xAGrkFZLzudBwLIgQCa62PTHx9mCymwC+lSvoR2s= github.com/warpfork/go-testmark v0.3.0/go.mod h1:jhEf8FVxd+F17juRubpmut64NEG6I2rgkUhlcqqXwE0= github.com/warpfork/go-wish v0.0.0-20180510122957-5ad1f5abf436/go.mod h1:x6AKhvSSexNrVSrViXSHUEbICjmGXhtgABaHIySUSGw= github.com/warpfork/go-wish v0.0.0-20200122115046-b9ea61034e4a h1:G++j5e0OC488te356JvdhaM8YS6nMsjLAYF7JxCv07w= diff --git a/gql/resolver.go b/gql/resolver.go index 7b02db5d..1ea452aa 100644 --- a/gql/resolver.go +++ b/gql/resolver.go @@ -5,12 +5,12 @@ import ( "encoding/base64" "strconv" + auctiontypes "github.com/cerc-io/laconicd/x/auction/types" + bondtypes "github.com/cerc-io/laconicd/x/bond/types" + nstypes "github.com/cerc-io/laconicd/x/nameservice/types" "github.com/cosmos/cosmos-sdk/client" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - auctiontypes "github.com/tharsis/ethermint/x/auction/types" - bondtypes "github.com/tharsis/ethermint/x/bond/types" - nstypes "github.com/tharsis/ethermint/x/nameservice/types" ) // DefaultLogNumLines is the number of log lines to tail by default. diff --git a/gql/util.go b/gql/util.go index 7af2aa0e..034d1696 100644 --- a/gql/util.go +++ b/gql/util.go @@ -6,10 +6,10 @@ import ( "reflect" "strconv" + auctiontypes "github.com/cerc-io/laconicd/x/auction/types" + bondtypes "github.com/cerc-io/laconicd/x/bond/types" + nstypes "github.com/cerc-io/laconicd/x/nameservice/types" sdk "github.com/cosmos/cosmos-sdk/types" - auctiontypes "github.com/tharsis/ethermint/x/auction/types" - bondtypes "github.com/tharsis/ethermint/x/bond/types" - nstypes "github.com/tharsis/ethermint/x/nameservice/types" ) // OwnerAttributeName denotes the owner attribute name for a bond. diff --git a/proto/ethermint/crypto/v1/ethsecp256k1/keys.proto b/proto/ethermint/crypto/v1/ethsecp256k1/keys.proto index 788382ab..4da3478c 100644 --- a/proto/ethermint/crypto/v1/ethsecp256k1/keys.proto +++ b/proto/ethermint/crypto/v1/ethsecp256k1/keys.proto @@ -3,7 +3,7 @@ package ethermint.crypto.v1.ethsecp256k1; import "gogoproto/gogo.proto"; -option go_package = "github.com/tharsis/ethermint/crypto/ethsecp256k1"; +option go_package = "github.com/cerc-io/laconicd/crypto/ethsecp256k1"; // PubKey defines a type alias for an ecdsa.PublicKey that implements // Tendermint's PubKey interface. It represents the 33-byte compressed public diff --git a/proto/ethermint/evm/v1/evm.proto b/proto/ethermint/evm/v1/evm.proto index 406276a2..40826eeb 100644 --- a/proto/ethermint/evm/v1/evm.proto +++ b/proto/ethermint/evm/v1/evm.proto @@ -3,7 +3,7 @@ package ethermint.evm.v1; import "gogoproto/gogo.proto"; -option go_package = "github.com/tharsis/ethermint/x/evm/types"; +option go_package = "github.com/cerc-io/laconicd/x/evm/types"; // Params defines the EVM module parameters message Params { diff --git a/proto/ethermint/evm/v1/genesis.proto b/proto/ethermint/evm/v1/genesis.proto index 65d27321..92d18a50 100644 --- a/proto/ethermint/evm/v1/genesis.proto +++ b/proto/ethermint/evm/v1/genesis.proto @@ -4,7 +4,7 @@ package ethermint.evm.v1; import "gogoproto/gogo.proto"; import "ethermint/evm/v1/evm.proto"; -option go_package = "github.com/tharsis/ethermint/x/evm/types"; +option go_package = "github.com/cerc-io/laconicd/x/evm/types"; // GenesisState defines the evm module's genesis state. message GenesisState { diff --git a/proto/ethermint/evm/v1/query.proto b/proto/ethermint/evm/v1/query.proto index 11a1be2f..4db7a234 100644 --- a/proto/ethermint/evm/v1/query.proto +++ b/proto/ethermint/evm/v1/query.proto @@ -8,7 +8,7 @@ import "ethermint/evm/v1/evm.proto"; import "ethermint/evm/v1/tx.proto"; import "google/protobuf/timestamp.proto"; -option go_package = "github.com/tharsis/ethermint/x/evm/types"; +option go_package = "github.com/cerc-io/laconicd/x/evm/types"; // Query defines the gRPC querier service. service Query { diff --git a/proto/ethermint/evm/v1/tx.proto b/proto/ethermint/evm/v1/tx.proto index 1a239689..e608da74 100644 --- a/proto/ethermint/evm/v1/tx.proto +++ b/proto/ethermint/evm/v1/tx.proto @@ -7,7 +7,7 @@ import "google/protobuf/any.proto"; import "cosmos_proto/cosmos.proto"; import "ethermint/evm/v1/evm.proto"; -option go_package = "github.com/tharsis/ethermint/x/evm/types"; +option go_package = "github.com/cerc-io/laconicd/x/evm/types"; // Msg defines the evm Msg service. service Msg { diff --git a/proto/ethermint/feemarket/v1/feemarket.proto b/proto/ethermint/feemarket/v1/feemarket.proto index 1aab31e2..9c57949e 100644 --- a/proto/ethermint/feemarket/v1/feemarket.proto +++ b/proto/ethermint/feemarket/v1/feemarket.proto @@ -3,7 +3,7 @@ package ethermint.feemarket.v1; import "gogoproto/gogo.proto"; -option go_package = "github.com/tharsis/ethermint/x/feemarket/types"; +option go_package = "github.com/cerc-io/laconicd/x/feemarket/types"; // Params defines the EVM module parameters message Params { diff --git a/proto/ethermint/feemarket/v1/genesis.proto b/proto/ethermint/feemarket/v1/genesis.proto index 362d8c44..9a2a10a8 100644 --- a/proto/ethermint/feemarket/v1/genesis.proto +++ b/proto/ethermint/feemarket/v1/genesis.proto @@ -4,7 +4,7 @@ package ethermint.feemarket.v1; import "gogoproto/gogo.proto"; import "ethermint/feemarket/v1/feemarket.proto"; -option go_package = "github.com/tharsis/ethermint/x/feemarket/types"; +option go_package = "github.com/cerc-io/laconicd/x/feemarket/types"; // GenesisState defines the feemarket module's genesis state. message GenesisState { diff --git a/proto/ethermint/feemarket/v1/query.proto b/proto/ethermint/feemarket/v1/query.proto index f8f8c7a7..e8b9582a 100644 --- a/proto/ethermint/feemarket/v1/query.proto +++ b/proto/ethermint/feemarket/v1/query.proto @@ -6,7 +6,7 @@ import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; import "ethermint/feemarket/v1/feemarket.proto"; -option go_package = "github.com/tharsis/ethermint/x/feemarket/types"; +option go_package = "github.com/cerc-io/laconicd/x/feemarket/types"; // Query defines the gRPC querier service. service Query { diff --git a/proto/ethermint/types/v1/account.proto b/proto/ethermint/types/v1/account.proto index 6beffb27..a7aa91e2 100644 --- a/proto/ethermint/types/v1/account.proto +++ b/proto/ethermint/types/v1/account.proto @@ -5,7 +5,7 @@ import "cosmos/auth/v1beta1/auth.proto"; import "cosmos_proto/cosmos.proto"; import "gogoproto/gogo.proto"; -option go_package = "github.com/tharsis/ethermint/types"; +option go_package = "github.com/cerc-io/laconicd/types"; // EthAccount implements the authtypes.AccountI interface and embeds an // authtypes.BaseAccount type. It is compatible with the auth AccountKeeper. diff --git a/proto/ethermint/types/v1/web3.proto b/proto/ethermint/types/v1/web3.proto index 7bcab06d..028c289e 100644 --- a/proto/ethermint/types/v1/web3.proto +++ b/proto/ethermint/types/v1/web3.proto @@ -3,7 +3,7 @@ package ethermint.types.v1; import "gogoproto/gogo.proto"; -option go_package = "github.com/tharsis/ethermint/types"; +option go_package = "github.com/cerc-io/laconicd/types"; message ExtensionOptionsWeb3Tx { option (gogoproto.goproto_getters) = false; diff --git a/proto/vulcanize/auction/v1beta1/genesis.proto b/proto/vulcanize/auction/v1beta1/genesis.proto index 9a50e3f3..baff60a9 100644 --- a/proto/vulcanize/auction/v1beta1/genesis.proto +++ b/proto/vulcanize/auction/v1beta1/genesis.proto @@ -4,7 +4,7 @@ package vulcanize.auction.v1beta1; import "gogoproto/gogo.proto"; import "vulcanize/auction/v1beta1/types.proto"; -option go_package = "github.com/tharsis/ethermint/x/auction/types"; +option go_package = "github.com/cerc-io/laconicd/x/auction/types"; // GenesisState defines the genesis state of the auction module message GenesisState { diff --git a/proto/vulcanize/auction/v1beta1/query.proto b/proto/vulcanize/auction/v1beta1/query.proto index 6ef39d2b..3930f1e9 100644 --- a/proto/vulcanize/auction/v1beta1/query.proto +++ b/proto/vulcanize/auction/v1beta1/query.proto @@ -7,7 +7,7 @@ import "cosmos/base/query/v1beta1/pagination.proto"; import "cosmos/base/v1beta1/coin.proto"; import "vulcanize/auction/v1beta1/types.proto"; -option go_package = "github.com/tharsis/ethermint/x/auction/types"; +option go_package = "github.com/cerc-io/laconicd/x/auction/types"; // AuctionsRequest is the format for querying all the auctions message AuctionsRequest { diff --git a/proto/vulcanize/auction/v1beta1/tx.proto b/proto/vulcanize/auction/v1beta1/tx.proto index 9602dece..9cdc07ef 100644 --- a/proto/vulcanize/auction/v1beta1/tx.proto +++ b/proto/vulcanize/auction/v1beta1/tx.proto @@ -6,7 +6,7 @@ import "google/protobuf/duration.proto"; import "cosmos/base/v1beta1/coin.proto"; import "vulcanize/auction/v1beta1/types.proto"; -option go_package = "github.com/tharsis/ethermint/x/auction/types"; +option go_package = "github.com/cerc-io/laconicd/x/auction/types"; // MsgCreateAuction defines a create auction message message MsgCreateAuction { diff --git a/proto/vulcanize/auction/v1beta1/types.proto b/proto/vulcanize/auction/v1beta1/types.proto index 4ec5462f..8b8d5601 100644 --- a/proto/vulcanize/auction/v1beta1/types.proto +++ b/proto/vulcanize/auction/v1beta1/types.proto @@ -6,7 +6,7 @@ import "google/protobuf/duration.proto"; import "google/protobuf/timestamp.proto"; import "cosmos/base/v1beta1/coin.proto"; -option go_package = "github.com/tharsis/ethermint/x/auction/types"; +option go_package = "github.com/cerc-io/laconicd/x/auction/types"; // Params defines the auction module parameters message Params { diff --git a/proto/vulcanize/bond/v1beta1/bond.proto b/proto/vulcanize/bond/v1beta1/bond.proto index c5b32141..ff5ac00a 100644 --- a/proto/vulcanize/bond/v1beta1/bond.proto +++ b/proto/vulcanize/bond/v1beta1/bond.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package vulcanize.bond.v1beta1; -option go_package = "github.com/tharsis/ethermint/x/bond/types"; +option go_package = "github.com/cerc-io/laconicd/x/bond/types"; import "gogoproto/gogo.proto"; import "cosmos/base/v1beta1/coin.proto"; diff --git a/proto/vulcanize/bond/v1beta1/genesis.proto b/proto/vulcanize/bond/v1beta1/genesis.proto index 7f46f061..44c54c19 100644 --- a/proto/vulcanize/bond/v1beta1/genesis.proto +++ b/proto/vulcanize/bond/v1beta1/genesis.proto @@ -4,7 +4,7 @@ package vulcanize.bond.v1beta1; import "gogoproto/gogo.proto"; import "vulcanize/bond/v1beta1/bond.proto"; -option go_package = "github.com/tharsis/ethermint/x/bond/types"; +option go_package = "github.com/cerc-io/laconicd/x/bond/types"; // GenesisState defines the bond module's genesis state. message GenesisState { diff --git a/proto/vulcanize/bond/v1beta1/query.proto b/proto/vulcanize/bond/v1beta1/query.proto index 866c3c09..20ada95b 100644 --- a/proto/vulcanize/bond/v1beta1/query.proto +++ b/proto/vulcanize/bond/v1beta1/query.proto @@ -7,7 +7,7 @@ import "google/api/annotations.proto"; import "cosmos/base/query/v1beta1/pagination.proto"; import "cosmos/base/v1beta1/coin.proto"; -option go_package = "github.com/tharsis/ethermint/x/bond/types"; +option go_package = "github.com/cerc-io/laconicd/x/bond/types"; // Query defines the gRPC querier service for bond module service Query { diff --git a/proto/vulcanize/bond/v1beta1/tx.proto b/proto/vulcanize/bond/v1beta1/tx.proto index 16cfe8e8..52d67496 100644 --- a/proto/vulcanize/bond/v1beta1/tx.proto +++ b/proto/vulcanize/bond/v1beta1/tx.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package vulcanize.bond.v1beta1; -option go_package = "github.com/tharsis/ethermint/x/bond/types"; +option go_package = "github.com/cerc-io/laconicd/x/bond/types"; import "gogoproto/gogo.proto"; import "cosmos/base/v1beta1/coin.proto"; diff --git a/proto/vulcanize/nameservice/v1beta1/genesis.proto b/proto/vulcanize/nameservice/v1beta1/genesis.proto index 8d71c3ec..9f2f619d 100644 --- a/proto/vulcanize/nameservice/v1beta1/genesis.proto +++ b/proto/vulcanize/nameservice/v1beta1/genesis.proto @@ -4,7 +4,7 @@ package vulcanize.nameservice.v1beta1; import "gogoproto/gogo.proto"; import "vulcanize/nameservice/v1beta1/nameservice.proto"; -option go_package = "github.com/tharsis/ethermint/x/nameservice/types"; +option go_package = "github.com/cerc-io/laconicd/x/nameservice/types"; // GenesisState defines the nameservice module's genesis state. message GenesisState { diff --git a/proto/vulcanize/nameservice/v1beta1/nameservice.proto b/proto/vulcanize/nameservice/v1beta1/nameservice.proto index 860dd91c..4816d73b 100644 --- a/proto/vulcanize/nameservice/v1beta1/nameservice.proto +++ b/proto/vulcanize/nameservice/v1beta1/nameservice.proto @@ -6,7 +6,7 @@ import "google/protobuf/timestamp.proto"; import "gogoproto/gogo.proto"; import "cosmos/base/v1beta1/coin.proto"; -option go_package = "github.com/tharsis/ethermint/x/nameservice/types"; +option go_package = "github.com/cerc-io/laconicd/x/nameservice/types"; // Params defines the nameservice module parameters message Params { diff --git a/proto/vulcanize/nameservice/v1beta1/query.proto b/proto/vulcanize/nameservice/v1beta1/query.proto index c6dd8e08..3e393bf6 100644 --- a/proto/vulcanize/nameservice/v1beta1/query.proto +++ b/proto/vulcanize/nameservice/v1beta1/query.proto @@ -7,7 +7,7 @@ import "cosmos/base/query/v1beta1/pagination.proto"; import "gogoproto/gogo.proto"; import "cosmos/base/v1beta1/coin.proto"; -option go_package = "github.com/tharsis/ethermint/x/nameservice/types"; +option go_package = "github.com/cerc-io/laconicd/x/nameservice/types"; // Query defines the gRPC querier service for nameservice module service Query { diff --git a/proto/vulcanize/nameservice/v1beta1/tx.proto b/proto/vulcanize/nameservice/v1beta1/tx.proto index f66d3a11..4dd7be96 100644 --- a/proto/vulcanize/nameservice/v1beta1/tx.proto +++ b/proto/vulcanize/nameservice/v1beta1/tx.proto @@ -4,7 +4,7 @@ package vulcanize.nameservice.v1beta1; import "gogoproto/gogo.proto"; import "vulcanize/nameservice/v1beta1/nameservice.proto"; -option go_package = "github.com/tharsis/ethermint/x/nameservice/types"; +option go_package = "github.com/cerc-io/laconicd/x/nameservice/types"; // Msg service Msg { diff --git a/rpc/apis.go b/rpc/apis.go index 78f78a44..c4077efc 100644 --- a/rpc/apis.go +++ b/rpc/apis.go @@ -10,16 +10,16 @@ import ( "github.com/ethereum/go-ethereum/rpc" - "github.com/tharsis/ethermint/rpc/ethereum/backend" - "github.com/tharsis/ethermint/rpc/ethereum/namespaces/debug" - "github.com/tharsis/ethermint/rpc/ethereum/namespaces/eth" - "github.com/tharsis/ethermint/rpc/ethereum/namespaces/eth/filters" - "github.com/tharsis/ethermint/rpc/ethereum/namespaces/miner" - "github.com/tharsis/ethermint/rpc/ethereum/namespaces/net" - "github.com/tharsis/ethermint/rpc/ethereum/namespaces/personal" - "github.com/tharsis/ethermint/rpc/ethereum/namespaces/txpool" - "github.com/tharsis/ethermint/rpc/ethereum/namespaces/web3" - "github.com/tharsis/ethermint/rpc/ethereum/types" + "github.com/cerc-io/laconicd/rpc/ethereum/backend" + "github.com/cerc-io/laconicd/rpc/ethereum/namespaces/debug" + "github.com/cerc-io/laconicd/rpc/ethereum/namespaces/eth" + "github.com/cerc-io/laconicd/rpc/ethereum/namespaces/eth/filters" + "github.com/cerc-io/laconicd/rpc/ethereum/namespaces/miner" + "github.com/cerc-io/laconicd/rpc/ethereum/namespaces/net" + "github.com/cerc-io/laconicd/rpc/ethereum/namespaces/personal" + "github.com/cerc-io/laconicd/rpc/ethereum/namespaces/txpool" + "github.com/cerc-io/laconicd/rpc/ethereum/namespaces/web3" + "github.com/cerc-io/laconicd/rpc/ethereum/types" rpcclient "github.com/tendermint/tendermint/rpc/jsonrpc/client" ) diff --git a/rpc/ethereum/backend/backend.go b/rpc/ethereum/backend/backend.go index cf7a2ad6..f7e80afa 100644 --- a/rpc/ethereum/backend/backend.go +++ b/rpc/ethereum/backend/backend.go @@ -31,11 +31,11 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" ethtypes "github.com/ethereum/go-ethereum/core/types" - "github.com/tharsis/ethermint/rpc/ethereum/types" - "github.com/tharsis/ethermint/server/config" - ethermint "github.com/tharsis/ethermint/types" - evmtypes "github.com/tharsis/ethermint/x/evm/types" - feemarkettypes "github.com/tharsis/ethermint/x/feemarket/types" + "github.com/cerc-io/laconicd/rpc/ethereum/types" + "github.com/cerc-io/laconicd/server/config" + ethermint "github.com/cerc-io/laconicd/types" + evmtypes "github.com/cerc-io/laconicd/x/evm/types" + feemarkettypes "github.com/cerc-io/laconicd/x/feemarket/types" ) // Backend implements the functionality shared within namespaces. diff --git a/rpc/ethereum/backend/feebackend.go b/rpc/ethereum/backend/feebackend.go index 9a553e7c..3368613e 100644 --- a/rpc/ethereum/backend/feebackend.go +++ b/rpc/ethereum/backend/feebackend.go @@ -5,11 +5,11 @@ import ( "math/big" "sort" + rpctypes "github.com/cerc-io/laconicd/rpc/ethereum/types" + evmtypes "github.com/cerc-io/laconicd/x/evm/types" "github.com/ethereum/go-ethereum/common/hexutil" "github.com/ethereum/go-ethereum/rpc" tmrpctypes "github.com/tendermint/tendermint/rpc/coretypes" - rpctypes "github.com/tharsis/ethermint/rpc/ethereum/types" - evmtypes "github.com/tharsis/ethermint/x/evm/types" ) type ( diff --git a/rpc/ethereum/backend/utils.go b/rpc/ethereum/backend/utils.go index 440ae673..ab5448bc 100644 --- a/rpc/ethereum/backend/utils.go +++ b/rpc/ethereum/backend/utils.go @@ -14,9 +14,9 @@ import ( abci "github.com/tendermint/tendermint/abci/types" "github.com/tendermint/tendermint/libs/log" + "github.com/cerc-io/laconicd/rpc/ethereum/types" + evmtypes "github.com/cerc-io/laconicd/x/evm/types" "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/tharsis/ethermint/rpc/ethereum/types" - evmtypes "github.com/tharsis/ethermint/x/evm/types" ) // SetTxDefaults populates tx message with default values in case they are not diff --git a/rpc/ethereum/namespaces/debug/api.go b/rpc/ethereum/namespaces/debug/api.go index 3b667196..698b804d 100644 --- a/rpc/ethereum/namespaces/debug/api.go +++ b/rpc/ethereum/namespaces/debug/api.go @@ -16,20 +16,20 @@ import ( "github.com/davecgh/go-spew/spew" tmrpctypes "github.com/tendermint/tendermint/rpc/coretypes" - evmtypes "github.com/tharsis/ethermint/x/evm/types" + evmtypes "github.com/cerc-io/laconicd/x/evm/types" "github.com/cosmos/cosmos-sdk/client" stderrors "github.com/pkg/errors" "github.com/cosmos/cosmos-sdk/server" + "github.com/cerc-io/laconicd/rpc/ethereum/backend" + rpctypes "github.com/cerc-io/laconicd/rpc/ethereum/types" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" "github.com/ethereum/go-ethereum/consensus/ethash" "github.com/ethereum/go-ethereum/rlp" "github.com/tendermint/tendermint/libs/log" - "github.com/tharsis/ethermint/rpc/ethereum/backend" - rpctypes "github.com/tharsis/ethermint/rpc/ethereum/types" ) // HandlerT keeps track of the cpu profiler and trace execution diff --git a/rpc/ethereum/namespaces/eth/api.go b/rpc/ethereum/namespaces/eth/api.go index dd258b00..3c5614ed 100644 --- a/rpc/ethereum/namespaces/eth/api.go +++ b/rpc/ethereum/namespaces/eth/api.go @@ -7,7 +7,7 @@ import ( "math" "math/big" - "github.com/tharsis/ethermint/ethereum/eip712" + "github.com/cerc-io/laconicd/ethereum/eip712" "github.com/ethereum/go-ethereum/signer/core/apitypes" @@ -35,11 +35,11 @@ import ( ethtypes "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/crypto" - "github.com/tharsis/ethermint/crypto/hd" - "github.com/tharsis/ethermint/rpc/ethereum/backend" - rpctypes "github.com/tharsis/ethermint/rpc/ethereum/types" - ethermint "github.com/tharsis/ethermint/types" - evmtypes "github.com/tharsis/ethermint/x/evm/types" + "github.com/cerc-io/laconicd/crypto/hd" + "github.com/cerc-io/laconicd/rpc/ethereum/backend" + rpctypes "github.com/cerc-io/laconicd/rpc/ethereum/types" + ethermint "github.com/cerc-io/laconicd/types" + evmtypes "github.com/cerc-io/laconicd/x/evm/types" ) // PublicAPI is the eth_ prefixed set of APIs in the Web3 JSON-RPC spec. @@ -609,7 +609,7 @@ func (e *PublicAPI) Resend(ctx context.Context, args evmtypes.TransactionArgs, g } for _, tx := range pending { - // FIXME does Resend api possible at all? https://github.com/tharsis/ethermint/issues/905 + // FIXME does Resend api possible at all? https://github.com/cerc-io/laconicd/issues/905 p, err := evmtypes.UnwrapEthereumMsg(tx, common.Hash{}) if err != nil { // not valid ethereum tx diff --git a/rpc/ethereum/namespaces/eth/filters/api.go b/rpc/ethereum/namespaces/eth/filters/api.go index 9bd9eafb..4861f847 100644 --- a/rpc/ethereum/namespaces/eth/filters/api.go +++ b/rpc/ethereum/namespaces/eth/filters/api.go @@ -6,8 +6,8 @@ import ( "sync" "time" + "github.com/cerc-io/laconicd/rpc/ethereum/types" "github.com/cosmos/cosmos-sdk/client" - "github.com/tharsis/ethermint/rpc/ethereum/types" "github.com/tendermint/tendermint/libs/log" @@ -20,7 +20,7 @@ import ( "github.com/ethereum/go-ethereum/eth/filters" "github.com/ethereum/go-ethereum/rpc" - evmtypes "github.com/tharsis/ethermint/x/evm/types" + evmtypes "github.com/cerc-io/laconicd/x/evm/types" ) // Backend defines the methods requided by the PublicFilterAPI backend diff --git a/rpc/ethereum/namespaces/eth/filters/filter_system.go b/rpc/ethereum/namespaces/eth/filters/filter_system.go index 89f17bb8..a1a3afc4 100644 --- a/rpc/ethereum/namespaces/eth/filters/filter_system.go +++ b/rpc/ethereum/namespaces/eth/filters/filter_system.go @@ -22,8 +22,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/tharsis/ethermint/rpc/ethereum/pubsub" - evmtypes "github.com/tharsis/ethermint/x/evm/types" + "github.com/cerc-io/laconicd/rpc/ethereum/pubsub" + evmtypes "github.com/cerc-io/laconicd/x/evm/types" ) var ( diff --git a/rpc/ethereum/namespaces/eth/filters/filters.go b/rpc/ethereum/namespaces/eth/filters/filters.go index e9adb5a5..8535964c 100644 --- a/rpc/ethereum/namespaces/eth/filters/filters.go +++ b/rpc/ethereum/namespaces/eth/filters/filters.go @@ -5,7 +5,7 @@ import ( "encoding/binary" "math/big" - "github.com/tharsis/ethermint/rpc/ethereum/types" + "github.com/cerc-io/laconicd/rpc/ethereum/types" "github.com/pkg/errors" "github.com/tendermint/tendermint/libs/log" diff --git a/rpc/ethereum/namespaces/miner/api.go b/rpc/ethereum/namespaces/miner/api.go index a44d0ad8..e7ffc0f5 100644 --- a/rpc/ethereum/namespaces/miner/api.go +++ b/rpc/ethereum/namespaces/miner/api.go @@ -21,9 +21,9 @@ import ( "github.com/tendermint/tendermint/libs/log" tmtypes "github.com/tendermint/tendermint/types" - "github.com/tharsis/ethermint/rpc/ethereum/backend" - rpctypes "github.com/tharsis/ethermint/rpc/ethereum/types" - "github.com/tharsis/ethermint/server/config" + "github.com/cerc-io/laconicd/rpc/ethereum/backend" + rpctypes "github.com/cerc-io/laconicd/rpc/ethereum/types" + "github.com/cerc-io/laconicd/server/config" ) // API is the private miner prefixed set of APIs in the Miner JSON-RPC spec. diff --git a/rpc/ethereum/namespaces/net/api.go b/rpc/ethereum/namespaces/net/api.go index a8e679ef..c469c92c 100644 --- a/rpc/ethereum/namespaces/net/api.go +++ b/rpc/ethereum/namespaces/net/api.go @@ -4,9 +4,9 @@ import ( "context" "fmt" + ethermint "github.com/cerc-io/laconicd/types" "github.com/cosmos/cosmos-sdk/client" rpcclient "github.com/tendermint/tendermint/rpc/client" - ethermint "github.com/tharsis/ethermint/types" ) // PublicAPI is the eth_ prefixed set of APIs in the Web3 JSON-RPC spec. diff --git a/rpc/ethereum/namespaces/personal/api.go b/rpc/ethereum/namespaces/personal/api.go index 7897002e..c93e1cdb 100644 --- a/rpc/ethereum/namespaces/personal/api.go +++ b/rpc/ethereum/namespaces/personal/api.go @@ -6,12 +6,12 @@ import ( "os" "time" - "github.com/tharsis/ethermint/rpc/ethereum/backend" + "github.com/cerc-io/laconicd/rpc/ethereum/backend" "github.com/cosmos/cosmos-sdk/client" - "github.com/tharsis/ethermint/crypto/hd" - ethermint "github.com/tharsis/ethermint/types" + "github.com/cerc-io/laconicd/crypto/hd" + ethermint "github.com/cerc-io/laconicd/types" "github.com/tendermint/tendermint/libs/log" @@ -24,8 +24,8 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/ethereum/go-ethereum/crypto" - "github.com/tharsis/ethermint/crypto/ethsecp256k1" - evmtypes "github.com/tharsis/ethermint/x/evm/types" + "github.com/cerc-io/laconicd/crypto/ethsecp256k1" + evmtypes "github.com/cerc-io/laconicd/x/evm/types" ) // PrivateAccountAPI is the personal_ prefixed set of APIs in the Web3 JSON-RPC spec. diff --git a/rpc/ethereum/namespaces/txpool/api.go b/rpc/ethereum/namespaces/txpool/api.go index bfc501d6..60930677 100644 --- a/rpc/ethereum/namespaces/txpool/api.go +++ b/rpc/ethereum/namespaces/txpool/api.go @@ -5,11 +5,11 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/tharsis/ethermint/rpc/ethereum/types" + "github.com/cerc-io/laconicd/rpc/ethereum/types" ) // PublicAPI offers and API for the transaction pool. It only operates on data that is non-confidential. -// NOTE: For more info about the current status of this endpoints see https://github.com/tharsis/ethermint/issues/124 +// NOTE: For more info about the current status of this endpoints see https://github.com/cerc-io/laconicd/issues/124 type PublicAPI struct { logger log.Logger } diff --git a/rpc/ethereum/namespaces/web3/api.go b/rpc/ethereum/namespaces/web3/api.go index 04fbee76..f504b8c1 100644 --- a/rpc/ethereum/namespaces/web3/api.go +++ b/rpc/ethereum/namespaces/web3/api.go @@ -1,7 +1,7 @@ package web3 import ( - "github.com/tharsis/ethermint/version" + "github.com/cerc-io/laconicd/version" "github.com/ethereum/go-ethereum/common/hexutil" "github.com/ethereum/go-ethereum/crypto" diff --git a/rpc/ethereum/types/block.go b/rpc/ethereum/types/block.go index 0f407f90..689e0c44 100644 --- a/rpc/ethereum/types/block.go +++ b/rpc/ethereum/types/block.go @@ -17,7 +17,7 @@ import ( grpctypes "github.com/cosmos/cosmos-sdk/types/grpc" - ethermint "github.com/tharsis/ethermint/types" + ethermint "github.com/cerc-io/laconicd/types" ) // BlockNumber represents decoding hex string to block values diff --git a/rpc/ethereum/types/query_client.go b/rpc/ethereum/types/query_client.go index b11ba3f7..9b3d8265 100644 --- a/rpc/ethereum/types/query_client.go +++ b/rpc/ethereum/types/query_client.go @@ -10,8 +10,8 @@ import ( "github.com/cosmos/cosmos-sdk/client" - evmtypes "github.com/tharsis/ethermint/x/evm/types" - feemarkettypes "github.com/tharsis/ethermint/x/feemarket/types" + evmtypes "github.com/cerc-io/laconicd/x/evm/types" + feemarkettypes "github.com/cerc-io/laconicd/x/feemarket/types" ) // QueryClient defines a gRPC Client used for: diff --git a/rpc/ethereum/types/utils.go b/rpc/ethereum/types/utils.go index d8d40d62..50feda0e 100644 --- a/rpc/ethereum/types/utils.go +++ b/rpc/ethereum/types/utils.go @@ -14,8 +14,8 @@ import ( "github.com/cosmos/cosmos-sdk/client" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - evmtypes "github.com/tharsis/ethermint/x/evm/types" - feemarkettypes "github.com/tharsis/ethermint/x/feemarket/types" + evmtypes "github.com/cerc-io/laconicd/x/evm/types" + feemarkettypes "github.com/cerc-io/laconicd/x/feemarket/types" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" diff --git a/rpc/websockets.go b/rpc/websockets.go index e2d76abc..8b7cc5f9 100644 --- a/rpc/websockets.go +++ b/rpc/websockets.go @@ -26,11 +26,11 @@ import ( rpcclient "github.com/tendermint/tendermint/rpc/jsonrpc/client" tmtypes "github.com/tendermint/tendermint/types" - rpcfilters "github.com/tharsis/ethermint/rpc/ethereum/namespaces/eth/filters" - "github.com/tharsis/ethermint/rpc/ethereum/pubsub" - "github.com/tharsis/ethermint/rpc/ethereum/types" - "github.com/tharsis/ethermint/server/config" - evmtypes "github.com/tharsis/ethermint/x/evm/types" + rpcfilters "github.com/cerc-io/laconicd/rpc/ethereum/namespaces/eth/filters" + "github.com/cerc-io/laconicd/rpc/ethereum/pubsub" + "github.com/cerc-io/laconicd/rpc/ethereum/types" + "github.com/cerc-io/laconicd/server/config" + evmtypes "github.com/cerc-io/laconicd/x/evm/types" ) type WebsocketsServer interface { diff --git a/scripts/protocgen.sh b/scripts/protocgen.sh index 9f622133..d6fa6597 100755 --- a/scripts/protocgen.sh +++ b/scripts/protocgen.sh @@ -40,5 +40,5 @@ $(find "$(pwd)/proto" -maxdepth 5 -name '*.proto') # go mod tidy # move proto files to the right places -cp -r github.com/tharsis/ethermint/* ./ +cp -r github.com/cerc-io/laconicd/* ./ rm -rf github.com diff --git a/server/json_rpc.go b/server/json_rpc.go index 244ad4dc..b3bc9841 100644 --- a/server/json_rpc.go +++ b/server/json_rpc.go @@ -7,14 +7,14 @@ import ( "github.com/gorilla/mux" "github.com/rs/cors" + "github.com/cerc-io/laconicd/rpc" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/server" "github.com/cosmos/cosmos-sdk/server/types" ethlog "github.com/ethereum/go-ethereum/log" ethrpc "github.com/ethereum/go-ethereum/rpc" - "github.com/tharsis/ethermint/rpc" - "github.com/tharsis/ethermint/server/config" + "github.com/cerc-io/laconicd/server/config" ) // StartJSONRPC starts the JSON-RPC server diff --git a/server/start.go b/server/start.go index eded2f3c..d4923d46 100644 --- a/server/start.go +++ b/server/start.go @@ -37,11 +37,11 @@ import ( "github.com/tendermint/tendermint/rpc/client/local" tmtypes "github.com/tendermint/tendermint/types" + "github.com/cerc-io/laconicd/gql" + ethdebug "github.com/cerc-io/laconicd/rpc/ethereum/namespaces/debug" + "github.com/cerc-io/laconicd/server/config" + srvflags "github.com/cerc-io/laconicd/server/flags" pruningtypes "github.com/cosmos/cosmos-sdk/pruning/types" - "github.com/tharsis/ethermint/gql" - ethdebug "github.com/tharsis/ethermint/rpc/ethereum/namespaces/debug" - "github.com/tharsis/ethermint/server/config" - srvflags "github.com/tharsis/ethermint/server/flags" ) const ( diff --git a/tests/e2e/integration_test.go b/tests/e2e/integration_test.go index 1396c557..c7b0f505 100644 --- a/tests/e2e/integration_test.go +++ b/tests/e2e/integration_test.go @@ -8,7 +8,7 @@ import ( "testing" "cosmossdk.io/math" - evmtypes "github.com/tharsis/ethermint/x/evm/types" + evmtypes "github.com/cerc-io/laconicd/x/evm/types" // . "github.com/onsi/ginkgo" // . "github.com/onsi/gomega" @@ -23,9 +23,9 @@ import ( "github.com/ethereum/go-ethereum/ethclient/gethclient" "github.com/ethereum/go-ethereum/rpc" - "github.com/tharsis/ethermint/server/config" - "github.com/tharsis/ethermint/testutil/network" - ethermint "github.com/tharsis/ethermint/types" + "github.com/cerc-io/laconicd/server/config" + "github.com/cerc-io/laconicd/testutil/network" + ethermint "github.com/cerc-io/laconicd/types" ) // var _ = Describe("E2e", func() { diff --git a/tests/importer/importer_test.go b/tests/importer/importer_test.go index 3d19ec84..8af17c89 100644 --- a/tests/importer/importer_test.go +++ b/tests/importer/importer_test.go @@ -9,15 +9,15 @@ import ( "testing" "time" - "github.com/tharsis/ethermint/app" + "github.com/cerc-io/laconicd/app" "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" sdk "github.com/cosmos/cosmos-sdk/types" - evmkeeper "github.com/tharsis/ethermint/x/evm/keeper" - "github.com/tharsis/ethermint/x/evm/statedb" + evmkeeper "github.com/cerc-io/laconicd/x/evm/keeper" + "github.com/cerc-io/laconicd/x/evm/statedb" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/consensus/ethash" @@ -28,12 +28,12 @@ import ( ethparams "github.com/ethereum/go-ethereum/params" ethrlp "github.com/ethereum/go-ethereum/rlp" + "github.com/cerc-io/laconicd/crypto/ethsecp256k1" "github.com/tendermint/tendermint/abci/types" "github.com/tendermint/tendermint/crypto/tmhash" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" tmversion "github.com/tendermint/tendermint/proto/tendermint/version" "github.com/tendermint/tendermint/version" - "github.com/tharsis/ethermint/crypto/ethsecp256k1" ) var ( diff --git a/tests/rpc/rpc_pending_test.go b/tests/rpc/rpc_pending_test.go index 544ee08b..a5517e32 100644 --- a/tests/rpc/rpc_pending_test.go +++ b/tests/rpc/rpc_pending_test.go @@ -15,7 +15,7 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/stretchr/testify/require" - rpctypes "github.com/tharsis/ethermint/rpc/ethereum/types" + rpctypes "github.com/cerc-io/laconicd/rpc/ethereum/types" ) // func TestMain(m *testing.M) { diff --git a/tests/rpc/rpc_test.go b/tests/rpc/rpc_test.go index 9af82ceb..350e30da 100644 --- a/tests/rpc/rpc_test.go +++ b/tests/rpc/rpc_test.go @@ -17,9 +17,9 @@ import ( "github.com/stretchr/testify/require" - rpctypes "github.com/tharsis/ethermint/rpc/ethereum/types" - ethermint "github.com/tharsis/ethermint/types" - evmtypes "github.com/tharsis/ethermint/x/evm/types" + rpctypes "github.com/cerc-io/laconicd/rpc/ethereum/types" + ethermint "github.com/cerc-io/laconicd/types" + evmtypes "github.com/cerc-io/laconicd/x/evm/types" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" diff --git a/tests/signer.go b/tests/signer.go index b90ecd6d..66c89c89 100644 --- a/tests/signer.go +++ b/tests/signer.go @@ -10,7 +10,7 @@ import ( cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/tharsis/ethermint/crypto/ethsecp256k1" + "github.com/cerc-io/laconicd/crypto/ethsecp256k1" ) // NewAddrKey generates an Ethereum address and its corresponding private key. diff --git a/testutil/network/network.go b/testutil/network/network.go index b262e927..e9e64edf 100644 --- a/testutil/network/network.go +++ b/testutil/network/network.go @@ -48,13 +48,13 @@ import ( "github.com/cosmos/cosmos-sdk/x/genutil" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/tharsis/ethermint/crypto/hd" - "github.com/tharsis/ethermint/encoding" - "github.com/tharsis/ethermint/server/config" - ethermint "github.com/tharsis/ethermint/types" - evmtypes "github.com/tharsis/ethermint/x/evm/types" + "github.com/cerc-io/laconicd/crypto/hd" + "github.com/cerc-io/laconicd/encoding" + "github.com/cerc-io/laconicd/server/config" + ethermint "github.com/cerc-io/laconicd/types" + evmtypes "github.com/cerc-io/laconicd/x/evm/types" - "github.com/tharsis/ethermint/app" + "github.com/cerc-io/laconicd/app" ) // package-wide network lock to only allow one test network at a time diff --git a/testutil/network/network_test.go b/testutil/network/network_test.go index 6f9b19a5..c6148d8a 100644 --- a/testutil/network/network_test.go +++ b/testutil/network/network_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/suite" - "github.com/tharsis/ethermint/testutil/network" + "github.com/cerc-io/laconicd/testutil/network" ) type IntegrationTestSuite struct { diff --git a/testutil/network/util.go b/testutil/network/util.go index 55eb2f93..7703307b 100644 --- a/testutil/network/util.go +++ b/testutil/network/util.go @@ -15,6 +15,8 @@ import ( "github.com/tendermint/tendermint/rpc/client/local" "github.com/tendermint/tendermint/types" + "github.com/cerc-io/laconicd/server" + evmtypes "github.com/cerc-io/laconicd/x/evm/types" "github.com/cosmos/cosmos-sdk/server/api" servergrpc "github.com/cosmos/cosmos-sdk/server/grpc" srvtypes "github.com/cosmos/cosmos-sdk/server/types" @@ -27,8 +29,6 @@ import ( v1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" mintypes "github.com/cosmos/cosmos-sdk/x/mint/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/tharsis/ethermint/server" - evmtypes "github.com/tharsis/ethermint/x/evm/types" ) func startInProcess(cfg Config, val *Validator) error { diff --git a/types/account_test.go b/types/account_test.go index 10b18a60..23671769 100644 --- a/types/account_test.go +++ b/types/account_test.go @@ -12,10 +12,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - cryptocodec "github.com/tharsis/ethermint/crypto/codec" - "github.com/tharsis/ethermint/crypto/ethsecp256k1" - ethermintcodec "github.com/tharsis/ethermint/encoding/codec" - "github.com/tharsis/ethermint/types" + cryptocodec "github.com/cerc-io/laconicd/crypto/codec" + "github.com/cerc-io/laconicd/crypto/ethsecp256k1" + ethermintcodec "github.com/cerc-io/laconicd/encoding/codec" + "github.com/cerc-io/laconicd/types" ) func init() { diff --git a/types/validation_test.go b/types/validation_test.go index 86e387d4..c2221d80 100644 --- a/types/validation_test.go +++ b/types/validation_test.go @@ -3,9 +3,9 @@ package types import ( "testing" + "github.com/cerc-io/laconicd/tests" "github.com/ethereum/go-ethereum/common" "github.com/stretchr/testify/require" - "github.com/tharsis/ethermint/tests" ) func TestIsEmptyHash(t *testing.T) { diff --git a/x/auction/abci.go b/x/auction/abci.go index 636803d5..36f66a97 100644 --- a/x/auction/abci.go +++ b/x/auction/abci.go @@ -1,9 +1,9 @@ package auction import ( + "github.com/cerc-io/laconicd/x/auction/keeper" sdk "github.com/cosmos/cosmos-sdk/types" abci "github.com/tendermint/tendermint/abci/types" - "github.com/tharsis/ethermint/x/auction/keeper" ) // EndBlocker is called every block, returns updated validator set. diff --git a/x/auction/client/cli/query.go b/x/auction/client/cli/query.go index 844f29bc..256a1029 100644 --- a/x/auction/client/cli/query.go +++ b/x/auction/client/cli/query.go @@ -10,7 +10,7 @@ import ( "github.com/spf13/cobra" - "github.com/tharsis/ethermint/x/auction/types" + "github.com/cerc-io/laconicd/x/auction/types" ) func GetQueryCmd() *cobra.Command { diff --git a/x/auction/client/cli/tx.go b/x/auction/client/cli/tx.go index 2728716d..e87bac42 100644 --- a/x/auction/client/cli/tx.go +++ b/x/auction/client/cli/tx.go @@ -14,9 +14,9 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "github.com/tharsis/ethermint/x/auction/types" + "github.com/cerc-io/laconicd/x/auction/types" - wnsUtils "github.com/tharsis/ethermint/utils" + wnsUtils "github.com/cerc-io/laconicd/utils" ) // GetTxCmd returns transaction commands for this module. diff --git a/x/auction/client/testutil/cli_test.go b/x/auction/client/testutil/cli_test.go index 6b027215..b241f54b 100644 --- a/x/auction/client/testutil/cli_test.go +++ b/x/auction/client/testutil/cli_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/suite" - "github.com/tharsis/ethermint/testutil/network" + "github.com/cerc-io/laconicd/testutil/network" ) func TestIntegrationTestSuite(t *testing.T) { diff --git a/x/auction/client/testutil/common.go b/x/auction/client/testutil/common.go index 062467b0..54ca27bb 100644 --- a/x/auction/client/testutil/common.go +++ b/x/auction/client/testutil/common.go @@ -3,14 +3,14 @@ package testutil import ( "fmt" + "github.com/cerc-io/laconicd/crypto/hd" + "github.com/cerc-io/laconicd/testutil/network" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/crypto/keyring" sdk "github.com/cosmos/cosmos-sdk/types" banktestutil "github.com/cosmos/cosmos-sdk/x/bank/client/testutil" "github.com/stretchr/testify/suite" tmcli "github.com/tendermint/tendermint/libs/cli" - "github.com/tharsis/ethermint/crypto/hd" - "github.com/tharsis/ethermint/testutil/network" ) type IntegrationTestSuite struct { diff --git a/x/auction/client/testutil/grpc.go b/x/auction/client/testutil/grpc.go index 686367c5..ccacf185 100644 --- a/x/auction/client/testutil/grpc.go +++ b/x/auction/client/testutil/grpc.go @@ -3,8 +3,8 @@ package testutil import ( "fmt" + auctiontypes "github.com/cerc-io/laconicd/x/auction/types" "github.com/cosmos/cosmos-sdk/testutil/rest" - auctiontypes "github.com/tharsis/ethermint/x/auction/types" ) const ( diff --git a/x/auction/client/testutil/query.go b/x/auction/client/testutil/query.go index e0ff2495..1a39077a 100644 --- a/x/auction/client/testutil/query.go +++ b/x/auction/client/testutil/query.go @@ -3,10 +3,10 @@ package testutil import ( "fmt" + "github.com/cerc-io/laconicd/x/auction/client/cli" + "github.com/cerc-io/laconicd/x/auction/types" clitestutil "github.com/cosmos/cosmos-sdk/testutil/cli" tmcli "github.com/tendermint/tendermint/libs/cli" - "github.com/tharsis/ethermint/x/auction/client/cli" - "github.com/tharsis/ethermint/x/auction/types" ) var queryJSONFlag = []string{fmt.Sprintf("--%s=json", tmcli.OutputFlag)} diff --git a/x/auction/client/testutil/tx.go b/x/auction/client/testutil/tx.go index 21f08554..ac67cacd 100644 --- a/x/auction/client/testutil/tx.go +++ b/x/auction/client/testutil/tx.go @@ -3,13 +3,13 @@ package testutil import ( "fmt" + "github.com/cerc-io/laconicd/x/auction/client/cli" + "github.com/cerc-io/laconicd/x/auction/types" "github.com/cosmos/cosmos-sdk/client/flags" clitestutil "github.com/cosmos/cosmos-sdk/testutil/cli" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/spf13/cobra" tmcli "github.com/tendermint/tendermint/libs/cli" - "github.com/tharsis/ethermint/x/auction/client/cli" - "github.com/tharsis/ethermint/x/auction/types" ) const ( diff --git a/x/auction/genesis.go b/x/auction/genesis.go index a413a1c7..384d76d9 100644 --- a/x/auction/genesis.go +++ b/x/auction/genesis.go @@ -5,8 +5,8 @@ import ( abci "github.com/tendermint/tendermint/abci/types" - "github.com/tharsis/ethermint/x/auction/keeper" - "github.com/tharsis/ethermint/x/auction/types" + "github.com/cerc-io/laconicd/x/auction/keeper" + "github.com/cerc-io/laconicd/x/auction/types" ) // func NewGenesisState(params types.Params, auctions []types.Auction) types.GenesisState { diff --git a/x/auction/keeper/grpc_query.go b/x/auction/keeper/grpc_query.go index 4cd7370b..b2497a19 100644 --- a/x/auction/keeper/grpc_query.go +++ b/x/auction/keeper/grpc_query.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/tharsis/ethermint/x/auction/types" + "github.com/cerc-io/laconicd/x/auction/types" ) type Querier struct { diff --git a/x/auction/keeper/grpc_query_test.go b/x/auction/keeper/grpc_query_test.go index 922d16f6..56dcd174 100644 --- a/x/auction/keeper/grpc_query_test.go +++ b/x/auction/keeper/grpc_query_test.go @@ -4,10 +4,10 @@ import ( "context" "fmt" + "github.com/cerc-io/laconicd/app" + "github.com/cerc-io/laconicd/x/auction/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/bank/testutil" - "github.com/tharsis/ethermint/app" - "github.com/tharsis/ethermint/x/auction/types" ) const testCommitHash = "71D8CF34026E32A3A34C2C2D4ADF25ABC8D7943A4619761BE27F196603D91B9D" diff --git a/x/auction/keeper/invariants.go b/x/auction/keeper/invariants.go index 5fc83d1b..fb2af327 100644 --- a/x/auction/keeper/invariants.go +++ b/x/auction/keeper/invariants.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/tharsis/ethermint/x/auction/types" + "github.com/cerc-io/laconicd/x/auction/types" ) // RegisterInvariants registers all auction module invariants. diff --git a/x/auction/keeper/keeper.go b/x/auction/keeper/keeper.go index 120978fc..d6f30bb3 100644 --- a/x/auction/keeper/keeper.go +++ b/x/auction/keeper/keeper.go @@ -6,6 +6,7 @@ import ( "fmt" "time" + "github.com/cerc-io/laconicd/x/auction/types" "github.com/cosmos/cosmos-sdk/codec" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" @@ -13,9 +14,8 @@ import ( auth "github.com/cosmos/cosmos-sdk/x/auth/keeper" bank "github.com/cosmos/cosmos-sdk/x/bank/keeper" params "github.com/cosmos/cosmos-sdk/x/params/types" - "github.com/tharsis/ethermint/x/auction/types" - wnsUtils "github.com/tharsis/ethermint/utils" + wnsUtils "github.com/cerc-io/laconicd/utils" ) // CompletedAuctionDeleteTimeout => Completed auctions are deleted after this timeout (after reveals end time). diff --git a/x/auction/keeper/keeper_test.go b/x/auction/keeper/keeper_test.go index 3040a867..9dfd9ccf 100644 --- a/x/auction/keeper/keeper_test.go +++ b/x/auction/keeper/keeper_test.go @@ -3,15 +3,15 @@ package keeper_test import ( "testing" + "github.com/cerc-io/laconicd/app" + auctionkeeper "github.com/cerc-io/laconicd/x/auction/keeper" + "github.com/cerc-io/laconicd/x/auction/types" "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/simapp" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - "github.com/tharsis/ethermint/app" - auctionkeeper "github.com/tharsis/ethermint/x/auction/keeper" - "github.com/tharsis/ethermint/x/auction/types" ) type KeeperTestSuite struct { diff --git a/x/auction/keeper/msg_server.go b/x/auction/keeper/msg_server.go index d0c99fbe..e336cb4e 100644 --- a/x/auction/keeper/msg_server.go +++ b/x/auction/keeper/msg_server.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/tharsis/ethermint/x/auction/types" + "github.com/cerc-io/laconicd/x/auction/types" ) type msgServer struct { diff --git a/x/auction/keeper/params.go b/x/auction/keeper/params.go index 2896f5a2..694a2a51 100644 --- a/x/auction/keeper/params.go +++ b/x/auction/keeper/params.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/tharsis/ethermint/x/auction/types" + "github.com/cerc-io/laconicd/x/auction/types" ) // GetParams - Get all parameteras as types.Params. diff --git a/x/auction/module.go b/x/auction/module.go index b4d59ddb..357d90e5 100644 --- a/x/auction/module.go +++ b/x/auction/module.go @@ -17,9 +17,9 @@ import ( abci "github.com/tendermint/tendermint/abci/types" - "github.com/tharsis/ethermint/x/auction/client/cli" - "github.com/tharsis/ethermint/x/auction/keeper" - "github.com/tharsis/ethermint/x/auction/types" + "github.com/cerc-io/laconicd/x/auction/client/cli" + "github.com/cerc-io/laconicd/x/auction/keeper" + "github.com/cerc-io/laconicd/x/auction/types" ) // type check to ensure the interface is properly implemented diff --git a/x/bond/abci.go b/x/bond/abci.go index 1b89cc90..e238ecea 100644 --- a/x/bond/abci.go +++ b/x/bond/abci.go @@ -1,9 +1,9 @@ package bond import ( + "github.com/cerc-io/laconicd/x/bond/keeper" sdk "github.com/cosmos/cosmos-sdk/types" abci "github.com/tendermint/tendermint/abci/types" - "github.com/tharsis/ethermint/x/bond/keeper" ) // BeginBlocker will persist the current header and validator set as a historical entry diff --git a/x/bond/client/cli/query.go b/x/bond/client/cli/query.go index 546f08ae..03fe3c5e 100644 --- a/x/bond/client/cli/query.go +++ b/x/bond/client/cli/query.go @@ -4,11 +4,11 @@ import ( "fmt" "strings" + "github.com/cerc-io/laconicd/x/bond/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/version" "github.com/spf13/cobra" - "github.com/tharsis/ethermint/x/bond/types" ) // GetQueryCmd returns the cli query commands for this module diff --git a/x/bond/client/cli/tx.go b/x/bond/client/cli/tx.go index c39eec75..033f4903 100644 --- a/x/bond/client/cli/tx.go +++ b/x/bond/client/cli/tx.go @@ -1,12 +1,12 @@ package cli import ( + "github.com/cerc-io/laconicd/server/flags" + "github.com/cerc-io/laconicd/x/bond/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/tx" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/spf13/cobra" - "github.com/tharsis/ethermint/server/flags" - "github.com/tharsis/ethermint/x/bond/types" ) // NewTxCmd returns a root CLI command handler for all x/bond transaction commands. diff --git a/x/bond/client/testutil/cli_test.go b/x/bond/client/testutil/cli_test.go index 26939954..7b22258b 100644 --- a/x/bond/client/testutil/cli_test.go +++ b/x/bond/client/testutil/cli_test.go @@ -3,8 +3,8 @@ package testutil import ( "testing" + "github.com/cerc-io/laconicd/testutil/network" "github.com/stretchr/testify/suite" - "github.com/tharsis/ethermint/testutil/network" ) func TestIntegrationTestSuite(t *testing.T) { diff --git a/x/bond/client/testutil/grpc.go b/x/bond/client/testutil/grpc.go index f5cbddf5..d397e1be 100644 --- a/x/bond/client/testutil/grpc.go +++ b/x/bond/client/testutil/grpc.go @@ -3,11 +3,11 @@ package testutil import ( "fmt" + "github.com/cerc-io/laconicd/x/bond/client/cli" + bondtypes "github.com/cerc-io/laconicd/x/bond/types" clitestutil "github.com/cosmos/cosmos-sdk/testutil/cli" "github.com/cosmos/cosmos-sdk/testutil/rest" tmcli "github.com/tendermint/tendermint/libs/cli" - "github.com/tharsis/ethermint/x/bond/client/cli" - bondtypes "github.com/tharsis/ethermint/x/bond/types" ) func (s *IntegrationTestSuite) TestGRPCGetBonds() { diff --git a/x/bond/client/testutil/query.go b/x/bond/client/testutil/query.go index ac965e18..cd83a4d6 100644 --- a/x/bond/client/testutil/query.go +++ b/x/bond/client/testutil/query.go @@ -3,6 +3,9 @@ package testutil import ( "fmt" + "github.com/cerc-io/laconicd/testutil/network" + "github.com/cerc-io/laconicd/x/bond/client/cli" + "github.com/cerc-io/laconicd/x/bond/types" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/crypto/hd" "github.com/cosmos/cosmos-sdk/crypto/keyring" @@ -12,9 +15,6 @@ import ( banktestutil "github.com/cosmos/cosmos-sdk/x/bank/client/testutil" "github.com/stretchr/testify/suite" tmcli "github.com/tendermint/tendermint/libs/cli" - "github.com/tharsis/ethermint/testutil/network" - "github.com/tharsis/ethermint/x/bond/client/cli" - "github.com/tharsis/ethermint/x/bond/types" ) type IntegrationTestSuite struct { diff --git a/x/bond/client/testutil/tx.go b/x/bond/client/testutil/tx.go index e01a1942..37006594 100644 --- a/x/bond/client/testutil/tx.go +++ b/x/bond/client/testutil/tx.go @@ -3,12 +3,12 @@ package testutil import ( "fmt" + "github.com/cerc-io/laconicd/x/bond/client/cli" + "github.com/cerc-io/laconicd/x/bond/types" "github.com/cosmos/cosmos-sdk/client/flags" clitestutil "github.com/cosmos/cosmos-sdk/testutil/cli" sdk "github.com/cosmos/cosmos-sdk/types" tmcli "github.com/tendermint/tendermint/libs/cli" - "github.com/tharsis/ethermint/x/bond/client/cli" - "github.com/tharsis/ethermint/x/bond/types" ) func (s *IntegrationTestSuite) TestTxCreateBond() { diff --git a/x/bond/genesis.go b/x/bond/genesis.go index 5457122c..cc6c884a 100644 --- a/x/bond/genesis.go +++ b/x/bond/genesis.go @@ -1,10 +1,10 @@ package bond import ( + "github.com/cerc-io/laconicd/x/bond/keeper" + "github.com/cerc-io/laconicd/x/bond/types" sdk "github.com/cosmos/cosmos-sdk/types" abci "github.com/tendermint/tendermint/abci/types" - "github.com/tharsis/ethermint/x/bond/keeper" - "github.com/tharsis/ethermint/x/bond/types" ) // InitGenesis initializes genesis state based on exported genesis diff --git a/x/bond/keeper/grpc_query.go b/x/bond/keeper/grpc_query.go index 9a19d7bc..b7fad21f 100644 --- a/x/bond/keeper/grpc_query.go +++ b/x/bond/keeper/grpc_query.go @@ -3,9 +3,9 @@ package keeper import ( "context" + "github.com/cerc-io/laconicd/x/bond/types" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/tharsis/ethermint/x/bond/types" ) type Querier struct { diff --git a/x/bond/keeper/grpc_query_test.go b/x/bond/keeper/grpc_query_test.go index 2c84c255..2ab66beb 100644 --- a/x/bond/keeper/grpc_query_test.go +++ b/x/bond/keeper/grpc_query_test.go @@ -4,10 +4,10 @@ import ( "context" "fmt" + "github.com/cerc-io/laconicd/app" + "github.com/cerc-io/laconicd/x/bond/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/bank/testutil" - "github.com/tharsis/ethermint/app" - "github.com/tharsis/ethermint/x/bond/types" ) func (suite *KeeperTestSuite) TestGrpcQueryBondsList() { diff --git a/x/bond/keeper/invariants.go b/x/bond/keeper/invariants.go index f7c8a4d8..03cc8aba 100644 --- a/x/bond/keeper/invariants.go +++ b/x/bond/keeper/invariants.go @@ -2,8 +2,9 @@ package keeper import ( "fmt" + + "github.com/cerc-io/laconicd/x/bond/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/tharsis/ethermint/x/bond/types" ) // RegisterInvariants registers all bond invariants diff --git a/x/bond/keeper/keeper.go b/x/bond/keeper/keeper.go index 161a0461..af04edfa 100644 --- a/x/bond/keeper/keeper.go +++ b/x/bond/keeper/keeper.go @@ -5,6 +5,7 @@ import ( "encoding/hex" "fmt" + "github.com/cerc-io/laconicd/x/bond/types" "github.com/cosmos/cosmos-sdk/codec" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" @@ -12,7 +13,6 @@ import ( auth "github.com/cosmos/cosmos-sdk/x/auth/keeper" bank "github.com/cosmos/cosmos-sdk/x/bank/keeper" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - "github.com/tharsis/ethermint/x/bond/types" ) // prefixIDToBondIndex is the prefix for ID -> Bond index in the KVStore. diff --git a/x/bond/keeper/keeper_test.go b/x/bond/keeper/keeper_test.go index 88bf9efc..7b7e0cc3 100644 --- a/x/bond/keeper/keeper_test.go +++ b/x/bond/keeper/keeper_test.go @@ -3,15 +3,15 @@ package keeper_test import ( "testing" + "github.com/cerc-io/laconicd/app" + bondkeeper "github.com/cerc-io/laconicd/x/bond/keeper" + "github.com/cerc-io/laconicd/x/bond/types" "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/simapp" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - "github.com/tharsis/ethermint/app" - bondkeeper "github.com/tharsis/ethermint/x/bond/keeper" - "github.com/tharsis/ethermint/x/bond/types" ) type KeeperTestSuite struct { diff --git a/x/bond/keeper/msg_server.go b/x/bond/keeper/msg_server.go index f34a60b8..818d3aab 100644 --- a/x/bond/keeper/msg_server.go +++ b/x/bond/keeper/msg_server.go @@ -2,8 +2,9 @@ package keeper import ( "context" + + "github.com/cerc-io/laconicd/x/bond/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/tharsis/ethermint/x/bond/types" ) type msgServer struct { diff --git a/x/bond/keeper/params.go b/x/bond/keeper/params.go index d2a484cf..76ab0fbf 100644 --- a/x/bond/keeper/params.go +++ b/x/bond/keeper/params.go @@ -1,8 +1,8 @@ package keeper import ( + "github.com/cerc-io/laconicd/x/bond/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/tharsis/ethermint/x/bond/types" ) // GetMaxBondAmount max bond amount diff --git a/x/bond/module.go b/x/bond/module.go index eb9f0103..f5e9a3c5 100644 --- a/x/bond/module.go +++ b/x/bond/module.go @@ -4,6 +4,10 @@ import ( "context" "encoding/json" "fmt" + + "github.com/cerc-io/laconicd/x/bond/client/cli" + "github.com/cerc-io/laconicd/x/bond/keeper" + "github.com/cerc-io/laconicd/x/bond/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" @@ -13,9 +17,6 @@ import ( "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/spf13/cobra" abci "github.com/tendermint/tendermint/abci/types" - "github.com/tharsis/ethermint/x/bond/client/cli" - "github.com/tharsis/ethermint/x/bond/keeper" - "github.com/tharsis/ethermint/x/bond/types" ) var ( diff --git a/x/bond/module_test.go b/x/bond/module_test.go index 60999049..c81eede0 100644 --- a/x/bond/module_test.go +++ b/x/bond/module_test.go @@ -3,11 +3,11 @@ package bond_test import ( "testing" + app "github.com/cerc-io/laconicd/app" + bondtypes "github.com/cerc-io/laconicd/x/bond/types" "github.com/cosmos/cosmos-sdk/simapp" "github.com/stretchr/testify/require" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - app "github.com/tharsis/ethermint/app" - bondtypes "github.com/tharsis/ethermint/x/bond/types" ) func TestItCreatesModuleAccountOnInitBlock(t *testing.T) { diff --git a/x/evm/atlas/atlas-v0.3.1.md b/x/evm/atlas/atlas-v0.3.1.md index 9d769962..3b03fd4e 100644 --- a/x/evm/atlas/atlas-v0.3.1.md +++ b/x/evm/atlas/atlas-v0.3.1.md @@ -10,23 +10,23 @@ The `x/evm` module is responsible for executing Ethereum Virtual Machine (EVM) s import ( "github.com/cosmos/cosmos-sdk/x/auth" "github.com/cosmos/cosmos-sdk/x/bank" - - "github.com/tharsis/ethermint/app/ante" - ethermint "github.com/tharsis/ethermint/types" - "github.com/tharsis/ethermint/x/evm" + + "github.com/cerc-io/laconicd/app/ante" + ethermint "github.com/cerc-io/laconicd/types" + "github.com/cerc-io/laconicd/x/evm" ) ``` 2. Add `AppModuleBasic` to your `ModuleBasics`. - ```go - var ( - ModuleBasics = module.NewBasicManager( - // ... - evm.AppModuleBasic{}, - ) - ) - ``` + ```go + var ( + ModuleBasics = module.NewBasicManager( + // ... + evm.AppModuleBasic{}, + ) + ) + ``` 3. Create the module's parameter subspace in your application constructor. @@ -74,27 +74,27 @@ The `x/evm` module is responsible for executing Ethereum Virtual Machine (EVM) s 7. Set the `x/evm` module `BeginBlock` and `EndBlock` ordering: - ```go - app.mm.SetOrderBeginBlockers( - evm.ModuleName, ... - ) - app.mm.SetOrderEndBlockers( - evm.ModuleName, ... - ) - ``` + ```go + app.mm.SetOrderBeginBlockers( + evm.ModuleName, ... + ) + app.mm.SetOrderEndBlockers( + evm.ModuleName, ... + ) + ``` 8. Set the `x/evm` module genesis order. The module must go after the `auth` and `bank` modules. - ```go - func NewApp(...) *App { - // ... - app.mm.SetOrderInitGenesis(auth.ModuleName, bank.ModuleName, ... , evm.ModuleName, ...) - } - ``` + ```go + func NewApp(...) *App { + // ... + app.mm.SetOrderInitGenesis(auth.ModuleName, bank.ModuleName, ... , evm.ModuleName, ...) + } + ``` 9. Set the Ethermint `AnteHandler` to support EVM transactions. Note, -the default `AnteHandler` provided by the `x/evm` module depends on the `x/auth` and `x/supply` -modules. + the default `AnteHandler` provided by the `x/evm` module depends on the `x/auth` and `x/supply` + modules. ```go func NewApp(...) *App { @@ -178,4 +178,4 @@ See the Ethermint [JSON-RPC docs](https://evmos.dev/basics/json_rpc.html) for re ## Documentation and Specification -* Ethermint documentation: [https://evmos.dev](https://evmos.dev) +- Ethermint documentation: [https://evmos.dev](https://evmos.dev) diff --git a/x/evm/atlas/atlas.toml b/x/evm/atlas/atlas.toml index 51abaca4..5e616cee 100644 --- a/x/evm/atlas/atlas.toml +++ b/x/evm/atlas/atlas.toml @@ -1,6 +1,6 @@ [module] description = "The evm module executes Ethereum Virtual Machine (EVM) state transitions." -homepage = "https://github.com/tharsis/ethermint" +homepage = "https://github.com/cerc-io/laconicd" keywords = [ "evm", "ethereum", @@ -10,7 +10,7 @@ keywords = [ name = "x/evm" [bug_tracker] -url = "https://github.com/tharsis/ethermint/issues" +url = "https://github.com/cerc-io/laconicd/issues" [[authors]] name = "fedekunze" @@ -28,7 +28,7 @@ name = "noot" name = "araskachoi" [version] -documentation = "https://raw.githubusercontent.com/tharsis/ethermint/main/x/evm/atlas/atlas-v0.3.1.md" -repo = "https://github.com/tharsis/ethermint/releases/tag/v0.3.1" +documentation = "https://raw.githubusercontent.com/cerc-io/laconicd/main/x/evm/atlas/atlas-v0.3.1.md" +repo = "https://github.com/cerc-io/laconicd/releases/tag/v0.3.1" sdk_compat = "v0.39.x" version = "v0.3.1" \ No newline at end of file diff --git a/x/evm/client/cli/query.go b/x/evm/client/cli/query.go index 72bda4ac..b15181c1 100644 --- a/x/evm/client/cli/query.go +++ b/x/evm/client/cli/query.go @@ -1,13 +1,13 @@ package cli import ( + rpctypes "github.com/cerc-io/laconicd/rpc/ethereum/types" "github.com/spf13/cobra" - rpctypes "github.com/tharsis/ethermint/rpc/ethereum/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/tharsis/ethermint/x/evm/types" + "github.com/cerc-io/laconicd/x/evm/types" ) // GetQueryCmd returns the parent command for all x/bank CLi query commands. diff --git a/x/evm/client/cli/tx.go b/x/evm/client/cli/tx.go index 200dc400..001af724 100644 --- a/x/evm/client/cli/tx.go +++ b/x/evm/client/cli/tx.go @@ -12,8 +12,8 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - rpctypes "github.com/tharsis/ethermint/rpc/ethereum/types" - "github.com/tharsis/ethermint/x/evm/types" + rpctypes "github.com/cerc-io/laconicd/rpc/ethereum/types" + "github.com/cerc-io/laconicd/x/evm/types" ) // GetTxCmd returns the transaction commands for this module diff --git a/x/evm/genesis.go b/x/evm/genesis.go index 00c45d46..c09eddd2 100644 --- a/x/evm/genesis.go +++ b/x/evm/genesis.go @@ -10,9 +10,9 @@ import ( "github.com/ethereum/go-ethereum/crypto" abci "github.com/tendermint/tendermint/abci/types" - ethermint "github.com/tharsis/ethermint/types" - "github.com/tharsis/ethermint/x/evm/keeper" - "github.com/tharsis/ethermint/x/evm/types" + ethermint "github.com/cerc-io/laconicd/types" + "github.com/cerc-io/laconicd/x/evm/keeper" + "github.com/cerc-io/laconicd/x/evm/types" ) // InitGenesis initializes genesis state based on exported genesis diff --git a/x/evm/genesis_test.go b/x/evm/genesis_test.go index 9a35390b..5793866e 100644 --- a/x/evm/genesis_test.go +++ b/x/evm/genesis_test.go @@ -5,11 +5,11 @@ import ( "github.com/ethereum/go-ethereum/common" + "github.com/cerc-io/laconicd/crypto/ethsecp256k1" + "github.com/cerc-io/laconicd/x/evm" + "github.com/cerc-io/laconicd/x/evm/statedb" + "github.com/cerc-io/laconicd/x/evm/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - "github.com/tharsis/ethermint/crypto/ethsecp256k1" - "github.com/tharsis/ethermint/x/evm" - "github.com/tharsis/ethermint/x/evm/statedb" - "github.com/tharsis/ethermint/x/evm/types" ) func (suite *EvmTestSuite) TestInitGenesis() { diff --git a/x/evm/handler.go b/x/evm/handler.go index 150a4031..6f8c65d2 100644 --- a/x/evm/handler.go +++ b/x/evm/handler.go @@ -4,7 +4,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/tharsis/ethermint/x/evm/types" + "github.com/cerc-io/laconicd/x/evm/types" ) // NewHandler returns a handler for Ethermint type messages. diff --git a/x/evm/handler_test.go b/x/evm/handler_test.go index 1542c678..5282825f 100644 --- a/x/evm/handler_test.go +++ b/x/evm/handler_test.go @@ -8,10 +8,10 @@ import ( "github.com/gogo/protobuf/proto" + feemarkettypes "github.com/cerc-io/laconicd/x/feemarket/types" "github.com/cosmos/cosmos-sdk/simapp" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" "github.com/cosmos/cosmos-sdk/x/bank/testutil" - feemarkettypes "github.com/tharsis/ethermint/x/feemarket/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/ethereum/go-ethereum/common" @@ -25,13 +25,13 @@ import ( "github.com/cosmos/cosmos-sdk/crypto/keyring" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/tharsis/ethermint/app" - "github.com/tharsis/ethermint/crypto/ethsecp256k1" - "github.com/tharsis/ethermint/tests" - ethermint "github.com/tharsis/ethermint/types" - "github.com/tharsis/ethermint/x/evm" - "github.com/tharsis/ethermint/x/evm/statedb" - "github.com/tharsis/ethermint/x/evm/types" + "github.com/cerc-io/laconicd/app" + "github.com/cerc-io/laconicd/crypto/ethsecp256k1" + "github.com/cerc-io/laconicd/tests" + ethermint "github.com/cerc-io/laconicd/types" + "github.com/cerc-io/laconicd/x/evm" + "github.com/cerc-io/laconicd/x/evm/statedb" + "github.com/cerc-io/laconicd/x/evm/types" "github.com/tendermint/tendermint/crypto/tmhash" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" diff --git a/x/evm/keeper/benchmark_test.go b/x/evm/keeper/benchmark_test.go index 889d0b78..67d8823b 100644 --- a/x/evm/keeper/benchmark_test.go +++ b/x/evm/keeper/benchmark_test.go @@ -10,10 +10,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/common" + ethermint "github.com/cerc-io/laconicd/types" + "github.com/cerc-io/laconicd/x/evm/types" ante "github.com/cosmos/cosmos-sdk/x/auth/ante" ethtypes "github.com/ethereum/go-ethereum/core/types" - ethermint "github.com/tharsis/ethermint/types" - "github.com/tharsis/ethermint/x/evm/types" ) func SetupContract(b *testing.B) (*KeeperTestSuite, common.Address) { diff --git a/x/evm/keeper/grpc_query.go b/x/evm/keeper/grpc_query.go index 0400e3e5..26e6a269 100644 --- a/x/evm/keeper/grpc_query.go +++ b/x/evm/keeper/grpc_query.go @@ -24,9 +24,9 @@ import ( "github.com/ethereum/go-ethereum/core/vm" ethparams "github.com/ethereum/go-ethereum/params" - ethermint "github.com/tharsis/ethermint/types" - "github.com/tharsis/ethermint/x/evm/statedb" - "github.com/tharsis/ethermint/x/evm/types" + ethermint "github.com/cerc-io/laconicd/types" + "github.com/cerc-io/laconicd/x/evm/statedb" + "github.com/cerc-io/laconicd/x/evm/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/evm/keeper/grpc_query_test.go b/x/evm/keeper/grpc_query_test.go index da9f8fc6..969da766 100644 --- a/x/evm/keeper/grpc_query_test.go +++ b/x/evm/keeper/grpc_query_test.go @@ -6,18 +6,18 @@ import ( "math/big" "cosmossdk.io/math" + "github.com/cerc-io/laconicd/x/evm/statedb" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" "github.com/ethereum/go-ethereum/core/vm" "github.com/ethereum/go-ethereum/crypto" - "github.com/tharsis/ethermint/x/evm/statedb" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/tharsis/ethermint/crypto/ethsecp256k1" - "github.com/tharsis/ethermint/server/config" - ethermint "github.com/tharsis/ethermint/types" - "github.com/tharsis/ethermint/x/evm/types" + "github.com/cerc-io/laconicd/crypto/ethsecp256k1" + "github.com/cerc-io/laconicd/server/config" + ethermint "github.com/cerc-io/laconicd/types" + "github.com/cerc-io/laconicd/x/evm/types" ) // Not valid Ethereum address diff --git a/x/evm/keeper/hooks.go b/x/evm/keeper/hooks.go index 5bb0952e..d4b5a3a2 100644 --- a/x/evm/keeper/hooks.go +++ b/x/evm/keeper/hooks.go @@ -1,11 +1,11 @@ package keeper import ( + "github.com/cerc-io/laconicd/x/evm/types" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/ethereum/go-ethereum/common" ethtypes "github.com/ethereum/go-ethereum/core/types" - "github.com/tharsis/ethermint/x/evm/types" ) var _ types.EvmHooks = MultiEvmHooks{} diff --git a/x/evm/keeper/hooks_test.go b/x/evm/keeper/hooks_test.go index 3dc5a83e..fd7053f5 100644 --- a/x/evm/keeper/hooks_test.go +++ b/x/evm/keeper/hooks_test.go @@ -8,9 +8,9 @@ import ( "github.com/ethereum/go-ethereum/common" ethtypes "github.com/ethereum/go-ethereum/core/types" - "github.com/tharsis/ethermint/x/evm/keeper" - "github.com/tharsis/ethermint/x/evm/statedb" - "github.com/tharsis/ethermint/x/evm/types" + "github.com/cerc-io/laconicd/x/evm/keeper" + "github.com/cerc-io/laconicd/x/evm/statedb" + "github.com/cerc-io/laconicd/x/evm/types" ) // LogRecordHook records all the logs diff --git a/x/evm/keeper/keeper.go b/x/evm/keeper/keeper.go index b600e77a..84866615 100644 --- a/x/evm/keeper/keeper.go +++ b/x/evm/keeper/keeper.go @@ -16,9 +16,9 @@ import ( "github.com/ethereum/go-ethereum/params" "github.com/tendermint/tendermint/libs/log" - ethermint "github.com/tharsis/ethermint/types" - "github.com/tharsis/ethermint/x/evm/statedb" - "github.com/tharsis/ethermint/x/evm/types" + ethermint "github.com/cerc-io/laconicd/types" + "github.com/cerc-io/laconicd/x/evm/statedb" + "github.com/cerc-io/laconicd/x/evm/types" ) // Keeper grants access to the EVM module state and implements the go-ethereum StateDB interface. diff --git a/x/evm/keeper/keeper_test.go b/x/evm/keeper/keeper_test.go index c059b4ee..63f1e09b 100644 --- a/x/evm/keeper/keeper_test.go +++ b/x/evm/keeper/keeper_test.go @@ -13,6 +13,7 @@ import ( "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" + feemarkettypes "github.com/cerc-io/laconicd/x/feemarket/types" "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" @@ -22,16 +23,15 @@ import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" "github.com/cosmos/cosmos-sdk/x/bank/testutil" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - feemarkettypes "github.com/tharsis/ethermint/x/feemarket/types" - "github.com/tharsis/ethermint/app" - "github.com/tharsis/ethermint/crypto/ethsecp256k1" - "github.com/tharsis/ethermint/encoding" - "github.com/tharsis/ethermint/server/config" - "github.com/tharsis/ethermint/tests" - ethermint "github.com/tharsis/ethermint/types" - "github.com/tharsis/ethermint/x/evm/statedb" - "github.com/tharsis/ethermint/x/evm/types" + "github.com/cerc-io/laconicd/app" + "github.com/cerc-io/laconicd/crypto/ethsecp256k1" + "github.com/cerc-io/laconicd/encoding" + "github.com/cerc-io/laconicd/server/config" + "github.com/cerc-io/laconicd/tests" + ethermint "github.com/cerc-io/laconicd/types" + "github.com/cerc-io/laconicd/x/evm/statedb" + "github.com/cerc-io/laconicd/x/evm/types" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" diff --git a/x/evm/keeper/msg_server.go b/x/evm/keeper/msg_server.go index 54ebb762..e12d0f02 100644 --- a/x/evm/keeper/msg_server.go +++ b/x/evm/keeper/msg_server.go @@ -12,7 +12,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/tharsis/ethermint/x/evm/types" + "github.com/cerc-io/laconicd/x/evm/types" ) var _ types.MsgServer = &Keeper{} diff --git a/x/evm/keeper/params.go b/x/evm/keeper/params.go index dbf0a0fc..00c3965c 100644 --- a/x/evm/keeper/params.go +++ b/x/evm/keeper/params.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/tharsis/ethermint/x/evm/types" + "github.com/cerc-io/laconicd/x/evm/types" ) // GetParams returns the total set of evm parameters. diff --git a/x/evm/keeper/params_test.go b/x/evm/keeper/params_test.go index 9cc6577f..58330b64 100644 --- a/x/evm/keeper/params_test.go +++ b/x/evm/keeper/params_test.go @@ -1,7 +1,7 @@ package keeper_test import ( - "github.com/tharsis/ethermint/x/evm/types" + "github.com/cerc-io/laconicd/x/evm/types" ) func (suite *KeeperTestSuite) TestParams() { diff --git a/x/evm/keeper/state_transition.go b/x/evm/keeper/state_transition.go index fb9a082e..d867ccb2 100644 --- a/x/evm/keeper/state_transition.go +++ b/x/evm/keeper/state_transition.go @@ -11,9 +11,9 @@ import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - ethermint "github.com/tharsis/ethermint/types" - "github.com/tharsis/ethermint/x/evm/statedb" - "github.com/tharsis/ethermint/x/evm/types" + ethermint "github.com/cerc-io/laconicd/types" + "github.com/cerc-io/laconicd/x/evm/statedb" + "github.com/cerc-io/laconicd/x/evm/types" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core" diff --git a/x/evm/keeper/state_transition_benchmark_test.go b/x/evm/keeper/state_transition_benchmark_test.go index 9b4f912d..f7dc5608 100644 --- a/x/evm/keeper/state_transition_benchmark_test.go +++ b/x/evm/keeper/state_transition_benchmark_test.go @@ -5,6 +5,7 @@ import ( "math/big" "testing" + evmtypes "github.com/cerc-io/laconicd/x/evm/types" "github.com/cosmos/cosmos-sdk/crypto/keyring" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/common" @@ -12,7 +13,6 @@ import ( ethtypes "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/params" "github.com/stretchr/testify/require" - evmtypes "github.com/tharsis/ethermint/x/evm/types" ) var templateAccessListTx = ðtypes.AccessListTx{ diff --git a/x/evm/keeper/state_transition_test.go b/x/evm/keeper/state_transition_test.go index 37314ccb..248199f9 100644 --- a/x/evm/keeper/state_transition_test.go +++ b/x/evm/keeper/state_transition_test.go @@ -5,6 +5,9 @@ import ( "math" "math/big" + "github.com/cerc-io/laconicd/tests" + "github.com/cerc-io/laconicd/x/evm/keeper" + "github.com/cerc-io/laconicd/x/evm/types" codectypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" @@ -14,9 +17,6 @@ import ( "github.com/tendermint/tendermint/crypto/tmhash" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" tmtypes "github.com/tendermint/tendermint/types" - "github.com/tharsis/ethermint/tests" - "github.com/tharsis/ethermint/x/evm/keeper" - "github.com/tharsis/ethermint/x/evm/types" ) func (suite *KeeperTestSuite) TestGetHashFn() { diff --git a/x/evm/keeper/statedb.go b/x/evm/keeper/statedb.go index 1dbd6f9b..115d6b7a 100644 --- a/x/evm/keeper/statedb.go +++ b/x/evm/keeper/statedb.go @@ -5,13 +5,13 @@ import ( "fmt" "math/big" + ethermint "github.com/cerc-io/laconicd/types" + "github.com/cerc-io/laconicd/x/evm/statedb" + "github.com/cerc-io/laconicd/x/evm/types" "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/ethereum/go-ethereum/common" - ethermint "github.com/tharsis/ethermint/types" - "github.com/tharsis/ethermint/x/evm/statedb" - "github.com/tharsis/ethermint/x/evm/types" ) var _ statedb.Keeper = &Keeper{} diff --git a/x/evm/keeper/statedb_benchmark_test.go b/x/evm/keeper/statedb_benchmark_test.go index 834a8161..d76f9dbc 100644 --- a/x/evm/keeper/statedb_benchmark_test.go +++ b/x/evm/keeper/statedb_benchmark_test.go @@ -10,7 +10,7 @@ import ( ethtypes "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/crypto" - "github.com/tharsis/ethermint/tests" + "github.com/cerc-io/laconicd/tests" ) func BenchmarkCreateAccountNew(b *testing.B) { diff --git a/x/evm/keeper/statedb_test.go b/x/evm/keeper/statedb_test.go index 65a985bd..cd33d580 100644 --- a/x/evm/keeper/statedb_test.go +++ b/x/evm/keeper/statedb_test.go @@ -11,13 +11,13 @@ import ( authtx "github.com/cosmos/cosmos-sdk/x/auth/tx" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" + "github.com/cerc-io/laconicd/tests" + "github.com/cerc-io/laconicd/x/evm/statedb" + "github.com/cerc-io/laconicd/x/evm/types" "github.com/ethereum/go-ethereum/common" ethtypes "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/core/vm" "github.com/ethereum/go-ethereum/crypto" - "github.com/tharsis/ethermint/tests" - "github.com/tharsis/ethermint/x/evm/statedb" - "github.com/tharsis/ethermint/x/evm/types" ) func (suite *KeeperTestSuite) TestCreateAccount() { diff --git a/x/evm/keeper/utils.go b/x/evm/keeper/utils.go index 7e10547e..89d76227 100644 --- a/x/evm/keeper/utils.go +++ b/x/evm/keeper/utils.go @@ -8,7 +8,7 @@ import ( ante "github.com/cosmos/cosmos-sdk/x/auth/ante" - evmtypes "github.com/tharsis/ethermint/x/evm/types" + evmtypes "github.com/cerc-io/laconicd/x/evm/types" "github.com/ethereum/go-ethereum/core" ethtypes "github.com/ethereum/go-ethereum/core/types" diff --git a/x/evm/keeper/utils_test.go b/x/evm/keeper/utils_test.go index e8921020..a456c7a2 100644 --- a/x/evm/keeper/utils_test.go +++ b/x/evm/keeper/utils_test.go @@ -3,12 +3,12 @@ package keeper_test import ( "math/big" + evmkeeper "github.com/cerc-io/laconicd/x/evm/keeper" + evmtypes "github.com/cerc-io/laconicd/x/evm/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/common" ethtypes "github.com/ethereum/go-ethereum/core/types" ethparams "github.com/ethereum/go-ethereum/params" - evmkeeper "github.com/tharsis/ethermint/x/evm/keeper" - evmtypes "github.com/tharsis/ethermint/x/evm/types" ) func (suite *KeeperTestSuite) TestCheckSenderBalance() { diff --git a/x/evm/module.go b/x/evm/module.go index 1335b263..001dfcda 100644 --- a/x/evm/module.go +++ b/x/evm/module.go @@ -19,10 +19,10 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/tharsis/ethermint/x/evm/client/cli" - "github.com/tharsis/ethermint/x/evm/keeper" - "github.com/tharsis/ethermint/x/evm/simulation" - "github.com/tharsis/ethermint/x/evm/types" + "github.com/cerc-io/laconicd/x/evm/client/cli" + "github.com/cerc-io/laconicd/x/evm/keeper" + "github.com/cerc-io/laconicd/x/evm/simulation" + "github.com/cerc-io/laconicd/x/evm/types" ) var ( diff --git a/x/evm/simulation/decoder.go b/x/evm/simulation/decoder.go index e09e870c..26ad17cb 100644 --- a/x/evm/simulation/decoder.go +++ b/x/evm/simulation/decoder.go @@ -4,9 +4,9 @@ import ( "bytes" "fmt" + "github.com/cerc-io/laconicd/x/evm/types" "github.com/cosmos/cosmos-sdk/types/kv" "github.com/ethereum/go-ethereum/common" - "github.com/tharsis/ethermint/x/evm/types" ) // NewDecodeStore returns a decoder function closure that unmarshals the KVPair's diff --git a/x/evm/simulation/genesis.go b/x/evm/simulation/genesis.go index 1ee9c969..9e85527b 100644 --- a/x/evm/simulation/genesis.go +++ b/x/evm/simulation/genesis.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" - "github.com/tharsis/ethermint/x/evm/types" + "github.com/cerc-io/laconicd/x/evm/types" ) // GenExtraEIPs randomly generates specific extra eips or not. diff --git a/x/evm/simulation/operations.go b/x/evm/simulation/operations.go index c48df808..f7dd29db 100644 --- a/x/evm/simulation/operations.go +++ b/x/evm/simulation/operations.go @@ -28,11 +28,11 @@ import ( cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" - "github.com/tharsis/ethermint/encoding" - "github.com/tharsis/ethermint/server/config" - "github.com/tharsis/ethermint/tests" - "github.com/tharsis/ethermint/x/evm/keeper" - "github.com/tharsis/ethermint/x/evm/types" + "github.com/cerc-io/laconicd/encoding" + "github.com/cerc-io/laconicd/server/config" + "github.com/cerc-io/laconicd/tests" + "github.com/cerc-io/laconicd/x/evm/keeper" + "github.com/cerc-io/laconicd/x/evm/types" ) const ( diff --git a/x/evm/simulation/params.go b/x/evm/simulation/params.go index 94295a5c..c1859d8e 100644 --- a/x/evm/simulation/params.go +++ b/x/evm/simulation/params.go @@ -6,9 +6,9 @@ import ( "fmt" "math/rand" + "github.com/cerc-io/laconicd/x/evm/types" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" "github.com/cosmos/cosmos-sdk/x/simulation" - "github.com/tharsis/ethermint/x/evm/types" ) const ( diff --git a/x/evm/spec/README.md b/x/evm/spec/README.md index 978c997f..fcbf4af9 100644 --- a/x/evm/spec/README.md +++ b/x/evm/spec/README.md @@ -17,7 +17,7 @@ The growth of EVM-based chains (e.g. Ethereum), however, has uncovered several s The `x/evm` module provides this EVM familiarity on a scalable, high-throughput Proof-of-Stake blockchain. It is built as a [Cosmos SDK module](https://docs.cosmos.network/master/building-modules/intro.html) which allows for the deployment of smart contracts, interaction with the EVM state machine (state transitions), and the use of EVM tooling. It can be used on Cosmos application-specific blockchains, which alleviate the aforementioned concerns through high transaction throughput via [Tendermint Core](https://github.com/tendermint/tendermint), fast transaction finality, and horizontal scalability via [IBC](https://ibcprotocol.org/). -The `x/evm` is part of the [ethermint library](https://pkg.go.dev/github.com/tharsis/ethermint). For an example of how Ethermint can be used on any Cosmos-SDK chain, please refer to [Evmos](https://www.github.com/tharsis/evmos). +The `x/evm` is part of the [ethermint library](https://pkg.go.dev/github.com/cerc-io/laconicd). For an example of how Ethermint can be used on any Cosmos-SDK chain, please refer to [Evmos](https://www.github.com/tharsis/evmos). ## Contents @@ -34,8 +34,8 @@ The `x/evm` is part of the [ethermint library](https://pkg.go.dev/github.com/tha ## Module Architecture > **NOTE:**: If you're not familiar with the overall module structure from -the SDK modules, please check this [document](https://docs.cosmos.network/master/building-modules/structure.html) as -prerequisite reading. +> the SDK modules, please check this [document](https://docs.cosmos.network/master/building-modules/structure.html) as +> prerequisite reading. ```shell evm/ diff --git a/x/evm/statedb/mock_test.go b/x/evm/statedb/mock_test.go index 7031419d..17d99eee 100644 --- a/x/evm/statedb/mock_test.go +++ b/x/evm/statedb/mock_test.go @@ -5,10 +5,10 @@ import ( "errors" "math/big" + "github.com/cerc-io/laconicd/x/evm/statedb" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" - "github.com/tharsis/ethermint/x/evm/statedb" ) var ( diff --git a/x/evm/statedb/statedb_test.go b/x/evm/statedb/statedb_test.go index ec390cfc..44b5db7f 100644 --- a/x/evm/statedb/statedb_test.go +++ b/x/evm/statedb/statedb_test.go @@ -4,13 +4,13 @@ import ( "math/big" "testing" + "github.com/cerc-io/laconicd/x/evm/statedb" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/common" ethtypes "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/core/vm" "github.com/ethereum/go-ethereum/crypto" "github.com/stretchr/testify/suite" - "github.com/tharsis/ethermint/x/evm/statedb" ) var ( diff --git a/x/evm/types/access_list_tx.go b/x/evm/types/access_list_tx.go index d318c426..9f775e5a 100644 --- a/x/evm/types/access_list_tx.go +++ b/x/evm/types/access_list_tx.go @@ -3,11 +3,11 @@ package types import ( "math/big" + "github.com/cerc-io/laconicd/types" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/ethereum/go-ethereum/common" ethtypes "github.com/ethereum/go-ethereum/core/types" - "github.com/tharsis/ethermint/types" ) func newAccessListTx(tx *ethtypes.Transaction) (*AccessListTx, error) { diff --git a/x/evm/types/dynamic_fee_tx.go b/x/evm/types/dynamic_fee_tx.go index 76c62172..bcc2ff51 100644 --- a/x/evm/types/dynamic_fee_tx.go +++ b/x/evm/types/dynamic_fee_tx.go @@ -10,7 +10,7 @@ import ( "github.com/ethereum/go-ethereum/common/math" ethtypes "github.com/ethereum/go-ethereum/core/types" - "github.com/tharsis/ethermint/types" + "github.com/cerc-io/laconicd/types" ) func newDynamicFeeTx(tx *ethtypes.Transaction) (*DynamicFeeTx, error) { diff --git a/x/evm/types/dynamic_fee_tx_test.go b/x/evm/types/dynamic_fee_tx_test.go index 1fbee58e..c26e5caf 100644 --- a/x/evm/types/dynamic_fee_tx_test.go +++ b/x/evm/types/dynamic_fee_tx_test.go @@ -4,11 +4,11 @@ import ( "math/big" "testing" + "github.com/cerc-io/laconicd/tests" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/common" ethtypes "github.com/ethereum/go-ethereum/core/types" "github.com/stretchr/testify/suite" - "github.com/tharsis/ethermint/tests" ) type TxDataTestSuite struct { diff --git a/x/evm/types/genesis.go b/x/evm/types/genesis.go index b71c85d0..8b1283e4 100644 --- a/x/evm/types/genesis.go +++ b/x/evm/types/genesis.go @@ -3,7 +3,7 @@ package types import ( "fmt" - ethermint "github.com/tharsis/ethermint/types" + ethermint "github.com/cerc-io/laconicd/types" ) // Validate performs a basic validation of a GenesisAccount fields. diff --git a/x/evm/types/genesis_test.go b/x/evm/types/genesis_test.go index 4f260ee5..d500a43e 100644 --- a/x/evm/types/genesis_test.go +++ b/x/evm/types/genesis_test.go @@ -6,7 +6,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/stretchr/testify/suite" - "github.com/tharsis/ethermint/crypto/ethsecp256k1" + "github.com/cerc-io/laconicd/crypto/ethsecp256k1" ) type GenesisTestSuite struct { diff --git a/x/evm/types/interfaces.go b/x/evm/types/interfaces.go index e36feaf7..457b62aa 100644 --- a/x/evm/types/interfaces.go +++ b/x/evm/types/interfaces.go @@ -8,8 +8,8 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/ethereum/go-ethereum/common" + feemarkettypes "github.com/cerc-io/laconicd/x/feemarket/types" ethtypes "github.com/ethereum/go-ethereum/core/types" - feemarkettypes "github.com/tharsis/ethermint/x/feemarket/types" ) // AccountKeeper defines the expected account keeper interface diff --git a/x/evm/types/legacy_tx.go b/x/evm/types/legacy_tx.go index 1846d7be..7d8048c4 100644 --- a/x/evm/types/legacy_tx.go +++ b/x/evm/types/legacy_tx.go @@ -3,10 +3,10 @@ package types import ( "math/big" + "github.com/cerc-io/laconicd/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/ethereum/go-ethereum/common" ethtypes "github.com/ethereum/go-ethereum/core/types" - "github.com/tharsis/ethermint/types" ) func newLegacyTx(tx *ethtypes.Transaction) (*LegacyTx, error) { diff --git a/x/evm/types/logs.go b/x/evm/types/logs.go index 4cf73c94..84a724f4 100644 --- a/x/evm/types/logs.go +++ b/x/evm/types/logs.go @@ -7,7 +7,7 @@ import ( "github.com/ethereum/go-ethereum/common" ethtypes "github.com/ethereum/go-ethereum/core/types" - ethermint "github.com/tharsis/ethermint/types" + ethermint "github.com/cerc-io/laconicd/types" ) // NewTransactionLogs creates a new NewTransactionLogs instance. diff --git a/x/evm/types/logs_test.go b/x/evm/types/logs_test.go index ebfcba65..4783d193 100644 --- a/x/evm/types/logs_test.go +++ b/x/evm/types/logs_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/tharsis/ethermint/tests" + "github.com/cerc-io/laconicd/tests" "github.com/ethereum/go-ethereum/common" ) diff --git a/x/evm/types/msg.go b/x/evm/types/msg.go index d4d1d8d8..9efc8756 100644 --- a/x/evm/types/msg.go +++ b/x/evm/types/msg.go @@ -14,7 +14,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/auth/signing" authtx "github.com/cosmos/cosmos-sdk/x/auth/tx" - "github.com/tharsis/ethermint/types" + "github.com/cerc-io/laconicd/types" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core" diff --git a/x/evm/types/msg_test.go b/x/evm/types/msg_test.go index 37a6bc7b..3ed44304 100644 --- a/x/evm/types/msg_test.go +++ b/x/evm/types/msg_test.go @@ -8,19 +8,19 @@ import ( "github.com/stretchr/testify/suite" + "github.com/cerc-io/laconicd/crypto/ethsecp256k1" + "github.com/cerc-io/laconicd/tests" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/crypto/keyring" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/tharsis/ethermint/crypto/ethsecp256k1" - "github.com/tharsis/ethermint/tests" "github.com/ethereum/go-ethereum/common" ethtypes "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/crypto" - "github.com/tharsis/ethermint/app" - "github.com/tharsis/ethermint/encoding" - "github.com/tharsis/ethermint/x/evm/types" + "github.com/cerc-io/laconicd/app" + "github.com/cerc-io/laconicd/encoding" + "github.com/cerc-io/laconicd/x/evm/types" ) const invalidFromAddress = "0x0000" diff --git a/x/evm/types/params.go b/x/evm/types/params.go index dc4caa20..10e9a514 100644 --- a/x/evm/types/params.go +++ b/x/evm/types/params.go @@ -6,10 +6,10 @@ import ( "github.com/ethereum/go-ethereum/params" + "github.com/cerc-io/laconicd/types" sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" "github.com/ethereum/go-ethereum/core/vm" - "github.com/tharsis/ethermint/types" ) var _ paramtypes.ParamSet = &Params{} diff --git a/x/evm/types/utils_test.go b/x/evm/types/utils_test.go index d48a3c27..141ca57c 100644 --- a/x/evm/types/utils_test.go +++ b/x/evm/types/utils_test.go @@ -13,9 +13,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" authtx "github.com/cosmos/cosmos-sdk/x/auth/tx" - "github.com/tharsis/ethermint/app" - "github.com/tharsis/ethermint/encoding" - evmtypes "github.com/tharsis/ethermint/x/evm/types" + "github.com/cerc-io/laconicd/app" + "github.com/cerc-io/laconicd/encoding" + evmtypes "github.com/cerc-io/laconicd/x/evm/types" "github.com/ethereum/go-ethereum/common" ) diff --git a/x/feemarket/client/cli/query.go b/x/feemarket/client/cli/query.go index db51c1f0..df6009d9 100644 --- a/x/feemarket/client/cli/query.go +++ b/x/feemarket/client/cli/query.go @@ -12,7 +12,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" grpctypes "github.com/cosmos/cosmos-sdk/types/grpc" - "github.com/tharsis/ethermint/x/feemarket/types" + "github.com/cerc-io/laconicd/x/feemarket/types" ) // GetQueryCmd returns the parent command for all x/feemarket CLI query commands. diff --git a/x/feemarket/genesis.go b/x/feemarket/genesis.go index d2d8e95c..fa72795f 100644 --- a/x/feemarket/genesis.go +++ b/x/feemarket/genesis.go @@ -4,8 +4,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" abci "github.com/tendermint/tendermint/abci/types" - "github.com/tharsis/ethermint/x/feemarket/keeper" - "github.com/tharsis/ethermint/x/feemarket/types" + "github.com/cerc-io/laconicd/x/feemarket/keeper" + "github.com/cerc-io/laconicd/x/feemarket/types" ) // InitGenesis initializes genesis state based on exported genesis diff --git a/x/feemarket/keeper/abci.go b/x/feemarket/keeper/abci.go index 4ad50e8f..7a26dc4b 100644 --- a/x/feemarket/keeper/abci.go +++ b/x/feemarket/keeper/abci.go @@ -3,8 +3,8 @@ package keeper import ( "fmt" + "github.com/cerc-io/laconicd/x/feemarket/types" abci "github.com/tendermint/tendermint/abci/types" - "github.com/tharsis/ethermint/x/feemarket/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/feemarket/keeper/grpc_query.go b/x/feemarket/keeper/grpc_query.go index 2469e52e..1393eec6 100644 --- a/x/feemarket/keeper/grpc_query.go +++ b/x/feemarket/keeper/grpc_query.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/tharsis/ethermint/x/feemarket/types" + "github.com/cerc-io/laconicd/x/feemarket/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/feemarket/keeper/grpc_query_test.go b/x/feemarket/keeper/grpc_query_test.go index b97f4d31..b93bd0ae 100644 --- a/x/feemarket/keeper/grpc_query_test.go +++ b/x/feemarket/keeper/grpc_query_test.go @@ -1,9 +1,9 @@ package keeper_test import ( + "github.com/cerc-io/laconicd/x/feemarket/types" sdk "github.com/cosmos/cosmos-sdk/types" ethparams "github.com/ethereum/go-ethereum/params" - "github.com/tharsis/ethermint/x/feemarket/types" ) func (suite *KeeperTestSuite) TestQueryParams() { diff --git a/x/feemarket/keeper/keeper.go b/x/feemarket/keeper/keeper.go index 644eadbe..69fadc79 100644 --- a/x/feemarket/keeper/keeper.go +++ b/x/feemarket/keeper/keeper.go @@ -6,8 +6,8 @@ import ( paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" "github.com/tendermint/tendermint/libs/log" + "github.com/cerc-io/laconicd/x/feemarket/types" storetypes "github.com/cosmos/cosmos-sdk/store/types" - "github.com/tharsis/ethermint/x/feemarket/types" ) // Keeper grants access to the Fee Market module state. diff --git a/x/feemarket/keeper/keeper_test.go b/x/feemarket/keeper/keeper_test.go index 0d502b04..022bf6e4 100644 --- a/x/feemarket/keeper/keeper_test.go +++ b/x/feemarket/keeper/keeper_test.go @@ -9,18 +9,18 @@ import ( "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" + "github.com/cerc-io/laconicd/app" + "github.com/cerc-io/laconicd/crypto/ethsecp256k1" + "github.com/cerc-io/laconicd/encoding" + "github.com/cerc-io/laconicd/tests" + ethermint "github.com/cerc-io/laconicd/types" + "github.com/cerc-io/laconicd/x/feemarket/types" "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/crypto/keyring" sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - "github.com/tharsis/ethermint/app" - "github.com/tharsis/ethermint/crypto/ethsecp256k1" - "github.com/tharsis/ethermint/encoding" - "github.com/tharsis/ethermint/tests" - ethermint "github.com/tharsis/ethermint/types" - "github.com/tharsis/ethermint/x/feemarket/types" "github.com/ethereum/go-ethereum/common" ethtypes "github.com/ethereum/go-ethereum/core/types" diff --git a/x/feemarket/keeper/migrations.go b/x/feemarket/keeper/migrations.go index 54efbfe6..c08fe4ff 100644 --- a/x/feemarket/keeper/migrations.go +++ b/x/feemarket/keeper/migrations.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - v010 "github.com/tharsis/ethermint/x/feemarket/migrations/v010" + v010 "github.com/cerc-io/laconicd/x/feemarket/migrations/v010" ) // Migrator is a struct for handling in-place store migrations. diff --git a/x/feemarket/keeper/migrations_test.go b/x/feemarket/keeper/migrations_test.go index 9c7f8ff2..79fc938a 100644 --- a/x/feemarket/keeper/migrations_test.go +++ b/x/feemarket/keeper/migrations_test.go @@ -3,8 +3,8 @@ package keeper_test import ( "math/big" - "github.com/tharsis/ethermint/x/feemarket/keeper" - v010 "github.com/tharsis/ethermint/x/feemarket/migrations/v010" + "github.com/cerc-io/laconicd/x/feemarket/keeper" + v010 "github.com/cerc-io/laconicd/x/feemarket/migrations/v010" ) func (suite *KeeperTestSuite) TestMigration1To2() { diff --git a/x/feemarket/keeper/params.go b/x/feemarket/keeper/params.go index 5e7f2c62..e5909845 100644 --- a/x/feemarket/keeper/params.go +++ b/x/feemarket/keeper/params.go @@ -3,8 +3,8 @@ package keeper import ( "math/big" + "github.com/cerc-io/laconicd/x/feemarket/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/tharsis/ethermint/x/feemarket/types" ) // GetParams returns the total set of fee market parameters. diff --git a/x/feemarket/keeper/params_test.go b/x/feemarket/keeper/params_test.go index 68decf15..c1cec4f3 100644 --- a/x/feemarket/keeper/params_test.go +++ b/x/feemarket/keeper/params_test.go @@ -1,7 +1,7 @@ package keeper_test import ( - "github.com/tharsis/ethermint/x/feemarket/types" + "github.com/cerc-io/laconicd/x/feemarket/types" ) func (suite *KeeperTestSuite) TestSetGetParams() { diff --git a/x/feemarket/migrations/v010/migrate.go b/x/feemarket/migrations/v010/migrate.go index 94db41e6..a1645b52 100644 --- a/x/feemarket/migrations/v010/migrate.go +++ b/x/feemarket/migrations/v010/migrate.go @@ -5,10 +5,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" + v09types "github.com/cerc-io/laconicd/x/feemarket/migrations/v09/types" + "github.com/cerc-io/laconicd/x/feemarket/types" storetypes "github.com/cosmos/cosmos-sdk/store/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - v09types "github.com/tharsis/ethermint/x/feemarket/migrations/v09/types" - "github.com/tharsis/ethermint/x/feemarket/types" ) // KeyPrefixBaseFeeV1 is the base fee key prefix used in version 1 diff --git a/x/feemarket/migrations/v010/migrate_test.go b/x/feemarket/migrations/v010/migrate_test.go index 5934d290..84575c65 100644 --- a/x/feemarket/migrations/v010/migrate_test.go +++ b/x/feemarket/migrations/v010/migrate_test.go @@ -9,13 +9,13 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - "github.com/tharsis/ethermint/encoding" + "github.com/cerc-io/laconicd/encoding" - "github.com/tharsis/ethermint/app" - feemarketkeeper "github.com/tharsis/ethermint/x/feemarket/keeper" - v010 "github.com/tharsis/ethermint/x/feemarket/migrations/v010" - "github.com/tharsis/ethermint/x/feemarket/types" - feemarkettypes "github.com/tharsis/ethermint/x/feemarket/types" + "github.com/cerc-io/laconicd/app" + feemarketkeeper "github.com/cerc-io/laconicd/x/feemarket/keeper" + v010 "github.com/cerc-io/laconicd/x/feemarket/migrations/v010" + "github.com/cerc-io/laconicd/x/feemarket/types" + feemarkettypes "github.com/cerc-io/laconicd/x/feemarket/types" ) func TestMigrateStore(t *testing.T) { diff --git a/x/feemarket/module.go b/x/feemarket/module.go index 71e0c6d0..edd1f646 100644 --- a/x/feemarket/module.go +++ b/x/feemarket/module.go @@ -19,10 +19,10 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/tharsis/ethermint/x/feemarket/client/cli" - "github.com/tharsis/ethermint/x/feemarket/keeper" - "github.com/tharsis/ethermint/x/feemarket/simulation" - "github.com/tharsis/ethermint/x/feemarket/types" + "github.com/cerc-io/laconicd/x/feemarket/client/cli" + "github.com/cerc-io/laconicd/x/feemarket/keeper" + "github.com/cerc-io/laconicd/x/feemarket/simulation" + "github.com/cerc-io/laconicd/x/feemarket/types" ) var ( diff --git a/x/feemarket/simulation/genesis.go b/x/feemarket/simulation/genesis.go index b5b5c0ec..f4fd9eac 100644 --- a/x/feemarket/simulation/genesis.go +++ b/x/feemarket/simulation/genesis.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" - "github.com/tharsis/ethermint/x/feemarket/types" + "github.com/cerc-io/laconicd/x/feemarket/types" ) // RandomizedGenState generates a random GenesisState for nft diff --git a/x/nameservice/abci.go b/x/nameservice/abci.go index 7deb1556..f57fc840 100644 --- a/x/nameservice/abci.go +++ b/x/nameservice/abci.go @@ -1,9 +1,9 @@ package nameservice import ( + "github.com/cerc-io/laconicd/x/nameservice/keeper" sdk "github.com/cosmos/cosmos-sdk/types" abci "github.com/tendermint/tendermint/abci/types" - "github.com/tharsis/ethermint/x/nameservice/keeper" ) // BeginBlocker will persist the current header and validator set as a historical entry diff --git a/x/nameservice/client/cli/query.go b/x/nameservice/client/cli/query.go index 71257932..627cd716 100644 --- a/x/nameservice/client/cli/query.go +++ b/x/nameservice/client/cli/query.go @@ -5,11 +5,11 @@ import ( "fmt" "strings" + "github.com/cerc-io/laconicd/x/nameservice/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/version" "github.com/spf13/cobra" - "github.com/tharsis/ethermint/x/nameservice/types" ) // GetQueryCmd returns the cli query commands for this module diff --git a/x/nameservice/client/cli/tx.go b/x/nameservice/client/cli/tx.go index 02840a76..f181ae3c 100644 --- a/x/nameservice/client/cli/tx.go +++ b/x/nameservice/client/cli/tx.go @@ -5,13 +5,13 @@ import ( "io/ioutil" "strings" + "github.com/cerc-io/laconicd/server/flags" + "github.com/cerc-io/laconicd/x/nameservice/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/tx" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/version" "github.com/spf13/cobra" - "github.com/tharsis/ethermint/server/flags" - "github.com/tharsis/ethermint/x/nameservice/types" "gopkg.in/yaml.v3" ) diff --git a/x/nameservice/client/testutil/cli_test.go b/x/nameservice/client/testutil/cli_test.go index 26939954..7b22258b 100644 --- a/x/nameservice/client/testutil/cli_test.go +++ b/x/nameservice/client/testutil/cli_test.go @@ -3,8 +3,8 @@ package testutil import ( "testing" + "github.com/cerc-io/laconicd/testutil/network" "github.com/stretchr/testify/suite" - "github.com/tharsis/ethermint/testutil/network" ) func TestIntegrationTestSuite(t *testing.T) { diff --git a/x/nameservice/client/testutil/grpc.go b/x/nameservice/client/testutil/grpc.go index 2256cee6..138a0c56 100644 --- a/x/nameservice/client/testutil/grpc.go +++ b/x/nameservice/client/testutil/grpc.go @@ -6,13 +6,13 @@ import ( "os" "time" + "github.com/cerc-io/laconicd/x/nameservice/client/cli" + nstypes "github.com/cerc-io/laconicd/x/nameservice/types" "github.com/cosmos/cosmos-sdk/client/flags" clitestutil "github.com/cosmos/cosmos-sdk/testutil/cli" "github.com/cosmos/cosmos-sdk/testutil/rest" sdk "github.com/cosmos/cosmos-sdk/types" tmcli "github.com/tendermint/tendermint/libs/cli" - "github.com/tharsis/ethermint/x/nameservice/client/cli" - nstypes "github.com/tharsis/ethermint/x/nameservice/types" ) func (s *IntegrationTestSuite) TestGRPCQueryParams() { diff --git a/x/nameservice/client/testutil/query.go b/x/nameservice/client/testutil/query.go index 0616fb0b..6fdd3733 100644 --- a/x/nameservice/client/testutil/query.go +++ b/x/nameservice/client/testutil/query.go @@ -6,12 +6,12 @@ import ( "os" "time" + "github.com/cerc-io/laconicd/x/nameservice/client/cli" + "github.com/cerc-io/laconicd/x/nameservice/types" "github.com/cosmos/cosmos-sdk/client/flags" clitestutil "github.com/cosmos/cosmos-sdk/testutil/cli" sdk "github.com/cosmos/cosmos-sdk/types" tmcli "github.com/tendermint/tendermint/libs/cli" - "github.com/tharsis/ethermint/x/nameservice/client/cli" - "github.com/tharsis/ethermint/x/nameservice/types" ) func (s *IntegrationTestSuite) TestGetCmdQueryParams() { diff --git a/x/nameservice/client/testutil/tx.go b/x/nameservice/client/testutil/tx.go index 963fc542..eff742d7 100644 --- a/x/nameservice/client/testutil/tx.go +++ b/x/nameservice/client/testutil/tx.go @@ -6,6 +6,11 @@ import ( "os" "time" + "github.com/cerc-io/laconicd/testutil/network" + bondcli "github.com/cerc-io/laconicd/x/bond/client/cli" + "github.com/cerc-io/laconicd/x/bond/types" + "github.com/cerc-io/laconicd/x/nameservice/client/cli" + nstypes "github.com/cerc-io/laconicd/x/nameservice/types" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/crypto/hd" "github.com/cosmos/cosmos-sdk/crypto/keyring" @@ -15,11 +20,6 @@ import ( banktestutil "github.com/cosmos/cosmos-sdk/x/bank/client/testutil" "github.com/stretchr/testify/suite" tmcli "github.com/tendermint/tendermint/libs/cli" - "github.com/tharsis/ethermint/testutil/network" - bondcli "github.com/tharsis/ethermint/x/bond/client/cli" - "github.com/tharsis/ethermint/x/bond/types" - "github.com/tharsis/ethermint/x/nameservice/client/cli" - nstypes "github.com/tharsis/ethermint/x/nameservice/types" ) var ( diff --git a/x/nameservice/genesis.go b/x/nameservice/genesis.go index 040eea5a..fc082834 100644 --- a/x/nameservice/genesis.go +++ b/x/nameservice/genesis.go @@ -3,10 +3,10 @@ package nameservice import ( "time" + "github.com/cerc-io/laconicd/x/nameservice/keeper" + "github.com/cerc-io/laconicd/x/nameservice/types" sdk "github.com/cosmos/cosmos-sdk/types" abci "github.com/tendermint/tendermint/abci/types" - "github.com/tharsis/ethermint/x/nameservice/keeper" - "github.com/tharsis/ethermint/x/nameservice/types" ) func InitGenesis(ctx sdk.Context, keeper keeper.Keeper, data types.GenesisState) []abci.ValidatorUpdate { diff --git a/x/nameservice/helpers/helpers.go b/x/nameservice/helpers/helpers.go index f2f4ed5d..3f28c9af 100644 --- a/x/nameservice/helpers/helpers.go +++ b/x/nameservice/helpers/helpers.go @@ -8,8 +8,8 @@ import ( "encoding/hex" "encoding/json" + wnsUtils "github.com/cerc-io/laconicd/utils" set "github.com/deckarep/golang-set" - wnsUtils "github.com/tharsis/ethermint/utils" "sort" ) diff --git a/x/nameservice/keeper/grpc_query.go b/x/nameservice/keeper/grpc_query.go index 35620223..1586ffa5 100644 --- a/x/nameservice/keeper/grpc_query.go +++ b/x/nameservice/keeper/grpc_query.go @@ -3,9 +3,9 @@ package keeper import ( "context" + "github.com/cerc-io/laconicd/x/nameservice/types" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/tharsis/ethermint/x/nameservice/types" ) // BondIDAttributeName denotes the record bond ID. diff --git a/x/nameservice/keeper/grpc_query_test.go b/x/nameservice/keeper/grpc_query_test.go index 331a2676..06e94827 100644 --- a/x/nameservice/keeper/grpc_query_test.go +++ b/x/nameservice/keeper/grpc_query_test.go @@ -5,8 +5,8 @@ import ( "fmt" "os" - "github.com/tharsis/ethermint/x/nameservice/client/cli" - nameservicetypes "github.com/tharsis/ethermint/x/nameservice/types" + "github.com/cerc-io/laconicd/x/nameservice/client/cli" + nameservicetypes "github.com/cerc-io/laconicd/x/nameservice/types" ) func (suite *KeeperTestSuite) TestGrpcQueryParams() { diff --git a/x/nameservice/keeper/invariants.go b/x/nameservice/keeper/invariants.go index 00069e31..0f52d82a 100644 --- a/x/nameservice/keeper/invariants.go +++ b/x/nameservice/keeper/invariants.go @@ -1,8 +1,8 @@ package keeper import ( + "github.com/cerc-io/laconicd/x/nameservice/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/tharsis/ethermint/x/nameservice/types" ) // RegisterInvariants registers all nameservice module invariants. diff --git a/x/nameservice/keeper/keeper.go b/x/nameservice/keeper/keeper.go index c4d1c7a9..fa81433d 100644 --- a/x/nameservice/keeper/keeper.go +++ b/x/nameservice/keeper/keeper.go @@ -6,6 +6,10 @@ import ( "sort" "time" + auctionkeeper "github.com/cerc-io/laconicd/x/auction/keeper" + bondkeeper "github.com/cerc-io/laconicd/x/bond/keeper" + "github.com/cerc-io/laconicd/x/nameservice/helpers" + "github.com/cerc-io/laconicd/x/nameservice/types" "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/codec/legacy" storetypes "github.com/cosmos/cosmos-sdk/store/types" @@ -14,10 +18,6 @@ import ( auth "github.com/cosmos/cosmos-sdk/x/auth/keeper" bank "github.com/cosmos/cosmos-sdk/x/bank/keeper" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - auctionkeeper "github.com/tharsis/ethermint/x/auction/keeper" - bondkeeper "github.com/tharsis/ethermint/x/bond/keeper" - "github.com/tharsis/ethermint/x/nameservice/helpers" - "github.com/tharsis/ethermint/x/nameservice/types" ) var ( diff --git a/x/nameservice/keeper/keeper_test.go b/x/nameservice/keeper/keeper_test.go index af50af44..76b4a6c6 100644 --- a/x/nameservice/keeper/keeper_test.go +++ b/x/nameservice/keeper/keeper_test.go @@ -3,6 +3,10 @@ package keeper_test import ( "testing" + "github.com/cerc-io/laconicd/app" + bondtypes "github.com/cerc-io/laconicd/x/bond/types" + nameservicekeeper "github.com/cerc-io/laconicd/x/nameservice/keeper" + "github.com/cerc-io/laconicd/x/nameservice/types" "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/simapp" sdk "github.com/cosmos/cosmos-sdk/types" @@ -10,10 +14,6 @@ import ( "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - "github.com/tharsis/ethermint/app" - bondtypes "github.com/tharsis/ethermint/x/bond/types" - nameservicekeeper "github.com/tharsis/ethermint/x/nameservice/keeper" - "github.com/tharsis/ethermint/x/nameservice/types" ) type KeeperTestSuite struct { diff --git a/x/nameservice/keeper/msg_server.go b/x/nameservice/keeper/msg_server.go index 31224b7a..3bef7bbe 100644 --- a/x/nameservice/keeper/msg_server.go +++ b/x/nameservice/keeper/msg_server.go @@ -3,8 +3,8 @@ package keeper import ( "context" + "github.com/cerc-io/laconicd/x/nameservice/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/tharsis/ethermint/x/nameservice/types" ) type msgServer struct { diff --git a/x/nameservice/keeper/naming_keeper.go b/x/nameservice/keeper/naming_keeper.go index cc61f567..4ab6e16e 100644 --- a/x/nameservice/keeper/naming_keeper.go +++ b/x/nameservice/keeper/naming_keeper.go @@ -7,13 +7,13 @@ import ( "strings" "time" + auctiontypes "github.com/cerc-io/laconicd/x/auction/types" + "github.com/cerc-io/laconicd/x/nameservice/helpers" + "github.com/cerc-io/laconicd/x/nameservice/types" "github.com/cosmos/cosmos-sdk/codec" cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - auctiontypes "github.com/tharsis/ethermint/x/auction/types" - "github.com/tharsis/ethermint/x/nameservice/helpers" - "github.com/tharsis/ethermint/x/nameservice/types" ) func getAuthorityPubKey(pubKey cryptotypes.PubKey) string { diff --git a/x/nameservice/keeper/params.go b/x/nameservice/keeper/params.go index da9c8360..4b40f3e9 100644 --- a/x/nameservice/keeper/params.go +++ b/x/nameservice/keeper/params.go @@ -1,8 +1,8 @@ package keeper import ( + "github.com/cerc-io/laconicd/x/nameservice/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/tharsis/ethermint/x/nameservice/types" ) // GetParams - Get all parameters as types.Params. diff --git a/x/nameservice/keeper/record_keeper.go b/x/nameservice/keeper/record_keeper.go index 8c390498..f3e65f7e 100644 --- a/x/nameservice/keeper/record_keeper.go +++ b/x/nameservice/keeper/record_keeper.go @@ -4,14 +4,14 @@ import ( "fmt" "time" + auctionkeeper "github.com/cerc-io/laconicd/x/auction/keeper" + auctiontypes "github.com/cerc-io/laconicd/x/auction/types" + bondtypes "github.com/cerc-io/laconicd/x/bond/types" + "github.com/cerc-io/laconicd/x/nameservice/types" "github.com/cosmos/cosmos-sdk/codec" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - auctionkeeper "github.com/tharsis/ethermint/x/auction/keeper" - auctiontypes "github.com/tharsis/ethermint/x/auction/types" - bondtypes "github.com/tharsis/ethermint/x/bond/types" - "github.com/tharsis/ethermint/x/nameservice/types" ) // RecordKeeper exposes the bare minimal read-only API for other modules. diff --git a/x/nameservice/keeper/sync.go b/x/nameservice/keeper/sync.go index e0de1d35..215ca3b6 100644 --- a/x/nameservice/keeper/sync.go +++ b/x/nameservice/keeper/sync.go @@ -1,10 +1,10 @@ package keeper import ( + "github.com/cerc-io/laconicd/x/nameservice/helpers" + "github.com/cerc-io/laconicd/x/nameservice/types" "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/tharsis/ethermint/x/nameservice/helpers" - "github.com/tharsis/ethermint/x/nameservice/types" ) func GetBlockChangeSetIndexKey(height int64) []byte { diff --git a/x/nameservice/module.go b/x/nameservice/module.go index d1011fc7..246ce1ce 100644 --- a/x/nameservice/module.go +++ b/x/nameservice/module.go @@ -4,6 +4,10 @@ import ( "context" "encoding/json" "fmt" + + "github.com/cerc-io/laconicd/x/nameservice/client/cli" + "github.com/cerc-io/laconicd/x/nameservice/keeper" + "github.com/cerc-io/laconicd/x/nameservice/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" @@ -13,9 +17,6 @@ import ( "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/spf13/cobra" abci "github.com/tendermint/tendermint/abci/types" - "github.com/tharsis/ethermint/x/nameservice/client/cli" - "github.com/tharsis/ethermint/x/nameservice/keeper" - "github.com/tharsis/ethermint/x/nameservice/types" ) // type check to ensure the interface is properly implemented diff --git a/x/nameservice/types/types.go b/x/nameservice/types/types.go index f60b0cea..86a2109c 100644 --- a/x/nameservice/types/types.go +++ b/x/nameservice/types/types.go @@ -3,8 +3,8 @@ package types import ( "crypto/sha256" + "github.com/cerc-io/laconicd/x/nameservice/helpers" canonicalJson "github.com/gibson042/canonicaljson-go" - "github.com/tharsis/ethermint/x/nameservice/helpers" ) const (