Skip to content

Commit fef33e9

Browse files
committed
Revert "replace lib version string (#2535)"
This reverts commit 6e08a76.
1 parent 6e08a76 commit fef33e9

File tree

4 files changed

+10
-11
lines changed

4 files changed

+10
-11
lines changed

evmrpc/filter.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1040,7 +1040,11 @@ func (f *LogFetcher) processBatch(ctx context.Context, start, end int64, crit fi
10401040
if len(crit.Addresses) != 0 || len(crit.Topics) != 0 {
10411041
// Bloom cache miss - read from database
10421042
providerCtx := f.ctxProvider(height)
1043-
blockBloom = f.k.GetBlockBloom(providerCtx)
1043+
if f.includeSyntheticReceipts {
1044+
blockBloom = f.k.GetBlockBloom(providerCtx)
1045+
} else {
1046+
blockBloom = f.k.GetEvmOnlyBlockBloom(providerCtx)
1047+
}
10441048

10451049
// When we cannot retrieve a bloom for the EVM-only view (all zeroes),
10461050
// skip the bloom pre-filter instead of short-circuiting the block.

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ require (
350350
)
351351

352352
replace (
353-
github.com/CosmWasm/wasmd => github.com/sei-protocol/sei-wasmd v0.3.11
353+
github.com/CosmWasm/wasmd => github.com/sei-protocol/sei-wasmd v0.3.10
354354
github.com/CosmWasm/wasmvm => github.com/sei-protocol/sei-wasmvm v1.5.4-sei.0.0.3
355355
github.com/btcsuite/btcd => github.com/btcsuite/btcd v0.23.2
356356
github.com/confio/ics23/go => github.com/cosmos/cosmos-sdk/ics23/go v0.8.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2007,8 +2007,8 @@ github.com/sei-protocol/sei-tendermint v0.6.7 h1:76ElMtSi08p7oUbMBCFvd9qwXABwI+H
20072007
github.com/sei-protocol/sei-tendermint v0.6.7/go.mod h1:SSZv0P1NBP/4uB3gZr5XJIan3ks3Ui8FJJzIap4r6uc=
20082008
github.com/sei-protocol/sei-tm-db v0.0.5 h1:3WONKdSXEqdZZeLuWYfK5hP37TJpfaUa13vAyAlvaQY=
20092009
github.com/sei-protocol/sei-tm-db v0.0.5/go.mod h1:Cpa6rGyczgthq7/0pI31jys2Fw0Nfrc+/jKdP1prVqY=
2010-
github.com/sei-protocol/sei-wasmd v0.3.11 h1:Ldmge+XVm/8pxdNJhOjLNjZeT2oFiH5LEylwttKmmtc=
2011-
github.com/sei-protocol/sei-wasmd v0.3.11/go.mod h1:C5TM6FIG7Nao2t1v5cdJYZEVXrRUswRNPdJ5XjCsCFk=
2010+
github.com/sei-protocol/sei-wasmd v0.3.10 h1:3sa8zEtUrpOwusIaojl8Jv4+OCFzcU1JZYhQx27ij/o=
2011+
github.com/sei-protocol/sei-wasmd v0.3.10/go.mod h1:C5TM6FIG7Nao2t1v5cdJYZEVXrRUswRNPdJ5XjCsCFk=
20122012
github.com/sei-protocol/sei-wasmvm v1.5.4-sei.0.0.3 h1:hhZdZLR8g+6bxWBZiMflSnIuHgLcK/QEpzyjx0/yXYU=
20132013
github.com/sei-protocol/sei-wasmvm v1.5.4-sei.0.0.3/go.mod h1:Q0bSEtlktzh7W2hhEaifrFp1Erx11ckQZmjq8FLCyys=
20142014
github.com/sei-protocol/tm-db v0.0.4 h1:7Y4EU62Xzzg6wKAHEotm7SXQR0aPLcGhKHkh3qd0tnk=

precompiles/common/precompiles.go

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import (
66
"errors"
77
"fmt"
88
"math/big"
9-
"strings"
109

1110
storetypes "github.com/cosmos/cosmos-sdk/store/types"
1211
sdk "github.com/cosmos/cosmos-sdk/types"
@@ -67,7 +66,7 @@ func (p Precompile) Run(evm *vm.EVM, caller common.Address, callingContract comm
6766
defer func() {
6867
HandlePrecompileError(err, evm, operation)
6968
if err != nil {
70-
bz = []byte(replaceWasmdVersionStr(err.Error()))
69+
bz = []byte(err.Error())
7170
err = vm.ErrExecutionReverted
7271
}
7372
}()
@@ -160,7 +159,7 @@ func (d DynamicGasPrecompile) RunAndCalculateGas(evm *vm.EVM, caller common.Addr
160159
defer func() {
161160
HandlePrecompileError(err, evm, operation)
162161
if err != nil {
163-
ret = []byte(replaceWasmdVersionStr(err.Error()))
162+
ret = []byte(err.Error())
164163
err = vm.ErrExecutionReverted
165164
}
166165
}()
@@ -300,7 +299,3 @@ func GetSeiAddressFromArg(ctx sdk.Context, arg interface{}, evmKeeper putils.EVM
300299
}
301300
return GetSeiAddressByEvmAddress(ctx, addr, evmKeeper)
302301
}
303-
304-
func replaceWasmdVersionStr(err string) string {
305-
return strings.Replace(err, "sei-wasmd@v0.3.11", "sei-wasmd@v0.3.10", 1)
306-
}

0 commit comments

Comments
 (0)