Merge branch 'celo10' into jcortejoso-patch-1

op-chain-ops/cmd/celo-migrate/non-ancients.go

@@ -62,7 +62,11 @@ func copyDbExceptAncients(oldDbPath, newDbPath string) error {
 func migrateNonAncientsDb(newDB ethdb.Database, lastBlock, numAncients, batchSize uint64) (uint64, error) {
 	defer timer("migrateNonAncientsDb")()
 
-	// The genesis block is also migrated in the ancient db migration as it is stored in both places.
+	// Delete bad blocks, we could migrate them, but we have no need of the historical bad blocks. AFAICS bad blocks
+	// are stored solely so that they can be retrieved or traced via the debug API, but we are no longer interested
+	// in these old bad blocks.
+	rawdb.DeleteBadBlocks(newDB)
+
 	// The genesis block is the only block that should remain stored in the non-ancient db even after it is frozen.
 	if numAncients > 0 {
 		log.Info("Migrating genesis block in non-ancient db", "process", "non-ancients")

op-e2e/interop/interop_recipe_test.go

@@ -16,8 +16,6 @@ import (
 )
 
 func TestInteropDevRecipe(t *testing.T) {
-	t.Skipf("Skipping interop tests for now. Celo doesn't use interop, so we can fix these tests at a later time")
-
 	rec := interopgen.InteropDevRecipe{
 		L1ChainID:        900100,
 		L2ChainIDs:       []uint64{900200, 900201},

op-e2e/interop/interop_test.go

@@ -20,8 +20,6 @@ import (
 // The balance of Bob on Chain A is checked before and after the tx.
 // The balance of Bob on Chain B is checked after the tx.
 func TestInteropTrivial(t *testing.T) {
-	t.Skipf("Skipping interop tests for now. Celo doesn't use interop, so we can fix these tests at a later time")
-
 	recipe := interopgen.InteropDevRecipe{
 		L1ChainID:        900100,
 		L2ChainIDs:       []uint64{900200, 900201},

op-e2e/system/bridge/validity_test.go

@@ -267,8 +267,6 @@ func TestMixedDepositValidity(t *testing.T) {
 // TestMixedWithdrawalValidity makes a number of withdrawal transactions and ensures ones with modified parameters are
 // rejected while unmodified ones are accepted. This runs test cases in different systems.
 func TestMixedWithdrawalValidity(t *testing.T) {
-	t.Skipf("Skipping withdrawal tests for now, must check in more detail!")
-
 	op_e2e.InitParallel(t)
 
 	// There are 7 different fields we try modifying to cause a failure, plus one "good" test result we test.

op-e2e/system/fees/fees_test.go

@@ -16,6 +16,7 @@ import (
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
+	"github.com/ethereum/go-ethereum/contracts/addresses"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/ethclient"
@@ -82,7 +83,6 @@ func TestFees(t *testing.T) {
 }
 
 func testFees(t *testing.T, cfg e2esys.SystemConfig) {
-	t.Skipf("Skipping fee tests for  tests for now, Celo changes fee handling and the tests need more work!")
 	sys, err := cfg.Start(t)
 	require.Nil(t, err, "Error starting up system")
 
@@ -136,8 +136,12 @@ func testFees(t *testing.T, cfg e2esys.SystemConfig) {
 
 	require.Equal(t, decimals.Uint64(), uint64(6), "wrong gpo decimals")
 
+	baseFeeRecipient := predeploys.BaseFeeVaultAddr
+	if sys.RollupConfig.IsCel2(sys.L2GenesisCfg.Timestamp) {
+		baseFeeRecipient = addresses.FeeHandlerAddress
+	}
 	// BaseFee Recipient
-	baseFeeRecipientStartBalance, err := l2Seq.BalanceAt(context.Background(), predeploys.BaseFeeVaultAddr, big.NewInt(rpc.EarliestBlockNumber.Int64()))
+	baseFeeRecipientStartBalance, err := l2Seq.BalanceAt(context.Background(), baseFeeRecipient, big.NewInt(rpc.EarliestBlockNumber.Int64()))
 	require.Nil(t, err)
 
 	// L1Fee Recipient
@@ -180,7 +184,7 @@ func testFees(t *testing.T, cfg e2esys.SystemConfig) {
 	endBalance, err := l2Seq.BalanceAt(context.Background(), fromAddr, header.Number)
 	require.Nil(t, err)
 
-	baseFeeRecipientEndBalance, err := l2Seq.BalanceAt(context.Background(), predeploys.BaseFeeVaultAddr, header.Number)
+	baseFeeRecipientEndBalance, err := l2Seq.BalanceAt(context.Background(), baseFeeRecipient, header.Number)
 	require.Nil(t, err)
 
 	l1Header, err := l1.HeaderByNumber(context.Background(), nil)