For CI, deploy to Arbitrum Sepolia instead of Base Sepolia

.github/workflows/ci-dev-contracts.yml

@@ -79,7 +79,8 @@ jobs:
         run: yarn deploy:ci
         env:
           ENVIRONMENT: "testnet"
-          DEPLOYER_PRIVATE_KEY: ${{ secrets.BASE_SEPOLIA_DEPLOYER_PRIVATE_KEY }}
+          DEPLOYER_PRIVATE_KEY: ${{ secrets.ARBITRUM_SEPOLIA_DEPLOYER_PRIVATE_KEY }}
           ALCHEMY_API_KEY: ${{ secrets.TESTNET_ALCHEMY_API_KEY }}
           BASE_SEPOLIA_ETHERSCAN_API_KEY: ${{ secrets.BASE_SEPOLIA_ETHERSCAN_API_KEY }}
+          ARBITRUM_SEPOLIA_ETHERSCAN_API_KEY: ${{ secrets.ARBITRUM_SEPOLIA_ETHERSCAN_API_KEY }}
           SUPABASE_SERVICE_ROLE_KEY: ${{ secrets.TEST_SUPABASE_SERVICE_ROLE_KEY }}

packages/contracts/Makefile

@@ -1,43 +1,43 @@
-# NOTE (JL,2024-05-20): Hierarchical Environment loading does not simply work with `make`. A custom 
-#	solution may be possible, but given that `forge` auto-loads any `.env` file in the invocation 
+# NOTE (JL,2024-05-20): Hierarchical Environment loading does not simply work with `make`. A custom
+#	solution may be possible, but given that `forge` auto-loads any `.env` file in the invocation
 #	directory and our deployment scripts depend on this, it seems unnecessary to change this now.
 -include .env
 
-build:; forge build
+DEPLOY_SCRIPT ?= script/DeployVaultFactory.s.sol:DeployVaultFactory
 
-anvil: anvil
+# How the deployer is authenticated. Can override to use `cast wallet` output or `--account x --password y` etc.
+DEPLOYER_AUTHENTICATION ?= --private-key $(DEPLOYER_PRIVATE_KEY)
 
 deploy-local:
 	$(MAKE) deploy RPC_URL=localhost EXTRA_FLAGS=
 
 # TODO: change this to use the network config from foundry.toml
-deploy-arbSepolia:
+deploy-arbitrumSepolia:
 	$(MAKE) deploy RPC_URL=arbitrumSepolia EXTRA_FLAGS="--verify --slow"
 
-resume-arbSepolia:
+resume-arbitrumSepolia:
 	$(MAKE) deploy RPC_URL=arbitrumSepolia EXTRA_FLAGS="--verify --slow --resume"
 
 deploy-baseSepolia:
 	$(MAKE) deploy RPC_URL=baseSepolia EXTRA_FLAGS="--verify --slow"
 
-# NOTE (JL,2024-05-20): `forge` auto-includes any `.env` file in the invocation directory.
-deploy:
-	@echo "Running deploy '$(RPC_URL)' for '$(ENVIRONMENT)' environment."
-	@rm -rf out && \
-	forge script script/DeployVaultFactory.s.sol:DeployVaultFactory --rpc-url $(RPC_URL) \
-		--private-key $(DEPLOYER_PRIVATE_KEY) --broadcast $(EXTRA_FLAGS) -vvvv && \
-	yarn gen-types && \
-	yarn db-export
-
 # TODO: add --verifier flag.  forge isn't happy --etherscan-api-key is empty.
 deploy-bitlayerTestnet:
 	$(MAKE) deploy RPC_URL="https://testnet-rpc.bitlayer.org" \
-	EXTRA_FLAGS='--etherscan-api-key "" --verifier-url "https://testnet-scan.bitlayer.org" --legacy --slow'
+		EXTRA_FLAGS='--etherscan-api-key "" --verifier-url "https://testnet-scan.bitlayer.org" --legacy --slow'
+
+# NOTE (JL,2024-05-20): `forge` auto-includes any `.env` file in the invocation directory.
+deploy:
+	@echo "Running deploy script '$(DEPLOY_SCRIPT)' against '$(RPC_URL)' for '$(ENVIRONMENT)' environment."
+	@yarn clean
+	@yarn build
+	forge script $(DEPLOY_SCRIPT) --rpc-url $(RPC_URL) --chain-id $$(cast chain-id --rpc-url $(RPC_URL)) \
+		$(DEPLOYER_AUTHENTICATION) --broadcast $(EXTRA_FLAGS) -vvvv
+	yarn db-export
 
 verify:
-	@echo "Running verify '$(RPC_URL)' for '$(ENVIRONMENT)' environment."
-	rm -rf out && \
-	forge script script/DeployVaultFactory.s.sol:DeployVaultFactory --rpc-url $(RPC_URL) \
-		--private-key $(DEPLOYER_PRIVATE_KEY) --verify --resume -vvvv && \
-	yarn gen-types && \
+	@echo "Running verify of script '$(DEPLOY_SCRIPT)' against '$(RPC_URL)' for '$(ENVIRONMENT)' environment."
+	@yarn clean
+	@yarn build
+	forge script $(DEPLOY_SCRIPT) --rpc-url $(RPC_URL) $(DEPLOYER_AUTHENTICATION) --verify --resume -vvvv
 	yarn db-export

packages/contracts/foundry.toml

@@ -3,7 +3,7 @@ src = "src"
 out = "out"
 libs = ["lib"]
 fs_permissions = [{ access = "read-write", path = "./" }]
-solc_version="0.8.23"
+solc_version = "0.8.23"
 
 [fmt]
 bracket_spacing = true
@@ -25,9 +25,9 @@ bitlayerTestnet = "https://testnet-rpc.bitlayer.org"
 
 
 [etherscan]
-localhost = { key = "" , url="http://127.0.0.1:8545"}
+localhost = { key = "", url = "http://127.0.0.1:8545" }
 base = { key = "${BASE_ETHERSCAN_API_KEY}" }
 baseSepolia = { key = "${BASE_SEPOLIA_ETHERSCAN_API_KEY}" }
-arbitrumSepolia = { key = "${ARB_SEPOLIA_ETHERSCAN_API_KEY}", url = "https://api-sepolia.arbiscan.io/api", chain=421614 }
-bitlayer = { key = "bitlayer", url="https://rpc.bitlayer.org" }
-bitlayerTestnet = { key = "bitlayerTestnet", url="https://testnet-scan.bitlayer.org" }
+arbitrumSepolia = { key = "${ARBITRUM_SEPOLIA_ETHERSCAN_API_KEY}", url = "https://api-sepolia.arbiscan.io/api", chain = 421614 }
+bitlayer = { key = "bitlayer", url = "https://rpc.bitlayer.org" }
+bitlayerTestnet = { key = "bitlayerTestnet", url = "https://testnet-scan.bitlayer.org" }

packages/contracts/package.json

@@ -8,15 +8,15 @@
     "chain": "yarn rm-dbdata && anvil --config-out localhost.json",
     "clean": "forge clean && rm -rf broadcast cache deployments types localhost.json index.js",
     "dev": "yarn rm-dbdata && anvil --config-out localhost.json & make deploy-local",
-    "build": "forge build && yarn gen-types",
+    "build": "forge build && yarn gen-types && tsc",
     "test": "forge test",
     "format": "forge fmt && prettier './script/**/*.js' --write",
     "lint": "forge fmt && eslint --fix --ignore-path .gitignore && yarn solhint './*(test|src)/**/*.sol'",
     "db-check": "tsc && node ./script/utils/checkDb.js",
     "db-export": "tsc && node ./script/utils/exporter.js",
     "deploy": "make deploy-local",
-    "deploy:ci": "yarn db-export && make deploy-baseSepolia",
-    "gen-types": "yarn typechain --target ethers-v5 --out-dir ./types ./out/*.sol/*.json && tsc",
+    "deploy:ci": "make deploy-arbitrumSepolia",
+    "gen-types": "yarn typechain --target ethers-v5 --out-dir ./types ./out/*.sol/*.json",
     "postinstall": "yarn build && yarn gen-types"
   },
   "packageManager": "[email protected]",
@@ -28,7 +28,7 @@
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-prettier": "^5.1.3",
     "prettier": "^3.2.2",
-    "solhint": "^5.0.1",
+    "solhint": "^5.0.3",
     "typechain": "^8.3.2",
     "typescript": "^5.4.5"
   },

packages/contracts/resource/testnet.toml

@@ -4,7 +4,7 @@
 
 [evm]
 # blockchain id, e.g. baseSepolia=84532, arbSepolia=421614
-chain_id = 84532
+chain_id = 421614
 deploy_mocks = true
 
 [evm.address]

yarn.lock

@@ -642,7 +642,7 @@ __metadata:
     ethers: ^5.7.2
     js-toml: ^1.0.0
     prettier: ^3.2.2
-    solhint: ^5.0.1
+    solhint: ^5.0.3
     typechain: ^8.3.2
     typescript: ^5.4.5
   languageName: unknown
@@ -15705,9 +15705,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"solhint@npm:^5.0.1":
-  version: 5.0.1
-  resolution: "solhint@npm:5.0.1"
+"solhint@npm:^5.0.3":
+  version: 5.0.3
+  resolution: "solhint@npm:5.0.3"
   dependencies:
     "@solidity-parser/parser": ^0.18.0
     ajv: ^6.12.6
@@ -15733,7 +15733,7 @@ __metadata:
       optional: true
   bin:
     solhint: solhint.js
-  checksum: ff961f5e3e62172b6e26cda758b4b2e266cd07fdc32f280bfbafeb9eda99177326515aaeb5dfff531eeb03c01e432488783f4406439e7524c8da1afa0235a44e
+  checksum: 30361c0099cded492059719e477cecadcc7390f87a1737904411e8dbf15277344a5892e0762738a025cefd78467455601db1d7d6ffb3d489a6ab6e296c6a7b92
   languageName: node
   linkType: hard