Skip to content

Commit

Permalink
resolved merge confligts
Browse files Browse the repository at this point in the history
  • Loading branch information
CarsonCase committed Sep 6, 2024
2 parents 884446f + fcb8dd1 commit 49b5948
Show file tree
Hide file tree
Showing 35 changed files with 703 additions and 134 deletions.
29 changes: 12 additions & 17 deletions deployment-config/boba-eth-l1-08-09-24.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,20 @@
{
"protocolAdmin": "0x0000000000417626Ef34D62C4DC189b021603f2F",

"boringVault":{
"base": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
"boringVaultAndBaseDecimals": "18",
"boringVault": {
"boringVaultSalt": "0x1000000000000000000000000000000000000000000000000000000000000001",
"boringVaultName": "Boba Native Yield Nucleus Token",
"boringVaultName": "Boba Native Yield Nucleus Token",
"boringVaultSymbol": "bobaETH",

"address": "0x0000000000000000000000000000000000000000"
},

"manager":{
"managerSalt": "0x2000000000000000000000000000000000000000000000000000000000000001",
"address": "0x0000000000000000000000000000000000000000"

},
"manager": {
"managerSalt": "0x2000000000000000000000000000000000000000000000000000000000000001",
"address": "0x0000000000000000000000000000000000000000"
},

"accountant":{
"accountant": {
"accountantSalt": "0x3000000000000000000000000000000000000000000000000000000000000001",
"payoutAddress": "0x0000000000417626Ef34D62C4DC189b021603f2F",
"allowedExchangeRateChangeUpper": "10030",
Expand All @@ -25,13 +24,13 @@

"address": "0x0000000000000000000000000000000000000000"
},

"teller": {
"tellerSalt": "0x4000000000000000000000000000000000000000000000000000000000000001",
"tellerSalt": "0x4000000000000000000000000000000000000000000000000000000000000002",
"maxGasForPeer": 200000,
"minGasForPeer": 60000,
"peerEid": 0,
"tellerContractName": "CrossChainOPTellerWithMultiAssetSupport",
"opMessenger": "0x6D4528d192dB72E282265D6092F4B872f9Dff69e",
"assets": [
"0xcd5fe23c85820f7b72d0926fc9b05b43e359b7ee",
"0xbf5495efe5db9ce00f80364c8b423567e58d2110",
Expand All @@ -46,14 +45,10 @@
"rolesAuthoritySalt": "0x5000000000000000000000000000000000000000000000000000000000000001",
"strategist": "0x0000000000417626Ef34D62C4DC189b021603f2F",
"exchangeRateBot": "0x0000000000417626Ef34D62C4DC189b021603f2F",

"address": "0x0000000000000000000000000000000000000000"
},

"decoder": {
"decoderSalt": "0x6000000000000000000000000000000000000000000000000000000000000001",

"address": "0x0000000000000000000000000000000000000000"
"address": "0x0000000000000000000000000000000000000000"
}

}
32 changes: 13 additions & 19 deletions deployment-config/boba-eth-l2-08-09-24.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,19 @@
{
"protocolAdmin": "0x0888c3D797E13892C5e67cD802F93Ffe55Ea2826",

"boringVault":{
"base": "0xDeadDeAddeAddEAddeadDEaDDEAdDeaDDeAD0000",
"boringVaultAndBaseDecimals": "18",
"boringVault": {
"boringVaultSalt": "0x1000000000000000000000000000000000000000000000000000000000000001",
"boringVaultName": "Boba Native Yield Nucleus Token",
"boringVaultName": "Boba Native Yield Nucleus Token",
"boringVaultSymbol": "bobaETH",

"address": "0x0000000000000000000000000000000000000000"
},

"manager":{
"address": "0x0000000000000000000000000000000000000000"
},
"manager": {
"managerSalt": "0x2000000000000000000000000000000000000000000000000000000000000001",

"address": "0x0000000000000000000000000000000000000000"
},

"accountant":{
"accountant": {
"accountantSalt": "0x3000000000000000000000000000000000000000000000000000000000000001",
"payoutAddress": "0x0888c3D797E13892C5e67cD802F93Ffe55Ea2826",
"allowedExchangeRateChangeUpper": "10030",
Expand All @@ -25,29 +23,25 @@

"address": "0x0000000000000000000000000000000000000000"
},

"teller": {
"tellerSalt": "0x4000000000000000000000000000000000000000000000000000000000000001",
"tellerSalt": "0x4000000000000000000000000000000000000000000000000000000000000002",
"maxGasForPeer": 200000,
"minGasForPeer": 60000,
"peerEid": 0,
"tellerContractName": "CrossChainOPTellerWithMultiAssetSupport",
"assets": [
],
"opMessenger": "0x4200000000000000000000000000000000000007",
"assets": [],

"address": "0x0000000000000000000000000000000000000000"
},
"rolesAuthority": {
"rolesAuthoritySalt": "0x5000000000000000000000000000000000000000000000000000000000000001",
"strategist": "0x0888c3D797E13892C5e67cD802F93Ffe55Ea2826",
"exchangeRateBot": "0x0888c3D797E13892C5e67cD802F93Ffe55Ea2826",

"address": "0x0000000000000000000000000000000000000000"
},

"decoder": {
"decoderSalt": "0x6000000000000000000000000000000000000000000000000000000000000001",

"address": "0x0000000000000000000000000000000000000000"
"address": "0x0000000000000000000000000000000000000000"
}

}
18 changes: 15 additions & 3 deletions deployment-config/chains/1.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"base": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
"balancerVault": "0xBA12222222228d8Ba445958a75a0704d566BF2C8",
"opMessenger": "0x25ace71c97B33Cc4729CF772ae268934F7ab5fA1",
"lzEndpoint": "0x1a44076050125825900e736c501f859c50fE728c",
Expand Down Expand Up @@ -41,11 +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
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"balancerVault": "0xBA12222222228d8Ba445958a75a0704d566BF2C8",
"lzEndpoint": "0x6EDCE65403992e310A62460808c4b910D972f10f"
}
2 changes: 0 additions & 2 deletions deployment-config/chains/1329.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
{
"base": "0x160345fC359604fC6e70E3c5fAcbdE5F7A9342d8",
"balancerVault": "0x0000000000000000000000000000000000000000",
"opMessenger": "0x0000000000000000000000000000000000000000",
"lzEndpoint": "0x1a44076050125825900e736c501f859c50fE728c"
}
4 changes: 4 additions & 0 deletions deployment-config/chains/252.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"balancerVault": "0x0000000000000000000000000000000000000000",
"lzEndpoint": "0x1a44076050125825900e736c501f859c50fE728c"
}
2 changes: 0 additions & 2 deletions deployment-config/chains/288.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
{
"base": "0xDeadDeAddeAddEAddeadDEaDDEAdDeaDDeAD0000",
"balancerVault": "0x0000000000000000000000000000000000000000",
"opMessenger": "0x4200000000000000000000000000000000000010",
"lzEndpoint": "0x0000000000000000000000000000000000000000"
}
15 changes: 8 additions & 7 deletions deployment-config/exampleL1.json
Original file line number Diff line number Diff line change
@@ -1,27 +1,28 @@
{
"base": "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2",
"protocolAdmin": "0xC2d99d76bb9D46BF8Ec9449E4DfAE48C30CF0839",
"boringVaultAndBaseDecimals": "18",
"boringVault": {
"boringVaultSalt": "0x1ddd634c506ad203da17ff00000000000000000000000000000000000000000e",
"boringVaultSalt": "0x1ddd634c506ad203da17ff000000000000000000000000000000000000000010",
"boringVaultName": "Nucleus Vault",
"boringVaultSymbol": "NV",
"address": "0x0000000000E7Ab44153eEBEF2343ba5289F65dAC"
},
"manager": {
"managerSalt": "0x30432d4b4ec00003b4a25000000000000000000000000000000000000000000e",
"managerSalt": "0x30432d4b4ec00003b4a250000000000000000000000000000000000000000010",
"address": "0x0000000000fAd6Db23abdC1a85621B97bd1Dc82f"
},
"accountant": {
"accountantSalt": "0x6a184dbea6f3cc0318679f00000000000000000000000000000000000000000e",
"accountantSalt": "0x6a184dbea6f3cc0318679f000000000000000000000000000000000000000010",
"payoutAddress": "0x0000000000417626Ef34D62C4DC189b021603f2F",
"base": "0x5f207d42F869fd1c71d7f0f81a2A67Fc20FF7323",
"allowedExchangeRateChangeUpper": "10003",
"allowedExchangeRateChangeLower": "9998",
"minimumUpdateDelayInSeconds": "3600",
"managementFee": "2000",
"address": "0x00000000004F96C07B83e86600D86F9479bB43fa"
},
"teller": {
"tellerSalt": "0x51f8968749a56d01202c9100000000000000000000000000000000000000000e",
"tellerSalt": "0x51f8968749a56d01202c91000000000000000000000000000000000000000010",
"maxGasForPeer": 100000,
"minGasForPeer": 0,
"peerEid": 30280,
Expand All @@ -46,13 +47,13 @@
"address": "0x00000000004F96C07B83e86600D86F0000000000"
},
"rolesAuthority": {
"rolesAuthoritySalt": "0x66bbc3b3b3000b01466a3a00000000000000000000000000000000000000000e",
"rolesAuthoritySalt": "0x66bbc3b3b3000b01466a3a000000000000000000000000000000000000000010",
"strategist": "0xC2d99d76bb9D46BF8Ec9449E4DfAE48C30CF0839",
"exchangeRateBot": "0x00000000004F96C07B83e86600D86F0000000000",
"address": "0x00000000004F96C07B83e86600D86F0000000000"
},
"decoder": {
"decoderSalt": "0x48b53893da2e0b0248268c00000000000000000000000000000000000000000e",
"decoderSalt": "0x48b53893da2e0b0248268c000000000000000000000000000000000000000010",
"address": "0x00000000004F96C07B83e86600D86F0000000000"
}
}
3 changes: 2 additions & 1 deletion deployment-config/exampleL2.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{
"base":"0x160345fC359604fC6e70E3c5fAcbdE5F7A9342d8",
"protocolAdmin": "0xF2dE1311C5b2C1BD94de996DA13F80010453e505",
"boringVaultAndBaseDecimals": "18",
"boringVault": {
"boringVaultSalt": "0x1ddd634c506ad203da17ff00000000000000000000000000000000000000000e",
"boringVaultName": "Nucleus Vault",
Expand All @@ -13,7 +15,6 @@
"accountant": {
"accountantSalt": "0x6a184dbea6f3cc0318679f00000000000000000000000000000000000000000e",
"payoutAddress": "0x0000000000417626Ef34D62C4DC189b021603f2F",
"base": "0x5f207d42F869fd1c71d7f0f81a2A67Fc20FF7323",
"allowedExchangeRateChangeUpper": "10003",
"allowedExchangeRateChangeLower": "9998",
"minimumUpdateDelayInSeconds": "3600",
Expand Down
57 changes: 57 additions & 0 deletions deployment-config/form-btc-testnet-l1-08-30-24.json
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
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"
}
}
Loading

0 comments on commit 49b5948

Please sign in to comment.