Merge branch 'development' into feat/dashboard-swap

ionicprotocol · Oct 15, 2024 · ef12232 · ef12232
2 parents 8d7fe8b + 01a20ad
commit ef12232
Show file tree

Hide file tree

Showing 46 changed files with 1,012 additions and 5,827 deletions.
diff --git a/packages/chains/src/base/assets.ts b/packages/chains/src/base/assets.ts
@@ -244,8 +244,8 @@ export const assets: SupportedAsset[] = [
       aggregator: "0x88Ee016dadDCa8061bf6D566585dF6c8aBfED7bb",
       feedBaseCurrency: ChainlinkFeedBaseCurrency.USD
     },
-    initialSupplyCap: parseEther(String(140_000)).toString(),
-    initialBorrowCap: parseEther(String(110_000)).toString(),
+    initialSupplyCap: parseEther(String(250_000)).toString(),
+    initialBorrowCap: parseEther(String(120_000)).toString(),
     initialCf: "0.82",
     extraDocs: defaultDocs("https://basescan.org", wUSDM)
   },

diff --git a/packages/contracts/deployments/base/IonicFlywheelBorrow_Borrow_ION.json b/packages/contracts/deployments/base/IonicFlywheelBorrow_Borrow_ION.json
@@ -1,5 +1,5 @@
 {
-  "address": "0x327410E4D3A32EF37712e77fCB005e5327F082De",
+  "address": "0x3EE270d9115CfabD776c32A72F3ca6AF5c8CC88a",
   "abi": [
     {
       "anonymous": false,
@@ -863,104 +863,104 @@
       "type": "constructor"
     }
   ],
-  "transactionHash": "0xd7c39105483991b0288cf35c6aae4176442a544395e4a7928c9cc1f95bc15664",
+  "transactionHash": "0x683084de5d286e90263b3db0b92a2772310757f598b9d921836b4f7ec3a0c387",
   "receipt": {
     "to": null,
     "from": "0x1155b614971f16758C92c4890eD338C9e3ede6b7",
-    "contractAddress": "0x327410E4D3A32EF37712e77fCB005e5327F082De",
-    "transactionIndex": 45,
+    "contractAddress": "0x3EE270d9115CfabD776c32A72F3ca6AF5c8CC88a",
+    "transactionIndex": 57,
     "gasUsed": "866912",
-    "logsBloom": "0x00000000000000100000000000000000400000000000000000800000000200000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000002000001000000000000000000000000000000000000020000000000000000000800040000800000000000000000000400400000000000000000000000000000000000000000000080000000000000c00000000000000000000000000000000400000000000000000000000040000200000000000020000000000000000000040000000000000400000000000000000020000000000000000000000000000000000040000000000000000000000000000000",
-    "blockHash": "0x20cea0ae1d447e158d179aed189d1e26797b5d19c78f0f98c2b34e1f2f2c05a6",
-    "transactionHash": "0xd7c39105483991b0288cf35c6aae4176442a544395e4a7928c9cc1f95bc15664",
+    "logsBloom": "0x00000000000000000000000000000000400000000000000000800000000200000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000002000001000000000000000000000000000000000000020000000000000200000800000000800000000000000000000000400000000000000000000000000000000000000000000080000000000000c00000000000000000000000000000000400000000000000000000000000000000200000000020000000000000000000140000000000000400000000000000000020000000000000000000000000000800000000000000004000000000000020000000",
+    "blockHash": "0x4cabc0700c65d481bd4dc87920bacf0d889bea86c39f4d6c6db837997a66eef7",
+    "transactionHash": "0x683084de5d286e90263b3db0b92a2772310757f598b9d921836b4f7ec3a0c387",
     "logs": [
       {
-        "transactionIndex": 45,
-        "blockNumber": 17438056,
-        "transactionHash": "0xd7c39105483991b0288cf35c6aae4176442a544395e4a7928c9cc1f95bc15664",
-        "address": "0x327410E4D3A32EF37712e77fCB005e5327F082De",
+        "transactionIndex": 57,
+        "blockNumber": 21057221,
+        "transactionHash": "0x683084de5d286e90263b3db0b92a2772310757f598b9d921836b4f7ec3a0c387",
+        "address": "0x3EE270d9115CfabD776c32A72F3ca6AF5c8CC88a",
         "topics": [
           "0xbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b",
-          "0x000000000000000000000000b4c0522f595ea2b407fe3e3d55b36291cc2b2ced"
+          "0x000000000000000000000000f6ce0a36b259cb1214886af0141472aec07a0b05"
         ],
         "data": "0x",
         "logIndex": 90,
-        "blockHash": "0x20cea0ae1d447e158d179aed189d1e26797b5d19c78f0f98c2b34e1f2f2c05a6"
+        "blockHash": "0x4cabc0700c65d481bd4dc87920bacf0d889bea86c39f4d6c6db837997a66eef7"
       },
       {
-        "transactionIndex": 45,
-        "blockNumber": 17438056,
-        "transactionHash": "0xd7c39105483991b0288cf35c6aae4176442a544395e4a7928c9cc1f95bc15664",
-        "address": "0x327410E4D3A32EF37712e77fCB005e5327F082De",
+        "transactionIndex": 57,
+        "blockNumber": 21057221,
+        "transactionHash": "0x683084de5d286e90263b3db0b92a2772310757f598b9d921836b4f7ec3a0c387",
+        "address": "0x3EE270d9115CfabD776c32A72F3ca6AF5c8CC88a",
         "topics": [
           "0x8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0",
           "0x0000000000000000000000000000000000000000000000000000000000000000",
           "0x0000000000000000000000001155b614971f16758c92c4890ed338c9e3ede6b7"
         ],
         "data": "0x",
         "logIndex": 91,
-        "blockHash": "0x20cea0ae1d447e158d179aed189d1e26797b5d19c78f0f98c2b34e1f2f2c05a6"
+        "blockHash": "0x4cabc0700c65d481bd4dc87920bacf0d889bea86c39f4d6c6db837997a66eef7"
       },
       {
-        "transactionIndex": 45,
-        "blockNumber": 17438056,
-        "transactionHash": "0xd7c39105483991b0288cf35c6aae4176442a544395e4a7928c9cc1f95bc15664",
-        "address": "0x327410E4D3A32EF37712e77fCB005e5327F082De",
+        "transactionIndex": 57,
+        "blockNumber": 21057221,
+        "transactionHash": "0x683084de5d286e90263b3db0b92a2772310757f598b9d921836b4f7ec3a0c387",
+        "address": "0x3EE270d9115CfabD776c32A72F3ca6AF5c8CC88a",
         "topics": [
           "0x8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0",
           "0x0000000000000000000000001155b614971f16758c92c4890ed338c9e3ede6b7",
           "0x0000000000000000000000001155b614971f16758c92c4890ed338c9e3ede6b7"
         ],
         "data": "0x",
         "logIndex": 92,
-        "blockHash": "0x20cea0ae1d447e158d179aed189d1e26797b5d19c78f0f98c2b34e1f2f2c05a6"
+        "blockHash": "0x4cabc0700c65d481bd4dc87920bacf0d889bea86c39f4d6c6db837997a66eef7"
       },
       {
-        "transactionIndex": 45,
-        "blockNumber": 17438056,
-        "transactionHash": "0xd7c39105483991b0288cf35c6aae4176442a544395e4a7928c9cc1f95bc15664",
-        "address": "0x327410E4D3A32EF37712e77fCB005e5327F082De",
+        "transactionIndex": 57,
+        "blockNumber": 21057221,
+        "transactionHash": "0x683084de5d286e90263b3db0b92a2772310757f598b9d921836b4f7ec3a0c387",
+        "address": "0x3EE270d9115CfabD776c32A72F3ca6AF5c8CC88a",
         "topics": [
           "0x8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0",
           "0x0000000000000000000000001155b614971f16758c92c4890ed338c9e3ede6b7",
           "0x0000000000000000000000001155b614971f16758c92c4890ed338c9e3ede6b7"
         ],
         "data": "0x",
         "logIndex": 93,
-        "blockHash": "0x20cea0ae1d447e158d179aed189d1e26797b5d19c78f0f98c2b34e1f2f2c05a6"
+        "blockHash": "0x4cabc0700c65d481bd4dc87920bacf0d889bea86c39f4d6c6db837997a66eef7"
       },
       {
-        "transactionIndex": 45,
-        "blockNumber": 17438056,
-        "transactionHash": "0xd7c39105483991b0288cf35c6aae4176442a544395e4a7928c9cc1f95bc15664",
-        "address": "0x327410E4D3A32EF37712e77fCB005e5327F082De",
+        "transactionIndex": 57,
+        "blockNumber": 21057221,
+        "transactionHash": "0x683084de5d286e90263b3db0b92a2772310757f598b9d921836b4f7ec3a0c387",
+        "address": "0x3EE270d9115CfabD776c32A72F3ca6AF5c8CC88a",
         "topics": [
           "0x7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb3847402498"
         ],
         "data": "0x0000000000000000000000000000000000000000000000000000000000000001",
         "logIndex": 94,
-        "blockHash": "0x20cea0ae1d447e158d179aed189d1e26797b5d19c78f0f98c2b34e1f2f2c05a6"
+        "blockHash": "0x4cabc0700c65d481bd4dc87920bacf0d889bea86c39f4d6c6db837997a66eef7"
       },
       {
-        "transactionIndex": 45,
-        "blockNumber": 17438056,
-        "transactionHash": "0xd7c39105483991b0288cf35c6aae4176442a544395e4a7928c9cc1f95bc15664",
-        "address": "0x327410E4D3A32EF37712e77fCB005e5327F082De",
+        "transactionIndex": 57,
+        "blockNumber": 21057221,
+        "transactionHash": "0x683084de5d286e90263b3db0b92a2772310757f598b9d921836b4f7ec3a0c387",
+        "address": "0x3EE270d9115CfabD776c32A72F3ca6AF5c8CC88a",
         "topics": [
           "0x7e644d79422f17c01e4894b5f4f588d331ebfa28653d42ae832dc59e38c9798f"
         ],
         "data": "0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004c21db52cca974df3dc019c92e52e522ce57156",
         "logIndex": 95,
-        "blockHash": "0x20cea0ae1d447e158d179aed189d1e26797b5d19c78f0f98c2b34e1f2f2c05a6"
+        "blockHash": "0x4cabc0700c65d481bd4dc87920bacf0d889bea86c39f4d6c6db837997a66eef7"
       }
     ],
-    "blockNumber": 17438056,
-    "cumulativeGasUsed": "4545378",
+    "blockNumber": 21057221,
+    "cumulativeGasUsed": "8602964",
     "status": 1,
     "byzantium": true
   },
   "args": [
-    "0xB4c0522F595eA2B407FE3e3D55B36291cC2b2Ced",
+    "0xf6ce0A36B259cB1214886aF0141472aEc07A0B05",
     "0x04C21Db52CcA974dF3Dc019C92E52e522ce57156",
     "0xf8c8765e0000000000000000000000003ee5e23eee121094f1cfc0ccc79d6c809ebd22e500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e47b0ff7b5571047bb1a8b18c9444d25516e7f90000000000000000000000001155b614971f16758c92c4890ed338c9e3ede6b7"
   ],
@@ -978,7 +978,7 @@
       "0x1155b614971f16758C92c4890eD338C9e3ede6b7"
     ]
   },
-  "implementation": "0xB4c0522F595eA2B407FE3e3D55B36291cC2b2Ced",
+  "implementation": "0xf6ce0A36B259cB1214886aF0141472aEc07A0B05",
   "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",

diff --git a/packages/contracts/deployments/base/IonicFlywheelBorrow_Borrow_ION_Implementation.json b/packages/contracts/deployments/base/IonicFlywheelBorrow_Borrow_ION_Implementation.json
diff --git a/packages/contracts/deployments/base/IonicFlywheelBorrow_Borrow_ION_Proxy.json b/packages/contracts/deployments/base/IonicFlywheelBorrow_Borrow_ION_Proxy.json
@@ -1,5 +1,5 @@
 {
-  "address": "0x327410E4D3A32EF37712e77fCB005e5327F082De",
+  "address": "0x3EE270d9115CfabD776c32A72F3ca6AF5c8CC88a",
   "abi": [
     {
       "inputs": [
@@ -146,104 +146,104 @@
       "type": "receive"
     }
   ],
-  "transactionHash": "0xd7c39105483991b0288cf35c6aae4176442a544395e4a7928c9cc1f95bc15664",
+  "transactionHash": "0x683084de5d286e90263b3db0b92a2772310757f598b9d921836b4f7ec3a0c387",
   "receipt": {
     "to": null,
     "from": "0x1155b614971f16758C92c4890eD338C9e3ede6b7",
-    "contractAddress": "0x327410E4D3A32EF37712e77fCB005e5327F082De",
-    "transactionIndex": 45,
+    "contractAddress": "0x3EE270d9115CfabD776c32A72F3ca6AF5c8CC88a",
+    "transactionIndex": 57,
     "gasUsed": "866912",
-    "logsBloom": "0x00000000000000100000000000000000400000000000000000800000000200000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000002000001000000000000000000000000000000000000020000000000000000000800040000800000000000000000000400400000000000000000000000000000000000000000000080000000000000c00000000000000000000000000000000400000000000000000000000040000200000000000020000000000000000000040000000000000400000000000000000020000000000000000000000000000000000040000000000000000000000000000000",
-    "blockHash": "0x20cea0ae1d447e158d179aed189d1e26797b5d19c78f0f98c2b34e1f2f2c05a6",
-    "transactionHash": "0xd7c39105483991b0288cf35c6aae4176442a544395e4a7928c9cc1f95bc15664",
+    "logsBloom": "0x00000000000000000000000000000000400000000000000000800000000200000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000002000001000000000000000000000000000000000000020000000000000200000800000000800000000000000000000000400000000000000000000000000000000000000000000080000000000000c00000000000000000000000000000000400000000000000000000000000000000200000000020000000000000000000140000000000000400000000000000000020000000000000000000000000000800000000000000004000000000000020000000",
+    "blockHash": "0x4cabc0700c65d481bd4dc87920bacf0d889bea86c39f4d6c6db837997a66eef7",
+    "transactionHash": "0x683084de5d286e90263b3db0b92a2772310757f598b9d921836b4f7ec3a0c387",
     "logs": [
       {
-        "transactionIndex": 45,
-        "blockNumber": 17438056,
-        "transactionHash": "0xd7c39105483991b0288cf35c6aae4176442a544395e4a7928c9cc1f95bc15664",
-        "address": "0x327410E4D3A32EF37712e77fCB005e5327F082De",
+        "transactionIndex": 57,
+        "blockNumber": 21057221,
+        "transactionHash": "0x683084de5d286e90263b3db0b92a2772310757f598b9d921836b4f7ec3a0c387",
+        "address": "0x3EE270d9115CfabD776c32A72F3ca6AF5c8CC88a",
         "topics": [
           "0xbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b",
-          "0x000000000000000000000000b4c0522f595ea2b407fe3e3d55b36291cc2b2ced"
+          "0x000000000000000000000000f6ce0a36b259cb1214886af0141472aec07a0b05"
         ],
         "data": "0x",
         "logIndex": 90,
-        "blockHash": "0x20cea0ae1d447e158d179aed189d1e26797b5d19c78f0f98c2b34e1f2f2c05a6"
+        "blockHash": "0x4cabc0700c65d481bd4dc87920bacf0d889bea86c39f4d6c6db837997a66eef7"
       },
       {
-        "transactionIndex": 45,
-        "blockNumber": 17438056,
-        "transactionHash": "0xd7c39105483991b0288cf35c6aae4176442a544395e4a7928c9cc1f95bc15664",
-        "address": "0x327410E4D3A32EF37712e77fCB005e5327F082De",
+        "transactionIndex": 57,
+        "blockNumber": 21057221,
+        "transactionHash": "0x683084de5d286e90263b3db0b92a2772310757f598b9d921836b4f7ec3a0c387",
+        "address": "0x3EE270d9115CfabD776c32A72F3ca6AF5c8CC88a",
         "topics": [
           "0x8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0",
           "0x0000000000000000000000000000000000000000000000000000000000000000",
           "0x0000000000000000000000001155b614971f16758c92c4890ed338c9e3ede6b7"
         ],
         "data": "0x",
         "logIndex": 91,
-        "blockHash": "0x20cea0ae1d447e158d179aed189d1e26797b5d19c78f0f98c2b34e1f2f2c05a6"
+        "blockHash": "0x4cabc0700c65d481bd4dc87920bacf0d889bea86c39f4d6c6db837997a66eef7"
       },
       {
-        "transactionIndex": 45,
-        "blockNumber": 17438056,
-        "transactionHash": "0xd7c39105483991b0288cf35c6aae4176442a544395e4a7928c9cc1f95bc15664",
-        "address": "0x327410E4D3A32EF37712e77fCB005e5327F082De",
+        "transactionIndex": 57,
+        "blockNumber": 21057221,
+        "transactionHash": "0x683084de5d286e90263b3db0b92a2772310757f598b9d921836b4f7ec3a0c387",
+        "address": "0x3EE270d9115CfabD776c32A72F3ca6AF5c8CC88a",
         "topics": [
           "0x8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0",
           "0x0000000000000000000000001155b614971f16758c92c4890ed338c9e3ede6b7",
           "0x0000000000000000000000001155b614971f16758c92c4890ed338c9e3ede6b7"
         ],
         "data": "0x",
         "logIndex": 92,
-        "blockHash": "0x20cea0ae1d447e158d179aed189d1e26797b5d19c78f0f98c2b34e1f2f2c05a6"
+        "blockHash": "0x4cabc0700c65d481bd4dc87920bacf0d889bea86c39f4d6c6db837997a66eef7"
       },
       {
-        "transactionIndex": 45,
-        "blockNumber": 17438056,
-        "transactionHash": "0xd7c39105483991b0288cf35c6aae4176442a544395e4a7928c9cc1f95bc15664",
-        "address": "0x327410E4D3A32EF37712e77fCB005e5327F082De",
+        "transactionIndex": 57,
+        "blockNumber": 21057221,
+        "transactionHash": "0x683084de5d286e90263b3db0b92a2772310757f598b9d921836b4f7ec3a0c387",
+        "address": "0x3EE270d9115CfabD776c32A72F3ca6AF5c8CC88a",
         "topics": [
           "0x8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0",
           "0x0000000000000000000000001155b614971f16758c92c4890ed338c9e3ede6b7",
           "0x0000000000000000000000001155b614971f16758c92c4890ed338c9e3ede6b7"
         ],
         "data": "0x",
         "logIndex": 93,
-        "blockHash": "0x20cea0ae1d447e158d179aed189d1e26797b5d19c78f0f98c2b34e1f2f2c05a6"
+        "blockHash": "0x4cabc0700c65d481bd4dc87920bacf0d889bea86c39f4d6c6db837997a66eef7"
       },
       {
-        "transactionIndex": 45,
-        "blockNumber": 17438056,
-        "transactionHash": "0xd7c39105483991b0288cf35c6aae4176442a544395e4a7928c9cc1f95bc15664",
-        "address": "0x327410E4D3A32EF37712e77fCB005e5327F082De",
+        "transactionIndex": 57,
+        "blockNumber": 21057221,
+        "transactionHash": "0x683084de5d286e90263b3db0b92a2772310757f598b9d921836b4f7ec3a0c387",
+        "address": "0x3EE270d9115CfabD776c32A72F3ca6AF5c8CC88a",
         "topics": [
           "0x7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb3847402498"
         ],
         "data": "0x0000000000000000000000000000000000000000000000000000000000000001",
         "logIndex": 94,
-        "blockHash": "0x20cea0ae1d447e158d179aed189d1e26797b5d19c78f0f98c2b34e1f2f2c05a6"
+        "blockHash": "0x4cabc0700c65d481bd4dc87920bacf0d889bea86c39f4d6c6db837997a66eef7"
       },
       {
-        "transactionIndex": 45,
-        "blockNumber": 17438056,
-        "transactionHash": "0xd7c39105483991b0288cf35c6aae4176442a544395e4a7928c9cc1f95bc15664",
-        "address": "0x327410E4D3A32EF37712e77fCB005e5327F082De",
+        "transactionIndex": 57,
+        "blockNumber": 21057221,
+        "transactionHash": "0x683084de5d286e90263b3db0b92a2772310757f598b9d921836b4f7ec3a0c387",
+        "address": "0x3EE270d9115CfabD776c32A72F3ca6AF5c8CC88a",
         "topics": [
           "0x7e644d79422f17c01e4894b5f4f588d331ebfa28653d42ae832dc59e38c9798f"
         ],
         "data": "0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004c21db52cca974df3dc019c92e52e522ce57156",
         "logIndex": 95,
-        "blockHash": "0x20cea0ae1d447e158d179aed189d1e26797b5d19c78f0f98c2b34e1f2f2c05a6"
+        "blockHash": "0x4cabc0700c65d481bd4dc87920bacf0d889bea86c39f4d6c6db837997a66eef7"
       }
     ],
-    "blockNumber": 17438056,
-    "cumulativeGasUsed": "4545378",
+    "blockNumber": 21057221,
+    "cumulativeGasUsed": "8602964",
     "status": 1,
     "byzantium": true
   },
   "args": [
-    "0xB4c0522F595eA2B407FE3e3D55B36291cC2b2Ced",
+    "0xf6ce0A36B259cB1214886aF0141472aEc07A0B05",
     "0x04C21Db52CcA974dF3Dc019C92E52e522ce57156",
     "0xf8c8765e0000000000000000000000003ee5e23eee121094f1cfc0ccc79d6c809ebd22e500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e47b0ff7b5571047bb1a8b18c9444d25516e7f90000000000000000000000001155b614971f16758c92c4890ed338c9e3ede6b7"
   ],