feat: bridge ERC20 tokens

.github/workflows/integration-test.yml

@@ -163,8 +163,10 @@ jobs:
           export ZKSYNC_CHAIN_ID=${{vars.ZKSYNC_CHAIN_ID}}
           export STARKNET_CLAIM_PAYMENT_SELECTOR=${{vars.STARKNET_CLAIM_PAYMENT_SELECTOR}}
           export STARKNET_CLAIM_PAYMENT_BATCH_SELECTOR=${{vars.STARKNET_CLAIM_PAYMENT_BATCH_SELECTOR}}
+          export STARKNET_CLAIM_PAYMENT_ERC20_SELECTOR=${{vars.STARKNET_CLAIM_PAYMENT_ERC20_SELECTOR}}
           export ZKSYNC_CLAIM_PAYMENT_SELECTOR=${{vars.ZKSYNC_CLAIM_PAYMENT_SELECTOR}}
           export ZKSYNC_CLAIM_PAYMENT_BATCH_SELECTOR=${{vars.ZKSYNC_CLAIM_PAYMENT_BATCH_SELECTOR}}
+          export ZKSYNC_CLAIM_PAYMENT_ERC20_SELECTOR=${{vars.ZKSYNC_CLAIM_PAYMENT_ERC20_SELECTOR}}
           export SKIP_VERIFY=true
           . ./contracts/ethereum/deploy.sh
 

Makefile

@@ -42,6 +42,9 @@ ethereum-upgrade: ethereum-build
 ethereum-set-escrow:
 	@. ./contracts/ethereum/.env && . ./contracts/ethereum/set_starknet_escrow.sh
 
+ethereum-deploy-erc20: ethereum-build
+	@. ./contracts/ethereum/.env && . ./contracts/ethereum/deploy_erc20.sh
+
 
 ### STARKNET ###
 
@@ -75,6 +78,9 @@ starknet-pause:
 starknet-unpause:
 	@. ./contracts/starknet/.env && . ./contracts/starknet/scripts/change_pause_state.sh unpause
 
+starknet-deploy-erc20: starknet-build
+	@. ./contracts/starknet/.env && . ./contracts/starknet/scripts/deploy_erc20.sh
+
 
 ### ZKSYNC ###
 
@@ -113,6 +119,10 @@ zksync-test-integration:
 	. ./contracts/zksync/test/transfer.sh && \
 	. ./contracts/zksync/test/claim_payment.sh
 
+zksync-deploy-erc20:
+	@make zksync-build && \
+	. ./contracts/zksync/deploy_erc20.sh
+
 # zksync-upgrade: WIP
 
 
@@ -141,15 +151,15 @@ ethereum-and-starknet-deploy:
 deploy-all:
 	@. ./contracts/ethereum/.env && . ./contracts/starknet/.env && . ./contracts/zksync/.env && \
 	make ethereum-build && \
-	. ./contracts/ethereum/deploy.sh && \
 	make starknet-build && \
+	make zksync-build && \
+	. ./contracts/ethereum/deploy.sh && \
 	. ./contracts/starknet/scripts/deploy.sh && \
 	. ./contracts/ethereum/set_starknet_escrow.sh && \
-	. ./contracts/utils/display_info.sh && \
-	make zksync-build && \
 	. ./contracts/zksync/deploy.sh && \
-	. ./contracts/ethereum/set_zksync_escrow.sh
-
+	. ./contracts/ethereum/set_zksync_escrow.sh && \
+	. ./contracts/utils/display_info.sh
+
 test: 
 	make starknet-test
 	make ethereum-test

contracts/ethereum/.env.example

@@ -10,8 +10,10 @@ ZKSYNC_DIAMOND_PROXY_ADDRESS=<0x9A6DE0f62Aa270A8bCB1e2610078650D539B1Ef9> # Sepo
 
 STARKNET_CLAIM_PAYMENT_SELECTOR=<0x03636c566f6409560d55d5f6d1eb4ee163b096b4698c503e69e210be79de2afa> #hex value of starknet's claim_payment selector
 STARKNET_CLAIM_PAYMENT_BATCH_SELECTOR=<0x0354a01e49fe07e43306a97ed84dbd5de8238c7d8ff616caa3444630cfc559e6> #hex value of starknet's claim_payment_batch selector
+STARKNET_CLAIM_PAYMENT_ERC20_SELECTOR=<0x0091ec2842317cd03601c3f46ee8ebc9b1dc6cdbc96cb7b0873cc6360538d754> #hex value of starknet's claim_payment_erc20 selector
 ZKSYNC_CLAIM_PAYMENT_SELECTOR=<0xa5168739> #hex value of ZKSync's claim_payment selctor
 ZKSYNC_CLAIM_PAYMENT_BATCH_SELECTOR=<0x156be1ae> #hex value of ZKSync's claim_payment_batch selctor
+ZKSYNC_CLAIM_PAYMENT_ERC20_SELECTOR=<0xb9738dd6> #hex value of ZKSync's claim_payment_erc20 selctor
 
 STARKNET_CHAIN_ID=<0x534e5f5345504f4c4941|0x534e5f4d41494e> #Sepolia | Mainnet
 ZKSYNC_CHAIN_ID=<300|324> # Sepolia | Mainnet

contracts/ethereum/.env.test

@@ -6,7 +6,10 @@ MM_ETHEREUM_ADDRESS=0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266
 SKIP_VERIFY=true
 STARKNET_CLAIM_PAYMENT_SELECTOR=0x03636c566f6409560d55d5f6d1eb4ee163b096b4698c503e69e210be79de2afa
 STARKNET_CLAIM_PAYMENT_BATCH_SELECTOR=0x0354a01e49fe07e43306a97ed84dbd5de8238c7d8ff616caa3444630cfc559e6
+STARKNET_CLAIM_PAYMENT_ERC20_SELECTOR=0x0091ec2842317cd03601c3f46ee8ebc9b1dc6cdbc96cb7b0873cc6360538d754
 ZKSYNC_CLAIM_PAYMENT_SELECTOR=0xa5168739
 ZKSYNC_CLAIM_PAYMENT_BATCH_SELECTOR=0x156be1ae
+ZKSYNC_CLAIM_PAYMENT_ERC20_SELECTOR=0xb9738dd6
+
 STARKNET_CHAIN_ID=0x534e5f5345504f4c4941
 ZKSYNC_CHAIN_ID=300

contracts/ethereum/deploy_erc20.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+. contracts/utils/colors.sh #for ANSI colors
+
+cd contracts/ethereum
+
+printf "${GREEN}\n=> [ETH] Deploying ERC20 ${COLOR_RESET}\n"
+
+
+export ETHEREUM_PRIVATE_KEY=$ETHEREUM_PRIVATE_KEY
+
+RESULT_LOG=$(forge script ./script/Deploy_ERC20.s.sol --rpc-url $ETHEREUM_RPC --broadcast ${SKIP_VERIFY:---verify})
+# echo "$RESULT_LOG" #uncomment this line for debugging in detail
+
+# Getting result addresses
+ERC20_ADDRESS=$(echo "$RESULT_LOG" | grep -Eo '0: address ([^\n]+)' | awk '{print $NF}')
+
+if [ -z "$ERC20_ADDRESS" ]; then
+    printf "\n${RED}ERROR:${COLOR_RESET}\n"
+    echo "ERC20_ADDRESS Variable is empty. Aborting execution.\n"
+    exit 1
+fi
+
+printf "${GREEN}\n=> [ETH] Deployed ERC20 address: $ERC20_ADDRESS ${COLOR_RESET}\n"
+
+cd ../.. #to reset working directory