diff --git a/go.mod b/go.mod index 3cac65fc..f3c631f5 100644 --- a/go.mod +++ b/go.mod @@ -297,7 +297,7 @@ replace ( github.com/cerc-io/eth-ipfs-state-validator/v5 => git.vdb.to/cerc-io/eth-ipfs-state-validator/v5 v5.1.1-alpha github.com/cerc-io/eth-iterator-utils => git.vdb.to/cerc-io/eth-iterator-utils v0.1.2-beta github.com/cerc-io/eth-testing => git.vdb.to/cerc-io/eth-testing v0.3.1 - github.com/cerc-io/ipld-eth-statedb => /Users/iannorden/go/src/github.com/cerc-io/ipld-eth-statedb // git.vdb.to/cerc-io/ipld-eth-statedb v0.0.6-alpha + github.com/cerc-io/ipld-eth-statedb => git.vdb.to/cerc-io/ipld-eth-statedb v0.0.7-alpha-0.0.1 // git.vdb.to/cerc-io/ipld-eth-statedb v0.0.6-alpha github.com/cerc-io/plugeth-statediff => git.vdb.to/cerc-io/plugeth-statediff v0.1.4 github.com/ethereum/go-ethereum => git.vdb.to/cerc-io/plugeth v0.0.0-20230808125822-691dc334fab1 github.com/openrelayxyz/plugeth-utils => git.vdb.to/cerc-io/plugeth-utils v0.0.0-20230706160122-cd41de354c46 diff --git a/go.sum b/go.sum index 7f176070..f5e439e8 100644 --- a/go.sum +++ b/go.sum @@ -50,6 +50,8 @@ git.vdb.to/cerc-io/eth-ipfs-state-validator/v5 v5.1.1-alpha/go.mod h1:e/9QV7BeaA git.vdb.to/cerc-io/eth-iterator-utils v0.1.2-beta h1:pv1HCRlD7/1X7i35MWylwGhji0aWI4QujsrJoYOW55U= git.vdb.to/cerc-io/eth-iterator-utils v0.1.2-beta/go.mod h1:OvXbdWbZ5viBXC/Ui1EkhsSmGB+AUX+TjGa3UDAfjfg= git.vdb.to/cerc-io/eth-testing v0.3.1 h1:sPnlMev6oEgTjsW7GtUkSsjKNG/+X6P9q0izSejLGpM= +git.vdb.to/cerc-io/ipld-eth-statedb v0.0.7-alpha-0.0.1 h1:wIT5/LEYlBSDp2lzY8R9+RIkM4DALSP4VJg7FpKxR+c= +git.vdb.to/cerc-io/ipld-eth-statedb v0.0.7-alpha-0.0.1/go.mod h1:isx+cwWmkOL6hzfbcjRt9lDR4vxT0s0kCR8wD01H1/8= git.vdb.to/cerc-io/plugeth v0.0.0-20230808125822-691dc334fab1 h1:KLjxHwp9Zp7xhECccmJS00RiL+VwTuUGLU7qeIctg8g= git.vdb.to/cerc-io/plugeth v0.0.0-20230808125822-691dc334fab1/go.mod h1:cYXZu70+6xmDgIgrTD81GPasv16piiAFJnKyAbwVPMU= git.vdb.to/cerc-io/plugeth-statediff v0.1.4 h1:swDJDAk1/yu6MOHAvxeyZz+MS1H9FCmSWGQRswFxFEw= diff --git a/pkg/eth/debug_test/debug_test.go b/pkg/eth/debug_test/debug_test.go index a06c54c0..64fd9e05 100644 --- a/pkg/eth/debug_test/debug_test.go +++ b/pkg/eth/debug_test/debug_test.go @@ -63,8 +63,6 @@ var ( ) var _ = BeforeSuite(func() { - chainConfig.LondonBlock = big.NewInt(100) - // db and type initializations var err error db = shared.SetupDB() @@ -72,7 +70,7 @@ var _ = BeforeSuite(func() { // Initialize test accounts accounts = newAccounts(3) genesis := &core.Genesis{ - Config: params.TestChainConfig, + Config: chainConfig, Alloc: core.GenesisAlloc{ accounts[0].addr: {Balance: big.NewInt(params.Ether)}, accounts[1].addr: {Balance: big.NewInt(params.Ether)}, @@ -95,7 +93,6 @@ var _ = BeforeSuite(func() { builder := statediff.NewBuilder(adapt.GethStateView(tb.chain.StateCache())) for i, block := range blocks { var args statediff.Args - var rcts types.Receipts if i == 0 { args = statediff.Args{ OldStateRoot: common.Hash{}, @@ -110,11 +107,10 @@ var _ = BeforeSuite(func() { BlockNumber: block.Number(), BlockHash: block.Hash(), } - rcts = receipts[i-1] } diff, err := builder.BuildStateDiffObject(args, params) Expect(err).ToNot(HaveOccurred()) - tx, err := transformer.PushBlock(block, rcts, mockTD) + tx, err := transformer.PushBlock(block, receipts[i], mockTD) Expect(err).ToNot(HaveOccurred()) defer tx.RollbackOnFailure(err) @@ -138,7 +134,7 @@ var _ = BeforeSuite(func() { RPCGasCap: big.NewInt(10000000000), // Max gas capacity for a rpc call. GroupCacheConfig: &shared.GroupCacheConfig{ StateDB: shared.GroupConfig{ - Name: "eth_state_test", + Name: "eth_debug_test", CacheSizeInMB: 8, CacheExpiryInMins: 60, LogStatsIntervalInSecs: 0,