@owneraio/finp2p-sdk-js 0.20.6 → 0.20.7
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.
|
@@ -23,9 +23,9 @@ const user_1 = require("../user");
|
|
|
23
23
|
*/
|
|
24
24
|
const executeRedemptionIntent = (req) => __awaiter(void 0, void 0, void 0, function* () {
|
|
25
25
|
const { owneraAPI, data, userId, userPublicKey, idempotency, logger } = req;
|
|
26
|
-
const { assetId:
|
|
27
|
-
const
|
|
28
|
-
const ossAsset = (yield owneraAPI.query.getAssets({ filter: { assetIds: [
|
|
26
|
+
const { assetId: sourceResourceId } = data;
|
|
27
|
+
const sourceResourceOrgId = (0, utils_1.getOrgFromResourceId)(sourceResourceId);
|
|
28
|
+
const ossAsset = (yield owneraAPI.query.getAssets({ filter: { assetIds: [sourceResourceId] } })).data[0];
|
|
29
29
|
const issuerId = ossAsset.issuerId;
|
|
30
30
|
const intent = ossAsset.intents.find((i) => i.id === data.intentId);
|
|
31
31
|
if (!intent) {
|
|
@@ -37,6 +37,8 @@ const executeRedemptionIntent = (req) => __awaiter(void 0, void 0, void 0, funct
|
|
|
37
37
|
};
|
|
38
38
|
}
|
|
39
39
|
const intentDetails = intent.intent;
|
|
40
|
+
const destinationResourceId = intentDetails.assetTerm.asset.resourceId;
|
|
41
|
+
const destinationResourceOrgId = (0, utils_1.getOrgFromResourceId)(destinationResourceId);
|
|
40
42
|
const nonce = (0, utils_1.generateNonce)().toString('hex');
|
|
41
43
|
const issuerPublicKey = yield (0, user_1.getPublicKey)({ owneraAPI, logger, userId: issuerId });
|
|
42
44
|
const custodianOrgIdFromIntent = intentDetails.redeemAssetInstruction.account.identifier
|
|
@@ -46,12 +48,12 @@ const executeRedemptionIntent = (req) => __awaiter(void 0, void 0, void 0, funct
|
|
|
46
48
|
account: {
|
|
47
49
|
type: 'finId',
|
|
48
50
|
finId: issuerPublicKey,
|
|
49
|
-
orgId:
|
|
51
|
+
orgId: destinationResourceOrgId,
|
|
50
52
|
custodian: {
|
|
51
53
|
orgId: custodianOrgIdFromIntent,
|
|
52
54
|
},
|
|
53
55
|
},
|
|
54
|
-
asset: { type: 'finp2p', resourceId },
|
|
56
|
+
asset: { type: 'finp2p', resourceId: destinationResourceId },
|
|
55
57
|
},
|
|
56
58
|
};
|
|
57
59
|
const settlementInstruction = {
|
|
@@ -61,7 +63,7 @@ const executeRedemptionIntent = (req) => __awaiter(void 0, void 0, void 0, funct
|
|
|
61
63
|
assetInstruction.sourceAccount = {
|
|
62
64
|
account: {
|
|
63
65
|
type: 'finId',
|
|
64
|
-
orgId:
|
|
66
|
+
orgId: sourceResourceOrgId,
|
|
65
67
|
finId: userPublicKey,
|
|
66
68
|
custodian: {
|
|
67
69
|
orgId: custodianOrgIdFromIntent,
|
|
@@ -69,7 +71,7 @@ const executeRedemptionIntent = (req) => __awaiter(void 0, void 0, void 0, funct
|
|
|
69
71
|
},
|
|
70
72
|
asset: {
|
|
71
73
|
type: 'finp2p',
|
|
72
|
-
resourceId,
|
|
74
|
+
resourceId: sourceResourceId,
|
|
73
75
|
},
|
|
74
76
|
};
|
|
75
77
|
const settlement = {
|
|
@@ -82,7 +84,7 @@ const executeRedemptionIntent = (req) => __awaiter(void 0, void 0, void 0, funct
|
|
|
82
84
|
const redemptionIntent = {
|
|
83
85
|
asset: {
|
|
84
86
|
instruction: assetInstruction,
|
|
85
|
-
term: { asset: { type: 'finp2p', resourceId }, amount: data.amount },
|
|
87
|
+
term: { asset: { type: 'finp2p', resourceId: sourceResourceId }, amount: data.amount },
|
|
86
88
|
},
|
|
87
89
|
seller: userId,
|
|
88
90
|
issuer: issuerId,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executeRedemptionIntent.js","sourceRoot":"","sources":["../../../src/core/intents/executeRedemptionIntent.ts"],"names":[],"mappings":";;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"executeRedemptionIntent.js","sourceRoot":"","sources":["../../../src/core/intents/executeRedemptionIntent.ts"],"names":[],"mappings":"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"}
|