@owneraio/finp2p-sdk-js 0.16.5 → 0.16.6
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/lib/core/intent.js +8 -4
- package/lib/core/intent.js.map +1 -1
- package/lib/core/payments.js +2 -0
- package/lib/core/payments.js.map +1 -1
- package/lib/core/signatures.d.ts +4 -0
- package/lib/core/signatures.js +75 -10
- package/lib/core/signatures.js.map +1 -1
- package/lib/types/Core/Intents.d.ts +3 -0
- package/lib/types/Core/SignatureProvider.d.ts +2 -1
- package/lib/types/CustodyAdapter/index.d.ts +1 -0
- package/package.json +1 -1
package/lib/core/intent.js
CHANGED
|
@@ -16,8 +16,7 @@ const signatures_1 = require("./signatures");
|
|
|
16
16
|
const consts_1 = require("./consts");
|
|
17
17
|
const user_1 = require("./user");
|
|
18
18
|
const getIntent = (req) => {
|
|
19
|
-
const { owneraAPI,
|
|
20
|
-
logger.debug('Get Intent Execution');
|
|
19
|
+
const { owneraAPI, assetId, intentId } = req;
|
|
21
20
|
return {
|
|
22
21
|
id: intentId,
|
|
23
22
|
enable: () => __awaiter(void 0, void 0, void 0, function* () {
|
|
@@ -35,7 +34,6 @@ const getIntent = (req) => {
|
|
|
35
34
|
exports.getIntent = getIntent;
|
|
36
35
|
const createIntent = (req, options) => __awaiter(void 0, void 0, void 0, function* () {
|
|
37
36
|
const { owneraAPI, logger, createIntentRequest, publicKey, userId } = req;
|
|
38
|
-
logger.debug('Create Intent Execution');
|
|
39
37
|
// TODO when signature policy type other than manual will be re enabled, use signature provider
|
|
40
38
|
// const { owneraAPI, createIntentRequest, publicKey, userId, signatureProvider } = req;
|
|
41
39
|
const { amount, type, settlement, assetId, start, end, signaturePolicy } = createIntentRequest;
|
|
@@ -103,7 +101,7 @@ const createLoanIntent = (req, options) => __awaiter(void 0, void 0, void 0, fun
|
|
|
103
101
|
data: { userId },
|
|
104
102
|
};
|
|
105
103
|
}
|
|
106
|
-
const { assetId, start, end, amount, settlement, interestRate, closeAmount, role, counterpartId, openDate, closeDate, } = createIntentRequest;
|
|
104
|
+
const { assetId, assetName, start, end, amount, settlement, interestRate, closeAmount, role, counterpartId, openDate, closeDate, } = createIntentRequest;
|
|
107
105
|
const partners = {
|
|
108
106
|
borrower: { id: '', pk: '' },
|
|
109
107
|
lender: { id: '', pk: '' },
|
|
@@ -126,7 +124,9 @@ const createLoanIntent = (req, options) => __awaiter(void 0, void 0, void 0, fun
|
|
|
126
124
|
const signature = yield (0, signatures_1.generateLoanSignature)({
|
|
127
125
|
assetAmount: amount,
|
|
128
126
|
assetDstAccount: partners.lender.pk,
|
|
127
|
+
userId,
|
|
129
128
|
assetId,
|
|
129
|
+
assetName,
|
|
130
130
|
assetSrcAccount: partners.borrower.pk,
|
|
131
131
|
nonce,
|
|
132
132
|
settlementAmount: (Number(settlement.unitValue) * Number(amount)).toString(),
|
|
@@ -280,7 +280,9 @@ const executeIntent = (req) => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
280
280
|
signatureProvider,
|
|
281
281
|
signatureTemplate: ossAsset.config.signatureTemplate,
|
|
282
282
|
nonce,
|
|
283
|
+
userId,
|
|
283
284
|
assetId: data.assetId,
|
|
285
|
+
assetName: data.assetName,
|
|
284
286
|
assetDstAccount: dstAccountPK,
|
|
285
287
|
assetAmount: data.amount,
|
|
286
288
|
settlementAssetId: getSettlementTermAssetId(intent.settlementTerm.asset),
|
|
@@ -367,9 +369,11 @@ const executeLoanIntent = (req) => __awaiter(void 0, void 0, void 0, function* (
|
|
|
367
369
|
const settlementAsset = getSettlementTermAsset(intent.intent.settlementTerm.asset);
|
|
368
370
|
const nonce = (0, utils_1.generateNonce)();
|
|
369
371
|
const signature = yield (0, signatures_1.generateLoanSignature)({
|
|
372
|
+
userId,
|
|
370
373
|
assetAmount: assetTerm.amount,
|
|
371
374
|
assetDstAccount: loanIntent.loanSettlementInstruction.lenderAccount.finId,
|
|
372
375
|
assetId: data.assetId,
|
|
376
|
+
assetName: data.assetName,
|
|
373
377
|
assetSrcAccount: loanIntent.loanSettlementInstruction.borrowerAccount.finId,
|
|
374
378
|
nonce,
|
|
375
379
|
settlementAmount: (Number(assetTerm.amount) * Number(settlementTerm.unitValue)).toString(),
|
package/lib/core/intent.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"intent.js","sourceRoot":"","sources":["../../src/core/intent.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"intent.js","sourceRoot":"","sources":["../../src/core/intent.ts"],"names":[],"mappings":"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"}
|
package/lib/core/payments.js
CHANGED
|
@@ -44,11 +44,13 @@ const deposit = (req, options) => __awaiter(void 0, void 0, void 0, function* ()
|
|
|
44
44
|
}
|
|
45
45
|
const assetType = account.asset.type;
|
|
46
46
|
const assetId = getAssetIdFromAccount(account);
|
|
47
|
+
const assetName = assetId;
|
|
47
48
|
const nonce = (0, utils_2.generateNonce)();
|
|
48
49
|
const signature = yield (0, signatures_1.generateDepositSignature)({
|
|
49
50
|
signatureProvider: signatureProvider,
|
|
50
51
|
nonce,
|
|
51
52
|
assetId,
|
|
53
|
+
assetName,
|
|
52
54
|
assetType,
|
|
53
55
|
dstAccountType: account.account.type,
|
|
54
56
|
dstAccount: account.account.finId,
|
package/lib/core/payments.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"payments.js","sourceRoot":"","sources":["../../src/core/payments.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,8CAA2C;AAC3C,mCAAgE;AAChE,6CAAwD;AACxD,8CAAgF;AAIzE,MAAM,OAAO,GAAG,CACrB,GAQC,EACD,OAA4B,EACF,EAAE;IAC5B,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,iBAAiB,EAAE,GAAG,GAAG,CAAC;IAE/E,IAAI,CAAC,iBAAiB,EAAE;QACtB,MAAM;YACJ,IAAI,EAAE,GAAG;YACT,IAAI,EAAE,oBAAoB;YAC1B,OAAO,EACL,wEAAwE;gBACxE,sFAAsF;YACxF,IAAI,EAAE,EAAE,MAAM,EAAE;SACjB,CAAC;KACH;IAED,MAAM,cAAc,GAAG,IAAA,mCAAsB,EAAC,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;IAC3E,IAAI,CAAC,cAAc,EAAE;QACnB,MAAM;YACJ,IAAI,EAAE,GAAG;YACT,IAAI,EAAE,cAAc;YACpB,OAAO,EAAE,iCAAiC;YAC1C,IAAI,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE;SAClC,CAAC;KACH;IAED,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC;IACpC,MAAM,QAAQ,GAAG,CAAC,MAAM,SAAS,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAC7F,MAAM,gBAAgB,GAAG,CAAC,CAAC,QAAQ,IAAI,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAE7E,IAAI,CAAC,gBAAgB,EAAE;QACrB,MAAM,SAAS,CAAC,QAAQ,CAAC,YAAY,CACnC,EAAE,aAAa,EAAE,CAAC,KAAK,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,EAC7C;YACE,WAAW,EAAE,IAAA,8BAAsB,GAAE;SACtC,CACF,CAAC;KACH;IAED,MAAM,SAAS,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC;IACrC,MAAM,OAAO,GAAG,qBAAqB,CAAC,OAAO,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"payments.js","sourceRoot":"","sources":["../../src/core/payments.ts"],"names":[],"mappings":"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"}
|
package/lib/core/signatures.d.ts
CHANGED
|
@@ -6,7 +6,9 @@ interface CommonRequest {
|
|
|
6
6
|
signatureProvider: SignatureProvider;
|
|
7
7
|
signatureTemplate: SignatureTemplate;
|
|
8
8
|
nonce: Buffer;
|
|
9
|
+
userId: string;
|
|
9
10
|
assetId: string;
|
|
11
|
+
assetName: string;
|
|
10
12
|
assetDstAccount: string;
|
|
11
13
|
assetAmount: string;
|
|
12
14
|
settlementAssetType: SettlementAssetType;
|
|
@@ -24,6 +26,7 @@ export declare const generateSellingSignature: (r: CommonRequest & {
|
|
|
24
26
|
assetSrcAccount: string;
|
|
25
27
|
}) => Promise<string>;
|
|
26
28
|
export declare const generateBuyingSignature: (r: CommonRequest & {
|
|
29
|
+
userId: string;
|
|
27
30
|
assetSrcAccount: string;
|
|
28
31
|
settlementExpiry: number;
|
|
29
32
|
}) => Promise<string>;
|
|
@@ -31,6 +34,7 @@ interface DepositRequest {
|
|
|
31
34
|
signatureProvider: SignatureProvider;
|
|
32
35
|
nonce: Buffer;
|
|
33
36
|
assetId: string;
|
|
37
|
+
assetName: string;
|
|
34
38
|
assetType: string;
|
|
35
39
|
dstAccount: string;
|
|
36
40
|
dstAccountType: string;
|
package/lib/core/signatures.js
CHANGED
|
@@ -12,7 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
12
12
|
exports.generateLoanSignature = exports.generateDepositSignature = exports.generateBuyingSignature = exports.generateSellingSignature = exports.generateIssuanceSignature = void 0;
|
|
13
13
|
const utils_1 = require("./utils");
|
|
14
14
|
const generateIssuanceSignature = (r) => __awaiter(void 0, void 0, void 0, function* () {
|
|
15
|
-
const { signatureProvider, nonce, assetId, assetDstAccount, assetAmount, settlementAmount, settlementAssetId, settlementAssetType, settlementDstAccount, settlementDstAccountType, settlementExpiry, settlementSrcAccount, settlementSrcAccountType, } = r;
|
|
15
|
+
const { signatureProvider, nonce, assetId, assetName, assetDstAccount, assetAmount, settlementAmount, settlementAssetId, settlementAssetType, settlementDstAccount, settlementDstAccountType, settlementExpiry, settlementSrcAccount, settlementSrcAccountType, } = r;
|
|
16
16
|
const assetValues = [nonce, 'issue', 'finp2p', assetId, 'finId', assetDstAccount, assetAmount];
|
|
17
17
|
const assetHash = (0, utils_1.generateHash)(assetValues, r.signatureTemplate.hashFunction);
|
|
18
18
|
const settlementValues = [
|
|
@@ -27,11 +27,24 @@ const generateIssuanceSignature = (r) => __awaiter(void 0, void 0, void 0, funct
|
|
|
27
27
|
];
|
|
28
28
|
const settlementHash = (0, utils_1.generateHash)(settlementValues, r.signatureTemplate.hashFunction);
|
|
29
29
|
const hash = (0, utils_1.generateHash)([assetHash, settlementHash], r.signatureTemplate.hashFunction).toString('hex');
|
|
30
|
-
|
|
30
|
+
const details = {
|
|
31
|
+
assetId,
|
|
32
|
+
assetName,
|
|
33
|
+
quantity: assetAmount,
|
|
34
|
+
buyer: '',
|
|
35
|
+
recipientPublicKey: assetDstAccount,
|
|
36
|
+
seller: '',
|
|
37
|
+
sourcePublicKey: undefined,
|
|
38
|
+
settlementAsset: {
|
|
39
|
+
assetId: settlementAssetId,
|
|
40
|
+
quantity: settlementAmount,
|
|
41
|
+
},
|
|
42
|
+
};
|
|
43
|
+
return yield signatureProvider.signingMethod(hash, details);
|
|
31
44
|
});
|
|
32
45
|
exports.generateIssuanceSignature = generateIssuanceSignature;
|
|
33
46
|
const generateSellingSignature = (r) => __awaiter(void 0, void 0, void 0, function* () {
|
|
34
|
-
const { signatureProvider, nonce, assetId, assetDstAccount, assetSrcAccount, assetAmount, settlementAmount, settlementAssetId, settlementAssetType, settlementDstAccount, settlementDstAccountType, settlementSrcAccount, settlementSrcAccountType, } = r;
|
|
47
|
+
const { signatureProvider, nonce, userId, assetId, assetName, assetDstAccount, assetSrcAccount, assetAmount, settlementAmount, settlementAssetId, settlementAssetType, settlementDstAccount, settlementDstAccountType, settlementSrcAccount, settlementSrcAccountType, } = r;
|
|
35
48
|
const assetValues = [
|
|
36
49
|
nonce,
|
|
37
50
|
'transfer',
|
|
@@ -55,11 +68,24 @@ const generateSellingSignature = (r) => __awaiter(void 0, void 0, void 0, functi
|
|
|
55
68
|
];
|
|
56
69
|
const settlementHash = (0, utils_1.generateHash)(settlementValues, r.signatureTemplate.hashFunction);
|
|
57
70
|
const hash = (0, utils_1.generateHash)([assetHash, settlementHash], r.signatureTemplate.hashFunction).toString('hex');
|
|
58
|
-
|
|
71
|
+
const details = {
|
|
72
|
+
assetId,
|
|
73
|
+
assetName,
|
|
74
|
+
quantity: assetAmount,
|
|
75
|
+
buyer: userId,
|
|
76
|
+
recipientPublicKey: assetDstAccount,
|
|
77
|
+
seller: '',
|
|
78
|
+
sourcePublicKey: undefined,
|
|
79
|
+
settlementAsset: {
|
|
80
|
+
assetId: settlementAssetId,
|
|
81
|
+
quantity: settlementAmount,
|
|
82
|
+
},
|
|
83
|
+
};
|
|
84
|
+
return yield signatureProvider.signingMethod(hash, details);
|
|
59
85
|
});
|
|
60
86
|
exports.generateSellingSignature = generateSellingSignature;
|
|
61
87
|
const generateBuyingSignature = (r) => __awaiter(void 0, void 0, void 0, function* () {
|
|
62
|
-
const { signatureProvider, nonce, assetId, assetDstAccount, assetSrcAccount, assetAmount, settlementAmount, settlementAssetId, settlementAssetType, settlementDstAccount, settlementDstAccountType, settlementSrcAccount, settlementSrcAccountType, settlementExpiry, } = r;
|
|
88
|
+
const { signatureProvider, nonce, userId, assetId, assetName, assetDstAccount, assetSrcAccount, assetAmount, settlementAmount, settlementAssetId, settlementAssetType, settlementDstAccount, settlementDstAccountType, settlementSrcAccount, settlementSrcAccountType, settlementExpiry, } = r;
|
|
63
89
|
const assetValues = [
|
|
64
90
|
nonce,
|
|
65
91
|
'transfer',
|
|
@@ -84,18 +110,44 @@ const generateBuyingSignature = (r) => __awaiter(void 0, void 0, void 0, functio
|
|
|
84
110
|
];
|
|
85
111
|
const settlementHash = (0, utils_1.generateHash)(settlementValues, r.signatureTemplate.hashFunction);
|
|
86
112
|
const hash = (0, utils_1.generateHash)([assetHash, settlementHash], r.signatureTemplate.hashFunction).toString('hex');
|
|
87
|
-
|
|
113
|
+
const details = {
|
|
114
|
+
assetId,
|
|
115
|
+
assetName,
|
|
116
|
+
quantity: assetAmount,
|
|
117
|
+
buyer: '',
|
|
118
|
+
recipientPublicKey: assetDstAccount,
|
|
119
|
+
seller: userId,
|
|
120
|
+
sourcePublicKey: undefined,
|
|
121
|
+
settlementAsset: {
|
|
122
|
+
assetId: settlementAssetId,
|
|
123
|
+
quantity: settlementAmount,
|
|
124
|
+
},
|
|
125
|
+
};
|
|
126
|
+
return yield signatureProvider.signingMethod(hash, details);
|
|
88
127
|
});
|
|
89
128
|
exports.generateBuyingSignature = generateBuyingSignature;
|
|
90
129
|
const generateDepositSignature = (r) => __awaiter(void 0, void 0, void 0, function* () {
|
|
91
|
-
const { signatureProvider, nonce, assetId, assetType, dstAccountType, dstAccount, amount } = r;
|
|
130
|
+
const { signatureProvider, nonce, assetId, assetName, assetType, dstAccountType, dstAccount, amount } = r;
|
|
92
131
|
const values = [nonce, 'deposit', assetType, assetId, dstAccountType, dstAccount, amount];
|
|
93
132
|
const hash = (0, utils_1.generateHash)(values).toString('hex');
|
|
94
|
-
|
|
133
|
+
const details = {
|
|
134
|
+
assetId,
|
|
135
|
+
assetName,
|
|
136
|
+
quantity: amount,
|
|
137
|
+
buyer: '',
|
|
138
|
+
recipientPublicKey: dstAccount,
|
|
139
|
+
seller: '',
|
|
140
|
+
sourcePublicKey: undefined,
|
|
141
|
+
settlementAsset: {
|
|
142
|
+
assetId,
|
|
143
|
+
quantity: amount,
|
|
144
|
+
},
|
|
145
|
+
};
|
|
146
|
+
return yield signatureProvider.signingMethod(hash, details);
|
|
95
147
|
});
|
|
96
148
|
exports.generateDepositSignature = generateDepositSignature;
|
|
97
149
|
const generateLoanSignature = (r) => __awaiter(void 0, void 0, void 0, function* () {
|
|
98
|
-
const { signatureProvider, signatureTemplate, nonce, assetId, assetDstAccount, assetSrcAccount, assetAmount, settlementAmount, settlementAssetId, settlementAssetType, settlementDstAccount, settlementDstAccountType, settlementSrcAccount, settlementSrcAccountType, settlementOpenTime, settlementCloseTime, settlementCloseAmount, } = r;
|
|
150
|
+
const { signatureProvider, signatureTemplate, nonce, assetId, assetName, assetDstAccount, assetSrcAccount, assetAmount, settlementAmount, settlementAssetId, settlementAssetType, settlementDstAccount, settlementDstAccountType, settlementSrcAccount, settlementSrcAccountType, settlementOpenTime, settlementCloseTime, settlementCloseAmount, } = r;
|
|
99
151
|
const values = [
|
|
100
152
|
nonce,
|
|
101
153
|
'loan',
|
|
@@ -119,7 +171,20 @@ const generateLoanSignature = (r) => __awaiter(void 0, void 0, void 0, function*
|
|
|
119
171
|
];
|
|
120
172
|
const valuesHash = (0, utils_1.generateHash)(values, signatureTemplate.hashFunction);
|
|
121
173
|
const hash = (0, utils_1.generateHash)([valuesHash], signatureTemplate.hashFunction).toString('hex');
|
|
122
|
-
|
|
174
|
+
const details = {
|
|
175
|
+
assetId,
|
|
176
|
+
assetName,
|
|
177
|
+
quantity: assetAmount,
|
|
178
|
+
buyer: '',
|
|
179
|
+
recipientPublicKey: assetDstAccount,
|
|
180
|
+
seller: '',
|
|
181
|
+
sourcePublicKey: undefined,
|
|
182
|
+
settlementAsset: {
|
|
183
|
+
assetId: settlementAssetId,
|
|
184
|
+
quantity: settlementAmount,
|
|
185
|
+
},
|
|
186
|
+
};
|
|
187
|
+
return yield signatureProvider.signingMethod(hash, details);
|
|
123
188
|
});
|
|
124
189
|
exports.generateLoanSignature = generateLoanSignature;
|
|
125
190
|
//# sourceMappingURL=signatures.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signatures.js","sourceRoot":"","sources":["../../src/core/signatures.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mCAAuC;
|
|
1
|
+
{"version":3,"file":"signatures.js","sourceRoot":"","sources":["../../src/core/signatures.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mCAAuC;AAwBhC,MAAM,yBAAyB,GAAG,CACvC,CAEC,EACgB,EAAE;IACnB,MAAM,EACJ,iBAAiB,EACjB,KAAK,EACL,OAAO,EACP,SAAS,EACT,eAAe,EACf,WAAW,EACX,gBAAgB,EAChB,iBAAiB,EACjB,mBAAmB,EACnB,oBAAoB,EACpB,wBAAwB,EACxB,gBAAgB,EAChB,oBAAoB,EACpB,wBAAwB,GACzB,GAAG,CAAC,CAAC;IACN,MAAM,WAAW,GAAG,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,WAAW,CAAC,CAAC;IAC/F,MAAM,SAAS,GAAG,IAAA,oBAAY,EAAC,WAAW,EAAE,CAAC,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAC;IAC9E,MAAM,gBAAgB,GAAG;QACvB,mBAAmB;QACnB,iBAAiB;QACjB,wBAAwB;QACxB,oBAAoB;QACpB,wBAAwB;QACxB,oBAAoB;QACpB,gBAAgB;QAChB,gBAAgB,CAAC,QAAQ,EAAE;KAC5B,CAAC;IAEF,MAAM,cAAc,GAAG,IAAA,oBAAY,EAAC,gBAAgB,EAAE,CAAC,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAC;IACxF,MAAM,IAAI,GAAG,IAAA,oBAAY,EAAC,CAAC,SAAS,EAAE,cAAc,CAAC,EAAE,CAAC,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACzG,MAAM,OAAO,GAAG;QACd,OAAO;QACP,SAAS;QACT,QAAQ,EAAE,WAAW;QACrB,KAAK,EAAE,EAAE;QACT,kBAAkB,EAAE,eAAe;QACnC,MAAM,EAAE,EAAE;QACV,eAAe,EAAE,SAAS;QAC1B,eAAe,EAAE;YACf,OAAO,EAAE,iBAAiB;YAC1B,QAAQ,EAAE,gBAAgB;SAC3B;KACF,CAAC;IAEF,OAAO,MAAM,iBAAiB,CAAC,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;AAC9D,CAAC,CAAA,CAAC;AAnDW,QAAA,yBAAyB,6BAmDpC;AAEK,MAAM,wBAAwB,GAAG,CACtC,CAEC,EACgB,EAAE;IACnB,MAAM,EACJ,iBAAiB,EACjB,KAAK,EACL,MAAM,EACN,OAAO,EACP,SAAS,EACT,eAAe,EACf,eAAe,EACf,WAAW,EACX,gBAAgB,EAChB,iBAAiB,EACjB,mBAAmB,EACnB,oBAAoB,EACpB,wBAAwB,EACxB,oBAAoB,EACpB,wBAAwB,GACzB,GAAG,CAAC,CAAC;IACN,MAAM,WAAW,GAAG;QAClB,KAAK;QACL,UAAU;QACV,QAAQ;QACR,OAAO;QACP,OAAO;QACP,eAAe;QACf,OAAO;QACP,eAAe;QACf,WAAW;KACZ,CAAC;IACF,MAAM,SAAS,GAAG,IAAA,oBAAY,EAAC,WAAW,EAAE,CAAC,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAC;IAC9E,MAAM,gBAAgB,GAAG;QACvB,mBAAmB;QACnB,iBAAiB;QACjB,wBAAwB;QACxB,oBAAoB;QACpB,wBAAwB;QACxB,oBAAoB;QACpB,gBAAgB;KACjB,CAAC;IACF,MAAM,cAAc,GAAG,IAAA,oBAAY,EAAC,gBAAgB,EAAE,CAAC,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAC;IACxF,MAAM,IAAI,GAAG,IAAA,oBAAY,EAAC,CAAC,SAAS,EAAE,cAAc,CAAC,EAAE,CAAC,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACzG,MAAM,OAAO,GAAG;QACd,OAAO;QACP,SAAS;QACT,QAAQ,EAAE,WAAW;QACrB,KAAK,EAAE,MAAM;QACb,kBAAkB,EAAE,eAAe;QACnC,MAAM,EAAE,EAAE;QACV,eAAe,EAAE,SAAS;QAC1B,eAAe,EAAE;YACf,OAAO,EAAE,iBAAiB;YAC1B,QAAQ,EAAE,gBAAgB;SAC3B;KACF,CAAC;IAEF,OAAO,MAAM,iBAAiB,CAAC,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;AAC9D,CAAC,CAAA,CAAC;AA5DW,QAAA,wBAAwB,4BA4DnC;AAEK,MAAM,uBAAuB,GAAG,CACrC,CAIC,EACgB,EAAE;IACnB,MAAM,EACJ,iBAAiB,EACjB,KAAK,EACL,MAAM,EACN,OAAO,EACP,SAAS,EACT,eAAe,EACf,eAAe,EACf,WAAW,EACX,gBAAgB,EAChB,iBAAiB,EACjB,mBAAmB,EACnB,oBAAoB,EACpB,wBAAwB,EACxB,oBAAoB,EACpB,wBAAwB,EACxB,gBAAgB,GACjB,GAAG,CAAC,CAAC;IACN,MAAM,WAAW,GAAG;QAClB,KAAK;QACL,UAAU;QACV,QAAQ;QACR,OAAO;QACP,OAAO;QACP,eAAe;QACf,OAAO;QACP,eAAe;QACf,WAAW;KACZ,CAAC;IAEF,MAAM,SAAS,GAAG,IAAA,oBAAY,EAAC,WAAW,EAAE,CAAC,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAC;IAC9E,MAAM,gBAAgB,GAAG;QACvB,mBAAmB;QACnB,iBAAiB;QACjB,wBAAwB;QACxB,oBAAoB;QACpB,wBAAwB;QACxB,oBAAoB;QACpB,gBAAgB;QAChB,gBAAgB,CAAC,QAAQ,EAAE;KAC5B,CAAC;IACF,MAAM,cAAc,GAAG,IAAA,oBAAY,EAAC,gBAAgB,EAAE,CAAC,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAC;IACxF,MAAM,IAAI,GAAG,IAAA,oBAAY,EAAC,CAAC,SAAS,EAAE,cAAc,CAAC,EAAE,CAAC,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACzG,MAAM,OAAO,GAAG;QACd,OAAO;QACP,SAAS;QACT,QAAQ,EAAE,WAAW;QACrB,KAAK,EAAE,EAAE;QACT,kBAAkB,EAAE,eAAe;QACnC,MAAM,EAAE,MAAM;QACd,eAAe,EAAE,SAAS;QAC1B,eAAe,EAAE;YACf,OAAO,EAAE,iBAAiB;YAC1B,QAAQ,EAAE,gBAAgB;SAC3B;KACF,CAAC;IAEF,OAAO,MAAM,iBAAiB,CAAC,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;AAC9D,CAAC,CAAA,CAAC;AAjEW,QAAA,uBAAuB,2BAiElC;AAaK,MAAM,wBAAwB,GAAG,CAAO,CAAiB,EAAmB,EAAE;IACnF,MAAM,EAAE,iBAAiB,EAAE,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1G,MAAM,MAAM,GAAG,CAAC,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC;IAC1F,MAAM,IAAI,GAAG,IAAA,oBAAY,EAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAClD,MAAM,OAAO,GAAG;QACd,OAAO;QACP,SAAS;QACT,QAAQ,EAAE,MAAM;QAChB,KAAK,EAAE,EAAE;QACT,kBAAkB,EAAE,UAAU;QAC9B,MAAM,EAAE,EAAE;QACV,eAAe,EAAE,SAAS;QAC1B,eAAe,EAAE;YACf,OAAO;YACP,QAAQ,EAAE,MAAM;SACjB;KACF,CAAC;IAEF,OAAO,MAAM,iBAAiB,CAAC,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;AAC9D,CAAC,CAAA,CAAC;AAnBW,QAAA,wBAAwB,4BAmBnC;AAEK,MAAM,qBAAqB,GAAG,CACnC,CAKC,EACgB,EAAE;IACnB,MAAM,EACJ,iBAAiB,EACjB,iBAAiB,EACjB,KAAK,EACL,OAAO,EACP,SAAS,EACT,eAAe,EACf,eAAe,EACf,WAAW,EACX,gBAAgB,EAChB,iBAAiB,EACjB,mBAAmB,EACnB,oBAAoB,EACpB,wBAAwB,EACxB,oBAAoB,EACpB,wBAAwB,EACxB,kBAAkB,EAClB,mBAAmB,EACnB,qBAAqB,GACtB,GAAG,CAAC,CAAC;IACN,MAAM,MAAM,GAAG;QACb,KAAK;QACL,MAAM;QACN,QAAQ;QACR,OAAO;QACP,OAAO;QACP,eAAe;QACf,OAAO;QACP,eAAe;QACf,WAAW;QACX,mBAAmB;QACnB,iBAAiB;QACjB,wBAAwB;QACxB,oBAAoB;QACpB,wBAAwB;QACxB,oBAAoB;QACpB,gBAAgB;QAChB,qBAAqB;QACrB,kBAAkB;QAClB,mBAAmB;KACpB,CAAC;IAEF,MAAM,UAAU,GAAG,IAAA,oBAAY,EAAC,MAAM,EAAE,iBAAiB,CAAC,YAAY,CAAC,CAAC;IACxE,MAAM,IAAI,GAAG,IAAA,oBAAY,EAAC,CAAC,UAAU,CAAC,EAAE,iBAAiB,CAAC,YAAY,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACxF,MAAM,OAAO,GAAG;QACd,OAAO;QACP,SAAS;QACT,QAAQ,EAAE,WAAW;QACrB,KAAK,EAAE,EAAE;QACT,kBAAkB,EAAE,eAAe;QACnC,MAAM,EAAE,EAAE;QACV,eAAe,EAAE,SAAS;QAC1B,eAAe,EAAE;YACf,OAAO,EAAE,iBAAiB;YAC1B,QAAQ,EAAE,gBAAgB;SAC3B;KACF,CAAC;IAEF,OAAO,MAAM,iBAAiB,CAAC,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;AAC9D,CAAC,CAAA,CAAC;AAnEW,QAAA,qBAAqB,yBAmEhC"}
|
|
@@ -32,6 +32,7 @@ export interface CreateIntent {
|
|
|
32
32
|
export interface CreateLoanIntent {
|
|
33
33
|
amount: string;
|
|
34
34
|
assetId: string;
|
|
35
|
+
assetName: string;
|
|
35
36
|
closeAmount: string;
|
|
36
37
|
closeDate: number;
|
|
37
38
|
counterpartId: string;
|
|
@@ -44,6 +45,7 @@ export interface CreateLoanIntent {
|
|
|
44
45
|
}
|
|
45
46
|
export interface IntentExecution {
|
|
46
47
|
assetId: string;
|
|
48
|
+
assetName: string;
|
|
47
49
|
intentId: string;
|
|
48
50
|
amount: string;
|
|
49
51
|
destinationAccount: SettlementInstructionDestinationAccount;
|
|
@@ -53,6 +55,7 @@ export interface IntentExecution {
|
|
|
53
55
|
}
|
|
54
56
|
export interface LoanIntentExecutionData {
|
|
55
57
|
assetId: string;
|
|
58
|
+
assetName: string;
|
|
56
59
|
executorType: 'borrower' | 'lender';
|
|
57
60
|
intentId: string;
|
|
58
61
|
executionId?: string;
|