diff --git a/.github/workflows/deploy_and_release.yml b/.github/workflows/deploy_and_release.yml
index 14de8b8..bdc4926 100644
--- a/.github/workflows/deploy_and_release.yml
+++ b/.github/workflows/deploy_and_release.yml
@@ -84,7 +84,7 @@ jobs:
           result-encoding: string
           script: |
             const tag = process.env.GITHUB_REF_NAME;
-            const regex = /v.*\-(eth|hteth|matic|tmatic|bsc|tbsc|arbeth|tarbeth|opeth|topeth|zketh|tzketh|baseeth|tbaseeth|bera|tbera|tavaxc|avaxc|toas|oas|tcoredao|coredao|tflr|flr|tsgb|sgb|txdc|xdc|twemix|wemix|tmon|mon|tstt|stt|tsoneium|soneium|world|tworld|tctc|ctc|tapechain|apechain|tphrs|phrs|thypeevm|hypeevm|tsonic|sonic|seievm|tseievm|kaia|tkaia|irys|tirys|tlineaeth|lineaeth|ip|tip|plasma|tplasma|kavaevm|tkavaevm|plume|tplume|zksyncera|tzksyncera|tog|og|flow|tflow|megaeth|tmegaeth|hbarevm|thbarevm|fluenteth|tfluenteth|mantle|tmantle|dogeos|tdogeos|opBNB|topBNB|jovayeth|tjovayeth|okb|tokb|ftm|morpheth|tmorpheth|arcusdc|tarcusdc|chiliz|tchiliz|hemieth|themieth|unichain|tunichain|hpp|thpp|hoodeth|thoodeth|h|th|usdt0|tusdt0)$/;
+            const regex = /v.*\-(eth|hteth|matic|tmatic|bsc|tbsc|arbeth|tarbeth|opeth|topeth|zketh|tzketh|baseeth|tbaseeth|bera|tbera|tavaxc|avaxc|toas|oas|tcoredao|coredao|tflr|flr|tsgb|sgb|txdc|xdc|twemix|wemix|tmon|mon|tstt|stt|tsoneium|soneium|world|tworld|tctc|ctc|tapechain|apechain|tphrs|phrs|thypeevm|hypeevm|tsonic|sonic|seievm|tseievm|kaia|tkaia|irys|tirys|tlineaeth|lineaeth|ip|tip|plasma|tplasma|kavaevm|tkavaevm|plume|tplume|zksyncera|tzksyncera|tog|og|flow|tflow|megaeth|tmegaeth|hbarevm|thbarevm|fluenteth|tfluenteth|mantle|tmantle|dogeos|tdogeos|opBNB|topBNB|jovayeth|tjovayeth|okb|tokb|ftm|morpheth|tmorpheth|arcusdc|tarcusdc|chiliz|tchiliz|hemieth|themieth|unichain|tunichain|hpp|thpp|hoodeth|thoodeth|h|th|usdt0|tusdt0|xtzevm|txtzevm)$/;
             const network = tag.match(regex);
             return network ? network[1] : "hteth";
   preview:
@@ -117,7 +117,7 @@ jobs:
   deploy-to-test:
     runs-on: ubuntu-latest
     needs: [lint-and-test, get-network, preview]
-    if: ${{ (needs.get-network.outputs.network == 'hteth' ) || (needs.get-network.outputs.network == 'tmatic' ) || (needs.get-network.outputs.network == 'tbsc' ) || (needs.get-network.outputs.network == 'tarbeth' ) || (needs.get-network.outputs.network == 'topeth' ) || (needs.get-network.outputs.network == 'tzketh' ) || (needs.get-network.outputs.network == 'tbaseeth' ) || (needs.get-network.outputs.network == 'tbera' ) || (needs.get-network.outputs.network == 'tavaxc' ) || (needs.get-network.outputs.network == 'toas' ) || (needs.get-network.outputs.network == 'tcoredao' ) || (needs.get-network.outputs.network == 'tflr' ) || (needs.get-network.outputs.network == 'tsgb' ) || (needs.get-network.outputs.network == 'txdc' ) || (needs.get-network.outputs.network == 'twemix' ) || (needs.get-network.outputs.network == 'tmon' ) || (needs.get-network.outputs.network == 'tstt' ) || (needs.get-network.outputs.network == 'tsoneium' ) || (needs.get-network.outputs.network == 'tworld' ) || (needs.get-network.outputs.network == 'tctc' ) || (needs.get-network.outputs.network == 'tapechain' ) || (needs.get-network.outputs.network == 'tphrs' ) || (needs.get-network.outputs.network == 'thypeevm' ) || (needs.get-network.outputs.network == 'tsonic' )|| (needs.get-network.outputs.network == 'tseievm' ) || (needs.get-network.outputs.network == 'tkaia' ) || (needs.get-network.outputs.network == 'tirys' ) || (needs.get-network.outputs.network == 'tlineaeth' ) || (needs.get-network.outputs.network == 'tip' ) || (needs.get-network.outputs.network == 'tplasma' ) || (needs.get-network.outputs.network == 'tog' ) || (needs.get-network.outputs.network == 'tkavaevm' ) || (needs.get-network.outputs.network == 'tplume') || (needs.get-network.outputs.network == 'tzksyncera') || (needs.get-network.outputs.network == 'tflow') || (needs.get-network.outputs.network == 'tmegaeth') || (needs.get-network.outputs.network == 'thbarevm') || (needs.get-network.outputs.network == 'tfluenteth') || (needs.get-network.outputs.network == 'tmantle') || (needs.get-network.outputs.network == 'tdogeos') || (needs.get-network.outputs.network == 'topBNB') || (needs.get-network.outputs.network == 'tjovayeth') || (needs.get-network.outputs.network == 'tokb') || (needs.get-network.outputs.network == 'tarcusdc') || (needs.get-network.outputs.network == 'tmorpheth') || (needs.get-network.outputs.network == 'tchiliz') || (needs.get-network.outputs.network == 'themieth') || (needs.get-network.outputs.network == 'tunichain') || (needs.get-network.outputs.network == 'thpp') || (needs.get-network.outputs.network == 'th') || (needs.get-network.outputs.network == 'thoodeth') || (needs.get-network.outputs.network == 'tudst0}}
+    if: ${{ (needs.get-network.outputs.network == 'hteth' ) || (needs.get-network.outputs.network == 'tmatic' ) || (needs.get-network.outputs.network == 'tbsc' ) || (needs.get-network.outputs.network == 'tarbeth' ) || (needs.get-network.outputs.network == 'topeth' ) || (needs.get-network.outputs.network == 'tzketh' ) || (needs.get-network.outputs.network == 'tbaseeth' ) || (needs.get-network.outputs.network == 'tbera' ) || (needs.get-network.outputs.network == 'tavaxc' ) || (needs.get-network.outputs.network == 'toas' ) || (needs.get-network.outputs.network == 'tcoredao' ) || (needs.get-network.outputs.network == 'tflr' ) || (needs.get-network.outputs.network == 'tsgb' ) || (needs.get-network.outputs.network == 'txdc' ) || (needs.get-network.outputs.network == 'twemix' ) || (needs.get-network.outputs.network == 'tmon' ) || (needs.get-network.outputs.network == 'tstt' ) || (needs.get-network.outputs.network == 'tsoneium' ) || (needs.get-network.outputs.network == 'tworld' ) || (needs.get-network.outputs.network == 'tctc' ) || (needs.get-network.outputs.network == 'tapechain' ) || (needs.get-network.outputs.network == 'tphrs' ) || (needs.get-network.outputs.network == 'thypeevm' ) || (needs.get-network.outputs.network == 'tsonic' )|| (needs.get-network.outputs.network == 'tseievm' ) || (needs.get-network.outputs.network == 'tkaia' ) || (needs.get-network.outputs.network == 'tirys' ) || (needs.get-network.outputs.network == 'tlineaeth' ) || (needs.get-network.outputs.network == 'tip' ) || (needs.get-network.outputs.network == 'tplasma' ) || (needs.get-network.outputs.network == 'tog' ) || (needs.get-network.outputs.network == 'tkavaevm' ) || (needs.get-network.outputs.network == 'tplume') || (needs.get-network.outputs.network == 'tzksyncera') || (needs.get-network.outputs.network == 'tflow') || (needs.get-network.outputs.network == 'tmegaeth') || (needs.get-network.outputs.network == 'thbarevm') || (needs.get-network.outputs.network == 'tfluenteth') || (needs.get-network.outputs.network == 'tmantle') || (needs.get-network.outputs.network == 'tdogeos') || (needs.get-network.outputs.network == 'topBNB') || (needs.get-network.outputs.network == 'tjovayeth') || (needs.get-network.outputs.network == 'tokb') || (needs.get-network.outputs.network == 'tarcusdc') || (needs.get-network.outputs.network == 'tmorpheth') || (needs.get-network.outputs.network == 'tchiliz') || (needs.get-network.outputs.network == 'themieth') || (needs.get-network.outputs.network == 'tunichain') || (needs.get-network.outputs.network == 'thpp') || (needs.get-network.outputs.network == 'th') || (needs.get-network.outputs.network == 'thoodeth') || (needs.get-network.outputs.network == 'tudst0) || (needs.get-network.outputs.network == 'txtzevm') }}
     environment: testnet
     steps:
       - uses: actions/checkout@v2
@@ -213,7 +213,7 @@ jobs:
   deploy-to-prod:
     runs-on: ubuntu-latest
     needs: [lint-and-test, get-network, preview]
-    if: ${{ (needs.get-network.outputs.network == 'eth' ) || (needs.get-network.outputs.network == 'matic' ) || (needs.get-network.outputs.network == 'bsc' ) || (needs.get-network.outputs.network == 'arbeth' ) || (needs.get-network.outputs.network == 'opeth' ) || (needs.get-network.outputs.network == 'zketh' ) || (needs.get-network.outputs.network == 'baseeth' ) || (needs.get-network.outputs.network == 'bera' ) || (needs.get-network.outputs.network == 'avaxc' ) || (needs.get-network.outputs.network == 'coredao' ) || (needs.get-network.outputs.network == 'oas' ) || (needs.get-network.outputs.network == 'flr' ) || (needs.get-network.outputs.network == 'sgb' ) || (needs.get-network.outputs.network == 'xdc' ) || (needs.get-network.outputs.network == 'wemix' )  || (needs.get-network.outputs.network == 'mon' ) || (needs.get-network.outputs.network == 'stt' ) || (needs.get-network.outputs.network == 'soneium' ) || (needs.get-network.outputs.network == 'world' ) || (needs.get-network.outputs.network == 'ctc' ) || (needs.get-network.outputs.network == 'apechain' ) || (needs.get-network.outputs.network == 'phrs' ) || (needs.get-network.outputs.network == 'hypeevm' ) || (needs.get-network.outputs.network == 'sonic' ) || (needs.get-network.outputs.network == 'seievm' ) || (needs.get-network.outputs.network == 'kaia' ) || (needs.get-network.outputs.network == 'irys' ) || (needs.get-network.outputs.network == 'lineaeth' ) || (needs.get-network.outputs.network == 'ip' ) || (needs.get-network.outputs.network == 'plasma' ) || (needs.get-network.outputs.network == 'kavaevm' ) || (needs.get-network.outputs.network == 'og' ) || (needs.get-network.outputs.network == 'plume') || (needs.get-network.outputs.network == 'zksyncera') || (needs.get-network.outputs.network == 'flow') || (needs.get-network.outputs.network == 'megaeth') || (needs.get-network.outputs.network == 'hbarevm') || (needs.get-network.outputs.network == 'fluenteth') || (needs.get-network.outputs.network == 'mantle') || (needs.get-network.outputs.network == 'dogeos') || (needs.get-network.outputs.network == 'opBNB') || (needs.get-network.outputs.network == 'jovayeth') || (needs.get-network.outputs.network == 'okb') || (needs.get-network.outputs.network == 'ftm') || (needs.get-network.outputs.network == 'arcusdc') || (needs.get-network.outputs.network == 'morpheth') || (needs.get-network.outputs.network == 'chiliz') || (needs.get-network.outputs.network == 'hemieth') || (needs.get-network.outputs.network == 'unichain') || (needs.get-network.outputs.network == 'hpp') || (needs.get-network.outputs.network == 'h') || (needs.get-network.outputs.network == 'hoodeth') || (needs.get-network.outputs.network == 'usdt0') }}
+    if: ${{ (needs.get-network.outputs.network == 'eth' ) || (needs.get-network.outputs.network == 'matic' ) || (needs.get-network.outputs.network == 'bsc' ) || (needs.get-network.outputs.network == 'arbeth' ) || (needs.get-network.outputs.network == 'opeth' ) || (needs.get-network.outputs.network == 'zketh' ) || (needs.get-network.outputs.network == 'baseeth' ) || (needs.get-network.outputs.network == 'bera' ) || (needs.get-network.outputs.network == 'avaxc' ) || (needs.get-network.outputs.network == 'coredao' ) || (needs.get-network.outputs.network == 'oas' ) || (needs.get-network.outputs.network == 'flr' ) || (needs.get-network.outputs.network == 'sgb' ) || (needs.get-network.outputs.network == 'xdc' ) || (needs.get-network.outputs.network == 'wemix' )  || (needs.get-network.outputs.network == 'mon' ) || (needs.get-network.outputs.network == 'stt' ) || (needs.get-network.outputs.network == 'soneium' ) || (needs.get-network.outputs.network == 'world' ) || (needs.get-network.outputs.network == 'ctc' ) || (needs.get-network.outputs.network == 'apechain' ) || (needs.get-network.outputs.network == 'phrs' ) || (needs.get-network.outputs.network == 'hypeevm' ) || (needs.get-network.outputs.network == 'sonic' ) || (needs.get-network.outputs.network == 'seievm' ) || (needs.get-network.outputs.network == 'kaia' ) || (needs.get-network.outputs.network == 'irys' ) || (needs.get-network.outputs.network == 'lineaeth' ) || (needs.get-network.outputs.network == 'ip' ) || (needs.get-network.outputs.network == 'plasma' ) || (needs.get-network.outputs.network == 'kavaevm' ) || (needs.get-network.outputs.network == 'og' ) || (needs.get-network.outputs.network == 'plume') || (needs.get-network.outputs.network == 'zksyncera') || (needs.get-network.outputs.network == 'flow') || (needs.get-network.outputs.network == 'megaeth') || (needs.get-network.outputs.network == 'hbarevm') || (needs.get-network.outputs.network == 'fluenteth') || (needs.get-network.outputs.network == 'mantle') || (needs.get-network.outputs.network == 'dogeos') || (needs.get-network.outputs.network == 'opBNB') || (needs.get-network.outputs.network == 'jovayeth') || (needs.get-network.outputs.network == 'okb') || (needs.get-network.outputs.network == 'ftm') || (needs.get-network.outputs.network == 'arcusdc') || (needs.get-network.outputs.network == 'morpheth') || (needs.get-network.outputs.network == 'chiliz') || (needs.get-network.outputs.network == 'hemieth') || (needs.get-network.outputs.network == 'unichain') || (needs.get-network.outputs.network == 'hpp') || (needs.get-network.outputs.network == 'h') || (needs.get-network.outputs.network == 'hoodeth') || (needs.get-network.outputs.network == 'usdt0') || (needs.get-network.outputs.network == 'xtzevm') }}
     environment: mainnet
     steps:
       - uses: actions/checkout@v2
diff --git a/.github/workflows/deploy_batcher_contract.yml b/.github/workflows/deploy_batcher_contract.yml
index fe7955c..7dc2221 100644
--- a/.github/workflows/deploy_batcher_contract.yml
+++ b/.github/workflows/deploy_batcher_contract.yml
@@ -81,7 +81,7 @@ jobs:
           result-encoding: string
           script: |
             const tag = process.env.GITHUB_REF_NAME;
-            const regex = /v.*\-(eth|hteth|matic|tmatic|bsc|tbsc|arbeth|tarbeth|opeth|topeth|zketh|tzketh|baseeth|tbaseeth|bera|tbera|tavaxc|avaxc|toas|oas|tcoredao|coredao|flr|tflr|sgb|tsgb|txdc|xdc|twemix|wemix|tmon|mon|tstt|stt|tsoneium|soneium|tworld|world|tctc|ctc|tapechain|apechain|tphrs|phrs|thypeevm|hypeevm|tsonic|sonic|seievm|tseievm|kaia|tkaia|irys|tirys|lineaeth|tlineaeth|tip|ip|tplasma|plasma|kavaevm|tkavaevm|plume|tplume|zksyncera|tzksyncera|tog|og|tflow|flow|megaeth|tmegaeth|hbarevm|thbarevm|fluenteth|tfluenteth|mantle|tmantle|dogeos|tdogeos|jovayeth|tjovayeth|okb|tokb|morpheth|tmorpheth|arcusdc|tarcusdc|chiliz|tchiliz|hemieth|themieth|unichain|tunichain|hpp|thpp|hoodeth|thoodeth|h|th|usdt0|tusdt0)$/;
+            const regex = /v.*\-(eth|hteth|matic|tmatic|bsc|tbsc|arbeth|tarbeth|opeth|topeth|zketh|tzketh|baseeth|tbaseeth|bera|tbera|tavaxc|avaxc|toas|oas|tcoredao|coredao|flr|tflr|sgb|tsgb|txdc|xdc|twemix|wemix|tmon|mon|tstt|stt|tsoneium|soneium|tworld|world|tctc|ctc|tapechain|apechain|tphrs|phrs|thypeevm|hypeevm|tsonic|sonic|seievm|tseievm|kaia|tkaia|irys|tirys|lineaeth|tlineaeth|tip|ip|tplasma|plasma|kavaevm|tkavaevm|plume|tplume|zksyncera|tzksyncera|tog|og|tflow|flow|megaeth|tmegaeth|hbarevm|thbarevm|fluenteth|tfluenteth|mantle|tmantle|dogeos|tdogeos|jovayeth|tjovayeth|okb|tokb|morpheth|tmorpheth|arcusdc|tarcusdc|chiliz|tchiliz|hemieth|themieth|unichain|tunichain|hpp|thpp|hoodeth|thoodeth|h|th|usdt0|tusdt0|xtzevm|txtzevm)$/;
             const matchedNetwork = tag.match(regex);
             if (!matchedNetwork) {
               console.log("No match found for the network name, defaulting to 'hteth'.");
@@ -112,7 +112,7 @@ jobs:
   deploy-batcher-contract-to-test:
     runs-on: ubuntu-latest
     needs: [lint-and-test, get-network, preview]
-    if: ${{ (needs.get-network.outputs.network == 'hteth' ) || (needs.get-network.outputs.network == 'tmatic' ) || (needs.get-network.outputs.network == 'tbsc' ) || (needs.get-network.outputs.network == 'tarbeth' ) || (needs.get-network.outputs.network == 'topeth' ) || (needs.get-network.outputs.network == 'tzketh' ) || (needs.get-network.outputs.network == 'tbaseeth' ) || (needs.get-network.outputs.network == 'tbera' ) || (needs.get-network.outputs.network == 'tavaxc' ) || (needs.get-network.outputs.network == 'tcoredao' ) || (needs.get-network.outputs.network == 'toas' ) || (needs.get-network.outputs.network == 'tflr' ) || (needs.get-network.outputs.network == 'tsgb' ) || (needs.get-network.outputs.network == 'txdc' ) || (needs.get-network.outputs.network == 'twemix' ) || (needs.get-network.outputs.network == 'tmon' )  || (needs.get-network.outputs.network == 'tstt' ) || (needs.get-network.outputs.network == 'tsoneium' )  || (needs.get-network.outputs.network == 'tworld' ) || (needs.get-network.outputs.network == 'tctc' ) || (needs.get-network.outputs.network == 'tapechain' ) || (needs.get-network.outputs.network == 'tphrs' ) || (needs.get-network.outputs.network == 'thypeevm' ) || (needs.get-network.outputs.network == 'tsonic' ) || (needs.get-network.outputs.network == 'tseievm' ) || (needs.get-network.outputs.network == 'tkaia' ) || (needs.get-network.outputs.network == 'tirys' ) || (needs.get-network.outputs.network == 'tlineaeth' ) || (needs.get-network.outputs.network == 'tip' ) || (needs.get-network.outputs.network == 'tplasma' ) || (needs.get-network.outputs.network == 'tog' ) || (needs.get-network.outputs.network == 'tkavaevm' ) || (needs.get-network.outputs.network == 'tplume') || (needs.get-network.outputs.network == 'tzksyncera') || (needs.get-network.outputs.network == 'tflow' ) || (needs.get-network.outputs.network == 'tmegaeth' ) || (needs.get-network.outputs.network == 'thbarevm' ) || (needs.get-network.outputs.network == 'tfluenteth' ) || (needs.get-network.outputs.network == 'tmantle' ) || (needs.get-network.outputs.network == 'tdogeos') || (needs.get-network.outputs.network == 'tjovayeth') || (needs.get-network.outputs.network == 'tokb') || (needs.get-network.outputs.network == 'tmorpheth') || (needs.get-network.outputs.network == 'tarcusdc') || (needs.get-network.outputs.network == 'tchiliz') || (needs.get-network.outputs.network == 'themieth') || (needs.get-network.outputs.network == 'tunichain') || (needs.get-network.outputs.network == 'thpp') || (needs.get-network.outputs.network == 'th') || (needs.get-network.outputs.network == 'thoodeth') || (needs.get-network.outputs.network == 'tusdt0')}}
+    if: ${{ (needs.get-network.outputs.network == 'hteth' ) || (needs.get-network.outputs.network == 'tmatic' ) || (needs.get-network.outputs.network == 'tbsc' ) || (needs.get-network.outputs.network == 'tarbeth' ) || (needs.get-network.outputs.network == 'topeth' ) || (needs.get-network.outputs.network == 'tzketh' ) || (needs.get-network.outputs.network == 'tbaseeth' ) || (needs.get-network.outputs.network == 'tbera' ) || (needs.get-network.outputs.network == 'tavaxc' ) || (needs.get-network.outputs.network == 'tcoredao' ) || (needs.get-network.outputs.network == 'toas' ) || (needs.get-network.outputs.network == 'tflr' ) || (needs.get-network.outputs.network == 'tsgb' ) || (needs.get-network.outputs.network == 'txdc' ) || (needs.get-network.outputs.network == 'twemix' ) || (needs.get-network.outputs.network == 'tmon' )  || (needs.get-network.outputs.network == 'tstt' ) || (needs.get-network.outputs.network == 'tsoneium' )  || (needs.get-network.outputs.network == 'tworld' ) || (needs.get-network.outputs.network == 'tctc' ) || (needs.get-network.outputs.network == 'tapechain' ) || (needs.get-network.outputs.network == 'tphrs' ) || (needs.get-network.outputs.network == 'thypeevm' ) || (needs.get-network.outputs.network == 'tsonic' ) || (needs.get-network.outputs.network == 'tseievm' ) || (needs.get-network.outputs.network == 'tkaia' ) || (needs.get-network.outputs.network == 'tirys' ) || (needs.get-network.outputs.network == 'tlineaeth' ) || (needs.get-network.outputs.network == 'tip' ) || (needs.get-network.outputs.network == 'tplasma' ) || (needs.get-network.outputs.network == 'tog' ) || (needs.get-network.outputs.network == 'tkavaevm' ) || (needs.get-network.outputs.network == 'tplume') || (needs.get-network.outputs.network == 'tzksyncera') || (needs.get-network.outputs.network == 'tflow' ) || (needs.get-network.outputs.network == 'tmegaeth' ) || (needs.get-network.outputs.network == 'thbarevm' ) || (needs.get-network.outputs.network == 'tfluenteth' ) || (needs.get-network.outputs.network == 'tmantle' ) || (needs.get-network.outputs.network == 'tdogeos') || (needs.get-network.outputs.network == 'tjovayeth') || (needs.get-network.outputs.network == 'tokb') || (needs.get-network.outputs.network == 'tmorpheth') || (needs.get-network.outputs.network == 'tarcusdc') || (needs.get-network.outputs.network == 'tchiliz') || (needs.get-network.outputs.network == 'themieth') || (needs.get-network.outputs.network == 'tunichain') || (needs.get-network.outputs.network == 'thpp') || (needs.get-network.outputs.network == 'th') || (needs.get-network.outputs.network == 'thoodeth') || (needs.get-network.outputs.network == 'tusdt0') ||  (needs.get-network.outputs.network == 'txtzevm')}}
     environment: testnet
     steps:
       - uses: actions/checkout@v4
@@ -184,7 +184,7 @@ jobs:
   deploy-batcher-contract-to-prod:
     runs-on: ubuntu-latest
     needs: [lint-and-test, get-network, preview]
-    if: ${{ (needs.get-network.outputs.network == 'eth' ) || (needs.get-network.outputs.network == 'matic' ) || (needs.get-network.outputs.network == 'bsc' ) || (needs.get-network.outputs.network == 'arbeth' ) || (needs.get-network.outputs.network == 'opeth' ) || (needs.get-network.outputs.network == 'zketh' ) || (needs.get-network.outputs.network == 'baseeth' ) || (needs.get-network.outputs.network == 'bera' ) || (needs.get-network.outputs.network == 'avaxc' ) || (needs.get-network.outputs.network == 'coredao' ) || (needs.get-network.outputs.network == 'oas' ) || (needs.get-network.outputs.network == 'sgb' ) || (needs.get-network.outputs.network == 'flr' ) || (needs.get-network.outputs.network == 'xdc' ) || (needs.get-network.outputs.network == 'wemix' ) || (needs.get-network.outputs.network == 'mon' ) || (needs.get-network.outputs.network == 'stt' ) || (needs.get-network.outputs.network == 'soneium' ) || (needs.get-network.outputs.network == 'world' ) || (needs.get-network.outputs.network == 'ctc' ) || (needs.get-network.outputs.network == 'apechain' ) || (needs.get-network.outputs.network == 'phrs' ) || (needs.get-network.outputs.network == 'hypeevm' ) || (needs.get-network.outputs.network == 'sonic' ) || (needs.get-network.outputs.network == 'seievm' ) || (needs.get-network.outputs.network == 'kaia' ) || (needs.get-network.outputs.network == 'irys' ) || (needs.get-network.outputs.network == 'lineaeth' ) || (needs.get-network.outputs.network == 'ip' ) || (needs.get-network.outputs.network == 'plasma' ) || (needs.get-network.outputs.network == 'kavaevm' ) || (needs.get-network.outputs.network == 'og' ) || (needs.get-network.outputs.network == 'plume' ) || (needs.get-network.outputs.network == 'zksyncera' ) || (needs.get-network.outputs.network == 'flow' ) || (needs.get-network.outputs.network == 'megaeth' ) || (needs.get-network.outputs.network == 'hbarevm' ) || (needs.get-network.outputs.network == 'fluenteth' ) || (needs.get-network.outputs.network == 'mantle' ) || (needs.get-network.outputs.network == 'dogeos') || (needs.get-network.outputs.network == 'jovayeth') || (needs.get-network.outputs.network == 'okb') || (needs.get-network.outputs.network == 'morpheth') || (needs.get-network.outputs.network == 'arcusdc') || (needs.get-network.outputs.network == 'chiliz') || (needs.get-network.outputs.network == 'hemieth') || (needs.get-network.outputs.network == 'unichain') || (needs.get-network.outputs.network == 'hpp') || (needs.get-network.outputs.network == 'h') || (needs.get-network.outputs.network == 'hoodeth') || (needs.get-network.outputs.network == 'usdt0' )}}
+    if: ${{ (needs.get-network.outputs.network == 'eth' ) || (needs.get-network.outputs.network == 'matic' ) || (needs.get-network.outputs.network == 'bsc' ) || (needs.get-network.outputs.network == 'arbeth' ) || (needs.get-network.outputs.network == 'opeth' ) || (needs.get-network.outputs.network == 'zketh' ) || (needs.get-network.outputs.network == 'baseeth' ) || (needs.get-network.outputs.network == 'bera' ) || (needs.get-network.outputs.network == 'avaxc' ) || (needs.get-network.outputs.network == 'coredao' ) || (needs.get-network.outputs.network == 'oas' ) || (needs.get-network.outputs.network == 'sgb' ) || (needs.get-network.outputs.network == 'flr' ) || (needs.get-network.outputs.network == 'xdc' ) || (needs.get-network.outputs.network == 'wemix' ) || (needs.get-network.outputs.network == 'mon' ) || (needs.get-network.outputs.network == 'stt' ) || (needs.get-network.outputs.network == 'soneium' ) || (needs.get-network.outputs.network == 'world' ) || (needs.get-network.outputs.network == 'ctc' ) || (needs.get-network.outputs.network == 'apechain' ) || (needs.get-network.outputs.network == 'phrs' ) || (needs.get-network.outputs.network == 'hypeevm' ) || (needs.get-network.outputs.network == 'sonic' ) || (needs.get-network.outputs.network == 'seievm' ) || (needs.get-network.outputs.network == 'kaia' ) || (needs.get-network.outputs.network == 'irys' ) || (needs.get-network.outputs.network == 'lineaeth' ) || (needs.get-network.outputs.network == 'ip' ) || (needs.get-network.outputs.network == 'plasma' ) || (needs.get-network.outputs.network == 'kavaevm' ) || (needs.get-network.outputs.network == 'og' ) || (needs.get-network.outputs.network == 'plume' ) || (needs.get-network.outputs.network == 'zksyncera' ) || (needs.get-network.outputs.network == 'flow' ) || (needs.get-network.outputs.network == 'megaeth' ) || (needs.get-network.outputs.network == 'hbarevm' ) || (needs.get-network.outputs.network == 'fluenteth' ) || (needs.get-network.outputs.network == 'mantle' ) || (needs.get-network.outputs.network == 'dogeos') || (needs.get-network.outputs.network == 'jovayeth') || (needs.get-network.outputs.network == 'okb') || (needs.get-network.outputs.network == 'morpheth') || (needs.get-network.outputs.network == 'arcusdc') || (needs.get-network.outputs.network == 'chiliz') || (needs.get-network.outputs.network == 'hemieth') || (needs.get-network.outputs.network == 'unichain') || (needs.get-network.outputs.network == 'hpp') || (needs.get-network.outputs.network == 'h') || (needs.get-network.outputs.network == 'hoodeth') || (needs.get-network.outputs.network == 'usdt0' ) || (needs.get-network.outputs.network == 'xtzevm' )}}
     environment: mainnet
     steps:
       - uses: actions/checkout@v4
diff --git a/config/chainIds.ts b/config/chainIds.ts
index c8e053a..969a96f 100644
--- a/config/chainIds.ts
+++ b/config/chainIds.ts
@@ -60,6 +60,7 @@ export const CHAIN_IDS = {
   HPP: 190415,
   H: 6985385,
   USDT0: 988,
+  XTZEVM: 42793,
   HOODETH: 999999, //TODO: update with correct mainnet chain ID when available
 
   // Testnet Networks
@@ -108,6 +109,7 @@ export const CHAIN_IDS = {
   HEMIETH_TESTNET: 743111,
   UNICHAIN_TESTNET: 1301,
   HPP_TESTNET: 181228,
+  XTZEVM_TESTNET: 128123,
   H_TESTNET: 7080969,
   HOODETH_TESTNET: 46630,
   USDT0_TESTNET: 2201
diff --git a/hardhat.config.ts b/hardhat.config.ts
index c4b43b0..1d8051f 100644
--- a/hardhat.config.ts
+++ b/hardhat.config.ts
@@ -149,6 +149,22 @@ const config: HardhatUserConfig = {
         `${PRIVATE_KEY_FOR_BATCHER_CONTRACT_DEPLOYMENT}`
       ]
     },
+  xtzevm: {
+    url: `https://node.mainnet.etherlink.com`,
+    accounts: [
+      `${MAINNET_PRIVATE_KEY_FOR_CONTRACT_DEPLOYMENT}`,
+      `${PLACEHOLDER_KEY}`,
+      `${PRIVATE_KEY_FOR_BATCHER_CONTRACT_DEPLOYMENT}`
+    ]
+  },
+  txtzevm: {
+    url: `https://node.ghostnet.etherlink.com`,
+    accounts: [
+      `${TESTNET_PRIVATE_KEY_FOR_CONTRACT_DEPLOYMENT}`,
+      `${PLACEHOLDER_KEY}`,
+      `${PRIVATE_KEY_FOR_BATCHER_CONTRACT_DEPLOYMENT}`
+    ]
+  },
     topBNB: {
       url: `https://opbnb-testnet-rpc.bnbchain.org`,
       accounts: [
@@ -1565,6 +1581,22 @@ const config: HardhatUserConfig = {
           browserURL: 'https://sepolia.lineascan.build/'
         }
       },
+      {
+        network: 'xtzevmMainnet',
+        chainId: CHAIN_IDS.XTZEVM,
+        urls: {
+          apiURL: `${ETHERSCAN_V2_URL}${CHAIN_IDS.XTZEVM}`,
+          browserURL: 'https://explorer.etherlink.com/'
+        }
+      },
+      {
+        network: 'xtzevmTestnet',
+        chainId: CHAIN_IDS.XTZEVM_TESTNET,
+        urls: {
+          apiURL: `${ETHERSCAN_V2_URL}${CHAIN_IDS.LINEAETH_TESTNET}`,
+          browserURL: 'https://shadownet.explorer.etherlink.com/'
+        }
+      },
       {
         network: 'irysTestnet',
         chainId: CHAIN_IDS.IRYS_TESTNET,
diff --git a/scripts/chainConfig.ts b/scripts/chainConfig.ts
index 32eadd0..1c25942 100644
--- a/scripts/chainConfig.ts
+++ b/scripts/chainConfig.ts
@@ -153,6 +153,8 @@ export async function getChainConfig(chainId: number): Promise<ChainConfig> {
     case CHAIN_IDS.FLARE_TESTNET:
     case CHAIN_IDS.SONEIUM_TESTNET:
     case CHAIN_IDS.SONEIUM:
+    case CHAIN_IDS.XTZEVM:
+    case CHAIN_IDS.XTZEVM_TESTNET:
       gasParams.gasLimit = 5_000_000;
       forwarderContractName = 'ForwarderV4';
       forwarderFactoryContractName = 'ForwarderFactoryV4';