@wildcatfi/wildcat-sdk 2.0.76 → 2.0.78
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/withdrawal-batch.d.ts +9 -1
- package/dist/withdrawal-batch.d.ts.map +1 -1
- package/dist/withdrawal-batch.js +10 -2
- package/dist/withdrawal-batch.js.map +1 -1
- package/dist/withdrawal-status.d.ts +2 -2
- package/dist/withdrawal-status.d.ts.map +1 -1
- package/dist/withdrawal-status.js +8 -6
- package/dist/withdrawal-status.js.map +1 -1
- package/package.json +2 -2
- package/dist/t.d.ts +0 -2
- package/dist/t.d.ts.map +0 -1
- package/dist/t.js +0 -23
- package/dist/t.js.map +0 -1
|
@@ -31,8 +31,16 @@ export declare class WithdrawalBatch {
|
|
|
31
31
|
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, isCompleted?: boolean | undefined, payments?: SubgraphWithdrawalBatchPaymentPropertiesFragment[], withdrawals?: SubgraphLenderWithdrawalPropertiesFragment[], executions?: SubgraphWithdrawalExecutionPropertiesFragment[], requests?: SubgraphWithdrawalRequestPropertiesFragment[]);
|
|
32
32
|
private calculateBatchInterestEarned;
|
|
33
33
|
processWithdrawalBatchInterestAccrued(): void;
|
|
34
|
+
/**
|
|
35
|
+
* @description Whether the batch is expired and all owed funds have been paid to it.
|
|
36
|
+
* @note Does not indicate the batch is "complete" in the way `isCompleted`
|
|
37
|
+
* indicates, which means all withdrawals have been claimed.
|
|
38
|
+
*/
|
|
34
39
|
get isClosed(): boolean;
|
|
35
|
-
|
|
40
|
+
/**
|
|
41
|
+
* @description Whether the batch is expired but the market has not yet been updated
|
|
42
|
+
*/
|
|
43
|
+
get isPendingExpired(): boolean;
|
|
36
44
|
get normalizedAmountOwed(): TokenAmount;
|
|
37
45
|
get scaledAmountOwed(): BigNumber;
|
|
38
46
|
get availableLiquidityToProcess(): TokenAmount;
|
|
@@ -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,EAAkB,MAAM,SAAS,CAAC;AACtD,OAAO,EAAE,+BAA+B,EAAE,MAAM,aAAa,CAAC;AAE9D,OAAO,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,EACL,YAAY,EACZ,0CAA0C,EAC1C,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;IACpB,WAAW,CAAC;IAjBd,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,EACjC,WAAW,CAAC,qBAAS,EAC5B,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,
|
|
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,EAAkB,MAAM,SAAS,CAAC;AACtD,OAAO,EAAE,+BAA+B,EAAE,MAAM,aAAa,CAAC;AAE9D,OAAO,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,EACL,YAAY,EACZ,0CAA0C,EAC1C,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;IACpB,WAAW,CAAC;IAjBd,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,EACjC,WAAW,CAAC,qBAAS,EAC5B,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;;;;OAIG;IACH,IAAI,QAAQ,IAAI,OAAO,CAEtB;IAED;;OAEG;IACH,IAAI,gBAAgB,IAAI,OAAO,CAE9B;IAED,IAAI,oBAAoB,IAAI,WAAW,CAEtC;IAED,IAAI,gBAAgB,IAAI,SAAS,CAEhC;IAED,IAAI,2BAA2B,IAAI,WAAW,CAwB7C;IAED,eAAe,CAAC,IAAI,EAAE,+BAA+B,GAAG,IAAI;IA8B5D,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;WA6CL,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC;CAK1F"}
|
package/dist/withdrawal-batch.js
CHANGED
|
@@ -59,10 +59,18 @@ class WithdrawalBatch {
|
|
|
59
59
|
this.lastUpdatedTimestamp = this.market.lastInterestAccruedTimestamp;
|
|
60
60
|
}
|
|
61
61
|
}
|
|
62
|
+
/**
|
|
63
|
+
* @description Whether the batch is expired and all owed funds have been paid to it.
|
|
64
|
+
* @note Does not indicate the batch is "complete" in the way `isCompleted`
|
|
65
|
+
* indicates, which means all withdrawals have been claimed.
|
|
66
|
+
*/
|
|
62
67
|
get isClosed() {
|
|
63
|
-
return this.
|
|
68
|
+
return this.status === BatchStatus.Complete;
|
|
64
69
|
}
|
|
65
|
-
|
|
70
|
+
/**
|
|
71
|
+
* @description Whether the batch is expired but the market has not yet been updated
|
|
72
|
+
*/
|
|
73
|
+
get isPendingExpired() {
|
|
66
74
|
return this.status === BatchStatus.Pending && this.expiry < Math.floor(Date.now() / 1000);
|
|
67
75
|
}
|
|
68
76
|
get normalizedAmountOwed() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"withdrawal-batch.js","sourceRoot":"","sources":["../src/withdrawal-batch.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"withdrawal-batch.js","sourceRoot":"","sources":["../src/withdrawal-batch.ts"],"names":[],"mappings":";;;AAAA,mCAAmC;AAEnC,mCAAsD;AAEtD,2CAA8C;AAC9C,2DAA6D;AAS7D,mCAMiB;AAEjB,IAAY,WAKX;AALD,WAAY,WAAW;IACrB,mDAAW,CAAA;IACX,mDAAW,CAAA;IACX,iDAAU,CAAA;IACV,qDAAY,CAAA;AACd,CAAC,EALW,WAAW,GAAX,mBAAW,KAAX,mBAAW,QAKtB;AAED,MAAa,eAAe;IAM1B,YACS,MAAc,EACd,MAAc,EACd,MAAmB,EACnB,iBAA4B,EAC5B,kBAA6B,EAC7B,oBAAiC,EACjC,qBAAkC,EAClC,eAA2B,EAC3B,aAAsB,EACtB,oBAA6B,EAC7B,mBAAiC,EACjC,WAAqB,EAC5B,WAA+D,EAAE,EACjE,cAA4D,EAAE,EAC9D,aAA8D,EAAE,EAChE,WAA0D,EAAE;QAfrD,WAAM,GAAN,MAAM,CAAQ;QACd,WAAM,GAAN,MAAM,CAAQ;QACd,WAAM,GAAN,MAAM,CAAa;QACnB,sBAAiB,GAAjB,iBAAiB,CAAW;QAC5B,uBAAkB,GAAlB,kBAAkB,CAAW;QAC7B,yBAAoB,GAApB,oBAAoB,CAAa;QACjC,0BAAqB,GAArB,qBAAqB,CAAa;QAClC,oBAAe,GAAf,eAAe,CAAY;QAC3B,kBAAa,GAAb,aAAa,CAAS;QACtB,yBAAoB,GAApB,oBAAoB,CAAS;QAC7B,wBAAmB,GAAnB,mBAAmB,CAAc;QACjC,gBAAW,GAAX,WAAW,CAAU;QAjBvB,gBAAW,GAA6B,EAAE,CAAC;QAC3C,aAAQ,GAA8B,EAAE,CAAC;QACzC,eAAU,GAAgC,EAAE,CAAC;QAC7C,aAAQ,GAA8B,EAAE,CAAC;QAoB9C,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CACvC,0CAAsB,CAAC,kCAAkC,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAC9F,CAAC;QACF,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,6BAAqB,EAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QACpE,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,6BAAqB,EAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QACxE,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,6BAAqB,EAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;IACtE,CAAC;IAEO,4BAA4B;QAClC,IAAI,CAAC,IAAI,CAAC,eAAe;YAAE,OAAO,kBAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACpD,MAAM,gBAAgB,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;QAC7E,IAAI,gBAAgB,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,eAAe,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE;YAC/E,OAAO,kBAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SAC1B;QACD,MAAM,WAAW,GAAG,IAAA,cAAM,EAAC,gBAAgB,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;QACnE,MAAM,cAAc,GAAG,IAAA,cAAM,EAAC,gBAAgB,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QACzE,OAAO,cAAc,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IACzC,CAAC;IAED,qCAAqC;QACnC,IAAI,CAAC,IAAI,CAAC,eAAe,IAAI,CAAC,IAAI,CAAC,mBAAmB;YAAE,OAAO;QAC/D,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE;YACrD,MAAM,cAAc,GAAG,IAAI,CAAC,4BAA4B,EAAE,CAAC;YAC3D,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC;YAC/C,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;SACzE;QACD,IAAI,IAAI,CAAC,oBAAoB,IAAI,IAAI,CAAC,MAAM,CAAC,4BAA4B,EAAE;YACzE,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC,MAAM,CAAC,4BAA4B,CAAC;SACtE;IACH,CAAC;IAED;;;;OAIG;IACH,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC,MAAM,KAAK,WAAW,CAAC,QAAQ,CAAC;IAC9C,CAAC;IAED;;OAEG;IACH,IAAI,gBAAgB;QAClB,OAAO,IAAI,CAAC,MAAM,KAAK,WAAW,CAAC,OAAO,IAAI,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;IAC5F,CAAC;IAED,IAAI,oBAAoB;QACtB,OAAO,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;IACnE,CAAC;IAED,IAAI,gBAAgB;QAClB,OAAO,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;IAC7D,CAAC;IAED,IAAI,2BAA2B;QAC7B,IAAI,IAAI,CAAC,QAAQ;YAAE,OAAO,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;QACnE,IAAI,IAAI,CAAC,MAAM,KAAK,IAAI,CAAC,MAAM,CAAC,uBAAuB,EAAE;YACvD,MAAM,wBAAwB,GAAG,IAAI,CAAC,MAAM,CAAC,wBAAwB,CAAC,GAAG,CACvE,IAAI,CAAC,gBAAgB,CACtB,CAAC;YACF,MAAM,iBAAiB,GAAG,IAAI,CAAC,MAAM,CAAC,8BAA8B;iBACjE,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,wBAAwB,CAAC,CAAC;iBAC1D,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,uBAAuB,CAAC,CAAC;YAC5C,OAAO,IAAA,sBAAc,EACnB,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,iBAAiB,CAAC,EAC9C,IAAI,CAAC,oBAAoB,CAC1B,CAAC;SACH;aAAM,IAAI,IAAI,CAAC,MAAM,KAAK,IAAI,CAAC,MAAM,CAAC,6BAA6B,CAAC,CAAC,CAAC,EAAE;YACvE,MAAM,iBAAiB,GAAG,IAAI,CAAC,MAAM,CAAC,8BAA8B,CAAC,GAAG,CACtE,IAAI,CAAC,MAAM,CAAC,uBAAuB,CACpC,CAAC;YACF,OAAO,IAAA,sBAAc,EACnB,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,iBAAiB,CAAC,EAC9C,IAAI,CAAC,oBAAoB,CAC1B,CAAC;SACH;aAAM;YACL,OAAO,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;SACjD;IACH,CAAC;IAED,eAAe,CAAC,IAAqC;QACnD,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,iBAAiB,CAAC;QAChD,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC,kBAAkB,CAAC;QAClD,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,SAAS,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;QAC7F,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,SAAS,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;QAC/F,IAAI,CAAC,MAAM;YACT,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC;gBACzC,CAAC,CAAC,WAAW,CAAC,OAAO;gBACrB,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC;oBACpD,CAAC,CAAC,WAAW,CAAC,QAAQ;oBACtB,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC;QACzB,IAAI,IAAI,CAAC,MAAM,KAAK,WAAW,CAAC,QAAQ,EAAE;YACxC,MAAM,sBAAsB,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CACpD,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,YAAY,CAAC,EACvC,kBAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAClB,CAAC;YACF,IACE,sBAAsB,CAAC,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC;gBACjD,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,EAC5C;gBACA,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;aACzB;SACF;QACD,IAAI,CAAC,qCAAqC,EAAE,CAAC;IAC/C,CAAC;IAED,gFAAgF;IAChF,gFAAgF;IAChF,gFAAgF;IAEhF,MAAM,CAAC,uBAAuB,CAC5B,MAAc,EACd,IAAqC;QAErC,OAAO,IAAI,eAAe,CACxB,MAAM,EACN,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,iBAAiB,EACtB,IAAI,CAAC,kBAAkB,EACvB,MAAM,CAAC,eAAe,CAAC,SAAS,CAAC,IAAI,CAAC,oBAAoB,CAAC,EAC3D,MAAM,CAAC,eAAe,CAAC,SAAS,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAC7D,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,2BAA2B,CAChC,MAAc,EACd,KAGC;QAED,MAAM,iBAAiB,GAAG,kBAAS,CAAC,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;QAClE,MAAM,kBAAkB,GAAG,kBAAS,CAAC,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;QACpE,MAAM,oBAAoB,GAAG,MAAM,CAAC,eAAe,CAAC,SAAS,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;QAC1F,MAAM,MAAM,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC;QAC7B,MAAM,MAAM,GACV,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC;YACpC,CAAC,CAAC,WAAW,CAAC,OAAO;YACrB,CAAC,CAAC,kBAAkB,CAAC,EAAE,CAAC,iBAAiB,CAAC;gBAC1C,CAAC,CAAC,WAAW,CAAC,QAAQ;gBACtB,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC;QACzB,IAAI,gBAA2B,CAAC;QAChC,IAAI,oBAAiC,CAAC;QACtC,IAAI,qBAAkC,CAAC;QACvC,IAAI,CAAC,kBAAkB,CAAC,EAAE,CAAC,iBAAiB,CAAC,EAAE;YAC7C,gBAAgB,GAAG,iBAAiB,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;YAC7D,oBAAoB,GAAG,MAAM,CAAC,eAAe,CAAC,SAAS,CACrD,IAAA,cAAM,EAAC,gBAAgB,EAAE,MAAM,CAAC,WAAW,CAAC,CAC7C,CAAC;YACF,qBAAqB,GAAG,oBAAoB,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;SACxE;aAAM;YACL,gBAAgB,GAAG,kBAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACrC,oBAAoB,GAAG,MAAM,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;YAC3D,qBAAqB,GAAG,oBAAoB,CAAC;SAC9C;QACD,OAAO,IAAI,eAAe,CACxB,MAAM,EACN,MAAM,EACN,MAAM,EACN,iBAAiB,EACjB,kBAAkB,EAClB,oBAAoB,EACpB,qBAAqB,EACrB,kBAAS,CAAC,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,EACrC,KAAK,CAAC,aAAa,EACnB,KAAK,CAAC,oBAAoB,EAC1B,MAAM,CAAC,eAAe,CAAC,SAAS,CAAC,KAAK,CAAC,mBAAmB,CAAC,EAC3D,KAAK,CAAC,WAAW,EACjB,KAAK,CAAC,QAAQ,IAAI,SAAS,EAC3B,KAAK,CAAC,WAAW,IAAI,SAAS,EAC9B,KAAK,CAAC,UAAU,IAAI,SAAS,EAC7B,KAAK,CAAC,QAAQ,IAAI,SAAS,CAC5B,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,kBAAkB,CAAC,MAAc,EAAE,MAAc;QAC5D,MAAM,IAAI,GAAG,IAAA,2BAAe,EAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;QAC9D,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACvE,OAAO,eAAe,CAAC,uBAAuB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAC/D,CAAC;CACF;AA9MD,0CA8MC"}
|
|
@@ -12,11 +12,11 @@ export declare class LenderWithdrawalStatus {
|
|
|
12
12
|
scaledAmount: BigNumber;
|
|
13
13
|
normalizedAmountWithdrawn: TokenAmount;
|
|
14
14
|
normalizedAmountOwed: TokenAmount;
|
|
15
|
-
availableWithdrawalAmount: TokenAmount;
|
|
16
15
|
isCompleted: boolean;
|
|
17
16
|
executions: WithdrawalExecutionRecord[];
|
|
18
17
|
requests: WithdrawalRequestRecord[];
|
|
19
|
-
constructor(batch: WithdrawalBatch, lender: string, scaledAmount: BigNumber, normalizedAmountWithdrawn: TokenAmount, normalizedAmountOwed: TokenAmount,
|
|
18
|
+
constructor(batch: WithdrawalBatch, lender: string, scaledAmount: BigNumber, normalizedAmountWithdrawn: TokenAmount, normalizedAmountOwed: TokenAmount, isCompleted: boolean, requests?: SubgraphWithdrawalRequestPropertiesFragment[], executions?: SubgraphWithdrawalExecutionPropertiesFragment[]);
|
|
19
|
+
get availableWithdrawalAmount(): TokenAmount;
|
|
20
20
|
get chainId(): SupportedChainId;
|
|
21
21
|
execute(): Promise<ContractTransaction>;
|
|
22
22
|
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,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AACtC,OAAO,EACL,uCAAuC,EACvC,+CAA+C,EAChD,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,gBAAgB,EAAmB,MAAM,aAAa,CAAC;AAChE,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,
|
|
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;AACrB,OAAO,EAAE,gBAAgB,EAAmB,MAAM,aAAa,CAAC;AAChE,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,WAAW,EAAE,OAAO;IARtB,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,WAAW,EAAE,OAAO,EAC3B,QAAQ,GAAE,2CAA2C,EAAO,EAC5D,UAAU,GAAE,6CAA6C,EAAO;IAMlE,IAAI,yBAAyB,IAAI,WAAW,CAI3C;IAED,IAAI,OAAO,IAAI,gBAAgB,CAE9B;IAEK,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,IAAI,qBAAqB,IAAI,WAAW,CAEvC;IAED,UAAU,CAAC,IAAI,EAAE,uCAAuC,GAAG,IAAI;IAQ/D,IAAI,sBAAsB,IAAI,WAAW,CAExC;IAED,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;WAuBZ,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;IAiBzB,MAAM,CAAC,uCAAuC,CAC5C,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,+CAA+C,GACpD,sBAAsB;CAO1B"}
|
|
@@ -6,19 +6,23 @@ const constants_1 = require("./constants");
|
|
|
6
6
|
const utils_1 = require("./utils");
|
|
7
7
|
const withdrawal_batch_1 = require("./withdrawal-batch");
|
|
8
8
|
class LenderWithdrawalStatus {
|
|
9
|
-
constructor(batch, lender, scaledAmount, normalizedAmountWithdrawn, normalizedAmountOwed,
|
|
9
|
+
constructor(batch, lender, scaledAmount, normalizedAmountWithdrawn, normalizedAmountOwed, isCompleted, requests = [], executions = []) {
|
|
10
10
|
this.batch = batch;
|
|
11
11
|
this.lender = lender;
|
|
12
12
|
this.scaledAmount = scaledAmount;
|
|
13
13
|
this.normalizedAmountWithdrawn = normalizedAmountWithdrawn;
|
|
14
14
|
this.normalizedAmountOwed = normalizedAmountOwed;
|
|
15
|
-
this.availableWithdrawalAmount = availableWithdrawalAmount;
|
|
16
15
|
this.isCompleted = isCompleted;
|
|
17
16
|
this.executions = [];
|
|
18
17
|
this.requests = [];
|
|
19
18
|
this.executions = executions.map((w) => (0, utils_1.parseWithdrawalRecord)(this.batch, w));
|
|
20
19
|
this.requests = requests.map((w) => (0, utils_1.parseWithdrawalRecord)(this.batch, w));
|
|
21
20
|
}
|
|
21
|
+
get availableWithdrawalAmount() {
|
|
22
|
+
return this.batch.normalizedAmountPaid
|
|
23
|
+
.mulDiv(this.scaledAmount, this.batch.scaledTotalAmount)
|
|
24
|
+
.sub(this.normalizedAmountWithdrawn);
|
|
25
|
+
}
|
|
22
26
|
get chainId() {
|
|
23
27
|
return this.market.chainId;
|
|
24
28
|
}
|
|
@@ -42,7 +46,6 @@ class LenderWithdrawalStatus {
|
|
|
42
46
|
this.scaledAmount = data.scaledAmount;
|
|
43
47
|
this.normalizedAmountWithdrawn = this.market.underlyingToken.getAmount(data.normalizedAmountWithdrawn);
|
|
44
48
|
this.normalizedAmountOwed = this.market.underlyingToken.getAmount(data.normalizedAmountOwed);
|
|
45
|
-
this.availableWithdrawalAmount = this.market.underlyingToken.getAmount(data.availableWithdrawalAmount);
|
|
46
49
|
}
|
|
47
50
|
get normalizedUnpaidAmount() {
|
|
48
51
|
return this.batch.normalizedAmountOwed.mulDiv(this.scaledAmount, this.batch.scaledTotalAmount);
|
|
@@ -51,8 +54,7 @@ class LenderWithdrawalStatus {
|
|
|
51
54
|
const scaledAmount = ethers_1.BigNumber.from(status.scaledAmount);
|
|
52
55
|
const normalizedAmountWithdrawn = market.underlyingToken.getAmount(status.normalizedAmountWithdrawn);
|
|
53
56
|
const normalizedAmountOwed = market.underlyingToken.getAmount((0, utils_1.mulDiv)(batch.normalizedTotalAmount.raw, scaledAmount, batch.scaledTotalAmount).sub(normalizedAmountWithdrawn.raw));
|
|
54
|
-
|
|
55
|
-
return new LenderWithdrawalStatus(batch, address ?? status.account.address, scaledAmount, normalizedAmountWithdrawn, normalizedAmountOwed, availableWithdrawalAmount, status.isCompleted, status.requests || undefined, status.executions || undefined);
|
|
57
|
+
return new LenderWithdrawalStatus(batch, address ?? status.account.address, scaledAmount, normalizedAmountWithdrawn, normalizedAmountOwed, status.isCompleted, status.requests || undefined, status.executions || undefined);
|
|
56
58
|
}
|
|
57
59
|
static async getWithdrawalForLender(market, expiry, lender) {
|
|
58
60
|
const lens = (0, constants_1.getLensContract)(market.chainId, market.provider);
|
|
@@ -66,7 +68,7 @@ class LenderWithdrawalStatus {
|
|
|
66
68
|
batch.normalizedAmountPaid
|
|
67
69
|
.mulDiv(data.scaledAmount, batch.scaledTotalAmount)
|
|
68
70
|
.eq(data.normalizedAmountWithdrawn);
|
|
69
|
-
return new LenderWithdrawalStatus(batch, data.lender, data.scaledAmount, market.underlyingToken.getAmount(data.normalizedAmountWithdrawn), market.underlyingToken.getAmount(data.normalizedAmountOwed),
|
|
71
|
+
return new LenderWithdrawalStatus(batch, data.lender, data.scaledAmount, market.underlyingToken.getAmount(data.normalizedAmountWithdrawn), market.underlyingToken.getAmount(data.normalizedAmountOwed), isCompleted);
|
|
70
72
|
}
|
|
71
73
|
static fromWithdrawalBatchDataWithLenderStatus(market, data) {
|
|
72
74
|
return LenderWithdrawalStatus.fromWithdrawalBatchLenderStatus(market, withdrawal_batch_1.WithdrawalBatch.fromWithdrawalBatchData(market, data.batch), data.lenderStatus);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"withdrawal-status.js","sourceRoot":"","sources":["../src/withdrawal-status.ts"],"names":[],"mappings":";;;AAAA,mCAAwD;AAOxD,2CAAgE;AAChE,mCAMiB;AACjB,yDAAkE;AASlE,MAAa,sBAAsB;IAGjC,YACS,KAAsB,EACtB,MAAc,EACd,YAAuB,EACvB,yBAAsC,EACtC,oBAAiC,EACjC,
|
|
1
|
+
{"version":3,"file":"withdrawal-status.js","sourceRoot":"","sources":["../src/withdrawal-status.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@wildcatfi/wildcat-sdk",
|
|
3
|
-
"version": "2.0.
|
|
3
|
+
"version": "2.0.78",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"files": [
|
|
6
6
|
"dist"
|
|
@@ -44,7 +44,7 @@
|
|
|
44
44
|
"@apollo/client": "^3.8.6",
|
|
45
45
|
"@tanstack/react-query": "^4.29.14",
|
|
46
46
|
"@types/jest": "^29.5.8",
|
|
47
|
-
"ethers": "^5.
|
|
47
|
+
"ethers": "^5.7.2",
|
|
48
48
|
"graphql": "^16.8.1",
|
|
49
49
|
"react": "^18.1.0",
|
|
50
50
|
"react-dom": "^18.1.0",
|
package/dist/t.d.ts
DELETED
package/dist/t.d.ts.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"t.d.ts","sourceRoot":"","sources":["../src/t.ts"],"names":[],"mappings":""}
|
package/dist/t.js
DELETED
|
@@ -1,23 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
const constants_1 = require("./constants");
|
|
4
|
-
const token_1 = require("./token");
|
|
5
|
-
const utils_1 = require("./utils");
|
|
6
|
-
const totalSupply = new token_1.TokenAmount((0, token_1.toBn)(10).pow(10), new token_1.Token(constants_1.SupportedChainId.Mainnet, "", "token", "token", 8, false, {}));
|
|
7
|
-
const effectiveBorrowerAPR = () => {
|
|
8
|
-
const annualInterestBips = 1000;
|
|
9
|
-
const protocolFeeBips = 0;
|
|
10
|
-
// apr + (apr * protocolFee)
|
|
11
|
-
return (0, utils_1.bipMul)((0, utils_1.bipToRay)(annualInterestBips), utils_1.BIP.add(protocolFeeBips));
|
|
12
|
-
};
|
|
13
|
-
const reserveRatioBips = 1000;
|
|
14
|
-
console.log(totalSupply.format(8, true));
|
|
15
|
-
const interestPerSecond = totalSupply.rayMul(effectiveBorrowerAPR()).div(utils_1.SECONDS_IN_365_DAYS);
|
|
16
|
-
const interestPerSecondAddedToMinimumReserves = interestPerSecond.bipMul(reserveRatioBips);
|
|
17
|
-
const timeToPay = 86400 * 365;
|
|
18
|
-
console.log("ips: ", interestPerSecond.raw);
|
|
19
|
-
console.log(effectiveBorrowerAPR().div(utils_1.SECONDS_IN_365_DAYS));
|
|
20
|
-
const assetsRequired = interestPerSecond.mul(timeToPay);
|
|
21
|
-
console.log(totalSupply.token.getAmount(assetsRequired.raw).format(8, true));
|
|
22
|
-
console.log(assetsRequired.raw);
|
|
23
|
-
//# sourceMappingURL=t.js.map
|
package/dist/t.js.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"t.js","sourceRoot":"","sources":["../src/t.ts"],"names":[],"mappings":";;AACA,2CAA+C;AAC/C,mCAAmD;AACnD,mCAAqE;AAErE,MAAM,WAAW,GAAG,IAAI,mBAAW,CACjC,IAAA,YAAI,EAAC,EAAE,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,EAChB,IAAI,aAAK,CAAC,4BAAgB,CAAC,OAAO,EAAE,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,EAAE,KAAK,EAAE,EAAS,CAAC,CAC/E,CAAC;AAEF,MAAM,oBAAoB,GAAG,GAAG,EAAE;IAChC,MAAM,kBAAkB,GAAG,IAAI,CAAC;IAChC,MAAM,eAAe,GAAG,CAAC,CAAC;IAE1B,4BAA4B;IAC5B,OAAO,IAAA,cAAM,EAAC,IAAA,gBAAQ,EAAC,kBAAkB,CAAC,EAAE,WAAG,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,CAAC;AACxE,CAAC,CAAC;AAEF,MAAM,gBAAgB,GAAG,IAAI,CAAC;AAC9B,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC;AACzC,MAAM,iBAAiB,GAAG,WAAW,CAAC,MAAM,CAAC,oBAAoB,EAAE,CAAC,CAAC,GAAG,CAAC,2BAAmB,CAAC,CAAC;AAE9F,MAAM,uCAAuC,GAAG,iBAAiB,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;AAE3F,MAAM,SAAS,GAAG,KAAK,GAAG,GAAG,CAAC;AAC9B,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,CAAC;AAC5C,OAAO,CAAC,GAAG,CAAC,oBAAoB,EAAE,CAAC,GAAG,CAAC,2BAAmB,CAAC,CAAC,CAAC;AAC7D,MAAM,cAAc,GAAG,iBAAiB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;AAExD,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,KAAK,CAAC,SAAS,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC;AAE7E,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC"}
|