@owneraio/finp2p-sdk-js 0.28.25 → 0.28.41
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/README.md +71 -1
- package/lib/OwneraAPI/__tests__/apiErrorShape.test.d.ts +1 -0
- package/lib/OwneraAPI/__tests__/apiErrorShape.test.js +264 -0
- package/lib/OwneraAPI/__tests__/apiErrorShape.test.js.map +1 -0
- package/lib/OwneraAPI/finp2p-node-api/__tests__/approvalsConfig.test.js +5 -12
- package/lib/OwneraAPI/finp2p-node-api/__tests__/approvalsConfig.test.js.map +1 -1
- package/lib/OwneraAPI/finp2p-node-api/__tests__/createIntentMetadata.test.d.ts +1 -0
- package/lib/OwneraAPI/finp2p-node-api/__tests__/createIntentMetadata.test.js +56 -0
- package/lib/OwneraAPI/finp2p-node-api/__tests__/createIntentMetadata.test.js.map +1 -0
- package/lib/OwneraAPI/finp2p-node-api/__tests__/dryRunExecute.test.d.ts +1 -0
- package/lib/OwneraAPI/finp2p-node-api/__tests__/dryRunExecute.test.js +75 -0
- package/lib/OwneraAPI/finp2p-node-api/__tests__/dryRunExecute.test.js.map +1 -0
- package/lib/OwneraAPI/finp2p-node-api/__tests__/pathEncoding.test.d.ts +1 -0
- package/lib/OwneraAPI/finp2p-node-api/__tests__/pathEncoding.test.js +348 -0
- package/lib/OwneraAPI/finp2p-node-api/__tests__/pathEncoding.test.js.map +1 -0
- package/lib/OwneraAPI/finp2p-node-api/__tests__/rejectIntent.test.d.ts +1 -0
- package/lib/OwneraAPI/finp2p-node-api/__tests__/rejectIntent.test.js +97 -0
- package/lib/OwneraAPI/finp2p-node-api/__tests__/rejectIntent.test.js.map +1 -0
- package/lib/OwneraAPI/finp2p-node-api/certificates.js +15 -6
- package/lib/OwneraAPI/finp2p-node-api/certificates.js.map +1 -1
- package/lib/OwneraAPI/finp2p-node-api/custodies.js +13 -2
- package/lib/OwneraAPI/finp2p-node-api/custodies.js.map +1 -1
- package/lib/OwneraAPI/finp2p-node-api/documents.js +22 -9
- package/lib/OwneraAPI/finp2p-node-api/documents.js.map +1 -1
- package/lib/OwneraAPI/finp2p-node-api/investorAccounts.d.ts +13 -0
- package/lib/OwneraAPI/finp2p-node-api/investorAccounts.js +71 -0
- package/lib/OwneraAPI/finp2p-node-api/investorAccounts.js.map +1 -0
- package/lib/OwneraAPI/finp2p-node-api/ledgers.js +13 -2
- package/lib/OwneraAPI/finp2p-node-api/ledgers.js.map +1 -1
- package/lib/OwneraAPI/finp2p-node-api/messages.js +12 -3
- package/lib/OwneraAPI/finp2p-node-api/messages.js.map +1 -1
- package/lib/OwneraAPI/finp2p-node-api/operations.js +37 -15
- package/lib/OwneraAPI/finp2p-node-api/operations.js.map +1 -1
- package/lib/OwneraAPI/finp2p-node-api/policies.js +14 -5
- package/lib/OwneraAPI/finp2p-node-api/policies.js.map +1 -1
- package/lib/OwneraAPI/finp2p-node-api/profiles.js +95 -49
- package/lib/OwneraAPI/finp2p-node-api/profiles.js.map +1 -1
- package/lib/OwneraAPI/finp2p-node-api/tokens.js +20 -0
- package/lib/OwneraAPI/finp2p-node-api/tokens.js.map +1 -1
- package/lib/OwneraAPI/index.js +2 -0
- package/lib/OwneraAPI/index.js.map +1 -1
- package/lib/OwneraAPI/oss-api/__tests__/buildGraphQLQuery.test.d.ts +1 -0
- package/lib/OwneraAPI/oss-api/__tests__/buildGraphQLQuery.test.js +253 -0
- package/lib/OwneraAPI/oss-api/__tests__/buildGraphQLQuery.test.js.map +1 -0
- package/lib/OwneraAPI/oss-api/__tests__/getAllExecutionPlans.test.js +52 -0
- package/lib/OwneraAPI/oss-api/__tests__/getAllExecutionPlans.test.js.map +1 -1
- package/lib/OwneraAPI/oss-api/__tests__/ossQueryEscaping.test.d.ts +1 -0
- package/lib/OwneraAPI/oss-api/__tests__/ossQueryEscaping.test.js +347 -0
- package/lib/OwneraAPI/oss-api/__tests__/ossQueryEscaping.test.js.map +1 -0
- package/lib/OwneraAPI/oss-api/filterUtils.d.ts +20 -0
- package/lib/OwneraAPI/oss-api/filterUtils.js +57 -5
- package/lib/OwneraAPI/oss-api/filterUtils.js.map +1 -1
- package/lib/OwneraAPI/oss-api/oss.js +188 -75
- package/lib/OwneraAPI/oss-api/oss.js.map +1 -1
- package/lib/OwneraAPI/oss-api/queryUtils.d.ts +1 -0
- package/lib/OwneraAPI/oss-api/queryUtils.js +6 -5
- package/lib/OwneraAPI/oss-api/queryUtils.js.map +1 -1
- package/lib/OwneraAPI/oss-api/queryValidation.d.ts +3 -1
- package/lib/OwneraAPI/oss-api/queryValidation.js +21 -2
- package/lib/OwneraAPI/oss-api/queryValidation.js.map +1 -1
- package/lib/OwneraAPI/payment-adapter-api/__tests__/updateBalance.test.d.ts +1 -0
- package/lib/OwneraAPI/payment-adapter-api/__tests__/updateBalance.test.js +42 -0
- package/lib/OwneraAPI/payment-adapter-api/__tests__/updateBalance.test.js.map +1 -0
- package/lib/OwneraAPI/payment-adapter-api/vanilla/__tests__/payouts.test.d.ts +1 -0
- package/lib/OwneraAPI/payment-adapter-api/vanilla/__tests__/payouts.test.js +73 -0
- package/lib/OwneraAPI/payment-adapter-api/vanilla/__tests__/payouts.test.js.map +1 -0
- package/lib/OwneraAPI/payment-adapter-api/vanilla/payouts.js +23 -11
- package/lib/OwneraAPI/payment-adapter-api/vanilla/payouts.js.map +1 -1
- package/lib/OwneraAPI/payment-adapter-api/vanilla/update-balance.d.ts +1 -1
- package/lib/OwneraAPI/payment-adapter-api/vanilla/update-balance.js +3 -1
- package/lib/OwneraAPI/payment-adapter-api/vanilla/update-balance.js.map +1 -1
- package/lib/OwneraAPI/utils.d.ts +39 -0
- package/lib/OwneraAPI/utils.js +125 -73
- package/lib/OwneraAPI/utils.js.map +1 -1
- package/lib/core/__tests__/consoleLogger.test.d.ts +1 -0
- package/lib/core/__tests__/consoleLogger.test.js +269 -0
- package/lib/core/__tests__/consoleLogger.test.js.map +1 -0
- package/lib/core/__tests__/createAssetNameUniqueness.test.d.ts +1 -0
- package/lib/core/__tests__/createAssetNameUniqueness.test.js +95 -0
- package/lib/core/__tests__/createAssetNameUniqueness.test.js.map +1 -0
- package/lib/core/__tests__/custodianPrecedence.test.d.ts +1 -0
- package/lib/core/__tests__/custodianPrecedence.test.js +683 -0
- package/lib/core/__tests__/custodianPrecedence.test.js.map +1 -0
- package/lib/core/__tests__/executeIntentSettlementAssets.test.d.ts +1 -0
- package/lib/core/__tests__/executeIntentSettlementAssets.test.js +128 -0
- package/lib/core/__tests__/executeIntentSettlementAssets.test.js.map +1 -0
- package/lib/core/__tests__/logException.test.d.ts +1 -0
- package/lib/core/__tests__/logException.test.js +49 -0
- package/lib/core/__tests__/logException.test.js.map +1 -0
- package/lib/core/__tests__/multiplyDecimalStrings.test.d.ts +1 -0
- package/lib/core/__tests__/multiplyDecimalStrings.test.js +37 -0
- package/lib/core/__tests__/multiplyDecimalStrings.test.js.map +1 -0
- package/lib/core/__tests__/settlementExecutionAmount.test.d.ts +1 -0
- package/lib/core/__tests__/settlementExecutionAmount.test.js +300 -0
- package/lib/core/__tests__/settlementExecutionAmount.test.js.map +1 -0
- package/lib/core/asset.js +21 -27
- package/lib/core/asset.js.map +1 -1
- package/lib/core/custodian.d.ts +30 -0
- package/lib/core/custodian.js +49 -0
- package/lib/core/custodian.js.map +1 -0
- package/lib/core/index.d.ts +1 -0
- package/lib/core/index.js +3 -1
- package/lib/core/index.js.map +1 -1
- package/lib/core/intents/__tests__/intentErrorCode.test.d.ts +1 -0
- package/lib/core/intents/__tests__/intentErrorCode.test.js +111 -0
- package/lib/core/intents/__tests__/intentErrorCode.test.js.map +1 -0
- package/lib/core/intents/__tests__/intentHandleReject.test.d.ts +1 -0
- package/lib/core/intents/__tests__/intentHandleReject.test.js +50 -0
- package/lib/core/intents/__tests__/intentHandleReject.test.js.map +1 -0
- package/lib/core/intents/__tests__/loanIntentAdditionalAccounts.test.d.ts +1 -0
- package/lib/core/intents/__tests__/loanIntentAdditionalAccounts.test.js +185 -0
- package/lib/core/intents/__tests__/loanIntentAdditionalAccounts.test.js.map +1 -0
- package/lib/core/intents/__tests__/loanIntentCustodianPrecedence.test.d.ts +1 -0
- package/lib/core/intents/__tests__/loanIntentCustodianPrecedence.test.js +85 -0
- package/lib/core/intents/__tests__/loanIntentCustodianPrecedence.test.js.map +1 -0
- package/lib/core/intents/__tests__/loanIntentMetadata.test.d.ts +1 -0
- package/lib/core/intents/__tests__/loanIntentMetadata.test.js +81 -0
- package/lib/core/intents/__tests__/loanIntentMetadata.test.js.map +1 -0
- package/lib/core/intents/__tests__/moveIntentSegregatedAccounts.test.d.ts +1 -0
- package/lib/core/intents/__tests__/moveIntentSegregatedAccounts.test.js +203 -0
- package/lib/core/intents/__tests__/moveIntentSegregatedAccounts.test.js.map +1 -0
- package/lib/core/intents/createIntent/createIntent.js +4 -3
- package/lib/core/intents/createIntent/createIntent.js.map +1 -1
- package/lib/core/intents/createIntent/createMoveIntentReq.d.ts +27 -0
- package/lib/core/intents/createIntent/createMoveIntentReq.js +91 -0
- package/lib/core/intents/createIntent/createMoveIntentReq.js.map +1 -0
- package/lib/core/intents/createIntent/helpers.d.ts +32 -2
- package/lib/core/intents/createIntent/helpers.js +78 -1
- package/lib/core/intents/createIntent/helpers.js.map +1 -1
- package/lib/core/intents/createLoanIntent.js +64 -19
- package/lib/core/intents/createLoanIntent.js.map +1 -1
- package/lib/core/intents/executeIntent.js +102 -41
- package/lib/core/intents/executeIntent.js.map +1 -1
- package/lib/core/intents/executeLoanIntent.js +48 -23
- package/lib/core/intents/executeLoanIntent.js.map +1 -1
- package/lib/core/intents/executeMoveIntent.d.ts +19 -0
- package/lib/core/intents/executeMoveIntent.js +134 -0
- package/lib/core/intents/executeMoveIntent.js.map +1 -0
- package/lib/core/intents/executePrivateIntent.js +46 -13
- package/lib/core/intents/executePrivateIntent.js.map +1 -1
- package/lib/core/intents/executeRedemptionIntent.d.ts +1 -0
- package/lib/core/intents/executeRedemptionIntent.js +23 -9
- package/lib/core/intents/executeRedemptionIntent.js.map +1 -1
- package/lib/core/intents/executeTransferRequest.d.ts +5 -0
- package/lib/core/intents/executeTransferRequest.js +14 -3
- package/lib/core/intents/executeTransferRequest.js.map +1 -1
- package/lib/core/intents/getIntent.js +18 -0
- package/lib/core/intents/getIntent.js.map +1 -1
- package/lib/core/intents/index.d.ts +3 -0
- package/lib/core/intents/index.js +7 -1
- package/lib/core/intents/index.js.map +1 -1
- package/lib/core/intents/transfer.js +7 -2
- package/lib/core/intents/transfer.js.map +1 -1
- package/lib/core/intents/updateMoveIntentReq.d.ts +28 -0
- package/lib/core/intents/updateMoveIntentReq.js +94 -0
- package/lib/core/intents/updateMoveIntentReq.js.map +1 -0
- package/lib/core/intents/utils.d.ts +15 -7
- package/lib/core/intents/utils.js +36 -26
- package/lib/core/intents/utils.js.map +1 -1
- package/lib/core/logger.js +128 -22
- package/lib/core/logger.js.map +1 -1
- package/lib/core/normalizers/__tests__/normalizeOperationResponse.test.d.ts +1 -0
- package/lib/core/normalizers/__tests__/normalizeOperationResponse.test.js +60 -0
- package/lib/core/normalizers/__tests__/normalizeOperationResponse.test.js.map +1 -0
- package/lib/core/normalizers/normalizeOperationResponse.d.ts +6 -0
- package/lib/core/normalizers/normalizeOperationResponse.js +4 -5
- package/lib/core/normalizers/normalizeOperationResponse.js.map +1 -1
- package/lib/core/sdk.d.ts +4 -0
- package/lib/core/sdk.js +2 -2
- package/lib/core/sdk.js.map +1 -1
- package/lib/core/user.d.ts +2 -2
- package/lib/core/user.js +60 -2
- package/lib/core/user.js.map +1 -1
- package/lib/core/utils.d.ts +17 -1
- package/lib/core/utils.js +75 -16
- package/lib/core/utils.js.map +1 -1
- package/lib/index.d.ts +1 -0
- package/lib/index.js +3 -1
- package/lib/index.js.map +1 -1
- package/lib/types/Core/Intents.d.ts +243 -2
- package/lib/types/Core/Intents.js +9 -0
- package/lib/types/Core/Intents.js.map +1 -1
- package/lib/types/Core/OwneraAPI.d.ts +21 -1
- package/lib/types/Core/User.d.ts +62 -4
- package/lib/types/InvestorAccounts/InvestorAccounts.d.ts +171 -0
- package/lib/types/InvestorAccounts/InvestorAccounts.js +35 -0
- package/lib/types/InvestorAccounts/InvestorAccounts.js.map +1 -0
- package/lib/types/InvestorAccounts/index.d.ts +1 -0
- package/lib/types/InvestorAccounts/index.js +18 -0
- package/lib/types/InvestorAccounts/index.js.map +1 -0
- package/lib/types/Operations/Operations.d.ts +11 -0
- package/lib/types/Oss/Oss.d.ts +18 -1
- package/lib/types/Oss/OssSchemas.d.ts +89 -2
- package/lib/types/Oss/OssSchemas.js.map +1 -1
- package/lib/types/Oss/utils.d.ts +32 -0
- package/lib/types/PaymentAdapter/PaymentAdapter.d.ts +7 -0
- package/lib/types/PaymentAdapter/index.d.ts +33 -1
- package/lib/types/Profiles/Accounts.d.ts +32 -0
- package/lib/types/Profiles/Intents.d.ts +58 -3
- package/lib/types/Profiles/Profiles.d.ts +71 -2
- package/lib/types/Tokens/Tokens.d.ts +111 -1
- package/lib/types/index.d.ts +1 -0
- package/lib/types/index.js +1 -0
- package/lib/types/index.js.map +1 -1
- package/package.json +1 -1
|
@@ -14,6 +14,7 @@ const utils_1 = require("../utils");
|
|
|
14
14
|
const utils_2 = require("./utils");
|
|
15
15
|
const tokens_1 = require("../tokens");
|
|
16
16
|
const helpers_1 = require("./createIntent/helpers");
|
|
17
|
+
const custodian_1 = require("../custodian");
|
|
17
18
|
/**
|
|
18
19
|
* Execute private intent
|
|
19
20
|
*
|
|
@@ -31,8 +32,13 @@ const executePrivateIntent = (req) => __awaiter(void 0, void 0, void 0, function
|
|
|
31
32
|
const nonce = (0, utils_1.generateNonce)().toString('hex');
|
|
32
33
|
// currently handle selling flow only
|
|
33
34
|
const dstAccountPK = userPublicKey;
|
|
34
|
-
//
|
|
35
|
-
|
|
35
|
+
// Custodian precedence differs per side — see each site:
|
|
36
|
+
// • source (the OFFEROR's account): intent → per-call → default, resolved inside the
|
|
37
|
+
// non-issuance branch below — issuance builds a sourceAccount with no account at all, so
|
|
38
|
+
// resolving (and possibly throwing) here would fail calls that never use the value;
|
|
39
|
+
// • destination (the TAKER's own account): per-call → intent → default, and the intent step
|
|
40
|
+
// is skipped entirely on the DvD (asset-settlement) branch.
|
|
41
|
+
const custodianOrgIdFromIntent = (_c = (_b = (_a = intentDetails.source) === null || _a === void 0 ? void 0 : _a.account) === null || _b === void 0 ? void 0 : _b.custodian) === null || _c === void 0 ? void 0 : _c.orgId;
|
|
36
42
|
// Detect issuance: the seller is the asset issuer (minting new tokens).
|
|
37
43
|
// Note: cannot rely on source.account.finId being absent — the platform populates it after creation.
|
|
38
44
|
const isIssuance = intentDetails.seller === ossAsset.issuerId;
|
|
@@ -45,12 +51,22 @@ const executePrivateIntent = (req) => __awaiter(void 0, void 0, void 0, function
|
|
|
45
51
|
(((_f = (_e = (_d = intentDetails === null || intentDetails === void 0 ? void 0 : intentDetails.sellingSettlementInstruction) === null || _d === void 0 ? void 0 : _d.accounts) === null || _e === void 0 ? void 0 : _e[0]) === null || _f === void 0 ? void 0 : _f.asset) || {});
|
|
46
52
|
// Build CAIP-19 asset identifier for main asset
|
|
47
53
|
const assetIdentifier = (0, helpers_1.buildCaip19Identifier)((_g = ossAsset.ledgerAssetInfo) === null || _g === void 0 ? void 0 : _g.ledgerIdentifier, data.assetId);
|
|
54
|
+
// The destination asset account belongs to the EXECUTING taker (finId = userPublicKey), so a
|
|
55
|
+
// per-call value naming the taker's own custodian wins on BOTH branches. The intent's custodian
|
|
56
|
+
// is the OFFEROR's — it stays only as a fallback for callers that pass nothing (previous
|
|
57
|
+
// precedence put it first, stamping the offeror's custodian onto the taker's account).
|
|
58
|
+
const destinationCustodianOrgId = isAssetSettlement
|
|
59
|
+
? data.destinationCustodianOrgId ||
|
|
60
|
+
(0, custodian_1.defaultCustodianOrgId)(custodianOrgId, 'executePrivateIntent.destinationAccount(assetSettlement)', logger)
|
|
61
|
+
: data.destinationCustodianOrgId ||
|
|
62
|
+
custodianOrgIdFromIntent ||
|
|
63
|
+
(0, custodian_1.defaultCustodianOrgId)(custodianOrgId, 'executePrivateIntent.destinationAccount', logger);
|
|
48
64
|
const instructionDestAccount = {
|
|
49
65
|
type: 'finId',
|
|
50
66
|
finId: dstAccountPK,
|
|
51
67
|
orgId: (0, utils_1.getOrgFromResourceId)(data.assetId),
|
|
52
68
|
custodian: {
|
|
53
|
-
orgId:
|
|
69
|
+
orgId: destinationCustodianOrgId,
|
|
54
70
|
},
|
|
55
71
|
};
|
|
56
72
|
logger.debug(`🔵 [executePrivateIntent] isIssuance=${isIssuance} (seller=${intentDetails.seller}, issuerId=${ossAsset.issuerId}), isFreeOfPayment=${isFreeOfPayment}, settlementTerm=${JSON.stringify(settlementTerm)}`);
|
|
@@ -68,12 +84,15 @@ const executePrivateIntent = (req) => __awaiter(void 0, void 0, void 0, function
|
|
|
68
84
|
else {
|
|
69
85
|
// Non-issuance (trade): sourceAccount with full account + asset
|
|
70
86
|
const srcFinId = ((_j = (_h = intentDetails.source) === null || _h === void 0 ? void 0 : _h.account) === null || _j === void 0 ? void 0 : _j.finId) || dstAccountPK;
|
|
87
|
+
const sourceCustodianOrgId = custodianOrgIdFromIntent ||
|
|
88
|
+
data.sourceCustodianOrgId ||
|
|
89
|
+
(0, custodian_1.defaultCustodianOrgId)(custodianOrgId, 'executePrivateIntent.sourceAccount', logger);
|
|
71
90
|
assetInstruction.sourceAccount = (0, helpers_1.buildFinp2pAssetAccount)({
|
|
72
91
|
type: 'finId',
|
|
73
92
|
orgId: (0, utils_1.getOrgFromResourceId)(data.assetId),
|
|
74
93
|
finId: srcFinId,
|
|
75
94
|
custodian: {
|
|
76
|
-
orgId:
|
|
95
|
+
orgId: sourceCustodianOrgId,
|
|
77
96
|
},
|
|
78
97
|
}, assetIdentifier);
|
|
79
98
|
}
|
|
@@ -124,9 +143,24 @@ const executePrivateIntent = (req) => __awaiter(void 0, void 0, void 0, function
|
|
|
124
143
|
if (!data.sourceAccount || !data.destinationAccount) {
|
|
125
144
|
throw new Error(`privateOfferIntent ${data.intentId} requires sourceAccount and destinationAccount when settlementTerm is present`);
|
|
126
145
|
}
|
|
146
|
+
// Settlement finId accounts resolve: the account's own value, then — only on the leg the
|
|
147
|
+
// executor owns — the per-call value, then the Sdk default, so an account passed with an
|
|
148
|
+
// empty custodian.orgId never reaches the Router. The executing taker PAYS, so they own the
|
|
149
|
+
// settlement source; the destination is the OFFEROR's receiving account, which must never
|
|
150
|
+
// borrow the executor's per-call custodian — with no value of its own it falls to the default
|
|
151
|
+
// or fails loudly. Non-finId (fiat/crypto) accounts carry no custodian and pass through
|
|
152
|
+
// untouched.
|
|
153
|
+
const resolveSettlementCustodian = (account, perCallCustodianOrgId, site) => {
|
|
154
|
+
var _a;
|
|
155
|
+
if ((account === null || account === void 0 ? void 0 : account.type) !== 'finId')
|
|
156
|
+
return account;
|
|
157
|
+
return Object.assign(Object.assign({}, account), { custodian: {
|
|
158
|
+
orgId: ((_a = account.custodian) === null || _a === void 0 ? void 0 : _a.orgId) || perCallCustodianOrgId || (0, custodian_1.defaultCustodianOrgId)(custodianOrgId, site, logger),
|
|
159
|
+
} });
|
|
160
|
+
};
|
|
127
161
|
const settlementInstruction = {
|
|
128
|
-
destinationAccount: Object.assign(Object.assign({}, data.destinationAccount), { asset: settlementAssetIdentifier }),
|
|
129
|
-
sourceAccount: Object.assign(Object.assign({}, data.sourceAccount), { asset: settlementAssetIdentifier }),
|
|
162
|
+
destinationAccount: Object.assign(Object.assign({}, data.destinationAccount), { account: resolveSettlementCustodian(data.destinationAccount.account, undefined, 'executePrivateIntent.settlementDestinationAccount'), asset: settlementAssetIdentifier }),
|
|
163
|
+
sourceAccount: Object.assign(Object.assign({}, data.sourceAccount), { account: resolveSettlementCustodian(data.sourceAccount.account, data.sourceCustodianOrgId, 'executePrivateIntent.settlementSourceAccount'), asset: settlementAssetIdentifier }),
|
|
130
164
|
};
|
|
131
165
|
// if DvD private offer, align orgId to the org where the asset exists in the settlement accounts
|
|
132
166
|
if (isAssetSettlement && settlementAccountAsset) {
|
|
@@ -134,14 +168,13 @@ const executePrivateIntent = (req) => __awaiter(void 0, void 0, void 0, function
|
|
|
134
168
|
settlementInstruction.destinationAccount.account.orgId = settlementAssetOrgId;
|
|
135
169
|
settlementInstruction.sourceAccount.account.orgId = settlementAssetOrgId;
|
|
136
170
|
}
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
}
|
|
141
|
-
else if (isFullSettlement) {
|
|
142
|
-
const amount = settlementTermDetails.amount;
|
|
143
|
-
settlement = { term: { type: 'fullSettlement', amount }, instruction: settlementInstruction };
|
|
171
|
+
const amount = (0, utils_2.getSettlementExecutionAmount)(intentDetails.settlementTerm, data.amount);
|
|
172
|
+
if (amount === undefined) {
|
|
173
|
+
throw new Error(`privateOfferIntent ${data.intentId} has no settlement amount (unitValue or amount) on its stored term`);
|
|
144
174
|
}
|
|
175
|
+
settlement = isFullSettlement
|
|
176
|
+
? { term: { type: 'fullSettlement', amount }, instruction: settlementInstruction }
|
|
177
|
+
: { term: { amount }, instruction: settlementInstruction };
|
|
145
178
|
}
|
|
146
179
|
const privateIntent = Object.assign(Object.assign({ asset: {
|
|
147
180
|
instruction: assetInstruction,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executePrivateIntent.js","sourceRoot":"","sources":["../../../src/core/intents/executePrivateIntent.ts"],"names":[],"mappings":";;;;;;;;;;;;AAWA,oCAA+D;AAE/D,
|
|
1
|
+
{"version":3,"file":"executePrivateIntent.js","sourceRoot":"","sources":["../../../src/core/intents/executePrivateIntent.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,6 +14,7 @@ const utils_1 = require("../utils");
|
|
|
14
14
|
const utils_2 = require("./utils");
|
|
15
15
|
const user_1 = require("../user");
|
|
16
16
|
const tokens_1 = require("../tokens");
|
|
17
|
+
const custodian_1 = require("../custodian");
|
|
17
18
|
const helpers_1 = require("./createIntent/helpers");
|
|
18
19
|
/**
|
|
19
20
|
* Execute redemption intent
|
|
@@ -24,7 +25,7 @@ const helpers_1 = require("./createIntent/helpers");
|
|
|
24
25
|
*
|
|
25
26
|
*/
|
|
26
27
|
const executeRedemptionIntent = (req) => __awaiter(void 0, void 0, void 0, function* () {
|
|
27
|
-
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
|
|
28
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
|
|
28
29
|
const { owneraAPI, data, userId, userPublicKey, idempotency, logger } = req;
|
|
29
30
|
// Redemption always settles — both accounts are required. Guard up front so the rest of the function
|
|
30
31
|
// can treat them as non-null. (IntentExecution.{source,destination}Account are optional only for FoP primarySale.)
|
|
@@ -43,12 +44,16 @@ const executeRedemptionIntent = (req) => __awaiter(void 0, void 0, void 0, funct
|
|
|
43
44
|
const assetIdentifier = (0, helpers_1.buildCaip19Identifier)((_a = ossAsset.ledgerAssetInfo) === null || _a === void 0 ? void 0 : _a.ledgerIdentifier, sourceResourceId);
|
|
44
45
|
// v0.28 updated: redemptionIntentExecution uses finp2pAssetAccountOptional for destinationAccount
|
|
45
46
|
// (account is optional, only asset required). sourceAccount uses full finp2pAssetAccount (seller).
|
|
46
|
-
//
|
|
47
|
-
//
|
|
47
|
+
// The redeeming seller's OWN custodian — a caller-passed value wins (the caller can name the
|
|
48
|
+
// seller's SPECIFIC account; `accounts[0]` is a positional pick that breaks for multi-account
|
|
49
|
+
// users), then the seller's OSS record, then the backend's sourceAccount value (the issuer's
|
|
50
|
+
// settlement account — wrong owner, kept only as legacy fallback), and finally the Sdk default,
|
|
51
|
+
// which fails loudly instead of shipping ''.
|
|
48
52
|
const sellerUserData = (yield owneraAPI.query.getUsers({ filter: { userIds: [userId] } })).data[0];
|
|
49
|
-
const sellerCustodianOrgId =
|
|
53
|
+
const sellerCustodianOrgId = data.sourceCustodianOrgId ||
|
|
54
|
+
((_d = (_c = (_b = sellerUserData === null || sellerUserData === void 0 ? void 0 : sellerUserData.accounts) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.custodian) === null || _d === void 0 ? void 0 : _d.orgId) ||
|
|
50
55
|
((_e = data.sourceAccount.account.custodian) === null || _e === void 0 ? void 0 : _e.orgId) ||
|
|
51
|
-
'';
|
|
56
|
+
(0, custodian_1.defaultCustodianOrgId)(req.custodianOrgId, 'executeRedemptionIntent.seller', logger);
|
|
52
57
|
const assetInstruction = {
|
|
53
58
|
sourceAccount: (0, helpers_1.buildFinp2pAssetAccount)({
|
|
54
59
|
finId: userPublicKey,
|
|
@@ -70,7 +75,7 @@ const executeRedemptionIntent = (req) => __awaiter(void 0, void 0, void 0, funct
|
|
|
70
75
|
const settlementAssetData = (_h = settlementAssets.data) === null || _h === void 0 ? void 0 : _h[0];
|
|
71
76
|
settlementAssetIdentifier = (0, helpers_1.buildCaip19Identifier)((_j = settlementAssetData === null || settlementAssetData === void 0 ? void 0 : settlementAssetData.ledgerAssetInfo) === null || _j === void 0 ? void 0 : _j.ledgerIdentifier, settlementResourceId);
|
|
72
77
|
}
|
|
73
|
-
catch (
|
|
78
|
+
catch (_m) {
|
|
74
79
|
settlementAssetIdentifier = (0, helpers_1.buildCaip19Identifier)(undefined, settlementResourceId);
|
|
75
80
|
}
|
|
76
81
|
}
|
|
@@ -87,14 +92,23 @@ const executeRedemptionIntent = (req) => __awaiter(void 0, void 0, void 0, funct
|
|
|
87
92
|
settlementDestAccount.custodian = { orgId: sellerCustodianOrgId };
|
|
88
93
|
const settlementSrcAccount = Object.assign({}, data.sourceAccount.account);
|
|
89
94
|
settlementSrcAccount.finId = issuerPublicKey;
|
|
95
|
+
// The settlement source is the ISSUER's account: its own custodian (as passed with the call)
|
|
96
|
+
// stands, with the Sdk default as the terminal guard so an empty value never reaches the Router.
|
|
97
|
+
settlementSrcAccount.custodian = {
|
|
98
|
+
orgId: ((_k = settlementSrcAccount.custodian) === null || _k === void 0 ? void 0 : _k.orgId) ||
|
|
99
|
+
(0, custodian_1.defaultCustodianOrgId)(req.custodianOrgId, 'executeRedemptionIntent.settlementSourceAccount', logger),
|
|
100
|
+
};
|
|
90
101
|
const settlementInstruction = {
|
|
91
102
|
destinationAccount: Object.assign(Object.assign({}, data.destinationAccount), { account: settlementDestAccount, asset: settlementAssetIdentifier }),
|
|
92
103
|
sourceAccount: Object.assign(Object.assign({}, data.sourceAccount), { account: settlementSrcAccount, asset: settlementAssetIdentifier }),
|
|
93
104
|
};
|
|
94
|
-
const
|
|
105
|
+
const settlementAmount = (0, utils_2.getSettlementExecutionAmount)(intentDetails.settlementTerm, data.amount);
|
|
106
|
+
if (settlementAmount === undefined) {
|
|
107
|
+
throw new Error(`redemptionIntent ${data.intentId} has no settlement amount (unitValue or amount) on its stored term`);
|
|
108
|
+
}
|
|
95
109
|
const settlement = {
|
|
96
110
|
term: {
|
|
97
|
-
amount:
|
|
111
|
+
amount: settlementAmount,
|
|
98
112
|
},
|
|
99
113
|
instruction: settlementInstruction,
|
|
100
114
|
};
|
|
@@ -109,7 +123,7 @@ const executeRedemptionIntent = (req) => __awaiter(void 0, void 0, void 0, funct
|
|
|
109
123
|
settlement,
|
|
110
124
|
type: 'redemptionIntentExecution',
|
|
111
125
|
};
|
|
112
|
-
const request = Object.assign({ intentId: data.intentId, user: userId, intent: redemptionIntent, executionId: data.executionId }, (((
|
|
126
|
+
const request = Object.assign({ intentId: data.intentId, user: userId, intent: redemptionIntent, executionId: data.executionId }, (((_l = data.observers) === null || _l === void 0 ? void 0 : _l.length) ? { observers: data.observers } : {}));
|
|
113
127
|
const execution = yield (0, tokens_1.executeTokenIntent)({
|
|
114
128
|
owneraAPI,
|
|
115
129
|
logger,
|
|
@@ -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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"}
|
|
@@ -8,7 +8,12 @@ export declare const executeTransferRequest: (req: {
|
|
|
8
8
|
destinationAssetId?: string;
|
|
9
9
|
executionId?: string;
|
|
10
10
|
observers?: string[];
|
|
11
|
+
/** Custodian of the SENDER's account — the sender and receiver are two different owners. */
|
|
12
|
+
sourceCustodianOrgId?: string;
|
|
13
|
+
/** Custodian of the RECEIVER's account. */
|
|
14
|
+
destinationCustodianOrgId?: string;
|
|
11
15
|
};
|
|
16
|
+
custodianOrgId: string;
|
|
12
17
|
userPublicKey: string;
|
|
13
18
|
idempotency?: string;
|
|
14
19
|
}) => Promise<any>;
|
|
@@ -13,6 +13,7 @@ exports.executeTransferRequest = void 0;
|
|
|
13
13
|
const utils_1 = require("../utils");
|
|
14
14
|
const utils_2 = require("./utils");
|
|
15
15
|
const tokens_1 = require("../tokens");
|
|
16
|
+
const custodian_1 = require("../custodian");
|
|
16
17
|
const helpers_1 = require("./createIntent/helpers");
|
|
17
18
|
const executeTransferRequest = (req) => __awaiter(void 0, void 0, void 0, function* () {
|
|
18
19
|
var _a, _b, _c, _d, _e, _f, _g, _h, _j;
|
|
@@ -65,13 +66,23 @@ const executeTransferRequest = (req) => __awaiter(void 0, void 0, void 0, functi
|
|
|
65
66
|
const nonce = (0, utils_1.generateNonce)().toString('hex');
|
|
66
67
|
const sourceAccountFromIntent = (_a = intentDetails.asset.assetInstruction.senderAccount) === null || _a === void 0 ? void 0 : _a.account;
|
|
67
68
|
const destAccountFromIntent = (_b = intentDetails.asset.assetInstruction.receiverAccount) === null || _b === void 0 ? void 0 : _b.account;
|
|
68
|
-
|
|
69
|
+
// The sender and the receiver are two DIFFERENT owners — each side resolves its own custodian.
|
|
70
|
+
// The old code collapsed `source || dest` into one value and stamped it on both accounts, which
|
|
71
|
+
// put the sender's custodian onto the receiver's account whenever they differed. Precedence per
|
|
72
|
+
// side: caller-passed value → that side's account on the intent record → the Sdk default (which
|
|
73
|
+
// fails loudly rather than shipping '').
|
|
74
|
+
const sourceCustodianOrgId = data.sourceCustodianOrgId ||
|
|
75
|
+
((_c = sourceAccountFromIntent === null || sourceAccountFromIntent === void 0 ? void 0 : sourceAccountFromIntent.custodian) === null || _c === void 0 ? void 0 : _c.orgId) ||
|
|
76
|
+
(0, custodian_1.defaultCustodianOrgId)(req.custodianOrgId, 'executeTransferRequest.sourceAccount', logger);
|
|
77
|
+
const destinationCustodianOrgId = data.destinationCustodianOrgId ||
|
|
78
|
+
((_d = destAccountFromIntent === null || destAccountFromIntent === void 0 ? void 0 : destAccountFromIntent.custodian) === null || _d === void 0 ? void 0 : _d.orgId) ||
|
|
79
|
+
(0, custodian_1.defaultCustodianOrgId)(req.custodianOrgId, 'executeTransferRequest.destinationAccount', logger);
|
|
69
80
|
const sourceAssetIdentifier = (0, helpers_1.buildCaip19Identifier)((_e = ossAsset.ledgerAssetInfo) === null || _e === void 0 ? void 0 : _e.ledgerIdentifier, assetId);
|
|
70
81
|
const sourceOrgId = (sourceAccountFromIntent === null || sourceAccountFromIntent === void 0 ? void 0 : sourceAccountFromIntent.orgId) || (0, utils_1.getOrgFromResourceId)(assetId);
|
|
71
82
|
const sourceAccount = (0, helpers_1.buildFinp2pAssetAccount)({
|
|
72
83
|
finId: senderPK,
|
|
73
84
|
orgId: sourceOrgId,
|
|
74
|
-
custodian: { orgId:
|
|
85
|
+
custodian: { orgId: sourceCustodianOrgId },
|
|
75
86
|
}, sourceAssetIdentifier);
|
|
76
87
|
let destAssetIdentifier = sourceAssetIdentifier;
|
|
77
88
|
let destOrgId = (0, utils_1.getOrgFromResourceId)(assetId);
|
|
@@ -89,7 +100,7 @@ const executeTransferRequest = (req) => __awaiter(void 0, void 0, void 0, functi
|
|
|
89
100
|
const destinationAccount = (0, helpers_1.buildFinp2pAssetAccount)({
|
|
90
101
|
finId: receiverPK,
|
|
91
102
|
orgId: destOrgId,
|
|
92
|
-
custodian: { orgId:
|
|
103
|
+
custodian: { orgId: destinationCustodianOrgId },
|
|
93
104
|
}, destAssetIdentifier);
|
|
94
105
|
const transferExecution = {
|
|
95
106
|
type: 'requestForTransferIntentExecution',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executeTransferRequest.js","sourceRoot":"","sources":["../../../src/core/intents/executeTransferRequest.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,oCAA+D;AAC/D,mCAAqD;AACrD,sCAA+C;AAC/C,oDAAwF;AAEjF,MAAM,sBAAsB,GAAG,CAAO,
|
|
1
|
+
{"version":3,"file":"executeTransferRequest.js","sourceRoot":"","sources":["../../../src/core/intents/executeTransferRequest.ts"],"names":[],"mappings":"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"}
|
|
@@ -40,6 +40,24 @@ const getIntent = (req) => {
|
|
|
40
40
|
idempotency: (0, utils_1.generateIdempotencyKey)(),
|
|
41
41
|
});
|
|
42
42
|
}),
|
|
43
|
+
/**
|
|
44
|
+
* Cancel intent
|
|
45
|
+
*
|
|
46
|
+
*/
|
|
47
|
+
cancel: () => __awaiter(void 0, void 0, void 0, function* () {
|
|
48
|
+
return yield owneraAPI.profiles.cancelIntent({ assetId, intentId }, {
|
|
49
|
+
idempotency: (0, utils_1.generateIdempotencyKey)(),
|
|
50
|
+
});
|
|
51
|
+
}),
|
|
52
|
+
/**
|
|
53
|
+
* Reject intent, optionally with a reason for the counterparty
|
|
54
|
+
*
|
|
55
|
+
*/
|
|
56
|
+
reject: (reason) => __awaiter(void 0, void 0, void 0, function* () {
|
|
57
|
+
return yield owneraAPI.profiles.rejectIntent({ assetId, intentId, rejectReason: reason }, {
|
|
58
|
+
idempotency: (0, utils_1.generateIdempotencyKey)(),
|
|
59
|
+
});
|
|
60
|
+
}),
|
|
43
61
|
};
|
|
44
62
|
};
|
|
45
63
|
exports.getIntent = getIntent;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getIntent.js","sourceRoot":"","sources":["../../../src/core/intents/getIntent.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,oCAAkD;AAElD;;;;;;GAMG;AACI,MAAM,SAAS,GAAG,CAAC,GAKzB,EAAmB,EAAE;IACpB,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,GAAG,CAAC;IAE7C,OAAO;QACL,EAAE,EAAE,QAAQ;QACZ;;;WAGG;QACH,MAAM,EAAE,GAAS,EAAE;YACjB,OAAA,MAAM,SAAS,CAAC,QAAQ,CAAC,YAAY,CACnC,EAAE,OAAO,EAAE,QAAQ,EAAE,EACrB;gBACE,WAAW,EAAE,IAAA,8BAAsB,GAAE;aACtC,CACF,CAAA;UAAA;QACH;;;WAGG;QACH,OAAO,EAAE,GAAS,EAAE;YAClB,OAAA,MAAM,SAAS,CAAC,QAAQ,CAAC,aAAa,CACpC,EAAE,OAAO,EAAE,QAAQ,EAAE,EACrB;gBACE,WAAW,EAAE,IAAA,8BAAsB,GAAE;aACtC,CACF,CAAA;UAAA;KACJ,CAAC;AACJ,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"getIntent.js","sourceRoot":"","sources":["../../../src/core/intents/getIntent.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,oCAAkD;AAElD;;;;;;GAMG;AACI,MAAM,SAAS,GAAG,CAAC,GAKzB,EAAmB,EAAE;IACpB,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,GAAG,CAAC;IAE7C,OAAO;QACL,EAAE,EAAE,QAAQ;QACZ;;;WAGG;QACH,MAAM,EAAE,GAAS,EAAE;YACjB,OAAA,MAAM,SAAS,CAAC,QAAQ,CAAC,YAAY,CACnC,EAAE,OAAO,EAAE,QAAQ,EAAE,EACrB;gBACE,WAAW,EAAE,IAAA,8BAAsB,GAAE;aACtC,CACF,CAAA;UAAA;QACH;;;WAGG;QACH,OAAO,EAAE,GAAS,EAAE;YAClB,OAAA,MAAM,SAAS,CAAC,QAAQ,CAAC,aAAa,CACpC,EAAE,OAAO,EAAE,QAAQ,EAAE,EACrB;gBACE,WAAW,EAAE,IAAA,8BAAsB,GAAE;aACtC,CACF,CAAA;UAAA;QACH;;;WAGG;QACH,MAAM,EAAE,GAAS,EAAE;YACjB,OAAA,MAAM,SAAS,CAAC,QAAQ,CAAC,YAAY,CACnC,EAAE,OAAO,EAAE,QAAQ,EAAE,EACrB;gBACE,WAAW,EAAE,IAAA,8BAAsB,GAAE;aACtC,CACF,CAAA;UAAA;QACH;;;WAGG;QACH,MAAM,EAAE,CAAO,MAAe,EAAE,EAAE;YAChC,OAAA,MAAM,SAAS,CAAC,QAAQ,CAAC,YAAY,CACnC,EAAE,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,EAAE,EAC3C;gBACE,WAAW,EAAE,IAAA,8BAAsB,GAAE;aACtC,CACF,CAAA;UAAA;KACJ,CAAC;AACJ,CAAC,CAAC;AAvDW,QAAA,SAAS,aAuDpB"}
|
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
export { createIntent } from './createIntent/createIntent';
|
|
2
|
+
export { createMoveIntentReq } from './createIntent/createMoveIntentReq';
|
|
3
|
+
export { updateMoveIntentReq } from './updateMoveIntentReq';
|
|
2
4
|
export { createTransferRequestIntentReq } from './createIntent/createTransferRequestIntent';
|
|
3
5
|
export { createLoanIntent } from './createLoanIntent';
|
|
4
6
|
export { executeIntent } from './executeIntent';
|
|
@@ -7,3 +9,4 @@ export { executeRedemptionIntent } from './executeRedemptionIntent';
|
|
|
7
9
|
export { getIntent } from './getIntent';
|
|
8
10
|
export { transfer } from './transfer';
|
|
9
11
|
export { executeTransferRequest } from './executeTransferRequest';
|
|
12
|
+
export { executeMoveIntent } from './executeMoveIntent';
|
|
@@ -1,8 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.executeTransferRequest = exports.transfer = exports.getIntent = exports.executeRedemptionIntent = exports.executeLoanIntent = exports.executeIntent = exports.createLoanIntent = exports.createTransferRequestIntentReq = exports.createIntent = void 0;
|
|
3
|
+
exports.executeMoveIntent = exports.executeTransferRequest = exports.transfer = exports.getIntent = exports.executeRedemptionIntent = exports.executeLoanIntent = exports.executeIntent = exports.createLoanIntent = exports.createTransferRequestIntentReq = exports.updateMoveIntentReq = exports.createMoveIntentReq = exports.createIntent = void 0;
|
|
4
4
|
var createIntent_1 = require("./createIntent/createIntent");
|
|
5
5
|
Object.defineProperty(exports, "createIntent", { enumerable: true, get: function () { return createIntent_1.createIntent; } });
|
|
6
|
+
var createMoveIntentReq_1 = require("./createIntent/createMoveIntentReq");
|
|
7
|
+
Object.defineProperty(exports, "createMoveIntentReq", { enumerable: true, get: function () { return createMoveIntentReq_1.createMoveIntentReq; } });
|
|
8
|
+
var updateMoveIntentReq_1 = require("./updateMoveIntentReq");
|
|
9
|
+
Object.defineProperty(exports, "updateMoveIntentReq", { enumerable: true, get: function () { return updateMoveIntentReq_1.updateMoveIntentReq; } });
|
|
6
10
|
var createTransferRequestIntent_1 = require("./createIntent/createTransferRequestIntent");
|
|
7
11
|
Object.defineProperty(exports, "createTransferRequestIntentReq", { enumerable: true, get: function () { return createTransferRequestIntent_1.createTransferRequestIntentReq; } });
|
|
8
12
|
var createLoanIntent_1 = require("./createLoanIntent");
|
|
@@ -19,4 +23,6 @@ var transfer_1 = require("./transfer");
|
|
|
19
23
|
Object.defineProperty(exports, "transfer", { enumerable: true, get: function () { return transfer_1.transfer; } });
|
|
20
24
|
var executeTransferRequest_1 = require("./executeTransferRequest");
|
|
21
25
|
Object.defineProperty(exports, "executeTransferRequest", { enumerable: true, get: function () { return executeTransferRequest_1.executeTransferRequest; } });
|
|
26
|
+
var executeMoveIntent_1 = require("./executeMoveIntent");
|
|
27
|
+
Object.defineProperty(exports, "executeMoveIntent", { enumerable: true, get: function () { return executeMoveIntent_1.executeMoveIntent; } });
|
|
22
28
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/core/intents/index.ts"],"names":[],"mappings":";;;AAAA,4DAA2D;AAAlD,4GAAA,YAAY,OAAA;AACrB,0FAA4F;AAAnF,6IAAA,8BAA8B,OAAA;AACvC,uDAAsD;AAA7C,oHAAA,gBAAgB,OAAA;AACzB,iDAAgD;AAAvC,8GAAA,aAAa,OAAA;AACtB,yDAAwD;AAA/C,sHAAA,iBAAiB,OAAA;AAC1B,qEAAoE;AAA3D,kIAAA,uBAAuB,OAAA;AAChC,yCAAwC;AAA/B,sGAAA,SAAS,OAAA;AAClB,uCAAsC;AAA7B,oGAAA,QAAQ,OAAA;AACjB,mEAAkE;AAAzD,gIAAA,sBAAsB,OAAA"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/core/intents/index.ts"],"names":[],"mappings":";;;AAAA,4DAA2D;AAAlD,4GAAA,YAAY,OAAA;AACrB,0EAAyE;AAAhE,0HAAA,mBAAmB,OAAA;AAC5B,6DAA4D;AAAnD,0HAAA,mBAAmB,OAAA;AAC5B,0FAA4F;AAAnF,6IAAA,8BAA8B,OAAA;AACvC,uDAAsD;AAA7C,oHAAA,gBAAgB,OAAA;AACzB,iDAAgD;AAAvC,8GAAA,aAAa,OAAA;AACtB,yDAAwD;AAA/C,sHAAA,iBAAiB,OAAA;AAC1B,qEAAoE;AAA3D,kIAAA,uBAAuB,OAAA;AAChC,yCAAwC;AAA/B,sGAAA,SAAS,OAAA;AAClB,uCAAsC;AAA7B,oGAAA,QAAQ,OAAA;AACjB,mEAAkE;AAAzD,gIAAA,sBAAsB,OAAA;AAC/B,yDAAwD;AAA/C,sHAAA,iBAAiB,OAAA"}
|
|
@@ -13,6 +13,7 @@ exports.transfer = void 0;
|
|
|
13
13
|
const utils_1 = require("../utils");
|
|
14
14
|
const tokens_1 = require("../tokens"); // ✅ wrapper
|
|
15
15
|
const helpers_1 = require("./createIntent/helpers");
|
|
16
|
+
const custodian_1 = require("../custodian");
|
|
16
17
|
const transfer = (req) => __awaiter(void 0, void 0, void 0, function* () {
|
|
17
18
|
var _a, _b, _c, _d, _e, _f, _g, _h;
|
|
18
19
|
const { owneraAPI, data, idempotency, custodianOrgId, logger } = req;
|
|
@@ -32,7 +33,9 @@ const transfer = (req) => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
32
33
|
finId: data.sourceAccount.account.finId,
|
|
33
34
|
orgId: data.sourceAccount.account.orgId,
|
|
34
35
|
custodian: {
|
|
35
|
-
orgId: ((_c = data.sourceAccount.account.custodian) === null || _c === void 0 ? void 0 : _c.orgId) ||
|
|
36
|
+
orgId: ((_c = data.sourceAccount.account.custodian) === null || _c === void 0 ? void 0 : _c.orgId) ||
|
|
37
|
+
data.sourceFallbackCustodianOrgId ||
|
|
38
|
+
(0, custodian_1.defaultCustodianOrgId)(custodianOrgId, 'transfer.sourceAccount', logger),
|
|
36
39
|
},
|
|
37
40
|
}, sourceAssetIdentifier);
|
|
38
41
|
// Use destination asset's own resource ID if it differs from source (cross-org transfer)
|
|
@@ -53,7 +56,9 @@ const transfer = (req) => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
53
56
|
finId: data.destinationAccount.account.finId,
|
|
54
57
|
orgId: data.destinationAccount.account.orgId,
|
|
55
58
|
custodian: {
|
|
56
|
-
orgId: ((_h = data.destinationAccount.account.custodian) === null || _h === void 0 ? void 0 : _h.orgId) ||
|
|
59
|
+
orgId: ((_h = data.destinationAccount.account.custodian) === null || _h === void 0 ? void 0 : _h.orgId) ||
|
|
60
|
+
data.destinationFallbackCustodianOrgId ||
|
|
61
|
+
(0, custodian_1.defaultCustodianOrgId)(custodianOrgId, 'transfer.destinationAccount', logger),
|
|
57
62
|
},
|
|
58
63
|
}, destAssetIdentifier);
|
|
59
64
|
const request = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transfer.js","sourceRoot":"","sources":["../../../src/core/intents/transfer.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,oCAAyC;AACzC,sCAAwD,CAAC,YAAY;AACrE,oDAAwF;
|
|
1
|
+
{"version":3,"file":"transfer.js","sourceRoot":"","sources":["../../../src/core/intents/transfer.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
import { CoreRequestOptions, Logger, OwneraAPIInterface, UpdateMoveIntent } from '../../types';
|
|
2
|
+
export interface UpdateMoveIntentPayload {
|
|
3
|
+
owneraAPI: OwneraAPIInterface;
|
|
4
|
+
logger: Logger;
|
|
5
|
+
updateIntentRequest: UpdateMoveIntent;
|
|
6
|
+
}
|
|
7
|
+
/**
|
|
8
|
+
* Edit a Move intent. Supports three kinds of edit, alone or combined:
|
|
9
|
+
* - Replace the allowed destination assets (source immutable). CAIP-19
|
|
10
|
+
* identifiers are resolved via `resolveMoveAssetIdentifiers` (one getAssets
|
|
11
|
+
* call; fails loud if an asset can't be resolved), so callers pass SDK-facing
|
|
12
|
+
* `FinP2PAsset`s.
|
|
13
|
+
* - Change the active window via `start` / `end` (epoch ms → seconds).
|
|
14
|
+
* - Reject the intent via `status: 'Rejected'`.
|
|
15
|
+
*
|
|
16
|
+
* Custody-offered seg/pool fields are updatable with **omit = keep, not clear**
|
|
17
|
+
* semantics: `sourceToSegregatedAccount` is only put on the wire when supplied,
|
|
18
|
+
* so omitting it leaves the intent's existing value intact server-side. Never
|
|
19
|
+
* send a clearing value to mean "unchanged". Per-destination pools travel with
|
|
20
|
+
* the destinations that replace the list.
|
|
21
|
+
*
|
|
22
|
+
* At least one editable field is required. A status-only or window-only update
|
|
23
|
+
* sends no `intent` payload (the node's moveIntent update requires
|
|
24
|
+
* `destinationAssets`, so it's only sent when destinations are supplied — which
|
|
25
|
+
* also means changing `sourceToSegregatedAccount` requires re-sending the
|
|
26
|
+
* destination list).
|
|
27
|
+
*/
|
|
28
|
+
export declare const updateMoveIntentReq: (req: UpdateMoveIntentPayload, options?: CoreRequestOptions) => Promise<void>;
|
|
@@ -0,0 +1,94 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
+
});
|
|
10
|
+
};
|
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
exports.updateMoveIntentReq = void 0;
|
|
13
|
+
const helpers_1 = require("./createIntent/helpers");
|
|
14
|
+
/**
|
|
15
|
+
* Edit a Move intent. Supports three kinds of edit, alone or combined:
|
|
16
|
+
* - Replace the allowed destination assets (source immutable). CAIP-19
|
|
17
|
+
* identifiers are resolved via `resolveMoveAssetIdentifiers` (one getAssets
|
|
18
|
+
* call; fails loud if an asset can't be resolved), so callers pass SDK-facing
|
|
19
|
+
* `FinP2PAsset`s.
|
|
20
|
+
* - Change the active window via `start` / `end` (epoch ms → seconds).
|
|
21
|
+
* - Reject the intent via `status: 'Rejected'`.
|
|
22
|
+
*
|
|
23
|
+
* Custody-offered seg/pool fields are updatable with **omit = keep, not clear**
|
|
24
|
+
* semantics: `sourceToSegregatedAccount` is only put on the wire when supplied,
|
|
25
|
+
* so omitting it leaves the intent's existing value intact server-side. Never
|
|
26
|
+
* send a clearing value to mean "unchanged". Per-destination pools travel with
|
|
27
|
+
* the destinations that replace the list.
|
|
28
|
+
*
|
|
29
|
+
* At least one editable field is required. A status-only or window-only update
|
|
30
|
+
* sends no `intent` payload (the node's moveIntent update requires
|
|
31
|
+
* `destinationAssets`, so it's only sent when destinations are supplied — which
|
|
32
|
+
* also means changing `sourceToSegregatedAccount` requires re-sending the
|
|
33
|
+
* destination list).
|
|
34
|
+
*/
|
|
35
|
+
const updateMoveIntentReq = (req, options) => __awaiter(void 0, void 0, void 0, function* () {
|
|
36
|
+
var _a, _b, _c, _d, _e, _f;
|
|
37
|
+
const { owneraAPI, logger, updateIntentRequest } = req;
|
|
38
|
+
const { assetId, intentId, destinationAsset, destinationAssets, sourceToSegregatedAccount, start, end, status } = updateIntentRequest;
|
|
39
|
+
// `destinationAssets` wins over the single-destination `destinationAsset` alias.
|
|
40
|
+
const destinations = destinationAssets !== null && destinationAssets !== void 0 ? destinationAssets : (destinationAsset ? [destinationAsset] : []);
|
|
41
|
+
const hasDestinations = destinations.length > 0;
|
|
42
|
+
if (!hasDestinations && start === undefined && end === undefined && !status && !sourceToSegregatedAccount) {
|
|
43
|
+
throw {
|
|
44
|
+
code: 400,
|
|
45
|
+
name: 'updateMoveIntentError',
|
|
46
|
+
message: 'Editing a move intent requires at least one of: destinationAsset(s), sourceToSegregatedAccount, start/end, or status.',
|
|
47
|
+
data: updateIntentRequest,
|
|
48
|
+
};
|
|
49
|
+
}
|
|
50
|
+
// The node's moveIntent update payload requires `destinationAssets`, so a
|
|
51
|
+
// seg-account change can't ride on its own — fail here rather than sending a
|
|
52
|
+
// payload the node will reject.
|
|
53
|
+
if (sourceToSegregatedAccount && !hasDestinations) {
|
|
54
|
+
throw {
|
|
55
|
+
code: 400,
|
|
56
|
+
name: 'updateMoveIntentError',
|
|
57
|
+
message: "Updating sourceToSegregatedAccount requires re-sending destinationAsset(s); the node's move intent " +
|
|
58
|
+
'update payload requires a destination list.',
|
|
59
|
+
data: updateIntentRequest,
|
|
60
|
+
};
|
|
61
|
+
}
|
|
62
|
+
(0, helpers_1.assertMoveDestinationPools)(destinations, 'updateMoveIntentError', updateIntentRequest);
|
|
63
|
+
// Resolve CAIP-19 for each destination in one getAssets call (fail loud on
|
|
64
|
+
// unresolved assets), carrying each destination's optional pre-funded pool
|
|
65
|
+
// through.
|
|
66
|
+
const identifiers = hasDestinations
|
|
67
|
+
? yield (0, helpers_1.resolveMoveAssetIdentifiers)(owneraAPI, destinations.map((d) => d.resourceId))
|
|
68
|
+
: new Map();
|
|
69
|
+
const destinationAssetIdentifiers = destinations.map((d) => (Object.assign(Object.assign(Object.assign({}, identifiers.get(d.resourceId)), (d.fromSegregatedAccount ? { fromSegregatedAccount: d.fromSegregatedAccount } : {})), (d.fromSegregatedAccountOwner ? { fromSegregatedAccountOwner: d.fromSegregatedAccountOwner } : {}))));
|
|
70
|
+
logger.debug('🔵 [updateMoveIntent] destinationAssets:', JSON.stringify(destinationAssetIdentifiers, null, 2));
|
|
71
|
+
try {
|
|
72
|
+
return yield owneraAPI.profiles.updateIntent(Object.assign(Object.assign({ assetId,
|
|
73
|
+
intentId,
|
|
74
|
+
start,
|
|
75
|
+
end }, (status ? { status } : {})), (hasDestinations
|
|
76
|
+
? {
|
|
77
|
+
intent: Object.assign({ type: 'moveIntent', destinationAssets: destinationAssetIdentifiers }, (sourceToSegregatedAccount ? { sourceToSegregatedAccount } : {})),
|
|
78
|
+
}
|
|
79
|
+
: {})), { idempotency: options === null || options === void 0 ? void 0 : options.idempotencyKey });
|
|
80
|
+
}
|
|
81
|
+
catch (e) {
|
|
82
|
+
logger.error('Update Move Intent Error', JSON.stringify(e));
|
|
83
|
+
const errorMessage = ((_b = (_a = e === null || e === void 0 ? void 0 : e.data) === null || _a === void 0 ? void 0 : _a.error) === null || _b === void 0 ? void 0 : _b.message) || ((_f = (_e = (_d = (_c = e === null || e === void 0 ? void 0 : e.data) === null || _c === void 0 ? void 0 : _c.error) === null || _d === void 0 ? void 0 : _d.errors) === null || _e === void 0 ? void 0 : _e[0]) === null || _f === void 0 ? void 0 : _f.message) || (e === null || e === void 0 ? void 0 : e.message) || e;
|
|
84
|
+
throw {
|
|
85
|
+
// numeric only: on an empty-bodied or transport failure data.error.code is axios's string code
|
|
86
|
+
code: typeof (e === null || e === void 0 ? void 0 : e.code) === 'number' ? e.code : 500,
|
|
87
|
+
name: 'updateMoveIntentError',
|
|
88
|
+
message: typeof errorMessage === 'string' ? errorMessage : JSON.stringify(errorMessage),
|
|
89
|
+
data: updateIntentRequest,
|
|
90
|
+
};
|
|
91
|
+
}
|
|
92
|
+
});
|
|
93
|
+
exports.updateMoveIntentReq = updateMoveIntentReq;
|
|
94
|
+
//# sourceMappingURL=updateMoveIntentReq.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"updateMoveIntentReq.js","sourceRoot":"","sources":["../../../src/core/intents/updateMoveIntentReq.ts"],"names":[],"mappings":"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"}
|