@owneraio/finp2p-sdk-js 0.28.7 → 0.28.9
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/asset.js +43 -43
- package/lib/core/asset.js.map +1 -1
- package/lib/core/intents/executeIntent.js +59 -71
- package/lib/core/intents/executeIntent.js.map +1 -1
- package/lib/core/intents/executePrivateIntent.js +22 -31
- package/lib/core/intents/executePrivateIntent.js.map +1 -1
- package/lib/core/intents/executeRedemptionIntent.js +5 -0
- package/lib/core/intents/executeRedemptionIntent.js.map +1 -1
- package/lib/core/intents/utils.d.ts +7 -1
- package/lib/core/intents/utils.js +18 -2
- package/lib/core/intents/utils.js.map +1 -1
- package/lib/types/Core/Intents.d.ts +2 -2
- package/package.json +1 -1
package/lib/core/asset.js
CHANGED
|
@@ -14,9 +14,9 @@ const certificate_1 = require("./certificate");
|
|
|
14
14
|
const intents_1 = require("./intents");
|
|
15
15
|
const validators_1 = require("../validators");
|
|
16
16
|
const utils_1 = require("./utils");
|
|
17
|
-
// FinIdAccount import removed — no longer needed after redemption creation simplification
|
|
18
17
|
const normalizeOperationResponse_1 = require("./normalizers/normalizeOperationResponse");
|
|
19
18
|
const helpers_1 = require("./intents/createIntent/helpers");
|
|
19
|
+
const utils_2 = require("./intents/utils");
|
|
20
20
|
/**
|
|
21
21
|
* Get Asset Interface
|
|
22
22
|
* @param req Get Asset Request. See {@link IGetAssetRequest}
|
|
@@ -223,7 +223,7 @@ exports.createAsset = createAsset;
|
|
|
223
223
|
* @returns the promise with intent object. See {@link IntentInterface}
|
|
224
224
|
*/
|
|
225
225
|
const createPrimarySale = (req, options) => __awaiter(void 0, void 0, void 0, function* () {
|
|
226
|
-
var _a, _b, _c
|
|
226
|
+
var _a, _b, _c;
|
|
227
227
|
const { owneraAPI, logger, custodianOrgId, assetId, data } = req;
|
|
228
228
|
// Get asset data (includes issuer and ledgerAssetInfo for CAIP-19)
|
|
229
229
|
const assetData = yield getData({ owneraAPI, logger, assetId });
|
|
@@ -251,18 +251,9 @@ const createPrimarySale = (req, options) => __awaiter(void 0, void 0, void 0, fu
|
|
|
251
251
|
resourceId: assetId,
|
|
252
252
|
},
|
|
253
253
|
};
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
if (settlementAssetIds.length > 0) {
|
|
258
|
-
const settlementAssetsData = yield owneraAPI.query.getAssets({
|
|
259
|
-
filter: { assetIds: settlementAssetIds },
|
|
260
|
-
});
|
|
261
|
-
for (const asset of settlementAssetsData.data) {
|
|
262
|
-
if ((_b = asset.ledgerAssetInfo) === null || _b === void 0 ? void 0 : _b.ledgerIdentifier) {
|
|
263
|
-
settlementAssetLedgerMap.set(asset.id, asset.ledgerAssetInfo.ledgerIdentifier);
|
|
264
|
-
}
|
|
265
|
-
}
|
|
254
|
+
const noSettlement = (0, utils_2.isNoSettlementInCreation)(data.settlementTerm);
|
|
255
|
+
if (noSettlement && data.settlementDestinationAccounts.length > 0) {
|
|
256
|
+
throw new Error('settlementDestinationAccounts must be empty when settlementTerm.type is noSettlement');
|
|
266
257
|
}
|
|
267
258
|
// Build settlement term (v0.28.0: no asset field)
|
|
268
259
|
const buildSettlementTerm = (term) => {
|
|
@@ -276,38 +267,47 @@ const createPrimarySale = (req, options) => __awaiter(void 0, void 0, void 0, fu
|
|
|
276
267
|
return { type: 'fullSettlement', amount: term.amount };
|
|
277
268
|
}
|
|
278
269
|
};
|
|
279
|
-
//
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
270
|
+
// Build settlement array (v0.28.0: combined settlementTerm + settlementInstruction per entry).
|
|
271
|
+
// For noSettlement (FoP) send a single entry with the term only — no instruction, no asset lookup.
|
|
272
|
+
let settlement;
|
|
273
|
+
if (noSettlement) {
|
|
274
|
+
settlement = [{ settlementTerm: buildSettlementTerm(data.settlementTerm) }];
|
|
283
275
|
}
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
|
|
291
|
-
|
|
292
|
-
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
298
|
-
|
|
299
|
-
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
|
|
276
|
+
else {
|
|
277
|
+
const settlementAssetIds = [...new Set(data.settlementDestinationAccounts.map((a) => a.asset.resourceId))];
|
|
278
|
+
const settlementAssetLedgerMap = new Map();
|
|
279
|
+
if (settlementAssetIds.length > 0) {
|
|
280
|
+
const settlementAssetsData = yield owneraAPI.query.getAssets({
|
|
281
|
+
filter: { assetIds: settlementAssetIds },
|
|
282
|
+
});
|
|
283
|
+
for (const asset of settlementAssetsData.data) {
|
|
284
|
+
if ((_b = asset.ledgerAssetInfo) === null || _b === void 0 ? void 0 : _b.ledgerIdentifier) {
|
|
285
|
+
settlementAssetLedgerMap.set(asset.id, asset.ledgerAssetInfo.ledgerIdentifier);
|
|
286
|
+
}
|
|
287
|
+
}
|
|
288
|
+
}
|
|
289
|
+
settlement = data.settlementDestinationAccounts.map((destAccount) => {
|
|
290
|
+
const destAssetLedger = settlementAssetLedgerMap.get(destAccount.asset.resourceId);
|
|
291
|
+
return {
|
|
292
|
+
settlementTerm: buildSettlementTerm(data.settlementTerm),
|
|
293
|
+
settlementInstruction: {
|
|
294
|
+
destinationAccount: {
|
|
295
|
+
account: destAccount.account,
|
|
296
|
+
asset: {
|
|
297
|
+
id: destAccount.asset.resourceId,
|
|
298
|
+
ledgerIdentifier: {
|
|
299
|
+
assetIdentifierType: 'CAIP-19',
|
|
300
|
+
network: (destAssetLedger === null || destAssetLedger === void 0 ? void 0 : destAssetLedger.network) || '',
|
|
301
|
+
standard: (destAssetLedger === null || destAssetLedger === void 0 ? void 0 : destAssetLedger.standard) || '',
|
|
302
|
+
tokenId: (destAssetLedger === null || destAssetLedger === void 0 ? void 0 : destAssetLedger.tokenId) || '',
|
|
303
|
+
resourceId: destAccount.asset.resourceId,
|
|
304
|
+
},
|
|
303
305
|
},
|
|
304
306
|
},
|
|
305
307
|
},
|
|
306
|
-
}
|
|
307
|
-
};
|
|
308
|
-
}
|
|
309
|
-
// Debug: log all amounts for comparison
|
|
310
|
-
logger.info(`🔍 AMOUNTS createPrimarySale: assetTerm.amount="${data.amount}" (type=${typeof data.amount}), settlementTerm=${JSON.stringify(buildSettlementTerm(data.settlementTerm))}, settlement[0].settlementTerm=${JSON.stringify((_c = settlement[0]) === null || _c === void 0 ? void 0 : _c.settlementTerm)}`);
|
|
308
|
+
};
|
|
309
|
+
});
|
|
310
|
+
}
|
|
311
311
|
const createIntentPayload = {
|
|
312
312
|
assetId,
|
|
313
313
|
start: data.start,
|
|
@@ -326,7 +326,7 @@ const createPrimarySale = (req, options) => __awaiter(void 0, void 0, void 0, fu
|
|
|
326
326
|
finId: issuerPK,
|
|
327
327
|
orgId: (0, utils_1.getOrgFromResourceId)(assetId),
|
|
328
328
|
custodian: {
|
|
329
|
-
orgId: (
|
|
329
|
+
orgId: (_c = data.custodianOrgId) !== null && _c !== void 0 ? _c : custodianOrgId,
|
|
330
330
|
},
|
|
331
331
|
},
|
|
332
332
|
asset: primaryAssetIdentifier,
|
package/lib/core/asset.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"asset.js","sourceRoot":"","sources":["../../src/core/asset.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"asset.js","sourceRoot":"","sources":["../../src/core/asset.ts"],"names":[],"mappings":"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"}
|
|
@@ -44,15 +44,20 @@ const executeIntent = (req) => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
44
44
|
const nonce = (0, utils_1.generateNonce)().toString('hex');
|
|
45
45
|
// Build CAIP-19 asset identifier for the primary asset
|
|
46
46
|
const primaryAssetIdentifier = buildCaip19Identifier((_a = ossAsset.ledgerAssetInfo) === null || _a === void 0 ? void 0 : _a.ledgerIdentifier, data.assetId);
|
|
47
|
-
|
|
48
|
-
|
|
47
|
+
const isFreeOfPayment = (0, utils_2.isFreeOfPaymentTerm)(intentDetails.settlementTerm);
|
|
48
|
+
// Free-of-Payment is only supported for primarySale. Buying/selling intents must have a settlement leg.
|
|
49
|
+
if (isFreeOfPayment && intent.type !== 'primarySale') {
|
|
50
|
+
throw new Error(`Free-of-Payment execution is only supported for primarySale intents (got ${intent.type} ${data.intentId})`);
|
|
51
|
+
}
|
|
52
|
+
// Get CAIP-19 ledger identifier for the settlement asset (skip when FoP)
|
|
53
|
+
const settlementAssetResourceId = isFreeOfPayment ? undefined : (_c = (_b = data.sourceAccount) === null || _b === void 0 ? void 0 : _b.asset) === null || _c === void 0 ? void 0 : _c.resourceId;
|
|
49
54
|
let settlementLedgerIdentifier;
|
|
50
55
|
if (settlementAssetResourceId) {
|
|
51
56
|
try {
|
|
52
57
|
const settlementAssetsData = yield owneraAPI.query.getAssets({
|
|
53
58
|
filter: { assetIds: [settlementAssetResourceId] },
|
|
54
59
|
});
|
|
55
|
-
settlementLedgerIdentifier = (
|
|
60
|
+
settlementLedgerIdentifier = (_e = (_d = settlementAssetsData.data[0]) === null || _d === void 0 ? void 0 : _d.ledgerAssetInfo) === null || _e === void 0 ? void 0 : _e.ledgerIdentifier;
|
|
56
61
|
}
|
|
57
62
|
catch (_p) {
|
|
58
63
|
logger.debug('Failed to get CAIP-19 for settlement asset, using defaults', { settlementAssetResourceId });
|
|
@@ -70,67 +75,63 @@ const executeIntent = (req) => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
70
75
|
return undefined;
|
|
71
76
|
};
|
|
72
77
|
const intentAccount = getIntentAccount();
|
|
73
|
-
const dstAccountPK = intent.type === 'buyingIntent' ? ((
|
|
74
|
-
const custodianOrgIdFromIntent = (
|
|
78
|
+
const dstAccountPK = intent.type === 'buyingIntent' ? ((_f = intentAccount === null || intentAccount === void 0 ? void 0 : intentAccount.finId) !== null && _f !== void 0 ? _f : userPublicKey) : userPublicKey;
|
|
79
|
+
const custodianOrgIdFromIntent = (_h = (_g = intentAccount === null || intentAccount === void 0 ? void 0 : intentAccount.custodian) === null || _g === void 0 ? void 0 : _g.orgId) !== null && _h !== void 0 ? _h : '';
|
|
75
80
|
// Build destination asset account (primary asset, buyer's account)
|
|
76
81
|
const destinationAssetAccount = (0, helpers_1.buildFinp2pAssetAccount)({
|
|
77
82
|
finId: dstAccountPK,
|
|
78
83
|
orgId: (0, utils_1.getOrgFromResourceId)(data.assetId),
|
|
79
84
|
custodian: { orgId: custodianOrgIdFromIntent },
|
|
80
85
|
}, primaryAssetIdentifier);
|
|
81
|
-
// Build settlement instruction accounts with CAIP-19
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
if (
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
if (buyingSettlementAccount) {
|
|
89
|
-
settlementSourceAccount.account = {
|
|
90
|
-
type: 'finId',
|
|
91
|
-
finId: (_j = buyingSettlementAccount.finId) !== null && _j !== void 0 ? _j : '',
|
|
92
|
-
orgId: (_k = buyingSettlementAccount.orgId) !== null && _k !== void 0 ? _k : '',
|
|
93
|
-
custodian: { orgId: custodianOrgIdFromIntent },
|
|
94
|
-
};
|
|
86
|
+
// Build settlement instruction accounts with CAIP-19 (skip when FoP — no settlement leg).
|
|
87
|
+
// `instruction` accounts carry a CAIP-19 asset identifier that doesn't match the strict
|
|
88
|
+
// SettlementInstruction*Account.asset (FinP2PAsset) shape — same `as any` bridge used elsewhere.
|
|
89
|
+
let settlement;
|
|
90
|
+
if (!isFreeOfPayment) {
|
|
91
|
+
if (!data.sourceAccount || !data.destinationAccount) {
|
|
92
|
+
throw new Error(`Intent ${data.intentId} requires settlement (non Free-of-Payment) but execution data is missing sourceAccount/destinationAccount`);
|
|
95
93
|
}
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
94
|
+
const settlementSourceAccount = (0, helpers_1.buildFinp2pAssetAccount)(data.sourceAccount.account, settlementAssetIdentifier);
|
|
95
|
+
const settlementDestAccount = (0, helpers_1.buildFinp2pAssetAccount)(data.destinationAccount.account, settlementAssetIdentifier);
|
|
96
|
+
// For buying intents, override the settlement source with the buying intent's settlement account
|
|
97
|
+
if (intent.type === 'buyingIntent') {
|
|
98
|
+
const buyingIntent = intent.intent;
|
|
99
|
+
const buyingSettlementAccount = (_j = buyingIntent.settlementInstruction.account) === null || _j === void 0 ? void 0 : _j.account;
|
|
100
|
+
if (buyingSettlementAccount) {
|
|
101
|
+
settlementSourceAccount.account = {
|
|
102
|
+
type: 'finId',
|
|
103
|
+
finId: (_k = buyingSettlementAccount.finId) !== null && _k !== void 0 ? _k : '',
|
|
104
|
+
orgId: (_l = buyingSettlementAccount.orgId) !== null && _l !== void 0 ? _l : '',
|
|
105
|
+
custodian: { orgId: custodianOrgIdFromIntent },
|
|
106
|
+
};
|
|
107
|
+
}
|
|
106
108
|
}
|
|
107
|
-
|
|
109
|
+
const settlementDetails = intentDetails.settlementTerm.details;
|
|
110
|
+
const settlementTermAmount = (0, utils_2.getSettlementTermAmount)(intentDetails);
|
|
111
|
+
let amount;
|
|
112
|
+
if ('amount' in settlementDetails) {
|
|
113
|
+
amount = settlementDetails.amount;
|
|
114
|
+
}
|
|
115
|
+
else {
|
|
116
|
+
if (settlementTermAmount === undefined) {
|
|
117
|
+
throw new Error(`Intent has no settlementTerm; cannot derive amount. Raw intent: ${JSON.stringify(intentDetails).slice(0, 500)}`);
|
|
118
|
+
}
|
|
119
|
+
amount = (0, utils_2.validateSettlementTermAmount)(settlementTermAmount, data.amount);
|
|
120
|
+
}
|
|
121
|
+
settlement = {
|
|
122
|
+
term: { amount },
|
|
123
|
+
instruction: {
|
|
124
|
+
sourceAccount: settlementSourceAccount,
|
|
125
|
+
destinationAccount: settlementDestAccount,
|
|
126
|
+
},
|
|
127
|
+
};
|
|
108
128
|
}
|
|
109
|
-
const settlement = {
|
|
110
|
-
term: {
|
|
111
|
-
amount,
|
|
112
|
-
},
|
|
113
|
-
instruction: {
|
|
114
|
-
sourceAccount: settlementSourceAccount,
|
|
115
|
-
destinationAccount: settlementDestAccount,
|
|
116
|
-
},
|
|
117
|
-
};
|
|
118
129
|
let executionIntent;
|
|
119
130
|
if (intent.type === 'primarySale') {
|
|
120
|
-
// Debug: log all amounts for comparison
|
|
121
|
-
const storedAssetAmount = (_l = intentDetails.assetTerm) === null || _l === void 0 ? void 0 : _l.amount;
|
|
122
|
-
const storedSettlementTerm = JSON.stringify(intentDetails.settlementTerm);
|
|
123
|
-
logger.debug(`🔍 AMOUNTS executeIntent(primarySale): stored.assetTerm.amount="${storedAssetAmount}" (type=${typeof storedAssetAmount}), stored.settlementTerm=${storedSettlementTerm}`);
|
|
124
|
-
logger.debug(`🔍 AMOUNTS executeIntent(primarySale): exec.assetTerm.amount="${data.amount}" (type=${typeof data.amount}), exec.settlement.term.amount="${amount}" (type=${typeof amount}), settlementTermAmount="${settlementTermAmount}"`);
|
|
125
131
|
// primarySaleExecution uses issuingAsset: { assetInstruction, assetTerm }
|
|
126
132
|
// sourceAccount has only asset (no account) — the issuer's asset
|
|
127
133
|
// destinationAccount has both account + asset — the buyer's account
|
|
128
|
-
executionIntent = {
|
|
129
|
-
type: 'primarySaleExecution',
|
|
130
|
-
nonce,
|
|
131
|
-
issuer: ossAsset.issuerId,
|
|
132
|
-
buyer: userId,
|
|
133
|
-
asset: {
|
|
134
|
+
executionIntent = Object.assign({ type: 'primarySaleExecution', nonce, issuer: ossAsset.issuerId, buyer: userId, asset: {
|
|
134
135
|
assetInstruction: {
|
|
135
136
|
sourceAccount: {
|
|
136
137
|
asset: primaryAssetIdentifier,
|
|
@@ -140,11 +141,12 @@ const executeIntent = (req) => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
140
141
|
assetTerm: {
|
|
141
142
|
amount: data.amount,
|
|
142
143
|
},
|
|
143
|
-
},
|
|
144
|
-
settlement,
|
|
145
|
-
};
|
|
144
|
+
} }, (settlement ? { settlement } : {}));
|
|
146
145
|
}
|
|
147
146
|
if (intent.type === 'buyingIntent') {
|
|
147
|
+
if (!data.sourceAccount || !data.destinationAccount) {
|
|
148
|
+
throw new Error(`buyingIntent ${data.intentId} execution requires sourceAccount and destinationAccount (Free-of-Payment is only supported for primarySale)`);
|
|
149
|
+
}
|
|
148
150
|
// Source asset account (seller transferring the asset)
|
|
149
151
|
const sourceAssetAccount = (0, helpers_1.buildFinp2pAssetAccount)({
|
|
150
152
|
finId: userPublicKey,
|
|
@@ -152,11 +154,7 @@ const executeIntent = (req) => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
152
154
|
custodian: { orgId: data.sourceAccount.account.custodian.orgId },
|
|
153
155
|
}, primaryAssetIdentifier);
|
|
154
156
|
// buyingIntentExecution uses sourceDestinationIntentAsset: { term, instruction }
|
|
155
|
-
executionIntent = {
|
|
156
|
-
type: 'buyingIntentExecution',
|
|
157
|
-
nonce,
|
|
158
|
-
seller: userId,
|
|
159
|
-
asset: {
|
|
157
|
+
executionIntent = Object.assign({ type: 'buyingIntentExecution', nonce, seller: userId, asset: {
|
|
160
158
|
term: {
|
|
161
159
|
amount: data.amount,
|
|
162
160
|
},
|
|
@@ -164,9 +162,7 @@ const executeIntent = (req) => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
164
162
|
sourceAccount: sourceAssetAccount,
|
|
165
163
|
destinationAccount: destinationAssetAccount,
|
|
166
164
|
},
|
|
167
|
-
},
|
|
168
|
-
settlement,
|
|
169
|
-
};
|
|
165
|
+
} }, (settlement ? { settlement } : {}));
|
|
170
166
|
}
|
|
171
167
|
if (intent.type === 'sellingIntent') {
|
|
172
168
|
// Source asset account (asset being transferred from the seller)
|
|
@@ -176,11 +172,7 @@ const executeIntent = (req) => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
176
172
|
custodian: { orgId: custodianOrgIdFromIntent },
|
|
177
173
|
}, primaryAssetIdentifier);
|
|
178
174
|
// sellingIntentExecution uses sourceDestinationIntentAsset: { term, instruction }
|
|
179
|
-
executionIntent = {
|
|
180
|
-
type: 'sellingIntentExecution',
|
|
181
|
-
nonce,
|
|
182
|
-
buyer: userId,
|
|
183
|
-
asset: {
|
|
175
|
+
executionIntent = Object.assign({ type: 'sellingIntentExecution', nonce, buyer: userId, asset: {
|
|
184
176
|
term: {
|
|
185
177
|
amount: data.amount,
|
|
186
178
|
},
|
|
@@ -188,13 +180,9 @@ const executeIntent = (req) => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
188
180
|
sourceAccount: sourceAssetAccount,
|
|
189
181
|
destinationAccount: destinationAssetAccount,
|
|
190
182
|
},
|
|
191
|
-
},
|
|
192
|
-
settlement,
|
|
193
|
-
};
|
|
183
|
+
} }, (settlement ? { settlement } : {}));
|
|
194
184
|
}
|
|
195
185
|
const request = Object.assign({ intentId: data.intentId, user: userId, intent: executionIntent, executionId: data.executionId }, (((_o = data.observers) === null || _o === void 0 ? void 0 : _o.length) ? { observers: data.observers } : {}));
|
|
196
|
-
// Debug: dump full execution payload for platform team
|
|
197
|
-
logger.debug(`🔍 FULL_PAYLOAD executeIntent: ${JSON.stringify(request)}`);
|
|
198
186
|
const execution = yield (0, tokens_1.executeTokenIntent)({
|
|
199
187
|
owneraAPI,
|
|
200
188
|
logger,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executeIntent.js","sourceRoot":"","sources":["../../../src/core/intents/executeIntent.ts"],"names":[],"mappings":";;;;;;;;;;;;AAYA,oCAA+D;AAC/D,
|
|
1
|
+
{"version":3,"file":"executeIntent.js","sourceRoot":"","sources":["../../../src/core/intents/executeIntent.ts"],"names":[],"mappings":"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"}
|
|
@@ -111,46 +111,37 @@ const executePrivateIntent = (req) => __awaiter(void 0, void 0, void 0, function
|
|
|
111
111
|
else {
|
|
112
112
|
settlementAssetIdentifier = (0, helpers_1.buildCaip19Identifier)(undefined, '');
|
|
113
113
|
}
|
|
114
|
-
const settlementInstruction = {
|
|
115
|
-
destinationAccount: Object.assign(Object.assign({}, data.destinationAccount), { asset: settlementAssetIdentifier }),
|
|
116
|
-
sourceAccount: Object.assign(Object.assign({}, data.sourceAccount), { asset: settlementAssetIdentifier }),
|
|
117
|
-
};
|
|
118
114
|
const settlementTermDetails = (_t = intentDetails.settlementTerm) === null || _t === void 0 ? void 0 : _t.details;
|
|
119
115
|
const isPartialSettlement = settlementTermDetails ? 'unitValue' in settlementTermDetails : false;
|
|
120
116
|
const isFullSettlement = settlementTermDetails ? 'amount' in settlementTermDetails : false;
|
|
121
117
|
const noSettlementTerm = !isPartialSettlement && !isFullSettlement;
|
|
122
|
-
// Calculate settlement amount for partial settlement
|
|
123
|
-
let amount = '';
|
|
124
|
-
if (isPartialSettlement) {
|
|
125
|
-
amount = (Number(settlementTermDetails.unitValue) * Number(data.amount)).toString();
|
|
126
|
-
}
|
|
127
|
-
else if (isFullSettlement) {
|
|
128
|
-
amount = settlementTermDetails.amount;
|
|
129
|
-
}
|
|
130
|
-
// if DvD private offer, align orgId to the org where the asset exists in the settlement accounts
|
|
131
|
-
if (isAssetSettlement && !noSettlementTerm && settlementAccountAsset) {
|
|
132
|
-
const settlementAssetOrgId = (0, utils_1.getOrgFromResourceId)(settlementAccountAsset.resourceId);
|
|
133
|
-
{
|
|
134
|
-
settlementInstruction.destinationAccount.account.orgId = settlementAssetOrgId;
|
|
135
|
-
}
|
|
136
|
-
settlementInstruction.sourceAccount.account.orgId = settlementAssetOrgId;
|
|
137
|
-
}
|
|
138
118
|
// Build settlement based on type:
|
|
139
119
|
// - Partial: term with calculated amount
|
|
140
120
|
// - Full: term with type discriminator + stored amount (must match creation's settlementTerm)
|
|
141
|
-
// - No settlement: omit entirely
|
|
121
|
+
// - No settlement: omit entirely (FoP — no need for source/destination accounts)
|
|
142
122
|
let settlement;
|
|
143
|
-
if (
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
settlement = {
|
|
151
|
-
term: { type: 'fullSettlement', amount },
|
|
152
|
-
instruction: settlementInstruction,
|
|
123
|
+
if (!noSettlementTerm) {
|
|
124
|
+
if (!data.sourceAccount || !data.destinationAccount) {
|
|
125
|
+
throw new Error(`privateOfferIntent ${data.intentId} requires sourceAccount and destinationAccount when settlementTerm is present`);
|
|
126
|
+
}
|
|
127
|
+
const settlementInstruction = {
|
|
128
|
+
destinationAccount: Object.assign(Object.assign({}, data.destinationAccount), { asset: settlementAssetIdentifier }),
|
|
129
|
+
sourceAccount: Object.assign(Object.assign({}, data.sourceAccount), { asset: settlementAssetIdentifier }),
|
|
153
130
|
};
|
|
131
|
+
// if DvD private offer, align orgId to the org where the asset exists in the settlement accounts
|
|
132
|
+
if (isAssetSettlement && settlementAccountAsset) {
|
|
133
|
+
const settlementAssetOrgId = (0, utils_1.getOrgFromResourceId)(settlementAccountAsset.resourceId);
|
|
134
|
+
settlementInstruction.destinationAccount.account.orgId = settlementAssetOrgId;
|
|
135
|
+
settlementInstruction.sourceAccount.account.orgId = settlementAssetOrgId;
|
|
136
|
+
}
|
|
137
|
+
if (isPartialSettlement) {
|
|
138
|
+
const amount = (Number(settlementTermDetails.unitValue) * Number(data.amount)).toString();
|
|
139
|
+
settlement = { term: { amount }, instruction: settlementInstruction };
|
|
140
|
+
}
|
|
141
|
+
else if (isFullSettlement) {
|
|
142
|
+
const amount = settlementTermDetails.amount;
|
|
143
|
+
settlement = { term: { type: 'fullSettlement', amount }, instruction: settlementInstruction };
|
|
144
|
+
}
|
|
154
145
|
}
|
|
155
146
|
const privateIntent = Object.assign(Object.assign({ asset: {
|
|
156
147
|
instruction: assetInstruction,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executePrivateIntent.js","sourceRoot":"","sources":["../../../src/core/intents/executePrivateIntent.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"executePrivateIntent.js","sourceRoot":"","sources":["../../../src/core/intents/executePrivateIntent.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,6 +26,11 @@ const helpers_1 = require("./createIntent/helpers");
|
|
|
26
26
|
const executeRedemptionIntent = (req) => __awaiter(void 0, void 0, void 0, function* () {
|
|
27
27
|
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
|
|
28
28
|
const { owneraAPI, data, userId, userPublicKey, idempotency, logger } = req;
|
|
29
|
+
// Redemption always settles — both accounts are required. Guard up front so the rest of the function
|
|
30
|
+
// can treat them as non-null. (IntentExecution.{source,destination}Account are optional only for FoP primarySale.)
|
|
31
|
+
if (!data.sourceAccount || !data.destinationAccount) {
|
|
32
|
+
throw new Error(`redemptionIntent ${data.intentId} execution requires sourceAccount and destinationAccount`);
|
|
33
|
+
}
|
|
29
34
|
const { assetId: sourceResourceId } = data;
|
|
30
35
|
const sourceResourceOrgId = (0, utils_1.getOrgFromResourceId)(sourceResourceId);
|
|
31
36
|
const ossAsset = (yield owneraAPI.query.getAssets({ filter: { assetIds: [sourceResourceId] } })).data[0];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executeRedemptionIntent.js","sourceRoot":"","sources":["../../../src/core/intents/executeRedemptionIntent.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"executeRedemptionIntent.js","sourceRoot":"","sources":["../../../src/core/intents/executeRedemptionIntent.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Asset, BuyingIntentSchemaOss, FinP2PAsset, IntentTypeSchemaOss, AssetDetailsSchemaOss, FullSettlementOss, PartialSettlementOss, SellingIntentSchemaOss, IntentCreationSettlementTerm } from '../../types';
|
|
2
|
-
import { PrimarySaleSchemaOss, LoanIntentSchemaOss } from '../../types/Oss/OssSchemas';
|
|
2
|
+
import { PrimarySaleSchemaOss, LoanIntentSchemaOss, SettlementTermOss } from '../../types/Oss/OssSchemas';
|
|
3
3
|
export declare const getSettlementInstructionSourceAssetFromBuyingIntent: (intent: BuyingIntentSchemaOss) => FinP2PAsset | undefined;
|
|
4
4
|
export declare const getSettlementTermAsset: (asset: AssetDetailsSchemaOss) => {
|
|
5
5
|
assetIdentifierType: "finp2p";
|
|
@@ -11,6 +11,12 @@ export declare const getSettlementDetails: (intentDetails: PrimarySaleSchemaOss
|
|
|
11
11
|
};
|
|
12
12
|
export declare const getSettlementTermAmount: (intentDetails: PrimarySaleSchemaOss | BuyingIntentSchemaOss | SellingIntentSchemaOss | LoanIntentSchemaOss) => string | undefined;
|
|
13
13
|
export declare const isNoSettlementInCreation: (settlement: IntentCreationSettlementTerm) => boolean;
|
|
14
|
+
/**
|
|
15
|
+
* Detect Free-of-Payment from an OSS-stored intent settlementTerm.
|
|
16
|
+
* GraphQL may return: null/undefined, an object with empty/null details,
|
|
17
|
+
* details: { __typename: "NoSettlement" }, or details with neither unitValue nor amount.
|
|
18
|
+
*/
|
|
19
|
+
export declare const isFreeOfPaymentTerm: (settlementTerm: SettlementTermOss | null | undefined) => boolean;
|
|
14
20
|
export declare const validateSettlementTermAmount: (settlementTermAmount: string, executionAmount: string) => string;
|
|
15
21
|
export declare const INTENT_TYPES: {
|
|
16
22
|
[key: string]: IntentTypeSchemaOss;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getAssetIntentOrThrowError = exports.INTENT_TYPES = exports.validateSettlementTermAmount = exports.isNoSettlementInCreation = exports.getSettlementTermAmount = exports.getSettlementDetails = exports.getSettlementTermAsset = exports.getSettlementInstructionSourceAssetFromBuyingIntent = void 0;
|
|
3
|
+
exports.getAssetIntentOrThrowError = exports.INTENT_TYPES = exports.validateSettlementTermAmount = exports.isFreeOfPaymentTerm = exports.isNoSettlementInCreation = exports.getSettlementTermAmount = exports.getSettlementDetails = exports.getSettlementTermAsset = exports.getSettlementInstructionSourceAssetFromBuyingIntent = void 0;
|
|
4
4
|
const getSettlementInstructionSourceAssetFromBuyingIntent = (intent) => {
|
|
5
5
|
var _a;
|
|
6
6
|
const asset = (_a = intent.settlementInstruction.account) === null || _a === void 0 ? void 0 : _a.asset;
|
|
@@ -40,9 +40,25 @@ const isNoSettlementInCreation = (settlement) => {
|
|
|
40
40
|
return (settlement.type === 'noSettlement' &&
|
|
41
41
|
!('asset' in settlement) &&
|
|
42
42
|
!('amount' in settlement) &&
|
|
43
|
-
!('
|
|
43
|
+
!('unitValue' in settlement));
|
|
44
44
|
};
|
|
45
45
|
exports.isNoSettlementInCreation = isNoSettlementInCreation;
|
|
46
|
+
/**
|
|
47
|
+
* Detect Free-of-Payment from an OSS-stored intent settlementTerm.
|
|
48
|
+
* GraphQL may return: null/undefined, an object with empty/null details,
|
|
49
|
+
* details: { __typename: "NoSettlement" }, or details with neither unitValue nor amount.
|
|
50
|
+
*/
|
|
51
|
+
const isFreeOfPaymentTerm = (settlementTerm) => {
|
|
52
|
+
if (!settlementTerm)
|
|
53
|
+
return true;
|
|
54
|
+
const details = settlementTerm.details;
|
|
55
|
+
if (!details)
|
|
56
|
+
return true;
|
|
57
|
+
if (details.__typename === 'NoSettlement')
|
|
58
|
+
return true;
|
|
59
|
+
return !('unitValue' in details) && !('amount' in details);
|
|
60
|
+
};
|
|
61
|
+
exports.isFreeOfPaymentTerm = isFreeOfPaymentTerm;
|
|
46
62
|
const validateSettlementTermAmount = (settlementTermAmount, executionAmount) => {
|
|
47
63
|
const amountNum = Number(settlementTermAmount) * Number(executionAmount);
|
|
48
64
|
const amount = amountNum.toString();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/core/intents/utils.ts"],"names":[],"mappings":";;;AAaO,MAAM,mDAAmD,GAAG,CACjE,MAA6B,EACJ,EAAE;;IAC3B,MAAM,KAAK,GAAG,MAAA,MAAM,CAAC,qBAAqB,CAAC,OAAO,0CAAE,KAAK,CAAC;IAC1D,IAAI,CAAC,KAAK;QAAE,OAAO,SAAS,CAAC;IAC7B,OAAO,EAAE,mBAAmB,EAAE,QAAQ,EAAE,UAAU,EAAE,KAAK,CAAC,UAAU,EAAE,CAAC;AACzE,CAAC,CAAC;AANW,QAAA,mDAAmD,uDAM9D;AAEK,MAAM,sBAAsB,GAAG,CAAC,KAA4B,EAAE,EAAE,CAAC,CAAC;IACvE,mBAAmB,EAAE,QAAiB;IACtC,UAAU,EAAE,KAAK,CAAC,UAAU;CAC7B,CAAC,CAAC;AAHU,QAAA,sBAAsB,0BAGhC;AAEI,MAAM,oBAAoB,GAAG,CAClC,aAA0G,EAI1G,EAAE;IACF,MAAM,IAAI,GAAG,aAAa,CAAC,cAAc,CAAC;IAC1C,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO,EAAE,qBAAqB,EAAE,SAAS,EAAE,wBAAwB,EAAE,SAAS,EAAE,CAAC;IACnF,CAAC;IACD,MAAM,qBAAqB,GAAI,IAA0B,CAAC,OAAO,CAAC;IAClE,MAAM,wBAAwB,GAAI,IAA6B,CAAC,OAAO,CAAC;IAExE,OAAO;QACL,qBAAqB;QACrB,wBAAwB;KACzB,CAAC;AACJ,CAAC,CAAC;AAjBW,QAAA,oBAAoB,wBAiB/B;AAEK,MAAM,uBAAuB,GAAG,CACrC,aAA0G,EACtF,EAAE;IACtB,MAAM,EAAE,qBAAqB,EAAE,wBAAwB,EAAE,GAAG,IAAA,4BAAoB,EAAC,aAAa,CAAC,CAAC;IAChG,IAAI,qBAAqB,aAArB,qBAAqB,uBAArB,qBAAqB,CAAE,MAAM;QAAE,OAAO,qBAAqB,CAAC,MAAM,CAAC;IACvE,IAAI,wBAAwB,aAAxB,wBAAwB,uBAAxB,wBAAwB,CAAE,SAAS;QAAE,OAAO,wBAAwB,CAAC,SAAS,CAAC;IACnF,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AAPW,QAAA,uBAAuB,2BAOlC;AAEK,MAAM,wBAAwB,GAAG,CAAC,UAAwC,EAAW,EAAE;IAC5F,OAAO,CACL,UAAU,CAAC,IAAI,KAAK,cAAc;QAClC,CAAC,CAAC,OAAO,IAAI,UAAU,CAAC;QACxB,CAAC,CAAC,QAAQ,IAAI,UAAU,CAAC;QACzB,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/core/intents/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -68,8 +68,8 @@ export interface IntentExecution {
|
|
|
68
68
|
assetName?: string;
|
|
69
69
|
intentId: string;
|
|
70
70
|
amount: string;
|
|
71
|
-
destinationAccount
|
|
72
|
-
sourceAccount
|
|
71
|
+
destinationAccount?: SettlementInstructionDestinationAccount;
|
|
72
|
+
sourceAccount?: SettlementInstructionSourceAccount;
|
|
73
73
|
executionId?: string;
|
|
74
74
|
idempotency?: string;
|
|
75
75
|
sourceCustodianOrgId?: string;
|