Merge branch 'main' into expertdicer/v50-upgrade

Author: k-yang

.github/workflows/changelog-check.yml

@@ -8,9 +8,42 @@ on:
     types: [opened, synchronize, reopened, ready_for_review, labeled, unlabeled]
 
 jobs:
+  # This implementation handles CHANGELOG.md checks for a monorepo, ensuring
+  # that changelogs throughout the repo are edited. The advantage of this
+  # implemenation is that packages or projecs with independent changelogs will
+  # can still have automation without requiring edits to the root changelog.
+  #
+  # IF a Go-related file (filter "nibiru-go") is changed, the
+  #   "dangoslen/changelog-enforcer" action runs, enforcing changes to the
+  #   CHANGELOG.md file at the root of the repo.
+  #
+  # ELSE IF no changelog was modified anywhere else, then
+  #   "dangoslen/changelog-enforcer" runs.
+  #
+  # ELSE, some changelog file must have been modified that was not the root
+  #   one, so the workflow can skip  "dangoslen/changelog-enforcer".
   changelog:
     runs-on: ubuntu-latest
     steps:
+      - uses: actions/checkout@v4
+      - name: "Check for changelog and Go edits"
+        id: check_changelog
+        uses: dorny/paths-filter@v3
+        with:
+          filters: |
+            changelog: 
+              - "**/CHANGELOG.md"
+            nibiru-go:
+              - "app/**.go"
+              - "cmd/**.go"
+              - "eth/**.go"
+              - "gosdk/**.go"
+              - "x/**.go"
+              - "**.proto"
+              - "go.mod"
+              - "go.sum"
+              - "contrib/docker/*"
       - uses: dangoslen/changelog-enforcer@v3
+        if: steps.check_changelog.outputs.nibiru-go == 'true' || steps.check_changelog.outputs.changelog == 'false'
         with:
-          skipLabels: "skip-changelog"
+          skipLabels: "skip-changelog"

CHANGELOG.md

@@ -38,7 +38,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [v2.1.0](https://github.com/NibiruChain/nibiru/releases/tag/v2.1.0) - 2025-02-25
 
 - [#2104](https://github.com/NibiruChain/nibiru/pull/2104) - chore: update chain IDs
 - [#2202](https://github.com/NibiruChain/nibiru/pull/2202) - chore(build): add build tags and missing flags/variables
@@ -47,14 +47,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - [#2209](https://github.com/NibiruChain/nibiru/pull/2209) - refator(ci):
 Simplify GitHub actions based on conditional paths, removing the need for files like ".github/workflows/skip-unit-tests.yml".
 - [#2211](https://github.com/NibiruChain/nibiru/pull/2211) - ci(chaosnet): avoid building on cache injected directories
+- [#2212](https://github.com/NibiruChain/nibiru/pull/2212) - fix(evm): proper eth tx logs emission for funtoken operations
+- [#2213](https://github.com/NibiruChain/nibiru/pull/2213) - chore(build): include lib versions on cache
+- [#2214](https://github.com/NibiruChain/nibiru/pull/2214) - chore(wasm): bump wasmvm to `v1.5.8`
+- [#2068](https://github.com/NibiruChain/nibiru/pull/2068) - feat: enable wasm light clients on IBC (08-wasm)
+- [#2217](https://github.com/NibiruChain/nibiru/pull/2217) - fix: app-db-backend not recognized on prune command
+- [#2219](https://github.com/NibiruChain/nibiru/pull/2219) - fix(evm): disable unprotected tx check in EVM ante handler
+- [#2220](https://github.com/NibiruChain/nibiru/pull/2220) - fix(evm): improved marshaling of the eth tx receipt
 
 ## [v2.0.0-p1](https://github.com/NibiruChain/nibiru/releases/tag/v2.0.0-p1) - 2025-02-10
 
-* fbcca386 fix: revert wasmvm to v1.5.0
-* 533490d0 fix: revert testnet-1 chain id to 7210
-* d8a10921 chore: update changelog for v2 EVM release
+- fbcca386 fix: revert wasmvm to v1.5.0
+- 533490d0 fix: revert testnet-1 chain id to 7210
+- d8a10921 chore: update changelog for v2 EVM release
 
-### Nibiru EVM
+## [v2.0.0](https://github.com/NibiruChain/nibiru/releases/tag/v2.0.0) - 2025-02-10
 
 - [#2119](https://github.com/NibiruChain/nibiru/pull/2119) - fix(evm): Guarantee
   that gas consumed during any send operation of the "NibiruBankKeeper" depends
@@ -119,7 +126,6 @@ Zenith](https://code4rena.com/zenith) Audit, running from 2024-10-07 until
 period. This section describes code changes that occurred after that audit in
 preparation for a second audit starting in November 2024.
 
-- [#2068](https://github.com/NibiruChain/nibiru/pull/2068) - feat: enable wasm light clients on IBC (08-wasm)
 - [#2074](https://github.com/NibiruChain/nibiru/pull/2074) - fix(evm-keeper): better utilize ERC20 metadata during FunToken creation. The bank metadata for a new FunToken mapping ties a connection between the Bank Coin's `DenomUnit` and the ERC20 contract metadata like the name, decimals, and symbol. This change brings parity between EVM wallets, such as MetaMask, and Interchain wallets like Keplr and Leap.
 - [#2076](https://github.com/NibiruChain/nibiru/pull/2076) - fix(evm-gas-fees):
   Use effective gas price in RefundGas and make sure that units are properly
@@ -164,9 +170,8 @@ preparation for a second audit starting in November 2024.
   Bank module. This code change uses the `NibiruBankKeeper` on all modules that
   depend on x/bank, such as the EVM and Wasm modules.
 - [#2097](https://github.com/NibiruChain/nibiru/pull/2097) - feat(evm): Add new query to get dated price from the oracle precompile
-- [#2098](https://github.com/NibiruChain/nibiru/pull/2098) - test(evm): statedb
-  tests for race conditions within funtoken precompile
 - [#2100](https://github.com/NibiruChain/nibiru/pull/2100) - refactor: cleanup statedb and precompile sections
+- [#2098](https://github.com/NibiruChain/nibiru/pull/2098) - test(evm): statedb tests for race conditions within funtoken precompile
 - [#2101](https://github.com/NibiruChain/nibiru/pull/2101) - fix(evm): tx receipt proper marshalling
 - [#2105](https://github.com/NibiruChain/nibiru/pull/2105) - test(evm): precompile call with revert
 - [#2106](https://github.com/NibiruChain/nibiru/pull/2106) - chore: scheduled basic e2e tests for evm testnet endpoint

Dockerfile

@@ -30,4 +30,4 @@ RUN apk --no-cache add \
 COPY --from=builder /nibiru/build/nibid /usr/local/bin/nibid
 
 ENTRYPOINT ["nibid"]
-CMD [ "start" ]
+CMD [ "start" ]

app/app.go

@@ -8,26 +8,28 @@ import (
 	"os"
 	"path/filepath"
 
+	"cosmossdk.io/log"
+	storetypes "cosmossdk.io/store/types"
 	wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
 	wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
-	cmtos "github.com/cometbft/cometbft/libs/os"
-	cmtproto "github.com/cometbft/cometbft/proto/tendermint/types"
-	ibcwasmkeeper "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/keeper"
-
 	"github.com/NibiruChain/nibiru/v2/app/ante"
 	"github.com/NibiruChain/nibiru/v2/app/wasmext"
 	"github.com/NibiruChain/nibiru/v2/x/evm/precompile"
-
-	"cosmossdk.io/log"
+	dbm "github.com/cometbft/cometbft-db"
 	abci "github.com/cometbft/cometbft/abci/types"
+	"github.com/cometbft/cometbft/libs/log"
+	cmtos "github.com/cometbft/cometbft/libs/os"
 	tmos "github.com/cometbft/cometbft/libs/os"
+	cmtproto "github.com/cometbft/cometbft/proto/tendermint/types"
 	dbm "github.com/cosmos/cosmos-db"
-
-	storetypes "cosmossdk.io/store/types"
 	"github.com/cosmos/cosmos-sdk/baseapp"
 	"github.com/cosmos/cosmos-sdk/client"
+	ibcwasmkeeper "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/keeper"
 
 	// _ "github.com/cosmos/cosmos-sdk/client/docs/statik"
+	"github.com/NibiruChain/nibiru/v2/app/ante"
+	"github.com/NibiruChain/nibiru/v2/app/wasmext"
+	"github.com/NibiruChain/nibiru/v2/x/evm/precompile"
 	"github.com/cosmos/cosmos-sdk/client/grpc/node"
 	"github.com/cosmos/cosmos-sdk/codec"
 	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
@@ -46,11 +48,10 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/crisis"
 	paramstypes "github.com/cosmos/cosmos-sdk/x/params/types"
 	capabilitykeeper "github.com/cosmos/ibc-go/modules/capability/keeper"
-
+	ibcwasmkeeper "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/keeper"
 	ibckeeper "github.com/cosmos/ibc-go/v8/modules/core/keeper"
 	ibctesting "github.com/cosmos/ibc-go/v8/testing"
 	"github.com/cosmos/ibc-go/v8/testing/types"
-
 	"github.com/gorilla/mux"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/rakyll/statik/fs"
@@ -202,7 +203,6 @@ func NewNibiruApp(
 	app.initModuleManager(encodingConfig, skipGenesisInvariants)
 
 	app.setupUpgrades()
-
 	// NOTE: Any module instantiated in the module manager that is later modified
 	// must be passed by reference here.
 

app/appconst/appconst.go

@@ -55,7 +55,7 @@ func RuntimeVersion() string {
 const (
 	ETH_CHAIN_ID_MAINNET int64 = 6900
 
-	ETH_CHAIN_ID_TESTNET_1 int64 = 6910
+	ETH_CHAIN_ID_TESTNET_1 int64 = 7210
 	ETH_CHAIN_ID_TESTNET_2 int64 = 6911
 	ETH_CHAIN_ID_TESTNET_3 int64 = 6912
 
@@ -74,7 +74,7 @@ const (
 var knownEthChainIDMap = map[string]int64{
 	"cataclysm-1": 6900,
 
-	"nibiru-testnet-1": 6910,
+	"nibiru-testnet-1": 7210,
 	"nibiru-testnet-2": 6911,
 	"nibiru-testnet-3": 6912,
 

app/evmante/evmante_sigverify.go

@@ -48,13 +48,13 @@ func (esvd EthSigVerificationDecorator) AnteHandle(
 		}
 
 		ethTx := msgEthTx.AsTransaction()
-		if !ethTx.Protected() {
-			return ctx, errors.Wrapf(
-				sdkerrors.ErrNotSupported,
-				"rejected unprotected Ethereum transaction. "+
-					"Please EIP155 sign your transaction to protect it against replay-attacks",
-			)
-		}
+		// if !ethTx.Protected() {
+		// 	return ctx, errors.Wrapf(
+		// 		sdkerrors.ErrNotSupported,
+		// 		"rejected unprotected Ethereum transaction. "+
+		// 			"Please EIP155 sign your transaction to protect it against replay-attacks",
+		// 	)
+		// }
 
 		sender, err := signer.Sender(ethTx)
 		if err != nil {

app/evmante/evmante_sigverify_test.go

@@ -26,7 +26,7 @@ func (s *TestSuite) TestEthSigVerificationDecorator() {
 				tx := evmtest.HappyCreateContractTx(deps)
 				return tx
 			},
-			wantErr: "rejected unprotected Ethereum transaction",
+			wantErr: "couldn't retrieve sender address from the ethereum transaction: invalid transaction v, r, s values: tx intended signer does not match the given signer",
 		},
 		{
 			name: "sad: non ethereum tx",

app/keepers.go

@@ -24,6 +24,7 @@ import (
 	"cosmossdk.io/x/feegrant"
 	feegrantkeeper "cosmossdk.io/x/feegrant/keeper"
 	feegrantmodule "cosmossdk.io/x/feegrant/module"
+	"cosmossdk.io/x/upgrade"
 	wasmdapp "github.com/CosmWasm/wasmd/app"
 	"github.com/CosmWasm/wasmd/x/wasm"
 	wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
@@ -63,33 +64,42 @@ import (
 	govv1types "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
 	govv1beta1types "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1"
 	groupmodule "github.com/cosmos/cosmos-sdk/x/group/module"
-	"github.com/cosmos/ibc-go/modules/capability"
-	capabilitykeeper "github.com/cosmos/ibc-go/modules/capability/keeper"
-	capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types"
-
 	"github.com/cosmos/cosmos-sdk/x/params"
 	paramsclient "github.com/cosmos/cosmos-sdk/x/params/client"
 	paramskeeper "github.com/cosmos/cosmos-sdk/x/params/keeper"
 	paramstypes "github.com/cosmos/cosmos-sdk/x/params/types"
 	paramproposal "github.com/cosmos/cosmos-sdk/x/params/types/proposal"
-
 	"github.com/cosmos/cosmos-sdk/x/slashing"
 	slashingkeeper "github.com/cosmos/cosmos-sdk/x/slashing/keeper"
 	slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types"
 	"github.com/cosmos/cosmos-sdk/x/staking"
 	stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
+	"github.com/cosmos/ibc-go/modules/capability"
+	capabilitykeeper "github.com/cosmos/ibc-go/modules/capability/keeper"
+	capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types"
 
-	"cosmossdk.io/x/upgrade"
 	// upgradeclient "cosmossdk.io/x/upgrade/client"
 	upgradekeeper "cosmossdk.io/x/upgrade/keeper"
 	upgradetypes "cosmossdk.io/x/upgrade/types"
 
 	// ---------------------------------------------------------------
 	// IBC imports
 
+	"cosmossdk.io/x/upgrade"
+	upgradekeeper "cosmossdk.io/x/upgrade/keeper"
+	upgradetypes "cosmossdk.io/x/upgrade/types"
+	ibcwasm "github.com/cosmos/ibc-go/modules/light-clients/08-wasm"
+	ibcwasmkeeper "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/keeper"
 	ibcwasmtypes "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/types"
+	ica "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts"
+	icacontroller "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/controller"
+	icacontrollerkeeper "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/controller/keeper"
+	icacontrollertypes "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/controller/types"
+	icahost "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/host"
 	icahostkeeper "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/host/keeper"
+	icahosttypes "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/host/types"
+	icatypes "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/types"
 	ibcfee "github.com/cosmos/ibc-go/v8/modules/apps/29-fee"
 	ibcfeekeeper "github.com/cosmos/ibc-go/v8/modules/apps/29-fee/keeper"
 	ibcfeetypes "github.com/cosmos/ibc-go/v8/modules/apps/29-fee/types"
@@ -104,9 +114,6 @@ import (
 	ibcmock "github.com/cosmos/ibc-go/v8/testing/mock"
 	"github.com/spf13/cast"
 
-	// ---------------------------------------------------------------
-	// Nibiru Custom Modules
-
 	"github.com/NibiruChain/nibiru/v2/app/keepers"
 	"github.com/NibiruChain/nibiru/v2/app/wasmext"
 	"github.com/NibiruChain/nibiru/v2/eth"
@@ -124,15 +131,13 @@ import (
 	"github.com/NibiruChain/nibiru/v2/x/inflation"
 	inflationkeeper "github.com/NibiruChain/nibiru/v2/x/inflation/keeper"
 	inflationtypes "github.com/NibiruChain/nibiru/v2/x/inflation/types"
-	"github.com/NibiruChain/nibiru/v2/x/oracle"
+	oracle "github.com/NibiruChain/nibiru/v2/x/oracle"
 	oraclekeeper "github.com/NibiruChain/nibiru/v2/x/oracle/keeper"
 	oracletypes "github.com/NibiruChain/nibiru/v2/x/oracle/types"
-
 	"github.com/NibiruChain/nibiru/v2/x/sudo"
 	"github.com/NibiruChain/nibiru/v2/x/sudo/keeper"
 	sudotypes "github.com/NibiruChain/nibiru/v2/x/sudo/types"
-
-	"github.com/NibiruChain/nibiru/v2/x/tokenfactory"
+	tokenfactory "github.com/NibiruChain/nibiru/v2/x/tokenfactory"
 	tokenfactorykeeper "github.com/NibiruChain/nibiru/v2/x/tokenfactory/keeper"
 	tokenfactorytypes "github.com/NibiruChain/nibiru/v2/x/tokenfactory/types"
 )
@@ -663,7 +668,7 @@ func (app *NibiruApp) initAppModules(
 		authzmodule.NewAppModule(appCodec, app.authzKeeper, app.AccountKeeper, app.BankKeeper, app.interfaceRegistry),
 
 		// Nibiru modules
-		oracle.NewAppModule(appCodec, app.OracleKeeper, app.AccountKeeper, app.BankKeeper),
+		oracle.NewAppModule(appCodec, app.OracleKeeper, app.AccountKeeper, app.BankKeeper, app.SudoKeeper),
 		epochs.NewAppModule(appCodec, app.EpochsKeeper),
 		inflation.NewAppModule(app.InflationKeeper, app.AccountKeeper, *app.StakingKeeper),
 		sudo.NewAppModule(appCodec, app.SudoKeeper),
@@ -677,6 +682,7 @@ func (app *NibiruApp) initAppModules(
 		ica.NewAppModule(&app.icaControllerKeeper, &app.icaHostKeeper),
 		ibcwasm.NewAppModule(app.WasmClientKeeper),
 
+		// evm
 		evmmodule.NewAppModule(app.EvmKeeper, app.AccountKeeper),
 
 		// wasm

app/keepers/all_keepers.go

@@ -14,6 +14,7 @@ import (
 	ibcwasmkeeper "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/keeper"
 
 	stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
+	ibcwasmkeeper "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/keeper"
 
 	// ---------------------------------------------------------------
 	// IBC imports
@@ -29,9 +30,7 @@ import (
 	evmkeeper "github.com/NibiruChain/nibiru/v2/x/evm/keeper"
 	inflationkeeper "github.com/NibiruChain/nibiru/v2/x/inflation/keeper"
 	oraclekeeper "github.com/NibiruChain/nibiru/v2/x/oracle/keeper"
-
-	"github.com/NibiruChain/nibiru/v2/x/sudo/keeper"
-
+	sudokeeper "github.com/NibiruChain/nibiru/v2/x/sudo/keeper"
 	tokenfactorykeeper "github.com/NibiruChain/nibiru/v2/x/tokenfactory/keeper"
 )
 
@@ -63,7 +62,7 @@ type PublicKeepers struct {
 	EpochsKeeper       epochskeeper.Keeper
 	OracleKeeper       oraclekeeper.Keeper
 	InflationKeeper    inflationkeeper.Keeper
-	SudoKeeper         keeper.Keeper
+	SudoKeeper         sudokeeper.Keeper
 	DevGasKeeper       devgaskeeper.Keeper
 	TokenFactoryKeeper tokenfactorykeeper.Keeper
 	EvmKeeper          *evmkeeper.Keeper

app/upgrades.go

@@ -6,18 +6,28 @@ import (
 	upgradetypes "cosmossdk.io/x/upgrade/types"
 
 	"github.com/NibiruChain/nibiru/v2/app/upgrades"
+	"github.com/NibiruChain/nibiru/v2/app/upgrades/v1_0_1"
+	"github.com/NibiruChain/nibiru/v2/app/upgrades/v1_0_2"
+	"github.com/NibiruChain/nibiru/v2/app/upgrades/v1_0_3"
 	"github.com/NibiruChain/nibiru/v2/app/upgrades/v1_1_0"
 	"github.com/NibiruChain/nibiru/v2/app/upgrades/v1_2_0"
 	"github.com/NibiruChain/nibiru/v2/app/upgrades/v1_3_0"
 	"github.com/NibiruChain/nibiru/v2/app/upgrades/v1_4_0"
+	"github.com/NibiruChain/nibiru/v2/app/upgrades/v1_5_0"
+	"github.com/NibiruChain/nibiru/v2/app/upgrades/v2_0_0"
 	"github.com/NibiruChain/nibiru/v2/app/upgrades/v2_1_0"
 )
 
 var Upgrades = []upgrades.Upgrade{
+	v1_0_1.Upgrade,
+	v1_0_2.Upgrade,
+	v1_0_3.Upgrade,
 	v1_1_0.Upgrade,
 	v1_2_0.Upgrade,
 	v1_3_0.Upgrade,
 	v1_4_0.Upgrade,
+	v1_5_0.Upgrade,
+	v2_0_0.Upgrade,
 	v2_1_0.Upgrade,
 }
 

app/upgrades/types.go

@@ -5,6 +5,7 @@ import (
 	"cosmossdk.io/x/upgrade/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
 
+	"cosmossdk.io/x/upgrade/types"
 	clientkeeper "github.com/cosmos/ibc-go/v8/modules/core/02-client/keeper"
 )