@wildcatfi/wildcat-sdk 2.0.18 → 2.0.19
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/utils/type-parsers.d.ts +13 -0
- package/dist/utils/type-parsers.d.ts.map +1 -1
- package/dist/utils/type-parsers.js +19 -1
- package/dist/utils/type-parsers.js.map +1 -1
- package/dist/withdrawal-batch.d.ts +4 -3
- package/dist/withdrawal-batch.d.ts.map +1 -1
- package/dist/withdrawal-batch.js +6 -3
- package/dist/withdrawal-batch.js.map +1 -1
- package/dist/withdrawal-status.d.ts +3 -2
- package/dist/withdrawal-status.d.ts.map +1 -1
- package/dist/withdrawal-status.js +4 -2
- package/dist/withdrawal-status.js.map +1 -1
- package/package.json +1 -1
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { FeeConfigurationStructOutput, MarketParameterConstraintsStructOutput } from "../typechain";
|
|
2
2
|
import { SignerOrProvider } from "../types";
|
|
3
3
|
import { Token, TokenAmount } from "../token";
|
|
4
|
+
import { SubgraphWithdrawalBatchPaymentPropertiesFragment, SubgraphWithdrawalExecutionPropertiesFragment, SubgraphWithdrawalRequestPropertiesFragment } from "../gql/graphql";
|
|
4
5
|
export type MarketParameterConstraints = {
|
|
5
6
|
minimumDelinquencyGracePeriod: number;
|
|
6
7
|
maximumDelinquencyGracePeriod: number;
|
|
@@ -21,4 +22,16 @@ export type FeeConfiguration = {
|
|
|
21
22
|
originationFeeAmount: TokenAmount | undefined;
|
|
22
23
|
};
|
|
23
24
|
export declare const parseFeeConfiguration: (provider: SignerOrProvider, feeConfiguration: FeeConfigurationStructOutput) => FeeConfiguration;
|
|
25
|
+
export type WithdrawalRequestRecord = {
|
|
26
|
+
normalizedAmount: TokenAmount;
|
|
27
|
+
} & Omit<SubgraphWithdrawalRequestPropertiesFragment, "normalizedAmount">;
|
|
28
|
+
export type WithdrawalPaymentRecord = {
|
|
29
|
+
normalizedAmountPaid: TokenAmount;
|
|
30
|
+
} & Omit<SubgraphWithdrawalBatchPaymentPropertiesFragment, "normalizedAmountPaid">;
|
|
31
|
+
export type WithdrawalExecutionRecord = {
|
|
32
|
+
normalizedAmount: TokenAmount;
|
|
33
|
+
} & Omit<SubgraphWithdrawalExecutionPropertiesFragment, "normalizedAmount">;
|
|
34
|
+
export declare function parseWithdrawalRecord(token: Token, log: SubgraphWithdrawalRequestPropertiesFragment): WithdrawalRequestRecord;
|
|
35
|
+
export declare function parseWithdrawalRecord(token: Token, log: SubgraphWithdrawalBatchPaymentPropertiesFragment): WithdrawalPaymentRecord;
|
|
36
|
+
export declare function parseWithdrawalRecord(token: Token, log: SubgraphWithdrawalExecutionPropertiesFragment): WithdrawalExecutionRecord;
|
|
24
37
|
//# sourceMappingURL=type-parsers.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"type-parsers.d.ts","sourceRoot":"","sources":["../../src/utils/type-parsers.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"type-parsers.d.ts","sourceRoot":"","sources":["../../src/utils/type-parsers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,4BAA4B,EAAE,sCAAsC,EAAE,MAAM,cAAc,CAAC;AACpG,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAE5C,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAC9C,OAAO,EACL,gDAAgD,EAChD,6CAA6C,EAC7C,2CAA2C,EAC5C,MAAM,gBAAgB,CAAC;AAExB,MAAM,MAAM,0BAA0B,GAAG;IACvC,6BAA6B,EAAE,MAAM,CAAC;IACtC,6BAA6B,EAAE,MAAM,CAAC;IACtC,uBAAuB,EAAE,MAAM,CAAC;IAChC,uBAAuB,EAAE,MAAM,CAAC;IAChC,yBAAyB,EAAE,MAAM,CAAC;IAClC,yBAAyB,EAAE,MAAM,CAAC;IAClC,8BAA8B,EAAE,MAAM,CAAC;IACvC,8BAA8B,EAAE,MAAM,CAAC;IACvC,yBAAyB,EAAE,MAAM,CAAC;IAClC,yBAAyB,EAAE,MAAM,CAAC;CACnC,CAAC;AACF,eAAO,MAAM,+BAA+B,gBAC7B,sCAAsC,KAClD,0BAG8B,CAAC;AAElC,MAAM,MAAM,gBAAgB,GAAG;IAC7B,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,MAAM,CAAC;IACxB,mBAAmB,EAAE,KAAK,GAAG,SAAS,CAAC;IACvC,oBAAoB,EAAE,WAAW,GAAG,SAAS,CAAC;CAC/C,CAAC;AACF,eAAO,MAAM,qBAAqB,aACtB,gBAAgB,oBACR,4BAA4B,KAC7C,gBAaF,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG;IACpC,gBAAgB,EAAE,WAAW,CAAC;CAC/B,GAAG,IAAI,CAAC,2CAA2C,EAAE,kBAAkB,CAAC,CAAC;AAE1E,MAAM,MAAM,uBAAuB,GAAG;IACpC,oBAAoB,EAAE,WAAW,CAAC;CACnC,GAAG,IAAI,CAAC,gDAAgD,EAAE,sBAAsB,CAAC,CAAC;AAEnF,MAAM,MAAM,yBAAyB,GAAG;IACtC,gBAAgB,EAAE,WAAW,CAAC;CAC/B,GAAG,IAAI,CAAC,6CAA6C,EAAE,kBAAkB,CAAC,CAAC;AAa5E,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,KAAK,EACZ,GAAG,EAAE,2CAA2C,GAC/C,uBAAuB,CAAC;AAC3B,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,KAAK,EACZ,GAAG,EAAE,gDAAgD,GACpD,uBAAuB,CAAC;AAC3B,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,KAAK,EACZ,GAAG,EAAE,6CAA6C,GACjD,yBAAyB,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.parseFeeConfiguration = exports.parseMarketParameterConstraints = void 0;
|
|
3
|
+
exports.parseWithdrawalRecord = exports.parseFeeConfiguration = exports.parseMarketParameterConstraints = void 0;
|
|
4
4
|
const ethers_1 = require("ethers");
|
|
5
5
|
const token_1 = require("../token");
|
|
6
6
|
const parseMarketParameterConstraints = (constraints) => Object.fromEntries(Object.entries(constraints).map(([k, v]) => [k, ethers_1.BigNumber.from(v).toNumber()]));
|
|
@@ -18,4 +18,22 @@ const parseFeeConfiguration = (provider, feeConfiguration) => {
|
|
|
18
18
|
};
|
|
19
19
|
};
|
|
20
20
|
exports.parseFeeConfiguration = parseFeeConfiguration;
|
|
21
|
+
const isPayment = (record) => {
|
|
22
|
+
return (record.normalizedAmountPaid !== undefined);
|
|
23
|
+
};
|
|
24
|
+
function parseWithdrawalRecord(token, log) {
|
|
25
|
+
if (isPayment(log)) {
|
|
26
|
+
const { normalizedAmountPaid, ...rest } = log;
|
|
27
|
+
return {
|
|
28
|
+
...rest,
|
|
29
|
+
normalizedAmountPaid: token.getAmount(normalizedAmountPaid)
|
|
30
|
+
};
|
|
31
|
+
}
|
|
32
|
+
const { normalizedAmount, ...rest } = log;
|
|
33
|
+
return {
|
|
34
|
+
...rest,
|
|
35
|
+
normalizedAmount: token.getAmount(normalizedAmount)
|
|
36
|
+
};
|
|
37
|
+
}
|
|
38
|
+
exports.parseWithdrawalRecord = parseWithdrawalRecord;
|
|
21
39
|
//# sourceMappingURL=type-parsers.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"type-parsers.js","sourceRoot":"","sources":["../../src/utils/type-parsers.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"type-parsers.js","sourceRoot":"","sources":["../../src/utils/type-parsers.ts"],"names":[],"mappings":";;;AAEA,mCAA8C;AAC9C,oCAA8C;AAmBvC,MAAM,+BAA+B,GAAG,CAC7C,WAAmD,EACvB,EAAE,CAC9B,MAAM,CAAC,WAAW,CAChB,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,kBAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,CACjD,CAAC;AALrB,QAAA,+BAA+B,mCAKV;AAQ3B,MAAM,qBAAqB,GAAG,CACnC,QAA0B,EAC1B,gBAA8C,EAC5B,EAAE;IACpB,MAAM,mBAAmB,GACvB,gBAAgB,CAAC,mBAAmB,CAAC,KAAK,KAAK,kBAAS,CAAC,WAAW;QAClE,CAAC,CAAC,SAAS;QACX,CAAC,CAAC,aAAK,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;IAC9E,MAAM,oBAAoB,GACxB,mBAAmB,IAAI,mBAAmB,CAAC,SAAS,CAAC,gBAAgB,CAAC,oBAAoB,CAAC,CAAC;IAC9F,OAAO;QACL,YAAY,EAAE,gBAAgB,CAAC,YAAY;QAC3C,eAAe,EAAE,gBAAgB,CAAC,eAAe;QACjD,mBAAmB;QACnB,oBAAoB;KACrB,CAAC;AACJ,CAAC,CAAC;AAhBW,QAAA,qBAAqB,yBAgBhC;AAcF,MAAM,SAAS,GAAG,CAChB,MAGiD,EACW,EAAE;IAC9D,OAAO,CACJ,MAA2D,CAAC,oBAAoB,KAAK,SAAS,CAChG,CAAC;AACJ,CAAC,CAAC;AAcF,SAAgB,qBAAqB,CACnC,KAAY,EACZ,GAGiD;IAEjD,IAAI,SAAS,CAAC,GAAG,CAAC,EAAE;QAClB,MAAM,EAAE,oBAAoB,EAAE,GAAG,IAAI,EAAE,GAAG,GAAG,CAAC;QAC9C,OAAO;YACL,GAAG,IAAI;YACP,oBAAoB,EAAE,KAAK,CAAC,SAAS,CAAC,oBAAoB,CAAC;SAC5D,CAAC;KACH;IACD,MAAM,EAAE,gBAAgB,EAAE,GAAG,IAAI,EAAE,GAAG,GAAG,CAAC;IAC1C,OAAO;QACL,GAAG,IAAI;QACP,gBAAgB,EAAE,KAAK,CAAC,SAAS,CAAC,gBAAgB,CAAC;KACpD,CAAC;AACJ,CAAC;AAnBD,sDAmBC"}
|
|
@@ -4,6 +4,7 @@ import { TokenAmount } from "./token";
|
|
|
4
4
|
import { WithdrawalBatchDataStructOutput } from "./typechain";
|
|
5
5
|
import { LenderWithdrawalStatus } from "./withdrawal-status";
|
|
6
6
|
import { MakeOptional, SubgraphLenderWithdrawalPropertiesFragment, SubgraphWithdrawalBatchPaymentPropertiesFragment, SubgraphWithdrawalBatchPropertiesWithEventsFragment, SubgraphWithdrawalExecutionPropertiesFragment, SubgraphWithdrawalRequestPropertiesFragment } from "./gql/graphql";
|
|
7
|
+
import { WithdrawalExecutionRecord, WithdrawalPaymentRecord, WithdrawalRequestRecord } from "./utils";
|
|
7
8
|
export declare enum BatchStatus {
|
|
8
9
|
Pending = 0,
|
|
9
10
|
Expired = 1,
|
|
@@ -22,10 +23,10 @@ export declare class WithdrawalBatch {
|
|
|
22
23
|
paymentsCount?: number | undefined;
|
|
23
24
|
lastUpdatedTimestamp?: number | undefined;
|
|
24
25
|
totalInterestEarned?: TokenAmount | undefined;
|
|
25
|
-
payments: SubgraphWithdrawalBatchPaymentPropertiesFragment[];
|
|
26
|
-
executions: SubgraphWithdrawalExecutionPropertiesFragment[];
|
|
27
|
-
requests: SubgraphWithdrawalRequestPropertiesFragment[];
|
|
28
26
|
withdrawals: LenderWithdrawalStatus[];
|
|
27
|
+
payments: WithdrawalPaymentRecord[];
|
|
28
|
+
executions: WithdrawalExecutionRecord[];
|
|
29
|
+
requests: WithdrawalRequestRecord[];
|
|
29
30
|
constructor(market: Market, expiry: number, status: BatchStatus, scaledTotalAmount: BigNumber, scaledAmountBurned: BigNumber, normalizedAmountPaid: TokenAmount, normalizedTotalAmount: TokenAmount, lastScaleFactor?: BigNumber | undefined, paymentsCount?: number | undefined, lastUpdatedTimestamp?: number | undefined, totalInterestEarned?: TokenAmount | undefined, payments?: SubgraphWithdrawalBatchPaymentPropertiesFragment[], withdrawals?: SubgraphLenderWithdrawalPropertiesFragment[], executions?: SubgraphWithdrawalExecutionPropertiesFragment[], requests?: SubgraphWithdrawalRequestPropertiesFragment[]);
|
|
30
31
|
private calculateBatchInterestEarned;
|
|
31
32
|
processWithdrawalBatchInterestAccrued(): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"withdrawal-batch.d.ts","sourceRoot":"","sources":["../src/withdrawal-batch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACnC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AACtC,OAAO,EAAE,+BAA+B,EAAE,MAAM,aAAa,CAAC;AAE9D,OAAO,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,EACL,YAAY,EAEZ,0CAA0C,EAE1C,gDAAgD,EAChD,mDAAmD,EACnD,6CAA6C,EAC7C,2CAA2C,EAC5C,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"withdrawal-batch.d.ts","sourceRoot":"","sources":["../src/withdrawal-batch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACnC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AACtC,OAAO,EAAE,+BAA+B,EAAE,MAAM,aAAa,CAAC;AAE9D,OAAO,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,EACL,YAAY,EAEZ,0CAA0C,EAE1C,gDAAgD,EAChD,mDAAmD,EACnD,6CAA6C,EAC7C,2CAA2C,EAC5C,MAAM,eAAe,CAAC;AACvB,OAAO,EACL,yBAAyB,EACzB,uBAAuB,EACvB,uBAAuB,EAGxB,MAAM,SAAS,CAAC;AAEjB,oBAAY,WAAW;IACrB,OAAO,IAAI;IACX,OAAO,IAAI;IACX,MAAM,IAAI;IACV,QAAQ,IAAI;CACb;AAED,qBAAa,eAAe;IAOjB,MAAM,EAAE,MAAM;IACd,MAAM,EAAE,MAAM;IACd,MAAM,EAAE,WAAW;IACnB,iBAAiB,EAAE,SAAS;IAC5B,kBAAkB,EAAE,SAAS;IAC7B,oBAAoB,EAAE,WAAW;IACjC,qBAAqB,EAAE,WAAW;IAClC,eAAe,CAAC;IAChB,aAAa,CAAC;IACd,oBAAoB,CAAC;IACrB,mBAAmB,CAAC;IAhBtB,WAAW,EAAE,sBAAsB,EAAE,CAAM;IAC3C,QAAQ,EAAE,uBAAuB,EAAE,CAAM;IACzC,UAAU,EAAE,yBAAyB,EAAE,CAAM;IAC7C,QAAQ,EAAE,uBAAuB,EAAE,CAAM;gBAGvC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,WAAW,EACnB,iBAAiB,EAAE,SAAS,EAC5B,kBAAkB,EAAE,SAAS,EAC7B,oBAAoB,EAAE,WAAW,EACjC,qBAAqB,EAAE,WAAW,EAClC,eAAe,CAAC,uBAAW,EAC3B,aAAa,CAAC,oBAAQ,EACtB,oBAAoB,CAAC,oBAAQ,EAC7B,mBAAmB,CAAC,yBAAa,EACxC,QAAQ,GAAE,gDAAgD,EAAO,EACjE,WAAW,GAAE,0CAA0C,EAAO,EAC9D,UAAU,GAAE,6CAA6C,EAAO,EAChE,QAAQ,GAAE,2CAA2C,EAAO;IAU9D,OAAO,CAAC,4BAA4B;IAWpC,qCAAqC,IAAI,IAAI;IAY7C,IAAI,QAAQ,IAAI,OAAO,CAEtB;IAED,IAAI,SAAS,IAAI,OAAO,CAEvB;IAED,IAAI,oBAAoB,IAAI,WAAW,CAEtC;IAED,eAAe,CAAC,IAAI,EAAE,+BAA+B,GAAG,IAAI;IAkB5D,MAAM,CAAC,uBAAuB,CAC5B,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,+BAA+B,GACpC,eAAe;IAYlB,MAAM,CAAC,2BAA2B,CAChC,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,YAAY,CACjB,mDAAmD,EACnD,UAAU,GAAG,YAAY,GAAG,aAAa,CAC1C,GACA,eAAe;WA4CL,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC;CAK1F"}
|
package/dist/withdrawal-batch.js
CHANGED
|
@@ -25,11 +25,14 @@ class WithdrawalBatch {
|
|
|
25
25
|
this.paymentsCount = paymentsCount;
|
|
26
26
|
this.lastUpdatedTimestamp = lastUpdatedTimestamp;
|
|
27
27
|
this.totalInterestEarned = totalInterestEarned;
|
|
28
|
-
this.payments = payments;
|
|
29
|
-
this.executions = executions;
|
|
30
|
-
this.requests = requests;
|
|
31
28
|
this.withdrawals = [];
|
|
29
|
+
this.payments = [];
|
|
30
|
+
this.executions = [];
|
|
31
|
+
this.requests = [];
|
|
32
32
|
this.withdrawals = withdrawals.map((w) => withdrawal_status_1.LenderWithdrawalStatus.fromSubgraphLenderWithdrawalStatus(market, this, w, w.account.address));
|
|
33
|
+
this.payments = payments.map((w) => (0, utils_1.parseWithdrawalRecord)(this.market.underlyingToken, w));
|
|
34
|
+
this.executions = executions.map((w) => (0, utils_1.parseWithdrawalRecord)(this.market.underlyingToken, w));
|
|
35
|
+
this.requests = requests.map((w) => (0, utils_1.parseWithdrawalRecord)(this.market.underlyingToken, w));
|
|
33
36
|
}
|
|
34
37
|
calculateBatchInterestEarned() {
|
|
35
38
|
if (!this.lastScaleFactor)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"withdrawal-batch.js","sourceRoot":"","sources":["../src/withdrawal-batch.ts"],"names":[],"mappings":";;;AAAA,mCAAmC;AAInC,2CAA8C;AAC9C,2DAA6D;AAW7D,
|
|
1
|
+
{"version":3,"file":"withdrawal-batch.js","sourceRoot":"","sources":["../src/withdrawal-batch.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@ import { BigNumber, ContractTransaction } from "ethers";
|
|
|
2
2
|
import { Market } from "./market";
|
|
3
3
|
import { TokenAmount } from "./token";
|
|
4
4
|
import { WithdrawalBatchLenderStatusStructOutput, WithdrawalBatchDataWithLenderStatusStructOutput } from "./typechain";
|
|
5
|
+
import { WithdrawalExecutionRecord, WithdrawalRequestRecord } from "./utils";
|
|
5
6
|
import { WithdrawalBatch, BatchStatus } from "./withdrawal-batch";
|
|
6
7
|
import { SubgraphLenderWithdrawalPropertiesFragment, SubgraphWithdrawalExecution, SubgraphWithdrawalExecutionPropertiesFragment, SubgraphWithdrawalRequest, SubgraphWithdrawalRequestPropertiesFragment } from "./gql/graphql";
|
|
7
8
|
export declare class LenderWithdrawalStatus {
|
|
@@ -11,8 +12,8 @@ export declare class LenderWithdrawalStatus {
|
|
|
11
12
|
normalizedAmountWithdrawn: TokenAmount;
|
|
12
13
|
normalizedAmountOwed: TokenAmount;
|
|
13
14
|
availableWithdrawalAmount: TokenAmount;
|
|
14
|
-
|
|
15
|
-
|
|
15
|
+
executions: WithdrawalExecutionRecord[];
|
|
16
|
+
requests: WithdrawalRequestRecord[];
|
|
16
17
|
constructor(batch: WithdrawalBatch, lender: string, scaledAmount: BigNumber, normalizedAmountWithdrawn: TokenAmount, normalizedAmountOwed: TokenAmount, availableWithdrawalAmount: TokenAmount, requests?: SubgraphWithdrawalRequestPropertiesFragment[], executions?: SubgraphWithdrawalExecutionPropertiesFragment[]);
|
|
17
18
|
execute(): Promise<ContractTransaction>;
|
|
18
19
|
get expiry(): number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"withdrawal-status.d.ts","sourceRoot":"","sources":["../src/withdrawal-status.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,mBAAmB,EAAE,MAAM,QAAQ,CAAC;AACxD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,
|
|
1
|
+
{"version":3,"file":"withdrawal-status.d.ts","sourceRoot":"","sources":["../src/withdrawal-status.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,mBAAmB,EAAE,MAAM,QAAQ,CAAC;AACxD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AACtC,OAAO,EACL,uCAAuC,EACvC,+CAA+C,EAChD,MAAM,aAAa,CAAC;AAErB,OAAO,EACL,yBAAyB,EACzB,uBAAuB,EAIxB,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAClE,OAAO,EACL,0CAA0C,EAC1C,2BAA2B,EAC3B,6CAA6C,EAC7C,yBAAyB,EACzB,2CAA2C,EAC5C,MAAM,eAAe,CAAC;AAEvB,qBAAa,sBAAsB;IAIxB,KAAK,EAAE,eAAe;IACtB,MAAM,EAAE,MAAM;IACd,YAAY,EAAE,SAAS;IACvB,yBAAyB,EAAE,WAAW;IACtC,oBAAoB,EAAE,WAAW;IACjC,yBAAyB,EAAE,WAAW;IARxC,UAAU,EAAE,yBAAyB,EAAE,CAAM;IAC7C,QAAQ,EAAE,uBAAuB,EAAE,CAAM;gBAEvC,KAAK,EAAE,eAAe,EACtB,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,SAAS,EACvB,yBAAyB,EAAE,WAAW,EACtC,oBAAoB,EAAE,WAAW,EACjC,yBAAyB,EAAE,WAAW,EAC7C,QAAQ,GAAE,2CAA2C,EAAO,EAC5D,UAAU,GAAE,6CAA6C,EAAO;IAM5D,OAAO,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAK7C,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED,IAAI,MAAM,IAAI,WAAW,CAExB;IAED,UAAU,CAAC,IAAI,EAAE,uCAAuC,GAAG,IAAI;IAW/D,MAAM,CAAC,kCAAkC,CACvC,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,eAAe,EACtB,MAAM,EAAE,0CAA0C,GAAG;QACnD,QAAQ,CAAC,EAAE,yBAAyB,EAAE,CAAC;QACvC,UAAU,CAAC,EAAE,2BAA2B,EAAE,CAAC;KAC5C,EACD,OAAO,CAAC,EAAE,MAAM,GACf,sBAAsB;WA4BZ,sBAAsB,CACjC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,sBAAsB,CAAC;IAelC,MAAM,CAAC,+BAA+B,CACpC,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,eAAe,EACtB,IAAI,EAAE,uCAAuC,GAC5C,sBAAsB;IAWzB,MAAM,CAAC,uCAAuC,CAC5C,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,+CAA+C,GACpD,sBAAsB;CAO1B"}
|
|
@@ -13,8 +13,10 @@ class LenderWithdrawalStatus {
|
|
|
13
13
|
this.normalizedAmountWithdrawn = normalizedAmountWithdrawn;
|
|
14
14
|
this.normalizedAmountOwed = normalizedAmountOwed;
|
|
15
15
|
this.availableWithdrawalAmount = availableWithdrawalAmount;
|
|
16
|
-
this.
|
|
17
|
-
this.
|
|
16
|
+
this.executions = [];
|
|
17
|
+
this.requests = [];
|
|
18
|
+
this.executions = executions.map((w) => (0, utils_1.parseWithdrawalRecord)(this.market.underlyingToken, w));
|
|
19
|
+
this.requests = requests.map((w) => (0, utils_1.parseWithdrawalRecord)(this.market.underlyingToken, w));
|
|
18
20
|
}
|
|
19
21
|
async execute() {
|
|
20
22
|
(0, utils_1.assert)(this.availableWithdrawalAmount.gt(0), "No funds available to withdraw");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"withdrawal-status.js","sourceRoot":"","sources":["../src/withdrawal-status.ts"],"names":[],"mappings":";;;AAAA,mCAAwD;AAOxD,2CAA8C;AAC9C,
|
|
1
|
+
{"version":3,"file":"withdrawal-status.js","sourceRoot":"","sources":["../src/withdrawal-status.ts"],"names":[],"mappings":"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"}
|