adding burn to execute

grappafinance · Oct 5, 2023 · edc641c · edc641c
1 parent e23f183
commit edc641c
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 2 deletions.
diff --git a/lib/core-cash b/lib/core-cash
diff --git a/lib/core-physical b/lib/core-physical
diff --git a/src/settled-cash/AccountCashEngine.sol b/src/settled-cash/AccountCashEngine.sol
@@ -111,6 +111,8 @@ abstract contract AccountCashEngine is BaseEngine {
         // update the account in state
         _decreaseLongInAccount(from, tokenId, amount);
 
+        emit CashOptionTokenBurned(from, tokenId, amount);
+
         // update the account in state
         _decreaseShortInAccount(_subAccount, tokenId, amount);
 

diff --git a/src/settled-cash/CrossMarginCashEngine.sol b/src/settled-cash/CrossMarginCashEngine.sol
@@ -476,6 +476,8 @@ contract CrossMarginCashEngine is
                 _mintOptionIntoAccount(_subAccount, actions[i].data);
             } else if (actions[i].action == ActionType.BurnShort) {
                 _burnOption(_subAccount, actions[i].data);
+            } else if (actions[i].action == ActionType.BurnShortInAccount) {
+                _burnOptionFromAccount(_subAccount, actions[i].data);
             } else if (actions[i].action == ActionType.TransferLong) {
                 _transferLong(_subAccount, actions[i].data);
             } else if (actions[i].action == ActionType.TransferShort) {

diff --git a/src/settled-physical/CrossMarginPhysicalEngine.sol b/src/settled-physical/CrossMarginPhysicalEngine.sol
@@ -533,6 +533,8 @@ contract CrossMarginPhysicalEngine is
                 _mintOptionIntoAccount(_subAccount, actions[i].data);
             } else if (actions[i].action == ActionType.BurnShort) {
                 _burnOption(_subAccount, actions[i].data);
+            } else if (actions[i].action == ActionType.BurnShortInAccount) {
+                _burnOptionFromAccount(_subAccount, actions[i].data);
             } else if (actions[i].action == ActionType.TransferLong) {
                 _transferLong(_subAccount, actions[i].data);
             } else if (actions[i].action == ActionType.TransferShort) {
+9 −10		.gas-snapshot
+2 −1		src/config/enums.sol
+3 −7		src/core/Pomace.sol
+0 −13		test/integration-tests/PomacePayoutTest.t.sol