Skip to content

Commit 0296449

Browse files
codchencodchen
committed
rebase
1 parent e4b8e41 commit 0296449

File tree

9 files changed

+86
-75
lines changed

9 files changed

+86
-75
lines changed

‎app/receipt.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -118,11 +118,11 @@ func (app *App) AddCosmosEventsToEVMReceiptIfApplicable(ctx sdk.Context, tx sdk.
118118
for i, l := range r.Logs {
119119
l.Index = uint32(i)
120120
}
121-
bloom = ethtypes.CreateBloom(ethtypes.Receipts{&ethtypes.Receipt{Logs: evmkeeper.GetLogsForTx(r, 0)}})
121+
bloom = ethtypes.CreateBloom(&ethtypes.Receipt{Logs: evmkeeper.GetLogsForTx(r, 0)})
122122
r.LogsBloom = bloom[:]
123123
_ = app.EvmKeeper.SetTransientReceipt(wasmToEvmEventCtx, txHash, r)
124124
} else {
125-
bloom = ethtypes.CreateBloom(ethtypes.Receipts{&ethtypes.Receipt{Logs: logs}})
125+
bloom = ethtypes.CreateBloom(&ethtypes.Receipt{Logs: logs})
126126
receipt := &evmtypes.Receipt{
127127
TxType: ShellEVMTxType,
128128
TxHashHex: txHash.Hex(),

‎evmrpc/bloom_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ func TestMatchBloom(t *testing.T) {
1515
Address: common.HexToAddress("0x797C2dBE5736D0096914Cd1f9A7330403c71d301"),
1616
Topics: []common.Hash{common.HexToHash("0x036285defb58e7bdfda894dd4f86e1c7c826522ae0755f0017a2155b4c58022e")},
1717
}
18-
bloom := ethtypes.CreateBloom(ethtypes.Receipts{&ethtypes.Receipt{Logs: []*ethtypes.Log{&log}}})
18+
bloom := ethtypes.CreateBloom(&ethtypes.Receipt{Logs: []*ethtypes.Log{&log}})
1919
require.Equal(t,
2020
"00000000001000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000400000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
2121
hex.EncodeToString(bloom[:]),

‎evmrpc/setup_test.go

+14-14
Original file line numberDiff line numberDiff line change
@@ -702,11 +702,11 @@ func generateTxData() {
702702
TestSyntheticTxHash = syntheticEthTx.Hash().Hex()
703703
TxNonEvm = app.TestTx{}
704704
TxNonEvmWithSyntheticLog = app.TestTx{}
705-
bloomTx1 := ethtypes.CreateBloom(ethtypes.Receipts{&ethtypes.Receipt{Logs: []*ethtypes.Log{{
705+
bloomTx1 := ethtypes.CreateBloom(&ethtypes.Receipt{Logs: []*ethtypes.Log{{
706706
Address: common.HexToAddress("0x1111111111111111111111111111111111111111"),
707707
Topics: []common.Hash{common.HexToHash("0x1111111111111111111111111111111111111111111111111111111111111111"),
708708
common.HexToHash("0x1111111111111111111111111111111111111111111111111111111111111112")},
709-
}}}})
709+
}}})
710710
if err := EVMKeeper.MockReceipt(Ctx, tx1.Hash(), &types.Receipt{
711711
From: "0x1234567890123456789012345678901234567890",
712712
To: "0x1234567890123456789012345678901234567890",
@@ -804,7 +804,7 @@ func buildTx(txData ethtypes.DynamicFeeTx) (client.TxBuilder, *ethtypes.Transact
804804

805805
func setupLogs() {
806806
// block height 2
807-
bloom1 := ethtypes.CreateBloom(ethtypes.Receipts{&ethtypes.Receipt{Logs: []*ethtypes.Log{{
807+
bloom1 := ethtypes.CreateBloom(&ethtypes.Receipt{Logs: []*ethtypes.Log{{
808808
Address: common.HexToAddress("0x1111111111111111111111111111111111111112"),
809809
Topics: []common.Hash{
810810
common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000000123"),
@@ -815,7 +815,7 @@ func setupLogs() {
815815
Topics: []common.Hash{
816816
common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000000123"),
817817
},
818-
}}}})
818+
}}})
819819
CtxMultiTx := Ctx.WithBlockHeight(MockHeight2)
820820
EVMKeeper.MockReceipt(CtxMultiTx, multiTxBlockTx1.Hash(), &types.Receipt{
821821
BlockNumber: MockHeight2,
@@ -831,13 +831,13 @@ func setupLogs() {
831831
}},
832832
EffectiveGasPrice: 100,
833833
})
834-
bloom2 := ethtypes.CreateBloom(ethtypes.Receipts{&ethtypes.Receipt{Logs: []*ethtypes.Log{{
834+
bloom2 := ethtypes.CreateBloom(&ethtypes.Receipt{Logs: []*ethtypes.Log{{
835835
Address: common.HexToAddress("0x1111111111111111111111111111111111111113"),
836836
Topics: []common.Hash{
837837
common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000000123"),
838838
common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000000456"),
839839
},
840-
}}}})
840+
}}})
841841
EVMKeeper.MockReceipt(CtxMultiTx, multiTxBlockTx2.Hash(), &types.Receipt{
842842
BlockNumber: MockHeight2,
843843
TransactionIndex: 3,
@@ -849,13 +849,13 @@ func setupLogs() {
849849
}},
850850
EffectiveGasPrice: 100,
851851
})
852-
bloom3 := ethtypes.CreateBloom(ethtypes.Receipts{&ethtypes.Receipt{Logs: []*ethtypes.Log{{
852+
bloom3 := ethtypes.CreateBloom(&ethtypes.Receipt{Logs: []*ethtypes.Log{{
853853
Address: common.HexToAddress("0x1111111111111111111111111111111111111114"),
854854
Topics: []common.Hash{
855855
common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000000123"),
856856
common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000000456"),
857857
},
858-
}}}})
858+
}}})
859859
EVMKeeper.MockReceipt(CtxMultiTx, multiTxBlockTx3.Hash(), &types.Receipt{
860860
BlockNumber: MockHeight2,
861861
TransactionIndex: 4,
@@ -867,13 +867,13 @@ func setupLogs() {
867867
}},
868868
EffectiveGasPrice: 100,
869869
})
870-
bloom4 := ethtypes.CreateBloom(ethtypes.Receipts{&ethtypes.Receipt{Logs: []*ethtypes.Log{{
870+
bloom4 := ethtypes.CreateBloom(&ethtypes.Receipt{Logs: []*ethtypes.Log{{
871871
Address: common.HexToAddress("0x1111111111111111111111111111111111111115"),
872872
Topics: []common.Hash{
873873
common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000000123"),
874874
common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000000456"),
875875
},
876-
}}}})
876+
}}})
877877
CtxMock := Ctx.WithBlockHeight(MockHeight8)
878878
EVMKeeper.MockReceipt(CtxMock, multiTxBlockTx4.Hash(), &types.Receipt{
879879
BlockNumber: MockHeight8,
@@ -887,13 +887,13 @@ func setupLogs() {
887887
EffectiveGasPrice: 100,
888888
})
889889
// create a receipt with a synthetic log
890-
bloomSynth := ethtypes.CreateBloom(ethtypes.Receipts{&ethtypes.Receipt{Logs: []*ethtypes.Log{{
890+
bloomSynth := ethtypes.CreateBloom(&ethtypes.Receipt{Logs: []*ethtypes.Log{{
891891
Address: common.HexToAddress("0x1111111111111111111111111111111111111116"),
892892
Topics: []common.Hash{
893893
common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000000234"),
894894
common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000000456"),
895895
},
896-
}}}})
896+
}}})
897897
EVMKeeper.MockReceipt(CtxMock, multiTxBlockSynthTx.Hash(), &types.Receipt{
898898
TxType: evmrpc.ShellEVMTxType,
899899
BlockNumber: MockHeight100,
@@ -949,11 +949,11 @@ func setupLogs() {
949949
EVMKeeper.SetBlockBloom(MultiTxCtx, []ethtypes.Bloom{bloom1, bloom2, bloom3})
950950

951951
// block 8
952-
bloomTx1 := ethtypes.CreateBloom(ethtypes.Receipts{&ethtypes.Receipt{Logs: []*ethtypes.Log{{
952+
bloomTx1 := ethtypes.CreateBloom(&ethtypes.Receipt{Logs: []*ethtypes.Log{{
953953
Address: common.HexToAddress("0x1111111111111111111111111111111111111111"),
954954
Topics: []common.Hash{common.HexToHash("0x1111111111111111111111111111111111111111111111111111111111111111"),
955955
common.HexToHash("0x1111111111111111111111111111111111111111111111111111111111111112")},
956-
}}}})
956+
}}})
957957
EVMKeeper.SetBlockBloom(Ctx, []ethtypes.Bloom{bloomSynth, bloom4, bloomTx1})
958958
}
959959

‎evmrpc/simulate.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ func (s *SimulationAPI) CreateAccessList(ctx context.Context, args export.Transa
7575
bNrOrHash = *blockNrOrHash
7676
}
7777
ctx = context.WithValue(ctx, CtxIsWasmdPrecompileCallKey, wasmd.IsWasmdCall(args.To))
78-
acl, gasUsed, vmerr, err := export.AccessList(ctx, s.backend, bNrOrHash, args)
78+
acl, gasUsed, vmerr, err := export.AccessList(ctx, s.backend, bNrOrHash, args, nil)
7979
if err != nil {
8080
return nil, err
8181
}

‎go.mod

+16-16
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
module github.com/sei-protocol/sei-chain
22

3-
go 1.22.0
3+
go 1.23.0
44

5-
toolchain go1.22.9
5+
toolchain go1.23.7
66

77
require (
8-
github.com/BurntSushi/toml v1.3.2
8+
github.com/BurntSushi/toml v1.4.0
99
github.com/CosmWasm/wasmd v0.27.0
1010
github.com/CosmWasm/wasmvm v1.5.4
1111
github.com/armon/go-metrics v0.4.1
@@ -37,15 +37,15 @@ require (
3737
github.com/sirkon/goproxy v1.4.8
3838
github.com/spf13/cast v1.5.0
3939
github.com/spf13/cobra v1.8.1
40-
github.com/stretchr/testify v1.9.0
40+
github.com/stretchr/testify v1.10.0
4141
github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d
4242
github.com/tendermint/tendermint v0.37.0-dev
4343
github.com/tendermint/tm-db v0.6.8-0.20220519162814-e24b96538a12
4444
go.opentelemetry.io/otel v1.9.0
4545
go.opentelemetry.io/otel/trace v1.9.0
4646
golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa
47-
golang.org/x/sync v0.10.0
48-
golang.org/x/time v0.5.0
47+
golang.org/x/sync v0.11.0
48+
golang.org/x/time v0.9.0
4949
google.golang.org/genproto/googleapis/api v0.0.0-20241021214115-324edc3d5d38
5050
google.golang.org/grpc v1.67.1
5151
google.golang.org/protobuf v1.35.1
@@ -99,7 +99,7 @@ require (
9999
github.com/cosmos/btcutil v1.0.5 // indirect
100100
github.com/cosmos/gorocksdb v1.2.0 // indirect
101101
github.com/cosmos/ledger-cosmos-go v0.12.4 // indirect
102-
github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
102+
github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect
103103
github.com/crate-crypto/go-ipa v0.0.0-20240724233137-53bbb0ceb27a // indirect
104104
github.com/crate-crypto/go-kzg-4844 v1.1.0 // indirect
105105
github.com/creachadair/taskgroup v0.3.2 // indirect
@@ -285,7 +285,7 @@ require (
285285
github.com/stbenjam/no-sprintf-host-port v0.1.1 // indirect
286286
github.com/stretchr/objx v0.5.2 // indirect
287287
github.com/subosito/gotenv v1.4.1 // indirect
288-
github.com/supranational/blst v0.3.13 // indirect
288+
github.com/supranational/blst v0.3.14 // indirect
289289
github.com/sylvia7788/contextcheck v1.0.4 // indirect
290290
github.com/tdakkota/asciicheck v0.1.1 // indirect
291291
github.com/tendermint/btcd v0.1.1 // indirect
@@ -304,9 +304,9 @@ require (
304304
github.com/tommy-muehle/go-mnd/v2 v2.5.0 // indirect
305305
github.com/ultraware/funlen v0.0.3 // indirect
306306
github.com/ultraware/whitespace v0.0.5 // indirect
307-
github.com/urfave/cli/v2 v2.25.7 // indirect
307+
github.com/urfave/cli/v2 v2.27.5 // indirect
308308
github.com/uudashr/gocognit v1.0.5 // indirect
309-
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
309+
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
310310
github.com/yagipy/maintidx v1.0.0 // indirect
311311
github.com/yeya24/promlinter v0.2.0 // indirect
312312
github.com/yourbasic/graph v0.0.0-20210606180040-8ecfec1c2869 // indirect
@@ -318,13 +318,13 @@ require (
318318
go.opencensus.io v0.24.0 // indirect
319319
go.opentelemetry.io/otel/exporters/jaeger v1.9.0 // indirect
320320
go.opentelemetry.io/otel/sdk v1.9.0 // indirect
321-
golang.org/x/crypto v0.32.0 // indirect
321+
golang.org/x/crypto v0.35.0 // indirect
322322
golang.org/x/exp/typeparams v0.0.0-20220218215828-6cf2b201936e // indirect
323323
golang.org/x/mod v0.22.0 // indirect
324-
golang.org/x/net v0.34.0 // indirect
325-
golang.org/x/sys v0.29.0 // indirect
326-
golang.org/x/term v0.28.0 // indirect
327-
golang.org/x/text v0.21.0 // indirect
324+
golang.org/x/net v0.36.0 // indirect
325+
golang.org/x/sys v0.30.0 // indirect
326+
golang.org/x/term v0.29.0 // indirect
327+
golang.org/x/text v0.22.0 // indirect
328328
golang.org/x/tools v0.29.0 // indirect
329329
google.golang.org/genproto v0.0.0-20240116215550-a9fa1716bcac // indirect
330330
google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38 // indirect
@@ -356,7 +356,7 @@ replace (
356356
github.com/cosmos/cosmos-sdk => github.com/sei-protocol/sei-cosmos v0.3.56-0.20250313190228-9fb9a4fd8636
357357
github.com/cosmos/iavl => github.com/sei-protocol/sei-iavl v0.2.0
358358
github.com/cosmos/ibc-go/v3 => github.com/sei-protocol/sei-ibc-go/v3 v3.3.5
359-
github.com/ethereum/go-ethereum => github.com/sei-protocol/go-ethereum-tmp v1.15.0-sei-10
359+
github.com/ethereum/go-ethereum => github.com/sei-protocol/go-ethereum-tmp v1.15.7-sei-0.1
360360
github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
361361
github.com/sei-protocol/sei-db => github.com/sei-protocol/sei-db v0.0.48
362362
// Latest goleveldb is broken, we have to stick to this version

0 commit comments

Comments
 (0)