From cbe0b2e4fb524a8c71439fe6ca7cd1e8221c6caa Mon Sep 17 00:00:00 2001 From: Carson Date: Sun, 1 Sep 2024 17:46:41 -0400 Subject: [PATCH 1/8] build: form deployment on sepolia --- Makefile | 19 ++- .../form-btc-testnet-l1-08-30-24.json | 110 +++++++++--------- .../form-eth-testnet-l1-08-30-24.json | 2 +- .../form-usd-testnet-l1-08-30-24.json | 110 +++++++++--------- 4 files changed, 127 insertions(+), 114 deletions(-) diff --git a/Makefile b/Makefile index 4bf4c2f..630343d 100644 --- a/Makefile +++ b/Makefile @@ -6,4 +6,21 @@ 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} \ No newline at end of file + @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 + diff --git a/deployment-config/form-btc-testnet-l1-08-30-24.json b/deployment-config/form-btc-testnet-l1-08-30-24.json index 7dccdc1..5805959 100644 --- a/deployment-config/form-btc-testnet-l1-08-30-24.json +++ b/deployment-config/form-btc-testnet-l1-08-30-24.json @@ -1,59 +1,57 @@ { - "base": "0x92f3B59a79bFf5dc60c0d59eA13a44D082B2bdFC", - "protocolAdmin": "0x0000000000417626Ef34D62C4DC189b021603f2F", - "boringVaultAndBaseDecimals": "8", - "boringVault": { - "boringVaultSalt": "0x1ddd634c506ad203da17ff00000000000000000000000000000000000000000e", - "boringVaultName": "Form ETH", - "boringVaultSymbol": "FETH", - "address": "0x0000000000000000000000000000000000000000" - }, - "manager": { - "managerSalt": "0x30432d4b4ec00003b4a25000000000000000000000000000000000000000000e", - "address": "0x0000000000000000000000000000000000000000" - }, - "accountant": { - "accountantSalt": "0x6a184dbea6f3cc0318679f00000000000000000000000000000000000000000e", - "payoutAddress": "0x0000000000417626Ef34D62C4DC189b021603f2F", - "allowedExchangeRateChangeUpper": "10003", - "allowedExchangeRateChangeLower": "9998", - "minimumUpdateDelayInSeconds": "3600", - "managementFee": "0", - "address": "0x0000000000000000000000000000000000000000" - }, - "teller": { - "tellerSalt": "0x51f8968749a56d01202c9100000000000000000000000000000000000000000e", - "maxGasForPeer": 100000, - "minGasForPeer": 0, - "peerEid": 40270, - "tellerContractName": "TellerWithMultiAssetSupport", - "opMessenger": "0x58Cc85b8D04EA49cC6DBd3CbFFd00B4B8D6cb3ef", - "assets": [ - + "base": "0x0893A950E8f80B21658ba35D39d9AB00cCa95589", + "protocolAdmin": "0x0000000000417626Ef34D62C4DC189b021603f2F", + "boringVaultAndBaseDecimals": "8", + "boringVault": { + "boringVaultSalt": "0x1ddd634c506ad203da17ff000000000000000000000000000000000000000011", + "boringVaultName": "Form BTC", + "boringVaultSymbol": "FBTC", + "address": "0x0000000000000000000000000000000000000000" + }, + "manager": { + "managerSalt": "0x30432d4b4ec00003b4a250000000000000000000000000000000000000000011", + "address": "0x0000000000000000000000000000000000000000" + }, + "accountant": { + "accountantSalt": "0x6a184dbea6f3cc0318679f000000000000000000000000000000000000000011", + "payoutAddress": "0x0000000000417626Ef34D62C4DC189b021603f2F", + "allowedExchangeRateChangeUpper": "10003", + "allowedExchangeRateChangeLower": "9998", + "minimumUpdateDelayInSeconds": "3600", + "managementFee": "0", + "address": "0x0000000000000000000000000000000000000000" + }, + "teller": { + "tellerSalt": "0x51f8968749a56d01202c91000000000000000000000000000000000000000011", + "maxGasForPeer": 100000, + "minGasForPeer": 0, + "peerEid": 40270, + "tellerContractName": "TellerWithMultiAssetSupport", + "opMessenger": "0x58Cc85b8D04EA49cC6DBd3CbFFd00B4B8D6cb3ef", + "assets": [], + "dvnIfNoDefault": { + "required": [ + "0x589dEDbD617e0CBcB916A9223F4d1300c294236b" ], - "dvnIfNoDefault": { - "required": [ - "0x589dEDbD617e0CBcB916A9223F4d1300c294236b" - ], - "optional": [ - "0x380275805876Ff19055EA900CDb2B46a94ecF20D", - "0x8FafAE7Dd957044088b3d0F67359C327c6200d18", - "0xa59BA433ac34D2927232918Ef5B2eaAfcF130BA5", - "0xe552485d02EDd3067FE7FCbD4dd56BB1D3A998D2" - ], - "blockConfirmationsRequiredIfNoDefault": 15, - "optionalThreshold": 1 - }, - "address": "0x0000000000000000000000000000000000000000" - }, - "rolesAuthority": { - "rolesAuthoritySalt": "0x66bbc3b3b3000b01466a3a00000000000000000000000000000000000000000e", - "strategist": "0x0000000000417626Ef34D62C4DC189b021603f2F", - "exchangeRateBot": "0x0000000000417626Ef34D62C4DC189b021603f2F", - "address": "0x0000000000000000000000000000000000000000" + "optional": [ + "0x380275805876Ff19055EA900CDb2B46a94ecF20D", + "0x8FafAE7Dd957044088b3d0F67359C327c6200d18", + "0xa59BA433ac34D2927232918Ef5B2eaAfcF130BA5", + "0xe552485d02EDd3067FE7FCbD4dd56BB1D3A998D2" + ], + "blockConfirmationsRequiredIfNoDefault": 15, + "optionalThreshold": 1 }, - "decoder": { - "decoderSalt": "0x48b53893da2e0b0248268c00000000000000000000000000000000000000000e", - "address": "0x0000000000000000000000000000000000000000" - } - } \ No newline at end of file + "address": "0x0000000000000000000000000000000000000000" + }, + "rolesAuthority": { + "rolesAuthoritySalt": "0x66bbc3b3b3000b01466a3a000000000000000000000000000000000000000011", + "strategist": "0x0000000000417626Ef34D62C4DC189b021603f2F", + "exchangeRateBot": "0x0000000000417626Ef34D62C4DC189b021603f2F", + "address": "0x0000000000000000000000000000000000000000" + }, + "decoder": { + "decoderSalt": "0x48b53893da2e0b0248268c000000000000000000000000000000000000000011", + "address": "0x0000000000000000000000000000000000000000" + } +} \ No newline at end of file diff --git a/deployment-config/form-eth-testnet-l1-08-30-24.json b/deployment-config/form-eth-testnet-l1-08-30-24.json index b8041a5..bcb0cb6 100644 --- 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 index 2401f6e..6206524 100644 --- a/deployment-config/form-usd-testnet-l1-08-30-24.json +++ b/deployment-config/form-usd-testnet-l1-08-30-24.json @@ -1,59 +1,57 @@ { - "base": "0x51fCe89b9f6D4c530698f181167043e1bB4abf89", - "protocolAdmin": "0x0000000000417626Ef34D62C4DC189b021603f2F", - "boringVaultAndBaseDecimals": "6", - "boringVault": { - "boringVaultSalt": "0x1ddd634c506ad203da17ff00000000000000000000000000000000000000000e", - "boringVaultName": "Form ETH", - "boringVaultSymbol": "FETH", - "address": "0x0000000000000000000000000000000000000000" - }, - "manager": { - "managerSalt": "0x30432d4b4ec00003b4a25000000000000000000000000000000000000000000e", - "address": "0x0000000000000000000000000000000000000000" - }, - "accountant": { - "accountantSalt": "0x6a184dbea6f3cc0318679f00000000000000000000000000000000000000000e", - "payoutAddress": "0x0000000000417626Ef34D62C4DC189b021603f2F", - "allowedExchangeRateChangeUpper": "10003", - "allowedExchangeRateChangeLower": "9998", - "minimumUpdateDelayInSeconds": "3600", - "managementFee": "0", - "address": "0x0000000000000000000000000000000000000000" - }, - "teller": { - "tellerSalt": "0x51f8968749a56d01202c9100000000000000000000000000000000000000000e", - "maxGasForPeer": 100000, - "minGasForPeer": 0, - "peerEid": 40270, - "tellerContractName": "TellerWithMultiAssetSupport", - "opMessenger": "0x58Cc85b8D04EA49cC6DBd3CbFFd00B4B8D6cb3ef", - "assets": [ - + "base": "0x66248001cdB1B26B66a89aA7227424Bb14937eCD", + "protocolAdmin": "0x0000000000417626Ef34D62C4DC189b021603f2F", + "boringVaultAndBaseDecimals": "6", + "boringVault": { + "boringVaultSalt": "0x1ddd634c506ad203da17ff000000000000000000000000000000000000000012", + "boringVaultName": "Form USDC", + "boringVaultSymbol": "FUSDC", + "address": "0x0000000000000000000000000000000000000000" + }, + "manager": { + "managerSalt": "0x30432d4b4ec00003b4a250000000000000000000000000000000000000000012", + "address": "0x0000000000000000000000000000000000000000" + }, + "accountant": { + "accountantSalt": "0x6a184dbea6f3cc0318679f000000000000000000000000000000000000000012", + "payoutAddress": "0x0000000000417626Ef34D62C4DC189b021603f2F", + "allowedExchangeRateChangeUpper": "10003", + "allowedExchangeRateChangeLower": "9998", + "minimumUpdateDelayInSeconds": "3600", + "managementFee": "0", + "address": "0x0000000000000000000000000000000000000000" + }, + "teller": { + "tellerSalt": "0x51f8968749a56d01202c91000000000000000000000000000000000000000012", + "maxGasForPeer": 100000, + "minGasForPeer": 0, + "peerEid": 40270, + "tellerContractName": "TellerWithMultiAssetSupport", + "opMessenger": "0x58Cc85b8D04EA49cC6DBd3CbFFd00B4B8D6cb3ef", + "assets": [], + "dvnIfNoDefault": { + "required": [ + "0x589dEDbD617e0CBcB916A9223F4d1300c294236b" ], - "dvnIfNoDefault": { - "required": [ - "0x589dEDbD617e0CBcB916A9223F4d1300c294236b" - ], - "optional": [ - "0x380275805876Ff19055EA900CDb2B46a94ecF20D", - "0x8FafAE7Dd957044088b3d0F67359C327c6200d18", - "0xa59BA433ac34D2927232918Ef5B2eaAfcF130BA5", - "0xe552485d02EDd3067FE7FCbD4dd56BB1D3A998D2" - ], - "blockConfirmationsRequiredIfNoDefault": 15, - "optionalThreshold": 1 - }, - "address": "0x0000000000000000000000000000000000000000" - }, - "rolesAuthority": { - "rolesAuthoritySalt": "0x66bbc3b3b3000b01466a3a00000000000000000000000000000000000000000e", - "strategist": "0x0000000000417626Ef34D62C4DC189b021603f2F", - "exchangeRateBot": "0x0000000000417626Ef34D62C4DC189b021603f2F", - "address": "0x0000000000000000000000000000000000000000" + "optional": [ + "0x380275805876Ff19055EA900CDb2B46a94ecF20D", + "0x8FafAE7Dd957044088b3d0F67359C327c6200d18", + "0xa59BA433ac34D2927232918Ef5B2eaAfcF130BA5", + "0xe552485d02EDd3067FE7FCbD4dd56BB1D3A998D2" + ], + "blockConfirmationsRequiredIfNoDefault": 15, + "optionalThreshold": 1 }, - "decoder": { - "decoderSalt": "0x48b53893da2e0b0248268c00000000000000000000000000000000000000000e", - "address": "0x0000000000000000000000000000000000000000" - } - } \ No newline at end of file + "address": "0x0000000000000000000000000000000000000000" + }, + "rolesAuthority": { + "rolesAuthoritySalt": "0x66bbc3b3b3000b01466a3a000000000000000000000000000000000000000012", + "strategist": "0x0000000000417626Ef34D62C4DC189b021603f2F", + "exchangeRateBot": "0x0000000000417626Ef34D62C4DC189b021603f2F", + "address": "0x0000000000000000000000000000000000000000" + }, + "decoder": { + "decoderSalt": "0x48b53893da2e0b0248268c000000000000000000000000000000000000000012", + "address": "0x0000000000000000000000000000000000000000" + } +} \ No newline at end of file From aa5da38e6894aa774385f23502ee53302ed33e38 Mon Sep 17 00:00:00 2001 From: Carson Date: Sun, 1 Sep 2024 18:14:53 -0400 Subject: [PATCH 2/8] example changed --- deployment-config/exampleL1.json | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/deployment-config/exampleL1.json b/deployment-config/exampleL1.json index 8fea879..801e989 100644 --- a/deployment-config/exampleL1.json +++ b/deployment-config/exampleL1.json @@ -1,18 +1,19 @@ { - "protocolAdmin": "0xC2d99d76bb9D46BF8Ec9449E4DfAE48C30CF0839", + "base": "0xee44150250AfF3E6aC25539765F056EDb7F85D7B", + "protocolAdmin": "0x0000000000417626Ef34D62C4DC189b021603f2F", "boringVaultAndBaseDecimals": "18", "boringVault": { - "boringVaultSalt": "0x1ddd634c506ad203da17ff00000000000000000000000000000000000000000e", + "boringVaultSalt": "0x1ddd634c506ad203da17ff00000000000000000000000000000000000000001c", "boringVaultName": "Nucleus Vault", "boringVaultSymbol": "NV", "address": "0x0000000000E7Ab44153eEBEF2343ba5289F65dAC" }, "manager": { - "managerSalt": "0x30432d4b4ec00003b4a25000000000000000000000000000000000000000000e", + "managerSalt": "0x30432d4b4ec00003b4a25000000000000000000000000000000000000000001c", "address": "0x0000000000fAd6Db23abdC1a85621B97bd1Dc82f" }, "accountant": { - "accountantSalt": "0x6a184dbea6f3cc0318679f00000000000000000000000000000000000000000e", + "accountantSalt": "0x6a184dbea6f3cc0318679f00000000000000000000000000000000000000001c", "payoutAddress": "0x0000000000417626Ef34D62C4DC189b021603f2F", "base": "0x5f207d42F869fd1c71d7f0f81a2A67Fc20FF7323", "allowedExchangeRateChangeUpper": "10003", @@ -22,7 +23,7 @@ "address": "0x00000000004F96C07B83e86600D86F9479bB43fa" }, "teller": { - "tellerSalt": "0x51f8968749a56d01202c9100000000000000000000000000000000000000000e", + "tellerSalt": "0x51f8968749a56d01202c9100000000000000000000000000000000000000001c", "maxGasForPeer": 100000, "minGasForPeer": 0, "peerEid": 30280, @@ -47,13 +48,13 @@ "address": "0x00000000004F96C07B83e86600D86F0000000000" }, "rolesAuthority": { - "rolesAuthoritySalt": "0x66bbc3b3b3000b01466a3a00000000000000000000000000000000000000000e", + "rolesAuthoritySalt": "0x66bbc3b3b3000b01466a3a00000000000000000000000000000000000000001c", "strategist": "0xC2d99d76bb9D46BF8Ec9449E4DfAE48C30CF0839", "exchangeRateBot": "0x00000000004F96C07B83e86600D86F0000000000", "address": "0x00000000004F96C07B83e86600D86F0000000000" }, "decoder": { - "decoderSalt": "0x48b53893da2e0b0248268c00000000000000000000000000000000000000000e", + "decoderSalt": "0x48b53893da2e0b0248268c00000000000000000000000000000000000000001c", "address": "0x00000000004F96C07B83e86600D86F0000000000" } } \ No newline at end of file From 799dbdd027f0d9ea071c1492716e2c7111d83ebd Mon Sep 17 00:00:00 2001 From: Carson Date: Thu, 5 Sep 2024 12:17:40 -0400 Subject: [PATCH 3/8] refactor: comment to clarify why CREATEX is different --- script/Base.s.sol | 1 + 1 file changed, 1 insertion(+) diff --git a/script/Base.s.sol b/script/Base.s.sol index cb758d9..055b4b3 100644 --- a/script/Base.s.sol +++ b/script/Base.s.sol @@ -17,6 +17,7 @@ abstract contract BaseScript is Script { string constant CONFIG_CHAIN_ROOT = "./deployment-config/chains/"; /// Custom base params + // Address for Sepolia ICreateX CREATEX = ICreateX(0x1C64d5eBCf22AC237d00cF7bB9Be6395e59B23b7); /// @dev Included to enable compilation of the script without a $MNEMONIC environment variable. From 2ed232cc004feff709b6a2da790ea550226da81c Mon Sep 17 00:00:00 2001 From: Carson Date: Thu, 5 Sep 2024 12:29:09 -0400 Subject: [PATCH 4/8] refactor: no assets in example --- deployment-config/exampleL1.json | 4 +--- deployment-config/exampleL2.json | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/deployment-config/exampleL1.json b/deployment-config/exampleL1.json index 801e989..9726e93 100644 --- a/deployment-config/exampleL1.json +++ b/deployment-config/exampleL1.json @@ -27,10 +27,8 @@ "maxGasForPeer": 100000, "minGasForPeer": 0, "peerEid": 30280, - "tellerContractName": "MultiChainLayerZeroTellerWithMultiAssetSupport", + "tellerContractName": "TellerWithMultiAssetSupport", "assets": [ - "0xCd5fE23C85820F7B72D0926FC9b05b43E359b7ee", - "0xbf5495Efe5DB9ce00f80364C8B423567e58d2110" ], "dvnIfNoDefault": { "required": [ diff --git a/deployment-config/exampleL2.json b/deployment-config/exampleL2.json index 01fd6d2..16fb01c 100644 --- 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": [ From f0c86ffa34db913215d9bb5a9b83756c929bf6d0 Mon Sep 17 00:00:00 2001 From: Carson Date: Fri, 6 Sep 2024 14:21:52 -0400 Subject: [PATCH 5/8] fix: makefile fix --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 630343d..c92795e 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,7 @@ 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: +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 From 882e6c3d8bdda4711526b7c6dfab92bfd138bcaf Mon Sep 17 00:00:00 2001 From: Carson Date: Fri, 6 Sep 2024 14:32:15 -0400 Subject: [PATCH 6/8] fix: innacurate chain config data --- deployment-config/chains/1.json | 5 +++-- deployment-config/chains/11155111.json | 1 + deployment-config/chains/1329.json | 1 + deployment-config/chains/252.json | 1 + deployment-config/chains/288.json | 1 + 5 files changed, 7 insertions(+), 2 deletions(-) diff --git a/deployment-config/chains/1.json b/deployment-config/chains/1.json index 195e5b6..5c2bcbb 100644 --- a/deployment-config/chains/1.json +++ b/deployment-config/chains/1.json @@ -1,4 +1,5 @@ { + "name": "Ethereum", "balancerVault": "0xBA12222222228d8Ba445958a75a0704d566BF2C8", "opMessenger": "0x25ace71c97B33Cc4729CF772ae268934F7ab5fA1", "lzEndpoint": "0x1a44076050125825900e736c501f859c50fE728c", @@ -50,11 +51,11 @@ "rateProvider": "0x318Da095d602C08eF41319f4c4bA0646d318C906", "decimals": 8 }, - "":{ + "0x9ba021b0a9b958b5e75ce9f6dff97c7ee52cb3e6":{ "priceFeed": "0x19219bc90f48dee4d5cf202e09c438faacfd8bea", "rateProvider": "", "decimals": 18, - "description": "STETH / ETH", + "description": "apxETH/ETH", "priceFeedType": 1 } diff --git a/deployment-config/chains/11155111.json b/deployment-config/chains/11155111.json index 68a80b5..e900a9a 100644 --- a/deployment-config/chains/11155111.json +++ b/deployment-config/chains/11155111.json @@ -1,4 +1,5 @@ { + "name": "Ethereum Sepolia", "balancerVault": "0xBA12222222228d8Ba445958a75a0704d566BF2C8", "lzEndpoint": "0x6EDCE65403992e310A62460808c4b910D972f10f" } \ No newline at end of file diff --git a/deployment-config/chains/1329.json b/deployment-config/chains/1329.json index 67171d8..4596379 100644 --- a/deployment-config/chains/1329.json +++ b/deployment-config/chains/1329.json @@ -1,4 +1,5 @@ { + "name": "Sei", "balancerVault": "0x0000000000000000000000000000000000000000", "lzEndpoint": "0x1a44076050125825900e736c501f859c50fE728c" } \ No newline at end of file diff --git a/deployment-config/chains/252.json b/deployment-config/chains/252.json index 68c5b63..b7c0c39 100644 --- a/deployment-config/chains/252.json +++ b/deployment-config/chains/252.json @@ -1,4 +1,5 @@ { + "name": "Fraxtal", "balancerVault": "0x0000000000000000000000000000000000000000", "lzEndpoint": "0x1a44076050125825900e736c501f859c50fE728c" } \ No newline at end of file diff --git a/deployment-config/chains/288.json b/deployment-config/chains/288.json index 1d0cca9..21e0d49 100644 --- a/deployment-config/chains/288.json +++ b/deployment-config/chains/288.json @@ -1,4 +1,5 @@ { + "name": "Boba", "balancerVault": "0x0000000000000000000000000000000000000000", "lzEndpoint": "0x0000000000000000000000000000000000000000" } \ No newline at end of file From b3bdef2b17bc1b43db71686dab58f8beb528b693 Mon Sep 17 00:00:00 2001 From: Carson Date: Fri, 6 Sep 2024 14:39:37 -0400 Subject: [PATCH 7/8] chore: scripts moved to makefile --- .vscode/settings.json | 5 +++++ Makefile | 20 ++++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..df50115 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,5 @@ +{ + "cSpell.enableFiletypes": [ + "makefile" + ] +} \ No newline at end of file diff --git a/Makefile b/Makefile index c92795e..935477e 100644 --- a/Makefile +++ b/Makefile @@ -24,3 +24,23 @@ 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 \ No newline at end of file From c15a117d44018d9621f9a99e4aadd6c947858d35 Mon Sep 17 00:00:00 2001 From: Carson Date: Fri, 6 Sep 2024 14:56:49 -0400 Subject: [PATCH 8/8] test: generic rate provider require has asserts --- test/ion/oracles/GenericRateProvider.t.sol | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test/ion/oracles/GenericRateProvider.t.sol b/test/ion/oracles/GenericRateProvider.t.sol index d40c3e1..0ddb4a0 100644 --- 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;