Merge branch 'main' into CU-8678qg1h7-lbp-proxy

Tapioca-DAO · Nov 15, 2023 · 11b4b26 · 11b4b26
2 parents 063178a + 6dfd0da
commit 11b4b26
Show file tree

Hide file tree

Showing 85 changed files with 364 additions and 599 deletions.
diff --git a/src/artifacts/tapioca-bar/BBBorrow.json b/src/artifacts/tapioca-bar/BBBorrow.json
diff --git a/src/artifacts/tapioca-bar/BBCollateral.json b/src/artifacts/tapioca-bar/BBCollateral.json
diff --git a/src/artifacts/tapioca-bar/BBCommon.json b/src/artifacts/tapioca-bar/BBCommon.json
diff --git a/src/artifacts/tapioca-bar/BBLendingCommon.json b/src/artifacts/tapioca-bar/BBLendingCommon.json
diff --git a/src/artifacts/tapioca-bar/BBLeverage.json b/src/artifacts/tapioca-bar/BBLeverage.json
diff --git a/src/artifacts/tapioca-bar/BBLiquidation.json b/src/artifacts/tapioca-bar/BBLiquidation.json
diff --git a/src/artifacts/tapioca-bar/BBStorage.json b/src/artifacts/tapioca-bar/BBStorage.json
diff --git a/src/artifacts/tapioca-bar/BaseUSDO.json b/src/artifacts/tapioca-bar/BaseUSDO.json
diff --git a/src/artifacts/tapioca-bar/BaseUSDOStorage.json b/src/artifacts/tapioca-bar/BaseUSDOStorage.json
diff --git a/src/artifacts/tapioca-bar/BigBang.json b/src/artifacts/tapioca-bar/BigBang.json
diff --git a/src/artifacts/tapioca-bar/MarketERC20.json b/src/artifacts/tapioca-bar/MarketERC20.json
diff --git a/src/artifacts/tapioca-bar/MarketLiquidatorReceiver.json b/src/artifacts/tapioca-bar/MarketLiquidatorReceiver.json
diff --git a/src/artifacts/tapioca-bar/Penrose.json b/src/artifacts/tapioca-bar/Penrose.json
diff --git a/src/artifacts/tapioca-bar/SGLBorrow.json b/src/artifacts/tapioca-bar/SGLBorrow.json
diff --git a/src/artifacts/tapioca-bar/SGLCollateral.json b/src/artifacts/tapioca-bar/SGLCollateral.json
diff --git a/src/artifacts/tapioca-bar/SGLCommon.json b/src/artifacts/tapioca-bar/SGLCommon.json
diff --git a/src/artifacts/tapioca-bar/SGLLendingCommon.json b/src/artifacts/tapioca-bar/SGLLendingCommon.json
diff --git a/src/artifacts/tapioca-bar/SGLLeverage.json b/src/artifacts/tapioca-bar/SGLLeverage.json
diff --git a/src/artifacts/tapioca-bar/SGLLiquidation.json b/src/artifacts/tapioca-bar/SGLLiquidation.json
diff --git a/src/artifacts/tapioca-bar/SGLStorage.json b/src/artifacts/tapioca-bar/SGLStorage.json
diff --git a/src/artifacts/tapioca-bar/SimpleLeverageExecutor.json b/src/artifacts/tapioca-bar/SimpleLeverageExecutor.json
diff --git a/src/artifacts/tapioca-bar/Singularity.json b/src/artifacts/tapioca-bar/Singularity.json
diff --git a/src/artifacts/tapioca-bar/Test.json b/src/artifacts/tapioca-bar/Test.json
@@ -71,25 +71,6 @@
       "stateMutability": "pure",
       "type": "function"
     },
-    {
-      "inputs": [
-        {
-          "internalType": "bytes4",
-          "name": "_returnData",
-          "type": "bytes4"
-        }
-      ],
-      "name": "getRevert",
-      "outputs": [
-        {
-          "internalType": "string",
-          "name": "result",
-          "type": "string"
-        }
-      ],
-      "stateMutability": "pure",
-      "type": "function"
-    },
     {
       "inputs": [],
       "name": "x",
@@ -104,8 +85,8 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x6080806040523461001b57600160005561035b90816100218239f35b600080fdfe608060408181526004918236101561001657600080fd5b600090813560e01c9081630c55699c1461015257508063191778cd1461012357806373f368ca146100805763d9cabbbb1461005057600080fd5b3461007d57606036600319011261007d575061007660209260443590602435903561018f565b9051908152f35b80fd5b503461007d5760208060031936011261011f5783359163ffffffff60e01b831680930361007d57835192828401528483528383019483861067ffffffffffffffff87111761010c5750848452818552825191826060850152815b8381106100f857505082820160800152601f01601f19168101030190f35b8082918601608083820151910152016100da565b634e487b7160e01b825260419052602490fd5b5080fd5b503461007d5760a036600319011261007d57506100766020926084359060643590604435906024359035610201565b90503461011f578160031936011261011f57602091548152f35b9190820391821161017957565b634e487b7160e01b600052601160045260246000fd5b9190670de0b6b3a76400008310156101fb57670d87e555900180008311156101f557670d87e55590017fff198301928311610179576101ce908261016c565b91828102928184041490151715610179576658d15e176280006101f292049061016c565b90565b50905090565b91505090565b919091821561031b5782811061031b578181101561031357826102239161016c565b90620186a09283830292808404851490151715610179576102439161016c565b9081156102fd570490838303600092838612858312811690868413901516176102e95781810291848112600160ff1b8314166102d55782051485851417156102c157058184820194851291129080158216911516176102ad57508082126102a8575090565b905090565b634e487b7160e01b81526011600452602490fd5b634e487b7160e01b83526011600452602483fd5b634e487b7160e01b85526011600452602485fd5b634e487b7160e01b84526011600452602484fd5b634e487b7160e01b600052601260045260246000fd5b505050905090565b505050505060009056fea2646970667358221220d74e7ee80a5050cb77e69180bd61b9d2512d657206b07f225e81577cc21af01864736f6c63430008120033",
-  "deployedBytecode": "0x608060408181526004918236101561001657600080fd5b600090813560e01c9081630c55699c1461015257508063191778cd1461012357806373f368ca146100805763d9cabbbb1461005057600080fd5b3461007d57606036600319011261007d575061007660209260443590602435903561018f565b9051908152f35b80fd5b503461007d5760208060031936011261011f5783359163ffffffff60e01b831680930361007d57835192828401528483528383019483861067ffffffffffffffff87111761010c5750848452818552825191826060850152815b8381106100f857505082820160800152601f01601f19168101030190f35b8082918601608083820151910152016100da565b634e487b7160e01b825260419052602490fd5b5080fd5b503461007d5760a036600319011261007d57506100766020926084359060643590604435906024359035610201565b90503461011f578160031936011261011f57602091548152f35b9190820391821161017957565b634e487b7160e01b600052601160045260246000fd5b9190670de0b6b3a76400008310156101fb57670d87e555900180008311156101f557670d87e55590017fff198301928311610179576101ce908261016c565b91828102928184041490151715610179576658d15e176280006101f292049061016c565b90565b50905090565b91505090565b919091821561031b5782811061031b578181101561031357826102239161016c565b90620186a09283830292808404851490151715610179576102439161016c565b9081156102fd570490838303600092838612858312811690868413901516176102e95781810291848112600160ff1b8314166102d55782051485851417156102c157058184820194851291129080158216911516176102ad57508082126102a8575090565b905090565b634e487b7160e01b81526011600452602490fd5b634e487b7160e01b83526011600452602483fd5b634e487b7160e01b85526011600452602485fd5b634e487b7160e01b84526011600452602484fd5b634e487b7160e01b600052601260045260246000fd5b505050905090565b505050505060009056fea2646970667358221220d74e7ee80a5050cb77e69180bd61b9d2512d657206b07f225e81577cc21af01864736f6c63430008120033",
+  "bytecode": "0x6080806040523461001b5760016000556102a990816100218239f35b600080fdfe608080604052600436101561001357600080fd5b600090813560e01c9081630c55699c1461009c57508063191778cd146100715763d9cabbbb1461004257600080fd5b3461006e57606036600319011261006e5760206100666044356024356004356100dd565b604051908152f35b80fd5b503461006e5760a036600319011261006e57602061006660843560643560443560243560043561014f565b9050346100b657816003193601126100b657602091548152f35b5080fd5b919082039182116100c757565b634e487b7160e01b600052601160045260246000fd5b9190670e27c49886e6000083101561014957670d99a8cec7e2000083111561014357670d99a8cec7e1ffff1983019283116100c75761011c90826100ba565b918281029281840414901517156100c757668e1bc9bf0400006101409204906100ba565b90565b50905090565b91505090565b91909182156102695782811061026957818110156102615782610171916100ba565b90620186a092838302928084048514901517156100c757610191916100ba565b90811561024b570490838303600092838612858312811690868413901516176102375781810291848112600160ff1b83141661022357820514858514171561020f57058184820194851291129080158216911516176101fb57508082126101f6575090565b905090565b634e487b7160e01b81526011600452602490fd5b634e487b7160e01b83526011600452602483fd5b634e487b7160e01b85526011600452602485fd5b634e487b7160e01b84526011600452602484fd5b634e487b7160e01b600052601260045260246000fd5b505050905090565b505050505060009056fea26469706673582212200cc8055ae6c11c304eb1da98b6bdf37d30860e52518e6b9a7108938c6657df2164736f6c63430008120033",
+  "deployedBytecode": "0x608080604052600436101561001357600080fd5b600090813560e01c9081630c55699c1461009c57508063191778cd146100715763d9cabbbb1461004257600080fd5b3461006e57606036600319011261006e5760206100666044356024356004356100dd565b604051908152f35b80fd5b503461006e5760a036600319011261006e57602061006660843560643560443560243560043561014f565b9050346100b657816003193601126100b657602091548152f35b5080fd5b919082039182116100c757565b634e487b7160e01b600052601160045260246000fd5b9190670e27c49886e6000083101561014957670d99a8cec7e2000083111561014357670d99a8cec7e1ffff1983019283116100c75761011c90826100ba565b918281029281840414901517156100c757668e1bc9bf0400006101409204906100ba565b90565b50905090565b91505090565b91909182156102695782811061026957818110156102615782610171916100ba565b90620186a092838302928084048514901517156100c757610191916100ba565b90811561024b570490838303600092838612858312811690868413901516176102375781810291848112600160ff1b83141661022357820514858514171561020f57058184820194851291129080158216911516176101fb57508082126101f6575090565b905090565b634e487b7160e01b81526011600452602490fd5b634e487b7160e01b83526011600452602483fd5b634e487b7160e01b85526011600452602485fd5b634e487b7160e01b84526011600452602484fd5b634e487b7160e01b600052601260045260246000fd5b505050905090565b505050505060009056fea26469706673582212200cc8055ae6c11c304eb1da98b6bdf37d30860e52518e6b9a7108938c6657df2164736f6c63430008120033",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }
diff --git a/src/artifacts/tapioca-bar/USDO.json b/src/artifacts/tapioca-bar/USDO.json
diff --git a/src/artifacts/tapioca-bar/USDOFlashloanHelper.json b/src/artifacts/tapioca-bar/USDOFlashloanHelper.json
diff --git a/src/artifacts/tapioca-bar/USDOGenericModule.json b/src/artifacts/tapioca-bar/USDOGenericModule.json
diff --git a/src/artifacts/tapioca-bar/USDOLeverageDestinationModule.json b/src/artifacts/tapioca-bar/USDOLeverageDestinationModule.json
diff --git a/src/artifacts/tapioca-bar/USDOLeverageModule.json b/src/artifacts/tapioca-bar/USDOLeverageModule.json
diff --git a/src/artifacts/tapioca-bar/USDOMarketDestinationModule.json b/src/artifacts/tapioca-bar/USDOMarketDestinationModule.json
diff --git a/src/artifacts/tapioca-bar/USDOMarketModule.json b/src/artifacts/tapioca-bar/USDOMarketModule.json
diff --git a/src/artifacts/tapioca-bar/USDOOptionsDestinationModule.json b/src/artifacts/tapioca-bar/USDOOptionsDestinationModule.json
diff --git a/src/artifacts/tapioca-bar/USDOOptionsModule.json b/src/artifacts/tapioca-bar/USDOOptionsModule.json
diff --git a/src/artifacts/tapioca-mocks/FlashBorrowerMock.json b/src/artifacts/tapioca-mocks/FlashBorrowerMock.json
@@ -90,8 +90,8 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x60803461007457601f61053338819003918201601f19168301916001600160401b038311848410176100795780849260209460405283398101031261007457516001600160a01b0381169081900361007457600080546001600160a01b0319169190911790556040516104a390816100908239f35b600080fd5b634e487b7160e01b600052604160045260246000fdfe60806040818152600436101561001457600080fd5b600091823560e01c90816323e30c8b1461011f57508063736ddf3b146100f55763b53e48851461004357600080fd5b346100f157806003193601126100f15761005b610249565b9060206024359261006c84826102d7565b60a46001600160a01b0391868381541686519788958694632e7ff4ef60e11b86523060048701521660248501526044840152608060648401528160848401525af19081156100e857506100bd575080f35b6100dd9060203d81116100e1575b6100d58183610264565b81019061029c565b5080f35b503d6100cb565b513d84823e3d90fd5b5080fd5b50346100f15736600319011261011c57610119610110610249565b602435906102d7565b80f35b80fd5b9050823461011c5760a036600319011261011c5761013b610249565b916001600160a01b03916024358381160361011c5760843567ffffffffffffffff8082116102455736602383011215610245578160040135908111610245573691016024011161011c5754821633036102035750309116036101c057602090517f439148f0bbc682ca079e46d6e2c2f0c1e3b820f1a291b069d8882abf8cf18dd98152f35b5162461bcd60e51b815260206004820181905260248201527f466c617368426f72726f7765723a206e6f742074686520696e69746961746f726044820152606490fd5b62461bcd60e51b815260206004820152601860248201527f466c617368426f72726f7765723a20756e7472757374656400000000000000006044820152606490fd5b8280fd5b600435906001600160a01b038216820361025f57565b600080fd5b90601f8019910116810190811067ffffffffffffffff82111761028657604052565b634e487b7160e01b600052604160045260246000fd5b9081602091031261025f5751801515810361025f5790565b919082018092116102c157565b634e487b7160e01b600052601160045260246000fd5b6001600160a01b039060008281541692604092835194636eb1769f60e11b86523060048701528060248701526020968787604481855afa968715610463578597610430575b508551633676633960e21b81526001600160a01b038416600482015260248101829052908882604481865afa918215610426579089959493929187926103e0575b506103a7986103708893610376936102b4565b906102b4565b875163095ea7b360e01b81526001600160a01b03909316600484015260248301529096879384929183906044820190565b0393165af19182156103d65750506103bd575050565b816103d392903d106100e1576100d58183610264565b50565b51903d90823e3d90fd5b8092508691939597989994963d831161041f575b6103fe8183610264565b8101031261041b57519196959488949093909290916103a761035d565b8680fd5b503d6103f4565b87513d88823e3d90fd5b9096508781813d831161045c575b6104488183610264565b810103126104585751953861031c565b8480fd5b503d61043e565b86513d87823e3d90fdfea264697066735822122083a60d37aed0ea99e9373e3994f0f0c698059a7f4b46dd9c43369e9d5add47ab64736f6c63430008120033",
-  "deployedBytecode": "0x60806040818152600436101561001457600080fd5b600091823560e01c90816323e30c8b1461011f57508063736ddf3b146100f55763b53e48851461004357600080fd5b346100f157806003193601126100f15761005b610249565b9060206024359261006c84826102d7565b60a46001600160a01b0391868381541686519788958694632e7ff4ef60e11b86523060048701521660248501526044840152608060648401528160848401525af19081156100e857506100bd575080f35b6100dd9060203d81116100e1575b6100d58183610264565b81019061029c565b5080f35b503d6100cb565b513d84823e3d90fd5b5080fd5b50346100f15736600319011261011c57610119610110610249565b602435906102d7565b80f35b80fd5b9050823461011c5760a036600319011261011c5761013b610249565b916001600160a01b03916024358381160361011c5760843567ffffffffffffffff8082116102455736602383011215610245578160040135908111610245573691016024011161011c5754821633036102035750309116036101c057602090517f439148f0bbc682ca079e46d6e2c2f0c1e3b820f1a291b069d8882abf8cf18dd98152f35b5162461bcd60e51b815260206004820181905260248201527f466c617368426f72726f7765723a206e6f742074686520696e69746961746f726044820152606490fd5b62461bcd60e51b815260206004820152601860248201527f466c617368426f72726f7765723a20756e7472757374656400000000000000006044820152606490fd5b8280fd5b600435906001600160a01b038216820361025f57565b600080fd5b90601f8019910116810190811067ffffffffffffffff82111761028657604052565b634e487b7160e01b600052604160045260246000fd5b9081602091031261025f5751801515810361025f5790565b919082018092116102c157565b634e487b7160e01b600052601160045260246000fd5b6001600160a01b039060008281541692604092835194636eb1769f60e11b86523060048701528060248701526020968787604481855afa968715610463578597610430575b508551633676633960e21b81526001600160a01b038416600482015260248101829052908882604481865afa918215610426579089959493929187926103e0575b506103a7986103708893610376936102b4565b906102b4565b875163095ea7b360e01b81526001600160a01b03909316600484015260248301529096879384929183906044820190565b0393165af19182156103d65750506103bd575050565b816103d392903d106100e1576100d58183610264565b50565b51903d90823e3d90fd5b8092508691939597989994963d831161041f575b6103fe8183610264565b8101031261041b57519196959488949093909290916103a761035d565b8680fd5b503d6103f4565b87513d88823e3d90fd5b9096508781813d831161045c575b6104488183610264565b810103126104585751953861031c565b8480fd5b503d61043e565b86513d87823e3d90fdfea264697066735822122083a60d37aed0ea99e9373e3994f0f0c698059a7f4b46dd9c43369e9d5add47ab64736f6c63430008120033",
+  "bytecode": "0x60803461007457601f61053338819003918201601f19168301916001600160401b038311848410176100795780849260209460405283398101031261007457516001600160a01b0381169081900361007457600080546001600160a01b0319169190911790556040516104a390816100908239f35b600080fd5b634e487b7160e01b600052604160045260246000fdfe60806040818152600436101561001457600080fd5b600091823560e01c90816323e30c8b1461011f57508063736ddf3b146100f55763b53e48851461004357600080fd5b346100f157806003193601126100f15761005b610249565b9060206024359261006c84826102d7565b60a46001600160a01b0391868381541686519788958694632e7ff4ef60e11b86523060048701521660248501526044840152608060648401528160848401525af19081156100e857506100bd575080f35b6100dd9060203d81116100e1575b6100d58183610264565b81019061029c565b5080f35b503d6100cb565b513d84823e3d90fd5b5080fd5b50346100f15736600319011261011c57610119610110610249565b602435906102d7565b80f35b80fd5b9050823461011c5760a036600319011261011c5761013b610249565b916001600160a01b03916024358381160361011c5760843567ffffffffffffffff8082116102455736602383011215610245578160040135908111610245573691016024011161011c5754821633036102035750309116036101c057602090517f439148f0bbc682ca079e46d6e2c2f0c1e3b820f1a291b069d8882abf8cf18dd98152f35b5162461bcd60e51b815260206004820181905260248201527f466c617368426f72726f7765723a206e6f742074686520696e69746961746f726044820152606490fd5b62461bcd60e51b815260206004820152601860248201527f466c617368426f72726f7765723a20756e7472757374656400000000000000006044820152606490fd5b8280fd5b600435906001600160a01b038216820361025f57565b600080fd5b90601f8019910116810190811067ffffffffffffffff82111761028657604052565b634e487b7160e01b600052604160045260246000fd5b9081602091031261025f5751801515810361025f5790565b919082018092116102c157565b634e487b7160e01b600052601160045260246000fd5b6001600160a01b039060008281541692604092835194636eb1769f60e11b86523060048701528060248701526020968787604481855afa968715610463578597610430575b508551633676633960e21b81526001600160a01b038416600482015260248101829052908882604481865afa918215610426579089959493929187926103e0575b506103a7986103708893610376936102b4565b906102b4565b875163095ea7b360e01b81526001600160a01b03909316600484015260248301529096879384929183906044820190565b0393165af19182156103d65750506103bd575050565b816103d392903d106100e1576100d58183610264565b50565b51903d90823e3d90fd5b8092508691939597989994963d831161041f575b6103fe8183610264565b8101031261041b57519196959488949093909290916103a761035d565b8680fd5b503d6103f4565b87513d88823e3d90fd5b9096508781813d831161045c575b6104488183610264565b810103126104585751953861031c565b8480fd5b503d61043e565b86513d87823e3d90fdfea26469706673582212203c27cbfd063f52458d527970d1b4fca5d4c3948e4a87c0f3cb1eb4b85927c31264736f6c63430008120033",
+  "deployedBytecode": "0x60806040818152600436101561001457600080fd5b600091823560e01c90816323e30c8b1461011f57508063736ddf3b146100f55763b53e48851461004357600080fd5b346100f157806003193601126100f15761005b610249565b9060206024359261006c84826102d7565b60a46001600160a01b0391868381541686519788958694632e7ff4ef60e11b86523060048701521660248501526044840152608060648401528160848401525af19081156100e857506100bd575080f35b6100dd9060203d81116100e1575b6100d58183610264565b81019061029c565b5080f35b503d6100cb565b513d84823e3d90fd5b5080fd5b50346100f15736600319011261011c57610119610110610249565b602435906102d7565b80f35b80fd5b9050823461011c5760a036600319011261011c5761013b610249565b916001600160a01b03916024358381160361011c5760843567ffffffffffffffff8082116102455736602383011215610245578160040135908111610245573691016024011161011c5754821633036102035750309116036101c057602090517f439148f0bbc682ca079e46d6e2c2f0c1e3b820f1a291b069d8882abf8cf18dd98152f35b5162461bcd60e51b815260206004820181905260248201527f466c617368426f72726f7765723a206e6f742074686520696e69746961746f726044820152606490fd5b62461bcd60e51b815260206004820152601860248201527f466c617368426f72726f7765723a20756e7472757374656400000000000000006044820152606490fd5b8280fd5b600435906001600160a01b038216820361025f57565b600080fd5b90601f8019910116810190811067ffffffffffffffff82111761028657604052565b634e487b7160e01b600052604160045260246000fd5b9081602091031261025f5751801515810361025f5790565b919082018092116102c157565b634e487b7160e01b600052601160045260246000fd5b6001600160a01b039060008281541692604092835194636eb1769f60e11b86523060048701528060248701526020968787604481855afa968715610463578597610430575b508551633676633960e21b81526001600160a01b038416600482015260248101829052908882604481865afa918215610426579089959493929187926103e0575b506103a7986103708893610376936102b4565b906102b4565b875163095ea7b360e01b81526001600160a01b03909316600484015260248301529096879384929183906044820190565b0393165af19182156103d65750506103bd575050565b816103d392903d106100e1576100d58183610264565b50565b51903d90823e3d90fd5b8092508691939597989994963d831161041f575b6103fe8183610264565b8101031261041b57519196959488949093909290916103a761035d565b8680fd5b503d6103f4565b87513d88823e3d90fd5b9096508781813d831161045c575b6104488183610264565b810103126104585751953861031c565b8480fd5b503d61043e565b86513d87823e3d90fdfea26469706673582212203c27cbfd063f52458d527970d1b4fca5d4c3948e4a87c0f3cb1eb4b85927c31264736f6c63430008120033",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }