Merge branch 'merge/foundation-release/1.12.2' into merge/foundation-…

…release/1.12.2+spiral
etclabscore · Aug 29, 2023 · 432cae1 · 432cae1
2 parents 9e174f9 + eade8b2
commit 432cae1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
 }
diff --git 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