changes

Author: 0xdomrom

lib/v2-core

@@ -4,7 +4,7 @@ pragma solidity ^0.8.0;
 import "forge-std/console.sol";
 import {Utils} from "./utils.sol";
 import "../src/periphery/LyraSettlementUtils.sol";
-import {BaseTSA} from "../src/tokenizedSubaccounts/BaseTSA.sol";
+import {BaseTSA} from "../src/tokenizedSubaccounts/shared/BaseTSA.sol";
 import {ISubAccounts} from "v2-core/src/interfaces/ISubAccounts.sol";
 import {CashAsset} from "v2-core/src/assets/CashAsset.sol";
 import {DutchAuction} from "v2-core/src/liquidation/DutchAuction.sol";

scripts/deploy-lbtsa.s.sol

@@ -4,7 +4,7 @@ pragma solidity ^0.8.0;
 import "forge-std/console.sol";
 import {Utils} from "./utils.sol";
 import "../src/periphery/LyraSettlementUtils.sol";
-import {BaseTSA} from "../src/tokenizedSubaccounts/BaseTSA.sol";
+import {BaseTSA} from "../src/tokenizedSubaccounts/shared/BaseTSA.sol";
 import {ISubAccounts} from "v2-core/src/interfaces/ISubAccounts.sol";
 import {CashAsset} from "v2-core/src/assets/CashAsset.sol";
 import {DutchAuction} from "v2-core/src/liquidation/DutchAuction.sol";

scripts/deploy-prod-tsa.s.sol

@@ -4,7 +4,7 @@ pragma solidity ^0.8.0;
 import "forge-std/console.sol";
 import {Utils} from "./utils.sol";
 import "../src/periphery/LyraSettlementUtils.sol";
-import {BaseTSA} from "../src/tokenizedSubaccounts/BaseTSA.sol";
+import {BaseTSA} from "../src/tokenizedSubaccounts/shared/BaseTSA.sol";
 import {ISubAccounts} from "v2-core/src/interfaces/ISubAccounts.sol";
 import {CashAsset} from "v2-core/src/assets/CashAsset.sol";
 import {DutchAuction} from "v2-core/src/liquidation/DutchAuction.sol";

scripts/deploy-tsa-with-implementation.s.sol

@@ -4,7 +4,7 @@ pragma solidity ^0.8.0;
 import "forge-std/console2.sol";
 import {Utils} from "./utils.sol";
 import "../src/periphery/LyraSettlementUtils.sol";
-import {BaseTSA} from "../src/tokenizedSubaccounts/BaseTSA.sol";
+import {BaseTSA} from "../src/tokenizedSubaccounts/shared/BaseTSA.sol";
 import {ISubAccounts} from "v2-core/src/interfaces/ISubAccounts.sol";
 import {CashAsset} from "v2-core/src/assets/CashAsset.sol";
 import {DutchAuction} from "v2-core/src/liquidation/DutchAuction.sol";

scripts/deploy-tsa.s.sol

@@ -4,7 +4,7 @@ pragma solidity ^0.8.0;
 import "forge-std/console.sol";
 import {Utils} from "./utils.sol";
 import "../src/periphery/LyraSettlementUtils.sol";
-import {BaseTSA} from "../src/tokenizedSubaccounts/BaseTSA.sol";
+import {BaseTSA} from "../src/tokenizedSubaccounts/shared/BaseTSA.sol";
 import {ISubAccounts} from "v2-core/src/interfaces/ISubAccounts.sol";
 import {CashAsset} from "v2-core/src/assets/CashAsset.sol";
 import {DutchAuction} from "v2-core/src/liquidation/DutchAuction.sol";

scripts/upgrade-lbtsa.s.sol

@@ -4,7 +4,7 @@ pragma solidity ^0.8.20;
 import "forge-std/console2.sol";
 import {Utils} from "./utils.sol";
 import "../src/periphery/LyraSettlementUtils.sol";
-import {BaseTSA} from "../src/tokenizedSubaccounts/BaseTSA.sol";
+import {BaseTSA} from "../src/tokenizedSubaccounts/shared/BaseTSA.sol";
 import {ISubAccounts} from "v2-core/src/interfaces/ISubAccounts.sol";
 import {CashAsset} from "v2-core/src/assets/CashAsset.sol";
 import {DutchAuction} from "v2-core/src/liquidation/DutchAuction.sol";

scripts/upgrade-tsa.s.sol

@@ -35,6 +35,16 @@ contract AtomicSigningExecutor {
       }
     }
     matching.verifyAndMatch(actions, signatures, actionData);
+
+    // Post-trade hook. Allows signer to update state internally and revert if they don't like the trade
+    for (uint i = 0; i < actions.length; i++) {
+      AtomicAction memory atomicAction = atomicActionData[i];
+      if (atomicAction.isAtomic) {
+        // Call the signer of the action
+        IAtomicSigner signer = IAtomicSigner(actions[i].signer);
+        signer.postTradeHook(actions[i], atomicAction.extraData);
+      }
+    }
   }
 
   modifier onlyTradeExecutor() {

src/AtomicSigningExecutor.sol

@@ -5,4 +5,5 @@ import "./IMatching.sol";
 
 interface IAtomicSigner {
   function signActionViaPermit(IMatching.Action memory action, bytes memory extraData, bytes memory signerSig) external;
+  function postTradeHook(IMatching.Action memory action, bytes memory extraData) external;
 }

src/interfaces/IAtomicSigner.sol

@@ -9,7 +9,7 @@ import {DecimalMath} from "lyra-utils/decimals/DecimalMath.sol";
 import {SignedDecimalMath} from "lyra-utils/decimals/SignedDecimalMath.sol";
 import {ConvertDecimals} from "lyra-utils/decimals/ConvertDecimals.sol";
 
-import {BaseOnChainSigningTSA, BaseTSA} from "./BaseOnChainSigningTSA.sol";
+import {BaseOnChainSigningTSA, BaseTSA} from "./shared/BaseOnChainSigningTSA.sol";
 import {ISubAccounts} from "v2-core/src/interfaces/ISubAccounts.sol";
 import {IOptionAsset} from "v2-core/src/interfaces/IOptionAsset.sol";
 import {ISpotFeed} from "v2-core/src/interfaces/ISpotFeed.sol";
@@ -21,7 +21,7 @@ import {IMatching} from "../interfaces/IMatching.sol";
 import {
   StandardManager, IStandardManager, IVolFeed, IForwardFeed
 } from "v2-core/src/risk-managers/StandardManager.sol";
-import "./CollateralManagementTSA.sol";
+import "./shared/CollateralManagementTSA.sol";
 
 /// @title CoveredCallTSA
 /// @notice TSA that accepts any deposited collateral, and sells covered calls on it. Assumes options sold are