Merge branch 'main' into indexed-events

Synthetixio · Jun 28, 2023 · 66591ec · 66591ec
2 parents 920bc83 + 8863153
commit 66591ec
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 1 deletion.
diff --git a/markets/perps-market/contracts/interfaces/IAccountModule.sol b/markets/perps-market/contracts/interfaces/IAccountModule.sol
@@ -39,4 +39,9 @@ interface IAccountModule {
     ) external view returns (AsyncOrder.Data memory);
 
     function getAvailableMargin(uint128 accountId) external view returns (int);
+
+    function getCollateralAmount(
+        uint128 accountId,
+        uint128 synthMarketId
+    ) external view returns (uint256);
 }
diff --git a/markets/perps-market/contracts/modules/PerpsAccountModule.sol b/markets/perps-market/contracts/modules/PerpsAccountModule.sol
@@ -104,4 +104,11 @@ contract PerpsAccountModule is IAccountModule {
     function getAvailableMargin(uint128 accountId) external view override returns (int) {
         return PerpsAccount.load(accountId).getAvailableMargin();
     }
+
+    function getCollateralAmount(
+        uint128 accountId,
+        uint128 synthMarketId
+    ) external view override returns (uint256) {
+        return PerpsAccount.load(accountId).collateralAmounts[synthMarketId];
+    }
 }
diff --git a/markets/perps-market/storage.dump.sol b/markets/perps-market/storage.dump.sol
@@ -350,7 +350,7 @@ library Vault {
     struct Data {
         uint256 epoch;
         bytes32 __slotAvailableForFutureUse;
-        int128 prevTotalDebtD18;
+        int128 _unused_prevTotalDebtD18;
         mapping(uint256 => VaultEpoch.Data) epochData;
         mapping(bytes32 => RewardDistribution.Data) rewards;
         SetUtil.Bytes32Set rewardIds;

diff --git a/markets/perps-market/test/integration/Account/ModifyCollateral.deposit.test.ts b/markets/perps-market/test/integration/Account/ModifyCollateral.deposit.test.ts
@@ -109,5 +109,13 @@ describe('ModifyCollateral Deposit', () => {
         systems().PerpsMarket
       );
     });
+
+    it('returns the correct amount when calling getCollateralAmount', async () => {
+      const collateralBalance = await systems().PerpsMarket.getCollateralAmount(
+        accountIds[0],
+        synthBTCMarketId
+      );
+      assertBn.equal(collateralBalance, bn(1));
+    });
   });
 });