Merge pull request #37 from 1inch/feat/maker-balance-and-allowance-in…

…-active-orders feat: add maker balance and allowance in getActiveOrders
1inch · Sep 9, 2024 · 38386e8 · 38386e8
2 parents e83a348 + 5a8a12b
commit 38386e8
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/src/api/orders/order-api.spec.ts b/src/api/orders/order-api.spec.ts
@@ -47,6 +47,8 @@ describe(__filename, () => {
                         auctionStartDate: '2024-04-25T13:24:36.000Z',
                         auctionEndDate: '2024-04-25T13:27:36.000Z',
                         remainingMakerAmount: '33058558528525703',
+                        makerBalance: '33058558528525703',
+                        makerAllowance: '33058558528525703',
                         order: {
                             salt: '102412815596156525137376967412477025111761562902072504909418068904100646989168',
                             maker: '0xe2668d9bef0a686c9874882f7037758b5b520e5c',
@@ -82,6 +84,8 @@ describe(__filename, () => {
                         auctionStartDate: '2023-01-31T10:58:11.000Z',
                         auctionEndDate: '2023-01-31T11:01:11.000Z',
                         remainingMakerAmount: '470444951856649710700841',
+                        makerBalance: '470444951856649710700841',
+                        makerAllowance: '470444951856649710700841',
                         order: {
                             salt: '102412815605188492728297784997818915205705878873010401762040598952855113412064',
                             maker: '0xdc8152a435d76fc89ced8255e28f690962c27e52',
@@ -147,6 +151,8 @@ describe(__filename, () => {
                         auctionStartDate: '2024-04-25T13:24:36.000Z',
                         auctionEndDate: '2024-04-25T13:27:36.000Z',
                         remainingMakerAmount: '33058558528525703',
+                        makerBalance: '33058558528525703',
+                        makerAllowance: '33058558528525703',
                         order: {
                             salt: '102412815596156525137376967412477025111761562902072504909418068904100646989168',
                             maker: '0xe2668d9bef0a686c9874882f7037758b5b520e5c',
@@ -174,6 +180,8 @@ describe(__filename, () => {
                         auctionStartDate: '2023-01-31T10:58:11.000Z',
                         auctionEndDate: '2023-01-31T11:01:11.000Z',
                         remainingMakerAmount: '470444951856649710700841',
+                        makerBalance: '470444951856649710700841',
+                        makerAllowance: '470444951856649710700841',
                         order: {
                             salt: '102412815605188492728297784997818915205705878873010401762040598952855113412064',
                             maker: '0xdc8152a435d76fc89ced8255e28f690962c27e52',

diff --git a/src/api/orders/types.ts b/src/api/orders/types.ts
@@ -22,6 +22,8 @@ export type ActiveOrder = {
     auctionStartDate: string
     auctionEndDate: string
     remainingMakerAmount: string
+    makerBalance: string
+    makerAllowance: string
     order: LimitOrderV4Struct
     extension: string
     srcChainId: SupportedChain

diff --git a/src/cross-chain-order/cross-chain-order.spec.ts b/src/cross-chain-order/cross-chain-order.spec.ts
@@ -19,7 +19,7 @@ describe('CrossChainOrder', () => {
             takerAsset: '0x00000000000000000000000000000000000001f4',
             makerTraits:
                 '62419173104490761595518734106350460423635492700242201632361211614299783430144',
-            salt: '1410071294180528719484992331266015429452646535356233418671461889751',
+            salt: '1410071294180528718533536018330595554196821979936720230760247937083',
             makingAmount: '41420000000000000',
             takingAmount: '261067595245294398218',
             receiver: '0x0000000000000000000000000000000000000000'