From e678b7d54afffa1c7979419d61da8df46ee568fd Mon Sep 17 00:00:00 2001 From: Oleg Nikonychev Date: Tue, 11 Jun 2024 17:37:35 +0200 Subject: [PATCH 1/2] feat(evm): tracer option is read from the config --- CHANGELOG.md | 1 + app/keepers.go | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7f87a4cb6..324533a17 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -73,6 +73,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - [#1912](https://github.com/NibiruChain/nibiru/pull/1912) - test(evm): unit tests for evm_ante - [#1914](https://github.com/NibiruChain/nibiru/pull/1914) - refactor(evm): Remove dead code and document non-EVM ante handler- [#1917](https://github.com/NibiruChain/nibiru/pull/1917) - test(e2e-evm): TypeScript support. Type generation from compiled contracts. Formatter for TS code. - [#1917](https://github.com/NibiruChain/nibiru/pull/1917) - test(e2e-evm): TypeScript support. Type generation from compiled contracts. Formatter for TS code. +- [#1922](https://github.com/NibiruChain/nibiru/pull/1922) - feat(evm): tracer option is read from the config. #### Dapp modules: perp, spot, oracle, etc diff --git a/app/keepers.go b/app/keepers.go index cb073a336..9f2d6fd2b 100644 --- a/app/keepers.go +++ b/app/keepers.go @@ -12,6 +12,8 @@ import ( icahosttypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/types" icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types" + appserver "github.com/NibiruChain/nibiru/app/server" + wasmdapp "github.com/CosmWasm/wasmd/app" "github.com/CosmWasm/wasmd/x/wasm" wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" @@ -393,7 +395,6 @@ func (app *NibiruApp) InitKeepers( ), ) - evmTracer := "json" app.EvmKeeper = evmkeeper.NewKeeper( appCodec, keys[evm.StoreKey], @@ -402,7 +403,7 @@ func (app *NibiruApp) InitKeepers( app.AccountKeeper, app.BankKeeper, app.StakingKeeper, - evmTracer, + cast.ToString(appOpts.Get(appserver.EVMTracer)), ) // ---------------------------------- IBC keepers From b1d0d43bfa6b972a6a2f84eb6aa8cc0e1f66f17c Mon Sep 17 00:00:00 2001 From: Oleg Nikonychev Date: Tue, 11 Jun 2024 17:56:46 +0200 Subject: [PATCH 2/2] chore: lint --- app/keepers.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/keepers.go b/app/keepers.go index 9f2d6fd2b..4d8be0114 100644 --- a/app/keepers.go +++ b/app/keepers.go @@ -12,8 +12,6 @@ import ( icahosttypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/types" icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types" - appserver "github.com/NibiruChain/nibiru/app/server" - wasmdapp "github.com/CosmWasm/wasmd/app" "github.com/CosmWasm/wasmd/x/wasm" wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" @@ -403,7 +401,7 @@ func (app *NibiruApp) InitKeepers( app.AccountKeeper, app.BankKeeper, app.StakingKeeper, - cast.ToString(appOpts.Get(appserver.EVMTracer)), + cast.ToString(appOpts.Get("evm.tracer")), ) // ---------------------------------- IBC keepers