Skip to content

Commit a6d416e

Browse files
patidarmanoj10patidarmanoj10
committed
Merged private with public
2 parents 54f54a1 + 9c2f546 commit a6d416e

34 files changed

+7976
-473
lines changed

‎deploy/scripts/base/pool1/16_vaeth_deposit_token.ts

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
import {buildDepositTokenDeployFunction, UpgradableContracts} from '../../../helpers'
2+
import Address from '../../../../helpers/address'
3+
import {parseEther} from 'ethers/lib/utils'
4+
5+
const {VAETH_ADDRESS} = Address
6+
7+
const {
8+
Pool1: {alias: Pool1},
9+
} = UpgradableContracts
10+
11+
const func = buildDepositTokenDeployFunction({
12+
poolAlias: Pool1,
13+
underlyingAddress: VAETH_ADDRESS,
14+
underlyingSymbol: 'vaETH',
15+
underlyingDecimals: 18,
16+
collateralFactor: parseEther('0.8'), // 80%
17+
maxTotalSupply: parseEther('150'),
18+
})
19+
20+
export default func

‎deploy/scripts/base/pool1/17_vausdc_deposit_token.ts

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
import {buildDepositTokenDeployFunction, UpgradableContracts} from '../../../helpers'
2+
import Address from '../../../../helpers/address'
3+
import {parseEther} from 'ethers/lib/utils'
4+
5+
const {VAUSDC_ADDRESS} = Address
6+
7+
const {
8+
Pool1: {alias: Pool1},
9+
} = UpgradableContracts
10+
11+
const func = buildDepositTokenDeployFunction({
12+
poolAlias: Pool1,
13+
underlyingAddress: VAUSDC_ADDRESS,
14+
underlyingSymbol: 'vaUSDC',
15+
underlyingDecimals: 18,
16+
collateralFactor: parseEther('0.82'), // 82%
17+
maxTotalSupply: parseEther('500000'),
18+
})
19+
20+
export default func

‎deploy/scripts/base/pool1/18_vawsteth_deposit_token.ts

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
import {buildDepositTokenDeployFunction, UpgradableContracts} from '../../../helpers'
2+
import Address from '../../../../helpers/address'
3+
import {parseEther} from 'ethers/lib/utils'
4+
5+
const {VAWSTETH_ADDRESS} = Address
6+
7+
const {
8+
Pool1: {alias: Pool1},
9+
} = UpgradableContracts
10+
11+
const func = buildDepositTokenDeployFunction({
12+
poolAlias: Pool1,
13+
underlyingAddress: VAWSTETH_ADDRESS,
14+
underlyingSymbol: 'vaWSTETH',
15+
underlyingDecimals: 18,
16+
collateralFactor: parseEther('0.78'), // 78%
17+
maxTotalSupply: parseEther('100'),
18+
})
19+
20+
export default func

‎deploy/scripts/base/pool1/19_vacbeth_deposit_token.ts

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
import {buildDepositTokenDeployFunction, UpgradableContracts} from '../../../helpers'
2+
import Address from '../../../../helpers/address'
3+
import {parseEther} from 'ethers/lib/utils'
4+
5+
const {VACBETH_ADDRESS} = Address
6+
7+
const {
8+
Pool1: {alias: Pool1},
9+
} = UpgradableContracts
10+
11+
const func = buildDepositTokenDeployFunction({
12+
poolAlias: Pool1,
13+
underlyingAddress: VACBETH_ADDRESS,
14+
underlyingSymbol: 'vaCBETH',
15+
underlyingDecimals: 18,
16+
collateralFactor: parseEther('0.75'), // 75%
17+
maxTotalSupply: parseEther('50'),
18+
})
19+
20+
export default func

‎deployments/base/CrossChainDispatcher.json

+21-10
Large diffs are not rendered by default.

‎deployments/base/CrossChainDispatcher_Implementation.json

+66-36
Large diffs are not rendered by default.

‎deployments/base/MsETHProxyOFT.json

+45-40
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"address": "0xDF2Aa7026bAE7e131D7D5af30345173843D22AFb",
2+
"address": "0x30EAc06D1e495411eE15cB59714Eb9DA29fc200e",
33
"abi": [
44
{
55
"anonymous": false,
@@ -134,6 +134,11 @@
134134
"name": "BridgingIsPaused",
135135
"type": "error"
136136
},
137+
{
138+
"inputs": [],
139+
"name": "DestinationChainNotAllowed",
140+
"type": "error"
141+
},
137142
{
138143
"inputs": [],
139144
"name": "SenderIsNotCrossChainDispatcher",
@@ -1492,78 +1497,78 @@
14921497
"type": "constructor"
14931498
}
14941499
],
1495-
"transactionHash": "0x8d1951992a6c3dad49b6f6dedeb833648fe700438750822c2e1e1556f8440b69",
1500+
"transactionHash": "0x9cd697a66c0b8edac90ffaabba02e9f796d615fd540e0642856340655811eb80",
14961501
"receipt": {
14971502
"to": null,
14981503
"from": "0xdf826ff6518e609E4cEE86299d40611C148099d5",
1499-
"contractAddress": "0xDF2Aa7026bAE7e131D7D5af30345173843D22AFb",
1500-
"transactionIndex": 49,
1504+
"contractAddress": "0x30EAc06D1e495411eE15cB59714Eb9DA29fc200e",
1505+
"transactionIndex": 30,
15011506
"gasUsed": "816183",
1502-
"logsBloom": "0x00000000000004000000000000000000400000000000000000800001000000000000000000000000000000000000000000000000400000000000000000000000000004000000000000000000000002000001000000000000000000000000000000000000020000000000000000000800000000800000000000000000000000400000000000000000000000000000000000000000000080008000000000800000000000000000000000000000000400000004000000000000000000000000000000100020000000000000002000040000000000000400000000000000000020000000000000000000000000000000000000000000000000400000000000000000",
1503-
"blockHash": "0xb05b94175134e648ac24fcefdd731487465af7ad27bfcfef2ac47802234bdc0b",
1504-
"transactionHash": "0x8d1951992a6c3dad49b6f6dedeb833648fe700438750822c2e1e1556f8440b69",
1507+
"logsBloom": "0x00000000000000000000000000000000400000000000000000800000600000000000000000000000000000000000000010000000400000000000000000000000000000000000000000000000000002000001000000000000000000400000000000000000020000000000000000000800000000800000000000000000000000400000000000000000000000000000000000000000000080000000000000800000000000000002000000000000000400000004000000000000000000000000000000100820000000000000000000040000000000000400000000000000000020000000000000000000000000000000000000000000000000000000000000000000",
1508+
"blockHash": "0x1b5ee3e1cf78b44aa77060df94c217b493e057f6040ade7052881076626b3393",
1509+
"transactionHash": "0x9cd697a66c0b8edac90ffaabba02e9f796d615fd540e0642856340655811eb80",
15051510
"logs": [
15061511
{
1507-
"transactionIndex": 49,
1508-
"blockNumber": 14104292,
1509-
"transactionHash": "0x8d1951992a6c3dad49b6f6dedeb833648fe700438750822c2e1e1556f8440b69",
1510-
"address": "0xDF2Aa7026bAE7e131D7D5af30345173843D22AFb",
1512+
"transactionIndex": 30,
1513+
"blockNumber": 15108405,
1514+
"transactionHash": "0x9cd697a66c0b8edac90ffaabba02e9f796d615fd540e0642856340655811eb80",
1515+
"address": "0x30EAc06D1e495411eE15cB59714Eb9DA29fc200e",
15111516
"topics": [
15121517
"0xbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b",
1513-
"0x000000000000000000000000f3ecd63bb9a4934c85026f8924b49ed7deb69985"
1518+
"0x000000000000000000000000ddd9864c68072a4723889644b5e7075452718ded"
15141519
],
15151520
"data": "0x",
1516-
"logIndex": 122,
1517-
"blockHash": "0xb05b94175134e648ac24fcefdd731487465af7ad27bfcfef2ac47802234bdc0b"
1521+
"logIndex": 102,
1522+
"blockHash": "0x1b5ee3e1cf78b44aa77060df94c217b493e057f6040ade7052881076626b3393"
15181523
},
15191524
{
1520-
"transactionIndex": 49,
1521-
"blockNumber": 14104292,
1522-
"transactionHash": "0x8d1951992a6c3dad49b6f6dedeb833648fe700438750822c2e1e1556f8440b69",
1523-
"address": "0xDF2Aa7026bAE7e131D7D5af30345173843D22AFb",
1525+
"transactionIndex": 30,
1526+
"blockNumber": 15108405,
1527+
"transactionHash": "0x9cd697a66c0b8edac90ffaabba02e9f796d615fd540e0642856340655811eb80",
1528+
"address": "0x30EAc06D1e495411eE15cB59714Eb9DA29fc200e",
15241529
"topics": [
15251530
"0x8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0",
15261531
"0x0000000000000000000000000000000000000000000000000000000000000000",
15271532
"0x000000000000000000000000df826ff6518e609e4cee86299d40611c148099d5"
15281533
],
15291534
"data": "0x",
1530-
"logIndex": 123,
1531-
"blockHash": "0xb05b94175134e648ac24fcefdd731487465af7ad27bfcfef2ac47802234bdc0b"
1535+
"logIndex": 103,
1536+
"blockHash": "0x1b5ee3e1cf78b44aa77060df94c217b493e057f6040ade7052881076626b3393"
15321537
},
15331538
{
1534-
"transactionIndex": 49,
1535-
"blockNumber": 14104292,
1536-
"transactionHash": "0x8d1951992a6c3dad49b6f6dedeb833648fe700438750822c2e1e1556f8440b69",
1537-
"address": "0xDF2Aa7026bAE7e131D7D5af30345173843D22AFb",
1539+
"transactionIndex": 30,
1540+
"blockNumber": 15108405,
1541+
"transactionHash": "0x9cd697a66c0b8edac90ffaabba02e9f796d615fd540e0642856340655811eb80",
1542+
"address": "0x30EAc06D1e495411eE15cB59714Eb9DA29fc200e",
15381543
"topics": [
15391544
"0x7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb3847402498"
15401545
],
15411546
"data": "0x0000000000000000000000000000000000000000000000000000000000000001",
1542-
"logIndex": 124,
1543-
"blockHash": "0xb05b94175134e648ac24fcefdd731487465af7ad27bfcfef2ac47802234bdc0b"
1547+
"logIndex": 104,
1548+
"blockHash": "0x1b5ee3e1cf78b44aa77060df94c217b493e057f6040ade7052881076626b3393"
15441549
},
15451550
{
1546-
"transactionIndex": 49,
1547-
"blockNumber": 14104292,
1548-
"transactionHash": "0x8d1951992a6c3dad49b6f6dedeb833648fe700438750822c2e1e1556f8440b69",
1549-
"address": "0xDF2Aa7026bAE7e131D7D5af30345173843D22AFb",
1551+
"transactionIndex": 30,
1552+
"blockNumber": 15108405,
1553+
"transactionHash": "0x9cd697a66c0b8edac90ffaabba02e9f796d615fd540e0642856340655811eb80",
1554+
"address": "0x30EAc06D1e495411eE15cB59714Eb9DA29fc200e",
15501555
"topics": [
15511556
"0x7e644d79422f17c01e4894b5f4f588d331ebfa28653d42ae832dc59e38c9798f"
15521557
],
1553-
"data": "0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000305b30dc978e931642d243852b4aa5d31a0da8c4",
1554-
"logIndex": 125,
1555-
"blockHash": "0xb05b94175134e648ac24fcefdd731487465af7ad27bfcfef2ac47802234bdc0b"
1558+
"data": "0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ecfe7634abcd2140bede1fb34753a7f5d412c881",
1559+
"logIndex": 105,
1560+
"blockHash": "0x1b5ee3e1cf78b44aa77060df94c217b493e057f6040ade7052881076626b3393"
15561561
}
15571562
],
1558-
"blockNumber": 14104292,
1559-
"cumulativeGasUsed": "7281626",
1563+
"blockNumber": 15108405,
1564+
"cumulativeGasUsed": "5005821",
15601565
"status": 1,
15611566
"byzantium": true
15621567
},
15631568
"args": [
1564-
"0xF3ecd63bb9A4934C85026F8924b49ed7Deb69985",
1565-
"0x305b30dC978e931642D243852b4AA5D31a0dA8c4",
1566-
"0x485cc9550000000000000000000000001a44076050125825900e736c501f859c50fe728c0000000000000000000000007ba6f01772924a82d9626c126347a28299e98c98"
1569+
"0xdDd9864C68072a4723889644b5E7075452718deD",
1570+
"0xecfE7634aBCd2140bede1fb34753A7F5d412c881",
1571+
"0x485cc955000000000000000000000000b6319cc6c8c27a8f5daf0dd3df91ea35c4720dd70000000000000000000000007ba6f01772924a82d9626c126347a28299e98c98"
15671572
],
15681573
"numDeployments": 1,
15691574
"solcInputHash": "0e89febeebc7444140de8e67c9067d2c",
@@ -1573,11 +1578,11 @@
15731578
"execute": {
15741579
"methodName": "initialize",
15751580
"args": [
1576-
"0x1a44076050125825900e736c501f859c50fE728c",
1581+
"0xb6319cC6c8c27A8F5dAF0dD3DF91EA35C4720dd7",
15771582
"0x7Ba6F01772924a82D9626c126347A28299E98c98"
15781583
]
15791584
},
1580-
"implementation": "0xF3ecd63bb9A4934C85026F8924b49ed7Deb69985",
1585+
"implementation": "0xdDd9864C68072a4723889644b5E7075452718deD",
15811586
"devdoc": {
15821587
"details": "This contract implements a proxy that is upgradeable by an admin. To avoid https://medium.com/nomic-labs-blog/malicious-backdoors-in-ethereum-proxies-62629adf3357[proxy selector clashing], which can potentially be used in an attack, this contract uses the https://blog.openzeppelin.com/the-transparent-proxy-pattern/[transparent proxy pattern]. This pattern implies two things that go hand in hand: 1. If any account other than the admin calls the proxy, the call will be forwarded to the implementation, even if that call matches one of the admin functions exposed by the proxy itself. 2. If the admin calls the proxy, it can access the admin functions, but its calls will never be forwarded to the implementation. If the admin tries to call a function on the implementation it will fail with an error that says \"admin cannot fallback to proxy target\". These properties mean that the admin account can only be used for admin actions like upgrading the proxy or changing the admin, so it's best if it's a dedicated account that is not used for anything else. This will avoid headaches due to sudden errors when trying to call a function from the proxy implementation. Our recommendation is for the dedicated account to be an instance of the {ProxyAdmin} contract. If set up this way, you should think of the `ProxyAdmin` instance as the real administrative interface of your proxy.",
15831588
"kind": "dev",

‎deployments/base/MsETHProxyOFT_Proxy.json

+38-38
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"address": "0xDF2Aa7026bAE7e131D7D5af30345173843D22AFb",
2+
"address": "0x30EAc06D1e495411eE15cB59714Eb9DA29fc200e",
33
"abi": [
44
{
55
"inputs": [
@@ -146,78 +146,78 @@
146146
"type": "receive"
147147
}
148148
],
149-
"transactionHash": "0x8d1951992a6c3dad49b6f6dedeb833648fe700438750822c2e1e1556f8440b69",
149+
"transactionHash": "0x9cd697a66c0b8edac90ffaabba02e9f796d615fd540e0642856340655811eb80",
150150
"receipt": {
151151
"to": null,
152152
"from": "0xdf826ff6518e609E4cEE86299d40611C148099d5",
153-
"contractAddress": "0xDF2Aa7026bAE7e131D7D5af30345173843D22AFb",
154-
"transactionIndex": 49,
153+
"contractAddress": "0x30EAc06D1e495411eE15cB59714Eb9DA29fc200e",
154+
"transactionIndex": 30,
155155
"gasUsed": "816183",
156-
"logsBloom": "0x00000000000004000000000000000000400000000000000000800001000000000000000000000000000000000000000000000000400000000000000000000000000004000000000000000000000002000001000000000000000000000000000000000000020000000000000000000800000000800000000000000000000000400000000000000000000000000000000000000000000080008000000000800000000000000000000000000000000400000004000000000000000000000000000000100020000000000000002000040000000000000400000000000000000020000000000000000000000000000000000000000000000000400000000000000000",
157-
"blockHash": "0xb05b94175134e648ac24fcefdd731487465af7ad27bfcfef2ac47802234bdc0b",
158-
"transactionHash": "0x8d1951992a6c3dad49b6f6dedeb833648fe700438750822c2e1e1556f8440b69",
156+
"logsBloom": "0x00000000000000000000000000000000400000000000000000800000600000000000000000000000000000000000000010000000400000000000000000000000000000000000000000000000000002000001000000000000000000400000000000000000020000000000000000000800000000800000000000000000000000400000000000000000000000000000000000000000000080000000000000800000000000000002000000000000000400000004000000000000000000000000000000100820000000000000000000040000000000000400000000000000000020000000000000000000000000000000000000000000000000000000000000000000",
157+
"blockHash": "0x1b5ee3e1cf78b44aa77060df94c217b493e057f6040ade7052881076626b3393",
158+
"transactionHash": "0x9cd697a66c0b8edac90ffaabba02e9f796d615fd540e0642856340655811eb80",
159159
"logs": [
160160
{
161-
"transactionIndex": 49,
162-
"blockNumber": 14104292,
163-
"transactionHash": "0x8d1951992a6c3dad49b6f6dedeb833648fe700438750822c2e1e1556f8440b69",
164-
"address": "0xDF2Aa7026bAE7e131D7D5af30345173843D22AFb",
161+
"transactionIndex": 30,
162+
"blockNumber": 15108405,
163+
"transactionHash": "0x9cd697a66c0b8edac90ffaabba02e9f796d615fd540e0642856340655811eb80",
164+
"address": "0x30EAc06D1e495411eE15cB59714Eb9DA29fc200e",
165165
"topics": [
166166
"0xbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b",
167-
"0x000000000000000000000000f3ecd63bb9a4934c85026f8924b49ed7deb69985"
167+
"0x000000000000000000000000ddd9864c68072a4723889644b5e7075452718ded"
168168
],
169169
"data": "0x",
170-
"logIndex": 122,
171-
"blockHash": "0xb05b94175134e648ac24fcefdd731487465af7ad27bfcfef2ac47802234bdc0b"
170+
"logIndex": 102,
171+
"blockHash": "0x1b5ee3e1cf78b44aa77060df94c217b493e057f6040ade7052881076626b3393"
172172
},
173173
{
174-
"transactionIndex": 49,
175-
"blockNumber": 14104292,
176-
"transactionHash": "0x8d1951992a6c3dad49b6f6dedeb833648fe700438750822c2e1e1556f8440b69",
177-
"address": "0xDF2Aa7026bAE7e131D7D5af30345173843D22AFb",
174+
"transactionIndex": 30,
175+
"blockNumber": 15108405,
176+
"transactionHash": "0x9cd697a66c0b8edac90ffaabba02e9f796d615fd540e0642856340655811eb80",
177+
"address": "0x30EAc06D1e495411eE15cB59714Eb9DA29fc200e",
178178
"topics": [
179179
"0x8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0",
180180
"0x0000000000000000000000000000000000000000000000000000000000000000",
181181
"0x000000000000000000000000df826ff6518e609e4cee86299d40611c148099d5"
182182
],
183183
"data": "0x",
184-
"logIndex": 123,
185-
"blockHash": "0xb05b94175134e648ac24fcefdd731487465af7ad27bfcfef2ac47802234bdc0b"
184+
"logIndex": 103,
185+
"blockHash": "0x1b5ee3e1cf78b44aa77060df94c217b493e057f6040ade7052881076626b3393"
186186
},
187187
{
188-
"transactionIndex": 49,
189-
"blockNumber": 14104292,
190-
"transactionHash": "0x8d1951992a6c3dad49b6f6dedeb833648fe700438750822c2e1e1556f8440b69",
191-
"address": "0xDF2Aa7026bAE7e131D7D5af30345173843D22AFb",
188+
"transactionIndex": 30,
189+
"blockNumber": 15108405,
190+
"transactionHash": "0x9cd697a66c0b8edac90ffaabba02e9f796d615fd540e0642856340655811eb80",
191+
"address": "0x30EAc06D1e495411eE15cB59714Eb9DA29fc200e",
192192
"topics": [
193193
"0x7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb3847402498"
194194
],
195195
"data": "0x0000000000000000000000000000000000000000000000000000000000000001",
196-
"logIndex": 124,
197-
"blockHash": "0xb05b94175134e648ac24fcefdd731487465af7ad27bfcfef2ac47802234bdc0b"
196+
"logIndex": 104,
197+
"blockHash": "0x1b5ee3e1cf78b44aa77060df94c217b493e057f6040ade7052881076626b3393"
198198
},
199199
{
200-
"transactionIndex": 49,
201-
"blockNumber": 14104292,
202-
"transactionHash": "0x8d1951992a6c3dad49b6f6dedeb833648fe700438750822c2e1e1556f8440b69",
203-
"address": "0xDF2Aa7026bAE7e131D7D5af30345173843D22AFb",
200+
"transactionIndex": 30,
201+
"blockNumber": 15108405,
202+
"transactionHash": "0x9cd697a66c0b8edac90ffaabba02e9f796d615fd540e0642856340655811eb80",
203+
"address": "0x30EAc06D1e495411eE15cB59714Eb9DA29fc200e",
204204
"topics": [
205205
"0x7e644d79422f17c01e4894b5f4f588d331ebfa28653d42ae832dc59e38c9798f"
206206
],
207-
"data": "0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000305b30dc978e931642d243852b4aa5d31a0da8c4",
208-
"logIndex": 125,
209-
"blockHash": "0xb05b94175134e648ac24fcefdd731487465af7ad27bfcfef2ac47802234bdc0b"
207+
"data": "0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ecfe7634abcd2140bede1fb34753a7f5d412c881",
208+
"logIndex": 105,
209+
"blockHash": "0x1b5ee3e1cf78b44aa77060df94c217b493e057f6040ade7052881076626b3393"
210210
}
211211
],
212-
"blockNumber": 14104292,
213-
"cumulativeGasUsed": "7281626",
212+
"blockNumber": 15108405,
213+
"cumulativeGasUsed": "5005821",
214214
"status": 1,
215215
"byzantium": true
216216
},
217217
"args": [
218-
"0xF3ecd63bb9A4934C85026F8924b49ed7Deb69985",
219-
"0x305b30dC978e931642D243852b4AA5D31a0dA8c4",
220-
"0x485cc9550000000000000000000000001a44076050125825900e736c501f859c50fe728c0000000000000000000000007ba6f01772924a82d9626c126347a28299e98c98"
218+
"0xdDd9864C68072a4723889644b5E7075452718deD",
219+
"0xecfE7634aBCd2140bede1fb34753A7F5d412c881",
220+
"0x485cc955000000000000000000000000b6319cc6c8c27a8f5daf0dd3df91ea35c4720dd70000000000000000000000007ba6f01772924a82d9626c126347a28299e98c98"
221221
],
222222
"numDeployments": 1,
223223
"solcInputHash": "0e89febeebc7444140de8e67c9067d2c",

0 commit comments

Comments
 (0)