merge conflicts on remote resolved

Ion-Protocol · Sep 6, 2024 · 9fc4d5f · 9fc4d5f
2 parents 49b5948 + 330d94f
commit 9fc4d5f
Show file tree

Hide file tree

Showing 13 changed files with 82 additions and 37 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,5 @@
+{
+    "cSpell.enableFiletypes": [
+        "makefile"
+    ]
+}
diff --git a/Makefile b/Makefile
@@ -6,4 +6,41 @@ checkL1:
 
 checkL2:
 	@echo "Setting environment variable LIVE_DEPLOY_READ_FILE_NAME to $(file)"
-	@export LIVE_DEPLOY_READ_FILE_NAME=$(file) && forge test --mp test/LiveDeploy.t.sol --fork-url=${L2_RPC_URL}
+	@export LIVE_DEPLOY_READ_FILE_NAME=$(file) && forge test --mp test/LiveDeploy.t.sol --fork-url=${L2_RPC_URL}
+
+deployL1:
+	@echo "Setting environment variable LIVE_DEPLOY_READ_FILE_NAME to $(file)"
+	@export LIVE_DEPLOY_READ_FILE_NAME=$(file) && forge script script/deploy/deployAll.s.sol --sig "run(string)" $(file) --fork-url=${L1_RPC_URL}
+
+deployL2:
+	@echo "Setting environment variable LIVE_DEPLOY_READ_FILE_NAME to $(file)"
+	@export LIVE_DEPLOY_READ_FILE_NAME=$(file) && forge script script/deploy/deployAll.s.sol --sig "run(string)" $(file) --fork-url=${L1_RPC_URL}
+
+live-deployL1:
+	@echo "Setting environment variable LIVE_DEPLOY_READ_FILE_NAME to $(file)"
+	@export LIVE_DEPLOY_READ_FILE_NAME=$(file) && forge script script/deploy/deployAll.s.sol --sig "run(string)" $(file) --fork-url=${L1_RPC_URL} --private-key=$(PRIVATE_KEY) --broadcast --slow --verify
+
+live-deployL2:
+	@echo "Setting environment variable LIVE_DEPLOY_READ_FILE_NAME to $(file)"
+	@export LIVE_DEPLOY_READ_FILE_NAME=$(file) && forge script script/deploy/deployAll.s.sol --sig "run(string)" $(file) --fork-url=${L1_RPC_URL} --private-key=$(PRIVATE_KEY) --broadcast --slow --verify
+
+prettier:
+	prettier --write '**/*.{md,yml,yaml,ts,js}'
+
+solhint:
+	solhint -w 0 'src/**/*.sol'
+
+slither: 
+	slither src
+
+prepare:
+	husky
+
+deploy-createx-l1: 
+	forge script script/DeployCustomCreatex.s.sol --rpc-url $L1_RPC_URL --private-key $PRIVATE_KEY --slow --no-metadata
+
+deploy-createx-l2:
+	forge script script/DeployCustomCreatex.s.sol --rpc-url $L2_RPC_URL --private-key $PRIVATE_KEY --slow --no-metadata
+
+check-configs: 
+	bun lzConfigCheck.cjs
diff --git a/deployment-config/chains/1.json b/deployment-config/chains/1.json
@@ -1,4 +1,5 @@
 {
+  "name": "Ethereum",
   "balancerVault": "0xBA12222222228d8Ba445958a75a0704d566BF2C8",
   "opMessenger": "0x25ace71c97B33Cc4729CF772ae268934F7ab5fA1",
   "lzEndpoint": "0x1a44076050125825900e736c501f859c50fE728c",

diff --git a/deployment-config/chains/11155111.json b/deployment-config/chains/11155111.json
@@ -1,4 +1,5 @@
 {
+    "name": "Ethereum Sepolia",
     "balancerVault": "0xBA12222222228d8Ba445958a75a0704d566BF2C8",
     "lzEndpoint": "0x6EDCE65403992e310A62460808c4b910D972f10f"
   }
diff --git a/deployment-config/chains/1329.json b/deployment-config/chains/1329.json
@@ -1,4 +1,5 @@
 {
+  "name": "Sei",
   "balancerVault": "0x0000000000000000000000000000000000000000",
   "lzEndpoint": "0x1a44076050125825900e736c501f859c50fE728c"
 }
diff --git a/deployment-config/chains/252.json b/deployment-config/chains/252.json
@@ -1,4 +1,5 @@
 {
+    "name": "Fraxtal",
     "balancerVault": "0x0000000000000000000000000000000000000000",
     "lzEndpoint": "0x1a44076050125825900e736c501f859c50fE728c"
 }
diff --git a/deployment-config/chains/288.json b/deployment-config/chains/288.json
@@ -1,4 +1,5 @@
 {
+  "name": "Boba",
   "balancerVault": "0x0000000000000000000000000000000000000000",
   "lzEndpoint": "0x0000000000000000000000000000000000000000"
 }
diff --git a/deployment-config/exampleL1.json b/deployment-config/exampleL1.json
@@ -1,19 +1,19 @@
 {
   "base": "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2",
-  "protocolAdmin": "0xC2d99d76bb9D46BF8Ec9449E4DfAE48C30CF0839",
+  "protocolAdmin": "0x0000000000417626Ef34D62C4DC189b021603f2F",
   "boringVaultAndBaseDecimals": "18",
   "boringVault": {
-    "boringVaultSalt": "0x1ddd634c506ad203da17ff000000000000000000000000000000000000000010",
+    "boringVaultSalt": "0x1ddd634c506ad203da17ff00000000000000000000000000000000000000001c",
     "boringVaultName": "Nucleus Vault",
     "boringVaultSymbol": "NV",
     "address": "0x0000000000E7Ab44153eEBEF2343ba5289F65dAC"
   },
   "manager": {
-    "managerSalt": "0x30432d4b4ec00003b4a250000000000000000000000000000000000000000010",
+    "managerSalt": "0x30432d4b4ec00003b4a25000000000000000000000000000000000000000001c",
     "address": "0x0000000000fAd6Db23abdC1a85621B97bd1Dc82f"
   },
   "accountant": {
-    "accountantSalt": "0x6a184dbea6f3cc0318679f000000000000000000000000000000000000000010",
+    "accountantSalt": "0x6a184dbea6f3cc0318679f00000000000000000000000000000000000000001c",
     "payoutAddress": "0x0000000000417626Ef34D62C4DC189b021603f2F",
     "allowedExchangeRateChangeUpper": "10003",
     "allowedExchangeRateChangeLower": "9998",
@@ -22,14 +22,12 @@
     "address": "0x00000000004F96C07B83e86600D86F9479bB43fa"
   },
   "teller": {
-    "tellerSalt": "0x51f8968749a56d01202c91000000000000000000000000000000000000000010",
+    "tellerSalt": "0x51f8968749a56d01202c9100000000000000000000000000000000000000001c",
     "maxGasForPeer": 100000,
     "minGasForPeer": 0,
     "peerEid": 30280,
-    "tellerContractName": "MultiChainLayerZeroTellerWithMultiAssetSupport",
+    "tellerContractName": "TellerWithMultiAssetSupport",
     "assets": [
-      "0xCd5fE23C85820F7B72D0926FC9b05b43E359b7ee",
-      "0xbf5495Efe5DB9ce00f80364C8B423567e58d2110"
     ],
     "dvnIfNoDefault": {
       "required": [
@@ -47,13 +45,13 @@
     "address": "0x00000000004F96C07B83e86600D86F0000000000"
   },
   "rolesAuthority": {
-    "rolesAuthoritySalt": "0x66bbc3b3b3000b01466a3a000000000000000000000000000000000000000010",
+    "rolesAuthoritySalt": "0x66bbc3b3b3000b01466a3a00000000000000000000000000000000000000001c",
     "strategist": "0xC2d99d76bb9D46BF8Ec9449E4DfAE48C30CF0839",
     "exchangeRateBot": "0x00000000004F96C07B83e86600D86F0000000000",
     "address": "0x00000000004F96C07B83e86600D86F0000000000"
   },
   "decoder": {
-    "decoderSalt": "0x48b53893da2e0b0248268c000000000000000000000000000000000000000010",
+    "decoderSalt": "0x48b53893da2e0b0248268c00000000000000000000000000000000000000001c",
     "address": "0x00000000004F96C07B83e86600D86F0000000000"
   }
 }
diff --git a/deployment-config/exampleL2.json b/deployment-config/exampleL2.json
@@ -26,7 +26,7 @@
     "maxGasForPeer": 100000,
     "minGasForPeer": 0,
     "peerEid": 30280,
-    "tellerContractName": "MultiChainLayerZeroTellerWithMultiAssetSupport",
+    "tellerContractName": "TellerWithMultiAssetSupport",
     "assets": [],
     "dvnIfNoDefault": {
       "required": [

diff --git a/deployment-config/form-btc-testnet-l1-08-30-24.json b/deployment-config/form-btc-testnet-l1-08-30-24.json
@@ -1,19 +1,19 @@
 {
-  "base": "0x92f3B59a79bFf5dc60c0d59eA13a44D082B2bdFC",
+  "base": "0x0893A950E8f80B21658ba35D39d9AB00cCa95589",
   "protocolAdmin": "0x0000000000417626Ef34D62C4DC189b021603f2F",
   "boringVaultAndBaseDecimals": "8",
   "boringVault": {
-    "boringVaultSalt": "0x1ddd634c506ad203da17ff000000000000000000000000000000000000000012",
-    "boringVaultName": "Form ETH",
-    "boringVaultSymbol": "FETH",
+    "boringVaultSalt": "0x1ddd634c506ad203da17ff000000000000000000000000000000000000000011",
+    "boringVaultName": "Form BTC",
+    "boringVaultSymbol": "FBTC",
     "address": "0x0000000000000000000000000000000000000000"
   },
   "manager": {
-    "managerSalt": "0x30432d4b4ec00003b4a250000000000000000000000000000000000000000012",
+    "managerSalt": "0x30432d4b4ec00003b4a250000000000000000000000000000000000000000011",
     "address": "0x0000000000000000000000000000000000000000"
   },
   "accountant": {
-    "accountantSalt": "0x6a184dbea6f3cc0318679f000000000000000000000000000000000000000012",
+    "accountantSalt": "0x6a184dbea6f3cc0318679f000000000000000000000000000000000000000011",
     "payoutAddress": "0x0000000000417626Ef34D62C4DC189b021603f2F",
     "allowedExchangeRateChangeUpper": "10003",
     "allowedExchangeRateChangeLower": "9998",
@@ -22,7 +22,7 @@
     "address": "0x0000000000000000000000000000000000000000"
   },
   "teller": {
-    "tellerSalt": "0x51f8968749a56d01202c91000000000000000000000000000000000000000012",
+    "tellerSalt": "0x51f8968749a56d01202c91000000000000000000000000000000000000000011",
     "maxGasForPeer": 100000,
     "minGasForPeer": 0,
     "peerEid": 40270,
@@ -45,13 +45,13 @@
     "address": "0x0000000000000000000000000000000000000000"
   },
   "rolesAuthority": {
-    "rolesAuthoritySalt": "0x66bbc3b3b3000b01466a3a000000000000000000000000000000000000000012",
+    "rolesAuthoritySalt": "0x66bbc3b3b3000b01466a3a000000000000000000000000000000000000000011",
     "strategist": "0x0000000000417626Ef34D62C4DC189b021603f2F",
     "exchangeRateBot": "0x0000000000417626Ef34D62C4DC189b021603f2F",
     "address": "0x0000000000000000000000000000000000000000"
   },
   "decoder": {
-    "decoderSalt": "0x48b53893da2e0b0248268c000000000000000000000000000000000000000012",
+    "decoderSalt": "0x48b53893da2e0b0248268c000000000000000000000000000000000000000011",
     "address": "0x0000000000000000000000000000000000000000"
   }
 }
diff --git a/deployment-config/form-eth-testnet-l1-08-30-24.json b/deployment-config/form-eth-testnet-l1-08-30-24.json
@@ -1,5 +1,5 @@
 {
-    "base": "0xb16F35c0Ae2912430DAc15764477E179D9B9EbEa",
+    "base": "0xee44150250AfF3E6aC25539765F056EDb7F85D7B",
     "protocolAdmin": "0x0000000000417626Ef34D62C4DC189b021603f2F",
     "boringVaultAndBaseDecimals": "18",
     "boringVault": {

diff --git a/deployment-config/form-usd-testnet-l1-08-30-24.json b/deployment-config/form-usd-testnet-l1-08-30-24.json
@@ -1,19 +1,19 @@
 {
-  "base": "0x51fCe89b9f6D4c530698f181167043e1bB4abf89",
+  "base": "0x66248001cdB1B26B66a89aA7227424Bb14937eCD",
   "protocolAdmin": "0x0000000000417626Ef34D62C4DC189b021603f2F",
   "boringVaultAndBaseDecimals": "6",
   "boringVault": {
-    "boringVaultSalt": "0x1ddd634c506ad203da17ff000000000000000000000000000000000000000010",
-    "boringVaultName": "Form ETH",
-    "boringVaultSymbol": "FETH",
+    "boringVaultSalt": "0x1ddd634c506ad203da17ff000000000000000000000000000000000000000012",
+    "boringVaultName": "Form USDC",
+    "boringVaultSymbol": "FUSDC",
     "address": "0x0000000000000000000000000000000000000000"
   },
   "manager": {
-    "managerSalt": "0x30432d4b4ec00003b4a250000000000000000000000000000000000000000010",
+    "managerSalt": "0x30432d4b4ec00003b4a250000000000000000000000000000000000000000012",
     "address": "0x0000000000000000000000000000000000000000"
   },
   "accountant": {
-    "accountantSalt": "0x6a184dbea6f3cc0318679f000000000000000000000000000000000000000010",
+    "accountantSalt": "0x6a184dbea6f3cc0318679f000000000000000000000000000000000000000012",
     "payoutAddress": "0x0000000000417626Ef34D62C4DC189b021603f2F",
     "allowedExchangeRateChangeUpper": "10003",
     "allowedExchangeRateChangeLower": "9998",
@@ -22,7 +22,7 @@
     "address": "0x0000000000000000000000000000000000000000"
   },
   "teller": {
-    "tellerSalt": "0x51f8968749a56d01202c91000000000000000000000000000000000000000010",
+    "tellerSalt": "0x51f8968749a56d01202c91000000000000000000000000000000000000000012",
     "maxGasForPeer": 100000,
     "minGasForPeer": 0,
     "peerEid": 40270,
@@ -45,13 +45,13 @@
     "address": "0x0000000000000000000000000000000000000000"
   },
   "rolesAuthority": {
-    "rolesAuthoritySalt": "0x66bbc3b3b3000b01466a3a000000000000000000000000000000000000000010",
+    "rolesAuthoritySalt": "0x66bbc3b3b3000b01466a3a000000000000000000000000000000000000000012",
     "strategist": "0x0000000000417626Ef34D62C4DC189b021603f2F",
     "exchangeRateBot": "0x0000000000417626Ef34D62C4DC189b021603f2F",
     "address": "0x0000000000000000000000000000000000000000"
   },
   "decoder": {
-    "decoderSalt": "0x48b53893da2e0b0248268c000000000000000000000000000000000000000010",
+    "decoderSalt": "0x48b53893da2e0b0248268c000000000000000000000000000000000000000012",
     "address": "0x0000000000000000000000000000000000000000"
   }
 }
diff --git a/test/ion/oracles/GenericRateProvider.t.sol b/test/ion/oracles/GenericRateProvider.t.sol
@@ -22,18 +22,18 @@ abstract contract GenericRateProviderTest is Test {
 
         _initialize();
 
-        require(address(rateProvider) != address(0), "rate provider not set");
-        require(decimals > 0, "decimals not set");
-        require(target != address(0), "target not set");
-        require(bytes4(selector).length > 0, "selector not set");
+        assertNotEq(address(rateProvider), address(0), "rate provider not set");
+        assertGt(decimals, 0, "decimals not set");
+        assertNotEq(target, address(0), "target not set");
+        assertGt(bytes4(selector).length, 0, "selector not set");
     }
 
     function test_GetRateWithinExpectedBounds() public {
         uint256 rate = rateProvider.getRate();
         (uint256 min, uint256 max) = _expectedRateMinMax();
 
-        require(rate >= min, "rate must be greater than or equal to min");
-        require(rate <= max, "rate must be less than or equal to max");
+        assertGe(rate, min, "rate must be greater than or equal to min");
+        assertLe(rate, max, "rate must be less than or equal to max");
     }
 
     function _initialize() public virtual;