Syncing repos

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

@@ -0,0 +1,20 @@
+import {buildDepositTokenDeployFunction, UpgradableContracts} from '../../../helpers'
+import Address from '../../../../helpers/address'
+import {parseEther} from 'ethers/lib/utils'
+
+const {VAETH_ADDRESS} = Address
+
+const {
+  Pool1: {alias: Pool1},
+} = UpgradableContracts
+
+const func = buildDepositTokenDeployFunction({
+  poolAlias: Pool1,
+  underlyingAddress: VAETH_ADDRESS,
+  underlyingSymbol: 'vaETH',
+  underlyingDecimals: 18,
+  collateralFactor: parseEther('0.8'), // 80%
+  maxTotalSupply: parseEther('150'),
+})
+
+export default func

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

@@ -0,0 +1,20 @@
+import {buildDepositTokenDeployFunction, UpgradableContracts} from '../../../helpers'
+import Address from '../../../../helpers/address'
+import {parseEther} from 'ethers/lib/utils'
+
+const {VAUSDC_ADDRESS} = Address
+
+const {
+  Pool1: {alias: Pool1},
+} = UpgradableContracts
+
+const func = buildDepositTokenDeployFunction({
+  poolAlias: Pool1,
+  underlyingAddress: VAUSDC_ADDRESS,
+  underlyingSymbol: 'vaUSDC',
+  underlyingDecimals: 18,
+  collateralFactor: parseEther('0.82'), // 82%
+  maxTotalSupply: parseEther('500000'),
+})
+
+export default func

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

@@ -0,0 +1,20 @@
+import {buildDepositTokenDeployFunction, UpgradableContracts} from '../../../helpers'
+import Address from '../../../../helpers/address'
+import {parseEther} from 'ethers/lib/utils'
+
+const {VAWSTETH_ADDRESS} = Address
+
+const {
+  Pool1: {alias: Pool1},
+} = UpgradableContracts
+
+const func = buildDepositTokenDeployFunction({
+  poolAlias: Pool1,
+  underlyingAddress: VAWSTETH_ADDRESS,
+  underlyingSymbol: 'vaWSTETH',
+  underlyingDecimals: 18,
+  collateralFactor: parseEther('0.78'), // 78%
+  maxTotalSupply: parseEther('100'),
+})
+
+export default func

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

@@ -0,0 +1,20 @@
+import {buildDepositTokenDeployFunction, UpgradableContracts} from '../../../helpers'
+import Address from '../../../../helpers/address'
+import {parseEther} from 'ethers/lib/utils'
+
+const {VACBETH_ADDRESS} = Address
+
+const {
+  Pool1: {alias: Pool1},
+} = UpgradableContracts
+
+const func = buildDepositTokenDeployFunction({
+  poolAlias: Pool1,
+  underlyingAddress: VACBETH_ADDRESS,
+  underlyingSymbol: 'vaCBETH',
+  underlyingDecimals: 18,
+  collateralFactor: parseEther('0.75'), // 75%
+  maxTotalSupply: parseEther('50'),
+})
+
+export default func

deployments/base/MsETHProxyOFT.json

@@ -1,5 +1,5 @@
 {
-  "address": "0xDF2Aa7026bAE7e131D7D5af30345173843D22AFb",
+  "address": "0x30EAc06D1e495411eE15cB59714Eb9DA29fc200e",
   "abi": [
     {
       "anonymous": false,
@@ -134,6 +134,11 @@
       "name": "BridgingIsPaused",
       "type": "error"
     },
+    {
+      "inputs": [],
+      "name": "DestinationChainNotAllowed",
+      "type": "error"
+    },
     {
       "inputs": [],
       "name": "SenderIsNotCrossChainDispatcher",
@@ -1492,78 +1497,78 @@
       "type": "constructor"
     }
   ],
-  "transactionHash": "0x8d1951992a6c3dad49b6f6dedeb833648fe700438750822c2e1e1556f8440b69",
+  "transactionHash": "0x9cd697a66c0b8edac90ffaabba02e9f796d615fd540e0642856340655811eb80",
   "receipt": {
     "to": null,
     "from": "0xdf826ff6518e609E4cEE86299d40611C148099d5",
-    "contractAddress": "0xDF2Aa7026bAE7e131D7D5af30345173843D22AFb",
-    "transactionIndex": 49,
+    "contractAddress": "0x30EAc06D1e495411eE15cB59714Eb9DA29fc200e",
+    "transactionIndex": 30,
     "gasUsed": "816183",
-    "logsBloom": "0x00000000000004000000000000000000400000000000000000800001000000000000000000000000000000000000000000000000400000000000000000000000000004000000000000000000000002000001000000000000000000000000000000000000020000000000000000000800000000800000000000000000000000400000000000000000000000000000000000000000000080008000000000800000000000000000000000000000000400000004000000000000000000000000000000100020000000000000002000040000000000000400000000000000000020000000000000000000000000000000000000000000000000400000000000000000",
-    "blockHash": "0xb05b94175134e648ac24fcefdd731487465af7ad27bfcfef2ac47802234bdc0b",
-    "transactionHash": "0x8d1951992a6c3dad49b6f6dedeb833648fe700438750822c2e1e1556f8440b69",
+    "logsBloom": "0x00000000000000000000000000000000400000000000000000800000600000000000000000000000000000000000000010000000400000000000000000000000000000000000000000000000000002000001000000000000000000400000000000000000020000000000000000000800000000800000000000000000000000400000000000000000000000000000000000000000000080000000000000800000000000000002000000000000000400000004000000000000000000000000000000100820000000000000000000040000000000000400000000000000000020000000000000000000000000000000000000000000000000000000000000000000",
+    "blockHash": "0x1b5ee3e1cf78b44aa77060df94c217b493e057f6040ade7052881076626b3393",
+    "transactionHash": "0x9cd697a66c0b8edac90ffaabba02e9f796d615fd540e0642856340655811eb80",
     "logs": [
       {
-        "transactionIndex": 49,
-        "blockNumber": 14104292,
-        "transactionHash": "0x8d1951992a6c3dad49b6f6dedeb833648fe700438750822c2e1e1556f8440b69",
-        "address": "0xDF2Aa7026bAE7e131D7D5af30345173843D22AFb",
+        "transactionIndex": 30,
+        "blockNumber": 15108405,
+        "transactionHash": "0x9cd697a66c0b8edac90ffaabba02e9f796d615fd540e0642856340655811eb80",
+        "address": "0x30EAc06D1e495411eE15cB59714Eb9DA29fc200e",
         "topics": [
           "0xbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b",
-          "0x000000000000000000000000f3ecd63bb9a4934c85026f8924b49ed7deb69985"
+          "0x000000000000000000000000ddd9864c68072a4723889644b5e7075452718ded"
         ],
         "data": "0x",
-        "logIndex": 122,
-        "blockHash": "0xb05b94175134e648ac24fcefdd731487465af7ad27bfcfef2ac47802234bdc0b"
+        "logIndex": 102,
+        "blockHash": "0x1b5ee3e1cf78b44aa77060df94c217b493e057f6040ade7052881076626b3393"
       },
       {
-        "transactionIndex": 49,
-        "blockNumber": 14104292,
-        "transactionHash": "0x8d1951992a6c3dad49b6f6dedeb833648fe700438750822c2e1e1556f8440b69",
-        "address": "0xDF2Aa7026bAE7e131D7D5af30345173843D22AFb",
+        "transactionIndex": 30,
+        "blockNumber": 15108405,
+        "transactionHash": "0x9cd697a66c0b8edac90ffaabba02e9f796d615fd540e0642856340655811eb80",
+        "address": "0x30EAc06D1e495411eE15cB59714Eb9DA29fc200e",
         "topics": [
           "0x8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0",
           "0x0000000000000000000000000000000000000000000000000000000000000000",
           "0x000000000000000000000000df826ff6518e609e4cee86299d40611c148099d5"
         ],
         "data": "0x",
-        "logIndex": 123,
-        "blockHash": "0xb05b94175134e648ac24fcefdd731487465af7ad27bfcfef2ac47802234bdc0b"
+        "logIndex": 103,
+        "blockHash": "0x1b5ee3e1cf78b44aa77060df94c217b493e057f6040ade7052881076626b3393"
       },
       {
-        "transactionIndex": 49,
-        "blockNumber": 14104292,
-        "transactionHash": "0x8d1951992a6c3dad49b6f6dedeb833648fe700438750822c2e1e1556f8440b69",
-        "address": "0xDF2Aa7026bAE7e131D7D5af30345173843D22AFb",
+        "transactionIndex": 30,
+        "blockNumber": 15108405,
+        "transactionHash": "0x9cd697a66c0b8edac90ffaabba02e9f796d615fd540e0642856340655811eb80",
+        "address": "0x30EAc06D1e495411eE15cB59714Eb9DA29fc200e",
         "topics": [
           "0x7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb3847402498"
         ],
         "data": "0x0000000000000000000000000000000000000000000000000000000000000001",
-        "logIndex": 124,
-        "blockHash": "0xb05b94175134e648ac24fcefdd731487465af7ad27bfcfef2ac47802234bdc0b"
+        "logIndex": 104,
+        "blockHash": "0x1b5ee3e1cf78b44aa77060df94c217b493e057f6040ade7052881076626b3393"
       },
       {
-        "transactionIndex": 49,
-        "blockNumber": 14104292,
-        "transactionHash": "0x8d1951992a6c3dad49b6f6dedeb833648fe700438750822c2e1e1556f8440b69",
-        "address": "0xDF2Aa7026bAE7e131D7D5af30345173843D22AFb",
+        "transactionIndex": 30,
+        "blockNumber": 15108405,
+        "transactionHash": "0x9cd697a66c0b8edac90ffaabba02e9f796d615fd540e0642856340655811eb80",
+        "address": "0x30EAc06D1e495411eE15cB59714Eb9DA29fc200e",
         "topics": [
           "0x7e644d79422f17c01e4894b5f4f588d331ebfa28653d42ae832dc59e38c9798f"
         ],
-        "data": "0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000305b30dc978e931642d243852b4aa5d31a0da8c4",
-        "logIndex": 125,
-        "blockHash": "0xb05b94175134e648ac24fcefdd731487465af7ad27bfcfef2ac47802234bdc0b"
+        "data": "0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ecfe7634abcd2140bede1fb34753a7f5d412c881",
+        "logIndex": 105,
+        "blockHash": "0x1b5ee3e1cf78b44aa77060df94c217b493e057f6040ade7052881076626b3393"
       }
     ],
-    "blockNumber": 14104292,
-    "cumulativeGasUsed": "7281626",
+    "blockNumber": 15108405,
+    "cumulativeGasUsed": "5005821",
     "status": 1,
     "byzantium": true
   },
   "args": [
-    "0xF3ecd63bb9A4934C85026F8924b49ed7Deb69985",
-    "0x305b30dC978e931642D243852b4AA5D31a0dA8c4",
-    "0x485cc9550000000000000000000000001a44076050125825900e736c501f859c50fe728c0000000000000000000000007ba6f01772924a82d9626c126347a28299e98c98"
+    "0xdDd9864C68072a4723889644b5E7075452718deD",
+    "0xecfE7634aBCd2140bede1fb34753A7F5d412c881",
+    "0x485cc955000000000000000000000000b6319cc6c8c27a8f5daf0dd3df91ea35c4720dd70000000000000000000000007ba6f01772924a82d9626c126347a28299e98c98"
   ],
   "numDeployments": 1,
   "solcInputHash": "0e89febeebc7444140de8e67c9067d2c",
@@ -1573,11 +1578,11 @@
   "execute": {
     "methodName": "initialize",
     "args": [
-      "0x1a44076050125825900e736c501f859c50fE728c",
+      "0xb6319cC6c8c27A8F5dAF0dD3DF91EA35C4720dd7",
       "0x7Ba6F01772924a82D9626c126347A28299E98c98"
     ]
   },
-  "implementation": "0xF3ecd63bb9A4934C85026F8924b49ed7Deb69985",
+  "implementation": "0xdDd9864C68072a4723889644b5E7075452718deD",
   "devdoc": {
     "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.",
     "kind": "dev",

deployments/base/MsETHProxyOFT_Proxy.json

@@ -1,5 +1,5 @@
 {
-  "address": "0xDF2Aa7026bAE7e131D7D5af30345173843D22AFb",
+  "address": "0x30EAc06D1e495411eE15cB59714Eb9DA29fc200e",
   "abi": [
     {
       "inputs": [
@@ -146,78 +146,78 @@
       "type": "receive"
     }
   ],
-  "transactionHash": "0x8d1951992a6c3dad49b6f6dedeb833648fe700438750822c2e1e1556f8440b69",
+  "transactionHash": "0x9cd697a66c0b8edac90ffaabba02e9f796d615fd540e0642856340655811eb80",
   "receipt": {
     "to": null,
     "from": "0xdf826ff6518e609E4cEE86299d40611C148099d5",
-    "contractAddress": "0xDF2Aa7026bAE7e131D7D5af30345173843D22AFb",
-    "transactionIndex": 49,
+    "contractAddress": "0x30EAc06D1e495411eE15cB59714Eb9DA29fc200e",
+    "transactionIndex": 30,
     "gasUsed": "816183",
-    "logsBloom": "0x00000000000004000000000000000000400000000000000000800001000000000000000000000000000000000000000000000000400000000000000000000000000004000000000000000000000002000001000000000000000000000000000000000000020000000000000000000800000000800000000000000000000000400000000000000000000000000000000000000000000080008000000000800000000000000000000000000000000400000004000000000000000000000000000000100020000000000000002000040000000000000400000000000000000020000000000000000000000000000000000000000000000000400000000000000000",
-    "blockHash": "0xb05b94175134e648ac24fcefdd731487465af7ad27bfcfef2ac47802234bdc0b",
-    "transactionHash": "0x8d1951992a6c3dad49b6f6dedeb833648fe700438750822c2e1e1556f8440b69",
+    "logsBloom": "0x00000000000000000000000000000000400000000000000000800000600000000000000000000000000000000000000010000000400000000000000000000000000000000000000000000000000002000001000000000000000000400000000000000000020000000000000000000800000000800000000000000000000000400000000000000000000000000000000000000000000080000000000000800000000000000002000000000000000400000004000000000000000000000000000000100820000000000000000000040000000000000400000000000000000020000000000000000000000000000000000000000000000000000000000000000000",
+    "blockHash": "0x1b5ee3e1cf78b44aa77060df94c217b493e057f6040ade7052881076626b3393",
+    "transactionHash": "0x9cd697a66c0b8edac90ffaabba02e9f796d615fd540e0642856340655811eb80",
     "logs": [
       {
-        "transactionIndex": 49,
-        "blockNumber": 14104292,
-        "transactionHash": "0x8d1951992a6c3dad49b6f6dedeb833648fe700438750822c2e1e1556f8440b69",
-        "address": "0xDF2Aa7026bAE7e131D7D5af30345173843D22AFb",
+        "transactionIndex": 30,
+        "blockNumber": 15108405,
+        "transactionHash": "0x9cd697a66c0b8edac90ffaabba02e9f796d615fd540e0642856340655811eb80",
+        "address": "0x30EAc06D1e495411eE15cB59714Eb9DA29fc200e",
         "topics": [
           "0xbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b",
-          "0x000000000000000000000000f3ecd63bb9a4934c85026f8924b49ed7deb69985"
+          "0x000000000000000000000000ddd9864c68072a4723889644b5e7075452718ded"
         ],
         "data": "0x",
-        "logIndex": 122,
-        "blockHash": "0xb05b94175134e648ac24fcefdd731487465af7ad27bfcfef2ac47802234bdc0b"
+        "logIndex": 102,
+        "blockHash": "0x1b5ee3e1cf78b44aa77060df94c217b493e057f6040ade7052881076626b3393"
       },
       {
-        "transactionIndex": 49,
-        "blockNumber": 14104292,
-        "transactionHash": "0x8d1951992a6c3dad49b6f6dedeb833648fe700438750822c2e1e1556f8440b69",
-        "address": "0xDF2Aa7026bAE7e131D7D5af30345173843D22AFb",
+        "transactionIndex": 30,
+        "blockNumber": 15108405,
+        "transactionHash": "0x9cd697a66c0b8edac90ffaabba02e9f796d615fd540e0642856340655811eb80",
+        "address": "0x30EAc06D1e495411eE15cB59714Eb9DA29fc200e",
         "topics": [
           "0x8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0",
           "0x0000000000000000000000000000000000000000000000000000000000000000",
           "0x000000000000000000000000df826ff6518e609e4cee86299d40611c148099d5"
         ],
         "data": "0x",
-        "logIndex": 123,
-        "blockHash": "0xb05b94175134e648ac24fcefdd731487465af7ad27bfcfef2ac47802234bdc0b"
+        "logIndex": 103,
+        "blockHash": "0x1b5ee3e1cf78b44aa77060df94c217b493e057f6040ade7052881076626b3393"
       },
       {
-        "transactionIndex": 49,
-        "blockNumber": 14104292,
-        "transactionHash": "0x8d1951992a6c3dad49b6f6dedeb833648fe700438750822c2e1e1556f8440b69",
-        "address": "0xDF2Aa7026bAE7e131D7D5af30345173843D22AFb",
+        "transactionIndex": 30,
+        "blockNumber": 15108405,
+        "transactionHash": "0x9cd697a66c0b8edac90ffaabba02e9f796d615fd540e0642856340655811eb80",
+        "address": "0x30EAc06D1e495411eE15cB59714Eb9DA29fc200e",
         "topics": [
           "0x7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb3847402498"
         ],
         "data": "0x0000000000000000000000000000000000000000000000000000000000000001",
-        "logIndex": 124,
-        "blockHash": "0xb05b94175134e648ac24fcefdd731487465af7ad27bfcfef2ac47802234bdc0b"
+        "logIndex": 104,
+        "blockHash": "0x1b5ee3e1cf78b44aa77060df94c217b493e057f6040ade7052881076626b3393"
       },
       {
-        "transactionIndex": 49,
-        "blockNumber": 14104292,
-        "transactionHash": "0x8d1951992a6c3dad49b6f6dedeb833648fe700438750822c2e1e1556f8440b69",
-        "address": "0xDF2Aa7026bAE7e131D7D5af30345173843D22AFb",
+        "transactionIndex": 30,
+        "blockNumber": 15108405,
+        "transactionHash": "0x9cd697a66c0b8edac90ffaabba02e9f796d615fd540e0642856340655811eb80",
+        "address": "0x30EAc06D1e495411eE15cB59714Eb9DA29fc200e",
         "topics": [
           "0x7e644d79422f17c01e4894b5f4f588d331ebfa28653d42ae832dc59e38c9798f"
         ],
-        "data": "0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000305b30dc978e931642d243852b4aa5d31a0da8c4",
-        "logIndex": 125,
-        "blockHash": "0xb05b94175134e648ac24fcefdd731487465af7ad27bfcfef2ac47802234bdc0b"
+        "data": "0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ecfe7634abcd2140bede1fb34753a7f5d412c881",
+        "logIndex": 105,
+        "blockHash": "0x1b5ee3e1cf78b44aa77060df94c217b493e057f6040ade7052881076626b3393"
       }
     ],
-    "blockNumber": 14104292,
-    "cumulativeGasUsed": "7281626",
+    "blockNumber": 15108405,
+    "cumulativeGasUsed": "5005821",
     "status": 1,
     "byzantium": true
   },
   "args": [
-    "0xF3ecd63bb9A4934C85026F8924b49ed7Deb69985",
-    "0x305b30dC978e931642D243852b4AA5D31a0dA8c4",
-    "0x485cc9550000000000000000000000001a44076050125825900e736c501f859c50fe728c0000000000000000000000007ba6f01772924a82d9626c126347a28299e98c98"
+    "0xdDd9864C68072a4723889644b5E7075452718deD",
+    "0xecfE7634aBCd2140bede1fb34753A7F5d412c881",
+    "0x485cc955000000000000000000000000b6319cc6c8c27a8f5daf0dd3df91ea35c4720dd70000000000000000000000007ba6f01772924a82d9626c126347a28299e98c98"
   ],
   "numDeployments": 1,
   "solcInputHash": "0e89febeebc7444140de8e67c9067d2c",