@polymeshassociation/polymesh-sdk 29.1.0-beta.9 → 30.0.0

package/api/procedures/executeManualInstruction.js

@@ -25,21 +25,23 @@ const conversion_1 = require("../../utils/conversion");
 function prepareExecuteManualInstruction(args) {
     return __awaiter(this, void 0, void 0, function* () {
         var _a;
-        const { context: { polymeshApi: { tx: { settlement: settlementTx }, query: { settlement }, call: { settlementApi }, }, }, context, storage: { portfolios, instructionDetails, signerDid, offChainParties }, } = this;
+        const { context: { polymeshApi: { tx: { settlement: settlementTx }, query: { settlement }, call: { settlementApi }, }, }, context, storage: { allowedAssetHolders, instructionDetails, signerDid, offChainParties, mediatorDids }, } = this;
         const { id, skipAffirmationCheck } = args;
         const instruction = new internal_1.Instruction({ id }, context);
         yield (0, utils_1.assertInstructionValidForManualExecution)(instructionDetails, context);
-        if (!portfolios.length) {
+        if (!allowedAssetHolders.length) {
             const details = yield ((_a = instructionDetails.venue) === null || _a === void 0 ? void 0 : _a.details());
-            if ((details === null || details === void 0 ? void 0 : details.owner.did) !== signerDid && !offChainParties.has(signerDid)) {
+            if ((details === null || details === void 0 ? void 0 : details.owner.did) !== signerDid &&
+                !offChainParties.has(signerDid) &&
+                !mediatorDids.includes(signerDid)) {
                 throw new internal_1.PolymeshError({
                     code: types_1.ErrorCode.UnmetPrerequisite,
-                    message: 'The signing identity is not involved in this Instruction',
+                    message: 'The signer is not involved in this Instruction',
                 });
             }
         }
         const rawInstructionId = (0, conversion_1.bigNumberToU64)(id, context);
-        const rawPortfolioIds = portfolios.map(portfolio => (0, conversion_1.portfolioIdToMeshPortfolioId)((0, conversion_1.portfolioLikeToPortfolioId)(portfolio), context));
+        const rawAssetHolders = yield Promise.all(allowedAssetHolders.map((assetHolder) => __awaiter(this, void 0, void 0, function* () { return yield (0, conversion_1.assetHolderIdToMeshAssetHolder)((0, conversion_1.assetHolderLikeToAssetHolderId)(assetHolder), context); })));
         if (!skipAffirmationCheck) {
             const pendingAffirmationsCount = yield settlement.instructionAffirmsPending(rawInstructionId);
             if (!(0, conversion_1.u64ToBigNumber)(pendingAffirmationsCount).isZero()) {
@@ -59,7 +61,7 @@ function prepareExecuteManualInstruction(args) {
             resolver: instruction,
             args: [
                 rawInstructionId,
-                rawPortfolioIds.length ? rawPortfolioIds[0] : null,
+                rawAssetHolders.length ? rawAssetHolders[0] : null,
                 fungibleTokens,
                 nonFungibleTokens,
                 offChainAssets,
@@ -72,10 +74,10 @@ function prepareExecuteManualInstruction(args) {
  * @hidden
  */
 function getAuthorization() {
-    const { storage: { portfolios }, } = this;
+    const { storage: { allowedAssetHolders }, } = this;
     return {
         permissions: {
-            portfolios,
+            portfolios: allowedAssetHolders.filter(utils_3.isPortfolioAssetHolder),
             transactions: [types_1.TxTags.settlement.ExecuteManualInstruction],
             assets: [],
         },
@@ -88,13 +90,29 @@ function prepareStorage(_a) {
     return __awaiter(this, arguments, void 0, function* ({ id }) {
         const { context } = this;
         const instruction = new internal_1.Instruction({ id }, context);
-        const [{ data: legs }, { did }, details] = yield Promise.all([
+        const [{ data: legs }, { did }, details, mediatorAffirmations] = yield Promise.all([
             instruction.getLegsFromChain(),
             context.getSigningIdentity(),
             instruction.detailsFromChain(),
+            instruction.getMediators(),
         ]);
-        const [portfolios, offChainParties] = yield legs.reduce((accPromise, leg) => __awaiter(this, void 0, void 0, function* () {
-            const [custodiedPortfolios, offChainDids] = yield accPromise;
+        const mediatorDids = mediatorAffirmations.map(({ identity: { did: mediatorDid } }) => mediatorDid);
+        const [allowedHolders, offChainParties] = yield legs.reduce((accPromise, leg) => __awaiter(this, void 0, void 0, function* () {
+            const [allowedAssetHolders, offChainDids] = yield accPromise;
+            const getAssetHolderIfAllowed = (assetHolder) => __awaiter(this, void 0, void 0, function* () {
+                if (assetHolder instanceof internal_1.Account) {
+                    const identity = yield assetHolder.getIdentity();
+                    if ((identity === null || identity === void 0 ? void 0 : identity.did) === did) {
+                        return assetHolder;
+                    }
+                    return null;
+                }
+                const isCustodied = yield assetHolder.isCustodiedBy({ identity: did });
+                if (isCustodied) {
+                    return assetHolder;
+                }
+                return null;
+            });
             if ((0, utils_3.isOffChainLeg)(leg)) {
                 const { from, to } = leg;
                 offChainDids.add(from.did);
@@ -102,24 +120,27 @@ function prepareStorage(_a) {
             }
             else {
                 const { from, to } = leg;
-                const [fromIsCustodied, toIsCustodied] = yield Promise.all([
-                    from.isCustodiedBy({ identity: did }),
-                    to.isCustodiedBy({ identity: did }),
+                const fromAssetHolder = (0, conversion_1.assetHolderLikeToAssetHolder)(from, context);
+                const toAssetHolder = (0, conversion_1.assetHolderLikeToAssetHolder)(to, context);
+                const [fromPortfolio, toPortfolio] = yield Promise.all([
+                    getAssetHolderIfAllowed(fromAssetHolder),
+                    getAssetHolderIfAllowed(toAssetHolder),
                 ]);
-                if (fromIsCustodied) {
-                    custodiedPortfolios.push(from);
+                if (fromPortfolio) {
+                    allowedAssetHolders.push(fromPortfolio);
                 }
-                if (toIsCustodied) {
-                    custodiedPortfolios.push(to);
+                if (toPortfolio) {
+                    allowedAssetHolders.push(toPortfolio);
                 }
             }
-            return (0, utils_2.tuple)(custodiedPortfolios, offChainDids);
+            return (0, utils_2.tuple)(allowedAssetHolders, offChainDids);
         }), Promise.resolve((0, utils_2.tuple)([], new Set())));
         return {
-            portfolios,
+            allowedAssetHolders: allowedHolders,
             instructionDetails: details,
             signerDid: did,
             offChainParties,
+            mediatorDids,
         };
     });
 }

package/api/procedures/executeManualInstruction.js.map

@@ -1 +1 @@
-{"version":3,"file":"executeManualInstruction.js","sourceRoot":"","sources":["../../../src/api/procedures/executeManualInstruction.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"executeManualInstruction.js","sourceRoot":"","sources":["../../../src/api/procedures/executeManualInstruction.ts"],"names":[],"mappings":"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"}

package/api/procedures/initiateCorporateAction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"initiateCorporateAction.d.ts","sourceRoot":"","sources":["../../../src/api/procedures/initiateCorporateAction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAE3D,OAAO,EACL,UAAU,EACV,kBAAkB,EAClB,OAAO,EACP,eAAe,EACf,aAAa,EAEb,SAAS,EACV,MAAM,YAAY,CAAC;AACpB,OAAO,EAAa,6BAA6B,EAAU,MAAM,SAAS,CAAC;AAC3E,OAAO,EAAE,eAAe,EAAE,sBAAsB,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAc5F;;GAEG;AACH,MAAM,MAAM,MAAM,GAAG,6BAA6B,GAAG;IACnD,KAAK,EAAE,aAAa,CAAC;CACtB,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,+BAA+B,GACzC,OAAO,aAAa,EAAE,SAAS,OAAO,MAChC,SAAS,kBAAkB,KAAG,OAAO,CAAC,eAAe,CAyB3D,CAAC;AAEJ;;GAEG;AACH,wBAAsB,qBAAqB,CACzC,UAAU,EAAE,UAAU,GAAG,kBAAkB,GAAG,IAAI,GACjD,OAAO,CAAC,IAAI,CAAC,CAgCf;AAED;;GAEG;AACH,wBAAsB,8BAA8B,CAClD,IAAI,EAAE,SAAS,CAAC,MAAM,EAAE,eAAe,CAAC,EACxC,IAAI,EAAE,MAAM,GACX,OAAO,CACR,eAAe,CAAC,eAAe,EAAE,eAAe,CAAC,iBAAiB,EAAE,yBAAyB,CAAC,CAAC,CAChG,CA0EA;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,SAAS,CAAC,MAAM,EAAE,eAAe,CAAC,EACxC,EAAE,KAAK,EAAE,EAAE,MAAM,GAChB,sBAAsB,CAQxB;AAED;;GAEG;AACH,eAAO,MAAM,uBAAuB,QAAO,SAAS,CAAC,MAAM,EAAE,eAAe,CACX,CAAC"}
+{"version":3,"file":"initiateCorporateAction.d.ts","sourceRoot":"","sources":["../../../src/api/procedures/initiateCorporateAction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAG3D,OAAO,EACL,UAAU,EACV,kBAAkB,EAClB,OAAO,EACP,eAAe,EACf,aAAa,EAEb,SAAS,EACV,MAAM,YAAY,CAAC;AACpB,OAAO,EAAa,6BAA6B,EAAU,MAAM,SAAS,CAAC;AAC3E,OAAO,EAAE,eAAe,EAAE,sBAAsB,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAc5F;;GAEG;AACH,MAAM,MAAM,MAAM,GAAG,6BAA6B,GAAG;IACnD,KAAK,EAAE,aAAa,CAAC;CACtB,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,+BAA+B,GACzC,OAAO,aAAa,EAAE,SAAS,OAAO,MAChC,SAAS,kBAAkB,KAAG,OAAO,CAAC,eAAe,CAyB3D,CAAC;AAEJ;;GAEG;AACH,wBAAsB,qBAAqB,CACzC,UAAU,EAAE,UAAU,GAAG,kBAAkB,GAAG,IAAI,GACjD,OAAO,CAAC,IAAI,CAAC,CAgCf;AAED;;GAEG;AACH,wBAAsB,8BAA8B,CAClD,IAAI,EAAE,SAAS,CAAC,MAAM,EAAE,eAAe,CAAC,EACxC,IAAI,EAAE,MAAM,GACX,OAAO,CACR,eAAe,CAAC,eAAe,EAAE,eAAe,CAAC,iBAAiB,EAAE,yBAAyB,CAAC,CAAC,CAChG,CAoFA;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,SAAS,CAAC,MAAM,EAAE,eAAe,CAAC,EACxC,EAAE,KAAK,EAAE,EAAE,MAAM,GAChB,sBAAsB,CAQxB;AAED;;GAEG;AACH,eAAO,MAAM,uBAAuB,QAAO,SAAS,CAAC,MAAM,EAAE,eAAe,CACX,CAAC"}

package/api/procedures/initiateCorporateAction.js

@@ -13,6 +13,7 @@ exports.initiateCorporateAction = exports.initiateCorporateActionResolver = void
 exports.assertCheckpointValue = assertCheckpointValue;
 exports.prepareInitiateCorporateAction = prepareInitiateCorporateAction;
 exports.getAuthorization = getAuthorization;
+const utils_1 = require("../../api/procedures/utils");
 const internal_1 = require("../../internal");
 const types_1 = require("../../types");
 const conversion_1 = require("../../utils/conversion");
@@ -74,12 +75,15 @@ function prepareInitiateCorporateAction(args) {
     return __awaiter(this, void 0, void 0, function* () {
         const { context: { polymeshApi: { tx: { corporateAction }, query, }, }, context, } = this;
         const { asset, kind, description, targets, declarationDate, checkpoint, taxWithholdings, defaultTaxWithholding, } = args;
+        // Validate declarationDate is in the past
         (0, internal_2.assertDeclarationDate)(declarationDate);
+        // Validate checkpoint/recordDate
         let checkpointValue = null;
         if (checkpoint) {
             checkpointValue = yield (0, internal_2.getCheckpointValue)(checkpoint, asset, context);
             yield assertCheckpointValue(checkpointValue);
         }
+        // Validate details length (max_details_length)
         const rawMaxDetailsLength = yield query.corporateAction.maxDetailsLength();
         const maxDetailsLength = (0, conversion_1.u32ToBigNumber)(rawMaxDetailsLength);
         // ensure the corporate action details are short enough
@@ -92,6 +96,12 @@ function prepareInitiateCorporateAction(args) {
                 },
             });
         }
+        // Validate targets limit (handled in targetsToTargetIdentities conversion)
+        // Validate withholding_tax: check limit and detect duplicates (chain throws error on duplicates)
+        if (taxWithholdings && taxWithholdings.length > 0) {
+            // Check limit and detect duplicates (assertCaTaxWithholdingsValid handles both)
+            (0, utils_1.assertCaTaxWithholdingsValid)(taxWithholdings, context);
+        }
         const rawArgs = (0, conversion_1.corporateActionParamsToMeshCorporateActionArgs)({
             asset,
             kind,

package/api/procedures/initiateCorporateAction.js.map

@@ -1 +1 @@
-{"version":3,"file":"initiateCorporateAction.js","sourceRoot":"","sources":["../../../src/api/procedures/initiateCorporateAction.ts"],"names":[],"mappings":";;;;;;;;;;;;AAoEA,sDAkCC;AAKD,wEA+EC;AAKD,4CAWC;AAxMD,yCAQoB;AACpB,mCAA2E;AAE3E,mDAK4B;AAC5B,+CAK0B;AAS1B;;GAEG;AACI,MAAM,+BAA+B,GAC1C,CAAC,KAAoB,EAAE,OAAgB,EAAE,EAAE,CAC3C,CAAO,OAA2B,EAA4B,EAAE;IAC9D,MAAM,CAAC,MAAM,CAAC,GAAG,IAAA,6BAAkB,EAAC,OAAO,EAAE,iBAAiB,EAAE,aAAa,CAAC,CAAC;IAE/E,MAAM,EAAE,IAAI,EAAE,GAAG,MAAO,CAAC;IACzB,MAAM,CAAC,EAAE,IAAI,CAAC,GAAG,IAAI,CAAC;IAEtB,MAAM,EAAE,GAAG,IAAA,2BAAc,EAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACxC,MAAM,OAAO,GAAG,IAAA,4BAAe,EAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAE9C,MAAM,EAAE,eAAe,EAAE,WAAW,EAAE,GAAG,MAAM,IAAA,4CAAiC,EAC9E,KAAK,EACL,EAAE,EACF,OAAO,CACR,CAAC;IAEF,MAAM,MAAM,GAAG,IAAI,0BAAe,iBAE9B,OAAO;QACP,EAAE,IACC,IAAA,uDAA0C,EAAC,eAAe,EAAE,WAAW,EAAE,OAAO,CAAC,GAEtF,OAAO,CACR,CAAC;IAEF,OAAO,MAAM,CAAC;AAChB,CAAC,CAAA,CAAC;AA3BS,QAAA,+BAA+B,mCA2BxC;AAEJ;;GAEG;AACH,SAAsB,qBAAqB,CACzC,UAAkD;;QAElD,IAAI,UAAU,YAAY,qBAAU,EAAE,CAAC;YACrC,MAAM,SAAS,GAAG,MAAM,UAAU,CAAC,SAAS,EAAE,CAAC;YAE/C,kDAAkD;YAClD,IAAI,SAAS,GAAG,IAAI,IAAI,EAAE,EAAE,CAAC;gBAC3B,MAAM,IAAI,wBAAa,CAAC;oBACtB,IAAI,EAAE,iBAAS,CAAC,eAAe;oBAC/B,OAAO,EAAE,kCAAkC;oBAC3C,IAAI,EAAE;wBACJ,UAAU,EAAE,UAAU,CAAC,OAAO,EAAE;qBACjC;iBACF,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QAED,IAAI,UAAU,YAAY,6BAAkB,IAAI,UAAU,CAAC,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACtF,MAAM,IAAI,wBAAa,CAAC;gBACtB,IAAI,EAAE,iBAAS,CAAC,eAAe;gBAC/B,OAAO,EAAE,4DAA4D;aACtE,CAAC,CAAC;QACL,CAAC;QAED,IAAI,UAAU,YAAY,IAAI,IAAI,UAAU,GAAG,IAAI,IAAI,EAAE,EAAE,CAAC;YAC1D,MAAM,IAAI,wBAAa,CAAC;gBACtB,IAAI,EAAE,iBAAS,CAAC,eAAe;gBAC/B,OAAO,EAAE,kCAAkC;gBAC3C,IAAI,EAAE;oBACJ,UAAU;iBACX;aACF,CAAC,CAAC;QACL,CAAC;IACH,CAAC;CAAA;AAED;;GAEG;AACH,SAAsB,8BAA8B,CAElD,IAAY;;QAIZ,MAAM,EACJ,OAAO,EAAE,EACP,WAAW,EAAE,EACX,EAAE,EAAE,EAAE,eAAe,EAAE,EACvB,KAAK,GACN,GACF,EACD,OAAO,GACR,GAAG,IAAI,CAAC;QAET,MAAM,EACJ,KAAK,EACL,IAAI,EACJ,WAAW,EACX,OAAO,EACP,eAAe,EACf,UAAU,EACV,eAAe,EACf,qBAAqB,GACtB,GAAG,IAAI,CAAC;QAET,IAAA,gCAAqB,EAAC,eAAe,CAAC,CAAC;QAEvC,IAAI,eAAe,GAAkD,IAAI,CAAC;QAE1E,IAAI,UAAU,EAAE,CAAC;YACf,eAAe,GAAG,MAAM,IAAA,6BAAkB,EAAC,UAAU,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;YAEvE,MAAM,qBAAqB,CAAC,eAAe,CAAC,CAAC;QAC/C,CAAC;QAED,MAAM,mBAAmB,GAAG,MAAM,KAAK,CAAC,eAAe,CAAC,gBAAgB,EAAE,CAAC;QAC3E,MAAM,gBAAgB,GAAG,IAAA,2BAAc,EAAC,mBAAmB,CAAC,CAAC;QAE7D,uDAAuD;QACvD,IAAI,gBAAgB,CAAC,EAAE,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC;YAC5C,MAAM,IAAI,wBAAa,CAAC;gBACtB,IAAI,EAAE,iBAAS,CAAC,eAAe;gBAC/B,OAAO,EAAE,sBAAsB;gBAC/B,IAAI,EAAE;oBACJ,SAAS,EAAE,gBAAgB,CAAC,QAAQ,EAAE;iBACvC;aACF,CAAC,CAAC;QACL,CAAC;QAED,MAAM,OAAO,GAAG,IAAA,2DAA8C,EAC5D;YACE,KAAK;YACL,IAAI;YACJ,eAAe;YACf,WAAW;YACX,UAAU,EAAE,eAAe;YAC3B,OAAO;YACP,qBAAqB;YACrB,eAAe;SAChB,EACD,OAAO,CACR,CAAC;QAEF,OAAO;YACL,WAAW,EAAE,eAAe,CAAC,uBAAuB;YACpD,IAAI,EAAE;gBACJ,OAAO,CAAC,OAAO;gBACf,OAAO,CAAC,IAAI;gBACZ,OAAO,CAAC,QAAQ;gBAChB,OAAO,CAAC,UAAU;gBAClB,OAAO,CAAC,OAAO;gBACf,OAAO,CAAC,OAAO;gBACf,OAAO,CAAC,qBAAqB;gBAC7B,OAAO,CAAC,cAAc;aACvB;YACD,QAAQ,EAAE,IAAA,uCAA+B,EAAC,KAAK,EAAE,OAAO,CAAC;SAC1D,CAAC;IACJ,CAAC;CAAA;AAED;;GAEG;AACH,SAAgB,gBAAgB,CAE9B,EAAE,KAAK,EAAU;IAEjB,OAAO;QACL,WAAW,EAAE;YACX,YAAY,EAAE,CAAC,cAAM,CAAC,eAAe,CAAC,uBAAuB,CAAC;YAC9D,MAAM,EAAE,CAAC,KAAK,CAAC;YACf,UAAU,EAAE,EAAE;SACf;KACF,CAAC;AACJ,CAAC;AAED;;GAEG;AACI,MAAM,uBAAuB,GAAG,GAAuC,EAAE,CAC9E,IAAI,oBAAS,CAAC,8BAA8B,EAAE,gBAAgB,CAAC,CAAC;AADrD,QAAA,uBAAuB,2BAC8B"}
+{"version":3,"file":"initiateCorporateAction.js","sourceRoot":"","sources":["../../../src/api/procedures/initiateCorporateAction.ts"],"names":[],"mappings":"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"}

package/api/procedures/issueNft.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"issueNft.d.ts","sourceRoot":"","sources":["../../../src/api/procedures/issueNft.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,SAAS,MAAM,cAAc,CAAC;AAErC,OAAO,EAAE,GAAG,EAAE,MAAM,sCAAsC,CAAC;AAC3D,OAAO,EAAE,OAAO,EAAE,aAAa,EAAiB,SAAS,EAAE,MAAM,YAAY,CAAC;AAC9E,OAAO,EAA4B,gBAAgB,EAAU,MAAM,SAAS,CAAC;AAC7E,OAAO,EAAE,oBAAoB,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAShF,MAAM,MAAM,MAAM,GAAG;IACnB,YAAY,EAAE,gBAAgB,EAAE,EAAE,CAAC;IACnC,WAAW,CAAC,EAAE,SAAS,GAAG,SAAS,CAAC;IACpC,UAAU,EAAE,aAAa,CAAC;CAC3B,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,kBAAkB,GAC5B,SAAS,OAAO,MAChB,SAAS,kBAAkB,KAAG,GAAG,EASjC,CAAC;AAsCJ;;GAEG;AACH,wBAAsB,eAAe,CACnC,IAAI,EAAE,SAAS,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,EAC9B,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,oBAAoB,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,EAAE,CAAC,CAAC,CAmCnD;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,SAAS,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,EAC9B,EAAE,UAAU,EAAE,EAAE,MAAM,GACrB,sBAAsB,CAQxB;AAED;;GAEG;AACH,eAAO,MAAM,QAAQ,QAAO,SAAS,CAAC,MAAM,EAAE,GAAG,EAAE,CACD,CAAC"}
+{"version":3,"file":"issueNft.d.ts","sourceRoot":"","sources":["../../../src/api/procedures/issueNft.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,SAAS,MAAM,cAAc,CAAC;AAErC,OAAO,EAAE,GAAG,EAAE,MAAM,sCAAsC,CAAC;AAC3D,OAAO,EAAE,OAAO,EAAE,aAAa,EAAiB,SAAS,EAAE,MAAM,YAAY,CAAC;AAC9E,OAAO,EAA4B,gBAAgB,EAAU,MAAM,SAAS,CAAC;AAC7E,OAAO,EAAE,oBAAoB,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAShF,MAAM,MAAM,MAAM,GAAG;IACnB,YAAY,EAAE,gBAAgB,EAAE,EAAE,CAAC;IACnC,WAAW,CAAC,EAAE,SAAS,GAAG,SAAS,CAAC;IACpC,UAAU,EAAE,aAAa,CAAC;CAC3B,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,kBAAkB,GAC5B,SAAS,OAAO,MAChB,SAAS,kBAAkB,KAAG,GAAG,EAejC,CAAC;AAsCJ;;GAEG;AACH,wBAAsB,eAAe,CACnC,IAAI,EAAE,SAAS,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,EAC9B,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,oBAAoB,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,EAAE,CAAC,CAAC,CAmCnD;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,SAAS,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,EAC9B,EAAE,UAAU,EAAE,EAAE,MAAM,GACrB,sBAAsB,CAQxB;AAED;;GAEG;AACH,eAAO,MAAM,QAAQ,QAAO,SAAS,CAAC,MAAM,EAAE,GAAG,EAAE,CACD,CAAC"}

package/api/procedures/issueNft.js

@@ -21,7 +21,14 @@ const internal_2 = require("../../utils/internal");
  * @hidden
  */
 const issuedNftsResolver = (context) => (receipt) => {
-    const records = (0, internal_2.filterEventRecords)(receipt, 'nft', 'NFTPortfolioUpdated');
+    let records;
+    if (context.isV7) {
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        records = (0, internal_2.filterEventRecords)(receipt, 'nft', 'NFTPortfolioUpdated');
+    }
+    else {
+        records = (0, internal_2.filterEventRecords)(receipt, 'nft', 'NFTHoldingsUpdated');
+    }
     return records.map(({ data }) => {
         const { assetId, ids } = (0, conversion_1.meshNftToNftId)(data[1]);
         const id = ids[0];
@@ -70,10 +77,10 @@ function prepareIssueNft(args) {
             ? yield signingIdentity.portfolios.getPortfolio({ portfolioId })
             : yield signingIdentity.portfolios.getPortfolio();
         const rawAssetId = (0, conversion_1.assetToMeshAssetId)(collection, context);
-        const rawPortfolio = (0, conversion_1.portfolioToPortfolioKind)(portfolio, context);
+        const rawAssetHolder = (0, conversion_1.assetHolderToAssetHolderKind)(portfolio, context);
         const transactions = rawMetadataValues.map(metadata => (0, internal_2.checkTxType)({
             transaction: tx.nft.issueNft,
-            args: [rawAssetId, metadata, rawPortfolio],
+            args: [rawAssetId, metadata, rawAssetHolder],
         }));
         return {
             transactions,

package/api/procedures/issueNft.js.map

@@ -1 +1 @@
-{"version":3,"file":"issueNft.js","sourceRoot":"","sources":["../../../src/api/procedures/issueNft.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"issueNft.js","sourceRoot":"","sources":["../../../src/api/procedures/issueNft.ts"],"names":[],"mappings":"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"}

package/api/procedures/issueTokens.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"issueTokens.d.ts","sourceRoot":"","sources":["../../../src/api/procedures/issueTokens.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAiB,SAAS,EAAE,MAAM,YAAY,CAAC;AACrE,OAAO,EAAa,iBAAiB,EAAU,MAAM,SAAS,CAAC;AAC/D,OAAO,EAAE,eAAe,EAAE,sBAAsB,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAQ5F,MAAM,MAAM,MAAM,GAAG,iBAAiB,GAAG;IACvC,KAAK,EAAE,aAAa,CAAC;CACtB,CAAC;AAEF;;GAEG;AACH,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,SAAS,CAAC,MAAM,EAAE,aAAa,CAAC,EACtC,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,eAAe,CAAC,aAAa,EAAE,eAAe,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,CAyC5E;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,SAAS,CAAC,MAAM,EAAE,aAAa,CAAC,EACtC,EAAE,KAAK,EAAE,EAAE,MAAM,GAChB,sBAAsB,CAQxB;AAED;;GAEG;AACH,eAAO,MAAM,WAAW,QAAO,SAAS,CAAC,MAAM,EAAE,aAAa,CACT,CAAC"}
+{"version":3,"file":"issueTokens.d.ts","sourceRoot":"","sources":["../../../src/api/procedures/issueTokens.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAiB,SAAS,EAAE,MAAM,YAAY,CAAC;AACrE,OAAO,EAAa,iBAAiB,EAAU,MAAM,SAAS,CAAC;AAC/D,OAAO,EAAE,eAAe,EAAE,sBAAsB,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAS5F,MAAM,MAAM,MAAM,GAAG,iBAAiB,GAAG;IACvC,KAAK,EAAE,aAAa,CAAC;CACtB,CAAC;AAEF;;GAEG;AACH,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,SAAS,CAAC,MAAM,EAAE,aAAa,CAAC,EACtC,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,eAAe,CAAC,aAAa,EAAE,eAAe,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,CA4D5E;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,SAAS,CAAC,MAAM,EAAE,aAAa,CAAC,EACtC,EAAE,KAAK,EAAE,EAAE,MAAM,GAChB,sBAAsB,CAQxB;AAED;;GAEG;AACH,eAAO,MAAM,WAAW,QAAO,SAAS,CAAC,MAAM,EAAE,aAAa,CACT,CAAC"}

package/api/procedures/issueTokens.js

@@ -16,13 +16,26 @@ const internal_1 = require("../../internal");
 const types_1 = require("../../types");
 const constants_1 = require("../../utils/constants");
 const conversion_1 = require("../../utils/conversion");
+const internal_2 = require("../../utils/internal");
 /**
  * @hidden
  */
 function prepareIssueTokens(args) {
     return __awaiter(this, void 0, void 0, function* () {
         const { context: { polymeshApi: { tx: { asset }, }, }, context, } = this;
-        const { asset: assetEntity, amount, portfolioId } = args;
+        const { asset: assetEntity, amount, portfolioId, account } = args;
+        if (portfolioId && account) {
+            throw new internal_1.PolymeshError({
+                code: types_1.ErrorCode.ValidationError,
+                message: 'Only one of portfolioId or account can be provided to issue tokens',
+            });
+        }
+        if (account && context.getSigningAccount().address !== account) {
+            throw new internal_1.PolymeshError({
+                code: types_1.ErrorCode.UnmetPrerequisite,
+                message: 'Account should be same as the signing account',
+            });
+        }
         const [{ isDivisible, totalSupply }, signingIdentity] = yield Promise.all([
             assetEntity.details(),
             context.getSigningIdentity(),
@@ -38,15 +51,21 @@ function prepareIssueTokens(args) {
                 },
             });
         }
-        const portfolio = portfolioId
-            ? yield signingIdentity.portfolios.getPortfolio({ portfolioId })
-            : yield signingIdentity.portfolios.getPortfolio();
         const rawAssetId = (0, conversion_1.assetToMeshAssetId)(assetEntity, context);
         const rawValue = (0, conversion_1.bigNumberToBalance)(amount, context, isDivisible);
-        const rawPortfolio = (0, conversion_1.portfolioToPortfolioKind)(portfolio, context);
+        let rawAssetHolder;
+        if (account) {
+            rawAssetHolder = (0, conversion_1.assetHolderToAssetHolderKind)((0, internal_2.asAccount)(account, context), context);
+        }
+        else {
+            const portfolio = portfolioId
+                ? yield signingIdentity.portfolios.getPortfolio({ portfolioId })
+                : yield signingIdentity.portfolios.getPortfolio();
+            rawAssetHolder = (0, conversion_1.assetHolderToAssetHolderKind)(portfolio, context);
+        }
         return {
             transaction: asset.issue,
-            args: [rawAssetId, rawValue, rawPortfolio],
+            args: [rawAssetId, rawValue, rawAssetHolder],
             resolver: assetEntity,
         };
     });

package/api/procedures/issueTokens.js.map

@@ -1 +1 @@
-{"version":3,"file":"issueTokens.js","sourceRoot":"","sources":["../../../src/api/procedures/issueTokens.ts"],"names":[],"mappings":";;;;;;;;;;;;AAiBA,gDA4CC;AAKD,4CAWC;AA7ED,yCAAqE;AACrE,mCAA+D;AAE/D,iDAAgD;AAChD,mDAI4B;AAM5B;;GAEG;AACH,SAAsB,kBAAkB,CAEtC,IAAY;;QAEZ,MAAM,EACJ,OAAO,EAAE,EACP,WAAW,EAAE,EACX,EAAE,EAAE,EAAE,KAAK,EAAE,GACd,GACF,EACD,OAAO,GACR,GAAG,IAAI,CAAC;QACT,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC;QAEzD,MAAM,CAAC,EAAE,WAAW,EAAE,WAAW,EAAE,EAAE,eAAe,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACxE,WAAW,CAAC,OAAO,EAAE;YACrB,OAAO,CAAC,kBAAkB,EAAE;SAC7B,CAAC,CAAC;QACH,MAAM,eAAe,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAEjD,IAAI,eAAe,CAAC,aAAa,CAAC,uBAAW,CAAC,EAAE,CAAC;YAC/C,MAAM,IAAI,wBAAa,CAAC;gBACtB,IAAI,EAAE,iBAAS,CAAC,aAAa;gBAC7B,OAAO,EAAE,2DAA2D,WAAW,CAAC,EAAE,8BAA8B;gBAChH,IAAI,EAAE;oBACJ,aAAa,EAAE,WAAW;oBAC1B,WAAW,EAAE,uBAAW;iBACzB;aACF,CAAC,CAAC;QACL,CAAC;QAED,MAAM,SAAS,GAAG,WAAW;YAC3B,CAAC,CAAC,MAAM,eAAe,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,WAAW,EAAE,CAAC;YAChE,CAAC,CAAC,MAAM,eAAe,CAAC,UAAU,CAAC,YAAY,EAAE,CAAC;QAEpD,MAAM,UAAU,GAAG,IAAA,+BAAkB,EAAC,WAAW,EAAE,OAAO,CAAC,CAAC;QAC5D,MAAM,QAAQ,GAAG,IAAA,+BAAkB,EAAC,MAAM,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC;QAClE,MAAM,YAAY,GAAG,IAAA,qCAAwB,EAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAElE,OAAO;YACL,WAAW,EAAE,KAAK,CAAC,KAAK;YACxB,IAAI,EAAE,CAAC,UAAU,EAAE,QAAQ,EAAE,YAAY,CAAC;YAC1C,QAAQ,EAAE,WAAW;SACtB,CAAC;IACJ,CAAC;CAAA;AAED;;GAEG;AACH,SAAgB,gBAAgB,CAE9B,EAAE,KAAK,EAAU;IAEjB,OAAO;QACL,WAAW,EAAE;YACX,YAAY,EAAE,CAAC,cAAM,CAAC,KAAK,CAAC,KAAK,CAAC;YAClC,MAAM,EAAE,CAAC,KAAK,CAAC;YACf,UAAU,EAAE,EAAE;SACf;KACF,CAAC;AACJ,CAAC;AAED;;GAEG;AACI,MAAM,WAAW,GAAG,GAAqC,EAAE,CAChE,IAAI,oBAAS,CAAC,kBAAkB,EAAE,gBAAgB,CAAC,CAAC;AADzC,QAAA,WAAW,eAC8B"}
+{"version":3,"file":"issueTokens.js","sourceRoot":"","sources":["../../../src/api/procedures/issueTokens.ts"],"names":[],"mappings":";;;;;;;;;;;;AAkBA,gDA+DC;AAKD,4CAWC;AAjGD,yCAAqE;AACrE,mCAA+D;AAE/D,iDAAgD;AAChD,mDAI4B;AAC5B,+CAA6C;AAM7C;;GAEG;AACH,SAAsB,kBAAkB,CAEtC,IAAY;;QAEZ,MAAM,EACJ,OAAO,EAAE,EACP,WAAW,EAAE,EACX,EAAE,EAAE,EAAE,KAAK,EAAE,GACd,GACF,EACD,OAAO,GACR,GAAG,IAAI,CAAC;QACT,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;QAElE,IAAI,WAAW,IAAI,OAAO,EAAE,CAAC;YAC3B,MAAM,IAAI,wBAAa,CAAC;gBACtB,IAAI,EAAE,iBAAS,CAAC,eAAe;gBAC/B,OAAO,EAAE,oEAAoE;aAC9E,CAAC,CAAC;QACL,CAAC;QAED,IAAI,OAAO,IAAI,OAAO,CAAC,iBAAiB,EAAE,CAAC,OAAO,KAAK,OAAO,EAAE,CAAC;YAC/D,MAAM,IAAI,wBAAa,CAAC;gBACtB,IAAI,EAAE,iBAAS,CAAC,iBAAiB;gBACjC,OAAO,EAAE,+CAA+C;aACzD,CAAC,CAAC;QACL,CAAC;QAED,MAAM,CAAC,EAAE,WAAW,EAAE,WAAW,EAAE,EAAE,eAAe,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACxE,WAAW,CAAC,OAAO,EAAE;YACrB,OAAO,CAAC,kBAAkB,EAAE;SAC7B,CAAC,CAAC;QACH,MAAM,eAAe,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAEjD,IAAI,eAAe,CAAC,aAAa,CAAC,uBAAW,CAAC,EAAE,CAAC;YAC/C,MAAM,IAAI,wBAAa,CAAC;gBACtB,IAAI,EAAE,iBAAS,CAAC,aAAa;gBAC7B,OAAO,EAAE,2DAA2D,WAAW,CAAC,EAAE,8BAA8B;gBAChH,IAAI,EAAE;oBACJ,aAAa,EAAE,WAAW;oBAC1B,WAAW,EAAE,uBAAW;iBACzB;aACF,CAAC,CAAC;QACL,CAAC;QAED,MAAM,UAAU,GAAG,IAAA,+BAAkB,EAAC,WAAW,EAAE,OAAO,CAAC,CAAC;QAC5D,MAAM,QAAQ,GAAG,IAAA,+BAAkB,EAAC,MAAM,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC;QAElE,IAAI,cAAc,CAAC;QACnB,IAAI,OAAO,EAAE,CAAC;YACZ,cAAc,GAAG,IAAA,yCAA4B,EAAC,IAAA,oBAAS,EAAC,OAAO,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,CAAC;QACtF,CAAC;aAAM,CAAC;YACN,MAAM,SAAS,GAAG,WAAW;gBAC3B,CAAC,CAAC,MAAM,eAAe,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,WAAW,EAAE,CAAC;gBAChE,CAAC,CAAC,MAAM,eAAe,CAAC,UAAU,CAAC,YAAY,EAAE,CAAC;YACpD,cAAc,GAAG,IAAA,yCAA4B,EAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QACpE,CAAC;QAED,OAAO;YACL,WAAW,EAAE,KAAK,CAAC,KAAK;YACxB,IAAI,EAAE,CAAC,UAAU,EAAE,QAAQ,EAAE,cAAc,CAAC;YAC5C,QAAQ,EAAE,WAAW;SACtB,CAAC;IACJ,CAAC;CAAA;AAED;;GAEG;AACH,SAAgB,gBAAgB,CAE9B,EAAE,KAAK,EAAU;IAEjB,OAAO;QACL,WAAW,EAAE;YACX,YAAY,EAAE,CAAC,cAAM,CAAC,KAAK,CAAC,KAAK,CAAC;YAClC,MAAM,EAAE,CAAC,KAAK,CAAC;YACf,UAAU,EAAE,EAAE;SACf;KACF,CAAC;AACJ,CAAC;AAED;;GAEG;AACI,MAAM,WAAW,GAAG,GAAqC,EAAE,CAChE,IAAI,oBAAS,CAAC,kBAAkB,EAAE,gBAAgB,CAAC,CAAC;AADzC,QAAA,WAAW,eAC8B"}

package/api/procedures/modifyInstructionAffirmation.d.ts

@@ -1,13 +1,13 @@
 import { ExecuteInstructionInfo } from '@polymeshassociation/polymesh-types/polkadot/polymesh';
 import BigNumber from 'bignumber.js';
 import { Identity, Instruction, Procedure } from '../../internal';
-import { DefaultPortfolio, ModifyInstructionAffirmationParams, NumberedPortfolio, PortfolioId, PortfolioLike } from '../../types';
+import { AssetHolder, AssetHolderId, AssetHolderLike, ModifyInstructionAffirmationParams } from '../../types';
 import { ExtrinsicParams, ProcedureAuthorization, TransactionSpec } from '../../types/internal';
 export interface Storage {
-    portfolios: (DefaultPortfolio | NumberedPortfolio)[];
-    portfolioParams: PortfolioLike[];
-    senderLegAmount: BigNumber;
-    totalLegAmount: BigNumber;
+    allowedAssetHolders: AssetHolder[];
+    assetHolderParams: AssetHolderLike[];
+    senderLegCount: BigNumber;
+    totalLegCount: BigNumber;
     signer: Identity;
     offChainLegIndices: number[];
     instructionInfo: ExecuteInstructionInfo;
@@ -23,7 +23,7 @@ export declare function getAuthorization(this: Procedure<ModifyInstructionAffirm
 /**
  * @hidden
  */
-export declare const isParam: (legPortfolio: DefaultPortfolio | NumberedPortfolio, portfolioIdParams: PortfolioId[]) => boolean;
+export declare const isParam: (legAssetHolder: AssetHolder, assetHolderIdParams: AssetHolderId[]) => boolean;
 /**
  * @hidden
  */

package/api/procedures/modifyInstructionAffirmation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"modifyInstructionAffirmation.d.ts","sourceRoot":"","sources":["../../../src/api/procedures/modifyInstructionAffirmation.ts"],"names":[],"mappings":"AAQA,OAAO,EAEL,sBAAsB,EAEvB,MAAM,uDAAuD,CAAC;AAC/D,OAAO,SAAS,MAAM,cAAc,CAAC;AAGrC,OAAO,EAAW,QAAQ,EAAE,WAAW,EAAiB,SAAS,EAAE,MAAM,YAAY,CAAC;AACtF,OAAO,EAGL,gBAAgB,EAGhB,kCAAkC,EAClC,iBAAiB,EAEjB,WAAW,EACX,aAAa,EAGd,MAAM,SAAS,CAAC;AACjB,OAAO,EACL,eAAe,EAEf,sBAAsB,EACtB,eAAe,EAChB,MAAM,kBAAkB,CAAC;AAmC1B,MAAM,WAAW,OAAO;IACtB,UAAU,EAAE,CAAC,gBAAgB,GAAG,iBAAiB,CAAC,EAAE,CAAC;IACrD,eAAe,EAAE,aAAa,EAAE,CAAC;IACjC,eAAe,EAAE,SAAS,CAAC;IAC3B,cAAc,EAAE,SAAS,CAAC;IAC1B,MAAM,EAAE,QAAQ,CAAC;IACjB,kBAAkB,EAAE,MAAM,EAAE,CAAC;IAC7B,eAAe,EAAE,sBAAsB,CAAC;CACzC;AAkUD;;GAEG;AACH,wBAAsB,mCAAmC,CACvD,IAAI,EAAE,SAAS,CAAC,kCAAkC,EAAE,WAAW,EAAE,OAAO,CAAC,EACzE,IAAI,EAAE,kCAAkC,GACvC,OAAO,CACN,eAAe,CAAC,WAAW,EAAE,eAAe,CAAC,cAAc,EAAE,4BAA4B,CAAC,CAAC,GAC3F,eAAe,CAAC,WAAW,EAAE,eAAe,CAAC,cAAc,EAAE,6BAA6B,CAAC,CAAC,GAC5F,eAAe,CAAC,WAAW,EAAE,eAAe,CAAC,cAAc,EAAE,8BAA8B,CAAC,CAAC,GAC7F,eAAe,CAAC,WAAW,EAAE,eAAe,CAAC,cAAc,EAAE,4BAA4B,CAAC,CAAC,GAC3F,eAAe,CAAC,WAAW,EAAE,eAAe,CAAC,cAAc,EAAE,6BAA6B,CAAC,CAAC,GAC5F,eAAe,CAAC,WAAW,EAAE,eAAe,CAAC,cAAc,EAAE,+BAA+B,CAAC,CAAC,GAC9F,eAAe,CAAC,WAAW,EAAE,eAAe,CAAC,cAAc,EAAE,6BAA6B,CAAC,CAAC,CAC/F,CAuIA;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,SAAS,CAAC,kCAAkC,EAAE,WAAW,EAAE,OAAO,CAAC,EACzE,IAAI,EAAE,kCAAkC,GACvC,sBAAsB,CAqDxB;AAyBD;;GAEG;AACH,eAAO,MAAM,OAAO,GAClB,cAAc,gBAAgB,GAAG,iBAAiB,EAClD,mBAAmB,WAAW,EAAE,KAC/B,OAWF,CAAC;AAmDF;;GAEG;AACH,wBAAsB,cAAc,CAClC,IAAI,EAAE,SAAS,CAAC,kCAAkC,EAAE,WAAW,EAAE,OAAO,CAAC,EACzE,MAAM,EAAE,kCAAkC,GACzC,OAAO,CAAC,OAAO,CAAC,CAkElB;AAED;;GAEG;AACH,eAAO,MAAM,4BAA4B,QAAO,SAAS,CACvD,kCAAkC,EAClC,WAAW,EACX,OAAO,CACgF,CAAC"}
+{"version":3,"file":"modifyInstructionAffirmation.d.ts","sourceRoot":"","sources":["../../../src/api/procedures/modifyInstructionAffirmation.ts"],"names":[],"mappings":"AASA,OAAO,EAEL,sBAAsB,EAEvB,MAAM,uDAAuD,CAAC;AAC/D,OAAO,SAAS,MAAM,cAAc,CAAC;AAIrC,OAAO,EAAoB,QAAQ,EAAE,WAAW,EAAiB,SAAS,EAAE,MAAM,YAAY,CAAC;AAC/F,OAAO,EAGL,WAAW,EACX,aAAa,EACb,eAAe,EAIf,kCAAkC,EAMnC,MAAM,SAAS,CAAC;AACjB,OAAO,EACL,eAAe,EAEf,sBAAsB,EACtB,eAAe,EAChB,MAAM,kBAAkB,CAAC;AAmC1B,MAAM,WAAW,OAAO;IACtB,mBAAmB,EAAE,WAAW,EAAE,CAAC;IACnC,iBAAiB,EAAE,eAAe,EAAE,CAAC;IACrC,cAAc,EAAE,SAAS,CAAC;IAC1B,aAAa,EAAE,SAAS,CAAC;IACzB,MAAM,EAAE,QAAQ,CAAC;IACjB,kBAAkB,EAAE,MAAM,EAAE,CAAC;IAC7B,eAAe,EAAE,sBAAsB,CAAC;CACzC;AAgUD;;GAEG;AACH,wBAAsB,mCAAmC,CACvD,IAAI,EAAE,SAAS,CAAC,kCAAkC,EAAE,WAAW,EAAE,OAAO,CAAC,EACzE,IAAI,EAAE,kCAAkC,GACvC,OAAO,CACN,eAAe,CAAC,WAAW,EAAE,eAAe,CAAC,cAAc,EAAE,4BAA4B,CAAC,CAAC,GAC3F,eAAe,CAAC,WAAW,EAAE,eAAe,CAAC,cAAc,EAAE,6BAA6B,CAAC,CAAC,GAC5F,eAAe,CAAC,WAAW,EAAE,eAAe,CAAC,cAAc,EAAE,8BAA8B,CAAC,CAAC,GAC7F,eAAe,CAAC,WAAW,EAAE,eAAe,CAAC,cAAc,EAAE,4BAA4B,CAAC,CAAC,GAC3F,eAAe,CAAC,WAAW,EAAE,eAAe,CAAC,cAAc,EAAE,6BAA6B,CAAC,CAAC,GAC5F,eAAe,CAAC,WAAW,EAAE,eAAe,CAAC,cAAc,EAAE,+BAA+B,CAAC,CAAC,GAC9F,eAAe,CAAC,WAAW,EAAE,eAAe,CAAC,cAAc,EAAE,6BAA6B,CAAC,CAAC,CAC/F,CA4JA;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,SAAS,CAAC,kCAAkC,EAAE,WAAW,EAAE,OAAO,CAAC,EACzE,IAAI,EAAE,kCAAkC,GACvC,sBAAsB,CAqDxB;AAyBD;;GAEG;AACH,eAAO,MAAM,OAAO,GAClB,gBAAgB,WAAW,EAC3B,qBAAqB,aAAa,EAAE,KACnC,OAuBF,CAAC;AAwEF;;GAEG;AACH,wBAAsB,cAAc,CAClC,IAAI,EAAE,SAAS,CAAC,kCAAkC,EAAE,WAAW,EAAE,OAAO,CAAC,EACzE,MAAM,EAAE,kCAAkC,GACzC,OAAO,CAAC,OAAO,CAAC,CA4ElB;AAED;;GAEG;AACH,eAAO,MAAM,4BAA4B,QAAO,SAAS,CACvD,kCAAkC,EAClC,WAAW,EACX,OAAO,CACgF,CAAC"}