@kasufinance/kasu-sdk 2.10.0 → 2.10.2
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/bundle.cjs.js +30 -12
- package/dist/bundle.esm.js +30 -12
- package/dist/domain/batch-proof.js +19 -12
- package/dist/domain/batch-proof.js.map +1 -1
- package/dist/services/Portfolio/portfolio.js +11 -0
- package/dist/services/Portfolio/portfolio.js.map +1 -1
- package/package.json +1 -1
- package/src/domain/batch-proof.ts +18 -12
- package/src/services/Portfolio/portfolio.ts +14 -0
package/dist/bundle.cjs.js
CHANGED
|
@@ -17853,6 +17853,17 @@ class Portfolio {
|
|
|
17853
17853
|
weeklyYieldEarnings +=
|
|
17854
17854
|
investedAmount * parseFloat(tranche.interestRate);
|
|
17855
17855
|
for (const fixedDeposits of tranche.fixedLoans) {
|
|
17856
|
+
// A matured lock's principal is already inside
|
|
17857
|
+
// `investedAmount`: getPortfolioLendingData subtracts only
|
|
17858
|
+
// the LOCKED loans from the tranche balance. Its lifetime
|
|
17859
|
+
// yield is earned and stays counted (the tranche's own
|
|
17860
|
+
// lifetime had every lock's yield taken out), but its
|
|
17861
|
+
// amount must not be added to the investment, weekly or
|
|
17862
|
+
// APY sums a second time.
|
|
17863
|
+
if (!fixedDeposits.isLocked) {
|
|
17864
|
+
totalYieldEarned += parseFloat(fixedDeposits.yieldEarnings.lifetime);
|
|
17865
|
+
continue;
|
|
17866
|
+
}
|
|
17856
17867
|
const ftdConfig = tranche.fixedTermConfig.find((ftd) => ftd.configId === fixedDeposits.configId);
|
|
17857
17868
|
if (!ftdConfig)
|
|
17858
17869
|
continue;
|
|
@@ -25091,26 +25102,33 @@ function sameAmount(a, b) {
|
|
|
25091
25102
|
* this run's deposit.
|
|
25092
25103
|
*/
|
|
25093
25104
|
function decodeCanonical(iface, name, data, code) {
|
|
25094
|
-
|
|
25095
|
-
|
|
25096
|
-
|
|
25097
|
-
|
|
25098
|
-
|
|
25099
|
-
|
|
25100
|
-
|
|
25101
|
-
|
|
25102
|
-
|
|
25105
|
+
// Decode AND re-encode against the interface's OWN fragment for `name`,
|
|
25106
|
+
// never through `parseTransaction`. ethers v5's `TransactionDescription`
|
|
25107
|
+
// deep-copies its fields, and a fragment whose `inputs` array is not
|
|
25108
|
+
// frozen comes out as a plain object. Under the CommonJS build (Node,
|
|
25109
|
+
// jest) that copy still carries `format()`, because ES5 prototype methods
|
|
25110
|
+
// are enumerable; under the ES-module build a browser bundler resolves
|
|
25111
|
+
// (`lib.esm`, real classes) it carries no methods at all, so re-encoding
|
|
25112
|
+
// `parsed.functionFragment` threw and EVERY batch was refused as
|
|
25113
|
+
// `approve-call` in the browser (2.10.0, 2.10.1). With no description in
|
|
25114
|
+
// the path, nothing here depends on which copied fields survive.
|
|
25115
|
+
//
|
|
25116
|
+
// `decodeFunctionData` refuses data whose selector is not this
|
|
25117
|
+
// fragment's, so a call to any other function is `code`, as before.
|
|
25118
|
+
let args;
|
|
25103
25119
|
let canonical;
|
|
25104
25120
|
try {
|
|
25105
|
-
|
|
25121
|
+
const fragment = iface.getFunction(name);
|
|
25122
|
+
args = iface.decodeFunctionData(fragment, data);
|
|
25123
|
+
canonical = iface.encodeFunctionData(fragment, args);
|
|
25106
25124
|
}
|
|
25107
|
-
catch (
|
|
25125
|
+
catch (_a) {
|
|
25108
25126
|
return mismatch(code);
|
|
25109
25127
|
}
|
|
25110
25128
|
if (canonical.toLowerCase() !== data.toLowerCase()) {
|
|
25111
25129
|
return mismatch('non-canonical-encoding');
|
|
25112
25130
|
}
|
|
25113
|
-
return
|
|
25131
|
+
return args;
|
|
25114
25132
|
}
|
|
25115
25133
|
/**
|
|
25116
25134
|
* Pin a deposit batch to the run that produced it — PURE; throws a
|
package/dist/bundle.esm.js
CHANGED
|
@@ -17851,6 +17851,17 @@ class Portfolio {
|
|
|
17851
17851
|
weeklyYieldEarnings +=
|
|
17852
17852
|
investedAmount * parseFloat(tranche.interestRate);
|
|
17853
17853
|
for (const fixedDeposits of tranche.fixedLoans) {
|
|
17854
|
+
// A matured lock's principal is already inside
|
|
17855
|
+
// `investedAmount`: getPortfolioLendingData subtracts only
|
|
17856
|
+
// the LOCKED loans from the tranche balance. Its lifetime
|
|
17857
|
+
// yield is earned and stays counted (the tranche's own
|
|
17858
|
+
// lifetime had every lock's yield taken out), but its
|
|
17859
|
+
// amount must not be added to the investment, weekly or
|
|
17860
|
+
// APY sums a second time.
|
|
17861
|
+
if (!fixedDeposits.isLocked) {
|
|
17862
|
+
totalYieldEarned += parseFloat(fixedDeposits.yieldEarnings.lifetime);
|
|
17863
|
+
continue;
|
|
17864
|
+
}
|
|
17854
17865
|
const ftdConfig = tranche.fixedTermConfig.find((ftd) => ftd.configId === fixedDeposits.configId);
|
|
17855
17866
|
if (!ftdConfig)
|
|
17856
17867
|
continue;
|
|
@@ -25089,26 +25100,33 @@ function sameAmount(a, b) {
|
|
|
25089
25100
|
* this run's deposit.
|
|
25090
25101
|
*/
|
|
25091
25102
|
function decodeCanonical(iface, name, data, code) {
|
|
25092
|
-
|
|
25093
|
-
|
|
25094
|
-
|
|
25095
|
-
|
|
25096
|
-
|
|
25097
|
-
|
|
25098
|
-
|
|
25099
|
-
|
|
25100
|
-
|
|
25103
|
+
// Decode AND re-encode against the interface's OWN fragment for `name`,
|
|
25104
|
+
// never through `parseTransaction`. ethers v5's `TransactionDescription`
|
|
25105
|
+
// deep-copies its fields, and a fragment whose `inputs` array is not
|
|
25106
|
+
// frozen comes out as a plain object. Under the CommonJS build (Node,
|
|
25107
|
+
// jest) that copy still carries `format()`, because ES5 prototype methods
|
|
25108
|
+
// are enumerable; under the ES-module build a browser bundler resolves
|
|
25109
|
+
// (`lib.esm`, real classes) it carries no methods at all, so re-encoding
|
|
25110
|
+
// `parsed.functionFragment` threw and EVERY batch was refused as
|
|
25111
|
+
// `approve-call` in the browser (2.10.0, 2.10.1). With no description in
|
|
25112
|
+
// the path, nothing here depends on which copied fields survive.
|
|
25113
|
+
//
|
|
25114
|
+
// `decodeFunctionData` refuses data whose selector is not this
|
|
25115
|
+
// fragment's, so a call to any other function is `code`, as before.
|
|
25116
|
+
let args;
|
|
25101
25117
|
let canonical;
|
|
25102
25118
|
try {
|
|
25103
|
-
|
|
25119
|
+
const fragment = iface.getFunction(name);
|
|
25120
|
+
args = iface.decodeFunctionData(fragment, data);
|
|
25121
|
+
canonical = iface.encodeFunctionData(fragment, args);
|
|
25104
25122
|
}
|
|
25105
|
-
catch (
|
|
25123
|
+
catch (_a) {
|
|
25106
25124
|
return mismatch(code);
|
|
25107
25125
|
}
|
|
25108
25126
|
if (canonical.toLowerCase() !== data.toLowerCase()) {
|
|
25109
25127
|
return mismatch('non-canonical-encoding');
|
|
25110
25128
|
}
|
|
25111
|
-
return
|
|
25129
|
+
return args;
|
|
25112
25130
|
}
|
|
25113
25131
|
/**
|
|
25114
25132
|
* Pin a deposit batch to the run that produced it — PURE; throws a
|
|
@@ -98,26 +98,33 @@ function sameAmount(a, b) {
|
|
|
98
98
|
* this run's deposit.
|
|
99
99
|
*/
|
|
100
100
|
function decodeCanonical(iface, name, data, code) {
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
101
|
+
// Decode AND re-encode against the interface's OWN fragment for `name`,
|
|
102
|
+
// never through `parseTransaction`. ethers v5's `TransactionDescription`
|
|
103
|
+
// deep-copies its fields, and a fragment whose `inputs` array is not
|
|
104
|
+
// frozen comes out as a plain object. Under the CommonJS build (Node,
|
|
105
|
+
// jest) that copy still carries `format()`, because ES5 prototype methods
|
|
106
|
+
// are enumerable; under the ES-module build a browser bundler resolves
|
|
107
|
+
// (`lib.esm`, real classes) it carries no methods at all, so re-encoding
|
|
108
|
+
// `parsed.functionFragment` threw and EVERY batch was refused as
|
|
109
|
+
// `approve-call` in the browser (2.10.0, 2.10.1). With no description in
|
|
110
|
+
// the path, nothing here depends on which copied fields survive.
|
|
111
|
+
//
|
|
112
|
+
// `decodeFunctionData` refuses data whose selector is not this
|
|
113
|
+
// fragment's, so a call to any other function is `code`, as before.
|
|
114
|
+
let args;
|
|
110
115
|
let canonical;
|
|
111
116
|
try {
|
|
112
|
-
|
|
117
|
+
const fragment = iface.getFunction(name);
|
|
118
|
+
args = iface.decodeFunctionData(fragment, data);
|
|
119
|
+
canonical = iface.encodeFunctionData(fragment, args);
|
|
113
120
|
}
|
|
114
|
-
catch (
|
|
121
|
+
catch (_a) {
|
|
115
122
|
return mismatch(code);
|
|
116
123
|
}
|
|
117
124
|
if (canonical.toLowerCase() !== data.toLowerCase()) {
|
|
118
125
|
return mismatch('non-canonical-encoding');
|
|
119
126
|
}
|
|
120
|
-
return
|
|
127
|
+
return args;
|
|
121
128
|
}
|
|
122
129
|
/**
|
|
123
130
|
* Pin a deposit batch to the run that produced it — PURE; throws a
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"batch-proof.js","sourceRoot":"","sources":["../../src/domain/batch-proof.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"batch-proof.js","sourceRoot":"","sources":["../../src/domain/batch-proof.ts"],"names":[],"mappings":"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"}
|
|
@@ -47,6 +47,17 @@ export class Portfolio {
|
|
|
47
47
|
weeklyYieldEarnings +=
|
|
48
48
|
investedAmount * parseFloat(tranche.interestRate);
|
|
49
49
|
for (const fixedDeposits of tranche.fixedLoans) {
|
|
50
|
+
// A matured lock's principal is already inside
|
|
51
|
+
// `investedAmount`: getPortfolioLendingData subtracts only
|
|
52
|
+
// the LOCKED loans from the tranche balance. Its lifetime
|
|
53
|
+
// yield is earned and stays counted (the tranche's own
|
|
54
|
+
// lifetime had every lock's yield taken out), but its
|
|
55
|
+
// amount must not be added to the investment, weekly or
|
|
56
|
+
// APY sums a second time.
|
|
57
|
+
if (!fixedDeposits.isLocked) {
|
|
58
|
+
totalYieldEarned += parseFloat(fixedDeposits.yieldEarnings.lifetime);
|
|
59
|
+
continue;
|
|
60
|
+
}
|
|
50
61
|
const ftdConfig = tranche.fixedTermConfig.find((ftd) => ftd.configId === fixedDeposits.configId);
|
|
51
62
|
if (!ftdConfig)
|
|
52
63
|
continue;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"portfolio.js","sourceRoot":"","sources":["../../../src/services/Portfolio/portfolio.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"portfolio.js","sourceRoot":"","sources":["../../../src/services/Portfolio/portfolio.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -162,26 +162,32 @@ function decodeCanonical(
|
|
|
162
162
|
data: string,
|
|
163
163
|
code: string,
|
|
164
164
|
): utils.Result {
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
165
|
+
// Decode AND re-encode against the interface's OWN fragment for `name`,
|
|
166
|
+
// never through `parseTransaction`. ethers v5's `TransactionDescription`
|
|
167
|
+
// deep-copies its fields, and a fragment whose `inputs` array is not
|
|
168
|
+
// frozen comes out as a plain object. Under the CommonJS build (Node,
|
|
169
|
+
// jest) that copy still carries `format()`, because ES5 prototype methods
|
|
170
|
+
// are enumerable; under the ES-module build a browser bundler resolves
|
|
171
|
+
// (`lib.esm`, real classes) it carries no methods at all, so re-encoding
|
|
172
|
+
// `parsed.functionFragment` threw and EVERY batch was refused as
|
|
173
|
+
// `approve-call` in the browser (2.10.0, 2.10.1). With no description in
|
|
174
|
+
// the path, nothing here depends on which copied fields survive.
|
|
175
|
+
//
|
|
176
|
+
// `decodeFunctionData` refuses data whose selector is not this
|
|
177
|
+
// fragment's, so a call to any other function is `code`, as before.
|
|
178
|
+
let args: utils.Result;
|
|
172
179
|
let canonical: string;
|
|
173
180
|
try {
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
);
|
|
181
|
+
const fragment = iface.getFunction(name);
|
|
182
|
+
args = iface.decodeFunctionData(fragment, data);
|
|
183
|
+
canonical = iface.encodeFunctionData(fragment, args);
|
|
178
184
|
} catch {
|
|
179
185
|
return mismatch(code);
|
|
180
186
|
}
|
|
181
187
|
if (canonical.toLowerCase() !== data.toLowerCase()) {
|
|
182
188
|
return mismatch('non-canonical-encoding');
|
|
183
189
|
}
|
|
184
|
-
return
|
|
190
|
+
return args;
|
|
185
191
|
}
|
|
186
192
|
|
|
187
193
|
/**
|
|
@@ -113,6 +113,20 @@ export class Portfolio {
|
|
|
113
113
|
investedAmount * parseFloat(tranche.interestRate);
|
|
114
114
|
|
|
115
115
|
for (const fixedDeposits of tranche.fixedLoans) {
|
|
116
|
+
// A matured lock's principal is already inside
|
|
117
|
+
// `investedAmount`: getPortfolioLendingData subtracts only
|
|
118
|
+
// the LOCKED loans from the tranche balance. Its lifetime
|
|
119
|
+
// yield is earned and stays counted (the tranche's own
|
|
120
|
+
// lifetime had every lock's yield taken out), but its
|
|
121
|
+
// amount must not be added to the investment, weekly or
|
|
122
|
+
// APY sums a second time.
|
|
123
|
+
if (!fixedDeposits.isLocked) {
|
|
124
|
+
totalYieldEarned += parseFloat(
|
|
125
|
+
fixedDeposits.yieldEarnings.lifetime,
|
|
126
|
+
);
|
|
127
|
+
continue;
|
|
128
|
+
}
|
|
129
|
+
|
|
116
130
|
const ftdConfig = tranche.fixedTermConfig.find(
|
|
117
131
|
(ftd) => ftd.configId === fixedDeposits.configId,
|
|
118
132
|
);
|