Merge branch 'main' into chore/sync-main-with-develop

agglayer · Jan 22, 2025 · daab714 · daab714
2 parents f885a7a + 777d3b2
commit daab714
Show file tree

Hide file tree

Showing 16 changed files with 37 additions and 40 deletions.
diff --git a/.github/assets/agglayer-logo.png b/.github/assets/agglayer-logo.png
diff --git a/.github/workflows/arm_rpm_packager.yml b/.github/workflows/arm_rpm_packager.yml
@@ -65,13 +65,12 @@ jobs:
           
           echo "%install" >> packaging/rpm/SPECS/aggkit.spec
           echo "mkdir -p %{buildroot}/usr/bin" >> packaging/rpm/SPECS/aggkit.spec
-          echo "cp /home/runner/work/aggkit/aggkit/target/aggkit %{buildroot}/usr/bin/aggkit" >> packaging/rpm/SPECS/aggkit.spec
+          echo "cp /home/runner/work/aggkit/aggkit/target/aggkit-node %{buildroot}/usr/bin/aggkit-node" >> packaging/rpm/SPECS/aggkit.spec
           echo "cp /home/runner/work/aggkit/aggkit/target/release/aggkit %{buildroot}/usr/bin/aggkit" >> packaging/rpm/SPECS/aggkit.spec
           
           echo "%files" >> packaging/rpm/SPECS/aggkit.spec
           echo "/usr/bin/aggkit" >> packaging/rpm/SPECS/aggkit.spec
 
-
       - name: Construct rpm package
         run: |
           rpmbuild --define "_topdir /home/runner/work/aggkit/aggkit/packaging/rpm_build" \

diff --git a/.github/workflows/test-resequence.yml b/.github/workflows/test-resequence.yml
@@ -69,7 +69,7 @@ jobs:
 
       - name: Deploy Kurtosis CDK package
         working-directory: ./kurtosis-cdk
-        run: kurtosis run --enclave cdk-v1 --args-file params.yml --image-download always .
+        run: kurtosis run --enclave aggkit --args-file params.yml --image-download always .
 
       - name: Test resequence
         working-directory: ./cdk-erigon

diff --git a/.github/workflows/test-unit.yml b/.github/workflows/test-unit.yml
@@ -37,4 +37,4 @@ jobs:
         uses: sonarsource/sonarcloud-github-action@master
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
diff --git a/.github/workflows/x86_deb_packager.yml b/.github/workflows/x86_deb_packager.yml
@@ -71,7 +71,6 @@ jobs:
         env:
           ARCH: amd64
 
-
       - name: Release aggkit Packages
         uses: softprops/action-gh-release@v2
         with:

diff --git a/.gitignore b/.gitignore
@@ -5,7 +5,6 @@
 cmd/__debug_bin
 **__debug**
 target/
-book/
 index.html
 tmp
 .vscode

diff --git a/agglayer/mock_agglayer_client.go b/agglayer/mock_agglayer_client.go
diff --git a/aggsender/mocks/mock_agg_sender_storage.go b/aggsender/mocks/mock_agg_sender_storage.go
diff --git a/aggsender/mocks/mock_block_notifier.go b/aggsender/mocks/mock_block_notifier.go
diff --git a/aggsender/mocks/mock_epoch_notifier.go b/aggsender/mocks/mock_epoch_notifier.go
diff --git a/aggsender/mocks/mock_generic_subscriber.go b/aggsender/mocks/mock_generic_subscriber.go
diff --git a/aggsender/mocks/mock_l2_bridge_syncer.go b/aggsender/mocks/mock_l2_bridge_syncer.go
diff --git a/aggsender/mocks/mock_logger.go b/aggsender/mocks/mock_logger.go
diff --git a/bridgesync/mocks/mock_eth_clienter.go b/bridgesync/mocks/mock_eth_clienter.go
diff --git a/scripts/local_config b/scripts/local_config
@@ -162,32 +162,32 @@ function export_values_of_genesis() {
 
 ###############################################################################
 function export_values_of_cdk_node_config() {
-    local _CDK_CONFIG_FILE=$1
-    export_key_from_toml_file_or_fatal zkevm_l2_sequencer_address $_CDK_CONFIG_FILE "." L2Coinbase
-    export_key_from_toml_file_or_fatal zkevm_l2_sequencer_keystore_password $_CDK_CONFIG_FILE "." SequencerPrivateKeyPassword
-    export_key_from_toml_file_or_fatal l1_chain_id $_CDK_CONFIG_FILE L1Config chainId
-    export_key_from_toml_file zkevm_is_validium $_CDK_CONFIG_FILE Common IsValidiumMode
+    local _AGGKIT_CONFIG_FILE=$1
+    export_key_from_toml_file_or_fatal zkevm_l2_sequencer_address $_AGGKIT_CONFIG_FILE "." L2Coinbase
+    export_key_from_toml_file_or_fatal zkevm_l2_sequencer_keystore_password $_AGGKIT_CONFIG_FILE "." SequencerPrivateKeyPassword
+    export_key_from_toml_file_or_fatal l1_chain_id $_AGGKIT_CONFIG_FILE L1Config chainId
+    export_key_from_toml_file zkevm_is_validium $_AGGKIT_CONFIG_FILE Common IsValidiumMode
     if [ $? -ne 0 ]; then
-        export_key_from_toml_file_or_fatal zkevm_is_validium $_CDK_CONFIG_FILE "." IsValidiumMode
+        export_key_from_toml_file_or_fatal zkevm_is_validium $_AGGKIT_CONFIG_FILE "." IsValidiumMode
     fi
-    export_key_from_toml_file zkevm_contract_versions $_CDK_CONFIG_FILE Common ContractVersions
+    export_key_from_toml_file zkevm_contract_versions $_AGGKIT_CONFIG_FILE Common ContractVersions
     if [ $? -ne 0 ]; then
-        export_key_from_toml_file_or_fatal zkevm_contract_versions $_CDK_CONFIG_FILE "." ContractVersions
+        export_key_from_toml_file_or_fatal zkevm_contract_versions $_AGGKIT_CONFIG_FILE "." ContractVersions
     fi
-    export_key_from_toml_file l2_chain_id $_CDK_CONFIG_FILE Aggregator ChainID
+    export_key_from_toml_file l2_chain_id $_AGGKIT_CONFIG_FILE Aggregator ChainID
     if [ $? -ne 0 ]; then
         log_debug "l2_chain_id not found in Aggregator section, using 0"
         export l2_chain_id="0"
     fi
-    export_key_from_toml_file_or_fatal zkevm_l2_agglayer_address $_CDK_CONFIG_FILE "." SenderProofToL1Addr
-    export_key_from_toml_file_or_fatal zkevm_rollup_fork_id $_CDK_CONFIG_FILE "." ForkId
-    export_key_from_toml_file zkevm_l2_agglayer_keystore_password $_CDK_CONFIG_FILE AggSender.SequencerPrivateKey Password
+    export_key_from_toml_file_or_fatal zkevm_l2_agglayer_address $_AGGKIT_CONFIG_FILE "." SenderProofToL1Addr
+    export_key_from_toml_file_or_fatal zkevm_rollup_fork_id $_AGGKIT_CONFIG_FILE "." ForkId
+    export_key_from_toml_file zkevm_l2_agglayer_keystore_password $_AGGKIT_CONFIG_FILE AggSender.SequencerPrivateKey Password
     if [ $? -ne 0 ]; then
-        export_key_from_toml_file_or_fatal zkevm_l2_agglayer_keystore_password $_CDK_CONFIG_FILE "." SequencerPrivateKeyPassword
+        export_key_from_toml_file_or_fatal zkevm_l2_agglayer_keystore_password $_AGGKIT_CONFIG_FILE "." SequencerPrivateKeyPassword
     fi
-    export_key_from_toml_file zkevm_bridge_address $_CDK_CONFIG_FILE BridgeL1Sync BridgeAddr
+    export_key_from_toml_file zkevm_bridge_address $_AGGKIT_CONFIG_FILE BridgeL1Sync BridgeAddr
     if [ $? -ne 0 ]; then
-        export_key_from_toml_file_or_fatal zkevm_bridge_address $_CDK_CONFIG_FILE "." polygonBridgeAddr
+        export_key_from_toml_file_or_fatal zkevm_bridge_address $_AGGKIT_CONFIG_FILE "." polygonBridgeAddr
     fi
     export is_cdk_validium=$zkevm_is_validium
     export zkevm_rollup_chain_id=$l2_chain_id

diff --git a/sync/mock_evm_downloader_full.go b/sync/mock_evm_downloader_full.go
-Original file line number
+Diff line change
@@ Expand Up / @@ -71,7 +71,6 @@ jobs: @@
             env:
               ARCH: amd64
           - name: Release aggkit Packages
             uses: softprops/action-gh-release@v2
             with:
@@ Expand Down @@