Merge 0.6.2 upstream

db/migrations/state/0017.sql

@@ -0,0 +1,9 @@
+-- +migrate Up
+ALTER TABLE state.receipt
+    ADD COLUMN IF NOT EXISTS im_state_root BYTEA;
+
+UPDATE state.receipt SET im_state_root = post_state WHERE block_num >= (SELECT MIN(block_num) FROM state.l2block WHERE batch_num >= (SELECT from_batch_num FROM state.fork_id WHERE fork_id = 7));
+
+-- +migrate Down
+ALTER TABLE state.receipt
+    DROP COLUMN IF EXISTS im_state_root;

docker-compose.yml

@@ -107,7 +107,7 @@ services:
   zkevm-prover:
     container_name: zkevm-prover
     restart: unless-stopped
-    image: hermeznetwork/zkevm-prover:v5.0.3
+    image: hermeznetwork/zkevm-prover:v5.0.6
     depends_on:
       zkevm-state-db:
         condition: service_healthy

etherman/etherman.go

@@ -712,7 +712,7 @@ func (etherMan *Client) addExistingRollup(ctx context.Context, vLog types.Log, b
 }
 
 func (etherMan *Client) updateEtrogSequence(_ context.Context, _ types.Log, _ *[]Block, _ *map[common.Hash][]Order) error {
-	return errors.New("Upgrading validiums to etrog not supported")
+	return errors.New("upgrading validiums to etrog not supported")
 }
 
 func (etherMan *Client) initialSequenceBatches(ctx context.Context, vLog types.Log, blocks *[]Block, blocksOrder *map[common.Hash][]Order) error {