diff --git a/evmrpc/filter.go b/evmrpc/filter.go index c22ead9dfe..875420a7fb 100644 --- a/evmrpc/filter.go +++ b/evmrpc/filter.go @@ -1040,11 +1040,7 @@ func (f *LogFetcher) processBatch(ctx context.Context, start, end int64, crit fi if len(crit.Addresses) != 0 || len(crit.Topics) != 0 { // Bloom cache miss - read from database providerCtx := f.ctxProvider(height) - if f.includeSyntheticReceipts { - blockBloom = f.k.GetBlockBloom(providerCtx) - } else { - blockBloom = f.k.GetEvmOnlyBlockBloom(providerCtx) - } + blockBloom = f.k.GetBlockBloom(providerCtx) // When we cannot retrieve a bloom for the EVM-only view (all zeroes), // skip the bloom pre-filter instead of short-circuiting the block. diff --git a/go.mod b/go.mod index 053fc3c70e..a53abae1b9 100644 --- a/go.mod +++ b/go.mod @@ -350,7 +350,7 @@ require ( ) replace ( - github.com/CosmWasm/wasmd => github.com/sei-protocol/sei-wasmd v0.3.10 + github.com/CosmWasm/wasmd => github.com/sei-protocol/sei-wasmd v0.3.11 github.com/CosmWasm/wasmvm => github.com/sei-protocol/sei-wasmvm v1.5.4-sei.0.0.3 github.com/btcsuite/btcd => github.com/btcsuite/btcd v0.23.2 github.com/confio/ics23/go => github.com/cosmos/cosmos-sdk/ics23/go v0.8.0 diff --git a/go.sum b/go.sum index d4b87b1893..7b0c6794c0 100644 --- a/go.sum +++ b/go.sum @@ -2007,8 +2007,8 @@ github.com/sei-protocol/sei-tendermint v0.6.7 h1:76ElMtSi08p7oUbMBCFvd9qwXABwI+H github.com/sei-protocol/sei-tendermint v0.6.7/go.mod h1:SSZv0P1NBP/4uB3gZr5XJIan3ks3Ui8FJJzIap4r6uc= github.com/sei-protocol/sei-tm-db v0.0.5 h1:3WONKdSXEqdZZeLuWYfK5hP37TJpfaUa13vAyAlvaQY= github.com/sei-protocol/sei-tm-db v0.0.5/go.mod h1:Cpa6rGyczgthq7/0pI31jys2Fw0Nfrc+/jKdP1prVqY= -github.com/sei-protocol/sei-wasmd v0.3.10 h1:3sa8zEtUrpOwusIaojl8Jv4+OCFzcU1JZYhQx27ij/o= -github.com/sei-protocol/sei-wasmd v0.3.10/go.mod h1:C5TM6FIG7Nao2t1v5cdJYZEVXrRUswRNPdJ5XjCsCFk= +github.com/sei-protocol/sei-wasmd v0.3.11 h1:Ldmge+XVm/8pxdNJhOjLNjZeT2oFiH5LEylwttKmmtc= +github.com/sei-protocol/sei-wasmd v0.3.11/go.mod h1:C5TM6FIG7Nao2t1v5cdJYZEVXrRUswRNPdJ5XjCsCFk= github.com/sei-protocol/sei-wasmvm v1.5.4-sei.0.0.3 h1:hhZdZLR8g+6bxWBZiMflSnIuHgLcK/QEpzyjx0/yXYU= github.com/sei-protocol/sei-wasmvm v1.5.4-sei.0.0.3/go.mod h1:Q0bSEtlktzh7W2hhEaifrFp1Erx11ckQZmjq8FLCyys= github.com/sei-protocol/tm-db v0.0.4 h1:7Y4EU62Xzzg6wKAHEotm7SXQR0aPLcGhKHkh3qd0tnk= diff --git a/precompiles/common/precompiles.go b/precompiles/common/precompiles.go index 40e69a2883..f10c48f0c6 100644 --- a/precompiles/common/precompiles.go +++ b/precompiles/common/precompiles.go @@ -6,6 +6,7 @@ import ( "errors" "fmt" "math/big" + "strings" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" @@ -66,7 +67,7 @@ func (p Precompile) Run(evm *vm.EVM, caller common.Address, callingContract comm defer func() { HandlePrecompileError(err, evm, operation) if err != nil { - bz = []byte(err.Error()) + bz = []byte(replaceWasmdVersionStr(err.Error())) err = vm.ErrExecutionReverted } }() @@ -159,7 +160,7 @@ func (d DynamicGasPrecompile) RunAndCalculateGas(evm *vm.EVM, caller common.Addr defer func() { HandlePrecompileError(err, evm, operation) if err != nil { - ret = []byte(err.Error()) + ret = []byte(replaceWasmdVersionStr(err.Error())) err = vm.ErrExecutionReverted } }() @@ -299,3 +300,7 @@ func GetSeiAddressFromArg(ctx sdk.Context, arg interface{}, evmKeeper putils.EVM } return GetSeiAddressByEvmAddress(ctx, addr, evmKeeper) } + +func replaceWasmdVersionStr(err string) string { + return strings.Replace(err, "sei-wasmd@v0.3.11", "sei-wasmd@v0.3.10", 1) +}