DVN script added to LZ deployment

deployment-config/mydeploy.json → deployment-config/exampleL1.json

@@ -31,12 +31,23 @@
         "tellerSalt": "0x51f8968749a56d01202c9100000000000000000000000000000000000000000a",
         "maxGasForPeer": 100000,
         "minGasForPeer": 0,
-        "peerEid": 0,
+        "peerEid": 30280,
         "tellerContractName": "MultiChainLayerZeroTellerWithMultiAssetSupport",
         "assets": [
             "0xCd5fE23C85820F7B72D0926FC9b05b43E359b7ee",
             "0xbf5495Efe5DB9ce00f80364C8B423567e58d2110"
         ],
+        "dvnIfNoDefault":{
+            "required":["0x589dEDbD617e0CBcB916A9223F4d1300c294236b"],
+            "optional":[
+                "0x380275805876Ff19055EA900CDb2B46a94ecF20D",
+                "0x8FafAE7Dd957044088b3d0F67359C327c6200d18",
+                "0xa59BA433ac34D2927232918Ef5B2eaAfcF130BA5",
+                "0xe552485d02EDd3067FE7FCbD4dd56BB1D3A998D2"
+            ],
+            "blockConfirmationsRequiredIfNoDefault": 15,
+            "optionalThreshold": 1
+        },
 
         "address": "0x00000000004F96C07B83e86600D86F0000000000"
     },

deployment-config/exampleL2.json

@@ -0,0 +1,67 @@
+{
+    "protocolAdmin": "0xF2dE1311C5b2C1BD94de996DA13F80010453e505",
+
+    "boringVault":{
+        "boringVaultSalt": "0x1ddd634c506ad203da17ff00000000000000000000000000000000000000000a",
+        "boringVaultName": "Ion Vault L2", 
+        "boringVaultSymbol": "IVT",
+
+        "address": "0x0000000000E7Ab44153eEBEF2343ba5289F65dAC"    
+    },
+
+    "manager":{
+        "managerSalt": "0x30432d4b4ec00003b4a25000000000000000000000000000000000000000000a",
+
+        "address": "0x0000000000fAd6Db23abdC1a85621B97bd1Dc82f"
+    },
+
+    "accountant":{
+        "accountantSalt": "0x6a184dbea6f3cc0318679f00000000000000000000000000000000000000000a",
+        "payoutAddress": "0x0000000000417626Ef34D62C4DC189b021603f2F",
+        "base": "0x5f207d42F869fd1c71d7f0f81a2A67Fc20FF7323",
+        "allowedExchangeRateChangeUpper": "10003",
+        "allowedExchangeRateChangeLower": "9998",
+        "minimumUpdateDelayInSeconds": "3600",
+        "managementFee": "2000",
+
+        "address": "0x00000000004F96C07B83e86600D86F9479bB43fa"
+    },
+
+    "teller": {
+        "tellerSalt": "0x51f8968749a56d01202c9100000000000000000000000000000000000000000a",
+        "maxGasForPeer": 100000,
+        "minGasForPeer": 0,
+        "peerEid": 30280,
+        "tellerContractName": "MultiChainLayerZeroTellerWithMultiAssetSupport",
+        "assets": [
+        ],
+        "dvnIfNoDefault":{
+            "required":["0x6788f52439aca6bff597d3eec2dc9a44b8fee842"],
+            "optional":[
+                "0x1feb08b1a53a9710afce82d380b8c2833c69a37e",
+                "0x87048402c32632b7c4d0a892d82bc1160e8b2393",
+                "0xd24972c11f91c1bb9eaee97ec96bb9c33cf7af24",
+                "0xbd00c87850416db0995ef8030b104f875e1bdd15"
+            ],
+            "blockConfirmationsRequiredIfNoDefault": 15,
+            "optionalThreshold": 1
+        },
+
+        "address": "0x00000000004F96C07B83e86600D86F0000000000"
+    },
+
+    "rolesAuthority": {
+        "rolesAuthoritySalt": "0x66bbc3b3b3000b01466a3a00000000000000000000000000000000000000000a",
+        "strategist": "0xC2d99d76bb9D46BF8Ec9449E4DfAE48C30CF0839",
+        "exchangeRateBot": "0x00000000004F96C07B83e86600D86F0000000000",
+
+        "address": "0x00000000004F96C07B83e86600D86F0000000000"
+    },
+
+    "decoder": {
+        "decoderSalt": "0x48b53893da2e0b0248268c00000000000000000000000000000000000000000a",
+
+        "address": "0x00000000004F96C07B83e86600D86F0000000000" 
+    }
+
+}

deployment-config/sei-eth-l1-08-08-24.json

@@ -2,21 +2,21 @@
     "protocolAdmin": "0x0000000000417626Ef34D62C4DC189b021603f2F",
 
     "boringVault":{
-        "boringVaultSalt": "0x1000000000000000000000000000000000000000000000000000000000000000",
+        "boringVaultSalt": "0x100000000000000000000000000000000000000000000000000000000000000a",
         "boringVaultName": "Sei Native Yield Nucleus Token", 
         "boringVaultSymbol": "seiyanETH",
 
         "address": "0x0000000000000000000000000000000000000000"    
     },
 
     "manager":{
-        "managerSalt": "0x2000000000000000000000000000000000000000000000000000000000000000",
+        "managerSalt": "0x200000000000000000000000000000000000000000000000000000000000000a",
 
         "address": "0x0000000000000000000000000000000000000000"
     },
 
     "accountant":{
-        "accountantSalt": "0x3000000000000000000000000000000000000000000000000000000000000000",
+        "accountantSalt": "0x300000000000000000000000000000000000000000000000000000000000000a",
         "payoutAddress": "0x0000000000417626Ef34D62C4DC189b021603f2F",
         "allowedExchangeRateChangeUpper": "10030",
         "allowedExchangeRateChangeLower": "9980",
@@ -27,7 +27,7 @@
     },
 
     "teller": {
-        "tellerSalt": "0x4000000000000000000000000000000000000000000000000000000000000000",
+        "tellerSalt": "0x400000000000000000000000000000000000000000000000000000000000000a",
         "maxGasForPeer": 200000,
         "minGasForPeer": 60000,
         "peerEid": 30280,
@@ -43,7 +43,7 @@
         "address": "0x0000000000000000000000000000000000000000"
     },
     "rolesAuthority": {
-        "rolesAuthoritySalt": "0x5000000000000000000000000000000000000000000000000000000000000000",
+        "rolesAuthoritySalt": "0x500000000000000000000000000000000000000000000000000000000000000a",
         "strategist": "0x0000000000417626Ef34D62C4DC189b021603f2F",
         "exchangeRateBot": "0x0000000000417626Ef34D62C4DC189b021603f2F",
 

lzConfigCheck.cjs

@@ -0,0 +1,126 @@
+const fs = require('fs');
+const readline = require('readline');
+
+// Function to load the DVN JSON data
+function loadDvns() {
+    const data = fs.readFileSync('./deployment-config/layerzero/dvn-deployments.json', 'utf8');
+    return JSON.parse(data);
+}
+
+// Function to find an address in the JSON data
+function findAddressInJson(addresses, jsonData, searchKey = "") {
+    const results = [];
+    const lowerCaseAddresses = addresses.map(a => a.toLowerCase());
+
+    for (const [parentKey, parentValue] of Object.entries(jsonData)) {
+        for (const [key, value] of Object.entries(parentValue)) {
+            if (lowerCaseAddresses.includes(value.toLowerCase())) {
+                results.push([parentKey, key, value]);
+            }
+        }
+    }
+
+    if (searchKey === "") {
+        if (results.length === 1) {
+            const [parentKey, key, value] = results[0];
+            return [true, key, parentKey];
+        } else {
+            return [false, null, null];
+        }
+    } else {
+        for (const [parentKey, key, value] of results) {
+            if (key === searchKey) {
+                return [true, key, parentKey];
+            }
+        }
+        return [false, null, null];
+    }
+}
+
+// Function to get findings from a config file
+function getFindingsInConfig(configName) {
+    const dvnJsonData = loadDvns();
+    const data = fs.readFileSync(`./deployment-config/${configName}`, 'utf8');
+    const configJsonData = JSON.parse(data);
+
+    const required = configJsonData.teller.dvnIfNoDefault.required;
+    const optional = configJsonData.teller.dvnIfNoDefault.optional;
+    const addresses = [...required, ...optional];
+
+    let chain = "";
+    for (const address of addresses) {
+        const [found, key, parentKey] = findAddressInJson([address], dvnJsonData);
+        if (found) {
+            chain = key;
+            break;
+        }
+    }
+
+    if (chain === "") {
+        throw new Error("❌ All provided configs have duplicates or are not found in the DVN registry");
+    }
+
+    const findings = [];
+    for (const address of addresses) {
+        const [found, key, parentKey] = findAddressInJson([address], dvnJsonData, chain);
+        if (found) {
+            findings.push({ address, chain: key, provider: parentKey });
+        } else {
+            console.log("Not Found ", address);
+        }
+    }
+
+    return {
+        findings,
+        requiredCount: required.length,
+        optionalCount: optional.length,
+        confirmations: configJsonData.teller.dvnIfNoDefault.blockConfirmationsRequiredIfNoDefault,
+        threshold: configJsonData.teller.dvnIfNoDefault.optionalThreshold
+    };
+}
+
+function assert(statement, message){
+    if(!statement){
+        throw new Error("❌ "+message)
+    }
+}
+
+// Main function
+async function main() {
+    const args = process.argv.slice(2);
+
+    if (args.length < 2) {
+        console.error("Usage: node script.js <file1Name> <file2Name>");
+        process.exit(1);
+    }
+
+    const [file1Name, file2Name] = args;
+
+    try {
+        const findings1 = getFindingsInConfig(file1Name);
+        const findings2 = getFindingsInConfig(file2Name);
+
+        assert(findings1.confirmations == findings2.confirmations, "Confirmations do not match");
+        assert(findings1.threshold == findings2.threshold, "thresholds do not match");
+        assert(findings1.requiredCount == findings2.requiredCount, "required DVNs count does not match");
+        assert(findings1.optionalCount == findings2.optionalCount, "optional DVNs count does not match");
+
+        const chain1 = findings1.findings[0].chain;
+        const providers1 = findings1.findings.map(finding => finding.provider);
+        for (const finding of findings1.findings) {
+            assert(finding.chain == chain1, "Networks do not match for "+finding)
+        }
+
+        const chain2 = findings2.findings[0].chain;
+        for (const finding of findings2.findings) {
+            assert(providers1.includes(finding.provider), "Provider: "+finding.provider+" does not havea matching provider in the first config");
+            assert(finding.chain == chain2, "Networks do not match for: "+finding);
+        }
+
+        console.log("✅ Config check passed");
+    } catch (error) {
+        console.error(error.message);
+    }
+}
+
+main();

package.json

@@ -11,7 +11,8 @@
     "deploy-createx-l1": "forge script script/DeployCustomCreatex.s.sol --rpc-url $L1_RPC_URL --private-key $PRIVATE_KEY --slow",
     "deploy-createx-l2": "forge script script/DeployCustomCreatex.s.sol --rpc-url $L2_RPC_URL --private-key $PRIVATE_KEY --slow",
     "deploy-l1": "forge script script/deploy/deployAll.s.sol -f $L1_RPC_URL --private-key=$PRIVATE_KEY --slow",
-    "deploy-l2": "forge script script/deploy/deployAll.s.sol -f $L2_RPC_URL --private-key=$PRIVATE_KEY --slow"
+    "deploy-l2": "forge script script/deploy/deployAll.s.sol -f $L2_RPC_URL --private-key=$PRIVATE_KEY --slow",
+    "check-configs": "bun lzConfigCheck.cjs"
   },
   "devDependencies": {
     "@layerzerolabs/lz-definitions": "^2.3.25",

script/Base.s.sol

@@ -86,4 +86,8 @@ abstract contract BaseScript is Script {
         path = string.concat(CONFIG_PATH_ROOT, vm.prompt("Please Enter The Deployments Configuration File Name: "));
         return vm.readFile(path);
     }
+
+    function compareStrings(string memory a, string memory b) internal returns (bool) {
+        return (keccak256(abi.encodePacked(a)) == keccak256(abi.encodePacked(b)));
+    }
 }

script/ConfigReader.s.sol

@@ -28,6 +28,10 @@ library ConfigReader {
         address balancerVault;
         bytes32 tellerSalt;
         uint32 peerEid;
+        address[] requiredDvns;
+        address[] optionalDvns;
+        uint64 dvnBlockConfirmationsRequired;
+        uint8 optionalDvnThreshold;
         address accountant;
         address opMessenger;
         uint64 maxGasForPeer;
@@ -83,6 +87,12 @@ library ConfigReader {
         config.assets = _config.readAddressArray(".teller.assets");
         config.peerEid = uint32(_config.readUint(".teller.peerEid"));
 
+        config.requiredDvns = _config.readAddressArray(".teller.dvnIfNoDefault.required");
+        config.optionalDvns = _config.readAddressArray(".teller.dvnIfNoDefault.optional");
+        config.dvnBlockConfirmationsRequired =
+            uint64(_config.readUint(".teller.dvnIfNoDefault.blockConfirmationsRequiredIfNoDefault"));
+        config.optionalDvnThreshold = uint8(_config.readUint(".teller.dvnIfNoDefault.optionalThreshold"));
+
         // Reading from the 'rolesAuthority' section
         config.rolesAuthority = _config.readAddress(".rolesAuthority.address");
         config.rolesAuthoritySalt = _config.readBytes32(".rolesAuthority.rolesAuthoritySalt");

script/Send1WeiAccrossChain.s.sol

@@ -0,0 +1,82 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity 0.8.21;
+
+import { MainnetAddresses } from "test/resources/MainnetAddresses.sol";
+import { BoringVault } from "src/base/BoringVault.sol";
+import { ManagerWithMerkleVerification } from "src/base/Roles/ManagerWithMerkleVerification.sol";
+import { SafeTransferLib } from "@solmate/utils/SafeTransferLib.sol";
+import { FixedPointMathLib } from "@solmate/utils/FixedPointMathLib.sol";
+import { ERC20 } from "@solmate/tokens/ERC20.sol";
+import { BalancerVault } from "src/interfaces/BalancerVault.sol";
+import { EtherFiLiquidDecoderAndSanitizer } from "src/base/DecodersAndSanitizers/EtherFiLiquidDecoderAndSanitizer.sol";
+import { RolesAuthority, Authority } from "@solmate/auth/authorities/RolesAuthority.sol";
+import { TellerWithMultiAssetSupport } from "src/base/Roles/TellerWithMultiAssetSupport.sol";
+import { MultiChainLayerZeroTellerWithMultiAssetSupport } from
+    "src/base/Roles/CrossChain/MultiChainLayerZeroTellerWithMultiAssetSupport.sol";
+import { AccountantWithRateProviders } from "src/base/Roles/AccountantWithRateProviders.sol";
+import { CrossChainTellerBase } from "src/base/Roles/CrossChain/CrossChainTellerBase.sol";
+import { BridgeData } from "src/base/Roles/CrossChain/CrossChainTellerBase.sol";
+import { ILayerZeroEndpointV2 } from "@layerzerolabs/lz-evm-protocol-v2/contracts/interfaces/ILayerZeroEndpointV2.sol";
+import { SetConfigParam } from "@layerzerolabs/lz-evm-protocol-v2/contracts/interfaces/IMessageLibManager.sol";
+import "@forge-std/Script.sol";
+import "@forge-std/StdJson.sol";
+import { console2 } from "forge-std/console2.sol";
+import { Test, stdStorage, StdStorage, stdError, console } from "@forge-std/Test.sol";
+
+interface IWETH {
+    function deposit() external payable;
+    function approve(address, uint256) external;
+}
+
+/**
+ *  source .env && forge script script/DeployTestBoringVault.s.sol:DeployTestBoringVaultScript --with-gas-price
+ * 30000000000 --slow --broadcast --etherscan-api-key $ETHERSCAN_KEY --verify
+ * @dev Optionally can change --with-gas-price to something more reasonable
+ */
+contract TestScript is Script {
+    uint256 public privateKey;
+    address broadcaster;
+
+    CrossChainTellerBase teller;
+
+    function setUp() external {
+        privateKey = vm.envUint("PRIVATE_KEY");
+        broadcaster = vm.addr(privateKey);
+    }
+
+    function run() external {
+        vm.startBroadcast(privateKey);
+
+        ERC20 NATIVE = ERC20(0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE);
+        ERC20 WETH = ERC20(0xFC00000000000000000000000000000000000006);
+        // ERC20 WETH = ERC20(0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2);
+        // ERC20 WETH = ERC20(0xDeadDeAddeAddEAddeadDEaDDEAdDeaDDeAD0000);
+        address BORING_VAULT = 0x647Ea8b492832e9D99A06DE8cc9A05e58FcCdF02;
+        address TELLER = 0xD9395622c8Ec792D1cb6F39B562095fDa240BA57;
+
+        teller = CrossChainTellerBase(TELLER);
+
+        require(teller.isSupported(WETH), "asset not supported");
+
+        // WETH.approve(BORING_VAULT, 1 ether);
+        // payable(address(WETH)).call{value: 1}("");
+        // require(WETH.balanceOf(broadcaster) > 1, "No WETH");
+
+        // teller.deposit(WETH, 1000000000, 1000000000);
+        BridgeData memory data = BridgeData({
+            chainSelector: 30_101,
+            destinationChainReceiver: broadcaster,
+            bridgeFeeToken: NATIVE,
+            messageGas: 100_000,
+            data: ""
+        });
+
+        uint256 fee = teller.previewFee(1, data);
+
+        // teller.depositAndBridge{ value: fee }(WETH, 1, 1, data);
+        teller.bridge{ value: fee }(1, data);
+        // boring_vault = new BoringVault(owner, "Test Boring Vault", "BV", 18);
+
+        // manager = new ManagerWithMerkleVerification(owner, address(boring_vault), balancerVault);
+    }
+}

script/deploy/deployAll.s.sol

@@ -94,8 +94,4 @@ contract DeployAll is BaseScript {
             revert INVALID_TELLER_CONTRACT_NAME();
         }
     }
-
-    function compareStrings(string memory a, string memory b) private returns (bool) {
-        return (keccak256(abi.encodePacked(a)) == keccak256(abi.encodePacked(b)));
-    }
 }