Merge remote-tracking branch 'origin/feature/improve-deploy-script-rebase'

Author: agureev

README.md

@@ -119,14 +119,13 @@ slither .
 To simulate deployment on sepolia, run
 
 ```sh
-forge script script/Deploy.s.sol:Deploy \
-   --rpc-url sepolia
+forge script script/DeployProtocolAdapter.s.sol:DeployProtocolAdapter --rpc-url sepolia
 ```
 
 Append the
 
 - `--broadcast` flag to deploy on sepolia
-- `--verify` flag for subsequent contract verification on Etherscan
+- `--verify --slow` flags for subsequent contract verification on Etherscan (`--slow` adds 15 seconds of waiting time between verification attempts)
 - `--account <ACCOUNT_NAME>` flag to use a previously imported keystore (see
   `cast wallet --help` for more info)
 

contracts/.env-example

@@ -1,20 +1,8 @@
 ## RPC Providers
-
-API_KEY_INFURA=<API_KEY_INFURA_KEY>
 API_KEY_ALCHEMY=<API_KEY_ALCHEMY>
 
-## Block Explorers
-
+## Block Explorers (see https://docs.etherscan.io/etherscan-v2)
 API_KEY_ETHERSCAN=<API_KEY_ETHERSCAN>
-API_KEY_POLYGONSCAN=<API_KEY_POLYGONSCAN>
-API_KEY_ARBISCAN=<API_KEY_ARBISCAN>
-API_KEY_BASESCAN=<API_KEY_BASESCAN>
-
-API_KEY_OPTIMISTIC_ETHERSCAN=<API_KEY_OPTIMISTIC_ETHERSCAN>
-API_KEY_SNOWTRACE=<API_KEY_SNOWTRACE>
-API_KEY_BSCSCAN=<API_KEY_BSCSCAN>
-API_KEY_GNOSISSCAN=<API_KEY_GNOSISSCAN>
 
 ## Deploying Wallet
-
 MNEMONIC="test test test test test test test test test test test junk"

contracts/foundry.toml

@@ -51,36 +51,18 @@ fuzz = { runs = 10_000 }
 verbosity = 4
 
 [etherscan]
-arbitrum = { key = "${API_KEY_ARBISCAN}" }
-avalanche = { key = "${API_KEY_SNOWTRACE}" }
-base = { key = "${API_KEY_BASESCAN}" }
-bnb_smart_chain = { key = "${API_KEY_BSCSCAN}" }
-gnosis_chain = { key = "${API_KEY_GNOSISSCAN}" }
-goerli = { key = "${API_KEY_ETHERSCAN}" }
 mainnet = { key = "${API_KEY_ETHERSCAN}" }
-optimism = { key = "${API_KEY_OPTIMISTIC_ETHERSCAN}" }
-polygon = { key = "${API_KEY_POLYGONSCAN}" }
 sepolia = { key = "${API_KEY_ETHERSCAN}" }
+arbitrum = { key = "${API_KEY_ETHERSCAN}" }
+arbitrum-sepolia = { key = "${API_KEY_ETHERSCAN}" }
+base = { key = "${API_KEY_ETHERSCAN}" }
+base-sepolia = { key = "${API_KEY_ETHERSCAN}" }
 
 [rpc_endpoints]
-#arbitrum = "https://arbitrum-mainnet.infura.io/v3/${API_KEY_INFURA}"
-#avalanche = "https://avalanche-mainnet.infura.io/v3/${API_KEY_INFURA}"
-#base = "https://mainnet.base.org"
-#bnb_smart_chain = "https://bsc-dataseed.binance.org"
-#gnosis_chain = "https://rpc.gnosischain.com"
-#localhost = "http://localhost:8545"
-#mainnet = "https://mainnet.infura.io/v3/${API_KEY_INFURA}"
-#optimism = "https://optimism-mainnet.infura.io/v3/${API_KEY_INFURA}"
-#polygon = "https://polygon-mainnet.infura.io/v3/${API_KEY_INFURA}"
-#sepolia = "https://sepolia.infura.io/v3/${API_KEY_INFURA}"
-
-arbitrum = "https://arb-mainnet.g.alchemy.com/v2/${API_KEY_ALCHEMY}"
-avalanche = "https://avax-mainnet.g.alchemy.com/v2/${API_KEY_ALCHEMY}"
-base = "https://mainnet.base.org"
-bnb_smart_chain = "https://bsc-dataseed.binance.org"
-gnosis_chain = "https://rpc.gnosischain.com"
-localhost = "http://localhost:8545"
 mainnet = "https://eth-mainnet.g.alchemy.com/v2/${API_KEY_ALCHEMY}"
-optimism = "https://opt-mainnet.g.alchemy.com/v2/${API_KEY_ALCHEMY}"
-polygon = "https://polygon-mainnet.g.alchemy.com/v2/${API_KEY_ALCHEMY}"
 sepolia = "https://eth-sepolia.g.alchemy.com/v2/${API_KEY_ALCHEMY}"
+arbitrum = "https://arb-mainnet.g.alchemy.com/v2/${API_KEY_ALCHEMY}"
+arbitrum-sepolia = "https://arb-sepolia.g.alchemy.com/v2/${API_KEY_ALCHEMY}"
+base = "https://base-mainnet.g.alchemy.com/v2/${API_KEY_ALCHEMY}"
+base-sepolia = "https://base-sepolia.g.alchemy.com/v2/${API_KEY_ALCHEMY}"
+localhost = "http://localhost:8545"

contracts/script/DeployProtocolAdapter.s.sol

@@ -8,21 +8,26 @@ import {Script} from "forge-std/Script.sol";
 import {ProtocolAdapter} from "../src/ProtocolAdapter.sol";
 
 contract DeployProtocolAdapter is Script {
-    function run() public returns (address protocolAdapter) {
-        string memory path = "script/constructor-args.txt";
-
-        RiscZeroVerifierRouter trustedSepoliaVerifierRouter = RiscZeroVerifierRouter(vm.parseAddress(vm.readLine(path)));
+    mapping(uint256 chainId => string network) internal _networks;
+    mapping(string network => RiscZeroVerifierRouter router) internal _routers;
 
-        uint8 commitmentTreeDepth = uint8(vm.parseUint(vm.readLine(path)));
+    constructor() {
+        _networks[11155111] = "sepolia";
+        _networks[421614] = "arbitrum-sepolia";
+        _networks[84532] = "base-sepolia";
 
-        uint8 actionTagTreeDepth = uint8(vm.parseUint(vm.readLine(path)));
+        _routers["sepolia"] = RiscZeroVerifierRouter(0x925d8331ddc0a1F0d96E68CF073DFE1d92b69187);
+        _routers["arbitrum-sepolia"] = RiscZeroVerifierRouter(0x0b144E07A0826182B6b59788c34b32Bfa86Fb711);
+        _routers["base-sepolia"] = RiscZeroVerifierRouter(0x0b144E07A0826182B6b59788c34b32Bfa86Fb711);
+    }
 
+    function run() public returns (address protocolAdapter) {
         vm.startBroadcast();
         protocolAdapter = address(
             new ProtocolAdapter{salt: sha256("ProtocolAdapterDraft")}({
-                riscZeroVerifierRouter: trustedSepoliaVerifierRouter,
-                commitmentTreeDepth: commitmentTreeDepth,
-                actionTagTreeDepth: actionTagTreeDepth
+                riscZeroVerifierRouter: _routers[_networks[block.chainid]],
+                commitmentTreeDepth: 32,
+                actionTagTreeDepth: 4
             })
         );
         vm.stopBroadcast();

contracts/src/ProtocolAdapter.sol

@@ -40,6 +40,8 @@ contract ProtocolAdapter is IProtocolAdapter, ReentrancyGuardTransient, Commitme
 
     uint256 internal _txCount;
 
+    error ZeroNotAllowed();
+
     error ForwarderCallOutputMismatch(bytes expected, bytes actual);
     error ResourceCountMismatch(uint256 expected, uint256 actual);
     error RootMismatch(bytes32 expected, bytes32 actual);
@@ -60,6 +62,10 @@ contract ProtocolAdapter is IProtocolAdapter, ReentrancyGuardTransient, Commitme
         _TRUSTED_RISC_ZERO_VERIFIER_ROUTER = riscZeroVerifierRouter;
         _ACTION_TAG_TREE_DEPTH = actionTagTreeDepth;
 
+        if (address(riscZeroVerifierRouter) == address(0)) {
+            revert ZeroNotAllowed();
+        }
+
         // Sanity check that the verifier has not been stopped already.
         if (isEmergencyStopped()) {
             revert RiscZeroVerifierStopped();