Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Carson/apx eth rate provider #19

Closed
wants to merge 31 commits into from
Closed

Carson/apx eth rate provider #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
b418923
feat: added helper script for send1weicrosschain
CarsonCase Aug 19, 2024
ec38591
fix: proompt for use of default
CarsonCase Aug 19, 2024
38820a6
fix: leftPaddedBytes32 for peer with check
CarsonCase Aug 20, 2024
5898682
refactor: dead address constant
CarsonCase Aug 20, 2024
41dabdb
feat: new lzConfigCheck.cjs file
CarsonCase Aug 21, 2024
d08740b
refactor: cleanup and added script to package.json
CarsonCase Aug 21, 2024
dcc199e
fix: do not hardcode boring vault decimals
junkim012 Aug 22, 2024
9ccf8e9
refactor: nucleus vault and removed convinence script
CarsonCase Aug 22, 2024
75486a1
feat: incrementSalt.cjs
CarsonCase Aug 22, 2024
730e53d
feat: optional --sig run(string memory) configFile deployment script …
CarsonCase Aug 22, 2024
5d9f961
removed old live tests
CarsonCase Aug 22, 2024
8eddf81
fix: bug in deployment script
CarsonCase Aug 22, 2024
29b9d21
refactor: fmt
CarsonCase Aug 22, 2024
d5e989b
Merge branch 'carson/dvm-script' into carson/deploy-testing
CarsonCase Aug 22, 2024
4bcbf6a
test: beginings of live tests. Passing
CarsonCase Aug 23, 2024
9bec840
test: included bulk withdrawal in test
CarsonCase Aug 23, 2024
7cf84b0
test: passing test for rate change
CarsonCase Aug 26, 2024
dba7e36
test: including rate change for non-base assets
CarsonCase Aug 27, 2024
1fa6eba
feat: makefile for checkL1 and checkL2
CarsonCase Aug 27, 2024
906e20e
test: LiveDeploy complete, working on RateMath
CarsonCase Aug 29, 2024
d6304bb
fix: live test now works with default
CarsonCase Aug 29, 2024
1dc1123
fix: removed testMath in teller test
CarsonCase Aug 29, 2024
a33b2f8
test: refactoring tests according to PR comments
CarsonCase Aug 29, 2024
6f1b314
chore: removed .working file and moved it to another branch
CarsonCase Aug 29, 2024
8b31ff5
fix: import error
CarsonCase Aug 29, 2024
4bb9320
test: ERC20 check
CarsonCase Aug 30, 2024
34eb07b
chore: chain config sepolia
CarsonCase Aug 30, 2024
5bc1215
refactor: ready for deployment, awaiting form confirmation
CarsonCase Aug 30, 2024
770d84a
test: prep for rate apxETH rate provider and test
CarsonCase Aug 30, 2024
bca4f72
refactor: spell error
CarsonCase Sep 6, 2024
fcb8dd1
refactor: spell error, unsaved file
CarsonCase Sep 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
include .env

checkL1:
@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=${L1_RPC_URL}

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}
2 changes: 1 addition & 1 deletion deployment-config/boba-eth-l1-08-09-24.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"protocolAdmin": "0x0000000000417626Ef34D62C4DC189b021603f2F",
"base": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
"baseDecimals": "18",
"boringVaultAndBaseDecimals": "18",
"boringVault": {
"boringVaultSalt": "0x1000000000000000000000000000000000000000000000000000000000000001",
"boringVaultName": "Boba Native Yield Nucleus Token",
Expand Down
2 changes: 1 addition & 1 deletion deployment-config/boba-eth-l2-08-09-24.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"protocolAdmin": "0x0888c3D797E13892C5e67cD802F93Ffe55Ea2826",
"base": "0xDeadDeAddeAddEAddeadDEaDDEAdDeaDDeAD0000",
"baseDecimals": "18",
"boringVaultAndBaseDecimals": "18",
"boringVault": {
"boringVaultSalt": "0x1000000000000000000000000000000000000000000000000000000000000001",
"boringVaultName": "Boba Native Yield Nucleus Token",
Expand Down
13 changes: 11 additions & 2 deletions deployment-config/chains/1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,24 @@
"priceFeedType": 1
},
"0x7f39c581f595b53c5cb19bd0b3f8da6c935e2ca0": {
"priceFeed": "",
"priceFeed": "0x86392dC19c0b719886221c78AB11eb8Cf5c52812",
"rateProvider": "0xa360Df495d0560bDDc5d681B54991629965ae170",
"decimals": 18,
"description": "",
"description": "STETH / ETH",
"priceFeedType": 0
},
"0x8db2350d78abc13f5673a411d4700bcf87864dde": {
"rateProvider": "0x318Da095d602C08eF41319f4c4bA0646d318C906",
"decimals": 8
},
"0x9ba021b0a9b958b5e75ce9f6dff97c7ee52cb3e6":{
"priceFeed": "0x19219bc90f48dee4d5cf202e09c438faacfd8bea",
"rateProvider": "0x0000000000000000000000000000000000000000",
"decimals": 18,
"description": "apxETH/ETH",
"priceFeedType": 1

}

}
}
4 changes: 4 additions & 0 deletions deployment-config/chains/11155111.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"balancerVault": "0xBA12222222228d8Ba445958a75a0704d566BF2C8",
"lzEndpoint": "0x6EDCE65403992e310A62460808c4b910D972f10f"
}
59 changes: 59 additions & 0 deletions deployment-config/exampleL1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
{
"base": "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2",
"protocolAdmin": "0xC2d99d76bb9D46BF8Ec9449E4DfAE48C30CF0839",
"boringVaultAndBaseDecimals": "18",
"boringVault": {
"boringVaultSalt": "0x1ddd634c506ad203da17ff000000000000000000000000000000000000000010",
"boringVaultName": "Nucleus Vault",
"boringVaultSymbol": "NV",
"address": "0x0000000000E7Ab44153eEBEF2343ba5289F65dAC"
},
"manager": {
"managerSalt": "0x30432d4b4ec00003b4a250000000000000000000000000000000000000000010",
"address": "0x0000000000fAd6Db23abdC1a85621B97bd1Dc82f"
},
"accountant": {
"accountantSalt": "0x6a184dbea6f3cc0318679f000000000000000000000000000000000000000010",
"payoutAddress": "0x0000000000417626Ef34D62C4DC189b021603f2F",
"allowedExchangeRateChangeUpper": "10003",
"allowedExchangeRateChangeLower": "9998",
"minimumUpdateDelayInSeconds": "3600",
"managementFee": "2000",
"address": "0x00000000004F96C07B83e86600D86F9479bB43fa"
},
"teller": {
"tellerSalt": "0x51f8968749a56d01202c91000000000000000000000000000000000000000010",
"maxGasForPeer": 100000,
"minGasForPeer": 0,
"peerEid": 30280,
"tellerContractName": "MultiChainLayerZeroTellerWithMultiAssetSupport",
"assets": [
"0xCd5fE23C85820F7B72D0926FC9b05b43E359b7ee",
"0xbf5495Efe5DB9ce00f80364C8B423567e58d2110"
],
"dvnIfNoDefault": {
"required": [
"0x589dEDbD617e0CBcB916A9223F4d1300c294236b"
],
"optional": [
"0x380275805876Ff19055EA900CDb2B46a94ecF20D",
"0x8FafAE7Dd957044088b3d0F67359C327c6200d18",
"0xa59BA433ac34D2927232918Ef5B2eaAfcF130BA5",
"0xe552485d02EDd3067FE7FCbD4dd56BB1D3A998D2"
],
"blockConfirmationsRequiredIfNoDefault": 15,
"optionalThreshold": 1
},
"address": "0x00000000004F96C07B83e86600D86F0000000000"
},
"rolesAuthority": {
"rolesAuthoritySalt": "0x66bbc3b3b3000b01466a3a000000000000000000000000000000000000000010",
"strategist": "0xC2d99d76bb9D46BF8Ec9449E4DfAE48C30CF0839",
"exchangeRateBot": "0x00000000004F96C07B83e86600D86F0000000000",
"address": "0x00000000004F96C07B83e86600D86F0000000000"
},
"decoder": {
"decoderSalt": "0x48b53893da2e0b0248268c000000000000000000000000000000000000000010",
"address": "0x00000000004F96C07B83e86600D86F0000000000"
}
}
56 changes: 56 additions & 0 deletions deployment-config/exampleL2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
{
"base":"0x160345fC359604fC6e70E3c5fAcbdE5F7A9342d8",
"protocolAdmin": "0xF2dE1311C5b2C1BD94de996DA13F80010453e505",
"boringVaultAndBaseDecimals": "18",
"boringVault": {
"boringVaultSalt": "0x1ddd634c506ad203da17ff00000000000000000000000000000000000000000e",
"boringVaultName": "Nucleus Vault",
"boringVaultSymbol": "NV",
"address": "0x0000000000E7Ab44153eEBEF2343ba5289F65dAC"
},
"manager": {
"managerSalt": "0x30432d4b4ec00003b4a25000000000000000000000000000000000000000000e",
"address": "0x0000000000fAd6Db23abdC1a85621B97bd1Dc82f"
},
"accountant": {
"accountantSalt": "0x6a184dbea6f3cc0318679f00000000000000000000000000000000000000000e",
"payoutAddress": "0x0000000000417626Ef34D62C4DC189b021603f2F",
"allowedExchangeRateChangeUpper": "10003",
"allowedExchangeRateChangeLower": "9998",
"minimumUpdateDelayInSeconds": "3600",
"managementFee": "2000",
"address": "0x00000000004F96C07B83e86600D86F9479bB43fa"
},
"teller": {
"tellerSalt": "0x51f8968749a56d01202c9100000000000000000000000000000000000000000e",
"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": "0x66bbc3b3b3000b01466a3a00000000000000000000000000000000000000000e",
"strategist": "0xC2d99d76bb9D46BF8Ec9449E4DfAE48C30CF0839",
"exchangeRateBot": "0x00000000004F96C07B83e86600D86F0000000000",
"address": "0x00000000004F96C07B83e86600D86F0000000000"
},
"decoder": {
"decoderSalt": "0x48b53893da2e0b0248268c00000000000000000000000000000000000000000e",
"address": "0x00000000004F96C07B83e86600D86F0000000000"
}
}
57 changes: 57 additions & 0 deletions deployment-config/form-btc-testnet-l1-08-30-24.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
{
"base": "0x92f3B59a79bFf5dc60c0d59eA13a44D082B2bdFC",
"protocolAdmin": "0x0000000000417626Ef34D62C4DC189b021603f2F",
"boringVaultAndBaseDecimals": "8",
"boringVault": {
"boringVaultSalt": "0x1ddd634c506ad203da17ff000000000000000000000000000000000000000012",
"boringVaultName": "Form ETH",
"boringVaultSymbol": "FETH",
"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"
],
"optional": [
"0x380275805876Ff19055EA900CDb2B46a94ecF20D",
"0x8FafAE7Dd957044088b3d0F67359C327c6200d18",
"0xa59BA433ac34D2927232918Ef5B2eaAfcF130BA5",
"0xe552485d02EDd3067FE7FCbD4dd56BB1D3A998D2"
],
"blockConfirmationsRequiredIfNoDefault": 15,
"optionalThreshold": 1
},
"address": "0x0000000000000000000000000000000000000000"
},
"rolesAuthority": {
"rolesAuthoritySalt": "0x66bbc3b3b3000b01466a3a000000000000000000000000000000000000000012",
"strategist": "0x0000000000417626Ef34D62C4DC189b021603f2F",
"exchangeRateBot": "0x0000000000417626Ef34D62C4DC189b021603f2F",
"address": "0x0000000000000000000000000000000000000000"
},
"decoder": {
"decoderSalt": "0x48b53893da2e0b0248268c000000000000000000000000000000000000000012",
"address": "0x0000000000000000000000000000000000000000"
}
}
59 changes: 59 additions & 0 deletions deployment-config/form-eth-testnet-l1-08-30-24.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
{
"base": "0xb16F35c0Ae2912430DAc15764477E179D9B9EbEa",
"protocolAdmin": "0x0000000000417626Ef34D62C4DC189b021603f2F",
"boringVaultAndBaseDecimals": "18",
"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": [

],
"dvnIfNoDefault": {
"required": [
"0x589dEDbD617e0CBcB916A9223F4d1300c294236b"
],
"optional": [
"0x380275805876Ff19055EA900CDb2B46a94ecF20D",
"0x8FafAE7Dd957044088b3d0F67359C327c6200d18",
"0xa59BA433ac34D2927232918Ef5B2eaAfcF130BA5",
"0xe552485d02EDd3067FE7FCbD4dd56BB1D3A998D2"
],
"blockConfirmationsRequiredIfNoDefault": 15,
"optionalThreshold": 1
},
"address": "0x0000000000000000000000000000000000000000"
},
"rolesAuthority": {
"rolesAuthoritySalt": "0x66bbc3b3b3000b01466a3a00000000000000000000000000000000000000000e",
"strategist": "0x0000000000417626Ef34D62C4DC189b021603f2F",
"exchangeRateBot": "0x0000000000417626Ef34D62C4DC189b021603f2F",
"address": "0x0000000000000000000000000000000000000000"
},
"decoder": {
"decoderSalt": "0x48b53893da2e0b0248268c00000000000000000000000000000000000000000e",
"address": "0x0000000000000000000000000000000000000000"
}
}
57 changes: 57 additions & 0 deletions deployment-config/form-usd-testnet-l1-08-30-24.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
{
"base": "0x51fCe89b9f6D4c530698f181167043e1bB4abf89",
"protocolAdmin": "0x0000000000417626Ef34D62C4DC189b021603f2F",
"boringVaultAndBaseDecimals": "6",
"boringVault": {
"boringVaultSalt": "0x1ddd634c506ad203da17ff000000000000000000000000000000000000000010",
"boringVaultName": "Form ETH",
"boringVaultSymbol": "FETH",
"address": "0x0000000000000000000000000000000000000000"
},
"manager": {
"managerSalt": "0x30432d4b4ec00003b4a250000000000000000000000000000000000000000010",
"address": "0x0000000000000000000000000000000000000000"
},
"accountant": {
"accountantSalt": "0x6a184dbea6f3cc0318679f000000000000000000000000000000000000000010",
"payoutAddress": "0x0000000000417626Ef34D62C4DC189b021603f2F",
"allowedExchangeRateChangeUpper": "10003",
"allowedExchangeRateChangeLower": "9998",
"minimumUpdateDelayInSeconds": "3600",
"managementFee": "0",
"address": "0x0000000000000000000000000000000000000000"
},
"teller": {
"tellerSalt": "0x51f8968749a56d01202c91000000000000000000000000000000000000000010",
"maxGasForPeer": 100000,
"minGasForPeer": 0,
"peerEid": 40270,
"tellerContractName": "TellerWithMultiAssetSupport",
"opMessenger": "0x58Cc85b8D04EA49cC6DBd3CbFFd00B4B8D6cb3ef",
"assets": [],
"dvnIfNoDefault": {
"required": [
"0x589dEDbD617e0CBcB916A9223F4d1300c294236b"
],
"optional": [
"0x380275805876Ff19055EA900CDb2B46a94ecF20D",
"0x8FafAE7Dd957044088b3d0F67359C327c6200d18",
"0xa59BA433ac34D2927232918Ef5B2eaAfcF130BA5",
"0xe552485d02EDd3067FE7FCbD4dd56BB1D3A998D2"
],
"blockConfirmationsRequiredIfNoDefault": 15,
"optionalThreshold": 1
},
"address": "0x0000000000000000000000000000000000000000"
},
"rolesAuthority": {
"rolesAuthoritySalt": "0x66bbc3b3b3000b01466a3a000000000000000000000000000000000000000010",
"strategist": "0x0000000000417626Ef34D62C4DC189b021603f2F",
"exchangeRateBot": "0x0000000000417626Ef34D62C4DC189b021603f2F",
"address": "0x0000000000000000000000000000000000000000"
},
"decoder": {
"decoderSalt": "0x48b53893da2e0b0248268c000000000000000000000000000000000000000010",
"address": "0x0000000000000000000000000000000000000000"
}
}
2 changes: 1 addition & 1 deletion deployment-config/fraxtal-eth-l1-08-13-24.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"protocolAdmin": "0x0000000000417626Ef34D62C4DC189b021603f2F",
"base": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
"baseDecimals": "18",
"boringVaultAndBaseDecimals": "18",
"boringVault": {
"boringVaultSalt": "0x1000000000000000000000000000000000000000000000000000000000000002",
"boringVaultName": "Fraxtal Native Yield Nucleus Token",
Expand Down
2 changes: 1 addition & 1 deletion deployment-config/fraxtal-eth-l2-08-13-24.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"protocolAdmin": "0x0888c3D797E13892C5e67cD802F93Ffe55Ea2826",
"base": "0xFC00000000000000000000000000000000000006",
"baseDecimals": "18",
"boringVaultAndBaseDecimals": "18",
"boringVault": {
"boringVaultSalt": "0x1000000000000000000000000000000000000000000000000000000000000002",
"boringVaultName": "Fraxtal Native Yield Nucleus Token",
Expand Down
Loading
Loading