diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index beba3c2f35..47a3a6190a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,7 +19,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v3 with: - go-version: 1.18 + go-version: 1.19 check-latest: true - uses: technote-space/get-diff-action@v6.1.1 id: git_diff diff --git a/.github/workflows/goreleaser.yml b/.github/workflows/goreleaser.yml index 1bda08f33d..a71039bd4e 100644 --- a/.github/workflows/goreleaser.yml +++ b/.github/workflows/goreleaser.yml @@ -15,7 +15,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v3 with: - go-version: 1.18 + go-version: 1.19 check-latest: true - name: release dry run run: make release-dry-run diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index e2ca16e72a..ee0a674066 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -16,7 +16,8 @@ jobs: # Required: setup-go, for all versions v3.0.0+ of golangci-lint - uses: actions/setup-go@v3 with: - go-version: 1.18.3 + go-version: 1.19 + check-latest: true - uses: actions/checkout@v3 - uses: technote-space/get-diff-action@v6.1.1 with: @@ -27,7 +28,7 @@ jobs: - uses: golangci/golangci-lint-action@v3.3.0 with: # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version. - version: v1.46.2 + version: latest args: --timeout 10m github-token: ${{ secrets.github_token }} # Check only if there are differences in the source code diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 07674d8605..5539640983 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -20,7 +20,7 @@ jobs: steps: - uses: actions/setup-go@v3 with: - go-version: 1.18 + go-version: 1.19 check-latest: true - uses: actions/checkout@v3 - uses: technote-space/get-diff-action@v6.1.1 diff --git a/.golangci.yml b/.golangci.yml index 72b18295d7..0da89721f2 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -6,7 +6,6 @@ run: linters: enable: # - bodyclose - - deadcode - depguard - dogsled - dupl @@ -32,7 +31,6 @@ linters: - unconvert # - unparam - unused - - varcheck # - nolintlint - asciicheck # - exhaustive @@ -71,7 +69,7 @@ linters-settings: require-explanation: false require-specific: false gofumpt: - lang-version: "1.18" + lang-version: "1.19" gomodguard: blocked: versions: # List of blocked module version constraints diff --git a/CHANGELOG.md b/CHANGELOG.md index 1323a41654..b456119afd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -37,16 +37,25 @@ Ref: https://keepachangelog.com/en/1.0.0/ ## Unreleased +### State Machine Breaking + +- (deps) [\#1041](https://github.com/evmos/evmos/pull/1041) Add ics23 dragonberry replace in go.mod as mentioned in the [Cosmos SDK release](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.46.4) +- (deps) [\#1037](https://github.com/evmos/evmos/pull/1037) Bump Ethermint version to [`v0.20.0-rc2`](https://github.com/evmos/ethermint/releases/tag/v0.20.0-rc2) + ### API Breaking - (erc20) [\#914](https://github.com/evmos/evmos/pull/914) Support registering multiple assets on `RegisterCoinProposal` and `RegisterERC20Proposal` ### Improvements + +- (go) [\#1039](https://github.com/evmos/evmos/pull/1039) Bump go v1.19 +- (deps) [\#1033](https://github.com/evmos/evmos/pull/1033) Bump Cosmos SDK to [`v0.46.4`](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.46.4) - (ante) [\#993](https://github.com/evmos/evmos/pull/993) Re-order AnteHandlers for better performance - (docs) [\#883](https://github.com/evmos/evmos/pull/883) Add Ethereum tx indexer documentation. - (docs) [\#985](https://github.com/evmos/evmos/pull/985) Specify repo branch name on markdown-link-check configuration. - (docs) [\#980](https://github.com/evmos/evmos/pull/980) Fix documentation links to cosmos-sdk docs. - (cmd) [\#974](https://github.com/evmos/evmos/pull/974) Add `prune` command. +- (cmd) [\#1027](https://github.com/evmos/evmos/pull/1027) Apply Google CLI Syntax for required and optional args. ## [v9.1.0] - 2022-10-25 diff --git a/Dockerfile b/Dockerfile index cb957a5a29..5b2db0f5e7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.19.2-bullseye AS build-env +FROM golang:1.19.3-bullseye AS build-env WORKDIR /go/src/github.com/evmos/evmos @@ -9,7 +9,7 @@ COPY . . RUN make build -FROM golang:1.19.2-bullseye +FROM golang:1.19.3-bullseye RUN apt-get update -y RUN apt-get install ca-certificates jq -y diff --git a/Makefile b/Makefile index 6d178dda21..fca4f233ff 100755 --- a/Makefile +++ b/Makefile @@ -436,7 +436,7 @@ lint-fix-contracts: .PHONY: lint lint-fix format: - find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" -not -path "./client/docs/statik/statik.go" -not -name '*.pb.go' | xargs gofumpt -w -l + find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" -not -path "./client/docs/statik/statik.go" -not -name '*.pb.go' | xargs gofumpt -w -l .PHONY: format @@ -554,7 +554,7 @@ localnet-show-logstream: ############################################################################### PACKAGE_NAME:=github.com/evmos/evmos -GOLANG_CROSS_VERSION = v1.18 +GOLANG_CROSS_VERSION = v1.19 GOPATH ?= '$(HOME)/go' release-dry-run: docker run \ diff --git a/README.md b/README.md index c13dbb25e9..079e010cd4 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ parent: Evmos is a scalable, high-throughput Proof-of-Stake blockchain that is fully compatible and interoperable with Ethereum. It's built using the [Cosmos SDK](https://github.com/cosmos/cosmos-sdk/) which runs on top of [Tendermint Core](https://github.com/tendermint/tendermint) consensus engine. -**Note**: Requires [Go 1.18+](https://golang.org/dl/) +**Note**: Requires [Go 1.19+](https://golang.org/dl/) ## Installation diff --git a/app/ante/handler_options.go b/app/ante/handler_options.go index 6843783afa..9535c2dbbf 100644 --- a/app/ante/handler_options.go +++ b/app/ante/handler_options.go @@ -15,7 +15,7 @@ import ( ethante "github.com/evmos/ethermint/app/ante" evmtypes "github.com/evmos/ethermint/x/evm/types" - vestingtypes "github.com/evmos/evmos/v9/x/vesting/types" + vestingtypes "github.com/evmos/evmos/v10/x/vesting/types" ) // HandlerOptions defines the list of module keepers required to run the Evmos @@ -25,7 +25,7 @@ type HandlerOptions struct { BankKeeper evmtypes.BankKeeper ExtensionOptionChecker ante.ExtensionOptionChecker IBCKeeper *ibckeeper.Keeper - FeeMarketKeeper evmtypes.FeeMarketKeeper + FeeMarketKeeper ethante.FeeMarketKeeper StakingKeeper vestingtypes.StakingKeeper EvmKeeper ethante.EVMKeeper FeegrantKeeper ante.FeegrantKeeper diff --git a/app/ante/utils_test.go b/app/ante/utils_test.go index 4ec9d0a2c7..1d48201a74 100644 --- a/app/ante/utils_test.go +++ b/app/ante/utils_test.go @@ -19,8 +19,8 @@ import ( "github.com/evmos/ethermint/encoding" evmtypes "github.com/evmos/ethermint/x/evm/types" feemarkettypes "github.com/evmos/ethermint/x/feemarket/types" - "github.com/evmos/evmos/v9/app" - claimstypes "github.com/evmos/evmos/v9/x/claims/types" + "github.com/evmos/evmos/v10/app" + claimstypes "github.com/evmos/evmos/v10/x/claims/types" abci "github.com/tendermint/tendermint/abci/types" "github.com/tendermint/tendermint/crypto/tmhash" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" diff --git a/app/ante/vesting.go b/app/ante/vesting.go index 5a2f7e3715..c4974e3c22 100644 --- a/app/ante/vesting.go +++ b/app/ante/vesting.go @@ -9,7 +9,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/authz" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" evmtypes "github.com/evmos/ethermint/x/evm/types" - vestingtypes "github.com/evmos/evmos/v9/x/vesting/types" + vestingtypes "github.com/evmos/evmos/v10/x/vesting/types" ) // EthVestingTransactionDecorator validates if clawback vesting accounts are diff --git a/app/app.go b/app/app.go index 6bac25244a..7586f8f686 100644 --- a/app/app.go +++ b/app/app.go @@ -109,41 +109,41 @@ import ( feemarkettypes "github.com/evmos/ethermint/x/feemarket/types" // unnamed import of statik for swagger UI support - _ "github.com/evmos/evmos/v9/client/docs/statik" - - "github.com/evmos/evmos/v9/app/ante" - v7 "github.com/evmos/evmos/v9/app/upgrades/v7" - v8 "github.com/evmos/evmos/v9/app/upgrades/v8" - v81 "github.com/evmos/evmos/v9/app/upgrades/v8_1" - v82 "github.com/evmos/evmos/v9/app/upgrades/v8_2" - v9 "github.com/evmos/evmos/v9/app/upgrades/v9" - v91 "github.com/evmos/evmos/v9/app/upgrades/v9_1" - "github.com/evmos/evmos/v9/x/claims" - claimskeeper "github.com/evmos/evmos/v9/x/claims/keeper" - claimstypes "github.com/evmos/evmos/v9/x/claims/types" - "github.com/evmos/evmos/v9/x/epochs" - epochskeeper "github.com/evmos/evmos/v9/x/epochs/keeper" - epochstypes "github.com/evmos/evmos/v9/x/epochs/types" - "github.com/evmos/evmos/v9/x/erc20" - erc20client "github.com/evmos/evmos/v9/x/erc20/client" - erc20keeper "github.com/evmos/evmos/v9/x/erc20/keeper" - erc20types "github.com/evmos/evmos/v9/x/erc20/types" - "github.com/evmos/evmos/v9/x/incentives" - incentivesclient "github.com/evmos/evmos/v9/x/incentives/client" - incentiveskeeper "github.com/evmos/evmos/v9/x/incentives/keeper" - incentivestypes "github.com/evmos/evmos/v9/x/incentives/types" - "github.com/evmos/evmos/v9/x/inflation" - inflationkeeper "github.com/evmos/evmos/v9/x/inflation/keeper" - inflationtypes "github.com/evmos/evmos/v9/x/inflation/types" - "github.com/evmos/evmos/v9/x/recovery" - recoverykeeper "github.com/evmos/evmos/v9/x/recovery/keeper" - recoverytypes "github.com/evmos/evmos/v9/x/recovery/types" - "github.com/evmos/evmos/v9/x/revenue" - revenuekeeper "github.com/evmos/evmos/v9/x/revenue/keeper" - revenuetypes "github.com/evmos/evmos/v9/x/revenue/types" - "github.com/evmos/evmos/v9/x/vesting" - vestingkeeper "github.com/evmos/evmos/v9/x/vesting/keeper" - vestingtypes "github.com/evmos/evmos/v9/x/vesting/types" + _ "github.com/evmos/evmos/v10/client/docs/statik" + + "github.com/evmos/evmos/v10/app/ante" + v10 "github.com/evmos/evmos/v10/app/upgrades/v10" + v8 "github.com/evmos/evmos/v10/app/upgrades/v8" + v81 "github.com/evmos/evmos/v10/app/upgrades/v8_1" + v82 "github.com/evmos/evmos/v10/app/upgrades/v8_2" + v9 "github.com/evmos/evmos/v10/app/upgrades/v9" + v91 "github.com/evmos/evmos/v10/app/upgrades/v9_1" + "github.com/evmos/evmos/v10/x/claims" + claimskeeper "github.com/evmos/evmos/v10/x/claims/keeper" + claimstypes "github.com/evmos/evmos/v10/x/claims/types" + "github.com/evmos/evmos/v10/x/epochs" + epochskeeper "github.com/evmos/evmos/v10/x/epochs/keeper" + epochstypes "github.com/evmos/evmos/v10/x/epochs/types" + "github.com/evmos/evmos/v10/x/erc20" + erc20client "github.com/evmos/evmos/v10/x/erc20/client" + erc20keeper "github.com/evmos/evmos/v10/x/erc20/keeper" + erc20types "github.com/evmos/evmos/v10/x/erc20/types" + "github.com/evmos/evmos/v10/x/incentives" + incentivesclient "github.com/evmos/evmos/v10/x/incentives/client" + incentiveskeeper "github.com/evmos/evmos/v10/x/incentives/keeper" + incentivestypes "github.com/evmos/evmos/v10/x/incentives/types" + "github.com/evmos/evmos/v10/x/inflation" + inflationkeeper "github.com/evmos/evmos/v10/x/inflation/keeper" + inflationtypes "github.com/evmos/evmos/v10/x/inflation/types" + "github.com/evmos/evmos/v10/x/recovery" + recoverykeeper "github.com/evmos/evmos/v10/x/recovery/keeper" + recoverytypes "github.com/evmos/evmos/v10/x/recovery/types" + "github.com/evmos/evmos/v10/x/revenue" + revenuekeeper "github.com/evmos/evmos/v10/x/revenue/keeper" + revenuetypes "github.com/evmos/evmos/v10/x/revenue/types" + "github.com/evmos/evmos/v10/x/vesting" + vestingkeeper "github.com/evmos/evmos/v10/x/vesting/keeper" + vestingtypes "github.com/evmos/evmos/v10/x/vesting/types" ) func init() { @@ -1062,17 +1062,6 @@ func initParamsKeeper( } func (app *Evmos) setupUpgradeHandlers() { - // v7 upgrade handler - app.UpgradeKeeper.SetUpgradeHandler( - v7.UpgradeName, - v7.CreateUpgradeHandler( - app.mm, app.configurator, - app.BankKeeper, - app.InflationKeeper, - app.ClaimsKeeper, - ), - ) - // v8 upgrade handler app.UpgradeKeeper.SetUpgradeHandler( v8.UpgradeName, @@ -1115,6 +1104,14 @@ func (app *Evmos) setupUpgradeHandlers() { ), ) + // v10 upgrade handler + app.UpgradeKeeper.SetUpgradeHandler( + v10.UpgradeName, + v10.CreateUpgradeHandler( + app.mm, app.configurator, + ), + ) + // When a planned update height is reached, the old binary will panic // writing on disk the height and name of the update that triggered it // This will read that value, and execute the preparations for the upgrade. @@ -1130,8 +1127,6 @@ func (app *Evmos) setupUpgradeHandlers() { var storeUpgrades *storetypes.StoreUpgrades switch upgradeInfo.Name { - case v7.UpgradeName: - // no store upgrades in v7 case v8.UpgradeName: // add revenue module for testnet (v7 -> v8) storeUpgrades = &storetypes.StoreUpgrades{ @@ -1147,10 +1142,10 @@ func (app *Evmos) setupUpgradeHandlers() { Added: []string{revenuetypes.ModuleName}, Deleted: []string{"feesplit"}, } - case v9.UpgradeName: - // no store upgrade in v9 - case v91.UpgradeName: - // no store upgrade in v9 + case v9.UpgradeName, v91.UpgradeName: + // no store upgrade in v9 or v9.1 + case v10.UpgradeName: + // no store upgrades in v10 } if storeUpgrades != nil { diff --git a/app/app_test.go b/app/app_test.go index f03bb69b25..b56bed1025 100644 --- a/app/app_test.go +++ b/app/app_test.go @@ -20,8 +20,8 @@ import ( dbm "github.com/tendermint/tm-db" "github.com/evmos/ethermint/encoding" - "github.com/evmos/evmos/v9/types" - claimstypes "github.com/evmos/evmos/v9/x/claims/types" + "github.com/evmos/evmos/v10/types" + claimstypes "github.com/evmos/evmos/v10/x/claims/types" ) func TestEvmosExport(t *testing.T) { diff --git a/app/forks.go b/app/forks.go index c06ecc696a..8c867fe943 100644 --- a/app/forks.go +++ b/app/forks.go @@ -6,9 +6,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - v7 "github.com/evmos/evmos/v9/app/upgrades/v7" - v82 "github.com/evmos/evmos/v9/app/upgrades/v8_2" - "github.com/evmos/evmos/v9/types" + v82 "github.com/evmos/evmos/v10/app/upgrades/v8_2" + "github.com/evmos/evmos/v10/types" ) // ScheduleForkUpgrade executes any necessary fork logic for based upon the current @@ -31,9 +30,6 @@ func (app *Evmos) ScheduleForkUpgrade(ctx sdk.Context) { // handle mainnet forks with their corresponding upgrade name and info switch ctx.BlockHeight() { - case v7.MainnetUpgradeHeight: - upgradePlan.Name = v7.UpgradeName - upgradePlan.Info = v7.UpgradeInfo case v82.MainnetUpgradeHeight: upgradePlan.Name = v82.UpgradeName upgradePlan.Info = v82.UpgradeInfo diff --git a/app/test_helpers.go b/app/test_helpers.go index 51c5ae6184..52b0974cbe 100644 --- a/app/test_helpers.go +++ b/app/test_helpers.go @@ -20,13 +20,13 @@ import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - claimstypes "github.com/evmos/evmos/v9/x/claims/types" + claimstypes "github.com/evmos/evmos/v10/x/claims/types" "github.com/evmos/ethermint/encoding" feemarkettypes "github.com/evmos/ethermint/x/feemarket/types" - "github.com/evmos/evmos/v9/cmd/config" - "github.com/evmos/evmos/v9/types" + "github.com/evmos/evmos/v10/cmd/config" + "github.com/evmos/evmos/v10/types" ) func init() { diff --git a/app/upgrades/v10/constants.go b/app/upgrades/v10/constants.go new file mode 100644 index 0000000000..401489e374 --- /dev/null +++ b/app/upgrades/v10/constants.go @@ -0,0 +1,8 @@ +package v10 + +const ( + // UpgradeName is the shared upgrade plan name for mainnet + UpgradeName = "v10.0.0" + // UpgradeInfo defines the binaries that will be used for the upgrade + UpgradeInfo = `'{"binaries":{"darwin/arm64":"https://github.com/evmos/evmos/releases/download/v10.0.0/evmos_10.0.0_Darwin_arm64.tar.gz","darwin/amd64":"https://github.com/evmos/evmos/releases/download/v10.0.0/evmos_10.0.0_Darwin_amd64.tar.gz","linux/arm64":"https://github.com/evmos/evmos/releases/download/v10.0.0/evmos_10.0.0_Linux_arm64.tar.gz","linux/amd64":"https://github.com/evmos/evmos/releases/download/v10.0.0/evmos_10.0.0_Linux_amd64.tar.gz","windows/x86_64":"https://github.com/evmos/evmos/releases/download/v10.0.0/evmos_10.0.0_Windows_x86_64.zip"}}'` +) diff --git a/app/upgrades/v10/upgrades.go b/app/upgrades/v10/upgrades.go new file mode 100644 index 0000000000..ab8a948fc3 --- /dev/null +++ b/app/upgrades/v10/upgrades.go @@ -0,0 +1,21 @@ +package v10 + +import ( + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/types/module" + upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" +) + +// CreateUpgradeHandler creates an SDK upgrade handler for v10 +func CreateUpgradeHandler( + mm *module.Manager, + configurator module.Configurator, +) upgradetypes.UpgradeHandler { + return func(ctx sdk.Context, _ upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) { + logger := ctx.Logger().With("upgrade", UpgradeName) + + // Leave modules are as-is to avoid running InitGenesis. + logger.Debug("running module migrations ...") + return mm.RunMigrations(ctx, configurator, vm) + } +} diff --git a/app/upgrades/v7/constants.go b/app/upgrades/v7/constants.go deleted file mode 100644 index b6fca3ebec..0000000000 --- a/app/upgrades/v7/constants.go +++ /dev/null @@ -1,22 +0,0 @@ -package v7 - -const ( - // UpgradeName is the shared upgrade plan name for mainnet and testnet - UpgradeName = "v7.0.0" - // MainnetUpgradeHeight defines the Evmos mainnet block height on which the upgrade will take place - MainnetUpgradeHeight = 2_476_000 - // TODO: TestnetUpgradeHeight defines the Evmos testnet block height on which the upgrade will take place - TestnetUpgradeHeight = 2_176_500 - // UpgradeInfo defines the binaries that will be used for the upgrade - UpgradeInfo = `'{"binaries":{"darwin/arm64":"https://github.com/evmos/evmos/releases/download/v7.0.0/evmos_7.0.0_Darwin_arm64.tar.gz","darwin/x86_64":"https://github.com/evmos/evmos/releases/download/v7.0.0/evmos_7.0.0_Darwin_x86_64.tar.gz","linux/arm64":"https://github.com/evmos/evmos/releases/download/v7.0.0/evmos_7.0.0_Linux_arm64.tar.gz","linux/amd64":"https://github.com/evmos/evmos/releases/download/v7.0.0/evmos_7.0.0_Linux_x86_64.tar.gz","windows/x86_64":"https://github.com/evmos/evmos/releases/download/v7.0.0/evmos_7.0.0_Windows_x86_64.zip"}}'` - - // FaucetAddressFrom is the inaccessible secp address of the Testnet Faucet - FaucetAddressFrom = "evmos1z4ya98ga2xnffn2mhjym7tzlsm49ec23890sze" - // FaucetAddressTo is the new eth_secp address of the Testnet Faucet - FaucetAddressTo = "evmos1ujm4z5v9zkdqm70xnptr027gqu90f7lxjr0fch" - - // ContributorAddrFrom is the lost address of an early contributor - ContributorAddrFrom = "evmos1659xwt0hnu5humgek7scefhnpcm2w6hyvy4fsq" - // ContributorAddrTo is the new address of an early contributor - ContributorAddrTo = "evmos1pktlmqrz448cuazl98tqmsj4kjwpqpmaa0cjcf" -) diff --git a/app/upgrades/v7/upgrades.go b/app/upgrades/v7/upgrades.go deleted file mode 100644 index 6d87dd4be0..0000000000 --- a/app/upgrades/v7/upgrades.go +++ /dev/null @@ -1,99 +0,0 @@ -package v7 - -import ( - sdkerrors "cosmossdk.io/errors" - sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/cosmos-sdk/types/module" - bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" - upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - - "github.com/evmos/evmos/v9/types" - claimskeeper "github.com/evmos/evmos/v9/x/claims/keeper" - inflationkeeper "github.com/evmos/evmos/v9/x/inflation/keeper" -) - -// CreateUpgradeHandler creates an SDK upgrade handler for v7 -func CreateUpgradeHandler( - mm *module.Manager, - configurator module.Configurator, - bk bankkeeper.Keeper, - ik inflationkeeper.Keeper, - ck *claimskeeper.Keeper, -) upgradetypes.UpgradeHandler { - return func(ctx sdk.Context, _ upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) { - logger := ctx.Logger().With("upgrade", UpgradeName) - - // Refs: - // - https://docs.cosmos.network/master/building-modules/upgrade.html#registering-migrations - // - https://docs.cosmos.network/master/migrations/chain-upgrade-guide-044.html#chain-upgrade - - if types.IsTestnet(ctx.ChainID()) { - logger.Debug("migrating inaccessible balance of secp faucet account...") - if err := MigrateFaucetBalances(ctx, bk); err != nil { - // log error instead of aborting the upgrade - logger.Error("FAILED TO MIGRATE FAUCET BALANCES", "error", err.Error()) - } - } - - if types.IsMainnet(ctx.ChainID()) { - logger.Debug("migrating skipped epochs value of inflation module...") - MigrateSkippedEpochs(ctx, ik) - - logger.Debug("migrating early contributor's claim record to new address...") - MigrateContributorClaim(ctx, ck) - } - - // Leave modules are as-is to avoid running InitGenesis. - logger.Debug("running module migrations ...") - return mm.RunMigrations(ctx, configurator, vm) - } -} - -// MigrateFaucetBalances transfers all balances of the inaccessible secp256k1 -// Faucet address on testnet to a eth_secp256k1 address. -func MigrateFaucetBalances(ctx sdk.Context, bk bankkeeper.Keeper) error { - from := sdk.MustAccAddressFromBech32(FaucetAddressFrom) - to := sdk.MustAccAddressFromBech32(FaucetAddressTo) - balances := bk.GetAllBalances(ctx, from) - if err := bk.SendCoins(ctx, from, to, balances); err != nil { - return sdkerrors.Wrap(err, "failed to migrate Faucet Balances") - } - return nil -} - -// MigrateSkippedEpochs migrates the number of skipped epochs to be lower -// than the previous stored value, due to an overcounting of two epochs pre v6.0.0. -// - launch date: 2022-03-02 20:00:00 -// - halt date: 2022-03-06 22:11:42 (Block 58701) -// - relaunch date: 2022-04-27 18:00:00 -// - inflation turned on: 2022-06-06 6:35:30 (skippedEpochs (incorrect) = 94 at this point) -// - counting mechanism fixed: 2022-07-04 (v6.0.0) -// = current date: 2022-07-07 13:00:00 -// - currentEpochDay = 128 -// = currentEpochWeek = 19 -// - skippedEpochs (incorrectly calculated) = 94 -// - 127 epochs have fully passed since launch -// - Of these 127 epochs, inflation has been enabled (at the end of the epoch) for 4 (pre-halt) + 31 (post-inflation-enabled) = 35 epochs -// - So the number of skippedEpochs (those with inflation disabled) should be 127 - 35 = 92 epochs, not 94 epochs -// - Can also see this by calculating number of completed epochs between halt date and date inflation turned on: 92 epochs between 3/6/2022 22:11:42, 6/6/2022 6:35:30 -// Since skippedEpochs past v6.0.0 will be counted correctly (via PR #554), then we just account for the overcounting of 2 epochs -func MigrateSkippedEpochs(ctx sdk.Context, ik inflationkeeper.Keeper) { - previousValue := ik.GetSkippedEpochs(ctx) - newValue := previousValue - uint64(2) - ik.SetSkippedEpochs(ctx, newValue) -} - -// MigrateContributorClaim migrates the claims record of a specific early -// contributor from one address to another -func MigrateContributorClaim(ctx sdk.Context, k *claimskeeper.Keeper) { - from, _ := sdk.AccAddressFromBech32(ContributorAddrFrom) - to, _ := sdk.AccAddressFromBech32(ContributorAddrTo) - - cr, found := k.GetClaimsRecord(ctx, from) - if !found { - return - } - - k.DeleteClaimsRecord(ctx, from) - k.SetClaimsRecord(ctx, to, cr) -} diff --git a/app/upgrades/v7/upgrades_test.go b/app/upgrades/v7/upgrades_test.go deleted file mode 100644 index de7c410a35..0000000000 --- a/app/upgrades/v7/upgrades_test.go +++ /dev/null @@ -1,200 +0,0 @@ -package v7_test - -import ( - "fmt" - "testing" - "time" - - "github.com/stretchr/testify/suite" - - "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" - - sdk "github.com/cosmos/cosmos-sdk/types" - - "github.com/evmos/ethermint/crypto/ethsecp256k1" - feemarkettypes "github.com/evmos/ethermint/x/feemarket/types" - - "github.com/evmos/evmos/v9/app" - v7 "github.com/evmos/evmos/v9/app/upgrades/v7" - "github.com/evmos/evmos/v9/testutil" - evmostypes "github.com/evmos/evmos/v9/types" - claimstypes "github.com/evmos/evmos/v9/x/claims/types" -) - -type UpgradeTestSuite struct { - suite.Suite - - ctx sdk.Context - app *app.Evmos - consAddress sdk.ConsAddress -} - -func (suite *UpgradeTestSuite) SetupTest(chainID string) { - checkTx := false - - // consensus key - priv, err := ethsecp256k1.GenerateKey() - suite.Require().NoError(err) - suite.consAddress = sdk.ConsAddress(priv.PubKey().Address()) - - // NOTE: this is the new binary, not the old one. - suite.app = app.Setup(checkTx, feemarkettypes.DefaultGenesisState()) - suite.ctx = suite.app.BaseApp.NewContext(checkTx, tmproto.Header{ - Height: 1, - ChainID: chainID, - Time: time.Date(2022, 5, 9, 8, 0, 0, 0, time.UTC), - ProposerAddress: suite.consAddress.Bytes(), - - Version: tmversion.Consensus{ - Block: version.BlockProtocol, - }, - LastBlockId: tmproto.BlockID{ - Hash: tmhash.Sum([]byte("block_id")), - PartSetHeader: tmproto.PartSetHeader{ - Total: 11, - Hash: tmhash.Sum([]byte("partset_header")), - }, - }, - AppHash: tmhash.Sum([]byte("app")), - DataHash: tmhash.Sum([]byte("data")), - EvidenceHash: tmhash.Sum([]byte("evidence")), - ValidatorsHash: tmhash.Sum([]byte("validators")), - NextValidatorsHash: tmhash.Sum([]byte("next_validators")), - ConsensusHash: tmhash.Sum([]byte("consensus")), - LastResultsHash: tmhash.Sum([]byte("last_result")), - }) - - cp := suite.app.BaseApp.GetConsensusParams(suite.ctx) - suite.ctx = suite.ctx.WithConsensusParams(cp) -} - -func TestUpgradeTestSuite(t *testing.T) { - s := new(UpgradeTestSuite) - suite.Run(t, s) -} - -func (suite *UpgradeTestSuite) TestMigrateFaucetBalance() { - from := sdk.MustAccAddressFromBech32(v7.FaucetAddressFrom) - to := sdk.MustAccAddressFromBech32(v7.FaucetAddressTo) - - testCases := []struct { - name string - chainID string - expectedMigration bool - }{ - { - "Testnet - sucess", - evmostypes.TestnetChainID + "-4", - true, - }, - } - - for _, tc := range testCases { - suite.Run(fmt.Sprintf("Case %s", tc.name), func() { - suite.SetupTest(tc.chainID) // reset - - coins := sdk.NewCoins(sdk.NewCoin(suite.app.StakingKeeper.BondDenom(suite.ctx), sdk.NewInt(1000))) - err := testutil.FundAccount(suite.ctx, suite.app.BankKeeper, from, coins) - suite.Require().NoError(err) - - suite.Require().NotPanics(func() { - v7.MigrateFaucetBalances(suite.ctx, suite.app.BankKeeper) - suite.app.Commit() - }) - - balancesFrom := suite.app.BankKeeper.GetAllBalances(suite.ctx, from) - balancesTo := suite.app.BankKeeper.GetAllBalances(suite.ctx, to) - - if tc.expectedMigration { - suite.Require().True(balancesFrom.IsZero()) - suite.Require().Equal(coins, balancesTo) - } else { - suite.Require().Equal(coins, balancesFrom) - suite.Require().Nil(balancesTo) - } - }) - } -} - -func (suite *UpgradeTestSuite) TestMigrateSkippedEpochs() { - testCases := []struct { - name string - chainID string - malleate func() - expectedSkippedEpochs uint64 - }{ - { - "success", - evmostypes.MainnetChainID + "-2", - func() { - suite.app.InflationKeeper.SetSkippedEpochs(suite.ctx, uint64(94)) - }, - uint64(92), - }, - } - - for _, tc := range testCases { - suite.Run(fmt.Sprintf("Case %s", tc.name), func() { - suite.SetupTest(tc.chainID) // reset - - tc.malleate() - - suite.Require().NotPanics(func() { - v7.MigrateSkippedEpochs(suite.ctx, suite.app.InflationKeeper) - }) - - newSkippedEpochs := suite.app.InflationKeeper.GetSkippedEpochs(suite.ctx) - suite.Require().Equal(tc.expectedSkippedEpochs, newSkippedEpochs) - }) - } -} - -func (suite *UpgradeTestSuite) TestMigrateClaim() { - from, err := sdk.AccAddressFromBech32(v7.ContributorAddrFrom) - suite.Require().NoError(err) - to, err := sdk.AccAddressFromBech32(v7.ContributorAddrTo) - suite.Require().NoError(err) - cr := claimstypes.ClaimsRecord{InitialClaimableAmount: sdk.NewInt(100), ActionsCompleted: []bool{false, false, false, false}} - - testCases := []struct { - name string - malleate func() - expPass bool - }{ - { - "with claims record", - func() { - suite.app.ClaimsKeeper.SetClaimsRecord(suite.ctx, from, cr) - }, - true, - }, - { - "without claims record", - func() { - }, - false, - }, - } - for _, tc := range testCases { - suite.Run(fmt.Sprintf("Case %s", tc.name), func() { - suite.SetupTest(evmostypes.TestnetChainID + "-2") // reset - - tc.malleate() - - v7.MigrateContributorClaim(suite.ctx, suite.app.ClaimsKeeper) - - _, foundFrom := suite.app.ClaimsKeeper.GetClaimsRecord(suite.ctx, from) - crTo, foundTo := suite.app.ClaimsKeeper.GetClaimsRecord(suite.ctx, to) - if tc.expPass { - suite.Require().False(foundFrom) - suite.Require().True(foundTo) - suite.Require().Equal(crTo, cr) - } else { - suite.Require().False(foundTo) - } - }) - } -} diff --git a/app/upgrades/v8/upgrades_test.go b/app/upgrades/v8/upgrades_test.go index bb32f7c721..9c27e6ca09 100644 --- a/app/upgrades/v8/upgrades_test.go +++ b/app/upgrades/v8/upgrades_test.go @@ -16,7 +16,7 @@ import ( "github.com/evmos/ethermint/crypto/ethsecp256k1" feemarkettypes "github.com/evmos/ethermint/x/feemarket/types" - "github.com/evmos/evmos/v9/app" + "github.com/evmos/evmos/v10/app" ) type UpgradeTestSuite struct { diff --git a/app/upgrades/v9/upgrades.go b/app/upgrades/v9/upgrades.go index 927bcdee67..dd19342aa0 100644 --- a/app/upgrades/v9/upgrades.go +++ b/app/upgrades/v9/upgrades.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" distrKeeper "github.com/cosmos/cosmos-sdk/x/distribution/keeper" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/evmos/evmos/v9/types" + "github.com/evmos/evmos/v10/types" ) // CreateUpgradeHandler creates an SDK upgrade handler for v9 diff --git a/app/upgrades/v9/upgrades_test.go b/app/upgrades/v9/upgrades_test.go index 195aa8fdf6..08922b2478 100644 --- a/app/upgrades/v9/upgrades_test.go +++ b/app/upgrades/v9/upgrades_test.go @@ -17,10 +17,10 @@ import ( "github.com/evmos/ethermint/crypto/ethsecp256k1" feemarkettypes "github.com/evmos/ethermint/x/feemarket/types" - "github.com/evmos/evmos/v9/app" - v9 "github.com/evmos/evmos/v9/app/upgrades/v9" - evmostypes "github.com/evmos/evmos/v9/types" - "github.com/evmos/evmos/v9/x/erc20/types" + "github.com/evmos/evmos/v10/app" + v9 "github.com/evmos/evmos/v10/app/upgrades/v9" + evmostypes "github.com/evmos/evmos/v10/types" + "github.com/evmos/evmos/v10/x/erc20/types" ) type UpgradeTestSuite struct { diff --git a/app/upgrades/v9_1/upgrades.go b/app/upgrades/v9_1/upgrades.go index 3a48ccbaad..cf5ac6ee75 100644 --- a/app/upgrades/v9_1/upgrades.go +++ b/app/upgrades/v9_1/upgrades.go @@ -10,7 +10,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" distrKeeper "github.com/cosmos/cosmos-sdk/x/distribution/keeper" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/evmos/evmos/v9/types" + "github.com/evmos/evmos/v10/types" ) // CreateUpgradeHandler creates an SDK upgrade handler for v9 diff --git a/app/upgrades/v9_1/upgrades_test.go b/app/upgrades/v9_1/upgrades_test.go index 3e8466170a..290f3ed9b6 100644 --- a/app/upgrades/v9_1/upgrades_test.go +++ b/app/upgrades/v9_1/upgrades_test.go @@ -18,10 +18,10 @@ import ( "github.com/evmos/ethermint/crypto/ethsecp256k1" feemarkettypes "github.com/evmos/ethermint/x/feemarket/types" - "github.com/evmos/evmos/v9/app" - v9 "github.com/evmos/evmos/v9/app/upgrades/v9_1" - evmostypes "github.com/evmos/evmos/v9/types" - "github.com/evmos/evmos/v9/x/erc20/types" + "github.com/evmos/evmos/v10/app" + v9 "github.com/evmos/evmos/v10/app/upgrades/v9_1" + evmostypes "github.com/evmos/evmos/v10/types" + "github.com/evmos/evmos/v10/x/erc20/types" ) type UpgradeTestSuite struct { @@ -77,7 +77,6 @@ func TestUpgradeTestSuite(t *testing.T) { } func (suite *UpgradeTestSuite) TestMigrateFaucetBalance() { - firstAccountAmount := v9.Accounts[0][1] thousandAccountAmount := v9.Accounts[1000][1] diff --git a/cmd/evmosd/cmd_test.go b/cmd/evmosd/cmd_test.go index 60dbea88c8..b61b882d27 100644 --- a/cmd/evmosd/cmd_test.go +++ b/cmd/evmosd/cmd_test.go @@ -9,8 +9,8 @@ import ( "github.com/cosmos/cosmos-sdk/x/genutil/client/cli" "github.com/stretchr/testify/require" - "github.com/evmos/evmos/v9/app" - evmosd "github.com/evmos/evmos/v9/cmd/evmosd" + "github.com/evmos/evmos/v10/app" + evmosd "github.com/evmos/evmos/v10/cmd/evmosd" ) func TestInitCmd(t *testing.T) { @@ -31,7 +31,7 @@ func TestAddKeyLedgerCmd(t *testing.T) { rootCmd.SetArgs([]string{ "keys", "add", - "mykey", + "dev0", fmt.Sprintf("--%s", flags.FlagUseLedger), }) diff --git a/cmd/evmosd/genaccounts.go b/cmd/evmosd/genaccounts.go index 1f5c011447..c0ded21151 100644 --- a/cmd/evmosd/genaccounts.go +++ b/cmd/evmosd/genaccounts.go @@ -23,10 +23,10 @@ import ( ethermint "github.com/evmos/ethermint/types" evmtypes "github.com/evmos/ethermint/x/evm/types" - evmoskr "github.com/evmos/evmos/v9/crypto/keyring" + evmoskr "github.com/evmos/evmos/v10/crypto/keyring" - vestingcli "github.com/evmos/evmos/v9/x/vesting/client/cli" - vestingtypes "github.com/evmos/evmos/v9/x/vesting/types" + vestingcli "github.com/evmos/evmos/v10/x/vesting/client/cli" + vestingtypes "github.com/evmos/evmos/v10/x/vesting/types" ) const ( @@ -36,7 +36,7 @@ const ( // AddGenesisAccountCmd returns add-genesis-account cobra Command. func AddGenesisAccountCmd(defaultNodeHome string) *cobra.Command { cmd := &cobra.Command{ - Use: "add-genesis-account [address_or_key_name] [coin][,[coin]]", + Use: "add-genesis-account ADDRESS_OR_KEY_NAME COIN...", Short: "Add a genesis account to genesis.json", Long: `Add a genesis account to genesis.json. The provided account must specify the account address or key name and a list of initial coins. If a key name is given, diff --git a/cmd/evmosd/init.go b/cmd/evmosd/init.go index f2bfbc14c0..aca543e56c 100644 --- a/cmd/evmosd/init.go +++ b/cmd/evmosd/init.go @@ -65,7 +65,7 @@ func displayInfo(info printInfo) error { // and the respective application. func InitCmd(mbm module.BasicManager, defaultNodeHome string) *cobra.Command { cmd := &cobra.Command{ - Use: "init [moniker]", + Use: "init MONIKER", Short: "Initialize private validator, p2p, genesis, and application configuration files", Long: `Initialize validators's and node's configuration files.`, Args: cobra.ExactArgs(1), diff --git a/cmd/evmosd/main.go b/cmd/evmosd/main.go index 11dab31508..edb30b68b5 100644 --- a/cmd/evmosd/main.go +++ b/cmd/evmosd/main.go @@ -7,8 +7,8 @@ import ( svrcmd "github.com/cosmos/cosmos-sdk/server/cmd" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/evmos/evmos/v9/app" - cmdcfg "github.com/evmos/evmos/v9/cmd/config" + "github.com/evmos/evmos/v10/app" + cmdcfg "github.com/evmos/evmos/v10/cmd/config" ) func main() { diff --git a/cmd/evmosd/migrate.go b/cmd/evmosd/migrate.go index c54a072bdd..70b9465931 100644 --- a/cmd/evmosd/migrate.go +++ b/cmd/evmosd/migrate.go @@ -16,7 +16,7 @@ import ( "github.com/cosmos/cosmos-sdk/version" genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types" - "github.com/evmos/evmos/v9/types" + "github.com/evmos/evmos/v10/types" ) // FlagGenesisTime defines the genesis time in string format @@ -36,7 +36,7 @@ func GetMigrationCallback(version, chainID string) genutiltypes.MigrationCallbac // MigrateGenesisCmd returns a command to execute genesis state migration. func MigrateGenesisCmd() *cobra.Command { cmd := &cobra.Command{ - Use: "migrate [target-version] [genesis-file]", + Use: "migrate TARGET_VERSION GENESIS_FILE", Short: "Migrate genesis to a specified target version", Long: "Migrate the source genesis into the target version and print to STDOUT.", Example: fmt.Sprintf( diff --git a/cmd/evmosd/root.go b/cmd/evmosd/root.go index 2eb9858ebc..d7327e9dd4 100644 --- a/cmd/evmosd/root.go +++ b/cmd/evmosd/root.go @@ -39,9 +39,9 @@ import ( srvflags "github.com/evmos/ethermint/server/flags" tmcfg "github.com/tendermint/tendermint/config" - "github.com/evmos/evmos/v9/app" - cmdcfg "github.com/evmos/evmos/v9/cmd/config" - evmoskr "github.com/evmos/evmos/v9/crypto/keyring" + "github.com/evmos/evmos/v10/app" + cmdcfg "github.com/evmos/evmos/v10/cmd/config" + evmoskr "github.com/evmos/evmos/v10/crypto/keyring" ) const ( @@ -248,7 +248,7 @@ func (a appCreator) newApp(logger log.Logger, db dbm.DB, traceStore io.Writer, a baseapp.SetTrace(cast.ToBool(appOpts.Get(sdkserver.FlagTrace))), baseapp.SetIndexEvents(cast.ToStringSlice(appOpts.Get(sdkserver.FlagIndexEvents))), baseapp.SetIAVLCacheSize(cast.ToInt(appOpts.Get(sdkserver.FlagIAVLCacheSize))), - baseapp.SetIAVLDisableFastNode(cast.ToBool(appOpts.Get(sdkserver.FlagIAVLFastNode))), + baseapp.SetIAVLDisableFastNode(cast.ToBool(appOpts.Get(sdkserver.FlagDisableIAVLFastNode))), ) return evmosApp diff --git a/cmd/evmosd/testnet.go b/cmd/evmosd/testnet.go index c1a77a9c9f..0443914d11 100644 --- a/cmd/evmosd/testnet.go +++ b/cmd/evmosd/testnet.go @@ -44,9 +44,9 @@ import ( ethermint "github.com/evmos/ethermint/types" evmtypes "github.com/evmos/ethermint/x/evm/types" - cmdcfg "github.com/evmos/evmos/v9/cmd/config" - evmoskr "github.com/evmos/evmos/v9/crypto/keyring" - "github.com/evmos/evmos/v9/testutil/network" + cmdcfg "github.com/evmos/evmos/v10/cmd/config" + evmoskr "github.com/evmos/evmos/v10/crypto/keyring" + "github.com/evmos/evmos/v10/testutil/network" ) var ( diff --git a/contracts/erc20.go b/contracts/erc20.go index 2f979e001e..b3799aa631 100644 --- a/contracts/erc20.go +++ b/contracts/erc20.go @@ -7,7 +7,7 @@ import ( "github.com/ethereum/go-ethereum/common" evmtypes "github.com/evmos/ethermint/x/evm/types" - "github.com/evmos/evmos/v9/x/erc20/types" + "github.com/evmos/evmos/v10/x/erc20/types" ) var ( diff --git a/contracts/erc20DirectBalanceManipulation.go b/contracts/erc20DirectBalanceManipulation.go index 9594961608..57ba261b9b 100644 --- a/contracts/erc20DirectBalanceManipulation.go +++ b/contracts/erc20DirectBalanceManipulation.go @@ -7,7 +7,7 @@ import ( "github.com/ethereum/go-ethereum/common" evmtypes "github.com/evmos/ethermint/x/evm/types" - "github.com/evmos/evmos/v9/x/erc20/types" + "github.com/evmos/evmos/v10/x/erc20/types" ) // This is an evil token. Whenever an A -> B transfer is called, diff --git a/contracts/erc20maliciousdelayed.go b/contracts/erc20maliciousdelayed.go index a2eba29fda..57f2360a3a 100644 --- a/contracts/erc20maliciousdelayed.go +++ b/contracts/erc20maliciousdelayed.go @@ -7,7 +7,7 @@ import ( "github.com/ethereum/go-ethereum/common" evmtypes "github.com/evmos/ethermint/x/evm/types" - "github.com/evmos/evmos/v9/x/erc20/types" + "github.com/evmos/evmos/v10/x/erc20/types" ) // This is an evil token. Whenever an A -> B transfer is called, diff --git a/docs/developers/connect.md b/docs/developers/connect.md index 7e6c0a92ef..eec60eb22d 100644 --- a/docs/developers/connect.md +++ b/docs/developers/connect.md @@ -48,6 +48,8 @@ You can also use [chainlist.org](https://chainlist.org/) to add the node directl | `https://evmos-evm.publicnode.com` | `Ethereum` `JSON-RPC` | [PublicNode (by Allnodes)](https://evmos.publicnode.com/) | | `https://evmos-rpc.publicnode.com` | `Tendermint` `RPC` | [PublicNode (by Allnodes)](https://evmos.publicnode.com/) | | `https://evmos-rest.publicnode.com` | `Cosmos` `REST` | [PublicNode (by Allnodes)](https://evmos.publicnode.com/) | +| `https://evmos-api.validatrium.club` | `Tendermint` `API` | [Validatrium](https://validatrium.com/) | +| `https://evmos-rpc.validatrium.club` | `Tendermint` `RPC` | [Validatrium](https://validatrium.com/) | ::: ::: tab Testnet diff --git a/docs/developers/guides/incentives_registration.md b/docs/developers/guides/incentives_registration.md index 0da67de64f..771039885b 100644 --- a/docs/developers/guides/incentives_registration.md +++ b/docs/developers/guides/incentives_registration.md @@ -38,7 +38,7 @@ The following topics must be addressed when drafting a Contract Incentives Propo Give a breakdown of the proposal's payload, and explain in layman's terms what the proposal will do if it passes. For the smart contract in question, provide general information on its purpose, along with an argument for why it requires incentives. Mention risks involved in the proposal, depending on the traction of the smart contract involved and the timetable for the proposed incentives. Finally, detail precautions taken during proposal formulation, if applicable (including consultations made prior to proposal creation, and any third-party reviews). -Remember to provide links to the relevant [Commonwealth Evmos community](https://commonwealth.im/evmos) discussions concerning your proposal, as well as the [proposal on testnet](#submit-the-proposal-to-the-testnet). +Remember to provide links to the relevant [Commonwealth Evmos community](https://commonwealth.im/evmos) discussions concerning your proposal, as well as the [proposal on testnet](#submit-the-proposal-to-testnet). ## Submitting the Contract Incentives Proposal @@ -65,7 +65,7 @@ evmosd tx gov submit-proposal \ --title= \ --description=<description> \ --deposit="1000000aevmos" \ - --from=<mykey> \ + --from=<dev0> \ --chain-id=<testnet_chain_id> \ --node <address> ``` @@ -137,7 +137,7 @@ Evmos supports the following metrics related to the `x/incentives` module, which | `incentives_distribute_participant_total` | Total number of participants who received rewards | participant | counter | | `incentives_distribute_reward_total` | Total amount of rewards that are distributed to all incentives' participants | token | counter | -To calculate specific values, such as paid out incentives to a given smart contract user, custom metrics will have to be made following the [above section](#emitting--collecting-metrics). +To calculate specific values, such as paid out incentives to a given smart contract user, custom metrics will have to be made following the [above section](#telemetry-basics--setup). In addition, gRPC queries related to the `x/incentives` module found [here](../../../x/incentives/spec/08_clients.md#clients) can produce useful analysis. @@ -145,5 +145,5 @@ In addition, gRPC queries related to the `x/incentives` module found [here](../. See the telemetry sources below for details not covered above: -- [Cosmos SDK Telemetry Documentation](https://docs.cosmos.network/master/core/telemetry.html) +- [Cosmos SDK Telemetry Documentation](https://docs.cosmos.network/main/core/telemetry.html) - [Evmos Supported Telemetry Metrics](https://docs.evmos.org/protocol/telemetry.html) diff --git a/docs/developers/guides/smart_contract_registration.md b/docs/developers/guides/smart_contract_registration.md index 2d21172436..3cb77f2388 100644 --- a/docs/developers/guides/smart_contract_registration.md +++ b/docs/developers/guides/smart_contract_registration.md @@ -32,7 +32,7 @@ You can register a contract by signing a transaction with the address that origi ```bash # Register a revenue for your contract evmosd tx revenue register $CONTRACT $NONCE $WITHDRAWER \ ---from=mykey \ # contract deployer key +--from=dev0 \ # contract deployer key --gas=700000 --gas-prices=10000aevmos \ # can vary depending on the network ``` diff --git a/docs/developers/localnet/single_node.md b/docs/developers/localnet/single_node.md index 96dfd054de..38f18f6041 100644 --- a/docs/developers/localnet/single_node.md +++ b/docs/developers/localnet/single_node.md @@ -14,7 +14,7 @@ You can customize the local testnet script by changing values for convenience fo ```bash # customize the name of your key, the chain-id, moniker of the node, keyring backend, and log level -KEY="mykey" +KEY="dev0" CHAINID="evmos_9000-4" MONIKER="localtestnet" KEYRING="test" @@ -29,12 +29,12 @@ evmosd gentx $KEY 1000000000000000000000aevmos --keyring-backend $KEYRING --chai ``` The default configuration will generate a single validator localnet with the chain-id -`evmosd-1` and one predefined account (`mykey`) with some allocated funds at the genesis. +`evmosd-1` and one predefined account (`dev0`) with some allocated funds at the genesis. You can start the local chain using: ```bash -init.sh +local_node.sh ``` ## Manual Localnet @@ -47,7 +47,7 @@ Before actually running the node, we need to initialize the chain, and most impo ```bash $MONIKER=testing -$KEY=mykey +$KEY=dev0 $CHAINID="evmos_9000-4" # The argument $MONIKER is the custom username of your node, it should be human-readable. diff --git a/docs/developers/localnet/testnet_cmd.md b/docs/developers/localnet/testnet_cmd.md index f8b39df2c4..7ad5ae99ca 100644 --- a/docs/developers/localnet/testnet_cmd.md +++ b/docs/developers/localnet/testnet_cmd.md @@ -85,7 +85,7 @@ evmosd keys add test --recover Check the balance of the account address: ```bash -evmosd q bank balances [address] +evmosd q bank balances ADDRESS ``` Use this test account to manually test against the test network. diff --git a/docs/protocol/moduleaccounts.md b/docs/protocol/moduleaccounts.md index d21112dffc..ab2a3e14d5 100644 --- a/docs/protocol/moduleaccounts.md +++ b/docs/protocol/moduleaccounts.md @@ -25,3 +25,5 @@ The `staking` permission means this account has permission to stake tokens on be | `not_bonded_tokens_pool`| [evmos1tygms3xhhs3yv487phx3dw4a95jn7t7lr6ys4t](https://www.mintscan.io/evmos/account/evmos1tygms3xhhs3yv487phx3dw4a95jn7t7lr6ys4t) | `burner` `staking` | | `gov` | [evmos10d07y265gmmuvt4z0w9aw880jnsr700jcrztvm](https://www.mintscan.io/evmos/account/evmos10d07y265gmmuvt4z0w9aw880jnsr700jcrztvm) | `burner` | | `distribution` | [evmos1jv65s3grqf6v6jl3dp4t6c9t9rk99cd8974jnh](https://www.mintscan.io/evmos/account/evmos1jv65s3grqf6v6jl3dp4t6c9t9rk99cd8974jnh) | `none` | +| `evm` | [evmos1vqu8rska6swzdmnhf90zuv0xmelej4lq0n56wq](https://www.mintscan.io/evmos/account/evmos1vqu8rska6swzdmnhf90zuv0xmelej4lq0n56wq) | `minter` `burner` | +| `ibc` | [evmos1a53udazy8ayufvy0s434pfwjcedzqv345dnt3x](https://www.mintscan.io/evmos/account/evmos1a53udazy8ayufvy0s434pfwjcedzqv345dnt3x) | `minter` `burner` | diff --git a/docs/protocol/upgrades/migrations.md b/docs/protocol/upgrades/migrations.md index 1d6e0b596d..9123d91b1d 100644 --- a/docs/protocol/upgrades/migrations.md +++ b/docs/protocol/upgrades/migrations.md @@ -40,5 +40,5 @@ At this point, you might want to run a script to update the exported genesis int You can use the `migrate` command to migrate from a given version to the next one (eg: `v0.X.X` to `v1.X.X`): ```bash -evmosd migrate [target-version] [/path/to/genesis.json] --chain-id=<new_chain_id> --genesis-time=<yyyy-mm-ddThh:mm:ssZ> +evmosd migrate TARGET_VERSION GENESIS_FILE --chain-id=<new_chain_id> --genesis-time=<yyyy-mm-ddThh:mm:ssZ> ``` diff --git a/docs/users/governance/submitting.md b/docs/users/governance/submitting.md index 3fe0aa48cb..7586a63613 100644 --- a/docs/users/governance/submitting.md +++ b/docs/users/governance/submitting.md @@ -174,7 +174,7 @@ evmosd tx gov submit-proposal \ --description=<description> \ --type="Text" \ --deposit="1000000aevmos" \ - --from=<mykey> \ + --from=<dev0> \ --chain-id=<chain_id> --node <address> ``` @@ -185,7 +185,7 @@ Use the `evmos tx gov --help` flag to get more info about the governance command 1. `evmosd` is the command-line interface client that is used to send transactions and query Evmos 2. `tx gov submit-proposal param-change` indicates that the transaction is submitting a parameter-change proposal -3. `--from mykey` is the account key that pays the transaction fee and deposit amount +3. `--from dev0` is the account key that pays the transaction fee and deposit amount 4. `--gas 500000` is the maximum amount of gas permitted to be used to process the transaction - the more content there is in the description of your proposal, the more gas your transaction will consume - if this number isn't high enough and there isn't enough gas to process your transaction, the transaction will fail diff --git a/docs/users/keys/keyring.md b/docs/users/keys/keyring.md index ef739e8092..dad20d7658 100644 --- a/docs/users/keys/keyring.md +++ b/docs/users/keys/keyring.md @@ -23,10 +23,10 @@ evmosd keys [command] --help To create a new key in the keyring, run the `add` subcommand with a `<key_name>` argument. You will have to provide a password for the newly generated key. This key will be used in the next section. ```bash -evmosd keys add mykey +evmosd keys add dev0 # Put the generated address in a variable for later use. -MY_VALIDATOR_ADDRESS=$(evmosd keys show mykey -a) +MY_VALIDATOR_ADDRESS=$(evmosd keys show dev0 -a) ``` This command generates a new 24-word mnemonic phrase, persists it to the relevant backend, and outputs information about the keypair. If this keypair will be used to hold value-bearing tokens, be sure to write down the mnemonic phrase somewhere safe! diff --git a/docs/users/technical_concepts/accounts.md b/docs/users/technical_concepts/accounts.md index 12e4468373..3e596c20e8 100644 --- a/docs/users/technical_concepts/accounts.md +++ b/docs/users/technical_concepts/accounts.md @@ -93,8 +93,8 @@ obtain the addresses and keys as mentioned above, ::: tab Account ```bash -evmosd keys show mykey --bech acc -- name: mykey +evmosd keys show dev0 --bech acc +- name: dev0 type: local address: evmos1z3t55m0l9h0eupuz3dp5t5cypyv674jj7mz2jw pubkey: '{"@type":"/ethermint.crypto.v1.ethsecp256k1.PubKey","key":"AsV5oddeB+hkByIJo/4lZiVUgXTzNfBPKC73cZ4K1YD2"}' @@ -105,8 +105,8 @@ evmosd keys show mykey --bech acc ::: tab Validator ```bash -evmosd keys show mykey --bech val -- name: mykey +evmosd keys show dev0 --bech val +- name: dev0 type: local address: evmosvaloper1z3t55m0l9h0eupuz3dp5t5cypyv674jjn4d6nn pubkey: '{"@type":"/ethermint.crypto.v1.ethsecp256k1.PubKey","key":"AsV5oddeB+hkByIJo/4lZiVUgXTzNfBPKC73cZ4K1YD2"}' @@ -117,8 +117,8 @@ evmosd keys show mykey --bech val ::: tab Consensus ```bash -evmosd keys show mykey --bech cons -- name: mykey +evmosd keys show dev0 --bech cons +- name: dev0 type: local address: evmosvalcons1rllqa5d97n6zyjhy6cnscc7zu30zjn3f7wyj2n pubkey: '{"@type":"/ethermint.crypto.v1.ethsecp256k1.PubKey","key":"A/fVLgIqiLykFQxum96JkSOoTemrXD0tFaFQ1B0cpB2c"}' @@ -136,7 +136,7 @@ You can query an account address using the CLI, gRPC or ```bash # NOTE: the --output (-o) flag will define the output format in JSON or YAML (text) -evmosd q auth account $(evmosd keys show mykey -a) -o text +evmosd q auth account $(evmosd keys show dev0 -a) -o text | '@type': /ethermint.types.v1.EthAccount base_account: diff --git a/docs/users/wallets/backup.md b/docs/users/wallets/backup.md index bce2274c27..423385f67f 100644 --- a/docs/users/wallets/backup.md +++ b/docs/users/wallets/backup.md @@ -11,9 +11,9 @@ Learn how to backup your wallet's mnemonic and private key. {synopsis} When you create a new key, you'll recieve a mnemonic phrase that can be used to restore that key. Backup the mnemonic phrase: ```bash -evmosd keys add mykey +evmosd keys add dev0 { - "name": "mykey", + "name": "dev0", "type": "local", "address": "evmos1n253dl2tgyhxjm592p580c38r4dn8023ctv28d", "pubkey": '{"@type":"/ethermint.crypto.v1.ethsecp256k1.PubKey","key":"ArJhve4v5HkLm+F7ViASU/rAGx7YrwU4+XKV2MNJt+Cq"}', @@ -29,11 +29,11 @@ It is the only way to recover your account if you ever forget your password. To restore the key: ```bash -$ evmosd keys add mykey-restored --recover +$ evmosd keys add dev0-restored --recover > Enter your bip39 mnemonic banner genuine height east ghost oak toward reflect asset marble else explain foster car nest make van divide twice culture announce shuffle net peanut { - "name": "mykey-restored", + "name": "dev0-restored", "type": "local", "address": "evmos1n253dl2tgyhxjm592p580c38r4dn8023ctv28d", "pubkey": '{"@type":"/ethermint.crypto.v1.ethsecp256k1.PubKey","key":"ArJhve4v5HkLm+F7ViASU/rAGx7YrwU4+XKV2MNJt+Cq"}' @@ -47,7 +47,7 @@ banner genuine height east ghost oak toward reflect asset marble else explain fo To backup this type of key without the mnemonic phrase, do the following: ```bash -evmosd keys export mykey +evmosd keys export dev0 Enter passphrase to decrypt your key: Enter passphrase to encrypt the exported key: -----BEGIN TENDERMINT PRIVATE KEY----- @@ -65,7 +65,7 @@ salt: 14559BB13D881A86E0F4D3872B8B2C82 type: secp256k1 # <Tendermint private key> ------END TENDERMINT PRIVATE KEY-----" > mykey.export +-----END TENDERMINT PRIVATE KEY-----" > dev0.export ``` ### Ethereum-Formatted Private Keys @@ -77,7 +77,7 @@ type: secp256k1 To backup this type of key without the mnemonic phrase, do the following: ```bash -evmosd keys unsafe-export-eth-key mykey > mykey.export +evmosd keys unsafe-export-eth-key dev0 > dev0.export **WARNING** this is an unsafe way to export your unencrypted private key, are you sure? [y/N]: y Enter keyring passphrase: ``` @@ -87,14 +87,14 @@ Enter keyring passphrase: ### Tendermint-Formatted Private Keys ```bash -$ evmosd keys import mykey-imported ./mykey.export +$ evmosd keys import dev0-imported ./dev0.export Enter passphrase to decrypt your key: ``` ### Ethereum-Formatted Private Keys ``` -$ evmosd keys unsafe-import-eth-key mykey-imported ./mykey.export +$ evmosd keys unsafe-import-eth-key dev0-imported ./dev0.export Enter passphrase to encrypt your key: ``` @@ -106,19 +106,19 @@ Verify that your key has been restored using the following command: $ evmosd keys list [ { - "name": "mykey-imported", + "name": "dev0-imported", "type": "local", "address": "evmos1n253dl2tgyhxjm592p580c38r4dn8023ctv28d", "pubkey": '{"@type":"/ethermint.crypto.v1.ethsecp256k1.PubKey","key":"ArJhve4v5HkLm+F7ViASU/rAGx7YrwU4+XKV2MNJt+Cq"}' }, { - "name": "mykey-restored", + "name": "dev0-restored", "type": "local", "address": "evmos1n253dl2tgyhxjm592p580c38r4dn8023ctv28d", "pubkey": '{"@type":"/ethermint.crypto.v1.ethsecp256k1.PubKey","key":"ArJhve4v5HkLm+F7ViASU/rAGx7YrwU4+XKV2MNJt+Cq"}' }, { - "name": "mykey", + "name": "dev0", "type": "local", "address": "evmos1n253dl2tgyhxjm592p580c38r4dn8023ctv28d", "pubkey": '{"@type":"/ethermint.crypto.v1.ethsecp256k1.PubKey","key":"ArJhve4v5HkLm+F7ViASU/rAGx7YrwU4+XKV2MNJt+Cq"}' diff --git a/docs/users/wallets/metamask.md b/docs/users/wallets/metamask.md index d69702abe9..c84ac4c758 100644 --- a/docs/users/wallets/metamask.md +++ b/docs/users/wallets/metamask.md @@ -71,10 +71,10 @@ Close the `Settings`, go to `My Accounts` (top right circle) and select `Import ![metamask manual import account page](./../../img/metamask_import.png) -Now you can export your private key from the terminal using the following command. Again, make sure to replace `mykey` with the name of the key that you want to export and use the correct `keyring-backend`: +Now you can export your private key from the terminal using the following command. Again, make sure to replace `dev0` with the name of the key that you want to export and use the correct `keyring-backend`: ```bash -evmosd keys unsafe-export-eth-key mykey +evmosd keys unsafe-export-eth-key dev0 ``` Go back to the browser and select the `Private Key` option. Then paste the private key exported from the `unsafe-export-eth-key` command. diff --git a/docs/validators/quickstart/installation.md b/docs/validators/quickstart/installation.md index bb6b389920..2ebc12130f 100644 --- a/docs/validators/quickstart/installation.md +++ b/docs/validators/quickstart/installation.md @@ -8,13 +8,13 @@ Build and install the Evmos binaries from source or using Docker. {synopsis} ## Pre-requisites -- [Install Go 1.18.5+](https://golang.org/dl/) {prereq} +- [Install Go 1.19+](https://golang.org/dl/) {prereq} - [Install jq](https://stedolan.github.io/jq/download/) {prereq} ## Install Go ::: warning -Evmos is built using [Go](https://golang.org/dl/) version `1.18+` +Evmos is built using [Go](https://golang.org/dl/) version `1.19+` ::: ```bash diff --git a/docs/validators/quickstart/run_node.md b/docs/validators/quickstart/run_node.md index 273c3fc096..bdda6afe61 100644 --- a/docs/validators/quickstart/run_node.md +++ b/docs/validators/quickstart/run_node.md @@ -13,7 +13,7 @@ Configure and run an Evmos node {synopsis} ## Automated deployment -Run the local node by running the `init.sh` script in the base directory of the repository. +Run the local node by running the `local_node.sh` script in the base directory of the repository. ::: warning The script below will remove any pre-existing binaries installed. Use the manual deploy if you want @@ -21,7 +21,7 @@ to keep your binaries and configuration files. ::: ```bash -./init.sh +./local_node.sh ``` ## Manual deployment @@ -39,7 +39,7 @@ evmosd start --json-rpc.enable=true --json-rpc.api="eth,web3,net" ## Key Management -To run a node with the same key every time: replace `evmosd keys add $KEY` in `./init.sh` with: +To run a node with the same key every time: replace `evmosd keys add $KEY` in `./local_node.sh` with: ```bash echo "your mnemonic here" | evmosd keys add $KEY --recover @@ -86,7 +86,7 @@ For more information about the Keyring and its backend options, click [here](./. ## Enable Tracing - To enable tracing when running the node, modify the last line of the `init.sh` script to be the following command, where: + To enable tracing when running the node, modify the last line of the `local_node.sh` script to be the following command, where: - `$TRACER` is the EVM tracer type to collect execution traces from the EVM transaction execution (eg. `json|struct|access_list|markdown`) - `$TRACESTORE` is the output file which contains KVStore tracing (eg. `store.txt`) diff --git a/docs/validators/upgrades/automated.md b/docs/validators/upgrades/automated.md index e4b530b8dc..93c2085943 100644 --- a/docs/validators/upgrades/automated.md +++ b/docs/validators/upgrades/automated.md @@ -45,7 +45,7 @@ cp $GOPATH/bin/evmosd ~/.evmosd/cosmovisor/genesis/bin To check that you did this correctly, ensure your versions of `cosmovisor` and `evmosd` are the same: ```bash -cosmovisor version +cosmovisor run version evmosd version ``` @@ -106,7 +106,7 @@ echo "export DAEMON_ALLOW_DOWNLOAD_BINARIES=true" >> ~/.profile Now that everything is setup and ready to go, you can start your node. ```bash -cosmovisor start +cosmovisor run start ``` You will need some way to keep the process always running. If you're on linux, you can do this by creating a service. diff --git a/docs/validators/upgrades/manual.md b/docs/validators/upgrades/manual.md index 8c07d6665c..50ece2561b 100644 --- a/docs/validators/upgrades/manual.md +++ b/docs/validators/upgrades/manual.md @@ -40,7 +40,7 @@ server_name: evmosd version: 3.0.0 commit: fe9df43332800a74a163c014c69e62765d8206e3 build_tags: netgo,ledger -go: go version go1.18 darwin/amd64 +go: go version go1.19 darwin/amd64 ... ``` diff --git a/go.mod b/go.mod index 51509a5a90..bc377d6465 100644 --- a/go.mod +++ b/go.mod @@ -1,21 +1,22 @@ -module github.com/evmos/evmos/v9 +module github.com/evmos/evmos/v10 -go 1.18 +go 1.19 require ( + cosmossdk.io/errors v1.0.0-beta.7 cosmossdk.io/math v1.0.0-beta.3 github.com/armon/go-metrics v0.4.1 - github.com/cosmos/cosmos-sdk v0.46.3 + github.com/cosmos/cosmos-sdk v0.46.4 github.com/cosmos/go-bip39 v1.0.0 github.com/cosmos/ibc-go/v5 v5.0.1 github.com/ethereum/go-ethereum v1.10.19 - github.com/evmos/ethermint v0.6.1-0.20220919141022-34226aa7b1fa //TODO: update to ethermint v0.20.0 after it's released. + github.com/evmos/ethermint v0.20.0-rc2 github.com/gogo/protobuf v1.3.3 github.com/golang/protobuf v1.5.2 github.com/gorilla/mux v1.8.0 github.com/grpc-ecosystem/grpc-gateway v1.16.0 github.com/onsi/ginkgo/v2 v2.4.0 - github.com/onsi/gomega v1.23.0 + github.com/onsi/gomega v1.24.0 github.com/pkg/errors v0.9.1 github.com/rakyll/statik v0.1.7 github.com/spf13/cast v1.5.0 @@ -29,8 +30,6 @@ require ( google.golang.org/protobuf v1.28.1 ) -require cosmossdk.io/errors v1.0.0-beta.7 - require ( cloud.google.com/go v0.102.1 // indirect cloud.google.com/go/compute v1.7.0 // indirect @@ -61,7 +60,7 @@ require ( github.com/cosmos/btcutil v1.0.4 // indirect github.com/cosmos/cosmos-proto v1.0.0-alpha7 // indirect github.com/cosmos/gorocksdb v1.2.0 // indirect - github.com/cosmos/iavl v0.19.3 // indirect + github.com/cosmos/iavl v0.19.4 // indirect github.com/cosmos/ledger-cosmos-go v0.11.1 // indirect github.com/cosmos/ledger-go v0.9.2 // indirect github.com/creachadair/taskgroup v0.3.2 // indirect @@ -192,6 +191,10 @@ require ( ) replace ( + // use cosmos keyring github.com/99designs/keyring => github.com/cosmos/keyring v1.1.7-0.20210622111912-ef00f8ac3d76 + // ics23 patch for dragonberry + github.com/confio/ics23/go => github.com/cosmos/cosmos-sdk/ics23/go v0.8.0 + // use cosmos flavored protobufs github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 ) diff --git a/go.sum b/go.sum index 7c271e4468..b407aafb88 100644 --- a/go.sum +++ b/go.sum @@ -222,8 +222,6 @@ github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE github.com/coinbase/kryptology v1.8.0/go.mod h1:RYXOAPdzOGUe3qlSFkMGn58i3xUA8hmxYHksuq+8ciI= github.com/coinbase/rosetta-sdk-go v0.7.9 h1:lqllBjMnazTjIqYrOGv8h8jxjg9+hJazIGZr9ZvoCcA= github.com/coinbase/rosetta-sdk-go v0.7.9/go.mod h1:0/knutI7XGVqXmmH4OQD8OckFrbQ8yMsUZTG7FXCR2M= -github.com/confio/ics23/go v0.7.0 h1:00d2kukk7sPoHWL4zZBZwzxnpA2pec1NPdwbSokJ5w8= -github.com/confio/ics23/go v0.7.0/go.mod h1:E45NqnlpxGnpfTWL/xauN7MRwEE28T4Dd4uraToOaKg= github.com/consensys/bavard v0.1.8-0.20210406032232-f3452dc9b572/go.mod h1:Bpd0/3mZuaj6Sj+PqrmIquiOKy397AKGThQPaGzNXAQ= github.com/consensys/bavard v0.1.8-0.20210915155054-088da2f7f54a/go.mod h1:9ItSMtA/dXMAiL7BG6bqW2m3NdSEObYWoH223nGHukI= github.com/consensys/gnark-crypto v0.4.1-0.20210426202927-39ac3d4b3f1f/go.mod h1:815PAHg3wvysy0SyIqanF8gZ0Y1wjk/hrDHD/iT88+Q= @@ -239,15 +237,17 @@ github.com/cosmos/btcutil v1.0.4 h1:n7C2ngKXo7UC9gNyMNLbzqz7Asuf+7Qv4gnX/rOdQ44= github.com/cosmos/btcutil v1.0.4/go.mod h1:Ffqc8Hn6TJUdDgHBwIZLtrLQC1KdJ9jGJl/TvgUaxbU= github.com/cosmos/cosmos-proto v1.0.0-alpha7 h1:yqYUOHF2jopwZh4dVQp3xgqwftE5/2hkrwIV6vkUbO0= github.com/cosmos/cosmos-proto v1.0.0-alpha7/go.mod h1:dosO4pSAbJF8zWCzCoTWP7nNsjcvSUBQmniFxDg5daw= -github.com/cosmos/cosmos-sdk v0.46.3 h1:2jdJYcSwh4AtFJKGoNGvmEy2mKDWtGaVZphGpvedljQ= -github.com/cosmos/cosmos-sdk v0.46.3/go.mod h1:AynIAjXwtS3T/ApdhNCz/7/KGMbZSUBbKRTcbukb2ic= +github.com/cosmos/cosmos-sdk v0.46.4 h1:I4CPfnz7lAPM7cEvvyTxL1h3M/ugbhTNr5ZRcnW8WsU= +github.com/cosmos/cosmos-sdk v0.46.4/go.mod h1:b5usG7aBEEvhaatYCdV6orFbDUsj4BG1V6UtKwNcJeQ= +github.com/cosmos/cosmos-sdk/ics23/go v0.8.0 h1:iKclrn3YEOwk4jQHT2ulgzuXyxmzmPczUalMwW4XH9k= +github.com/cosmos/cosmos-sdk/ics23/go v0.8.0/go.mod h1:2a4dBq88TUoqoWAU5eu0lGvpFP3wWDPgdHPargtyw30= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY= github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw= github.com/cosmos/gorocksdb v1.2.0 h1:d0l3jJG8M4hBouIZq0mDUHZ+zjOx044J3nGRskwTb4Y= github.com/cosmos/gorocksdb v1.2.0/go.mod h1:aaKvKItm514hKfNJpUJXnnOWeBnk2GL4+Qw9NHizILw= -github.com/cosmos/iavl v0.19.3 h1:cESO0OwTTxQm5rmyESKW+zESheDUYI7CcZDWWDwnuxg= -github.com/cosmos/iavl v0.19.3/go.mod h1:X9PKD3J0iFxdmgNLa7b2LYWdsGd90ToV5cAONApkEPw= +github.com/cosmos/iavl v0.19.4 h1:t82sN+Y0WeqxDLJRSpNd8YFX5URIrT+p8n6oJbJ2Dok= +github.com/cosmos/iavl v0.19.4/go.mod h1:X9PKD3J0iFxdmgNLa7b2LYWdsGd90ToV5cAONApkEPw= github.com/cosmos/ibc-go/v5 v5.0.1 h1:ZI5xCi6RDOL+hyu6Wx/w6JoAYFlOoK5hijsRTVWo+RA= github.com/cosmos/ibc-go/v5 v5.0.1/go.mod h1:LX0DHLW3dfi/1e4BJzi8MGLWmQ4DSraPEgVjyo3VzAo= github.com/cosmos/keyring v1.1.7-0.20210622111912-ef00f8ac3d76 h1:DdzS1m6o/pCqeZ8VOAit/gyATedRgjvkVI+UCrLpyuU= @@ -332,8 +332,8 @@ github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7 github.com/ethereum/go-ethereum v1.10.17/go.mod h1:Lt5WzjM07XlXc95YzrhosmR4J9Ahd6X2wyEV2SvGhk0= github.com/ethereum/go-ethereum v1.10.19 h1:EOR5JbL4MD5yeOqv8W2iC1s4NximrTjqFccUz8lyBRA= github.com/ethereum/go-ethereum v1.10.19/go.mod h1:IJBNMtzKcNHPtllYihy6BL2IgK1u+32JriaTbdt4v+w= -github.com/evmos/ethermint v0.6.1-0.20220919141022-34226aa7b1fa h1:bpvKBR28IiB5XccRBih6zHK6p83YAddhVuovuVbtfJg= -github.com/evmos/ethermint v0.6.1-0.20220919141022-34226aa7b1fa/go.mod h1:BMNkMffNTcrpv/kG52aZtHBnQpeiVyX5+Gr3tlt3Faw= +github.com/evmos/ethermint v0.20.0-rc2 h1:SGFfqR1nQOkJAlpYYKMvAscKLmXzu4QShSw/K9lWZ90= +github.com/evmos/ethermint v0.20.0-rc2/go.mod h1:0mjSWj39t42VnsMYh0G6ahjrnxdtwt9v6EayTL//6nw= github.com/facebookgo/ensure v0.0.0-20200202191622-63f1cf65ac4c h1:8ISkoahWXwZR41ois5lSJBSVw4D0OV19Ht/JSTzvSv0= github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 h1:JWuenKqqX8nojtoVVWjGfOF9635RETekkoH6Cc9SX0A= github.com/facebookgo/subset v0.0.0-20200203212716-c811ad88dec4 h1:7HZCaLC5+BZpmbhCOZJ293Lz68O7PYrF2EzeiFMwCLk= @@ -811,8 +811,8 @@ github.com/onsi/gomega v1.4.1/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= -github.com/onsi/gomega v1.23.0 h1:/oxKu9c2HVap+F3PfKort2Hw5DEU+HGlW8n+tguWsys= -github.com/onsi/gomega v1.23.0/go.mod h1:Z/NWtiqwBrwUt4/2loMmHL63EDLnYHmVbuBpDr2vQAg= +github.com/onsi/gomega v1.24.0 h1:+0glovB9Jd6z3VR+ScSwQqXVTIfJcGA9UBM8yzQxhqg= +github.com/onsi/gomega v1.24.0/go.mod h1:Z/NWtiqwBrwUt4/2loMmHL63EDLnYHmVbuBpDr2vQAg= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 h1:rc3tiVYb5z54aKaDfakKn0dDjIyPpTtszkjuMzyt7ec= diff --git a/ibc/testing/app.go b/ibc/testing/app.go index e77cf72e6d..0e4458d01c 100644 --- a/ibc/testing/app.go +++ b/ibc/testing/app.go @@ -20,7 +20,7 @@ import ( ibcgotesting "github.com/cosmos/ibc-go/v5/testing" ethermint "github.com/evmos/ethermint/types" - evmosapp "github.com/evmos/evmos/v9/app" + evmosapp "github.com/evmos/evmos/v10/app" ) var DefaultTestingAppInit func() (ibcgotesting.TestingApp, map[string]json.RawMessage) = evmosapp.SetupTestingApp diff --git a/ibc/utils.go b/ibc/utils.go index 90fe526daa..3fe5075906 100644 --- a/ibc/utils.go +++ b/ibc/utils.go @@ -8,7 +8,7 @@ import ( transfertypes "github.com/cosmos/ibc-go/v5/modules/apps/transfer/types" channeltypes "github.com/cosmos/ibc-go/v5/modules/core/04-channel/types" - evmos "github.com/evmos/evmos/v9/types" + evmos "github.com/evmos/evmos/v10/types" ) // GetTransferSenderRecipient returns the sender and recipient sdk.AccAddresses diff --git a/ibc/utils_test.go b/ibc/utils_test.go index efe3861b6f..80441945b5 100644 --- a/ibc/utils_test.go +++ b/ibc/utils_test.go @@ -3,7 +3,7 @@ package ibc import ( "testing" - "github.com/evmos/evmos/v9/x/claims/types" + "github.com/evmos/evmos/v10/x/claims/types" "github.com/stretchr/testify/require" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/init.bat b/init.bat index 1ef7a09043..cc2a862af5 100644 --- a/init.bat +++ b/init.bat @@ -8,7 +8,7 @@ rem pacman -S mingw-w64-x86_64-jq rem 3. add path C:\msys64\mingw64\bin rem C:\msys64\usr\bin -set KEY="mykey" +set KEY="dev0" set CHAINID="evmos_9000-1" set MONIKER="localtestnet" set KEYRING="test" diff --git a/init.sh b/init.sh deleted file mode 100755 index 20d926e905..0000000000 --- a/init.sh +++ /dev/null @@ -1,121 +0,0 @@ -KEY="mykey" -CHAINID="evmos_9000-1" -MONIKER="localtestnet" -KEYRING="test" # remember to change to other types of keyring like 'file' in-case exposing to outside world, otherwise your balance will be wiped quickly. The keyring test does not require private key to steal tokens from you -KEYALGO="eth_secp256k1" -LOGLEVEL="info" -# to trace evm -#TRACE="--trace" -TRACE="" - -# validate dependencies are installed -command -v jq > /dev/null 2>&1 || { echo >&2 "jq not installed. More info: https://stedolan.github.io/jq/download/"; exit 1; } - -# used to exit on first error (any non-zero exit code) -set -e - -# Clear everything of previous installation -rm -rf ~/.evmosd* - -# Reinstall daemon -make install - -# Set client config -evmosd config keyring-backend $KEYRING -evmosd config chain-id $CHAINID - -# if $KEY exists it should be deleted -evmosd keys add $KEY --keyring-backend $KEYRING --algo $KEYALGO - -# Set moniker and chain-id for Evmos (Moniker can be anything, chain-id must be an integer) -evmosd init $MONIKER --chain-id $CHAINID - -# Change parameter token denominations to aevmos -cat $HOME/.evmosd/config/genesis.json | jq '.app_state["staking"]["params"]["bond_denom"]="aevmos"' > $HOME/.evmosd/config/tmp_genesis.json && mv $HOME/.evmosd/config/tmp_genesis.json $HOME/.evmosd/config/genesis.json -cat $HOME/.evmosd/config/genesis.json | jq '.app_state["crisis"]["constant_fee"]["denom"]="aevmos"' > $HOME/.evmosd/config/tmp_genesis.json && mv $HOME/.evmosd/config/tmp_genesis.json $HOME/.evmosd/config/genesis.json -cat $HOME/.evmosd/config/genesis.json | jq '.app_state["gov"]["deposit_params"]["min_deposit"][0]["denom"]="aevmos"' > $HOME/.evmosd/config/tmp_genesis.json && mv $HOME/.evmosd/config/tmp_genesis.json $HOME/.evmosd/config/genesis.json -cat $HOME/.evmosd/config/genesis.json | jq '.app_state["evm"]["params"]["evm_denom"]="aevmos"' > $HOME/.evmosd/config/tmp_genesis.json && mv $HOME/.evmosd/config/tmp_genesis.json $HOME/.evmosd/config/genesis.json -cat $HOME/.evmosd/config/genesis.json | jq '.app_state["inflation"]["params"]["mint_denom"]="aevmos"' > $HOME/.evmosd/config/tmp_genesis.json && mv $HOME/.evmosd/config/tmp_genesis.json $HOME/.evmosd/config/genesis.json - -# Set gas limit in genesis -cat $HOME/.evmosd/config/genesis.json | jq '.consensus_params["block"]["max_gas"]="10000000"' > $HOME/.evmosd/config/tmp_genesis.json && mv $HOME/.evmosd/config/tmp_genesis.json $HOME/.evmosd/config/genesis.json - -# Set claims start time -node_address=$(evmosd keys list | grep "address: " | cut -c12-) -current_date=$(date -u +"%Y-%m-%dT%TZ") -cat $HOME/.evmosd/config/genesis.json | jq -r --arg current_date "$current_date" '.app_state["claims"]["params"]["airdrop_start_time"]=$current_date' > $HOME/.evmosd/config/tmp_genesis.json && mv $HOME/.evmosd/config/tmp_genesis.json $HOME/.evmosd/config/genesis.json - -# Set claims records for validator account -amount_to_claim=10000 -cat $HOME/.evmosd/config/genesis.json | jq -r --arg node_address "$node_address" --arg amount_to_claim "$amount_to_claim" '.app_state["claims"]["claims_records"]=[{"initial_claimable_amount":$amount_to_claim, "actions_completed":[false, false, false, false],"address":$node_address}]' > $HOME/.evmosd/config/tmp_genesis.json && mv $HOME/.evmosd/config/tmp_genesis.json $HOME/.evmosd/config/genesis.json - -# Set claims decay -cat $HOME/.evmosd/config/genesis.json | jq '.app_state["claims"]["params"]["duration_of_decay"]="1000000s"' > $HOME/.evmosd/config/tmp_genesis.json && mv $HOME/.evmosd/config/tmp_genesis.json $HOME/.evmosd/config/genesis.json -cat $HOME/.evmosd/config/genesis.json | jq '.app_state["claims"]["params"]["duration_until_decay"]="100000s"' > $HOME/.evmosd/config/tmp_genesis.json && mv $HOME/.evmosd/config/tmp_genesis.json $HOME/.evmosd/config/genesis.json - -# Claim module account: -# 0xA61808Fe40fEb8B3433778BBC2ecECCAA47c8c47 || evmos15cvq3ljql6utxseh0zau9m8ve2j8erz89m5wkz -cat $HOME/.evmosd/config/genesis.json | jq -r --arg amount_to_claim "$amount_to_claim" '.app_state["bank"]["balances"] += [{"address":"evmos15cvq3ljql6utxseh0zau9m8ve2j8erz89m5wkz","coins":[{"denom":"aevmos", "amount":$amount_to_claim}]}]' > $HOME/.evmosd/config/tmp_genesis.json && mv $HOME/.evmosd/config/tmp_genesis.json $HOME/.evmosd/config/genesis.json - -# disable produce empty block -if [[ "$OSTYPE" == "darwin"* ]]; then - sed -i '' 's/create_empty_blocks = true/create_empty_blocks = false/g' $HOME/.evmosd/config/config.toml - else - sed -i 's/create_empty_blocks = true/create_empty_blocks = false/g' $HOME/.evmosd/config/config.toml -fi - -if [[ $1 == "pending" ]]; then - if [[ "$OSTYPE" == "darwin"* ]]; then - sed -i '' 's/create_empty_blocks_interval = "0s"/create_empty_blocks_interval = "30s"/g' $HOME/.evmosd/config/config.toml - sed -i '' 's/timeout_propose = "3s"/timeout_propose = "30s"/g' $HOME/.evmosd/config/config.toml - sed -i '' 's/timeout_propose_delta = "500ms"/timeout_propose_delta = "5s"/g' $HOME/.evmosd/config/config.toml - sed -i '' 's/timeout_prevote = "1s"/timeout_prevote = "10s"/g' $HOME/.evmosd/config/config.toml - sed -i '' 's/timeout_prevote_delta = "500ms"/timeout_prevote_delta = "5s"/g' $HOME/.evmosd/config/config.toml - sed -i '' 's/timeout_precommit = "1s"/timeout_precommit = "10s"/g' $HOME/.evmosd/config/config.toml - sed -i '' 's/timeout_precommit_delta = "500ms"/timeout_precommit_delta = "5s"/g' $HOME/.evmosd/config/config.toml - sed -i '' 's/timeout_commit = "5s"/timeout_commit = "150s"/g' $HOME/.evmosd/config/config.toml - sed -i '' 's/timeout_broadcast_tx_commit = "10s"/timeout_broadcast_tx_commit = "150s"/g' $HOME/.evmosd/config/config.toml - else - sed -i 's/create_empty_blocks_interval = "0s"/create_empty_blocks_interval = "30s"/g' $HOME/.evmosd/config/config.toml - sed -i 's/timeout_propose = "3s"/timeout_propose = "30s"/g' $HOME/.evmosd/config/config.toml - sed -i 's/timeout_propose_delta = "500ms"/timeout_propose_delta = "5s"/g' $HOME/.evmosd/config/config.toml - sed -i 's/timeout_prevote = "1s"/timeout_prevote = "10s"/g' $HOME/.evmosd/config/config.toml - sed -i 's/timeout_prevote_delta = "500ms"/timeout_prevote_delta = "5s"/g' $HOME/.evmosd/config/config.toml - sed -i 's/timeout_precommit = "1s"/timeout_precommit = "10s"/g' $HOME/.evmosd/config/config.toml - sed -i 's/timeout_precommit_delta = "500ms"/timeout_precommit_delta = "5s"/g' $HOME/.evmosd/config/config.toml - sed -i 's/timeout_commit = "5s"/timeout_commit = "150s"/g' $HOME/.evmosd/config/config.toml - sed -i 's/timeout_broadcast_tx_commit = "10s"/timeout_broadcast_tx_commit = "150s"/g' $HOME/.evmosd/config/config.toml - fi -fi - -# Allocate genesis accounts (cosmos formatted addresses) -evmosd add-genesis-account $KEY 100000000000000000000000000aevmos --keyring-backend $KEYRING - -# Update total supply with claim values -validators_supply=$(cat $HOME/.evmosd/config/genesis.json | jq -r '.app_state["bank"]["supply"][0]["amount"]') -# Bc is required to add this big numbers -# total_supply=$(bc <<< "$amount_to_claim+$validators_supply") -total_supply=100000000000000000000010000 -cat $HOME/.evmosd/config/genesis.json | jq -r --arg total_supply "$total_supply" '.app_state["bank"]["supply"][0]["amount"]=$total_supply' > $HOME/.evmosd/config/tmp_genesis.json && mv $HOME/.evmosd/config/tmp_genesis.json $HOME/.evmosd/config/genesis.json - -# Sign genesis transaction -evmosd gentx $KEY 1000000000000000000000aevmos --keyring-backend $KEYRING --chain-id $CHAINID -## In case you want to create multiple validators at genesis -## 1. Back to `evmosd keys add` step, init more keys -## 2. Back to `evmosd add-genesis-account` step, add balance for those -## 3. Clone this ~/.evmosd home directory into some others, let's say `~/.clonedEvmosd` -## 4. Run `gentx` in each of those folders -## 5. Copy the `gentx-*` folders under `~/.clonedEvmosd/config/gentx/` folders into the original `~/.evmosd/config/gentx` - -# Collect genesis tx -evmosd collect-gentxs - -# Run this to ensure everything worked and that the genesis file is setup correctly -evmosd validate-genesis - -if [[ $1 == "pending" ]]; then - echo "pending mode is on, please wait for the first block committed." -fi - -# Start the node (remove the --pruning=nothing flag if historical queries are not needed) -evmosd start --pruning=nothing $TRACE --log_level $LOGLEVEL --minimum-gas-prices=0.0001aevmos --json-rpc.api eth,txpool,personal,net,debug,web3 diff --git a/local_node.sh b/local_node.sh new file mode 100755 index 0000000000..e4dce416b1 --- /dev/null +++ b/local_node.sh @@ -0,0 +1,137 @@ +#!/bin/bash +KEYS[0]="dev0" +KEYS[1]="dev1" +KEYS[2]="dev2" +CHAINID="evmos_9000-1" +MONIKER="localtestnet" +KEYRING="test" # remember to change to other types of keyring like 'file' in-case exposing to outside world, otherwise your balance will be wiped quickly. The keyring test does not require private key to steal tokens from you +KEYALGO="eth_secp256k1" +LOGLEVEL="info" +# Set dedicated home directory for the evmosd instance +HOMEDIR=~/.tmp-evmosd +# to trace evm +#TRACE="--trace" +TRACE="" + +# Path variables +CONFIG=$HOMEDIR/config/config.toml +GENESIS=$HOMEDIR/config/genesis.json +TMP_GENESIS=$HOMEDIR/config/tmp_genesis.json + +# validate dependencies are installed +command -v jq > /dev/null 2>&1 || { echo >&2 "jq not installed. More info: https://stedolan.github.io/jq/download/"; exit 1; } + +# used to exit on first error (any non-zero exit code) +set -e + +# Reinstall daemon +make install + +# Set client config +evmosd config keyring-backend $KEYRING --home $HOMEDIR +evmosd config chain-id $CHAINID --home $HOMEDIR + +# If keys exist they should be deleted +for KEY in "${KEYS[@]}" +do + evmosd keys add $KEY --keyring-backend $KEYRING --algo $KEYALGO --home $HOMEDIR +done + +# Set moniker and chain-id for Evmos (Moniker can be anything, chain-id must be an integer) +evmosd init $MONIKER -o --chain-id $CHAINID --home $HOMEDIR + +# Change parameter token denominations to aevmos +cat $GENESIS | jq '.app_state["staking"]["params"]["bond_denom"]="aevmos"' > $TMP_GENESIS && mv $TMP_GENESIS $GENESIS +cat $GENESIS | jq '.app_state["crisis"]["constant_fee"]["denom"]="aevmos"' > $TMP_GENESIS && mv $TMP_GENESIS $GENESIS +cat $GENESIS | jq '.app_state["gov"]["deposit_params"]["min_deposit"][0]["denom"]="aevmos"' > $TMP_GENESIS && mv $TMP_GENESIS $GENESIS +cat $GENESIS | jq '.app_state["evm"]["params"]["evm_denom"]="aevmos"' > $TMP_GENESIS && mv $TMP_GENESIS $GENESIS +cat $GENESIS | jq '.app_state["inflation"]["params"]["mint_denom"]="aevmos"' > $TMP_GENESIS && mv $TMP_GENESIS $GENESIS + +# Set gas limit in genesis +cat $GENESIS | jq '.consensus_params["block"]["max_gas"]="10000000"' > $TMP_GENESIS && mv $TMP_GENESIS $GENESIS + +# Set claims start time +current_date=$(date -u +"%Y-%m-%dT%TZ") +cat $GENESIS | jq -r --arg current_date "$current_date" '.app_state["claims"]["params"]["airdrop_start_time"]=$current_date' > $TMP_GENESIS && mv $TMP_GENESIS $GENESIS + +# Set claims records for validator account +amount_to_claim=10000 +claims_key=${KEYS[0]} +node_address=$(evmosd keys show $claims_key --keyring-backend $KEYRING --home $HOMEDIR | grep "address" | cut -c12-) +cat $GENESIS | jq -r --arg node_address "$node_address" --arg amount_to_claim "$amount_to_claim" '.app_state["claims"]["claims_records"]=[{"initial_claimable_amount":$amount_to_claim, "actions_completed":[false, false, false, false],"address":$node_address}]' > $TMP_GENESIS && mv $TMP_GENESIS $GENESIS + +# Set claims decay +cat $GENESIS | jq '.app_state["claims"]["params"]["duration_of_decay"]="1000000s"' > $TMP_GENESIS && mv $TMP_GENESIS $GENESIS +cat $GENESIS | jq '.app_state["claims"]["params"]["duration_until_decay"]="100000s"' > $TMP_GENESIS && mv $TMP_GENESIS $GENESIS + +# Claim module account: +# 0xA61808Fe40fEb8B3433778BBC2ecECCAA47c8c47 || evmos15cvq3ljql6utxseh0zau9m8ve2j8erz89m5wkz +cat $GENESIS | jq -r --arg amount_to_claim "$amount_to_claim" '.app_state["bank"]["balances"] += [{"address":"evmos15cvq3ljql6utxseh0zau9m8ve2j8erz89m5wkz","coins":[{"denom":"aevmos", "amount":$amount_to_claim}]}]' > $TMP_GENESIS && mv $TMP_GENESIS $GENESIS + +# disable produce empty block +if [[ "$OSTYPE" == "darwin"* ]]; then + sed -i '' 's/create_empty_blocks = true/create_empty_blocks = false/g' $CONFIG + else + sed -i 's/create_empty_blocks = true/create_empty_blocks = false/g' $CONFIG +fi + +if [[ $1 == "pending" ]]; then + if [[ "$OSTYPE" == "darwin"* ]]; then + sed -i '' 's/create_empty_blocks_interval = "0s"/create_empty_blocks_interval = "30s"/g' $CONFIG + sed -i '' 's/timeout_propose = "3s"/timeout_propose = "30s"/g' $CONFIG + sed -i '' 's/timeout_propose_delta = "500ms"/timeout_propose_delta = "5s"/g' $CONFIG + sed -i '' 's/timeout_prevote = "1s"/timeout_prevote = "10s"/g' $CONFIG + sed -i '' 's/timeout_prevote_delta = "500ms"/timeout_prevote_delta = "5s"/g' $CONFIG + sed -i '' 's/timeout_precommit = "1s"/timeout_precommit = "10s"/g' $CONFIG + sed -i '' 's/timeout_precommit_delta = "500ms"/timeout_precommit_delta = "5s"/g' $CONFIG + sed -i '' 's/timeout_commit = "5s"/timeout_commit = "150s"/g' $CONFIG + sed -i '' 's/timeout_broadcast_tx_commit = "10s"/timeout_broadcast_tx_commit = "150s"/g' $CONFIG + else + sed -i 's/create_empty_blocks_interval = "0s"/create_empty_blocks_interval = "30s"/g' $CONFIG + sed -i 's/timeout_propose = "3s"/timeout_propose = "30s"/g' $CONFIG + sed -i 's/timeout_propose_delta = "500ms"/timeout_propose_delta = "5s"/g' $CONFIG + sed -i 's/timeout_prevote = "1s"/timeout_prevote = "10s"/g' $CONFIG + sed -i 's/timeout_prevote_delta = "500ms"/timeout_prevote_delta = "5s"/g' $CONFIG + sed -i 's/timeout_precommit = "1s"/timeout_precommit = "10s"/g' $CONFIG + sed -i 's/timeout_precommit_delta = "500ms"/timeout_precommit_delta = "5s"/g' $CONFIG + sed -i 's/timeout_commit = "5s"/timeout_commit = "150s"/g' $CONFIG + sed -i 's/timeout_broadcast_tx_commit = "10s"/timeout_broadcast_tx_commit = "150s"/g' $CONFIG + fi +fi + +# Allocate genesis accounts (cosmos formatted addresses) +for KEY in "${KEYS[@]}" +do + evmosd add-genesis-account $KEY 100000000000000000000000000aevmos --keyring-backend $KEYRING --home $HOMEDIR +done + +# Update total supply with claim values +validators_supply=$(cat $GENESIS | jq -r '.app_state["bank"]["supply"][0]["amount"]') +# Bc is required to add these big numbers +total_supply=$(echo "${#KEYS[@]} * 100000000000000000000000000 + $amount_to_claim" | bc) +cat $GENESIS | jq -r --arg total_supply "$total_supply" '.app_state["bank"]["supply"][0]["amount"]=$total_supply' > $TMP_GENESIS && mv $TMP_GENESIS $GENESIS + +# Remove genesis transaction if it exists already +rm -rf $HOMEDIR/config/gentx + +# Sign genesis transaction +evmosd gentx ${KEYS[0]} 1000000000000000000000aevmos --keyring-backend $KEYRING --chain-id $CHAINID --home $HOMEDIR +## In case you want to create multiple validators at genesis +## 1. Back to `evmosd keys add` step, init more keys +## 2. Back to `evmosd add-genesis-account` step, add balance for those +## 3. Clone this ~/.evmosd home directory into some others, let's say `~/.clonedEvmosd` +## 4. Run `gentx` in each of those folders +## 5. Copy the `gentx-*` folders under `~/.clonedEvmosd/config/gentx/` folders into the original `~/.evmosd/config/gentx` + +# Collect genesis tx +evmosd collect-gentxs --home $HOMEDIR + +# Run this to ensure everything worked and that the genesis file is setup correctly +evmosd validate-genesis --home $HOMEDIR + +if [[ $1 == "pending" ]]; then + echo "pending mode is on, please wait for the first block committed." +fi + +# Start the node (remove the --pruning=nothing flag if historical queries are not needed) +evmosd start --pruning=nothing $TRACE --log_level $LOGLEVEL --minimum-gas-prices=0.0001aevmos --json-rpc.api eth,txpool,personal,net,debug,web3 --home $HOMEDIR diff --git a/networks/local/evmos/Dockerfile b/networks/local/evmos/Dockerfile index 557c7e68a0..7fb893ab55 100644 --- a/networks/local/evmos/Dockerfile +++ b/networks/local/evmos/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.18.5-bullseye as build-env +FROM golang:1.19-bullseye as build-env # Install minimum necessary dependencies ENV PACKAGES curl make git libc-dev bash gcc @@ -15,7 +15,7 @@ COPY . . RUN make build-linux # Final image -FROM golang:1.18.5-bullseye as final +FROM golang:1.19-bullseye as final WORKDIR / diff --git a/proto/evmos/revenue/v1/genesis.proto b/proto/evmos/revenue/v1/genesis.proto index 0f34f96a4d..4da637fda9 100644 --- a/proto/evmos/revenue/v1/genesis.proto +++ b/proto/evmos/revenue/v1/genesis.proto @@ -4,7 +4,7 @@ package evmos.revenue.v1; import "evmos/revenue/v1/revenue.proto"; import "gogoproto/gogo.proto"; -option go_package = "github.com/evmos/evmos/v9/x/revenue/types"; +option go_package = "github.com/evmos/evmos/v10/x/revenue/types"; // GenesisState defines the module's genesis state. message GenesisState { diff --git a/proto/evmos/revenue/v1/query.proto b/proto/evmos/revenue/v1/query.proto index 0a00e69c25..5c6906186f 100644 --- a/proto/evmos/revenue/v1/query.proto +++ b/proto/evmos/revenue/v1/query.proto @@ -7,7 +7,7 @@ import "evmos/revenue/v1/revenue.proto"; import "google/api/annotations.proto"; import "gogoproto/gogo.proto"; -option go_package = "github.com/evmos/evmos/v9/x/revenue/types"; +option go_package = "github.com/evmos/evmos/v10/x/revenue/types"; // Query defines the gRPC querier service. service Query { diff --git a/proto/evmos/revenue/v1/revenue.proto b/proto/evmos/revenue/v1/revenue.proto index 00fe5a2bdd..56b589de86 100644 --- a/proto/evmos/revenue/v1/revenue.proto +++ b/proto/evmos/revenue/v1/revenue.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package evmos.revenue.v1; -option go_package = "github.com/evmos/evmos/v9/x/revenue/types"; +option go_package = "github.com/evmos/evmos/v10/x/revenue/types"; // Revenue defines an instance that organizes fee distribution conditions for // the owner of a given smart contract diff --git a/proto/evmos/revenue/v1/tx.proto b/proto/evmos/revenue/v1/tx.proto index 24579e1678..9d425bd8bd 100644 --- a/proto/evmos/revenue/v1/tx.proto +++ b/proto/evmos/revenue/v1/tx.proto @@ -4,7 +4,7 @@ package evmos.revenue.v1; import "google/api/annotations.proto"; import "gogoproto/gogo.proto"; -option go_package = "github.com/evmos/evmos/v9/x/revenue/types"; +option go_package = "github.com/evmos/evmos/v10/x/revenue/types"; // Msg defines the fees Msg service. service Msg { diff --git a/scripts/integration-test-all.sh b/scripts/integration-test-all.sh index 6593a214ae..09c0202389 100755 --- a/scripts/integration-test-all.sh +++ b/scripts/integration-test-all.sh @@ -16,7 +16,7 @@ REMOVE_DATA_DIR=false RPC_PORT="854" IP_ADDR="0.0.0.0" -KEY="mykey" +KEY="dev0" CHAINID="evmos_9000-1" MONIKER="mymoniker" diff --git a/scripts/start-docker.sh b/scripts/start-docker.sh index 48b57b9090..7ba817d528 100755 --- a/scripts/start-docker.sh +++ b/scripts/start-docker.sh @@ -1,6 +1,6 @@ #!/bin/bash -KEY="mykey" +KEY="dev0" CHAINID="evmos_9000-1" MONIKER="mymoniker" DATA_DIR=$(mktemp -d -t evmos-datadir.XXXXX) diff --git a/testutil/fund.go b/testutil/fund.go index c61dec9734..2ee40b4308 100644 --- a/testutil/fund.go +++ b/testutil/fund.go @@ -3,7 +3,7 @@ package testutil import ( sdk "github.com/cosmos/cosmos-sdk/types" bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" - inflationtypes "github.com/evmos/evmos/v9/x/inflation/types" + inflationtypes "github.com/evmos/evmos/v10/x/inflation/types" ) // FundAccount is a utility function that funds an account by minting and diff --git a/testutil/integration.go b/testutil/integration.go index a3f6c61371..b6e6cac9cd 100644 --- a/testutil/integration.go +++ b/testutil/integration.go @@ -17,7 +17,7 @@ import ( "github.com/evmos/ethermint/crypto/ethsecp256k1" "github.com/evmos/ethermint/encoding" - "github.com/evmos/evmos/v9/app" + "github.com/evmos/evmos/v10/app" ) // SubmitProposal delivers a submit proposal tx for a given gov content. diff --git a/testutil/network/network.go b/testutil/network/network.go index a2ad14d4a0..bf123e05b8 100644 --- a/testutil/network/network.go +++ b/testutil/network/network.go @@ -49,7 +49,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/genutil" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/evmos/ethermint/crypto/hd" - "github.com/evmos/evmos/v9/app" + "github.com/evmos/evmos/v10/app" "github.com/evmos/ethermint/encoding" "github.com/evmos/ethermint/server/config" diff --git a/testutil/network/network_test.go b/testutil/network/network_test.go index 5ce05fc529..757627b8d5 100644 --- a/testutil/network/network_test.go +++ b/testutil/network/network_test.go @@ -14,7 +14,7 @@ import ( "github.com/evmos/ethermint/server/config" "github.com/evmos/ethermint/testutil/network" - evmosnetwork "github.com/evmos/evmos/v9/testutil/network" + evmosnetwork "github.com/evmos/evmos/v10/testutil/network" ) type IntegrationTestSuite struct { diff --git a/testutil/network/util.go b/testutil/network/util.go index 7e2ffe511f..ffa368f238 100644 --- a/testutil/network/util.go +++ b/testutil/network/util.go @@ -27,7 +27,7 @@ import ( govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - inflationtypes "github.com/evmos/evmos/v9/x/inflation/types" + inflationtypes "github.com/evmos/evmos/v10/x/inflation/types" "github.com/evmos/ethermint/server" evmtypes "github.com/evmos/ethermint/x/evm/types" diff --git a/x/claims/client/cli/query.go b/x/claims/client/cli/query.go index 127256896a..e906280035 100644 --- a/x/claims/client/cli/query.go +++ b/x/claims/client/cli/query.go @@ -10,7 +10,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/version" - "github.com/evmos/evmos/v9/x/claims/types" + "github.com/evmos/evmos/v10/x/claims/types" ) // GetQueryCmd returns the cli query commands for this module @@ -134,7 +134,7 @@ func GetCmdQueryClaimsRecords() *cobra.Command { // GetCmdQueryClaimsRecord implements the query claims record command. func GetCmdQueryClaimsRecord() *cobra.Command { cmd := &cobra.Command{ - Use: "record [address]", + Use: "record ADDRESS", Args: cobra.ExactArgs(1), Short: "Query the claims records for an account.", Long: "Query the claims records for an account.\nThis contains an address' initial claimable amount, and the claims per action.", diff --git a/x/claims/genesis.go b/x/claims/genesis.go index d400fc18f1..5836ae972e 100644 --- a/x/claims/genesis.go +++ b/x/claims/genesis.go @@ -5,8 +5,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/evmos/evmos/v9/x/claims/keeper" - "github.com/evmos/evmos/v9/x/claims/types" + "github.com/evmos/evmos/v10/x/claims/keeper" + "github.com/evmos/evmos/v10/x/claims/types" ) // InitGenesis initializes the claim module's state from a provided genesis diff --git a/x/claims/genesis_test.go b/x/claims/genesis_test.go index d1cf64da45..859bac5cac 100644 --- a/x/claims/genesis_test.go +++ b/x/claims/genesis_test.go @@ -15,10 +15,10 @@ import ( "github.com/evmos/ethermint/tests" feemarkettypes "github.com/evmos/ethermint/x/feemarket/types" - "github.com/evmos/evmos/v9/app" - "github.com/evmos/evmos/v9/testutil" - "github.com/evmos/evmos/v9/x/claims" - "github.com/evmos/evmos/v9/x/claims/types" + "github.com/evmos/evmos/v10/app" + "github.com/evmos/evmos/v10/testutil" + "github.com/evmos/evmos/v10/x/claims" + "github.com/evmos/evmos/v10/x/claims/types" ) type GenesisTestSuite struct { diff --git a/x/claims/handler.go b/x/claims/handler.go index 0e24aaa3d6..988192c4a2 100644 --- a/x/claims/handler.go +++ b/x/claims/handler.go @@ -7,8 +7,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" errortypes "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/evmos/evmos/v9/x/claims/keeper" - "github.com/evmos/evmos/v9/x/claims/types" + "github.com/evmos/evmos/v10/x/claims/keeper" + "github.com/evmos/evmos/v10/x/claims/types" ) // NewHandler returns claim module messages diff --git a/x/claims/ibc_middleware.go b/x/claims/ibc_middleware.go index 1f75062d7c..7772c2ddf8 100644 --- a/x/claims/ibc_middleware.go +++ b/x/claims/ibc_middleware.go @@ -7,8 +7,8 @@ import ( porttypes "github.com/cosmos/ibc-go/v5/modules/core/05-port/types" "github.com/cosmos/ibc-go/v5/modules/core/exported" - "github.com/evmos/evmos/v9/ibc" - "github.com/evmos/evmos/v9/x/claims/keeper" + "github.com/evmos/evmos/v10/ibc" + "github.com/evmos/evmos/v10/x/claims/keeper" ) var _ porttypes.Middleware = &IBCMiddleware{} diff --git a/x/claims/keeper/abci.go b/x/claims/keeper/abci.go index feea94a954..9972ef18d1 100644 --- a/x/claims/keeper/abci.go +++ b/x/claims/keeper/abci.go @@ -8,7 +8,7 @@ import ( vestexported "github.com/cosmos/cosmos-sdk/x/auth/vesting/exported" ethermint "github.com/evmos/ethermint/types" - "github.com/evmos/evmos/v9/x/claims/types" + "github.com/evmos/evmos/v10/x/claims/types" ) // EndBlocker checks if the airdrop claiming period has ended in order to diff --git a/x/claims/keeper/abci_test.go b/x/claims/keeper/abci_test.go index 75d4754b7b..a738f2e490 100644 --- a/x/claims/keeper/abci_test.go +++ b/x/claims/keeper/abci_test.go @@ -11,9 +11,9 @@ import ( "github.com/ethereum/go-ethereum/crypto" "github.com/evmos/ethermint/tests" ethermint "github.com/evmos/ethermint/types" - "github.com/evmos/evmos/v9/testutil" - "github.com/evmos/evmos/v9/x/claims/types" - vestingtypes "github.com/evmos/evmos/v9/x/vesting/types" + "github.com/evmos/evmos/v10/testutil" + "github.com/evmos/evmos/v10/x/claims/types" + vestingtypes "github.com/evmos/evmos/v10/x/vesting/types" ) func (suite *KeeperTestSuite) TestEndBlock() { diff --git a/x/claims/keeper/claim.go b/x/claims/keeper/claim.go index 5b5bcc07f8..649bf148a9 100644 --- a/x/claims/keeper/claim.go +++ b/x/claims/keeper/claim.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" errortypes "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/evmos/evmos/v9/x/claims/types" + "github.com/evmos/evmos/v10/x/claims/types" ) // ClaimCoinsForAction removes the claimable amount entry from a claims record diff --git a/x/claims/keeper/claim_test.go b/x/claims/keeper/claim_test.go index 4104274811..54b94d86fa 100644 --- a/x/claims/keeper/claim_test.go +++ b/x/claims/keeper/claim_test.go @@ -15,10 +15,10 @@ import ( "github.com/evmos/ethermint/crypto/ethsecp256k1" "github.com/evmos/ethermint/tests" ethermint "github.com/evmos/ethermint/types" - "github.com/evmos/evmos/v9/testutil" - inflationtypes "github.com/evmos/evmos/v9/x/inflation/types" + "github.com/evmos/evmos/v10/testutil" + inflationtypes "github.com/evmos/evmos/v10/x/inflation/types" - "github.com/evmos/evmos/v9/x/claims/types" + "github.com/evmos/evmos/v10/x/claims/types" ) func (suite *KeeperTestSuite) TestGetClaimableAmountForAction() { diff --git a/x/claims/keeper/claims_records.go b/x/claims/keeper/claims_records.go index f7176e88d2..9e4194b2b9 100644 --- a/x/claims/keeper/claims_records.go +++ b/x/claims/keeper/claims_records.go @@ -4,7 +4,7 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/evmos/evmos/v9/x/claims/types" + "github.com/evmos/evmos/v10/x/claims/types" ) // GetClaimsRecord returns the claims record for a specific address diff --git a/x/claims/keeper/claims_records_test.go b/x/claims/keeper/claims_records_test.go index cc8a0ce0df..03bfab2686 100644 --- a/x/claims/keeper/claims_records_test.go +++ b/x/claims/keeper/claims_records_test.go @@ -3,7 +3,7 @@ package keeper_test import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/evmos/evmos/v9/x/claims/types" + "github.com/evmos/evmos/v10/x/claims/types" ) func (suite *KeeperTestSuite) TestsClaimsRecords() { diff --git a/x/claims/keeper/grpc_query.go b/x/claims/keeper/grpc_query.go index fabf9cc07b..500871676e 100644 --- a/x/claims/keeper/grpc_query.go +++ b/x/claims/keeper/grpc_query.go @@ -9,7 +9,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/evmos/evmos/v9/x/claims/types" + "github.com/evmos/evmos/v10/x/claims/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/claims/keeper/grpc_query_test.go b/x/claims/keeper/grpc_query_test.go index 503f87424e..83b9325e72 100644 --- a/x/claims/keeper/grpc_query_test.go +++ b/x/claims/keeper/grpc_query_test.go @@ -7,8 +7,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/evmos/ethermint/tests" - "github.com/evmos/evmos/v9/testutil" - "github.com/evmos/evmos/v9/x/claims/types" + "github.com/evmos/evmos/v10/testutil" + "github.com/evmos/evmos/v10/x/claims/types" ) func (suite *KeeperTestSuite) TestTotalUnclaimed() { diff --git a/x/claims/keeper/hooks.go b/x/claims/keeper/hooks.go index a9f3ac1450..ef7cfe169d 100644 --- a/x/claims/keeper/hooks.go +++ b/x/claims/keeper/hooks.go @@ -13,7 +13,7 @@ import ( evmtypes "github.com/evmos/ethermint/x/evm/types" - "github.com/evmos/evmos/v9/x/claims/types" + "github.com/evmos/evmos/v10/x/claims/types" ) var ( diff --git a/x/claims/keeper/hooks_test.go b/x/claims/keeper/hooks_test.go index e16da9ff2c..baddc51c5c 100644 --- a/x/claims/keeper/hooks_test.go +++ b/x/claims/keeper/hooks_test.go @@ -8,8 +8,8 @@ import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" ethtypes "github.com/ethereum/go-ethereum/core/types" "github.com/evmos/ethermint/tests" - "github.com/evmos/evmos/v9/testutil" - "github.com/evmos/evmos/v9/x/claims/types" + "github.com/evmos/evmos/v10/testutil" + "github.com/evmos/evmos/v10/x/claims/types" ) func (suite *KeeperTestSuite) TestAfterProposalVote() { diff --git a/x/claims/keeper/ibc_callbacks.go b/x/claims/keeper/ibc_callbacks.go index df8071650f..696e194127 100644 --- a/x/claims/keeper/ibc_callbacks.go +++ b/x/claims/keeper/ibc_callbacks.go @@ -8,9 +8,9 @@ import ( channeltypes "github.com/cosmos/ibc-go/v5/modules/core/04-channel/types" "github.com/cosmos/ibc-go/v5/modules/core/exported" - "github.com/evmos/evmos/v9/ibc" - evmos "github.com/evmos/evmos/v9/types" - "github.com/evmos/evmos/v9/x/claims/types" + "github.com/evmos/evmos/v10/ibc" + evmos "github.com/evmos/evmos/v10/types" + "github.com/evmos/evmos/v10/x/claims/types" ) // OnAcknowledgementPacket performs an IBC send callback. Once a user submits an diff --git a/x/claims/keeper/ibc_callbacks_ibc_suite_test.go b/x/claims/keeper/ibc_callbacks_ibc_suite_test.go index 3b487077ba..26eb16d8b5 100644 --- a/x/claims/keeper/ibc_callbacks_ibc_suite_test.go +++ b/x/claims/keeper/ibc_callbacks_ibc_suite_test.go @@ -13,10 +13,10 @@ import ( ibcgotesting "github.com/cosmos/ibc-go/v5/testing" "github.com/evmos/ethermint/tests" - "github.com/evmos/evmos/v9/app" - ibctesting "github.com/evmos/evmos/v9/ibc/testing" - "github.com/evmos/evmos/v9/testutil" - "github.com/evmos/evmos/v9/x/claims/types" + "github.com/evmos/evmos/v10/app" + ibctesting "github.com/evmos/evmos/v10/ibc/testing" + "github.com/evmos/evmos/v10/testutil" + "github.com/evmos/evmos/v10/x/claims/types" ) type IBCTestingSuite struct { diff --git a/x/claims/keeper/ibc_callbacks_test.go b/x/claims/keeper/ibc_callbacks_test.go index c5bbe4095c..14ba9caa0d 100644 --- a/x/claims/keeper/ibc_callbacks_test.go +++ b/x/claims/keeper/ibc_callbacks_test.go @@ -15,7 +15,7 @@ import ( ibcgotesting "github.com/cosmos/ibc-go/v5/testing" ibcmock "github.com/cosmos/ibc-go/v5/testing/mock" - "github.com/evmos/evmos/v9/x/claims/types" + "github.com/evmos/evmos/v10/x/claims/types" ) var timeoutHeight = clienttypes.NewHeight(1000, 1000) diff --git a/x/claims/keeper/integration_test.go b/x/claims/keeper/integration_test.go index e0fbeba69c..7918011b19 100644 --- a/x/claims/keeper/integration_test.go +++ b/x/claims/keeper/integration_test.go @@ -25,16 +25,16 @@ import ( "github.com/evmos/ethermint/encoding" "github.com/evmos/ethermint/tests" evmtypes "github.com/evmos/ethermint/x/evm/types" - "github.com/evmos/evmos/v9/app" - "github.com/evmos/evmos/v9/testutil" - incentivestypes "github.com/evmos/evmos/v9/x/incentives/types" - inflationtypes "github.com/evmos/evmos/v9/x/inflation/types" + "github.com/evmos/evmos/v10/app" + "github.com/evmos/evmos/v10/testutil" + incentivestypes "github.com/evmos/evmos/v10/x/incentives/types" + inflationtypes "github.com/evmos/evmos/v10/x/inflation/types" authsigning "github.com/cosmos/cosmos-sdk/x/auth/signing" "github.com/evmos/ethermint/server/config" evm "github.com/evmos/ethermint/x/evm/types" - "github.com/evmos/evmos/v9/contracts" - "github.com/evmos/evmos/v9/x/claims/types" + "github.com/evmos/evmos/v10/contracts" + "github.com/evmos/evmos/v10/x/claims/types" abci "github.com/tendermint/tendermint/abci/types" ) diff --git a/x/claims/keeper/invariants.go b/x/claims/keeper/invariants.go index ec40add6c7..5c7d3a1b07 100644 --- a/x/claims/keeper/invariants.go +++ b/x/claims/keeper/invariants.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/evmos/evmos/v9/x/claims/types" + "github.com/evmos/evmos/v10/x/claims/types" ) // RegisterInvariants registers the claims module invariants diff --git a/x/claims/keeper/invariants_test.go b/x/claims/keeper/invariants_test.go index eb6324968b..b35443bd2c 100644 --- a/x/claims/keeper/invariants_test.go +++ b/x/claims/keeper/invariants_test.go @@ -5,8 +5,8 @@ import ( "github.com/evmos/ethermint/tests" - "github.com/evmos/evmos/v9/testutil" - "github.com/evmos/evmos/v9/x/claims/types" + "github.com/evmos/evmos/v10/testutil" + "github.com/evmos/evmos/v10/x/claims/types" ) func (suite *KeeperTestSuite) TestClaimsInvariant() { diff --git a/x/claims/keeper/keeper.go b/x/claims/keeper/keeper.go index d636d96af3..76db89dbfa 100644 --- a/x/claims/keeper/keeper.go +++ b/x/claims/keeper/keeper.go @@ -12,7 +12,7 @@ import ( paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" porttypes "github.com/cosmos/ibc-go/v5/modules/core/05-port/types" - "github.com/evmos/evmos/v9/x/claims/types" + "github.com/evmos/evmos/v10/x/claims/types" ) // Keeper struct diff --git a/x/claims/keeper/keeper_test.go b/x/claims/keeper/keeper_test.go index bed2c1249f..b33dd1a3ba 100644 --- a/x/claims/keeper/keeper_test.go +++ b/x/claims/keeper/keeper_test.go @@ -19,9 +19,9 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" ethtypes "github.com/ethereum/go-ethereum/core/types" evm "github.com/evmos/ethermint/x/evm/types" - "github.com/evmos/evmos/v9/app" - "github.com/evmos/evmos/v9/testutil" - "github.com/evmos/evmos/v9/x/claims/types" + "github.com/evmos/evmos/v10/app" + "github.com/evmos/evmos/v10/testutil" + "github.com/evmos/evmos/v10/x/claims/types" "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" abci "github.com/tendermint/tendermint/abci/types" diff --git a/x/claims/keeper/migrations.go b/x/claims/keeper/migrations.go index 2fb07a9a74..8ac9626504 100644 --- a/x/claims/keeper/migrations.go +++ b/x/claims/keeper/migrations.go @@ -4,7 +4,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - v2 "github.com/evmos/evmos/v9/x/claims/migrations/v2" + v2 "github.com/evmos/evmos/v10/x/claims/migrations/v2" ) var _ module.MigrationHandler = Migrator{}.Migrate1to2 diff --git a/x/claims/keeper/params.go b/x/claims/keeper/params.go index 6e07c89d0f..f3b0b3ea41 100644 --- a/x/claims/keeper/params.go +++ b/x/claims/keeper/params.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/evmos/evmos/v9/x/claims/types" + "github.com/evmos/evmos/v10/x/claims/types" ) // GetParams returns the total set of claim parameters. diff --git a/x/claims/keeper/params_test.go b/x/claims/keeper/params_test.go index ded0326213..00b088ee3b 100644 --- a/x/claims/keeper/params_test.go +++ b/x/claims/keeper/params_test.go @@ -1,7 +1,7 @@ package keeper_test import ( - "github.com/evmos/evmos/v9/x/claims/types" + "github.com/evmos/evmos/v10/x/claims/types" ) func (suite *KeeperTestSuite) TestParams() { diff --git a/x/claims/migrations/v2/migration.go b/x/claims/migrations/v2/migration.go index 008d6dc625..23a1de4464 100644 --- a/x/claims/migrations/v2/migration.go +++ b/x/claims/migrations/v2/migration.go @@ -4,8 +4,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - v1types "github.com/evmos/evmos/v9/x/claims/migrations/v1/types" - "github.com/evmos/evmos/v9/x/claims/types" + v1types "github.com/evmos/evmos/v10/x/claims/migrations/v1/types" + "github.com/evmos/evmos/v10/x/claims/types" ) // MigrateStore adds the new parameters AuthorizedChannels and EVMChannels diff --git a/x/claims/migrations/v2/migration_test.go b/x/claims/migrations/v2/migration_test.go index f79d6395e4..402ff9ce66 100644 --- a/x/claims/migrations/v2/migration_test.go +++ b/x/claims/migrations/v2/migration_test.go @@ -8,9 +8,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" "github.com/evmos/ethermint/encoding" - "github.com/evmos/evmos/v9/app" - v2 "github.com/evmos/evmos/v9/x/claims/migrations/v2" - claims "github.com/evmos/evmos/v9/x/claims/types" + "github.com/evmos/evmos/v10/app" + v2 "github.com/evmos/evmos/v10/x/claims/migrations/v2" + claims "github.com/evmos/evmos/v10/x/claims/types" "github.com/stretchr/testify/require" ) diff --git a/x/claims/module.go b/x/claims/module.go index 05d0c892b4..236d944cf6 100644 --- a/x/claims/module.go +++ b/x/claims/module.go @@ -17,9 +17,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - "github.com/evmos/evmos/v9/x/claims/client/cli" - "github.com/evmos/evmos/v9/x/claims/keeper" - "github.com/evmos/evmos/v9/x/claims/types" + "github.com/evmos/evmos/v10/x/claims/client/cli" + "github.com/evmos/evmos/v10/x/claims/keeper" + "github.com/evmos/evmos/v10/x/claims/types" ) var ( diff --git a/x/claims/spec/07_clients.md b/x/claims/spec/07_clients.md index 4db23d24d6..fcb4d21bd6 100644 --- a/x/claims/spec/07_clients.md +++ b/x/claims/spec/07_clients.md @@ -35,7 +35,7 @@ evmosd query claims records [flags] Allows users to query a claims record for a given user. ```bash -evmosd query claims record [address] [flags] +evmosd query claims record ADDRESS [flags] ``` **`params`** diff --git a/x/epochs/client/cli/query.go b/x/epochs/client/cli/query.go index dee5d47ff8..f2c7f717f9 100644 --- a/x/epochs/client/cli/query.go +++ b/x/epochs/client/cli/query.go @@ -9,7 +9,7 @@ import ( "github.com/cosmos/cosmos-sdk/version" "github.com/spf13/cobra" - "github.com/evmos/evmos/v9/x/epochs/types" + "github.com/evmos/evmos/v10/x/epochs/types" ) // GetQueryCmd returns the cli query commands for this module diff --git a/x/epochs/genesis.go b/x/epochs/genesis.go index a097c3af55..0ebc3fc38b 100644 --- a/x/epochs/genesis.go +++ b/x/epochs/genesis.go @@ -5,8 +5,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/evmos/evmos/v9/x/epochs/keeper" - "github.com/evmos/evmos/v9/x/epochs/types" + "github.com/evmos/evmos/v10/x/epochs/keeper" + "github.com/evmos/evmos/v10/x/epochs/types" ) // InitGenesis initializes the epochs module's state from a provided genesis diff --git a/x/epochs/genesis_test.go b/x/epochs/genesis_test.go index 86f6d22aca..3b7e272705 100644 --- a/x/epochs/genesis_test.go +++ b/x/epochs/genesis_test.go @@ -8,9 +8,9 @@ import ( "github.com/stretchr/testify/require" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - simapp "github.com/evmos/evmos/v9/app" - "github.com/evmos/evmos/v9/x/epochs" - "github.com/evmos/evmos/v9/x/epochs/types" + simapp "github.com/evmos/evmos/v10/app" + "github.com/evmos/evmos/v10/x/epochs" + "github.com/evmos/evmos/v10/x/epochs/types" ) func TestEpochsExportGenesis(t *testing.T) { diff --git a/x/epochs/keeper/abci.go b/x/epochs/keeper/abci.go index 98b5e970f0..6028adc9b3 100644 --- a/x/epochs/keeper/abci.go +++ b/x/epochs/keeper/abci.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/telemetry" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/evmos/evmos/v9/x/epochs/types" + "github.com/evmos/evmos/v10/x/epochs/types" ) // BeginBlocker of epochs module diff --git a/x/epochs/keeper/abci_test.go b/x/epochs/keeper/abci_test.go index 988147a163..2e08ed5db2 100644 --- a/x/epochs/keeper/abci_test.go +++ b/x/epochs/keeper/abci_test.go @@ -4,8 +4,8 @@ import ( "fmt" "time" - "github.com/evmos/evmos/v9/x/epochs" - "github.com/evmos/evmos/v9/x/epochs/types" + "github.com/evmos/evmos/v10/x/epochs" + "github.com/evmos/evmos/v10/x/epochs/types" ) func (suite *KeeperTestSuite) TestEpochInfoChangesBeginBlockerAndInitGenesis() { diff --git a/x/epochs/keeper/epoch_infos.go b/x/epochs/keeper/epoch_infos.go index cc00417f6b..11583c34cd 100644 --- a/x/epochs/keeper/epoch_infos.go +++ b/x/epochs/keeper/epoch_infos.go @@ -4,7 +4,7 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/evmos/evmos/v9/x/epochs/types" + "github.com/evmos/evmos/v10/x/epochs/types" ) // GetEpochInfo returns epoch info by identifier diff --git a/x/epochs/keeper/epoch_infos_test.go b/x/epochs/keeper/epoch_infos_test.go index a992f80306..89615dbc14 100644 --- a/x/epochs/keeper/epoch_infos_test.go +++ b/x/epochs/keeper/epoch_infos_test.go @@ -3,7 +3,7 @@ package keeper_test import ( "time" - "github.com/evmos/evmos/v9/x/epochs/types" + "github.com/evmos/evmos/v10/x/epochs/types" ) func (suite *KeeperTestSuite) TestEpochLifeCycle() { diff --git a/x/epochs/keeper/grpc_query.go b/x/epochs/keeper/grpc_query.go index 2875e23189..8834cba32c 100644 --- a/x/epochs/keeper/grpc_query.go +++ b/x/epochs/keeper/grpc_query.go @@ -9,7 +9,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/evmos/evmos/v9/x/epochs/types" + "github.com/evmos/evmos/v10/x/epochs/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/epochs/keeper/grpc_query_test.go b/x/epochs/keeper/grpc_query_test.go index 1e9812943a..b67d751e7e 100644 --- a/x/epochs/keeper/grpc_query_test.go +++ b/x/epochs/keeper/grpc_query_test.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" - "github.com/evmos/evmos/v9/x/epochs/types" + "github.com/evmos/evmos/v10/x/epochs/types" ) func (suite *KeeperTestSuite) TestEpochInfo() { diff --git a/x/epochs/keeper/hooks.go b/x/epochs/keeper/hooks.go index def02db631..2c88cd58b8 100644 --- a/x/epochs/keeper/hooks.go +++ b/x/epochs/keeper/hooks.go @@ -2,7 +2,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/evmos/evmos/v9/x/epochs/types" + "github.com/evmos/evmos/v10/x/epochs/types" ) var _ types.EpochHooks = MultiEpochHooks{} diff --git a/x/epochs/keeper/keeper.go b/x/epochs/keeper/keeper.go index 1432496eb1..7f871d1c6f 100644 --- a/x/epochs/keeper/keeper.go +++ b/x/epochs/keeper/keeper.go @@ -8,7 +8,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/tendermint/tendermint/libs/log" - "github.com/evmos/evmos/v9/x/epochs/types" + "github.com/evmos/evmos/v10/x/epochs/types" ) // Keeper of this module maintains collections of epochs and hooks. diff --git a/x/epochs/keeper/keeper_test.go b/x/epochs/keeper/keeper_test.go index bb1400eea0..a9108d605a 100644 --- a/x/epochs/keeper/keeper_test.go +++ b/x/epochs/keeper/keeper_test.go @@ -19,8 +19,8 @@ import ( evm "github.com/evmos/ethermint/x/evm/types" - "github.com/evmos/evmos/v9/app" - "github.com/evmos/evmos/v9/x/epochs/types" + "github.com/evmos/evmos/v10/app" + "github.com/evmos/evmos/v10/x/epochs/types" ) var denomMint = evm.DefaultEVMDenom diff --git a/x/epochs/module.go b/x/epochs/module.go index aba7bf76c0..4b434c3635 100644 --- a/x/epochs/module.go +++ b/x/epochs/module.go @@ -20,9 +20,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - "github.com/evmos/evmos/v9/x/epochs/client/cli" - "github.com/evmos/evmos/v9/x/epochs/keeper" - "github.com/evmos/evmos/v9/x/epochs/types" + "github.com/evmos/evmos/v10/x/epochs/client/cli" + "github.com/evmos/evmos/v10/x/epochs/keeper" + "github.com/evmos/evmos/v10/x/epochs/types" ) var ( diff --git a/x/erc20/client/cli/query.go b/x/erc20/client/cli/query.go index 4ec1b5a1ca..28c2211de1 100644 --- a/x/erc20/client/cli/query.go +++ b/x/erc20/client/cli/query.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/spf13/cobra" - "github.com/evmos/evmos/v9/x/erc20/types" + "github.com/evmos/evmos/v10/x/erc20/types" ) // GetQueryCmd returns the parent command for all erc20 CLI query commands @@ -68,7 +68,7 @@ func GetTokenPairsCmd() *cobra.Command { // GetTokenPairsCmd queries a registered token pair func GetTokenPairCmd() *cobra.Command { cmd := &cobra.Command{ - Use: "token-pair [token]", + Use: "token-pair TOKEN", Short: "Get a registered token pair", Long: "Get a registered token pair", Args: cobra.ExactArgs(1), diff --git a/x/erc20/client/cli/tx.go b/x/erc20/client/cli/tx.go index f0dee92bb6..3279d32920 100644 --- a/x/erc20/client/cli/tx.go +++ b/x/erc20/client/cli/tx.go @@ -17,7 +17,7 @@ import ( ethermint "github.com/evmos/ethermint/types" - "github.com/evmos/evmos/v9/x/erc20/types" + "github.com/evmos/evmos/v10/x/erc20/types" ) // NewTxCmd returns a root CLI command handler for erc20 transaction commands diff --git a/x/erc20/client/cli/utils.go b/x/erc20/client/cli/utils.go index 22bf82aacb..9672b926cf 100644 --- a/x/erc20/client/cli/utils.go +++ b/x/erc20/client/cli/utils.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - "github.com/evmos/evmos/v9/x/erc20/types" + "github.com/evmos/evmos/v10/x/erc20/types" ) // ParseRegisterCoinProposal reads and parses a ParseRegisterCoinProposal from a file. diff --git a/x/erc20/client/cli/utils_test.go b/x/erc20/client/cli/utils_test.go index 0ba13b00c5..e97abc71c8 100644 --- a/x/erc20/client/cli/utils_test.go +++ b/x/erc20/client/cli/utils_test.go @@ -3,12 +3,11 @@ package cli import ( "testing" - "github.com/evmos/evmos/v9/x/erc20/types" + "github.com/evmos/evmos/v10/x/erc20/types" "github.com/stretchr/testify/require" ) func TestParseMetadata(t *testing.T) { - testCases := []struct { name string metadataFile string diff --git a/x/erc20/client/proposal_handler.go b/x/erc20/client/proposal_handler.go index 57cf893b7d..93e1fdef4a 100644 --- a/x/erc20/client/proposal_handler.go +++ b/x/erc20/client/proposal_handler.go @@ -3,7 +3,7 @@ package client import ( govclient "github.com/cosmos/cosmos-sdk/x/gov/client" - "github.com/evmos/evmos/v9/x/erc20/client/cli" + "github.com/evmos/evmos/v10/x/erc20/client/cli" ) var ( diff --git a/x/erc20/genesis.go b/x/erc20/genesis.go index 14e38c0b26..bcc44e414e 100644 --- a/x/erc20/genesis.go +++ b/x/erc20/genesis.go @@ -4,8 +4,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper" - "github.com/evmos/evmos/v9/x/erc20/keeper" - "github.com/evmos/evmos/v9/x/erc20/types" + "github.com/evmos/evmos/v10/x/erc20/keeper" + "github.com/evmos/evmos/v10/x/erc20/types" ) // InitGenesis import module genesis diff --git a/x/erc20/genesis_test.go b/x/erc20/genesis_test.go index 9c01b5c9c4..9a9f26145c 100644 --- a/x/erc20/genesis_test.go +++ b/x/erc20/genesis_test.go @@ -16,9 +16,9 @@ import ( "github.com/evmos/ethermint/tests" feemarkettypes "github.com/evmos/ethermint/x/feemarket/types" - "github.com/evmos/evmos/v9/app" - "github.com/evmos/evmos/v9/x/erc20" - "github.com/evmos/evmos/v9/x/erc20/types" + "github.com/evmos/evmos/v10/app" + "github.com/evmos/evmos/v10/x/erc20" + "github.com/evmos/evmos/v10/x/erc20/types" ) type GenesisTestSuite struct { diff --git a/x/erc20/handler.go b/x/erc20/handler.go index 0df9fcd829..c6f3841b53 100644 --- a/x/erc20/handler.go +++ b/x/erc20/handler.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" errortypes "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/evmos/evmos/v9/x/erc20/types" + "github.com/evmos/evmos/v10/x/erc20/types" ) // NewHandler defines the erc20 module handler instance diff --git a/x/erc20/keeper/evm.go b/x/erc20/keeper/evm.go index f32075c3ce..e4f1332f6f 100644 --- a/x/erc20/keeper/evm.go +++ b/x/erc20/keeper/evm.go @@ -16,8 +16,8 @@ import ( "github.com/evmos/ethermint/server/config" evmtypes "github.com/evmos/ethermint/x/evm/types" - "github.com/evmos/evmos/v9/contracts" - "github.com/evmos/evmos/v9/x/erc20/types" + "github.com/evmos/evmos/v10/contracts" + "github.com/evmos/evmos/v10/x/erc20/types" ) // DeployERC20Contract creates and deploys an ERC20 contract on the EVM with the diff --git a/x/erc20/keeper/evm_hooks.go b/x/erc20/keeper/evm_hooks.go index bac8496288..9d78434755 100644 --- a/x/erc20/keeper/evm_hooks.go +++ b/x/erc20/keeper/evm_hooks.go @@ -11,8 +11,8 @@ import ( ethtypes "github.com/ethereum/go-ethereum/core/types" evmtypes "github.com/evmos/ethermint/x/evm/types" - "github.com/evmos/evmos/v9/contracts" - "github.com/evmos/evmos/v9/x/erc20/types" + "github.com/evmos/evmos/v10/contracts" + "github.com/evmos/evmos/v10/x/erc20/types" ) var _ evmtypes.EvmHooks = Hooks{} diff --git a/x/erc20/keeper/evm_hooks_test.go b/x/erc20/keeper/evm_hooks_test.go index faaaf3f1d0..907c6cb611 100644 --- a/x/erc20/keeper/evm_hooks_test.go +++ b/x/erc20/keeper/evm_hooks_test.go @@ -9,8 +9,8 @@ import ( ethtypes "github.com/ethereum/go-ethereum/core/types" "github.com/evmos/ethermint/tests" - "github.com/evmos/evmos/v9/contracts" - "github.com/evmos/evmos/v9/x/erc20/types" + "github.com/evmos/evmos/v10/contracts" + "github.com/evmos/evmos/v10/x/erc20/types" ) // ensureHooksSet tries to set the hooks on EVMKeeper, this will fail if the erc20 hook is already set diff --git a/x/erc20/keeper/evm_test.go b/x/erc20/keeper/evm_test.go index 872ce90838..c3a1b13fe0 100644 --- a/x/erc20/keeper/evm_test.go +++ b/x/erc20/keeper/evm_test.go @@ -8,9 +8,9 @@ import ( evmtypes "github.com/evmos/ethermint/x/evm/types" "github.com/stretchr/testify/mock" - "github.com/evmos/evmos/v9/contracts" - "github.com/evmos/evmos/v9/x/erc20/keeper" - "github.com/evmos/evmos/v9/x/erc20/types" + "github.com/evmos/evmos/v10/contracts" + "github.com/evmos/evmos/v10/x/erc20/keeper" + "github.com/evmos/evmos/v10/x/erc20/types" ) func (suite *KeeperTestSuite) TestQueryERC20() { diff --git a/x/erc20/keeper/grpc_query.go b/x/erc20/keeper/grpc_query.go index 714134d410..5163511122 100644 --- a/x/erc20/keeper/grpc_query.go +++ b/x/erc20/keeper/grpc_query.go @@ -11,7 +11,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/query" ethermint "github.com/evmos/ethermint/types" - "github.com/evmos/evmos/v9/x/erc20/types" + "github.com/evmos/evmos/v10/x/erc20/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/erc20/keeper/grpc_query_test.go b/x/erc20/keeper/grpc_query_test.go index 0760bcc6c9..7b81126664 100644 --- a/x/erc20/keeper/grpc_query_test.go +++ b/x/erc20/keeper/grpc_query_test.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/query" "github.com/evmos/ethermint/tests" - "github.com/evmos/evmos/v9/x/erc20/types" + "github.com/evmos/evmos/v10/x/erc20/types" ) func (suite *KeeperTestSuite) TestTokenPairs() { diff --git a/x/erc20/keeper/integration_test.go b/x/erc20/keeper/integration_test.go index 55a2ba5ef8..28de6b3984 100644 --- a/x/erc20/keeper/integration_test.go +++ b/x/erc20/keeper/integration_test.go @@ -18,9 +18,9 @@ import ( "github.com/evmos/ethermint/crypto/ethsecp256k1" ethermint "github.com/evmos/ethermint/types" - "github.com/evmos/evmos/v9/app" - "github.com/evmos/evmos/v9/testutil" - "github.com/evmos/evmos/v9/x/erc20/types" + "github.com/evmos/evmos/v10/app" + "github.com/evmos/evmos/v10/testutil" + "github.com/evmos/evmos/v10/x/erc20/types" ) var _ = Describe("Performing EVM transactions", Ordered, func() { @@ -161,7 +161,6 @@ var _ = Describe("ERC20:", Ordered, func() { s.CommitAndBeginBlockAfter(duration) s.app.EndBlocker(s.ctx, abci.RequestEndBlock{Height: s.ctx.BlockHeight()}) s.Commit() - }) It("should create a token pairs owned by the erc20 module", func() { tokenPairs := s.app.Erc20Keeper.GetTokenPairs(s.ctx) diff --git a/x/erc20/keeper/keeper.go b/x/erc20/keeper/keeper.go index f7f78b4156..ec9ec9a7e8 100644 --- a/x/erc20/keeper/keeper.go +++ b/x/erc20/keeper/keeper.go @@ -9,7 +9,7 @@ import ( paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" "github.com/tendermint/tendermint/libs/log" - "github.com/evmos/evmos/v9/x/erc20/types" + "github.com/evmos/evmos/v10/x/erc20/types" ) // Keeper of this module maintains collections of erc20. diff --git a/x/erc20/keeper/keeper_test.go b/x/erc20/keeper/keeper_test.go index ffb9354804..63eb00d748 100644 --- a/x/erc20/keeper/keeper_test.go +++ b/x/erc20/keeper/keeper_test.go @@ -41,10 +41,10 @@ import ( evmtypes "github.com/evmos/ethermint/x/evm/types" feemarkettypes "github.com/evmos/ethermint/x/feemarket/types" - "github.com/evmos/evmos/v9/app" - "github.com/evmos/evmos/v9/contracts" - claimstypes "github.com/evmos/evmos/v9/x/claims/types" - "github.com/evmos/evmos/v9/x/erc20/types" + "github.com/evmos/evmos/v10/app" + "github.com/evmos/evmos/v10/contracts" + claimstypes "github.com/evmos/evmos/v10/x/claims/types" + "github.com/evmos/evmos/v10/x/erc20/types" ) type KeeperTestSuite struct { diff --git a/x/erc20/keeper/migrations.go b/x/erc20/keeper/migrations.go index ccbcdc483e..1531a8ba2a 100644 --- a/x/erc20/keeper/migrations.go +++ b/x/erc20/keeper/migrations.go @@ -4,7 +4,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - v2 "github.com/evmos/evmos/v9/x/erc20/migrations/v2" + v2 "github.com/evmos/evmos/v10/x/erc20/migrations/v2" ) var _ module.MigrationHandler = Migrator{}.Migrate1to2 diff --git a/x/erc20/keeper/mint.go b/x/erc20/keeper/mint.go index e0b659701d..d0445a1538 100644 --- a/x/erc20/keeper/mint.go +++ b/x/erc20/keeper/mint.go @@ -6,7 +6,7 @@ import ( errortypes "github.com/cosmos/cosmos-sdk/types/errors" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - "github.com/evmos/evmos/v9/x/erc20/types" + "github.com/evmos/evmos/v10/x/erc20/types" ) // MintingEnabled checks that: diff --git a/x/erc20/keeper/mint_test.go b/x/erc20/keeper/mint_test.go index f83b380d0f..a59d6c8145 100644 --- a/x/erc20/keeper/mint_test.go +++ b/x/erc20/keeper/mint_test.go @@ -7,7 +7,7 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" "github.com/evmos/ethermint/tests" - "github.com/evmos/evmos/v9/x/erc20/types" + "github.com/evmos/evmos/v10/x/erc20/types" ) func (suite *KeeperTestSuite) TestMintingEnabled() { diff --git a/x/erc20/keeper/msg_server.go b/x/erc20/keeper/msg_server.go index 0c37704ebe..fab0641445 100644 --- a/x/erc20/keeper/msg_server.go +++ b/x/erc20/keeper/msg_server.go @@ -11,8 +11,8 @@ import ( errortypes "github.com/cosmos/cosmos-sdk/types/errors" "github.com/ethereum/go-ethereum/common" - "github.com/evmos/evmos/v9/contracts" - "github.com/evmos/evmos/v9/x/erc20/types" + "github.com/evmos/evmos/v10/contracts" + "github.com/evmos/evmos/v10/x/erc20/types" ) var _ types.MsgServer = &Keeper{} diff --git a/x/erc20/keeper/msg_server_test.go b/x/erc20/keeper/msg_server_test.go index 74161c6879..af8828da20 100644 --- a/x/erc20/keeper/msg_server_test.go +++ b/x/erc20/keeper/msg_server_test.go @@ -11,8 +11,8 @@ import ( "github.com/evmos/ethermint/x/evm/statedb" evmtypes "github.com/evmos/ethermint/x/evm/types" - "github.com/evmos/evmos/v9/x/erc20/keeper" - "github.com/evmos/evmos/v9/x/erc20/types" + "github.com/evmos/evmos/v10/x/erc20/keeper" + "github.com/evmos/evmos/v10/x/erc20/types" ) func (suite *KeeperTestSuite) TestConvertCoinNativeCoin() { diff --git a/x/erc20/keeper/params.go b/x/erc20/keeper/params.go index e946998b14..0286ee20a2 100644 --- a/x/erc20/keeper/params.go +++ b/x/erc20/keeper/params.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/evmos/evmos/v9/x/erc20/types" + "github.com/evmos/evmos/v10/x/erc20/types" ) // GetParams returns the total set of erc20 parameters. diff --git a/x/erc20/keeper/params_test.go b/x/erc20/keeper/params_test.go index 4790a12be9..62aea72c07 100644 --- a/x/erc20/keeper/params_test.go +++ b/x/erc20/keeper/params_test.go @@ -1,6 +1,6 @@ package keeper_test -import "github.com/evmos/evmos/v9/x/erc20/types" +import "github.com/evmos/evmos/v10/x/erc20/types" func (suite *KeeperTestSuite) TestParams() { params := suite.app.Erc20Keeper.GetParams(suite.ctx) diff --git a/x/erc20/keeper/proposals.go b/x/erc20/keeper/proposals.go index ab99268b51..c96e7f604d 100644 --- a/x/erc20/keeper/proposals.go +++ b/x/erc20/keeper/proposals.go @@ -7,7 +7,7 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" "github.com/ethereum/go-ethereum/common" - "github.com/evmos/evmos/v9/x/erc20/types" + "github.com/evmos/evmos/v10/x/erc20/types" ) // RegisterCoin deploys an erc20 contract and creates the token pair for the diff --git a/x/erc20/keeper/proposals_test.go b/x/erc20/keeper/proposals_test.go index 5694207fe6..7efe873736 100644 --- a/x/erc20/keeper/proposals_test.go +++ b/x/erc20/keeper/proposals_test.go @@ -12,9 +12,9 @@ import ( "github.com/evmos/ethermint/tests" evmtypes "github.com/evmos/ethermint/x/evm/types" - "github.com/evmos/evmos/v9/x/erc20/keeper" - "github.com/evmos/evmos/v9/x/erc20/types" - inflationtypes "github.com/evmos/evmos/v9/x/inflation/types" + "github.com/evmos/evmos/v10/x/erc20/keeper" + "github.com/evmos/evmos/v10/x/erc20/types" + inflationtypes "github.com/evmos/evmos/v10/x/inflation/types" ) const ( diff --git a/x/erc20/keeper/token_pairs.go b/x/erc20/keeper/token_pairs.go index 133eeb2b6d..dcc5796d4a 100644 --- a/x/erc20/keeper/token_pairs.go +++ b/x/erc20/keeper/token_pairs.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/common" - "github.com/evmos/evmos/v9/x/erc20/types" + "github.com/evmos/evmos/v10/x/erc20/types" ) // GetTokenPairs - get all registered token tokenPairs diff --git a/x/erc20/keeper/token_pairs_test.go b/x/erc20/keeper/token_pairs_test.go index 8a75fa3710..2c44981107 100644 --- a/x/erc20/keeper/token_pairs_test.go +++ b/x/erc20/keeper/token_pairs_test.go @@ -7,7 +7,7 @@ import ( "github.com/evmos/ethermint/tests" evmtypes "github.com/evmos/ethermint/x/evm/types" - "github.com/evmos/evmos/v9/x/erc20/types" + "github.com/evmos/evmos/v10/x/erc20/types" ) func (suite *KeeperTestSuite) TestGetTokenPairs() { diff --git a/x/erc20/migrations/v2/migration.go b/x/erc20/migrations/v2/migration.go index 1a15c7fd1a..a281648448 100644 --- a/x/erc20/migrations/v2/migration.go +++ b/x/erc20/migrations/v2/migration.go @@ -4,7 +4,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - "github.com/evmos/evmos/v9/x/erc20/types" + "github.com/evmos/evmos/v10/x/erc20/types" ) // UpdateParams updates the module parameters EnableERC20 and EnableEMVHook diff --git a/x/erc20/migrations/v2/migration_test.go b/x/erc20/migrations/v2/migration_test.go index 00ca19b206..add8386e08 100644 --- a/x/erc20/migrations/v2/migration_test.go +++ b/x/erc20/migrations/v2/migration_test.go @@ -12,9 +12,9 @@ import ( "github.com/evmos/ethermint/encoding" - "github.com/evmos/evmos/v9/app" - v2 "github.com/evmos/evmos/v9/x/erc20/migrations/v2" - erc20types "github.com/evmos/evmos/v9/x/erc20/types" + "github.com/evmos/evmos/v10/app" + v2 "github.com/evmos/evmos/v10/x/erc20/migrations/v2" + erc20types "github.com/evmos/evmos/v10/x/erc20/types" ) func TestUpdateParams(t *testing.T) { diff --git a/x/erc20/module.go b/x/erc20/module.go index 4393ac851b..c6e88f604a 100644 --- a/x/erc20/module.go +++ b/x/erc20/module.go @@ -18,9 +18,9 @@ import ( "github.com/spf13/cobra" abci "github.com/tendermint/tendermint/abci/types" - "github.com/evmos/evmos/v9/x/erc20/client/cli" - "github.com/evmos/evmos/v9/x/erc20/keeper" - "github.com/evmos/evmos/v9/x/erc20/types" + "github.com/evmos/evmos/v10/x/erc20/client/cli" + "github.com/evmos/evmos/v10/x/erc20/keeper" + "github.com/evmos/evmos/v10/x/erc20/types" ) // type check to ensure the interface is properly implemented diff --git a/x/erc20/proposal_handler.go b/x/erc20/proposal_handler.go index 7cf01bb757..7dae97a06d 100644 --- a/x/erc20/proposal_handler.go +++ b/x/erc20/proposal_handler.go @@ -7,8 +7,8 @@ import ( govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" "github.com/ethereum/go-ethereum/common" - "github.com/evmos/evmos/v9/x/erc20/keeper" - "github.com/evmos/evmos/v9/x/erc20/types" + "github.com/evmos/evmos/v10/x/erc20/keeper" + "github.com/evmos/evmos/v10/x/erc20/types" ) // NewErc20ProposalHandler creates a governance handler to manage new proposal types. diff --git a/x/erc20/spec/08_clients.md b/x/erc20/spec/08_clients.md index b9de97d125..e326101515 100644 --- a/x/erc20/spec/08_clients.md +++ b/x/erc20/spec/08_clients.md @@ -79,7 +79,7 @@ evmosd tx gov submit-proposal register-erc20 ERC20_ADDRESS... [flags] Allows users to submit a `ToggleTokenConversionProposal`. ```bash -evmosd tx gov submit-proposal toggle-token-conversion [token] [flags] +evmosd tx gov submit-proposal toggle-token-conversion TOKEN [flags] ``` **`param-change`** @@ -87,7 +87,7 @@ evmosd tx gov submit-proposal toggle-token-conversion [token] [flags] Allows users to submit a `ParameterChangeProposal``. ```bash -evmosd tx gov submit-proposal param-change [proposal-file] [flags] +evmosd tx gov submit-proposal param-change PROPOSAL_FILE [flags] ``` ## gRPC diff --git a/x/incentives/client/cli/query.go b/x/incentives/client/cli/query.go index 73454c1fa0..ca346bb9dd 100644 --- a/x/incentives/client/cli/query.go +++ b/x/incentives/client/cli/query.go @@ -9,7 +9,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/spf13/cobra" - "github.com/evmos/evmos/v9/x/incentives/types" + "github.com/evmos/evmos/v10/x/incentives/types" ) // GetQueryCmd returns the parent command for all incentives CLI query commands. @@ -74,7 +74,7 @@ func GetIncentivesCmd() *cobra.Command { // GetIncentiveCmd queries a given contract incentive func GetIncentiveCmd() *cobra.Command { cmd := &cobra.Command{ - Use: "incentive [contract-address]", + Use: "incentive CONTRACT_ADDRESS", Short: "Gets incentive for a given contract", Long: "Gets incentive for a given contract", Args: cobra.ExactArgs(1), @@ -110,7 +110,7 @@ func GetIncentiveCmd() *cobra.Command { // GetGasMetersCmd queries the list of incentives func GetGasMetersCmd() *cobra.Command { cmd := &cobra.Command{ - Use: "gas-meters [contract-address]", + Use: "gas-meters CONTRACT_ADDRESS", Short: "Gets gas meters for a given incentive", Long: "Gets gas meters for a given incentive", Args: cobra.ExactArgs(1), @@ -152,7 +152,7 @@ func GetGasMetersCmd() *cobra.Command { // GetGasMeterCmd queries the list of incentives func GetGasMeterCmd() *cobra.Command { cmd := &cobra.Command{ - Use: "gas-meter [contract-address] [participant-address]", + Use: "gas-meter CONTRACT_ADDRESS PARTICIPANT_ADDRESS", Short: "Gets gas meter for a given incentive and user", Long: "Gets gas meter for a given incentive and user", Args: cobra.ExactArgs(2), @@ -230,7 +230,7 @@ func GetAllocationMetersCmd() *cobra.Command { // GetAllocationMeterCmd queries a given denom allocation meter func GetAllocationMeterCmd() *cobra.Command { cmd := &cobra.Command{ - Use: "allocation-meter [denom]", + Use: "allocation-meter DENOM", Short: "Gets allocation meter for a denom", Long: "Gets allocation meter for a denom", Args: cobra.ExactArgs(1), diff --git a/x/incentives/client/cli/tx.go b/x/incentives/client/cli/tx.go index 234a8a960f..4308163210 100644 --- a/x/incentives/client/cli/tx.go +++ b/x/incentives/client/cli/tx.go @@ -14,7 +14,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/gov/client/cli" govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" - "github.com/evmos/evmos/v9/x/incentives/types" + "github.com/evmos/evmos/v10/x/incentives/types" ) // NewRegisterIncentiveProposalCmd implements the command to submit a register @@ -24,7 +24,7 @@ import ( //nolint:staticcheck // we use deprecated flags func NewRegisterIncentiveProposalCmd() *cobra.Command { cmd := &cobra.Command{ - Use: "register-incentive [contract-address] [allocation] [epochs]", + Use: "register-incentive CONTRACT_ADDRESS ALLOCATION EPOCHS", Args: cobra.ExactArgs(3), Short: "Submit a proposal to register a contract incentive", Long: "Submit a proposal to register a contract incentive.", @@ -109,7 +109,7 @@ func NewRegisterIncentiveProposalCmd() *cobra.Command { //nolint:staticcheck func NewCancelIncentiveProposalCmd() *cobra.Command { cmd := &cobra.Command{ - Use: "cancel-incentive [contract-address]", + Use: "cancel-incentive CONTRACT_ADDRESS", Args: cobra.ExactArgs(1), Short: "Submit a proposal to cancel a contract incentive", Long: "Submit a proposal to cancel a contract incentive.", diff --git a/x/incentives/client/proposal_handler.go b/x/incentives/client/proposal_handler.go index cb2944fac7..7973d932ff 100644 --- a/x/incentives/client/proposal_handler.go +++ b/x/incentives/client/proposal_handler.go @@ -3,7 +3,7 @@ package client import ( govclient "github.com/cosmos/cosmos-sdk/x/gov/client" - "github.com/evmos/evmos/v9/x/incentives/client/cli" + "github.com/evmos/evmos/v10/x/incentives/client/cli" ) var ( diff --git a/x/incentives/genesis.go b/x/incentives/genesis.go index 651a1ccc6c..6fa1311fb7 100644 --- a/x/incentives/genesis.go +++ b/x/incentives/genesis.go @@ -6,8 +6,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper" - "github.com/evmos/evmos/v9/x/incentives/keeper" - "github.com/evmos/evmos/v9/x/incentives/types" + "github.com/evmos/evmos/v10/x/incentives/keeper" + "github.com/evmos/evmos/v10/x/incentives/types" ) // InitGenesis import module genesis diff --git a/x/incentives/keeper/allocation_meters.go b/x/incentives/keeper/allocation_meters.go index 464cbe92d9..1cfe285d0e 100644 --- a/x/incentives/keeper/allocation_meters.go +++ b/x/incentives/keeper/allocation_meters.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/evmos/evmos/v9/x/incentives/types" + "github.com/evmos/evmos/v10/x/incentives/types" ) // GetAllAllocationMeters - get all registered AllocationMeters diff --git a/x/incentives/keeper/distribution.go b/x/incentives/keeper/distribution.go index bad6ed78e6..ae85556dfd 100644 --- a/x/incentives/keeper/distribution.go +++ b/x/incentives/keeper/distribution.go @@ -12,7 +12,7 @@ import ( errortypes "github.com/cosmos/cosmos-sdk/types/errors" "github.com/ethereum/go-ethereum/common" - "github.com/evmos/evmos/v9/x/incentives/types" + "github.com/evmos/evmos/v10/x/incentives/types" ) // DistributeRewards transfers the allocated rewards to the participants of a given diff --git a/x/incentives/keeper/distribution_test.go b/x/incentives/keeper/distribution_test.go index c188c2b176..6109d26803 100644 --- a/x/incentives/keeper/distribution_test.go +++ b/x/incentives/keeper/distribution_test.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/evmos/evmos/v9/x/incentives/types" + "github.com/evmos/evmos/v10/x/incentives/types" ) func (suite *KeeperTestSuite) TestDistributeIncentives() { diff --git a/x/incentives/keeper/epoch_hooks.go b/x/incentives/keeper/epoch_hooks.go index ee07d50b21..00784a3344 100644 --- a/x/incentives/keeper/epoch_hooks.go +++ b/x/incentives/keeper/epoch_hooks.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - epochstypes "github.com/evmos/evmos/v9/x/epochs/types" + epochstypes "github.com/evmos/evmos/v10/x/epochs/types" ) // BeforeEpochStart performs a no-op diff --git a/x/incentives/keeper/evm_hooks.go b/x/incentives/keeper/evm_hooks.go index 9b63f9f88b..3ce0af5f9e 100644 --- a/x/incentives/keeper/evm_hooks.go +++ b/x/incentives/keeper/evm_hooks.go @@ -11,7 +11,7 @@ import ( ethermint "github.com/evmos/ethermint/types" evmtypes "github.com/evmos/ethermint/x/evm/types" - "github.com/evmos/evmos/v9/x/incentives/types" + "github.com/evmos/evmos/v10/x/incentives/types" ) var _ evmtypes.EvmHooks = Hooks{} diff --git a/x/incentives/keeper/evm_hooks_test.go b/x/incentives/keeper/evm_hooks_test.go index 967ad5fd73..c3d063e10e 100644 --- a/x/incentives/keeper/evm_hooks_test.go +++ b/x/incentives/keeper/evm_hooks_test.go @@ -14,9 +14,9 @@ import ( ethermint "github.com/evmos/ethermint/types" evm "github.com/evmos/ethermint/x/evm/types" - "github.com/evmos/evmos/v9/testutil" - "github.com/evmos/evmos/v9/x/incentives/types" - vestingtypes "github.com/evmos/evmos/v9/x/vesting/types" + "github.com/evmos/evmos/v10/testutil" + "github.com/evmos/evmos/v10/x/incentives/types" + vestingtypes "github.com/evmos/evmos/v10/x/vesting/types" ) // ensureHooksSet tries to set the hooks on EVMKeeper, this will fail if the diff --git a/x/incentives/keeper/gas_meters.go b/x/incentives/keeper/gas_meters.go index e3ff984161..7766478c86 100644 --- a/x/incentives/keeper/gas_meters.go +++ b/x/incentives/keeper/gas_meters.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/common" - "github.com/evmos/evmos/v9/x/incentives/types" + "github.com/evmos/evmos/v10/x/incentives/types" ) // GetIncentivesGasMeters - get all registered GasMeters per Incentive diff --git a/x/incentives/keeper/gas_meters_test.go b/x/incentives/keeper/gas_meters_test.go index 66227be845..8108ac7921 100644 --- a/x/incentives/keeper/gas_meters_test.go +++ b/x/incentives/keeper/gas_meters_test.go @@ -6,7 +6,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/evmos/ethermint/tests" - "github.com/evmos/evmos/v9/x/incentives/types" + "github.com/evmos/evmos/v10/x/incentives/types" ) func (suite *KeeperTestSuite) TestGetIncentivesGasMeters() { diff --git a/x/incentives/keeper/grpc_query.go b/x/incentives/keeper/grpc_query.go index 805ec0afb8..73cbaf03eb 100644 --- a/x/incentives/keeper/grpc_query.go +++ b/x/incentives/keeper/grpc_query.go @@ -15,7 +15,7 @@ import ( "github.com/ethereum/go-ethereum/common" ethermint "github.com/evmos/ethermint/types" - "github.com/evmos/evmos/v9/x/incentives/types" + "github.com/evmos/evmos/v10/x/incentives/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/incentives/keeper/grpc_query_test.go b/x/incentives/keeper/grpc_query_test.go index 2e2fdd566a..e6052cf17a 100644 --- a/x/incentives/keeper/grpc_query_test.go +++ b/x/incentives/keeper/grpc_query_test.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" - "github.com/evmos/evmos/v9/x/incentives/types" + "github.com/evmos/evmos/v10/x/incentives/types" ) func (suite *KeeperTestSuite) TestIncentives() { diff --git a/x/incentives/keeper/incentives.go b/x/incentives/keeper/incentives.go index 5390f49f3a..ccce39439f 100644 --- a/x/incentives/keeper/incentives.go +++ b/x/incentives/keeper/incentives.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/common" - "github.com/evmos/evmos/v9/x/incentives/types" + "github.com/evmos/evmos/v10/x/incentives/types" ) // GetAllIncentives - get all registered Incentives diff --git a/x/incentives/keeper/incentives_test.go b/x/incentives/keeper/incentives_test.go index da900a6a25..517638b60e 100644 --- a/x/incentives/keeper/incentives_test.go +++ b/x/incentives/keeper/incentives_test.go @@ -5,7 +5,7 @@ import ( "github.com/ethereum/go-ethereum/common" - "github.com/evmos/evmos/v9/x/incentives/types" + "github.com/evmos/evmos/v10/x/incentives/types" ) func (suite *KeeperTestSuite) TestGetAllIncentives() { diff --git a/x/incentives/keeper/integration_test.go b/x/incentives/keeper/integration_test.go index 004b421ff0..87f464e61f 100644 --- a/x/incentives/keeper/integration_test.go +++ b/x/incentives/keeper/integration_test.go @@ -15,7 +15,7 @@ import ( ethermint "github.com/evmos/ethermint/types" evmtypes "github.com/evmos/ethermint/x/evm/types" - "github.com/evmos/evmos/v9/x/incentives/types" + "github.com/evmos/evmos/v10/x/incentives/types" ) var _ = Describe("Performing EVM transactions", Ordered, func() { diff --git a/x/incentives/keeper/keeper.go b/x/incentives/keeper/keeper.go index 9e25000b3d..ccfd6e5698 100644 --- a/x/incentives/keeper/keeper.go +++ b/x/incentives/keeper/keeper.go @@ -9,7 +9,7 @@ import ( paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" "github.com/tendermint/tendermint/libs/log" - "github.com/evmos/evmos/v9/x/incentives/types" + "github.com/evmos/evmos/v10/x/incentives/types" ) // Keeper of this module maintains collections of incentives. diff --git a/x/incentives/keeper/keeper_test.go b/x/incentives/keeper/keeper_test.go index 69e9bf7ebb..d08850439f 100644 --- a/x/incentives/keeper/keeper_test.go +++ b/x/incentives/keeper/keeper_test.go @@ -36,10 +36,10 @@ import ( ethermint "github.com/evmos/ethermint/types" evm "github.com/evmos/ethermint/x/evm/types" - "github.com/evmos/evmos/v9/app" - "github.com/evmos/evmos/v9/contracts" - epochstypes "github.com/evmos/evmos/v9/x/epochs/types" - "github.com/evmos/evmos/v9/x/incentives/types" + "github.com/evmos/evmos/v10/app" + "github.com/evmos/evmos/v10/contracts" + epochstypes "github.com/evmos/evmos/v10/x/epochs/types" + "github.com/evmos/evmos/v10/x/incentives/types" ) var ( diff --git a/x/incentives/keeper/params.go b/x/incentives/keeper/params.go index e6a4fdbc94..8178c4377a 100644 --- a/x/incentives/keeper/params.go +++ b/x/incentives/keeper/params.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/evmos/evmos/v9/x/incentives/types" + "github.com/evmos/evmos/v10/x/incentives/types" ) // GetParams returns the total set of incentives parameters. diff --git a/x/incentives/keeper/params_test.go b/x/incentives/keeper/params_test.go index 032f90ae2e..d61a0d3f87 100644 --- a/x/incentives/keeper/params_test.go +++ b/x/incentives/keeper/params_test.go @@ -1,6 +1,6 @@ package keeper_test -import "github.com/evmos/evmos/v9/x/incentives/types" +import "github.com/evmos/evmos/v10/x/incentives/types" func (suite *KeeperTestSuite) TestParams() { params := suite.app.IncentivesKeeper.GetParams(suite.ctx) diff --git a/x/incentives/keeper/proposals.go b/x/incentives/keeper/proposals.go index 4f1cbd4509..9e5f578900 100644 --- a/x/incentives/keeper/proposals.go +++ b/x/incentives/keeper/proposals.go @@ -6,7 +6,7 @@ import ( errortypes "github.com/cosmos/cosmos-sdk/types/errors" "github.com/ethereum/go-ethereum/common" - "github.com/evmos/evmos/v9/x/incentives/types" + "github.com/evmos/evmos/v10/x/incentives/types" ) // RegisterIncentive creates an incentive for a contract diff --git a/x/incentives/keeper/proposals_test.go b/x/incentives/keeper/proposals_test.go index 76af788a4d..79525dc861 100644 --- a/x/incentives/keeper/proposals_test.go +++ b/x/incentives/keeper/proposals_test.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/evmos/ethermint/tests" - "github.com/evmos/evmos/v9/x/incentives/types" + "github.com/evmos/evmos/v10/x/incentives/types" ) func (suite KeeperTestSuite) TestRegisterIncentive() { diff --git a/x/incentives/module.go b/x/incentives/module.go index 713e57e10b..76732fbc5f 100644 --- a/x/incentives/module.go +++ b/x/incentives/module.go @@ -18,9 +18,9 @@ import ( "github.com/spf13/cobra" abci "github.com/tendermint/tendermint/abci/types" - "github.com/evmos/evmos/v9/x/incentives/client/cli" - "github.com/evmos/evmos/v9/x/incentives/keeper" - "github.com/evmos/evmos/v9/x/incentives/types" + "github.com/evmos/evmos/v10/x/incentives/client/cli" + "github.com/evmos/evmos/v10/x/incentives/keeper" + "github.com/evmos/evmos/v10/x/incentives/types" ) // type check to ensure the interface is properly implemented diff --git a/x/incentives/proposal_handler.go b/x/incentives/proposal_handler.go index 0ca1280753..650eb8e172 100644 --- a/x/incentives/proposal_handler.go +++ b/x/incentives/proposal_handler.go @@ -10,8 +10,8 @@ import ( govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" "github.com/ethereum/go-ethereum/common" - "github.com/evmos/evmos/v9/x/incentives/keeper" - "github.com/evmos/evmos/v9/x/incentives/types" + "github.com/evmos/evmos/v10/x/incentives/keeper" + "github.com/evmos/evmos/v10/x/incentives/types" ) // NewIncentivesProposalHandler creates a governance handler to manage new diff --git a/x/incentives/spec/08_clients.md b/x/incentives/spec/08_clients.md index b741316bb3..2431035a7a 100644 --- a/x/incentives/spec/08_clients.md +++ b/x/incentives/spec/08_clients.md @@ -27,7 +27,7 @@ evmosd query incentives incentives [flags] Allows users to query an incentive for a given contract. ```go -evmosd query incentives incentive [contract-address] [flags] +evmosd query incentives incentive CONTRACT_ADDRESS [flags] ``` **`gas-meters`** @@ -35,7 +35,7 @@ evmosd query incentives incentive [contract-address] [flags] Allows users to query all gas meters for a given incentive. ```bash -evmosd query incentives gas-meters [contract-address] [flags] +evmosd query incentives gas-meters CONTRACT_ADDRESS [flags] ``` **`gas-meter`** @@ -43,7 +43,7 @@ evmosd query incentives gas-meters [contract-address] [flags] Allows users to query a gas meter for a given incentive and user. ```go -evmosd query incentives gas-meter [contract-address] [participant-address] [flags] +evmosd query incentives gas-meter CONTRACT_ADDRESS PARTICIPANT_ADDRESS [flags] ``` **`params`** @@ -63,7 +63,7 @@ The `tx gov submit-proposal` commands allow users to query create a proposal usi Allows users to submit a `RegisterIncentiveProposal`. ```bash -evmosd tx gov submit-proposal register-incentive [contract-address] [allocation] [epochs] [flags] +evmosd tx gov submit-proposal register-incentive CONTRACT_ADDRESS ALLOCATION EPOCHS [flags] ``` **`cancel-incentive`** @@ -71,7 +71,7 @@ evmosd tx gov submit-proposal register-incentive [contract-address] [allocation] Allows users to submit a `CanelIncentiveProposal`. ```bash -evmosd tx gov submit-proposal cancel-incentive [contract-address] [flags] +evmosd tx gov submit-proposal cancel-incentive CONTRACT_ADDRESS [flags] ``` **`param-change`** @@ -79,7 +79,7 @@ evmosd tx gov submit-proposal cancel-incentive [contract-address] [flags] Allows users to submit a `ParameterChangeProposal``. ```bash -evmosd tx gov submit-proposal param-change [proposal-file] [flags] +evmosd tx gov submit-proposal param-change PROPOSAL_FILE [flags] ``` ## gRPC diff --git a/x/incentives/types/interfaces.go b/x/incentives/types/interfaces.go index 7989280c93..8293490465 100644 --- a/x/incentives/types/interfaces.go +++ b/x/incentives/types/interfaces.go @@ -14,7 +14,7 @@ import ( "github.com/evmos/ethermint/x/evm/statedb" evmtypes "github.com/evmos/ethermint/x/evm/types" - inflationtypes "github.com/evmos/evmos/v9/x/inflation/types" + inflationtypes "github.com/evmos/evmos/v10/x/inflation/types" ) // AccountKeeper defines the expected interface needed to retrieve account info. diff --git a/x/incentives/types/params.go b/x/incentives/types/params.go index c2a78d13e8..6d513a3d32 100644 --- a/x/incentives/types/params.go +++ b/x/incentives/types/params.go @@ -8,7 +8,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - epochstypes "github.com/evmos/evmos/v9/x/epochs/types" + epochstypes "github.com/evmos/evmos/v10/x/epochs/types" ) // Parameter store key diff --git a/x/incentives/types/params_test.go b/x/incentives/types/params_test.go index f38a2b642e..f8ea1e51ed 100644 --- a/x/incentives/types/params_test.go +++ b/x/incentives/types/params_test.go @@ -9,7 +9,7 @@ import ( govtypes "github.com/cosmos/cosmos-sdk/x/gov/types/v1" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - epochstypes "github.com/evmos/evmos/v9/x/epochs/types" + epochstypes "github.com/evmos/evmos/v10/x/epochs/types" ) type ParamsTestSuite struct { diff --git a/x/inflation/client/cli/query.go b/x/inflation/client/cli/query.go index efb3274193..fe06e9f1db 100644 --- a/x/inflation/client/cli/query.go +++ b/x/inflation/client/cli/query.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/evmos/evmos/v9/x/inflation/types" + "github.com/evmos/evmos/v10/x/inflation/types" ) // GetQueryCmd returns the cli query commands for the inflation module. diff --git a/x/inflation/genesis.go b/x/inflation/genesis.go index 66b6706a8c..ebad35ebfb 100644 --- a/x/inflation/genesis.go +++ b/x/inflation/genesis.go @@ -2,8 +2,8 @@ package inflation import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/evmos/evmos/v9/x/inflation/keeper" - "github.com/evmos/evmos/v9/x/inflation/types" + "github.com/evmos/evmos/v10/x/inflation/keeper" + "github.com/evmos/evmos/v10/x/inflation/types" ) // InitGenesis import module genesis diff --git a/x/inflation/keeper/epoch_info.go b/x/inflation/keeper/epoch_info.go index edeb950145..c8c2ee3ba2 100644 --- a/x/inflation/keeper/epoch_info.go +++ b/x/inflation/keeper/epoch_info.go @@ -2,7 +2,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/evmos/evmos/v9/x/inflation/types" + "github.com/evmos/evmos/v10/x/inflation/types" ) // GetEpochIdentifier gets the epoch identifier diff --git a/x/inflation/keeper/epoch_info_test.go b/x/inflation/keeper/epoch_info_test.go index 14da74012d..2d4cdbb718 100644 --- a/x/inflation/keeper/epoch_info_test.go +++ b/x/inflation/keeper/epoch_info_test.go @@ -3,8 +3,8 @@ package keeper_test import ( "fmt" - epochstypes "github.com/evmos/evmos/v9/x/epochs/types" - "github.com/evmos/evmos/v9/x/inflation/types" + epochstypes "github.com/evmos/evmos/v10/x/epochs/types" + "github.com/evmos/evmos/v10/x/inflation/types" ) func (suite *KeeperTestSuite) TestSetGetEpochIdentifier() { diff --git a/x/inflation/keeper/epoch_mint_provisions.go b/x/inflation/keeper/epoch_mint_provisions.go index e0b9dca9be..6640a96883 100644 --- a/x/inflation/keeper/epoch_mint_provisions.go +++ b/x/inflation/keeper/epoch_mint_provisions.go @@ -4,7 +4,7 @@ import ( "fmt" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/evmos/evmos/v9/x/inflation/types" + "github.com/evmos/evmos/v10/x/inflation/types" ) // GetEpochMintProvision gets the current EpochMintProvision diff --git a/x/inflation/keeper/grpc_query.go b/x/inflation/keeper/grpc_query.go index b3941c6994..3d4a321674 100644 --- a/x/inflation/keeper/grpc_query.go +++ b/x/inflation/keeper/grpc_query.go @@ -4,7 +4,7 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/evmos/evmos/v9/x/inflation/types" + "github.com/evmos/evmos/v10/x/inflation/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/x/inflation/keeper/grpc_query_test.go b/x/inflation/keeper/grpc_query_test.go index 10cdfdce05..d13b583d2c 100644 --- a/x/inflation/keeper/grpc_query_test.go +++ b/x/inflation/keeper/grpc_query_test.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" ethermint "github.com/evmos/ethermint/types" - "github.com/evmos/evmos/v9/x/inflation/types" + "github.com/evmos/evmos/v10/x/inflation/types" ) func (suite *KeeperTestSuite) TestPeriod() { diff --git a/x/inflation/keeper/hooks.go b/x/inflation/keeper/hooks.go index c5596c8cca..370ac8f0ce 100644 --- a/x/inflation/keeper/hooks.go +++ b/x/inflation/keeper/hooks.go @@ -6,8 +6,8 @@ import ( "github.com/armon/go-metrics" "github.com/cosmos/cosmos-sdk/telemetry" sdk "github.com/cosmos/cosmos-sdk/types" - epochstypes "github.com/evmos/evmos/v9/x/epochs/types" - "github.com/evmos/evmos/v9/x/inflation/types" + epochstypes "github.com/evmos/evmos/v10/x/epochs/types" + "github.com/evmos/evmos/v10/x/inflation/types" ) // BeforeEpochStart: noop, We don't need to do anything here diff --git a/x/inflation/keeper/hooks_test.go b/x/inflation/keeper/hooks_test.go index cb28c548f0..ac75a50622 100644 --- a/x/inflation/keeper/hooks_test.go +++ b/x/inflation/keeper/hooks_test.go @@ -4,8 +4,8 @@ import ( "fmt" "time" - epochstypes "github.com/evmos/evmos/v9/x/epochs/types" - "github.com/evmos/evmos/v9/x/inflation/types" + epochstypes "github.com/evmos/evmos/v10/x/epochs/types" + "github.com/evmos/evmos/v10/x/inflation/types" ) func (suite *KeeperTestSuite) TestEpochIdentifierAfterEpochEnd() { diff --git a/x/inflation/keeper/inflation.go b/x/inflation/keeper/inflation.go index ff475e80a3..0045b5674b 100644 --- a/x/inflation/keeper/inflation.go +++ b/x/inflation/keeper/inflation.go @@ -5,9 +5,9 @@ import ( ethermint "github.com/evmos/ethermint/types" - evmos "github.com/evmos/evmos/v9/types" - incentivestypes "github.com/evmos/evmos/v9/x/incentives/types" - "github.com/evmos/evmos/v9/x/inflation/types" + evmos "github.com/evmos/evmos/v10/types" + incentivestypes "github.com/evmos/evmos/v10/x/incentives/types" + "github.com/evmos/evmos/v10/x/inflation/types" ) // 200M token at year 4 allocated to the team diff --git a/x/inflation/keeper/inflation_test.go b/x/inflation/keeper/inflation_test.go index cf6e414905..5f037eb6d3 100644 --- a/x/inflation/keeper/inflation_test.go +++ b/x/inflation/keeper/inflation_test.go @@ -6,8 +6,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" ethermint "github.com/evmos/ethermint/types" - incentivestypes "github.com/evmos/evmos/v9/x/incentives/types" - "github.com/evmos/evmos/v9/x/inflation/types" + incentivestypes "github.com/evmos/evmos/v10/x/incentives/types" + "github.com/evmos/evmos/v10/x/inflation/types" ) func (suite *KeeperTestSuite) TestMintAndAllocateInflation() { diff --git a/x/inflation/keeper/integration_test.go b/x/inflation/keeper/integration_test.go index 237cf33f88..b40f5b93ad 100644 --- a/x/inflation/keeper/integration_test.go +++ b/x/inflation/keeper/integration_test.go @@ -8,8 +8,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - epochstypes "github.com/evmos/evmos/v9/x/epochs/types" - incentivestypes "github.com/evmos/evmos/v9/x/incentives/types" + epochstypes "github.com/evmos/evmos/v10/x/epochs/types" + incentivestypes "github.com/evmos/evmos/v10/x/incentives/types" ) var ( diff --git a/x/inflation/keeper/keeper.go b/x/inflation/keeper/keeper.go index 8fe0c369f1..79aecd37d6 100644 --- a/x/inflation/keeper/keeper.go +++ b/x/inflation/keeper/keeper.go @@ -8,7 +8,7 @@ import ( "github.com/tendermint/tendermint/libs/log" - "github.com/evmos/evmos/v9/x/inflation/types" + "github.com/evmos/evmos/v10/x/inflation/types" ) // Keeper of the inflation store diff --git a/x/inflation/keeper/keeper_test.go b/x/inflation/keeper/keeper_test.go index ab11c12694..10b3acac50 100644 --- a/x/inflation/keeper/keeper_test.go +++ b/x/inflation/keeper/keeper_test.go @@ -19,9 +19,9 @@ import ( evm "github.com/evmos/ethermint/x/evm/types" - "github.com/evmos/evmos/v9/app" - epochstypes "github.com/evmos/evmos/v9/x/epochs/types" - "github.com/evmos/evmos/v9/x/inflation/types" + "github.com/evmos/evmos/v10/app" + epochstypes "github.com/evmos/evmos/v10/x/epochs/types" + "github.com/evmos/evmos/v10/x/inflation/types" ) var denomMint = types.DefaultInflationDenom diff --git a/x/inflation/keeper/params.go b/x/inflation/keeper/params.go index 6e5f9ed01a..f4686a083c 100644 --- a/x/inflation/keeper/params.go +++ b/x/inflation/keeper/params.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/evmos/evmos/v9/x/inflation/types" + "github.com/evmos/evmos/v10/x/inflation/types" ) // GetParams returns the total set of inflation parameters. diff --git a/x/inflation/keeper/params_test.go b/x/inflation/keeper/params_test.go index 612d2abfc7..cc13cec590 100644 --- a/x/inflation/keeper/params_test.go +++ b/x/inflation/keeper/params_test.go @@ -1,7 +1,7 @@ package keeper_test import ( - "github.com/evmos/evmos/v9/x/inflation/types" + "github.com/evmos/evmos/v10/x/inflation/types" ) func (suite *KeeperTestSuite) TestParams() { diff --git a/x/inflation/keeper/periods.go b/x/inflation/keeper/periods.go index fd0fd43499..ece72fe022 100644 --- a/x/inflation/keeper/periods.go +++ b/x/inflation/keeper/periods.go @@ -2,7 +2,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/evmos/evmos/v9/x/inflation/types" + "github.com/evmos/evmos/v10/x/inflation/types" ) // GetPeriod gets current period diff --git a/x/inflation/module.go b/x/inflation/module.go index a0403f0582..5206293cca 100644 --- a/x/inflation/module.go +++ b/x/inflation/module.go @@ -19,9 +19,9 @@ import ( "github.com/spf13/cobra" abci "github.com/tendermint/tendermint/abci/types" - "github.com/evmos/evmos/v9/x/inflation/client/cli" - "github.com/evmos/evmos/v9/x/inflation/keeper" - "github.com/evmos/evmos/v9/x/inflation/types" + "github.com/evmos/evmos/v10/x/inflation/client/cli" + "github.com/evmos/evmos/v10/x/inflation/keeper" + "github.com/evmos/evmos/v10/x/inflation/types" ) // type check to ensure the interface is properly implemented diff --git a/x/inflation/types/genesis.go b/x/inflation/types/genesis.go index 74c6bfb9fc..a9f0091e3e 100644 --- a/x/inflation/types/genesis.go +++ b/x/inflation/types/genesis.go @@ -3,7 +3,7 @@ package types import ( fmt "fmt" - epochstypes "github.com/evmos/evmos/v9/x/epochs/types" + epochstypes "github.com/evmos/evmos/v10/x/epochs/types" ) // NewGenesisState creates a new GenesisState object diff --git a/x/inflation/types/genesis_test.go b/x/inflation/types/genesis_test.go index 023029ce25..551c2d4d01 100644 --- a/x/inflation/types/genesis_test.go +++ b/x/inflation/types/genesis_test.go @@ -3,7 +3,7 @@ package types import ( "testing" - epochstypes "github.com/evmos/evmos/v9/x/epochs/types" + epochstypes "github.com/evmos/evmos/v10/x/epochs/types" "github.com/stretchr/testify/suite" ) diff --git a/x/recovery/client/cli/query.go b/x/recovery/client/cli/query.go index 3a50fa54c4..c8948d63c2 100644 --- a/x/recovery/client/cli/query.go +++ b/x/recovery/client/cli/query.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/spf13/cobra" - "github.com/evmos/evmos/v9/x/recovery/types" + "github.com/evmos/evmos/v10/x/recovery/types" ) // GetQueryCmd returns the parent command for all recovery CLI query commands. diff --git a/x/recovery/genesis.go b/x/recovery/genesis.go index 53997183d7..011e18488c 100644 --- a/x/recovery/genesis.go +++ b/x/recovery/genesis.go @@ -3,8 +3,8 @@ package recovery import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/evmos/evmos/v9/x/recovery/keeper" - "github.com/evmos/evmos/v9/x/recovery/types" + "github.com/evmos/evmos/v10/x/recovery/keeper" + "github.com/evmos/evmos/v10/x/recovery/types" ) // InitGenesis import module genesis diff --git a/x/recovery/genesis_test.go b/x/recovery/genesis_test.go index c67a3f04f2..ca11883140 100644 --- a/x/recovery/genesis_test.go +++ b/x/recovery/genesis_test.go @@ -15,9 +15,9 @@ import ( "github.com/evmos/ethermint/tests" feemarkettypes "github.com/evmos/ethermint/x/feemarket/types" - "github.com/evmos/evmos/v9/app" - "github.com/evmos/evmos/v9/x/recovery" - "github.com/evmos/evmos/v9/x/recovery/types" + "github.com/evmos/evmos/v10/app" + "github.com/evmos/evmos/v10/x/recovery" + "github.com/evmos/evmos/v10/x/recovery/types" ) type GenesisTestSuite struct { diff --git a/x/recovery/ibc_middleware.go b/x/recovery/ibc_middleware.go index 1860dd3219..c25e73c31c 100644 --- a/x/recovery/ibc_middleware.go +++ b/x/recovery/ibc_middleware.go @@ -7,8 +7,8 @@ import ( porttypes "github.com/cosmos/ibc-go/v5/modules/core/05-port/types" "github.com/cosmos/ibc-go/v5/modules/core/exported" - "github.com/evmos/evmos/v9/ibc" - "github.com/evmos/evmos/v9/x/recovery/keeper" + "github.com/evmos/evmos/v10/ibc" + "github.com/evmos/evmos/v10/x/recovery/keeper" ) var _ porttypes.Middleware = &IBCMiddleware{} diff --git a/x/recovery/keeper/grpc_query.go b/x/recovery/keeper/grpc_query.go index ff6e5c5815..c7c565ae56 100644 --- a/x/recovery/keeper/grpc_query.go +++ b/x/recovery/keeper/grpc_query.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/evmos/evmos/v9/x/recovery/types" + "github.com/evmos/evmos/v10/x/recovery/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/recovery/keeper/grpc_query_test.go b/x/recovery/keeper/grpc_query_test.go index 3e982cc227..576d0ba19b 100644 --- a/x/recovery/keeper/grpc_query_test.go +++ b/x/recovery/keeper/grpc_query_test.go @@ -3,7 +3,7 @@ package keeper_test import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/evmos/evmos/v9/x/recovery/types" + "github.com/evmos/evmos/v10/x/recovery/types" ) func (suite *KeeperTestSuite) TestQueryParams() { diff --git a/x/recovery/keeper/ibc_callbacks.go b/x/recovery/keeper/ibc_callbacks.go index acae53c69d..c6ee6b5882 100644 --- a/x/recovery/keeper/ibc_callbacks.go +++ b/x/recovery/keeper/ibc_callbacks.go @@ -16,9 +16,9 @@ import ( host "github.com/cosmos/ibc-go/v5/modules/core/24-host" "github.com/cosmos/ibc-go/v5/modules/core/exported" - "github.com/evmos/evmos/v9/ibc" - evmos "github.com/evmos/evmos/v9/types" - "github.com/evmos/evmos/v9/x/recovery/types" + "github.com/evmos/evmos/v10/ibc" + evmos "github.com/evmos/evmos/v10/types" + "github.com/evmos/evmos/v10/x/recovery/types" ) // OnRecvPacket performs an IBC receive callback. It returns the tokens that diff --git a/x/recovery/keeper/ibc_callbacks_integration_suite_test.go b/x/recovery/keeper/ibc_callbacks_integration_suite_test.go index 2bdf75e482..edcc9c8477 100644 --- a/x/recovery/keeper/ibc_callbacks_integration_suite_test.go +++ b/x/recovery/keeper/ibc_callbacks_integration_suite_test.go @@ -15,13 +15,13 @@ import ( channeltypes "github.com/cosmos/ibc-go/v5/modules/core/04-channel/types" ibcgotesting "github.com/cosmos/ibc-go/v5/testing" - ibctesting "github.com/evmos/evmos/v9/ibc/testing" + ibctesting "github.com/evmos/evmos/v10/ibc/testing" minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" - "github.com/evmos/evmos/v9/app" - claimtypes "github.com/evmos/evmos/v9/x/claims/types" - inflationtypes "github.com/evmos/evmos/v9/x/inflation/types" - "github.com/evmos/evmos/v9/x/recovery/types" + "github.com/evmos/evmos/v10/app" + claimtypes "github.com/evmos/evmos/v10/x/claims/types" + inflationtypes "github.com/evmos/evmos/v10/x/inflation/types" + "github.com/evmos/evmos/v10/x/recovery/types" ) type IBCTestingSuite struct { diff --git a/x/recovery/keeper/ibc_callbacks_integration_test.go b/x/recovery/keeper/ibc_callbacks_integration_test.go index 0e3fc1f090..88b24c9ec2 100644 --- a/x/recovery/keeper/ibc_callbacks_integration_test.go +++ b/x/recovery/keeper/ibc_callbacks_integration_test.go @@ -6,10 +6,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" transfertypes "github.com/cosmos/ibc-go/v5/modules/apps/transfer/types" channeltypes "github.com/cosmos/ibc-go/v5/modules/core/04-channel/types" - "github.com/evmos/evmos/v9/app" - "github.com/evmos/evmos/v9/testutil" - claimtypes "github.com/evmos/evmos/v9/x/claims/types" - "github.com/evmos/evmos/v9/x/recovery/types" + "github.com/evmos/evmos/v10/app" + "github.com/evmos/evmos/v10/testutil" + claimtypes "github.com/evmos/evmos/v10/x/claims/types" + "github.com/evmos/evmos/v10/x/recovery/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/x/recovery/keeper/ibc_callbacks_test.go b/x/recovery/keeper/ibc_callbacks_test.go index bd7db3689d..c1ba1d505f 100644 --- a/x/recovery/keeper/ibc_callbacks_test.go +++ b/x/recovery/keeper/ibc_callbacks_test.go @@ -8,7 +8,7 @@ import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" "github.com/evmos/ethermint/crypto/ethsecp256k1" "github.com/evmos/ethermint/tests" - "github.com/evmos/evmos/v9/testutil" + "github.com/evmos/evmos/v10/testutil" "github.com/stretchr/testify/mock" transfertypes "github.com/cosmos/ibc-go/v5/modules/apps/transfer/types" @@ -17,11 +17,11 @@ import ( ibcgotesting "github.com/cosmos/ibc-go/v5/testing" ibcmock "github.com/cosmos/ibc-go/v5/testing/mock" - claimstypes "github.com/evmos/evmos/v9/x/claims/types" - incentivestypes "github.com/evmos/evmos/v9/x/incentives/types" - "github.com/evmos/evmos/v9/x/recovery/keeper" - "github.com/evmos/evmos/v9/x/recovery/types" - vestingtypes "github.com/evmos/evmos/v9/x/vesting/types" + claimstypes "github.com/evmos/evmos/v10/x/claims/types" + incentivestypes "github.com/evmos/evmos/v10/x/incentives/types" + "github.com/evmos/evmos/v10/x/recovery/keeper" + "github.com/evmos/evmos/v10/x/recovery/types" + vestingtypes "github.com/evmos/evmos/v10/x/vesting/types" ) func (suite *KeeperTestSuite) TestOnRecvPacket() { diff --git a/x/recovery/keeper/keeper.go b/x/recovery/keeper/keeper.go index ec8c1b2764..ca1832e62b 100644 --- a/x/recovery/keeper/keeper.go +++ b/x/recovery/keeper/keeper.go @@ -13,7 +13,7 @@ import ( porttypes "github.com/cosmos/ibc-go/v5/modules/core/05-port/types" "github.com/cosmos/ibc-go/v5/modules/core/exported" - "github.com/evmos/evmos/v9/x/recovery/types" + "github.com/evmos/evmos/v10/x/recovery/types" ) var _ transfertypes.ICS4Wrapper = Keeper{} diff --git a/x/recovery/keeper/keeper_test.go b/x/recovery/keeper/keeper_test.go index ad2e928b3f..c5c3f0ee1f 100644 --- a/x/recovery/keeper/keeper_test.go +++ b/x/recovery/keeper/keeper_test.go @@ -17,9 +17,9 @@ import ( "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/evmos/evmos/v9/app" - claimstypes "github.com/evmos/evmos/v9/x/claims/types" - "github.com/evmos/evmos/v9/x/recovery/types" + "github.com/evmos/evmos/v10/app" + claimstypes "github.com/evmos/evmos/v10/x/claims/types" + "github.com/evmos/evmos/v10/x/recovery/types" ) var ( diff --git a/x/recovery/keeper/params.go b/x/recovery/keeper/params.go index f52375d617..c75c3e6353 100644 --- a/x/recovery/keeper/params.go +++ b/x/recovery/keeper/params.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/evmos/evmos/v9/x/recovery/types" + "github.com/evmos/evmos/v10/x/recovery/types" ) // GetParams returns the total set of recovery parameters. diff --git a/x/recovery/keeper/utils_test.go b/x/recovery/keeper/utils_test.go index 8b6b7cc5d4..5be9c47d35 100644 --- a/x/recovery/keeper/utils_test.go +++ b/x/recovery/keeper/utils_test.go @@ -11,7 +11,7 @@ import ( transfertypes "github.com/cosmos/ibc-go/v5/modules/apps/transfer/types" clienttypes "github.com/cosmos/ibc-go/v5/modules/core/02-client/types" - "github.com/evmos/evmos/v9/x/recovery/types" + "github.com/evmos/evmos/v10/x/recovery/types" ) var _ types.TransferKeeper = &MockTransferKeeper{} diff --git a/x/recovery/module.go b/x/recovery/module.go index b97c375a05..02ad8ad640 100644 --- a/x/recovery/module.go +++ b/x/recovery/module.go @@ -19,9 +19,9 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/evmos/evmos/v9/x/recovery/client/cli" - "github.com/evmos/evmos/v9/x/recovery/keeper" - "github.com/evmos/evmos/v9/x/recovery/types" + "github.com/evmos/evmos/v10/x/recovery/client/cli" + "github.com/evmos/evmos/v10/x/recovery/keeper" + "github.com/evmos/evmos/v10/x/recovery/types" ) // type check to ensure the interface is properly implemented diff --git a/x/recovery/types/interfaces.go b/x/recovery/types/interfaces.go index 83716336c0..65a5a888ee 100644 --- a/x/recovery/types/interfaces.go +++ b/x/recovery/types/interfaces.go @@ -10,7 +10,7 @@ import ( clienttypes "github.com/cosmos/ibc-go/v5/modules/core/02-client/types" channeltypes "github.com/cosmos/ibc-go/v5/modules/core/04-channel/types" - claimstypes "github.com/evmos/evmos/v9/x/claims/types" + claimstypes "github.com/evmos/evmos/v10/x/claims/types" ) // BankKeeper defines the banking keeper that must be fulfilled when diff --git a/x/revenue/client/cli/query.go b/x/revenue/client/cli/query.go index 5ac4ed870c..35b07af6e9 100644 --- a/x/revenue/client/cli/query.go +++ b/x/revenue/client/cli/query.go @@ -10,7 +10,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/version" - "github.com/evmos/evmos/v9/x/revenue/types" + "github.com/evmos/evmos/v10/x/revenue/types" ) // GetQueryCmd returns the cli query commands for this module @@ -75,7 +75,7 @@ func GetCmdQueryRevenues() *cobra.Command { // distribution func GetCmdQueryRevenue() *cobra.Command { cmd := &cobra.Command{ - Use: "contract [contract-address]", + Use: "contract CONTRACT_ADDRESS", Args: cobra.ExactArgs(1), Short: "Query a registered contract for fee distribution by hex address", Long: "Query a registered contract for fee distribution by hex address", @@ -137,7 +137,7 @@ func GetCmdQueryParams() *cobra.Command { // that a deployer has registered for fee distribution func GetCmdQueryDeployerRevenues() *cobra.Command { cmd := &cobra.Command{ - Use: "deployer-contracts [deployer-address]", + Use: "deployer-contracts DEPLOYER_ADDRESS", Args: cobra.ExactArgs(1), Short: "Query all contracts that a given deployer has registered for fee distribution", Long: "Query all contracts that a given deployer has registered for fee distribution", @@ -176,7 +176,7 @@ func GetCmdQueryDeployerRevenues() *cobra.Command { // address func GetCmdQueryWithdrawerRevenues() *cobra.Command { cmd := &cobra.Command{ - Use: "withdrawer-contracts [withdrawer-address]", + Use: "withdrawer-contracts WITHDRAWER_ADDRESS", Args: cobra.ExactArgs(1), Short: "Query all contracts that have been registered for fee distribution with a given withdrawer address", Long: "Query all contracts that have been registered for fee distribution with a given withdrawer address", diff --git a/x/revenue/client/cli/tx.go b/x/revenue/client/cli/tx.go index c6b3e9d325..f6ec835452 100644 --- a/x/revenue/client/cli/tx.go +++ b/x/revenue/client/cli/tx.go @@ -13,7 +13,7 @@ import ( ethermint "github.com/evmos/ethermint/types" - "github.com/evmos/evmos/v9/x/revenue/types" + "github.com/evmos/evmos/v10/x/revenue/types" ) // NewTxCmd returns a root CLI command handler for certain modules/revenue @@ -39,9 +39,9 @@ func NewTxCmd() *cobra.Command { // contract for fee distribution func NewRegisterRevenue() *cobra.Command { cmd := &cobra.Command{ - Use: "register [contract_hex] [nonces] [withdraw_bech32]", + Use: "register CONTRACT_HEX NONCE... [WITHDRAWER_BECH32]", Short: "Register a contract for fee distribution. **NOTE** Please ensure, that the deployer of the contract (or the factory that deployes the contract) is an account that is owned by your project, to avoid that an individual deployer who leaves your project becomes malicious.", - Long: "Register a contract for fee distribution.\nOnly the contract deployer can register a contract.\nProvide the account nonce(s) used to derive the contract address. E.g.: you have an account nonce of 4 when you send a deployment transaction for a contract A; you use this contract as a factory, to create another contract B. If you register A, the nonces value is \"4\". If you register B, the nonces value is \"4,1\" (B is the first contract created by A). \nThe withdraw address defaults to the deployer address if not provided.", + Long: "Register a contract for fee distribution.\nOnly the contract deployer can register a contract.\nProvide the account nonce(s) used to derive the contract address. E.g.: you have an account nonce of 4 when you send a deployment transaction for a contract A; you use this contract as a factory, to create another contract B. If you register A, the nonces value is \"4\". If you register B, the nonces value is \"4,1\" (B is the first contract created by A). \nThe withdrawer address defaults to the deployer address if not provided.", Args: cobra.RangeArgs(2, 3), RunE: func(cmd *cobra.Command, args []string) error { cliCtx, err := client.GetClientTxContext(cmd) @@ -49,7 +49,7 @@ func NewRegisterRevenue() *cobra.Command { return err } - var withdraw string + var withdrawer string deployer := cliCtx.GetFromAddress() contract := args[0] @@ -63,22 +63,22 @@ func NewRegisterRevenue() *cobra.Command { } if len(args) == 3 { - withdraw = args[2] - if _, err := sdk.AccAddressFromBech32(withdraw); err != nil { - return fmt.Errorf("invalid withdraw bech32 address %w", err) + withdrawer = args[2] + if _, err := sdk.AccAddressFromBech32(withdrawer); err != nil { + return fmt.Errorf("invalid withdrawer bech32 address %w", err) } } // If withdraw address is the same as contract deployer, remove the // field for avoiding storage bloat - if deployer.String() == withdraw { - withdraw = "" + if deployer.String() == withdrawer { + withdrawer = "" } msg := &types.MsgRegisterRevenue{ ContractAddress: contract, DeployerAddress: deployer.String(), - WithdrawerAddress: withdraw, + WithdrawerAddress: withdrawer, Nonces: nonces, } @@ -98,7 +98,7 @@ func NewRegisterRevenue() *cobra.Command { // contract for fee distribution func NewCancelRevenue() *cobra.Command { cmd := &cobra.Command{ - Use: "cancel [contract_hex]", + Use: "cancel CONTRACT_HEX", Short: "Cancel a contract from fee distribution", Long: "Cancel a contract from fee distribution. The deployer will no longer receive fees from users interacting with the contract. \nOnly the contract deployer can cancel a contract.", Args: cobra.ExactArgs(1), @@ -136,9 +136,9 @@ func NewCancelRevenue() *cobra.Command { // address of a contract for fee distribution func NewUpdateRevenue() *cobra.Command { cmd := &cobra.Command{ - Use: "update [contract_hex] [withdraw_bech32]", - Short: "Update withdraw address for a contract registered for fee distribution.", - Long: "Update withdraw address for a contract registered for fee distribution. \nOnly the contract deployer can update the withdraw address.", + Use: "update CONTRACT_HEX WITHDRAWER_BECH32", + Short: "Update withdrawer address for a contract registered for fee distribution.", + Long: "Update withdrawer address for a contract registered for fee distribution. \nOnly the contract deployer can update the withdrawer address.", Args: cobra.ExactArgs(2), RunE: func(cmd *cobra.Command, args []string) error { cliCtx, err := client.GetClientTxContext(cmd) @@ -153,15 +153,15 @@ func NewUpdateRevenue() *cobra.Command { return fmt.Errorf("invalid contract hex address %w", err) } - withdraw := args[1] - if _, err := sdk.AccAddressFromBech32(withdraw); err != nil { - return fmt.Errorf("invalid withdraw bech32 address %w", err) + withdrawer := args[1] + if _, err := sdk.AccAddressFromBech32(withdrawer); err != nil { + return fmt.Errorf("invalid withdrawer bech32 address %w", err) } msg := &types.MsgUpdateRevenue{ ContractAddress: contract, DeployerAddress: deployer.String(), - WithdrawerAddress: withdraw, + WithdrawerAddress: withdrawer, } if err := msg.ValidateBasic(); err != nil { diff --git a/x/revenue/genesis.go b/x/revenue/genesis.go index 2c93f64693..64a8148138 100644 --- a/x/revenue/genesis.go +++ b/x/revenue/genesis.go @@ -3,8 +3,8 @@ package revenue import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/evmos/evmos/v9/x/revenue/keeper" - "github.com/evmos/evmos/v9/x/revenue/types" + "github.com/evmos/evmos/v10/x/revenue/keeper" + "github.com/evmos/evmos/v10/x/revenue/types" ) // InitGenesis import module genesis diff --git a/x/revenue/genesis_test.go b/x/revenue/genesis_test.go index f0e501c8bb..1525375cff 100644 --- a/x/revenue/genesis_test.go +++ b/x/revenue/genesis_test.go @@ -15,9 +15,9 @@ import ( "github.com/evmos/ethermint/tests" feemarkettypes "github.com/evmos/ethermint/x/feemarket/types" - "github.com/evmos/evmos/v9/app" - "github.com/evmos/evmos/v9/x/revenue" - "github.com/evmos/evmos/v9/x/revenue/types" + "github.com/evmos/evmos/v10/app" + "github.com/evmos/evmos/v10/x/revenue" + "github.com/evmos/evmos/v10/x/revenue/types" ) type GenesisTestSuite struct { diff --git a/x/revenue/handler.go b/x/revenue/handler.go index 67fb19fed2..9c72eb256f 100644 --- a/x/revenue/handler.go +++ b/x/revenue/handler.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" errortypes "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/evmos/evmos/v9/x/revenue/types" + "github.com/evmos/evmos/v10/x/revenue/types" ) // NewHandler defines the fees module handler instance diff --git a/x/revenue/keeper/evm_hooks.go b/x/revenue/keeper/evm_hooks.go index 6c4c2f3a98..3becad800b 100644 --- a/x/revenue/keeper/evm_hooks.go +++ b/x/revenue/keeper/evm_hooks.go @@ -11,7 +11,7 @@ import ( evmtypes "github.com/evmos/ethermint/x/evm/types" - "github.com/evmos/evmos/v9/x/revenue/types" + "github.com/evmos/evmos/v10/x/revenue/types" ) var _ evmtypes.EvmHooks = Hooks{} diff --git a/x/revenue/keeper/grpc_query.go b/x/revenue/keeper/grpc_query.go index 34169c2f9a..cbfa13d70b 100644 --- a/x/revenue/keeper/grpc_query.go +++ b/x/revenue/keeper/grpc_query.go @@ -13,7 +13,7 @@ import ( "github.com/ethereum/go-ethereum/common" ethermint "github.com/evmos/ethermint/types" - "github.com/evmos/evmos/v9/x/revenue/types" + "github.com/evmos/evmos/v10/x/revenue/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/revenue/keeper/grpc_query_test.go b/x/revenue/keeper/grpc_query_test.go index dfddc1242b..ae93dd8794 100644 --- a/x/revenue/keeper/grpc_query_test.go +++ b/x/revenue/keeper/grpc_query_test.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/query" "github.com/evmos/ethermint/tests" - "github.com/evmos/evmos/v9/x/revenue/types" + "github.com/evmos/evmos/v10/x/revenue/types" ) func (suite *KeeperTestSuite) TestRevenues() { diff --git a/x/revenue/keeper/integration_test.go b/x/revenue/keeper/integration_test.go index ce9ac09b90..31a0379a89 100644 --- a/x/revenue/keeper/integration_test.go +++ b/x/revenue/keeper/integration_test.go @@ -20,9 +20,9 @@ import ( "github.com/evmos/ethermint/encoding" "github.com/evmos/ethermint/tests" evmtypes "github.com/evmos/ethermint/x/evm/types" - "github.com/evmos/evmos/v9/app" - "github.com/evmos/evmos/v9/testutil" - "github.com/evmos/evmos/v9/x/revenue/types" + "github.com/evmos/evmos/v10/app" + "github.com/evmos/evmos/v10/testutil" + "github.com/evmos/evmos/v10/x/revenue/types" authsigning "github.com/cosmos/cosmos-sdk/x/auth/signing" diff --git a/x/revenue/keeper/keeper.go b/x/revenue/keeper/keeper.go index 09b6f0c7db..13834c9767 100644 --- a/x/revenue/keeper/keeper.go +++ b/x/revenue/keeper/keeper.go @@ -9,7 +9,7 @@ import ( paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" "github.com/tendermint/tendermint/libs/log" - "github.com/evmos/evmos/v9/x/revenue/types" + "github.com/evmos/evmos/v10/x/revenue/types" ) // Keeper of this module maintains collections of revenues for contracts diff --git a/x/revenue/keeper/keeper_test.go b/x/revenue/keeper/keeper_test.go index 6a33debcb6..4ac7d12476 100644 --- a/x/revenue/keeper/keeper_test.go +++ b/x/revenue/keeper/keeper_test.go @@ -19,9 +19,9 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" ethtypes "github.com/ethereum/go-ethereum/core/types" evm "github.com/evmos/ethermint/x/evm/types" - "github.com/evmos/evmos/v9/app" - claimtypes "github.com/evmos/evmos/v9/x/claims/types" - "github.com/evmos/evmos/v9/x/revenue/types" + "github.com/evmos/evmos/v10/app" + claimtypes "github.com/evmos/evmos/v10/x/claims/types" + "github.com/evmos/evmos/v10/x/revenue/types" "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" abci "github.com/tendermint/tendermint/abci/types" diff --git a/x/revenue/keeper/msg_server.go b/x/revenue/keeper/msg_server.go index a7bd8e5a7c..9af00d6e11 100644 --- a/x/revenue/keeper/msg_server.go +++ b/x/revenue/keeper/msg_server.go @@ -10,7 +10,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" - "github.com/evmos/evmos/v9/x/revenue/types" + "github.com/evmos/evmos/v10/x/revenue/types" ) var _ types.MsgServer = &Keeper{} diff --git a/x/revenue/keeper/msg_server_test.go b/x/revenue/keeper/msg_server_test.go index 4162b41977..8aab65477c 100644 --- a/x/revenue/keeper/msg_server_test.go +++ b/x/revenue/keeper/msg_server_test.go @@ -11,7 +11,7 @@ import ( "github.com/evmos/ethermint/tests" "github.com/evmos/ethermint/x/evm/statedb" - "github.com/evmos/evmos/v9/x/revenue/types" + "github.com/evmos/evmos/v10/x/revenue/types" ) func (suite *KeeperTestSuite) TestRegisterRevenue() { diff --git a/x/revenue/keeper/params.go b/x/revenue/keeper/params.go index ef60623331..e67c525a96 100644 --- a/x/revenue/keeper/params.go +++ b/x/revenue/keeper/params.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/evmos/evmos/v9/x/revenue/types" + "github.com/evmos/evmos/v10/x/revenue/types" ) // GetParams returns the total set of fees parameters. diff --git a/x/revenue/keeper/params_test.go b/x/revenue/keeper/params_test.go index 8713b59e58..4c0419cb11 100644 --- a/x/revenue/keeper/params_test.go +++ b/x/revenue/keeper/params_test.go @@ -1,6 +1,6 @@ package keeper_test -import "github.com/evmos/evmos/v9/x/revenue/types" +import "github.com/evmos/evmos/v10/x/revenue/types" func (suite *KeeperTestSuite) TestParams() { params := suite.app.RevenueKeeper.GetParams(suite.ctx) diff --git a/x/revenue/keeper/revenues.go b/x/revenue/keeper/revenues.go index ee1eab5952..254e9e43d3 100644 --- a/x/revenue/keeper/revenues.go +++ b/x/revenue/keeper/revenues.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/common" - "github.com/evmos/evmos/v9/x/revenue/types" + "github.com/evmos/evmos/v10/x/revenue/types" ) // GetRevenues returns all registered Revenues. diff --git a/x/revenue/keeper/revenues_test.go b/x/revenue/keeper/revenues_test.go index 3314d43527..18d3348513 100644 --- a/x/revenue/keeper/revenues_test.go +++ b/x/revenue/keeper/revenues_test.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/common" "github.com/evmos/ethermint/tests" - "github.com/evmos/evmos/v9/x/revenue/types" + "github.com/evmos/evmos/v10/x/revenue/types" ) func (suite *KeeperTestSuite) TestGetFees() { diff --git a/x/revenue/module.go b/x/revenue/module.go index 8b4e261a59..e614590f8e 100644 --- a/x/revenue/module.go +++ b/x/revenue/module.go @@ -18,9 +18,9 @@ import ( "github.com/spf13/cobra" abci "github.com/tendermint/tendermint/abci/types" - "github.com/evmos/evmos/v9/x/revenue/client/cli" - "github.com/evmos/evmos/v9/x/revenue/keeper" - "github.com/evmos/evmos/v9/x/revenue/types" + "github.com/evmos/evmos/v10/x/revenue/client/cli" + "github.com/evmos/evmos/v10/x/revenue/keeper" + "github.com/evmos/evmos/v10/x/revenue/types" ) // type check to ensure the interface is properly implemented diff --git a/x/revenue/types/interfaces.go b/x/revenue/types/interfaces.go index 3782384e14..0904e1f277 100644 --- a/x/revenue/types/interfaces.go +++ b/x/revenue/types/interfaces.go @@ -25,7 +25,7 @@ type BankKeeper interface { // EVMKeeper defines the expected EVM keeper interface used on erc20 type EVMKeeper interface { - EVMConfig(ctx sdk.Context) (*evmtypes.EVMConfig, error) + EVMConfig(ctx sdk.Context, proposerAddress sdk.ConsAddress) (*evmtypes.EVMConfig, error) GetParams(ctx sdk.Context) evmtypes.Params GetAccountWithoutBalance(ctx sdk.Context, addr common.Address) *statedb.Account } diff --git a/x/vesting/client/cli/query.go b/x/vesting/client/cli/query.go index 7625c65623..ae7a31c110 100644 --- a/x/vesting/client/cli/query.go +++ b/x/vesting/client/cli/query.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/spf13/cobra" - "github.com/evmos/evmos/v9/x/vesting/types" + "github.com/evmos/evmos/v10/x/vesting/types" ) // GetQueryCmd returns the parent command for all vesting CLI query commands. @@ -30,7 +30,7 @@ func GetQueryCmd() *cobra.Command { // GetBalancesCmd queries the unvested tokens for a given vesting account func GetBalancesCmd() *cobra.Command { cmd := &cobra.Command{ - Use: "balances [address]", + Use: "balances ADDRESS", Short: "Gets locked, unvested and vested tokens for a vesting account", Long: "Gets locked, unvested and vested tokens for a vesting account", Args: cobra.ExactArgs(1), diff --git a/x/vesting/client/cli/tx.go b/x/vesting/client/cli/tx.go index b27def028b..facf580108 100644 --- a/x/vesting/client/cli/tx.go +++ b/x/vesting/client/cli/tx.go @@ -12,7 +12,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkvesting "github.com/cosmos/cosmos-sdk/x/auth/vesting/types" - "github.com/evmos/evmos/v9/x/vesting/types" + "github.com/evmos/evmos/v10/x/vesting/types" ) // Transaction command flags @@ -49,7 +49,7 @@ func NewTxCmd() *cobra.Command { // MsgCreateClawbackVestingAccount transaction. func NewMsgCreateClawbackVestingAccountCmd() *cobra.Command { cmd := &cobra.Command{ - Use: "create-clawback-vesting-account [to_address]", + Use: "create-clawback-vesting-account TO_ADDRESS", Short: "Create a new vesting account funded with an allocation of tokens, subject to clawback.", Long: `Must provide a lockup periods file (--lockup), a vesting periods file (--vesting), or both. If both files are given, they must describe schedules for the same total amount. @@ -132,7 +132,7 @@ with a start time and an array of coins strings and durations relative to the st // MsgClawback transaction. func NewMsgClawbackCmd() *cobra.Command { cmd := &cobra.Command{ - Use: "clawback [address]", + Use: "clawback ADDRESS", Short: "Transfer unvested amount out of a ClawbackVestingAccount.", Long: `Must be requested by the original funder address (--from). May provide a destination address (--dest), otherwise the coins return to the funder. diff --git a/x/vesting/handler.go b/x/vesting/handler.go index dc41b3511d..0e4da20b1b 100644 --- a/x/vesting/handler.go +++ b/x/vesting/handler.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" errortypes "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/evmos/evmos/v9/x/vesting/types" + "github.com/evmos/evmos/v10/x/vesting/types" ) // NewHandler defines the vesting module handler instance diff --git a/x/vesting/keeper/grpc_query.go b/x/vesting/keeper/grpc_query.go index 3ad9523302..3158e328fd 100644 --- a/x/vesting/keeper/grpc_query.go +++ b/x/vesting/keeper/grpc_query.go @@ -7,7 +7,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/evmos/evmos/v9/x/vesting/types" + "github.com/evmos/evmos/v10/x/vesting/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/vesting/keeper/grpc_query_test.go b/x/vesting/keeper/grpc_query_test.go index 7123d2986a..6d4333cc49 100644 --- a/x/vesting/keeper/grpc_query_test.go +++ b/x/vesting/keeper/grpc_query_test.go @@ -7,8 +7,8 @@ import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" "github.com/evmos/ethermint/tests" - "github.com/evmos/evmos/v9/testutil" - "github.com/evmos/evmos/v9/x/vesting/types" + "github.com/evmos/evmos/v10/testutil" + "github.com/evmos/evmos/v10/x/vesting/types" ) func (suite *KeeperTestSuite) TestBalances() { diff --git a/x/vesting/keeper/integration_test.go b/x/vesting/keeper/integration_test.go index 143fbb4849..1cbfe5bc10 100644 --- a/x/vesting/keeper/integration_test.go +++ b/x/vesting/keeper/integration_test.go @@ -10,9 +10,9 @@ import ( "github.com/evmos/ethermint/encoding" "github.com/evmos/ethermint/tests" - "github.com/evmos/evmos/v9/app" - "github.com/evmos/evmos/v9/app/ante" - "github.com/evmos/evmos/v9/testutil" + "github.com/evmos/evmos/v10/app" + "github.com/evmos/evmos/v10/app/ante" + "github.com/evmos/evmos/v10/testutil" "github.com/ethereum/go-ethereum/common" ethtypes "github.com/ethereum/go-ethereum/core/types" @@ -22,9 +22,9 @@ import ( sdkvesting "github.com/cosmos/cosmos-sdk/x/auth/vesting/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" evmtypes "github.com/evmos/ethermint/x/evm/types" - claimstypes "github.com/evmos/evmos/v9/x/claims/types" + claimstypes "github.com/evmos/evmos/v10/x/claims/types" - "github.com/evmos/evmos/v9/x/vesting/types" + "github.com/evmos/evmos/v10/x/vesting/types" ) // Clawback vesting with Cliff and Lock. In this case the cliff is reached diff --git a/x/vesting/keeper/keeper.go b/x/vesting/keeper/keeper.go index 56ebe099f4..5b6de75c6e 100644 --- a/x/vesting/keeper/keeper.go +++ b/x/vesting/keeper/keeper.go @@ -8,7 +8,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/tendermint/tendermint/libs/log" - "github.com/evmos/evmos/v9/x/vesting/types" + "github.com/evmos/evmos/v10/x/vesting/types" ) // Keeper of this module maintains collections of vesting. diff --git a/x/vesting/keeper/keeper_test.go b/x/vesting/keeper/keeper_test.go index aaceb5c80f..a611f95931 100644 --- a/x/vesting/keeper/keeper_test.go +++ b/x/vesting/keeper/keeper_test.go @@ -35,10 +35,10 @@ import ( ethermint "github.com/evmos/ethermint/types" evm "github.com/evmos/ethermint/x/evm/types" - "github.com/evmos/evmos/v9/app" - "github.com/evmos/evmos/v9/contracts" - epochstypes "github.com/evmos/evmos/v9/x/epochs/types" - "github.com/evmos/evmos/v9/x/vesting/types" + "github.com/evmos/evmos/v10/app" + "github.com/evmos/evmos/v10/contracts" + epochstypes "github.com/evmos/evmos/v10/x/epochs/types" + "github.com/evmos/evmos/v10/x/vesting/types" ) var ( diff --git a/x/vesting/keeper/msg_server.go b/x/vesting/keeper/msg_server.go index 882071460c..befd055529 100644 --- a/x/vesting/keeper/msg_server.go +++ b/x/vesting/keeper/msg_server.go @@ -14,7 +14,7 @@ import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" sdkvesting "github.com/cosmos/cosmos-sdk/x/auth/vesting/types" - "github.com/evmos/evmos/v9/x/vesting/types" + "github.com/evmos/evmos/v10/x/vesting/types" ) var _ types.MsgServer = &Keeper{} diff --git a/x/vesting/keeper/msg_server_test.go b/x/vesting/keeper/msg_server_test.go index 0732e23c5f..4d7b8d42bc 100644 --- a/x/vesting/keeper/msg_server_test.go +++ b/x/vesting/keeper/msg_server_test.go @@ -10,8 +10,8 @@ import ( sdkvesting "github.com/cosmos/cosmos-sdk/x/auth/vesting/types" "github.com/evmos/ethermint/tests" - "github.com/evmos/evmos/v9/testutil" - "github.com/evmos/evmos/v9/x/vesting/types" + "github.com/evmos/evmos/v10/testutil" + "github.com/evmos/evmos/v10/x/vesting/types" ) var ( diff --git a/x/vesting/module.go b/x/vesting/module.go index 30220b8fa7..a2c63359a3 100644 --- a/x/vesting/module.go +++ b/x/vesting/module.go @@ -18,9 +18,9 @@ import ( bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" - "github.com/evmos/evmos/v9/x/vesting/client/cli" - "github.com/evmos/evmos/v9/x/vesting/keeper" - "github.com/evmos/evmos/v9/x/vesting/types" + "github.com/evmos/evmos/v10/x/vesting/client/cli" + "github.com/evmos/evmos/v10/x/vesting/keeper" + "github.com/evmos/evmos/v10/x/vesting/types" ) var ( diff --git a/x/vesting/spec/07_clients.md b/x/vesting/spec/07_clients.md index 03dc8948f9..b5fea44f8c 100644 --- a/x/vesting/spec/07_clients.md +++ b/x/vesting/spec/07_clients.md @@ -22,7 +22,7 @@ If both files are given, they must describe schedules for the same total amount. If one file is omitted, it will default to a schedule that immediately unlocks or vests the entire amount. The described amount of coins will be transferred from the --from address to the vesting account. Unvested coins may be "clawed back" by the funder with the clawback command. Coins may not be transferred out of the account if they are locked or unvested. Only vested coins may be staked. For an example of how to set this see [this link](https://github.com/evmos/evmos/pull/303). ```go -evmosd add-genesis-account [address_or_key_name] [coin][,[coin]] [flags] +evmosd add-genesis-account ADDRESS_OR_KEY_NAME COIN... [flags] ``` ### Queries @@ -34,7 +34,7 @@ The `query` commands allow users to query `vesting` account state. Allows users to query the locked, unvested and vested tokens for a given vesting account ```go -evmosd query vesting balances [address] [flags] +evmosd query vesting balances ADDRESS [flags] ``` ### Transactions @@ -49,7 +49,7 @@ If both files are given, they must describe schedules for the same total amount. If one file is omitted, it will default to a schedule that immediately unlocks or vests the entire amount. The described amount of coins will be transferred from the --from address to the vesting account. Unvested coins may be "clawed back" by the funder with the clawback command. Coins may not be transferred out of the account if they are locked or unvested. Only vested coins may be staked. For an example of how to set this see [this link](https://github.com/evmos/evmos/pull/303). ```go -evmosd tx vesting create-clawback-vesting-account [to_address] [flags] +evmosd tx vesting create-clawback-vesting-account TO_ADDRESS [flags] ``` **`clawback`** @@ -57,7 +57,7 @@ evmosd tx vesting create-clawback-vesting-account [to_address] [flags] Allows users to create a transfer unvested amount out of a ClawbackVestingAccount. Must be requested by the original funder address (--from) and may provide a destination address (--dest), otherwise the coins return to the funder. Delegated or undelegating staking tokens will be transferred in the delegated (undelegating) state. The recipient is vulnerable to slashing, and must act to unbond the tokens if desired. ```go -evmosd tx vesting clawback [address] [flags] +evmosd tx vesting clawback ADDRESS [flags] ``` ## gRPC diff --git a/x/vesting/types/clawback_vesting_account_test.go b/x/vesting/types/clawback_vesting_account_test.go index 526da066d6..b87f420557 100644 --- a/x/vesting/types/clawback_vesting_account_test.go +++ b/x/vesting/types/clawback_vesting_account_test.go @@ -12,7 +12,7 @@ import ( sdkvesting "github.com/cosmos/cosmos-sdk/x/auth/vesting/types" "github.com/evmos/ethermint/tests" - "github.com/evmos/evmos/v9/x/vesting/types" + "github.com/evmos/evmos/v10/x/vesting/types" ) var (