updated bash script to deploy and verify

yieldnest · Sep 15, 2024 · 71e1fd0 · 71e1fd0
1 parent 7a28a2d
commit 71e1fd0
Show file tree

Hide file tree

Showing 12 changed files with 223 additions and 172 deletions.
diff --git a/broadcast/DeployMultiChainDeployer.s.sol/2522/9352fad2-latest.json b/broadcast/DeployMultiChainDeployer.s.sol/2522/9352fad2-latest.json
diff --git a/broadcast/DeployMultiChainDeployer.s.sol/2522/run-1726382993.json b/broadcast/DeployMultiChainDeployer.s.sol/2522/run-1726382993.json
diff --git a/deployments/ynETH-1.json b/deployments/ynETH-1.json
diff --git a/deployments/ynETH-17000(original).json b/deployments/ynETH-17000(original).json
diff --git a/deployments/ynETH-17000.json b/deployments/ynETH-17000.json
diff --git a/package.json b/package.json
@@ -29,11 +29,12 @@
   "repository": "https://github.com/yieldnest/yieldnest-cross-chain",
   "scripts": {
     "build": "forge build",
+    "clean": "forge clean",
     "compile": "forge compile",
     "format": "forge fmt --root .",
     "lint": "solhint \"src/**/*.sol\" && solhint \"test/**/*.sol\" && solhint \"script/**/*.sol\"",
     "prepare": "husky",
-    "test": "forge test -vvv",
-    "script-manager": "./script/scriptManager.sh"
+    "script-manager": "./script/scriptManager.sh",
+    "test": "forge test -vvv"
   }
-}
+}
diff --git a/script/BaseData.s.sol b/script/BaseData.s.sol
@@ -37,6 +37,9 @@ contract BaseData is Script {
     });
 
     function setUp() public virtual {
+        // NOTE: All the LZ Addresses and EIDs are picked up from their docs
+        // at https://docs.layerzero.network/v2/developers/evm/technical-reference/deployed-contracts
+
         // mainnets
         __addresses[true] = Addresses({
             OFT_DELEGATE: 0xfcad670592a3b24869C0b51a6c6FDED4F95D6975, // yn security council

diff --git a/script/DeployL1OFTAdapter.s.sol b/script/DeployL1OFTAdapter.s.sol
@@ -60,20 +60,19 @@ contract DeployL1OFTAdapter is BaseScript {
 
         if (l1OFTAdapter.owner() == CURRENT_SIGNER) {
             console.log("Setting peers");
-            for (uint256 i = 0; i < deployment.chains.length; i++) {
-                if (deployment.chains[i].chainId == block.chainid) {
-                    continue;
-                }
-                uint32 eid = deployment.chains[i].lzEID;
+            for (uint256 i = 0; i < baseInput.l2ChainIds.length; i++) {
+                uint256 chainId = baseInput.l2ChainIds[i];
+                uint32 eid = getEID(chainId);
                 address adapter = predictions.l2OftAdapter;
                 bytes32 adapterBytes32 = addressToBytes32(adapter);
                 if (l1OFTAdapter.peers(eid) == adapterBytes32) {
-                    console.log("Adapter already set for chain %d", deployment.chains[i].chainId);
+                    console.log("Adapter already set for chain %d", chainId);
                     continue;
                 }
 
                 vm.broadcast();
                 l1OFTAdapter.setPeer(eid, adapterBytes32);
+                console.log("Set Peer %s for eid %d", adapter, eid);
             }
 
             vm.broadcast();