port v0.4.1-beta1 to cosmos-evm

Author: AdriaCarrera

.github/workflows/release.yml

@@ -21,7 +21,7 @@ env:
 
 jobs:
   build:
-    runs-on: amd-runner-2204
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
@@ -98,7 +98,7 @@ jobs:
           retention-days: 1
 
   merge:
-    runs-on: arm-runner-2204
+    runs-on: ubuntu-24.04-arm
     needs:
       - build
     steps:

aggsender/query/l1info_tree_data_query.go

@@ -148,7 +148,7 @@ func (l *L1InfoTreeDataQuerier) getLatestProcessedFinalizedBlock(ctx context.Con
 		}
 	}
 
-	if (lastProcessedBlockHash == common.Hash{}) || (lastProcessedBlockHash == lastFinalizedL1Block.Hash()) {
+	if (lastProcessedBlockHash == common.Hash{}) || (lastProcessedBlockHash == lastFinalizedL1Block.RpcHash) {
 		// if the hash is empty it means that this is an old block that was processed before this
 		// feature was added, so we will consider it finalized
 		return lastFinalizedL1Block.Number.Uint64(), nil
@@ -157,5 +157,5 @@ func (l *L1InfoTreeDataQuerier) getLatestProcessedFinalizedBlock(ctx context.Con
 	return 0, fmt.Errorf("l1infotreesyncer returned a different hash for "+
 		"the latest finalized block: %d. Might be that syncer did not process a reorg yet. "+
 		"Expected hash: %s, got: %s", lastProcessedBlockNum,
-		lastFinalizedL1Block.Hash().String(), lastProcessedBlockHash.String())
+		lastFinalizedL1Block.RpcHash.String(), lastProcessedBlockHash.String())
 }

bridgesync/bridgesync.go

@@ -150,7 +150,7 @@ func newBridgeSync(
 
 		err = processor.ProcessBlock(ctx, sync.Block{
 			Num:  initialBlock,
-			Hash: block.Hash(),
+			Hash: block.Header().RpcHash,
 		})
 		if err != nil {
 			return nil, err

go.mod

@@ -190,3 +190,5 @@ require (
 	honnef.co/go/tools v0.0.1-2020.1.4 // indirect
 	rsc.io/tmplfunc v0.0.3 // indirect
 )
+
+replace github.com/ethereum/go-ethereum => github.com/Peersyst/go-ethereum v1.15.5-agglayer.0

go.sum

@@ -38,6 +38,8 @@ github.com/DataDog/zstd v1.5.6 h1:LbEglqepa/ipmmQJUDnSsfvA8e8IStVcGaFWDuxvGOY=
 github.com/DataDog/zstd v1.5.6/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw=
 github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=
 github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
+github.com/Peersyst/go-ethereum v1.15.5-agglayer.0 h1:hajnc47agSwFRH/tXWq/Op3eej2A2qtNkbd6Gn18/PQ=
+github.com/Peersyst/go-ethereum v1.15.5-agglayer.0/go.mod h1:1LG2LnMOx2yPRHR/S+xuipXH29vPr6BIH6GElD8N/fo=
 github.com/VictoriaMetrics/fastcache v1.12.2 h1:N0y9ASrJ0F6h0QaC3o6uJb3NIZ9VKLjCM7NQbSmF7WI=
 github.com/VictoriaMetrics/fastcache v1.12.2/go.mod h1:AmC+Nzz1+3G2eCPapF6UcsnkThDcMsQicp4xDukwJYI=
 github.com/agglayer/go_signer v0.0.7 h1:V+4wFWjGKdL1GgXSzx2RLgglJWyce95Dy/4+9xx52hs=
@@ -131,8 +133,6 @@ github.com/ethereum-optimism/infra/op-signer v1.4.1 h1:vLNPTqbSZH85KItWDuCoRsNto
 github.com/ethereum-optimism/infra/op-signer v1.4.1/go.mod h1:znWwvyDM9lYCQUUjMzQAF8+ysPa418ZzopUr9tdPJWI=
 github.com/ethereum/c-kzg-4844 v1.0.3 h1:IEnbOHwjixW2cTvKRUlAAUOeleV7nNM/umJR+qy4WDs=
 github.com/ethereum/c-kzg-4844 v1.0.3/go.mod h1:VewdlzQmpT5QSrVhbBuGoCdFJkpaJlO1aQputP83wc0=
-github.com/ethereum/go-ethereum v1.15.5 h1:Fo2TbBWC61lWVkFw9tsMoHCNX1ndpuaQBRJ8H6xLUPo=
-github.com/ethereum/go-ethereum v1.15.5/go.mod h1:1LG2LnMOx2yPRHR/S+xuipXH29vPr6BIH6GElD8N/fo=
 github.com/ethereum/go-verkle v0.2.2 h1:I2W0WjnrFUIzzVPwm8ykY+7pL2d4VhlsePn4j7cnFk8=
 github.com/ethereum/go-verkle v0.2.2/go.mod h1:M3b90YRnzqKyyzBEWJGqj8Qff4IDeXnzFw0P9bFw3uk=
 github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
@@ -628,6 +628,5 @@ honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.1-2020.1.4 h1:UoveltGrhghAA7ePc+e+QYDHXrBps2PqFZiHkGR/xK8=
 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
-nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50=
 rsc.io/tmplfunc v0.0.3 h1:53XFQh69AfOa8Tw0Jm7t+GV7KZhOi6jzsCzTtKbMvzU=
 rsc.io/tmplfunc v0.0.3/go.mod h1:AG3sTPzElb1Io3Yg4voV9AGZJuleGAwaVRxL9M49PhA=

l1infotreesync/l1infotreesync.go

@@ -71,7 +71,7 @@ func New(
 
 		err = processor.ProcessBlock(ctx, sync.Block{
 			Num:  initialBlock - 1,
-			Hash: block.Hash(),
+			Hash: block.Header().RpcHash,
 		})
 		if err != nil {
 			return nil, err

reorgdetector/reorgdetector.go

@@ -209,7 +209,7 @@ func (rd *ReorgDetector) detectReorgInTrackedList(ctx context.Context) error {
 				headersCacheLock.Unlock()
 
 				// Check if the block hash matches with the actual block hash
-				if hdr.Hash == currentHeader.Hash() {
+				if hdr.Hash == currentHeader.RpcHash {
 					// Delete block from the tracked blocks list if it is less than or equal to the last finalized block
 					// and hashes matches. If higher than finalized block, we assume a reorg still might happen.
 					if hdr.Num <= lastFinalisedBlock.Number.Uint64() {

sync/evmdownloader.go

@@ -429,7 +429,7 @@ func (d *EVMDownloaderImplementation) GetBlockHeader(ctx context.Context, blockN
 		}
 		return EVMBlockHeader{
 			Num:        header.Number.Uint64(),
-			Hash:       header.Hash(),
+			Hash:       header.RpcHash,
 			ParentHash: header.ParentHash,
 			Timestamp:  header.Time,
 		}, false

test/helpers/reorg.go

@@ -31,7 +31,7 @@ func Reorg(t *testing.T, client *simulated.Backend, reorgSizeInBlocks uint64) {
 	block, err := client.Client().BlockByNumber(ctx, big.NewInt(int64(currentBlockNum-reorgSizeInBlocks)))
 	log.Debugf("reorging until block %d. Current block %d (before reorg)", block.NumberU64(), currentBlockNum)
 	require.NoError(t, err)
-	reorgFrom := block.Hash()
+	reorgFrom := block.Header().RpcHash
 	err = client.Fork(reorgFrom)
 	require.NoError(t, err)
 }