Skip to content

Commit bdcbbe4

Browse files
Le-CaignecLe-Caignec
committed
refactor: standardize naming for arbitrumSepolia across deployment scripts and configuration
1 parent 2ef85a0 commit bdcbbe4

File tree

4 files changed

+22
-46
lines changed

4 files changed

+22
-46
lines changed

‎.github/workflows/deploy.yml‎

Lines changed: 14 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -14,47 +14,23 @@ on:
1414
- arbitrumSepolia
1515
- arbitrum
1616
default: 'anvil'
17-
environment:
18-
description: 'Environment'
19-
required: true
20-
type: choice
21-
options:
22-
- testnets
23-
- mainnets
24-
default: 'testnets'
2517

2618
jobs:
2719

28-
# Validate deployment network and environment.
29-
validate:
30-
runs-on: ubuntu-latest
31-
steps:
32-
# On Github, the environment `mainnets` is restricted to
33-
# the main branch. Here we check that it's only used with
34-
# mainnet networks.
35-
- name: Validate mainnet deployment
36-
run: |
37-
if [[ "${{ inputs.environment }}" == "mainnets" && "${{ inputs.network }}" != "arbitrum" && "${{ inputs.network }}" != "ethereum" ]]; then
38-
echo "::error::mainnets environment can only be used with mainnet networks (ethereum, arbitrum)."
39-
exit 1
40-
fi
41-
echo "Deploying to network '${{ inputs.network }}' with environment '${{ inputs.environment }}'."
42-
4320
# Build and test before deploying.
4421
ci:
45-
needs: validate
4622
uses: ./.github/workflows/main.yml
4723
secrets:
48-
SEPOLIA_RPC_URL: ${{ secrets.SEPOLIA_RPC_URL }}
49-
ARBITRUM_SEPOLIA_RPC_URL: ${{ secrets.ARBITRUM_SEPOLIA_RPC_URL }}
24+
SEPOLIA_RPC_URL: ${{ vars.SEPOLIA_RPC_URL }}
25+
ARBITRUM_SEPOLIA_RPC_URL: ${{ vars.ARBITRUM_SEPOLIA_RPC_URL }}
5026

5127
# Deploy and verify contract.
5228
deploy:
5329
needs: ci
5430
runs-on: ubuntu-latest
5531
permissions:
5632
contents: write # Required to commit deployment files.
57-
environment: ${{ inputs.environment }}
33+
environment: ${{ inputs.network }}
5834
steps:
5935
- uses: actions/checkout@v4
6036
with:
@@ -71,31 +47,31 @@ jobs:
7147
env:
7248
CI: true
7349
PRIVATE_KEY: ${{ secrets.DEPLOYER_PRIVATE_KEY }}
74-
SEPOLIA_RPC_URL: ${{ secrets.SEPOLIA_RPC_URL }}
75-
ARBITRUM_SEPOLIA_RPC_URL: ${{ secrets.ARBITRUM_SEPOLIA_RPC_URL }}
76-
ANVIL_SEPOLIA_RPC_URL: http://localhost:8545
77-
ANVIL_ARBITRUM_SEPOLIA_RPC_URL: http://localhost:8546
50+
SEPOLIA_RPC_URL: ${{ vars.SEPOLIA_RPC_URL }}
51+
ARBITRUM_SEPOLIA_RPC_URL: ${{ vars.ARBITRUM_SEPOLIA_RPC_URL }}
52+
ANVIL_SEPOLIA_RPC_URL: ${{ vars.ANVIL_SEPOLIA_RPC_URL }}
53+
ANVIL_ARBITRUM_SEPOLIA_RPC_URL: ${{ vars.ANVIL_ARBITRUM_SEPOLIA_RPC_URL }}
7854
run: |
7955
make fork-sepolia & make fork-arbitrum-sepolia & sleep 10 && make deploy-on-anvil
8056
81-
- name: Deploy contracts on Ethereum Mainnet or Sepolia
57+
- name: Deploy contracts on Sepolia/EthereumMainnet
8258
if: inputs.network == 'sepolia' || inputs.network == 'ethereum'
8359
env:
8460
CI: true
8561
PRIVATE_KEY: ${{ secrets.DEPLOYER_PRIVATE_KEY }}
8662
CHAIN: ${{ inputs.network }}
87-
RPC_URL: ${{ inputs.network == 'sepolia' && secrets.SEPOLIA_RPC_URL || secrets.ETHEREUM_RPC_URL }}
63+
RPC_URL: ${{ secrets.RPC_URL }}
8864
run: |
8965
CONTRACT=RLCLiquidityUnifier make deploy-contract
9066
CONTRACT=bridges/layerZero/IexecLayerZeroBridge make deploy-contract
9167
92-
- name: Deploy contracts on Arbitrum/Arbitrum Sepolia (L2)
93-
if: inputs.network == 'arbitrumSepolia' || inputs.network == 'arbitrum'
68+
- name: Deploy contracts on ChainX
69+
if: inputs.network != 'sepolia' && inputs.network != 'ethereum'
9470
env:
9571
CI: true
9672
PRIVATE_KEY: ${{ secrets.DEPLOYER_PRIVATE_KEY }}
97-
CHAIN: ${{ inputs.network == 'arbitrumSepolia' && 'arbitrum_sepolia' || 'arbitrum' }}
98-
RPC_URL: ${{ inputs.network == 'arbitrumSepolia' && secrets.ARBITRUM_SEPOLIA_RPC_URL || secrets.ARBITRUM_RPC_URL }}
73+
CHAIN: ${{ inputs.network }}
74+
RPC_URL: ${{ secrets.RPC_URL }}
9975
run: |
10076
CONTRACT=RLCCrosschainToken make deploy-contract
10177
CONTRACT=bridges/layerZero/IexecLayerZeroBridge make deploy-contract
@@ -104,7 +80,7 @@ jobs:
10480
if: inputs.network != 'anvil'
10581
uses: stefanzweifel/git-auto-commit-action@v5
10682
with:
107-
commit_message: 'chore: save deployment artifacts for ${{ inputs.network }} (${{ inputs.environment }}, ${{ github.run_id }})'
83+
commit_message: 'chore: save deployment artifacts for ${{ inputs.network }} (${{ github.run_id }})'
10884
file_pattern: 'config/config.json broadcast/'
10985
commit_user_name: 'GitHub Actions Bot'
11086
commit_user_email: 'github-actions[bot]@users.noreply.github.com'

‎Makefile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ clean:
5151
deploy-on-anvil:
5252
$(MAKE) deploy-all \
5353
SOURCE_CHAIN=sepolia SOURCE_RPC=$(ANVIL_SEPOLIA_RPC_URL) \
54-
TARGET_CHAIN=arbitrum_sepolia TARGET_RPC=$(ANVIL_ARBITRUM_SEPOLIA_RPC_URL) \
54+
TARGET_CHAIN=arbitrumSepolia TARGET_RPC=$(ANVIL_ARBITRUM_SEPOLIA_RPC_URL) \
5555
OPTIONS=
5656

5757
deploy-on-mainnets:
@@ -63,7 +63,7 @@ deploy-on-mainnets:
6363
deploy-on-testnets:
6464
$(MAKE) deploy-all \
6565
SOURCE_CHAIN=sepolia SOURCE_RPC=$(SEPOLIA_RPC_URL) \
66-
TARGET_CHAIN=arbitrum_sepolia TARGET_RPC=$(ARBITRUM_SEPOLIA_RPC_URL) \
66+
TARGET_CHAIN=arbitrumSepolia TARGET_RPC=$(ARBITRUM_SEPOLIA_RPC_URL) \
6767
OPTIONS="--verify --verifier etherscan --verifier-api-key $(ETHERSCAN_API_KEY) --verifier-url $(ETHERSCAN_API_URL)"
6868

6969
deploy-all: # SOURCE_CHAIN, SOURCE_RPC, TARGET_CHAIN, TARGET_RPC, OPTIONS
@@ -84,7 +84,7 @@ deploy-all: # SOURCE_CHAIN, SOURCE_RPC, TARGET_CHAIN, TARGET_RPC, OPTIONS
8484
upgrade-on-anvil:
8585
$(MAKE) upgrade-all \
8686
SOURCE_CHAIN=sepolia SOURCE_RPC=$(ANVIL_SEPOLIA_RPC_URL) \
87-
TARGET_CHAIN=arbitrum_sepolia TARGET_RPC=$(ANVIL_ARBITRUM_SEPOLIA_RPC_URL)
87+
TARGET_CHAIN=arbitrumSepolia TARGET_RPC=$(ANVIL_ARBITRUM_SEPOLIA_RPC_URL)
8888

8989
upgrade-on-mainnets:
9090
$(MAKE) upgrade-all \
@@ -96,7 +96,7 @@ upgrade-on-mainnets:
9696
upgrade-on-testnets:
9797
$(MAKE) upgrade-all \
9898
SOURCE_CHAIN=sepolia SOURCE_RPC=$(SEPOLIA_RPC_URL) \
99-
TARGET_CHAIN=arbitrum_sepolia TARGET_RPC=$(ARBITRUM_SEPOLIA_RPC_URL) \
99+
TARGET_CHAIN=arbitrumSepolia TARGET_RPC=$(ARBITRUM_SEPOLIA_RPC_URL) \
100100
OPTIONS=--verify
101101

102102
upgrade-all: # SOURCE_CHAIN, SOURCE_RPC, TARGET_CHAIN, TARGET_RPC, OPTIONS
@@ -155,7 +155,7 @@ upgrade-layerzero-bridge: # CHAIN, RPC_URL
155155

156156
send-tokens-to-arbitrum-sepolia:
157157
@echo "Sending tokens cross-chain... from SEPOLIA to Arbitrum SEPOLIA"
158-
SOURCE_CHAIN=sepolia TARGET_CHAIN=arbitrum_sepolia \
158+
SOURCE_CHAIN=sepolia TARGET_CHAIN=arbitrumSepolia \
159159
forge script script/SendFromEthereumToArbitrum.s.sol:SendTokensFromEthereumToArbitrum \
160160
--rpc-url $(SEPOLIA_RPC_URL) \
161161
$$(if [ "$(CI)" = "true" ]; then echo "--private-key $(PRIVATE_KEY)"; else echo "--account $(ACCOUNT)"; fi) \
@@ -164,7 +164,7 @@ send-tokens-to-arbitrum-sepolia:
164164

165165
send-tokens-to-sepolia:
166166
@echo "Sending tokens cross-chain... from Arbitrum SEPOLIA to SEPOLIA"
167-
SOURCE_CHAIN=arbitrum_sepolia TARGET_CHAIN=sepolia \
167+
SOURCE_CHAIN=arbitrumSepolia TARGET_CHAIN=sepolia \
168168
forge script script/SendFromArbitrumToEthereum.s.sol:SendTokensFromArbitrumToEthereum \
169169
--rpc-url $(ARBITRUM_SEPOLIA_RPC_URL) \
170170
$$(if [ "$(CI)" = "true" ]; then echo "--private-key $(PRIVATE_KEY)"; else echo "--account $(ACCOUNT)"; fi) \

‎config/config.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"lzEndpointAddress": "0x6EDCE65403992e310A62460808c4b910D972f10f",
1515
"lzChainId": 40161
1616
},
17-
"arbitrum_sepolia": {
17+
"arbitrumSepolia": {
1818
"approvalRequired": false,
1919
"rlcCrosschainTokenAddress": "0x5ba6945Ef517F455783D4978a6F1761Bc49f97F8",
2020
"rlcCrosschainTokenCreatexSalt": "0x0000000000d33f5439d011d58213072dc8bd99dd22f7c6bd85ea442e75371c81",

‎script/lib/ConfigLib.sol‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ library ConfigLib {
123123

124124
/**
125125
* @dev Updates the config file with a new address for a specific chain
126-
* @param chain The chain identifier (e.g., "sepolia", "arbitrum_sepolia")
126+
* @param chain The chain identifier (e.g., "sepolia", "arbitrumSepolia")
127127
* @param fieldName The field name to update (e.g., "iexecLayerZeroBridgeAddress")
128128
* @param value The address value to set
129129
*/

0 commit comments

Comments
 (0)