Leveraged Basis trade vault (#64)

Author: 0xdomrom

.gitignore

@@ -13,10 +13,11 @@ broadcast/
 docs/
 
 # Dotenv file
-.env
+../../socket/socket-plugs/.env
 
 # IDE files
 .idea/
+.vscode/
 
 lcov.info
 

deployments/901/LBTCB.json

@@ -0,0 +1,5 @@
+{
+  "implementation": "0x499DFB45735907E2ea447006F66340709366f2aB",
+  "token": "0x0Eb95740A626500f80E1652186E32416477880b5",
+  "proxyAdmin": "0x02295856e96Ce40459adF38d66DfF6E43Ad94e6D"
+}

deployments/901/matching.json

@@ -9,5 +9,7 @@
   "transfer": "0x0CFC1a4a90741aB242cAfaCD798b409E12e68926",
   "withdrawal": "0xe850641C5207dc5E9423fB15f89ae6031A05fd92",
   "rfq": "0x4E4DD8Be1e461913D9A5DBC4B830e67a8694ebCa",
-  "liquidate": "0xfC3d7465C6Aa57d7Ba39ed70F143F89E1f823f37"
+  "liquidate": "0xfC3d7465C6Aa57d7Ba39ed70F143F89E1f823f37",
+  "tsaShareHandler": "0x05bf05e4D19DaF3234d3aE287B32212924b551Fe",
+  "atomicExecutor": "0x47E946f9027B0e7E0117afa482AF4C4053C53b40"
 }

deployments/901/weETHB.json

@@ -0,0 +1,5 @@
+{
+  "implementation": "0x6bF2f4896406d7f023245f3FAcbee9200E034D9f",
+  "token": "0x9ffB0Ee4447c491E3c842b62184BB0669A12b9e4",
+  "proxyAdmin": "0xed13a133ae5bf55de6e5e2f9908cdf298972c4ce"
+}

deployments/957/LBTCB.json

@@ -0,0 +1,5 @@
+{
+  "implementation": "0x377746e5d52141C9b3b20e2D86a7DB9453F7cc3e",
+  "token": "0x2104654d6Da663961a86AC3Cf1751981C5dc62E8",
+  "proxyAdmin": "0x880ed6BD35E07C0438d7Fb757a8c79c49ECab777"
+}

deployments/957/matching.json

@@ -8,5 +8,7 @@
   "transfer": "0x01259207A40925b794C8ac320456F7F6c8FE2636",
   "withdrawal": "0x9d0E8f5b25384C7310CB8C6aE32C8fbeb645d083",
   "liquidate": "0x66d23e59DaEEF13904eFA2D4B8658aeD05f59a92",
-  "rfq": "0x9371352CCef6f5b36EfDFE90942fFE622Ab77F1D"
+  "rfq": "0x9371352CCef6f5b36EfDFE90942fFE622Ab77F1D",
+  "tsaShareHandler": "0x4B759054CF4DA826e48645EfaDEfE9AfA613FDc5",
+  "atomicExecutor": "0xE01557509EceFC07042226c9BF4cAC6Be25e0E2E"
 }

deployments/957/weETHB.json

@@ -0,0 +1,5 @@
+{
+  "implementation": "0x1886b148Fa52916820bE0Ce19c8e256835Bb8A7A",
+  "token": "0x513Dc0e3407CA3A6E073A2f2d43fd61498db5739",
+  "proxyAdmin": "0xE62aB0b9B84D21BE57beAEfcfF89aA08f47B0140"
+}

foundry.toml

@@ -6,7 +6,7 @@ optimizer = true
 optimizer_runs = 50
 fs_permissions = [{access = "read-write", path = "./"}]
 
-solc_version="0.8.20"
+solc_version="0.8.27"
 
 evm_version="shanghai"
 

scripts/deploy-all.s.sol

@@ -13,6 +13,8 @@ import {SubAccountCreator} from "../src/periphery/SubAccountCreator.sol";
 import {LyraSettlementUtils} from "../src/periphery/LyraSettlementUtils.sol";
 import {LyraAuctionUtils} from "../src/periphery/LyraAuctionUtils.sol";
 import {DutchAuction} from "v2-core/src/liquidation/DutchAuction.sol";
+import {TSAShareHandler} from "../src/tokenizedSubaccounts/TSAShareHandler.sol";
+import {AtomicSigningExecutor} from "../src/AtomicSigningExecutor.sol";
 import {ISubAccounts} from "v2-core/src/interfaces/ISubAccounts.sol";
 import {IAsset} from "v2-core/src/interfaces/IAsset.sol";
 import {ICashAsset} from "v2-core/src/interfaces/ICashAsset.sol";
@@ -49,6 +51,9 @@ contract DeployAll is Utils {
 
     deployment.matching = new Matching(ISubAccounts(config.subAccounts));
 
+    ////
+    // Modules
+
     deployment.deposit = new DepositModule(deployment.matching);
     deployment.trade = new TradeModule(deployment.matching, IAsset(config.cash), defaultFeeRecipient);
     deployment.transfer = new TransferModule(deployment.matching);
@@ -64,21 +69,20 @@ contract DeployAll is Utils {
     deployment.matching.setAllowedModule(address(deployment.liquidate), true);
     deployment.matching.setAllowedModule(address(deployment.rfq), true);
 
-    deployment.matching.setTradeExecutor(0xf00A105BC009eA3a250024cbe1DCd0509c71C52b, true);
-
-    console2.log("subAccounts", address(config.subAccounts));
-    console2.log("cash", address(config.cash));
-
-    deployment.subAccountCreator = new SubAccountCreator(ISubAccounts(config.subAccounts), deployment.matching);
-    console2.log("subAccountCreator: ", address(deployment.subAccountCreator));
+    /////
+    // helpers
 
     deployment.settlementUtil = new LyraSettlementUtils();
-    console2.log("settlementUtil: ", address(deployment.settlementUtil));
-
+    deployment.subAccountCreator = new SubAccountCreator(ISubAccounts(config.subAccounts), deployment.matching);
     deployment.auctionUtil = new LyraAuctionUtils(
       ISubAccounts(config.subAccounts), DutchAuction(config.auction), config.srm
     );
-    console2.log("settlementUtil: ", address(deployment.settlementUtil));
+    deployment.tsaShareHandler = new TSAShareHandler();
+    deployment.atomicSigningExecutor = new AtomicSigningExecutor(deployment.matching);
+
+    // whitelist helpers
+    deployment.matching.setTradeExecutor(0xf00A105BC009eA3a250024cbe1DCd0509c71C52b, true);
+    deployment.matching.setTradeExecutor(address(deployment.atomicSigningExecutor), true);
 
     // write to output
     __writeToDeploymentsJson(deployment);
@@ -102,6 +106,8 @@ contract DeployAll is Utils {
     vm.serializeAddress(objKey, "auctionUtil", address(deployment.auctionUtil));
     vm.serializeAddress(objKey, "liquidate", address(deployment.liquidate));
     vm.serializeAddress(objKey, "rfq", address(deployment.rfq));
+    vm.serializeAddress(objKey, "tsaShareHandler", address(deployment.tsaShareHandler));
+    vm.serializeAddress(objKey, "atomicSigningExecutor", address(deployment.atomicSigningExecutor));
 
     string memory finalObj = vm.serializeAddress(objKey, "withdrawal", address(deployment.withdrawal));
 

scripts/deploy-and-dump.sh

@@ -47,9 +47,9 @@ cp lib/v2-core/deployments/$chainId/strands.json deployments/$chainId/strands.js
 cp lib/v2-core/deployments/$chainId/SFP.json deployments/$chainId/SFP.json
 cp lib/v2-core/deployments/$chainId/SOL.json deployments/$chainId/SOL.json
 cp lib/v2-core/deployments/$chainId/DOGE.json deployments/$chainId/DOGE.json
-cp lib/v2-core/scripts/input/$chainId/config.json deployments/$chainId/shared.json
-
+cp lib/v2-core/deployments/$chainId/shared.json deployments/$chainId/shared.json
 
+echo "Deployed core contracts"
 
 # Deploy matching contracts
 forge script scripts/deploy-all.s.sol --rpc-url $ETH_RPC_URL --broadcast
@@ -59,6 +59,7 @@ MARKET_NAME=SOL forge script scripts/add-perp-to-modules.s.sol --rpc-url $ETH_RP
 MARKET_NAME=DOGE forge script scripts/add-perp-to-modules.s.sol --rpc-url $ETH_RPC_URL --broadcast
 
 forge script scripts/deploy-tsa.s.sol --rpc-url $ETH_RPC_URL --broadcast
+DEPOSIT_ASSET=WSTETH PERP_ASSET=ETH forge script scripts/deploy-lbtsa.s.sol --rpc-url $ETH_RPC_URL --broadcast
 
 if [[ "$ETH_RPC_URL" =~ .*local.* ]]; then
   forge script scripts/update-callees.s.sol --rpc-url $ETH_RPC_URL --broadcast