From 5b73e8f632f40f7c25c69a53cbfa285b78c21c9c Mon Sep 17 00:00:00 2001 From: stubbsta Date: Fri, 3 Oct 2025 11:07:56 +0200 Subject: [PATCH] Update docker-compose and deploy_rln_contracts --- deploy_rln_contract.sh | 16 ++++++++-------- docker-compose.yml | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/deploy_rln_contract.sh b/deploy_rln_contract.sh index a60eb95..0a2391b 100644 --- a/deploy_rln_contract.sh +++ b/deploy_rln_contract.sh @@ -39,23 +39,23 @@ export API_KEY_CARDONA=123 export API_KEY_LINEASCAN=123 # 5. Deploy the TestToken Proxy with the TestToken implementation contracts -echo "\nDeploying TestToken Proxy (ERC20 Token Contract)...\n" +printf "\nDeploying TestToken Proxy (ERC20 Token Contract)...\n" DEPLOY_TST_PROXY_OUTPUT=$(ETH_FROM=$ETH_FROM forge script script/DeployTokenWithProxy.s.sol:DeployTokenWithProxy --broadcast -vv --rpc-url http://foundry:8545 --tc TestTokenFactory --private-key $PRIVATE_KEY) PROXY_TOKEN_ADDRESS=$(echo "$DEPLOY_TST_PROXY_OUTPUT" | grep -o "0: address 0x[a-fA-F0-9]\{40\}" | head -n1 | cut -d' ' -f3) export TOKEN_ADDRESS=$PROXY_TOKEN_ADDRESS -echo "\nDeploying LinearPriceCalculator Contract..." +printf "\nDeploying LinearPriceCalculator Contract...\n" forge script script/Deploy.s.sol --broadcast -vv --rpc-url http://foundry:8545 --tc DeployPriceCalculator --private-key $PRIVATE_KEY -echo "\nDeploying RLN contract..." +printf "\nDeploying RLN contract...\n" forge script script/Deploy.s.sol --broadcast -vv --rpc-url http://foundry:8545 --tc DeployWakuRlnV2 --private-key $PRIVATE_KEY -echo "\nDeploying Proxy contract..." +printf "\nDeploying Proxy contract...\n" DEPLOY_WAKURLN_PROXY_OUTPUT=$(ETH_FROM=$ETH_FROM forge script script/Deploy.s.sol --broadcast -vvv --rpc-url http://foundry:8545 --tc DeployProxy --private-key $PRIVATE_KEY) export RLN_CONTRACT_ADDRESS=$(echo "$DEPLOY_WAKURLN_PROXY_OUTPUT" | grep -o "0: address 0x[a-fA-F0-9]\{40\}" | head -n1 | cut -d' ' -f3) # 6. Contract deployment completed -echo "\nContract deployment completed successfully" -echo "TOKEN_ADDRESS: $TOKEN_ADDRESS" -echo "RLN_CONTRACT_ADDRESS: $RLN_CONTRACT_ADDRESS" -echo "\nEach account registering a membership needs to first mint the token and approve the contract to spend it on their behalf." \ No newline at end of file +printf "\nContract deployment completed successfully" +printf "\nTOKEN_ADDRESS: $TOKEN_ADDRESS" +printf "\nRLN_CONTRACT_ADDRESS: $RLN_CONTRACT_ADDRESS" +printf "\nEach account registering a membership needs to first mint the token and approve the contract to spend it on their behalf." \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 5bc86df..c28cdd9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -40,7 +40,7 @@ services: labels: com.centurylinklabs.watchtower.enable: '${WATCHTOWER_ENABLED:-false}' environment: - - RLN_CONTRACT_REPO_COMMIT=${RLN_CONTRACT_REPO_COMMIT:-ad0dc9a81d892864ac2576d74e628ce93da592ef} + - RLN_CONTRACT_REPO_COMMIT=${RLN_CONTRACT_REPO_COMMIT:-e75ac913e579ad872f54b2225eec35d1de3d98b0} - PRIVATE_KEY=${PRIVATE_KEY} - RPC_URL=${RPC_URL:-http://foundry:8545} - ETH_FROM=${ETH_FROM}