feat(evm)!: update to geth v1.14 with new tracers, EIP-1153, PRECOMPILE_ADDRS, and transient storage support

.golangci.yml

@@ -11,7 +11,6 @@ issues:
 linters:
   enable:
     - whitespace
-    - misspell
     - goimports
 linters-settings:
   misspell:
@@ -20,5 +19,9 @@ linters-settings:
     # Put imports beginning with prefix after 3rd-party packages.
     # It's a comma-separated list of prefixes.
     local-prefixes: github.com/NibiruChain/nibiru
+  revive:
+    rules:
+      - name: exported
+        disabled: true
 severity:
   default-severity: error

CHANGELOG.md

@@ -42,6 +42,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - [#2271](https://github.com/NibiruChain/nibiru/pull/2271) - fix(ci): update tag-pattern for changelog step in releases
 - [#2270](https://github.com/NibiruChain/nibiru/pull/2270) - refactor(app): remove private keeper struct and transient/mem keys from app
+<<<<<<< HEAD
+- [#2274](https://github.com/NibiruChain/nibiru/pull/2274) - feat(evm)!: update to geth v1.13 with EIP-1153, PRECOMPILE_ADDRS, and transient storage support
+- [#2275](https://github.com/NibiruChain/nibiru/pull/2275) - feat(evm)!: update
+to geth v1.14 with tracing updates and new StateDB methods. 
+   - This upgrade keeps Nibiru's EVM on the Berlin upgrade to avoid
+   incompatibilities stemming from functionality specific to Ethereum's consesnus
+   setup. Namely, blobs (Cancun) and Verkle additions for zkEVM.
+   - The jump to v1.14 was necessary to use an up-to-date "cockroach/pebble" DB
+   dependency and leverage new generics features added in Go 1.23+.
 - [#2288](https://github.com/NibiruChain/nibiru/pull/2288) - chore(ci): add workflow to check for missing upgrade handler
 - [#2278](https://github.com/NibiruChain/nibiru/pull/2278) - chore: migrate to cosmossdk.io/mathLegacyDec and cosmossdk.io/math.Int
 

Dockerfile

@@ -74,4 +74,4 @@ RUN apk --no-cache add ca-certificates
 COPY --from=build-source /root/nibid /usr/local/bin/nibid
 
 ENTRYPOINT ["nibid"]
-CMD ["start"]
+CMD ["start"]

LEGACY-CHANGELOG.md

@@ -216,7 +216,7 @@ NOTE: It's pragmatic to assume that any change prior to v1.0.0 was state machine
 - [#1459](https://github.com/NibiruChain/nibiru/pull/1459) - fix(spot): wire `x/spot` msgService into app router
 - [#1452](https://github.com/NibiruChain/nibiru/pull/1452) - fix(oracle): continue with abci hook during error
 - [#1451](https://github.com/NibiruChain/nibiru/pull/1451) - fix(perp): decrease position with zero size
-- [#1446](https://github.com/NibiruChain/nibiru/pull/1446) - fix(cmd): Add custom InitCmd to set set desired Tendermint consensus params for each node.
+- [#1446](https://github.com/NibiruChain/nibiru/pull/1446) - fix(cmd): Add custom InitCmd to set desired Tendermint consensus params for each node.
 - [#1441](https://github.com/NibiruChain/nibiru/pull/1441) - fix(oracle): ignore abstain votes in std dev calculation
 - [#1425](https://github.com/NibiruChain/nibiru/pull/1425) - fix: remove positions from state when closed with reverse position
 - [#1423](https://github.com/NibiruChain/nibiru/pull/1423) - fix: remove panics from abci hooks

app/evmante/evmante_can_transfer.go

@@ -25,7 +25,11 @@ func (ctd CanTransferDecorator) AnteHandle(
 	ctx sdk.Context, tx sdk.Tx, simulate bool, next sdk.AnteHandler,
 ) (sdk.Context, error) {
 	ethCfg := evm.EthereumConfig(ctd.EVMKeeper.EthChainID(ctx))
-	signer := gethcore.MakeSigner(ethCfg, big.NewInt(ctx.BlockHeight()))
+	signer := gethcore.MakeSigner(
+		ethCfg,
+		big.NewInt(ctx.BlockHeight()),
+		evm.ParseBlockTimeUnixU64(ctx),
+	)
 
 	for _, msg := range tx.GetMsgs() {
 		msgEthTx, ok := msg.(*evm.MsgEthereumTx)
@@ -57,25 +61,25 @@ func (ctd CanTransferDecorator) AnteHandle(
 			return ctx, errors.Wrapf(
 				sdkerrors.ErrInsufficientFee,
 				"gas fee cap (wei) less than block base fee (wei); (%s < %s)",
-				evmMsg.GasFeeCap(), baseFeeWeiPerGas,
+				evmMsg.GasFeeCap, baseFeeWeiPerGas,
 			)
 		}
 
 		// check that caller has enough balance to cover asset transfer for **topmost** call
 		// NOTE: here the gas consumed is from the context with the infinite gas meter
 
-		if evmMsg.Value().Sign() > 0 {
-			nibiruAddr := eth.EthAddrToNibiruAddr(evmMsg.From())
+		if evmMsg.Value.Sign() > 0 {
+			nibiruAddr := eth.EthAddrToNibiruAddr(evmMsg.From)
 			balanceNative := ctd.Bank.GetBalance(ctx, nibiruAddr, evm.EVMBankDenom).Amount.BigInt()
 			balanceWei := evm.NativeToWei(balanceNative)
 
-			if balanceWei.Cmp(evmMsg.Value()) < 0 {
+			if balanceWei.Cmp(evmMsg.Value) < 0 {
 				return ctx, errors.Wrapf(
 					sdkerrors.ErrInsufficientFunds,
 					"failed to transfer %s wei ( balance=%s )from address %s using the EVM block context transfer function",
-					evmMsg.Value(),
+					evmMsg.Value,
 					balanceWei,
-					evmMsg.From(),
+					evmMsg.From,
 				)
 			}
 		}

app/evmante/evmante_gas_consume.go

@@ -100,7 +100,7 @@ func (anteDec AnteDecEthGasConsume) AnteHandle(
 		fees, err := keeper.VerifyFee(
 			txData,
 			baseFeeMicronibiPerGas,
-			ctx.IsCheckTx(),
+			ctx,
 		)
 		if err != nil {
 			return ctx, errors.Wrapf(err, "failed to verify the fees")

app/evmante/evmante_gas_consume_test.go

@@ -26,7 +26,7 @@ func (s *TestSuite) TestAnteDecEthGasConsume() {
 			beforeTxSetup: func(deps *evmtest.TestDeps, sdb *statedb.StateDB) {
 				gasLimit := happyGasLimit()
 				balance := evm.NativeToWei(new(big.Int).Add(gasLimit, big.NewInt(100)))
-				sdb.AddBalance(deps.Sender.EthAddr, balance)
+				sdb.AddBalanceSigned(deps.Sender.EthAddr, balance)
 			},
 			txSetup:      evmtest.HappyCreateContractTx,
 			wantErr:      "",
@@ -47,7 +47,7 @@ func (s *TestSuite) TestAnteDecEthGasConsume() {
 			beforeTxSetup: func(deps *evmtest.TestDeps, sdb *statedb.StateDB) {
 				gasLimit := happyGasLimit()
 				balance := evm.NativeToWei(new(big.Int).Add(gasLimit, big.NewInt(100)))
-				sdb.AddBalance(deps.Sender.EthAddr, balance)
+				sdb.AddBalanceSigned(deps.Sender.EthAddr, balance)
 			},
 			txSetup:      evmtest.HappyCreateContractTx,
 			wantErr:      "exceeds block gas limit (0)",

app/evmante/evmante_handler_test.go

@@ -29,7 +29,7 @@ func (s *TestSuite) TestAnteHandlerEVM() {
 			name: "happy: signed tx, sufficient funds",
 			beforeTxSetup: func(deps *evmtest.TestDeps, sdb *statedb.StateDB) {
 				balanceMicronibi := new(big.Int).Add(evmtest.GasLimitCreateContract(), big.NewInt(100))
-				sdb.AddBalance(
+				sdb.AddBalanceSigned(
 					deps.Sender.EthAddr,
 					evm.NativeToWei(balanceMicronibi),
 				)

app/evmante/evmante_increment_sender_seq_test.go

@@ -22,7 +22,7 @@ func (s *TestSuite) TestAnteDecEthIncrementSenderSequence() {
 			name: "happy: single message",
 			beforeTxSetup: func(deps *evmtest.TestDeps, sdb *statedb.StateDB) {
 				balance := big.NewInt(100)
-				sdb.AddBalance(deps.Sender.EthAddr, balance)
+				sdb.AddBalanceSigned(deps.Sender.EthAddr, balance)
 			},
 			txSetup: func(deps *evmtest.TestDeps) sdk.Tx {
 				return evmtest.HappyTransferTx(deps, 0)
@@ -34,7 +34,7 @@ func (s *TestSuite) TestAnteDecEthIncrementSenderSequence() {
 			name: "happy: two messages",
 			beforeTxSetup: func(deps *evmtest.TestDeps, sdb *statedb.StateDB) {
 				balance := big.NewInt(100)
-				sdb.AddBalance(deps.Sender.EthAddr, balance)
+				sdb.AddBalanceSigned(deps.Sender.EthAddr, balance)
 			},
 			txSetup: func(deps *evmtest.TestDeps) sdk.Tx {
 				txMsgOne := evmtest.HappyTransferTx(deps, 0)

app/evmante/evmante_sigverify.go

@@ -36,7 +36,11 @@ func (esvd EthSigVerificationDecorator) AnteHandle(
 	chainID := esvd.evmKeeper.EthChainID(ctx)
 	ethCfg := evm.EthereumConfig(chainID)
 	blockNum := big.NewInt(ctx.BlockHeight())
-	signer := gethcore.MakeSigner(ethCfg, blockNum)
+	signer := gethcore.MakeSigner(
+		ethCfg,
+		blockNum,
+		evm.ParseBlockTimeUnixU64(ctx),
+	)
 
 	for _, msg := range tx.GetMsgs() {
 		msgEthTx, ok := msg.(*evm.MsgEthereumTx)

app/evmante/evmante_verify_eth_acc.go

@@ -71,7 +71,7 @@ func (anteDec AnteDecVerifyEthAcc) AnteHandle(
 		}
 
 		if err := keeper.CheckSenderBalance(
-			evm.NativeToWei(acct.BalanceNative), txData,
+			evm.NativeToWei(acct.BalanceNative.ToBig()), txData,
 		); err != nil {
 			return ctx, errors.Wrap(err, "failed to check sender balance")
 		}

app/evmante/evmante_verify_eth_acc_test.go

@@ -21,7 +21,7 @@ func (s *TestSuite) TestAnteDecoratorVerifyEthAcc_CheckTx() {
 		{
 			name: "happy: sender with funds",
 			beforeTxSetup: func(deps *evmtest.TestDeps, sdb *statedb.StateDB) {
-				sdb.AddBalance(deps.Sender.EthAddr, evm.NativeToWei(happyGasLimit()))
+				sdb.AddBalanceSigned(deps.Sender.EthAddr, evm.NativeToWei(happyGasLimit()))
 			},
 			txSetup: evmtest.HappyCreateContractTx,
 			wantErr: "",

app/keepers.go

@@ -347,7 +347,7 @@ func (app *NibiruApp) initNonDepinjectKeepers(
 
 	app.GovKeeper.SetLegacyRouter(govRouter)
 
-	app.EvmKeeper.AddPrecompiles(precompile.InitPrecompiles(app.AppKeepers.PublicKeepers))
+	precompile.InitPrecompiles(app.AppKeepers.PublicKeepers)
 
 	return wasmConfig
 }

app/server/geth_log_handler.go

@@ -0,0 +1,109 @@
+package server
+
+import (
+	// Use "log/slog" from the Go std lib because Geth migrated to support
+	// slog and deprecated the original go-ethereum/log implementation.
+	// For more info on the migration, see https://github.com/ethereum/go-ethereum/pull/28187
+	"context"
+	"log/slog"
+
+	cmtlog "github.com/cometbft/cometbft/libs/log"
+	gethlog "github.com/ethereum/go-ethereum/log"
+)
+
+// Ensure LogHandler implements slog.Handler
+var _ slog.Handler = (*LogHandler)(nil)
+
+// LogHandler implements slog.Handler, which is needed to construct the
+// conventional go-ethereum.Logger, using a CometBFT logger
+// ("github.com/cometbft/cometbft/libs/log".Logger).
+type LogHandler struct {
+	CmtLogger cmtlog.Logger
+	attrs     []slog.Attr // Attributes gathered via WithAttrs
+	group     string      // Group name gathered via WithGroup (simple implementation)
+}
+
+// Enabled decides whether a log record should be processed.
+// We let the underlying CometBFT logger handle filtering.
+func (h *LogHandler) Enabled(_ context.Context, level slog.Level) bool {
+	// You could potentially check the CmtLogger's level here if needed,
+	// but returning true is usually sufficient.
+	return true
+}
+
+// Handle processes the log record and sends it to the CometBFT logger.
+func (h *LogHandler) Handle(_ context.Context, r slog.Record) error {
+	// 1. Determine the corresponding CometBFT log function
+	var logFunc func(msg string, keyvals ...interface{})
+	switch r.Level {
+	// Check against Geth's custom levels first if they exist
+	// This handler covers all defined slog and go-ethereum log levels.
+	case gethlog.LevelTrace, slog.LevelDebug: // Handles -8, -4
+		logFunc = h.CmtLogger.Debug
+	case slog.LevelInfo, slog.LevelWarn: // Handles 0, 4
+		logFunc = h.CmtLogger.Info
+	case gethlog.LevelCrit, slog.LevelError: // Handles 12, 8
+		// Map Geth Crit level along with standard Error
+		logFunc = h.CmtLogger.Error
+	default: // Handle any other levels (e.g., below Debug)
+		logFunc = h.CmtLogger.Debug // Default to Debug or Info as appropriate
+	}
+
+	// 2. Collect attributes (key-value pairs)
+	// Preallocate assuming 2 slots per attribute plus handler attrs
+	keyvals := make([]interface{}, 0, (r.NumAttrs()+len(h.attrs))*2)
+
+	// Add attributes stored in the handler first (from WithAttrs)
+	currentGroup := h.group
+	for _, attr := range h.attrs {
+		key := attr.Key
+		if currentGroup != "" {
+			key = currentGroup + "." + key // Basic grouping
+		}
+		keyvals = append(keyvals, key, attr.Value.Any())
+	}
+
+	// Add attributes from the specific log record
+	r.Attrs(func(attr slog.Attr) bool {
+		key := attr.Key
+		if currentGroup != "" {
+			key = currentGroup + "." + key // Basic grouping
+		}
+		keyvals = append(keyvals, key, attr.Value.Any())
+		return true // Continue iterating
+	})
+
+	// 3. Call the CometBFT logger function
+	logFunc(r.Message, keyvals...)
+
+	return nil // No error to return in this basic implementation
+}
+
+// WithAttrs returns a new LogHandler with the provided attributes added.
+func (h *LogHandler) WithAttrs(attrs []slog.Attr) slog.Handler {
+	// Create a new handler, cloning existing state and adding new attrs
+	newHandler := &LogHandler{
+		CmtLogger: h.CmtLogger, // Keep the same underlying logger
+		// Important: Clone slices to avoid modifying the original handler's state
+		attrs: append(append([]slog.Attr{}, h.attrs...), attrs...),
+		group: h.group,
+	}
+	return newHandler
+}
+
+// WithGroup returns a new LogHandler associated with the specified group.
+func (h *LogHandler) WithGroup(name string) slog.Handler {
+	// Create a new handler, cloning attributes and setting/appending the group
+	newHandler := &LogHandler{
+		CmtLogger: h.CmtLogger,
+		attrs:     append([]slog.Attr{}, h.attrs...), // Clone attributes
+		// Basic implementation: Overwrites group. Could concatenate if nesting needed.
+		group: name,
+	}
+	// If nested groups are needed:
+	// if h.group != "" {
+	//  name = h.group + "." + name
+	// }
+	// newHandler.group = name
+	return newHandler
+}