chore: use v21 as upgrade base (#3063)

Makefile

@@ -301,7 +301,7 @@ ifdef UPGRADE_TEST_FROM_SOURCE
 zetanode-upgrade: zetanode
 	@echo "Building zetanode-upgrade from source"
 	$(DOCKER) build -t zetanode:old -f Dockerfile-localnet --target old-runtime-source \
-		--build-arg OLD_VERSION='release/v20' \
+		--build-arg OLD_VERSION='release/v21' \
 		--build-arg NODE_VERSION=$(NODE_VERSION) \
 		--build-arg NODE_COMMIT=$(NODE_COMMIT)
 		.
@@ -310,7 +310,7 @@ else
 zetanode-upgrade: zetanode
 	@echo "Building zetanode-upgrade from binaries"
 	$(DOCKER) build -t zetanode:old -f Dockerfile-localnet --target old-runtime \
-	--build-arg OLD_VERSION='https://github.com/zeta-chain/node/releases/download/v20.0.2' \
+	--build-arg OLD_VERSION='https://github.com/zeta-chain/node/releases/download/v21.0.0' \
 	--build-arg NODE_VERSION=$(NODE_VERSION) \
 	--build-arg NODE_COMMIT=$(NODE_COMMIT) \
 	.

e2e/e2etests/test_eth_withdraw.go

@@ -39,12 +39,8 @@ func TestEtherWithdraw(r *runner.E2ERunner, args []string) {
 
 	utils.RequireCCTXStatus(r, cctx, crosschaintypes.CctxStatus_OutboundMined)
 
-	// Previous binary doesn't take EIP-1559 into account, so this will fail.
-	// Thus, we need to skip this check for upgrade tests
-	if !r.IsRunningUpgrade() {
-		withdrawalReceipt := mustFetchEthReceipt(r, cctx)
-		require.Equal(r, uint8(ethtypes.DynamicFeeTxType), withdrawalReceipt.Type, "receipt type mismatch")
-	}
+	withdrawalReceipt := mustFetchEthReceipt(r, cctx)
+	require.Equal(r, uint8(ethtypes.DynamicFeeTxType), withdrawalReceipt.Type, "receipt type mismatch")
 
 	r.Logger.Info("TestEtherWithdraw completed")
 }