From e8e0cf3fb1c235540b03dc89adea194a20c7e497 Mon Sep 17 00:00:00 2001 From: Chris Ziogas Date: Tue, 29 Aug 2023 14:21:13 +0300 Subject: [PATCH 1/5] Update eth/api_debug.go --- eth/api_debug.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eth/api_debug.go b/eth/api_debug.go index cd79681172..3f60f42055 100644 --- a/eth/api_debug.go +++ b/eth/api_debug.go @@ -412,6 +412,6 @@ func (api *DebugAPI) GetAccessibleState(from, to rpc.BlockNumber) (uint64, error // RemovePendingTransaction removes a transaction from the txpool. // It returns the transaction removed, if any. func (api *DebugAPI) RemovePendingTransaction(hash common.Hash) (*types.Transaction, error) { - // TODO (ziogaschr): add support for RemoveTx in bloppool + // TODO (ziogaschr): add support for RemoveTx in blobpool return nil, nil } From a5602be434174d8283c8c0c93c2e91f9726a5de0 Mon Sep 17 00:00:00 2001 From: Chris Ziogas Date: Tue, 29 Aug 2023 14:25:40 +0300 Subject: [PATCH 2/5] params/types/genesisT: params/types/genesisT: fix indentation --- params/types/genesisT/gen_genesis.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/params/types/genesisT/gen_genesis.go b/params/types/genesisT/gen_genesis.go index 8473a90f85..0136309ee6 100644 --- a/params/types/genesisT/gen_genesis.go +++ b/params/types/genesisT/gen_genesis.go @@ -81,7 +81,7 @@ func (g *Genesis) UnmarshalJSON(input []byte) error { BlobGasUsed *math.HexOrDecimal64 `json:"blobGasUsed"` } var dec Genesis - // We have to look at the raw input, decide what kind of configurator schema it's using, + // We have to look at the raw input, decide what kind of configurator schema it's using, // then assign the decoder struct to use that schema type. conf, err := generic.UnmarshalChainConfigurator(input) if err != nil { From 30b7293464b6d061765a38cb38dc5d8dbd944233 Mon Sep 17 00:00:00 2001 From: Chris Ziogas Date: Tue, 29 Aug 2023 15:01:27 +0300 Subject: [PATCH 3/5] tests: tests: set new head for tests/testdata --- tests/testdata | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/testdata b/tests/testdata index a380655e5f..ee3fa4c86d 160000 --- a/tests/testdata +++ b/tests/testdata @@ -1 +1 @@ -Subproject commit a380655e5ffab1a5ea0f4d860224bdb19013f06a +Subproject commit ee3fa4c86d05f99f2717f83a6ad08008490ddf07 From 3ce83fc973a1c3f824f7bad0815b14dab906bb63 Mon Sep 17 00:00:00 2001 From: Chris Ziogas Date: Tue, 29 Aug 2023 15:01:40 +0300 Subject: [PATCH 4/5] tests: tests: Set new submodule head for tests/testdata-etc --- tests/testdata-etc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/testdata-etc b/tests/testdata-etc index c138c1391d..06ec708ea7 160000 --- a/tests/testdata-etc +++ b/tests/testdata-etc @@ -1 +1 @@ -Subproject commit c138c1391deb604aa8efa97561b3f8edc49f0eb5 +Subproject commit 06ec708ea7f3707826142a97a94b61d40c920696 From eade8b23becd8f9194e955c6253285bbffed04f6 Mon Sep 17 00:00:00 2001 From: meows Date: Tue, 29 Aug 2023 09:55:26 -0600 Subject: [PATCH 5/5] tests: skip post-Berlin forks during EVMC tests CI tests were failing because the Cancun suite was not skipped. Core-Geth still only supports EVMCv7, so all forks thereafter need to be skipped. AFAIK an upgrade to EVMCv10 should catch up to compatibility for these later forks. Date: 2023-08-29 09:55:26-06:00 Signed-off-by: meows --- tests/state_test.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/state_test.go b/tests/state_test.go index ec1d9edaaa..3f94a26b93 100644 --- a/tests/state_test.go +++ b/tests/state_test.go @@ -82,6 +82,9 @@ func TestState(t *testing.T) { st.skipFork("London") // ETH st.skipFork("Mystique") // ETC st.skipFork("Merge") // ETH + st.skipFork("Shanghai") // ETH + st.skipFork("Spiral") // ETC + st.skipFork("Cancun") // ETH } // Un-skip this when https://github.com/ethereum/tests/issues/908 is closed