@polymeshassociation/polymesh-sdk 24.7.0-alpha.1 → 24.7.0-alpha.10

package/api/entities/Portfolio/index.js

@@ -16,8 +16,11 @@ exports.Portfolio = void 0;
 const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const lodash_1 = require("lodash");
 const internal_1 = require("../../../internal");
-const queries_1 = require("../../../middleware/queries");
+const portfolios_1 = require("../../../middleware/queries/portfolios");
+const settlements_1 = require("../../../middleware/queries/settlements");
+const settlementsOld_1 = require("../../../middleware/queries/settlementsOld");
 const types_1 = require("../../../types");
+const constants_1 = require("../../../utils/constants");
 const conversion_1 = require("../../../utils/conversion");
 const internal_2 = require("../../../utils/internal");
 const notExistsMessage = "The Portfolio doesn't exist or was removed by its owner";
@@ -230,32 +233,56 @@ class Portfolio extends internal_1.Entity {
         return __awaiter(this, void 0, void 0, function* () {
             const { context, owner: { did: identityId }, _id: portfolioId, } = this;
             const { account, ticker } = filters;
-            const address = account ? (0, conversion_1.addressToKey)(account, context) : undefined;
-            const settlementsPromise = context.queryMiddleware((0, queries_1.settlementsQuery)({
+            // TODO @prashantasdeveloper Remove after SQ dual version support
+            const sqVersion = yield (0, internal_2.getLatestSqVersion)(context);
+            if ((0, lodash_1.lt)(sqVersion, constants_1.SETTLEMENTS_V2_SQ_VERSION)) {
+                const address = account ? (0, conversion_1.addressToKey)(account, context) : undefined;
+                const settlementsPromise = context.queryMiddleware((0, settlementsOld_1.settlementsQuery)({
+                    identityId,
+                    portfolioId,
+                    address,
+                    ticker,
+                }));
+                const portfolioMovementsPromise = context.queryMiddleware((0, portfolios_1.portfolioMovementsQuery)({
+                    identityId,
+                    portfolioId,
+                    address,
+                    ticker,
+                }));
+                const [{ data: { legs: { nodes: settlements }, }, }, { data: { portfolioMovements: { nodes: portfolioMovements }, }, }, exists,] = yield Promise.all([settlementsPromise, portfolioMovementsPromise, this.exists()]);
+                if (!exists) {
+                    throw new internal_1.PolymeshError({
+                        code: types_1.ErrorCode.DataUnavailable,
+                        message: notExistsMessage,
+                    });
+                }
+                const portfolioFilter = `${identityId}/${new bignumber_js_1.default(portfolioId || 0).toString()}`;
+                return (0, conversion_1.oldMiddlewareDataToHistoricalSettlements)(settlements, portfolioMovements, portfolioFilter, context);
+            }
+            // Dual version support end
+            const settlementsPromise = context.queryMiddleware((0, settlements_1.settlementsQuery)({
                 identityId,
                 portfolioId,
-                address,
+                address: account,
                 ticker,
             }));
-            const portfolioMovementsPromise = context.queryMiddleware((0, queries_1.portfolioMovementsQuery)({
+            const portfolioMovementsPromise = context.queryMiddleware((0, portfolios_1.portfolioMovementsQuery)({
                 identityId,
                 portfolioId,
-                address,
+                address: account,
                 ticker,
             }));
-            const [settlementsResult, portfolioMovementsResult, exists] = yield Promise.all([
-                settlementsPromise,
-                portfolioMovementsPromise,
-                this.exists(),
-            ]);
+            const [{ data: { legs: { nodes: settlements }, }, }, { data: { portfolioMovements: { nodes: portfolioMovements }, }, }, exists,] = yield Promise.all([settlementsPromise, portfolioMovementsPromise, this.exists()]);
             if (!exists) {
                 throw new internal_1.PolymeshError({
                     code: types_1.ErrorCode.DataUnavailable,
                     message: notExistsMessage,
                 });
             }
-            const portfolioFilter = `${identityId}/${new bignumber_js_1.default(portfolioId || 0).toString()}`;
-            return (0, conversion_1.toHistoricalSettlements)(settlementsResult, portfolioMovementsResult, portfolioFilter, context);
+            return (0, conversion_1.toHistoricalSettlements)(settlements, portfolioMovements, {
+                identityId,
+                portfolio: new bignumber_js_1.default(portfolioId || 0).toNumber(),
+            }, context);
         });
     }
     /**

package/api/entities/Portfolio/index.js.map

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

package/api/entities/Portfolio/types.d.ts

@@ -1,8 +1,7 @@
 import BigNumber from 'bignumber.js';
-import { Account, FungibleAsset, Nft } from "../../../internal";
-import { SettlementResultEnum as SettlementResult } from "../../../middleware/types";
+import { Account, FungibleAsset, Instruction, Nft } from "../../../internal";
 import { SettlementDirectionEnum as SettlementDirection } from "../../../middleware/typesV1";
-import { Balance, Leg, NftCollection } from "../../../types";
+import { Balance, Leg, NftCollection, SettlementResultEnum } from "../../../types";
 export interface PortfolioBalance extends Balance {
     asset: FungibleAsset;
 }
@@ -27,11 +26,15 @@ export declare type SettlementLeg = Leg & {
 export interface HistoricSettlement {
     blockNumber: BigNumber;
     blockHash: string;
-    status: SettlementResult;
+    status: SettlementResultEnum;
     /**
      * Array of Accounts that participated by affirming the settlement
      */
     accounts: Account[];
     legs: SettlementLeg[];
+    /**
+     * This value is null when depicting portfolio movements
+     */
+    instruction?: Instruction;
 }
 //# sourceMappingURL=types.d.ts.map

package/api/entities/Portfolio/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/api/entities/Portfolio/types.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,cAAc,CAAC;AAErC,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,GAAG,EAAE,0BAAmB;AACzD,OAAO,EAAE,oBAAoB,IAAI,gBAAgB,EAAE,kCAA2B;AAC9E,OAAO,EAAE,uBAAuB,IAAI,mBAAmB,EAAE,oCAA6B;AACtF,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,aAAa,EAAE,uBAAgB;AAEtD,MAAM,WAAW,gBAAiB,SAAQ,OAAO;IAC/C,KAAK,EAAE,aAAa,CAAC;CACtB;AAED,MAAM,WAAW,mBAAmB;IAClC,UAAU,EAAE,aAAa,CAAC;IAC1B;;OAEG;IACH,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ;;OAEG;IACH,MAAM,EAAE,GAAG,EAAE,CAAC;IACd;;OAEG;IACH,KAAK,EAAE,SAAS,CAAC;CAClB;AAED,oBAAY,aAAa,GAAG,GAAG,GAAG;IAChC,SAAS,EAAE,mBAAmB,CAAC;CAChC,CAAC;AAEF,MAAM,WAAW,kBAAkB;IACjC,WAAW,EAAE,SAAS,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,gBAAgB,CAAC;IACzB;;OAEG;IACH,QAAQ,EAAE,OAAO,EAAE,CAAC;IACpB,IAAI,EAAE,aAAa,EAAE,CAAC;CACvB"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/api/entities/Portfolio/types.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,cAAc,CAAC;AAErC,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,GAAG,EAAE,0BAAmB;AACtE,OAAO,EAAE,uBAAuB,IAAI,mBAAmB,EAAE,oCAA6B;AACtF,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,aAAa,EAAE,oBAAoB,EAAE,uBAAgB;AAE5E,MAAM,WAAW,gBAAiB,SAAQ,OAAO;IAC/C,KAAK,EAAE,aAAa,CAAC;CACtB;AAED,MAAM,WAAW,mBAAmB;IAClC,UAAU,EAAE,aAAa,CAAC;IAC1B;;OAEG;IACH,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ;;OAEG;IACH,MAAM,EAAE,GAAG,EAAE,CAAC;IACd;;OAEG;IACH,KAAK,EAAE,SAAS,CAAC;CAClB;AAED,oBAAY,aAAa,GAAG,GAAG,GAAG;IAChC,SAAS,EAAE,mBAAmB,CAAC;CAChC,CAAC;AAEF,MAAM,WAAW,kBAAkB;IACjC,WAAW,EAAE,SAAS,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,oBAAoB,CAAC;IAC7B;;OAEG;IACH,QAAQ,EAAE,OAAO,EAAE,CAAC;IACpB,IAAI,EAAE,aAAa,EAAE,CAAC;IACtB;;OAEG;IACH,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B"}

package/api/entities/Venue/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/api/entities/Venue/index.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,cAAc,CAAC;AAGrC,OAAO,EACL,OAAO,EAEP,OAAO,EACP,MAAM,EAEN,WAAW,EAGZ,0BAAmB;AAGpB,OAAO,EACL,oBAAoB,EACpB,qBAAqB,EACrB,mBAAmB,EAEnB,iBAAiB,EACjB,iBAAiB,EACjB,eAAe,EACf,SAAS,EACT,wBAAwB,EACzB,uBAAgB;AAajB,OAAO,EAAE,mBAAmB,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAE5D,MAAM,WAAW,iBAAiB;IAChC,EAAE,EAAE,SAAS,CAAC;CACf;AAED;;GAEG;AACH,wBAAgB,yBAAyB,CAAC,CAAC,WAAW,CAAC,EAAE,WAAW,EAAE,GAAG,WAAW,CAEnF;AAED;;GAEG;AACH,wBAAgB,0BAA0B,CAAC,CAAC,SAAS,CAAC,EAAE,iBAAiB,EAAE,GAAG,iBAAiB,CAE9F;AAED;;GAEG;AACH,qBAAa,KAAM,SAAQ,MAAM,CAAC,iBAAiB,EAAE,MAAM,CAAC;IAC1D;;;OAGG;WACoB,mBAAmB,CAAC,UAAU,EAAE,OAAO,GAAG,UAAU,IAAI,iBAAiB;IAMhG;;OAEG;IACI,EAAE,EAAE,SAAS,CAAC;IAErB;;OAEG;gBACgB,WAAW,EAAE,iBAAiB,EAAE,OAAO,EAAE,OAAO;IA8CnE;;OAEG;IACU,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC;IAgBvC;;OAEG;IACU,OAAO,IAAI,OAAO,CAAC,YAAY,CAAC;IA0B7C;;OAEG;IACU,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC,mBAAmB,EAAE,SAAS,GAAG,QAAQ,CAAC,CAAC;IAwBxF;;OAEG;YACW,iBAAiB;IAwB/B;;;;;;;;OAQG;IACU,yBAAyB,CACpC,IAAI,GAAE;QACJ,IAAI,CAAC,EAAE,SAAS,CAAC;QACjB,KAAK,CAAC,EAAE,SAAS,CAAC;KACd,GACL,OAAO,CAAC,SAAS,CAAC,mBAAmB,CAAC,CAAC;IAkC1C;;;OAGG;IACU,iBAAiB,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;IAsBpD;;;;;OAKG;IACI,cAAc,EAAE,eAAe,CAAC,oBAAoB,EAAE,WAAW,EAAE,EAAE,WAAW,CAAC,CAAC;IAEzF;;;;;OAKG;IACI,eAAe,EAAE,eAAe,CAAC,qBAAqB,EAAE,WAAW,EAAE,CAAC,CAAC;IAE9E;;;;;OAKG;IACI,MAAM,EAAE,eAAe,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC;IAExD;;;;;;;OAOG;IACI,UAAU,EAAE,eAAe,CAAC,wBAAwB,EAAE,IAAI,CAAC,CAAC;IAEnE;;;;;;;OAOG;IACI,aAAa,EAAE,eAAe,CAAC,wBAAwB,EAAE,IAAI,CAAC,CAAC;IAEtE;;OAEG;IACI,OAAO,IAAI,MAAM;CAGzB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/api/entities/Venue/index.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,cAAc,CAAC;AAIrC,OAAO,EACL,OAAO,EAEP,OAAO,EACP,MAAM,EAEN,WAAW,EAGZ,0BAAmB;AAKpB,OAAO,EACL,oBAAoB,EACpB,qBAAqB,EACrB,mBAAmB,EAEnB,iBAAiB,EACjB,iBAAiB,EACjB,eAAe,EACf,SAAS,EACT,wBAAwB,EACzB,uBAAgB;AAejB,OAAO,EAAE,mBAAmB,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAE5D,MAAM,WAAW,iBAAiB;IAChC,EAAE,EAAE,SAAS,CAAC;CACf;AAED;;GAEG;AACH,wBAAgB,yBAAyB,CAAC,CAAC,WAAW,CAAC,EAAE,WAAW,EAAE,GAAG,WAAW,CAEnF;AAED;;GAEG;AACH,wBAAgB,0BAA0B,CAAC,CAAC,SAAS,CAAC,EAAE,iBAAiB,EAAE,GAAG,iBAAiB,CAE9F;AAED;;GAEG;AACH,qBAAa,KAAM,SAAQ,MAAM,CAAC,iBAAiB,EAAE,MAAM,CAAC;IAC1D;;;OAGG;WACoB,mBAAmB,CAAC,UAAU,EAAE,OAAO,GAAG,UAAU,IAAI,iBAAiB;IAMhG;;OAEG;IACI,EAAE,EAAE,SAAS,CAAC;IAErB;;OAEG;gBACgB,WAAW,EAAE,iBAAiB,EAAE,OAAO,EAAE,OAAO;IA8CnE;;OAEG;IACU,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC;IAgBvC;;OAEG;IACU,OAAO,IAAI,OAAO,CAAC,YAAY,CAAC;IA0B7C;;OAEG;IACU,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC,mBAAmB,EAAE,SAAS,GAAG,QAAQ,CAAC,CAAC;IAwBxF;;OAEG;YACW,iBAAiB;IAwB/B;;;;;;;;OAQG;IACU,yBAAyB,CACpC,IAAI,GAAE;QACJ,IAAI,CAAC,EAAE,SAAS,CAAC;QACjB,KAAK,CAAC,EAAE,SAAS,CAAC;KACd,GACL,OAAO,CAAC,SAAS,CAAC,mBAAmB,CAAC,CAAC;IA2D1C;;;OAGG;IACU,iBAAiB,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;IAsBpD;;;;;OAKG;IACI,cAAc,EAAE,eAAe,CAAC,oBAAoB,EAAE,WAAW,EAAE,EAAE,WAAW,CAAC,CAAC;IAEzF;;;;;OAKG;IACI,eAAe,EAAE,eAAe,CAAC,qBAAqB,EAAE,WAAW,EAAE,CAAC,CAAC;IAE9E;;;;;OAKG;IACI,MAAM,EAAE,eAAe,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC;IAExD;;;;;;;OAOG;IACI,UAAU,EAAE,eAAe,CAAC,wBAAwB,EAAE,IAAI,CAAC,CAAC;IAEnE;;;;;;;OAOG;IACI,aAAa,EAAE,eAAe,CAAC,wBAAwB,EAAE,IAAI,CAAC,CAAC;IAEtE;;OAEG;IACI,OAAO,IAAI,MAAM;CAGzB"}

package/api/entities/Venue/index.js

@@ -15,9 +15,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Venue = exports.createPortfolioTransformer = exports.addInstructionTransformer = void 0;
 const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const bluebird_1 = __importDefault(require("bluebird"));
+const lodash_1 = require("lodash");
 const internal_1 = require("../../../internal");
-const queries_1 = require("../../../middleware/queries");
+const settlements_1 = require("../../../middleware/queries/settlements");
+const settlementsOld_1 = require("../../../middleware/queries/settlementsOld");
 const types_1 = require("../../../types");
+const constants_1 = require("../../../utils/constants");
 const conversion_1 = require("../../../utils/conversion");
 const internal_2 = require("../../../utils/internal");
 /**
@@ -147,10 +150,30 @@ class Venue extends internal_1.Entity {
         return __awaiter(this, void 0, void 0, function* () {
             const { context, id } = this;
             const { size, start } = opts;
-            const { data: { instructions: { nodes: instructionsResult, totalCount }, }, } = yield context.queryMiddleware((0, queries_1.instructionsQuery)({
-                venueId: id.toString(),
-            }, size, start));
-            const data = instructionsResult.map(middlewareInstruction => (0, conversion_1.middlewareInstructionToHistoricInstruction)(middlewareInstruction, context));
+            let data;
+            // TODO @prashantasdeveloper Remove after SQ dual version support
+            const sqVersion = yield (0, internal_2.getLatestSqVersion)(context);
+            let instructionsResult, totalCount;
+            if ((0, lodash_1.lt)(sqVersion, constants_1.SETTLEMENTS_V2_SQ_VERSION)) {
+                ({
+                    data: {
+                        instructions: { nodes: instructionsResult, totalCount },
+                    },
+                } = yield context.queryMiddleware((0, settlementsOld_1.instructionsQuery)({
+                    venueId: id.toString(),
+                }, size, start)));
+                data = instructionsResult.map(middlewareInstruction => (0, conversion_1.oldMiddlewareInstructionToHistoricInstruction)(middlewareInstruction, context));
+            }
+            else {
+                ({
+                    data: {
+                        instructions: { nodes: instructionsResult, totalCount },
+                    },
+                } = yield context.queryMiddleware((0, settlements_1.instructionsQuery)({
+                    venueId: id.toString(),
+                }, size, start)));
+                data = instructionsResult.map(middlewareInstruction => (0, conversion_1.middlewareInstructionToHistoricInstruction)(middlewareInstruction, context));
+            }
             const count = new bignumber_js_1.default(totalCount);
             const next = (0, internal_2.calculateNextKey)(count, data.length, start);
             return {

package/api/entities/Venue/index.js.map

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

package/api/entities/common/namespaces/Authorizations.js

@@ -15,7 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Authorizations = void 0;
 const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const internal_1 = require("../../../../internal");
-const queries_1 = require("../../../../middleware/queries");
+const authorizations_1 = require("../../../../middleware/queries/authorizations");
 const types_1 = require("../../../../types");
 const conversion_1 = require("../../../../utils/conversion");
 const internal_2 = require("../../../../utils/internal");
@@ -116,7 +116,7 @@ class Authorizations extends internal_1.Namespace {
             else {
                 filters.toKey = (0, conversion_1.addressToKey)(signerValue.value, context);
             }
-            const { data: { authorizations: { totalCount, nodes: authorizationResult }, }, } = yield context.queryMiddleware((0, queries_1.authorizationsQuery)(filters, size, start));
+            const { data: { authorizations: { totalCount, nodes: authorizationResult }, }, } = yield context.queryMiddleware((0, authorizations_1.authorizationsQuery)(filters, size, start));
             const data = authorizationResult.map(middlewareAuthorization => {
                 const { id, type: authType, data: authData, fromId, toId, toKey, expiry, } = middlewareAuthorization;
                 return new internal_1.AuthorizationRequest({

package/api/entities/common/namespaces/Authorizations.js.map

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

package/api/procedures/acceptPrimaryKeyRotation.js

@@ -62,19 +62,19 @@ exports.getAuthorization = getAuthorization;
 function prepareStorage({ ownerAuth, cddAuth }) {
     return __awaiter(this, void 0, void 0, function* () {
         const { context } = this;
-        const signingAccount = context.getSigningAccount();
+        const actingAccount = yield context.getActingAccount();
         const getAuthRequest = (auth) => __awaiter(this, void 0, void 0, function* () {
             if (auth && auth instanceof bignumber_js_1.default) {
-                return signingAccount.authorizations.getOne({ id: auth });
+                return actingAccount.authorizations.getOne({ id: auth });
             }
             return auth;
         });
         const ownerAuthRequest = yield getAuthRequest(ownerAuth);
-        let calledByTarget = signingAccount.isEqual(ownerAuthRequest.target);
+        let calledByTarget = actingAccount.isEqual(ownerAuthRequest.target);
         let cddAuthRequest;
         if (cddAuth) {
             cddAuthRequest = yield getAuthRequest(cddAuth);
-            calledByTarget = calledByTarget && signingAccount.isEqual(cddAuthRequest.target);
+            calledByTarget = calledByTarget && actingAccount.isEqual(cddAuthRequest.target);
         }
         return {
             calledByTarget,

package/api/procedures/acceptPrimaryKeyRotation.js.map

@@ -1 +1 @@
-{"version":3,"file":"acceptPrimaryKeyRotation.js","sourceRoot":"","sources":["../../../src/api/procedures/acceptPrimaryKeyRotation.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,gEAAqC;AAErC,mCAAyE;AACzE,6CAA6D;AAC7D,uCAA4E;AAE5E,uDAAoD;AACpD,mDAA6C;AAW7C;;GAEG;AACH,SAAsB,+BAA+B;;QAGnD,MAAM,EACJ,OAAO,EAAE,EACP,WAAW,EAAE,EACX,EAAE,EAAE,EAAE,QAAQ,EAAE,GACjB,GACF,EACD,OAAO,EAAE,EAAE,gBAAgB,EAAE,cAAc,EAAE,EAC7C,OAAO,GACR,GAAG,IAAI,CAAC;QAET,MAAM,kBAAkB,GAAG,CAAC,IAAA,uCAA+B,EAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC,CAAC;QACxF,IAAI,cAAc,EAAE;YAClB,kBAAkB,CAAC,IAAI,CAAC,IAAA,uCAA+B,EAAC,cAAc,EAAE,OAAO,CAAC,CAAC,CAAC;SACnF;QAED,MAAM,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;QAEtC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,gBAAgB,CAAC;QACzD,OAAO;YACL,WAAW,EAAE,QAAQ,CAAC,gBAAgB;YACtC,SAAS,EAAE,MAAM;YACjB,IAAI,EAAE;gBACJ,IAAA,2BAAc,EAAC,WAAW,EAAE,OAAO,CAAC;gBACpC,IAAA,oBAAS,EAAC,2BAAc,CAAC,CAAC,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,MAAM,EAAE,OAAO,CAAC;aAC3D;YACD,QAAQ,EAAE,SAAS;SACpB,CAAC;IACJ,CAAC;CAAA;AA9BD,0EA8BC;AAED;;GAEG;AACH,SAAsB,gBAAgB;;QAGpC,MAAM,EACJ,OAAO,EAAE,EAAE,cAAc,EAAE,GAC5B,GAAG,IAAI,CAAC;QAET,OAAO;YACL,KAAK,EACH,cAAc;gBACd,IAAI,yBAAiB,CAAC,gBAAgB,iEAAiE;SAC1G,CAAC;IACJ,CAAC;CAAA;AAZD,4CAYC;AAED;;GAEG;AACH,SAAsB,cAAc,CAElC,EAAE,SAAS,EAAE,OAAO,EAAkC;;QAEtD,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;QAEzB,MAAM,cAAc,GAAG,OAAO,CAAC,iBAAiB,EAAE,CAAC;QAEnD,MAAM,cAAc,GAAG,CACrB,IAAsC,EACP,EAAE;YACjC,IAAI,IAAI,IAAI,IAAI,YAAY,sBAAS,EAAE;gBACrC,OAAO,cAAc,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;aAC3D;YACD,OAAO,IAAI,CAAC;QACd,CAAC,CAAA,CAAC;QAEF,MAAM,gBAAgB,GAAG,MAAM,cAAc,CAAC,SAAS,CAAC,CAAC;QAEzD,IAAI,cAAc,GAAG,cAAc,CAAC,OAAO,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;QAErE,IAAI,cAAc,CAAC;QACnB,IAAI,OAAO,EAAE;YACX,cAAc,GAAG,MAAM,cAAc,CAAC,OAAO,CAAC,CAAC;YAC/C,cAAc,GAAG,cAAc,IAAI,cAAc,CAAC,OAAO,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;SAClF;QAED,OAAO;YACL,cAAc;YACd,gBAAgB;YAChB,cAAc;SACf,CAAC;IACJ,CAAC;CAAA;AAhCD,wCAgCC;AAED;;GAEG;AACI,MAAM,wBAAwB,GAAG,GAItC,EAAE,CAAC,IAAI,oBAAS,CAAC,+BAA+B,EAAE,gBAAgB,EAAE,cAAc,CAAC,CAAC;AAJzE,QAAA,wBAAwB,4BAIiD"}
+{"version":3,"file":"acceptPrimaryKeyRotation.js","sourceRoot":"","sources":["../../../src/api/procedures/acceptPrimaryKeyRotation.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,gEAAqC;AAErC,mCAAyE;AACzE,6CAA6D;AAC7D,uCAA4E;AAE5E,uDAAoD;AACpD,mDAA6C;AAW7C;;GAEG;AACH,SAAsB,+BAA+B;;QAGnD,MAAM,EACJ,OAAO,EAAE,EACP,WAAW,EAAE,EACX,EAAE,EAAE,EAAE,QAAQ,EAAE,GACjB,GACF,EACD,OAAO,EAAE,EAAE,gBAAgB,EAAE,cAAc,EAAE,EAC7C,OAAO,GACR,GAAG,IAAI,CAAC;QAET,MAAM,kBAAkB,GAAG,CAAC,IAAA,uCAA+B,EAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC,CAAC;QACxF,IAAI,cAAc,EAAE;YAClB,kBAAkB,CAAC,IAAI,CAAC,IAAA,uCAA+B,EAAC,cAAc,EAAE,OAAO,CAAC,CAAC,CAAC;SACnF;QAED,MAAM,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;QAEtC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,gBAAgB,CAAC;QACzD,OAAO;YACL,WAAW,EAAE,QAAQ,CAAC,gBAAgB;YACtC,SAAS,EAAE,MAAM;YACjB,IAAI,EAAE;gBACJ,IAAA,2BAAc,EAAC,WAAW,EAAE,OAAO,CAAC;gBACpC,IAAA,oBAAS,EAAC,2BAAc,CAAC,CAAC,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,MAAM,EAAE,OAAO,CAAC;aAC3D;YACD,QAAQ,EAAE,SAAS;SACpB,CAAC;IACJ,CAAC;CAAA;AA9BD,0EA8BC;AAED;;GAEG;AACH,SAAsB,gBAAgB;;QAGpC,MAAM,EACJ,OAAO,EAAE,EAAE,cAAc,EAAE,GAC5B,GAAG,IAAI,CAAC;QAET,OAAO;YACL,KAAK,EACH,cAAc;gBACd,IAAI,yBAAiB,CAAC,gBAAgB,iEAAiE;SAC1G,CAAC;IACJ,CAAC;CAAA;AAZD,4CAYC;AAED;;GAEG;AACH,SAAsB,cAAc,CAElC,EAAE,SAAS,EAAE,OAAO,EAAkC;;QAEtD,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;QAEzB,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,gBAAgB,EAAE,CAAC;QAEvD,MAAM,cAAc,GAAG,CACrB,IAAsC,EACP,EAAE;YACjC,IAAI,IAAI,IAAI,IAAI,YAAY,sBAAS,EAAE;gBACrC,OAAO,aAAa,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;aAC1D;YACD,OAAO,IAAI,CAAC;QACd,CAAC,CAAA,CAAC;QAEF,MAAM,gBAAgB,GAAG,MAAM,cAAc,CAAC,SAAS,CAAC,CAAC;QAEzD,IAAI,cAAc,GAAG,aAAa,CAAC,OAAO,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;QAEpE,IAAI,cAAc,CAAC;QACnB,IAAI,OAAO,EAAE;YACX,cAAc,GAAG,MAAM,cAAc,CAAC,OAAO,CAAC,CAAC;YAC/C,cAAc,GAAG,cAAc,IAAI,aAAa,CAAC,OAAO,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;SACjF;QAED,OAAO;YACL,cAAc;YACd,gBAAgB;YAChB,cAAc;SACf,CAAC;IACJ,CAAC;CAAA;AAhCD,wCAgCC;AAED;;GAEG;AACI,MAAM,wBAAwB,GAAG,GAItC,EAAE,CAAC,IAAI,oBAAS,CAAC,+BAA+B,EAAE,gBAAgB,EAAE,cAAc,CAAC,CAAC;AAJzE,QAAA,wBAAwB,4BAIiD"}

package/api/procedures/addSecondaryAccountsWithAuth.d.ts

@@ -0,0 +1,27 @@
+import { Procedure } from "../../internal";
+import { Account, AddSecondaryAccountsParams, Identity } from "../../types";
+import { ExtrinsicParams, ProcedureAuthorization, TransactionSpec } from "../../types/internal";
+/**
+ * @hidden
+ */
+export interface Storage {
+    identity: Identity;
+    actingAccount: Account;
+}
+/**
+ * @hidden
+ */
+export declare function prepareAddSecondaryKeysWithAuth(this: Procedure<AddSecondaryAccountsParams, Identity, Storage>, args: AddSecondaryAccountsParams): Promise<TransactionSpec<Identity, ExtrinsicParams<'identity', 'addSecondaryKeysWithAuthorization'>>>;
+/**
+ * @hidden
+ */
+export declare function getAuthorization(this: Procedure<AddSecondaryAccountsParams, Identity, Storage>): Promise<ProcedureAuthorization>;
+/**
+ * @hidden
+ */
+export declare function prepareStorage(this: Procedure<AddSecondaryAccountsParams, Identity, Storage>): Promise<Storage>;
+/**
+ * @hidden
+ */
+export declare const addSecondaryAccounts: () => Procedure<AddSecondaryAccountsParams, Identity, Storage>;
+//# sourceMappingURL=addSecondaryAccountsWithAuth.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"addSecondaryAccountsWithAuth.d.ts","sourceRoot":"","sources":["../../../src/api/procedures/addSecondaryAccountsWithAuth.ts"],"names":[],"mappings":"AAEA,OAAO,EAAiB,SAAS,EAAE,uBAAmB;AACtD,OAAO,EAAE,OAAO,EAAE,0BAA0B,EAAa,QAAQ,EAAU,oBAAgB;AAC3F,OAAO,EAAE,eAAe,EAAE,sBAAsB,EAAE,eAAe,EAAE,6BAAyB;AAI5F;;GAEG;AACH,MAAM,WAAW,OAAO;IACtB,QAAQ,EAAE,QAAQ,CAAC;IACnB,aAAa,EAAE,OAAO,CAAC;CACxB;AAED;;GAEG;AACH,wBAAsB,+BAA+B,CACnD,IAAI,EAAE,SAAS,CAAC,0BAA0B,EAAE,QAAQ,EAAE,OAAO,CAAC,EAC9D,IAAI,EAAE,0BAA0B,GAC/B,OAAO,CACR,eAAe,CAAC,QAAQ,EAAE,eAAe,CAAC,UAAU,EAAE,mCAAmC,CAAC,CAAC,CAC5F,CAqCA;AAED;;GAEG;AACH,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,SAAS,CAAC,0BAA0B,EAAE,QAAQ,EAAE,OAAO,CAAC,GAC7D,OAAO,CAAC,sBAAsB,CAAC,CAoBjC;AAED;;GAEG;AACH,wBAAsB,cAAc,CAClC,IAAI,EAAE,SAAS,CAAC,0BAA0B,EAAE,QAAQ,EAAE,OAAO,CAAC,GAC7D,OAAO,CAAC,OAAO,CAAC,CAYlB;AAED;;GAEG;AACH,eAAO,MAAM,oBAAoB,QAAO,UAAU,0BAA0B,EAAE,QAAQ,EAAE,OAAO,CACb,CAAC"}

package/api/procedures/addSecondaryAccountsWithAuth.js

@@ -0,0 +1,95 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addSecondaryAccounts = exports.prepareStorage = exports.getAuthorization = exports.prepareAddSecondaryKeysWithAuth = void 0;
+const bignumber_js_1 = __importDefault(require("bignumber.js"));
+const internal_1 = require("../../internal");
+const types_1 = require("../../types");
+const conversion_1 = require("../../utils/conversion");
+const internal_2 = require("../../utils/internal");
+/**
+ * @hidden
+ */
+function prepareAddSecondaryKeysWithAuth(args) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const { context: { polymeshApi: { tx }, }, context, storage: { identity }, } = this;
+        const { accounts, expiresAt } = args;
+        if (expiresAt <= new Date()) {
+            throw new internal_1.PolymeshError({
+                code: types_1.ErrorCode.ValidationError,
+                message: 'Expiry date must be in the future',
+            });
+        }
+        const identities = yield Promise.all(accounts.map(({ secondaryAccount: { account } }) => (0, internal_2.asAccount)(account, context).getIdentity()));
+        if (identities.some(identityValue => identityValue !== null)) {
+            throw new internal_1.PolymeshError({
+                code: types_1.ErrorCode.UnmetPrerequisite,
+                message: 'One or more accounts are already linked to some Identity',
+            });
+        }
+        const rawExpiry = (0, conversion_1.dateToMoment)(expiresAt, context);
+        return {
+            transaction: tx.identity.addSecondaryKeysWithAuthorization,
+            feeMultiplier: new bignumber_js_1.default(accounts.length),
+            args: [(0, conversion_1.secondaryAccountWithAuthToSecondaryKeyWithAuth)(accounts, context), rawExpiry],
+            resolver: identity,
+        };
+    });
+}
+exports.prepareAddSecondaryKeysWithAuth = prepareAddSecondaryKeysWithAuth;
+/**
+ * @hidden
+ */
+function getAuthorization() {
+    return __awaiter(this, void 0, void 0, function* () {
+        const { storage: { identity, actingAccount }, } = this;
+        const { account: primaryAccount } = yield identity.getPrimaryAccount();
+        if (!actingAccount.isEqual(primaryAccount)) {
+            return {
+                signerPermissions: 'Secondary accounts can only be added by primary key of an Identity',
+            };
+        }
+        return {
+            permissions: {
+                transactions: [types_1.TxTags.identity.AddSecondaryKeysWithAuthorization],
+                assets: [],
+                portfolios: [],
+            },
+        };
+    });
+}
+exports.getAuthorization = getAuthorization;
+/**
+ * @hidden
+ */
+function prepareStorage() {
+    return __awaiter(this, void 0, void 0, function* () {
+        const { context } = this;
+        const [identity, actingAccount] = yield Promise.all([
+            context.getSigningIdentity(),
+            context.getActingAccount(),
+        ]);
+        return {
+            identity,
+            actingAccount,
+        };
+    });
+}
+exports.prepareStorage = prepareStorage;
+/**
+ * @hidden
+ */
+const addSecondaryAccounts = () => new internal_1.Procedure(prepareAddSecondaryKeysWithAuth, getAuthorization, prepareStorage);
+exports.addSecondaryAccounts = addSecondaryAccounts;
+//# sourceMappingURL=addSecondaryAccountsWithAuth.js.map

package/api/procedures/addSecondaryAccountsWithAuth.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"addSecondaryAccountsWithAuth.js","sourceRoot":"","sources":["../../../src/api/procedures/addSecondaryAccountsWithAuth.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,gEAAqC;AAErC,6CAAsD;AACtD,uCAA2F;AAE3F,uDAAkG;AAClG,mDAA6C;AAU7C;;GAEG;AACH,SAAsB,+BAA+B,CAEnD,IAAgC;;QAIhC,MAAM,EACJ,OAAO,EAAE,EACP,WAAW,EAAE,EAAE,EAAE,EAAE,GACpB,EACD,OAAO,EACP,OAAO,EAAE,EAAE,QAAQ,EAAE,GACtB,GAAG,IAAI,CAAC;QAET,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC;QAErC,IAAI,SAAS,IAAI,IAAI,IAAI,EAAE,EAAE;YAC3B,MAAM,IAAI,wBAAa,CAAC;gBACtB,IAAI,EAAE,iBAAS,CAAC,eAAe;gBAC/B,OAAO,EAAE,mCAAmC;aAC7C,CAAC,CAAC;SACJ;QAED,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,GAAG,CAClC,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAE,gBAAgB,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,EAAE,CAAC,IAAA,oBAAS,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC,WAAW,EAAE,CAAC,CAC/F,CAAC;QAEF,IAAI,UAAU,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,aAAa,KAAK,IAAI,CAAC,EAAE;YAC5D,MAAM,IAAI,wBAAa,CAAC;gBACtB,IAAI,EAAE,iBAAS,CAAC,iBAAiB;gBACjC,OAAO,EAAE,0DAA0D;aACpE,CAAC,CAAC;SACJ;QAED,MAAM,SAAS,GAAG,IAAA,yBAAY,EAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAEnD,OAAO;YACL,WAAW,EAAE,EAAE,CAAC,QAAQ,CAAC,iCAAiC;YAC1D,aAAa,EAAE,IAAI,sBAAS,CAAC,QAAQ,CAAC,MAAM,CAAC;YAC7C,IAAI,EAAE,CAAC,IAAA,2DAA8C,EAAC,QAAQ,EAAE,OAAO,CAAC,EAAE,SAAS,CAAC;YACpF,QAAQ,EAAE,QAAQ;SACnB,CAAC;IACJ,CAAC;CAAA;AA1CD,0EA0CC;AAED;;GAEG;AACH,SAAsB,gBAAgB;;QAGpC,MAAM,EACJ,OAAO,EAAE,EAAE,QAAQ,EAAE,aAAa,EAAE,GACrC,GAAG,IAAI,CAAC;QAET,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,GAAG,MAAM,QAAQ,CAAC,iBAAiB,EAAE,CAAC;QAEvE,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE;YAC1C,OAAO;gBACL,iBAAiB,EAAE,oEAAoE;aACxF,CAAC;SACH;QAED,OAAO;YACL,WAAW,EAAE;gBACX,YAAY,EAAE,CAAC,cAAM,CAAC,QAAQ,CAAC,iCAAiC,CAAC;gBACjE,MAAM,EAAE,EAAE;gBACV,UAAU,EAAE,EAAE;aACf;SACF,CAAC;IACJ,CAAC;CAAA;AAtBD,4CAsBC;AAED;;GAEG;AACH,SAAsB,cAAc;;QAGlC,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;QAEzB,MAAM,CAAC,QAAQ,EAAE,aAAa,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YAClD,OAAO,CAAC,kBAAkB,EAAE;YAC5B,OAAO,CAAC,gBAAgB,EAAE;SAC3B,CAAC,CAAC;QAEH,OAAO;YACL,QAAQ;YACR,aAAa;SACd,CAAC;IACJ,CAAC;CAAA;AAdD,wCAcC;AAED;;GAEG;AACI,MAAM,oBAAoB,GAAG,GAA6D,EAAE,CACjG,IAAI,oBAAS,CAAC,+BAA+B,EAAE,gBAAgB,EAAE,cAAc,CAAC,CAAC;AADtE,QAAA,oBAAoB,wBACkD"}

package/api/procedures/consumeAddMultiSigSignerAuthorization.js

@@ -24,7 +24,7 @@ function prepareConsumeAddMultiSigSignerAuthorization(args) {
         const { target, authId, issuer } = authRequest;
         const rawAuthId = (0, conversion_1.bigNumberToU64)(authId, context);
         if (!accept) {
-            const { address } = context.getSigningAccount();
+            const { address } = yield context.getActingAccount();
             const paidByThirdParty = address === (0, conversion_1.signerToString)(target);
             const addTransactionArgs = {};
             if (paidByThirdParty) {
@@ -52,12 +52,12 @@ function getAuthorization({ authRequest, accept }) {
         const { target, issuer } = authRequest;
         const { context } = this;
         let hasRoles;
-        const signingAccount = context.getSigningAccount();
-        const identity = yield signingAccount.getIdentity();
+        const actingAccount = yield context.getActingAccount();
+        const identity = yield actingAccount.getIdentity();
         let calledByTarget;
         let permissions;
         if (target instanceof internal_1.Account) {
-            calledByTarget = target.isEqual(signingAccount);
+            calledByTarget = target.isEqual(actingAccount);
             hasRoles = calledByTarget;
             // An account accepting multisig cannot be part of an Identity, so we cannot check for permissions
         }

package/api/procedures/consumeAddMultiSigSignerAuthorization.js.map

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

package/api/procedures/consumeAddRelayerPayingKeyAuthorization.d.ts

@@ -8,7 +8,7 @@ export interface ConsumeAddRelayerPayingKeyAuthorizationParams {
     accept: boolean;
 }
 export interface Storage {
-    signingAccount: Account;
+    actingAccount: Account;
     calledByTarget: boolean;
 }
 /**

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

@@ -1 +1 @@
-{"version":3,"file":"consumeAddRelayerPayingKeyAuthorization.d.ts","sourceRoot":"","sources":["../../../src/api/procedures/consumeAddRelayerPayingKeyAuthorization.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,oBAAoB,EAA2B,SAAS,EAAE,uBAAmB;AAE/F,OAAO,EAAE,eAAe,EAAE,sBAAsB,EAAE,eAAe,EAAE,6BAAyB;AAQ5F;;GAEG;AACH,MAAM,WAAW,6CAA6C;IAC5D,WAAW,EAAE,oBAAoB,CAAC;IAClC,MAAM,EAAE,OAAO,CAAC;CACjB;AAED,MAAM,WAAW,OAAO;IACtB,cAAc,EAAE,OAAO,CAAC;IACxB,cAAc,EAAE,OAAO,CAAC;CACzB;AAED;;;;GAIG;AACH,wBAAsB,8CAA8C,CAClE,IAAI,EAAE,SAAS,CAAC,6CAA6C,EAAE,IAAI,EAAE,OAAO,CAAC,EAC7E,IAAI,EAAE,6CAA6C,GAClD,OAAO,CACN,eAAe,CAAC,IAAI,EAAE,eAAe,CAAC,UAAU,EAAE,qBAAqB,CAAC,CAAC,GACzE,eAAe,CAAC,IAAI,EAAE,eAAe,CAAC,SAAS,EAAE,iBAAiB,CAAC,CAAC,CACvE,CAuDA;AAED;;;;;GAKG;AACH,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,SAAS,CAAC,6CAA6C,EAAE,IAAI,EAAE,OAAO,CAAC,EAC7E,EAAE,WAAW,EAAE,MAAM,EAAE,EAAE,6CAA6C,GACrE,OAAO,CAAC,sBAAsB,CAAC,CA2BjC;AAED;;GAEG;AACH,wBAAsB,cAAc,CAClC,IAAI,EAAE,SAAS,CAAC,6CAA6C,EAAE,IAAI,EAAE,OAAO,CAAC,EAC7E,EAAE,WAAW,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,6CAA6C,GACzE,OAAO,CAAC,OAAO,CAAC,CAYlB;AAED;;GAEG;AACH,eAAO,MAAM,uCAAuC,QAAO,UACzD,6CAA6C,EAC7C,IAAI,EACJ,OAAO,CAEwF,CAAC"}
+{"version":3,"file":"consumeAddRelayerPayingKeyAuthorization.d.ts","sourceRoot":"","sources":["../../../src/api/procedures/consumeAddRelayerPayingKeyAuthorization.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,oBAAoB,EAA2B,SAAS,EAAE,uBAAmB;AAE/F,OAAO,EAAE,eAAe,EAAE,sBAAsB,EAAE,eAAe,EAAE,6BAAyB;AAQ5F;;GAEG;AACH,MAAM,WAAW,6CAA6C;IAC5D,WAAW,EAAE,oBAAoB,CAAC;IAClC,MAAM,EAAE,OAAO,CAAC;CACjB;AAED,MAAM,WAAW,OAAO;IACtB,aAAa,EAAE,OAAO,CAAC;IACvB,cAAc,EAAE,OAAO,CAAC;CACzB;AAED;;;;GAIG;AACH,wBAAsB,8CAA8C,CAClE,IAAI,EAAE,SAAS,CAAC,6CAA6C,EAAE,IAAI,EAAE,OAAO,CAAC,EAC7E,IAAI,EAAE,6CAA6C,GAClD,OAAO,CACN,eAAe,CAAC,IAAI,EAAE,eAAe,CAAC,UAAU,EAAE,qBAAqB,CAAC,CAAC,GACzE,eAAe,CAAC,IAAI,EAAE,eAAe,CAAC,SAAS,EAAE,iBAAiB,CAAC,CAAC,CACvE,CAuDA;AAED;;;;;GAKG;AACH,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,SAAS,CAAC,6CAA6C,EAAE,IAAI,EAAE,OAAO,CAAC,EAC7E,EAAE,WAAW,EAAE,MAAM,EAAE,EAAE,6CAA6C,GACrE,OAAO,CAAC,sBAAsB,CAAC,CA2BjC;AAED;;GAEG;AACH,wBAAsB,cAAc,CAClC,IAAI,EAAE,SAAS,CAAC,6CAA6C,EAAE,IAAI,EAAE,OAAO,CAAC,EAC7E,EAAE,WAAW,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,6CAA6C,GACzE,OAAO,CAAC,OAAO,CAAC,CAYlB;AAED;;GAEG;AACH,eAAO,MAAM,uCAAuC,QAAO,UACzD,6CAA6C,EAC7C,IAAI,EACJ,OAAO,CAEwF,CAAC"}

package/api/procedures/consumeAddRelayerPayingKeyAuthorization.js

@@ -61,7 +61,7 @@ exports.prepareConsumeAddRelayerPayingKeyAuthorization = prepareConsumeAddRelaye
 function getAuthorization({ authRequest, accept }) {
     return __awaiter(this, void 0, void 0, function* () {
         const { issuer } = authRequest;
-        const { storage: { signingAccount, calledByTarget }, } = this;
+        const { storage: { actingAccount, calledByTarget }, } = this;
         let hasRoles = calledByTarget;
         if (accept) {
             return {
@@ -69,7 +69,7 @@ function getAuthorization({ authRequest, accept }) {
                     `"${types_1.AuthorizationType.AddRelayerPayingKey}" Authorization Requests must be accepted by the target Account`,
             };
         }
-        const identity = yield signingAccount.getIdentity();
+        const identity = yield actingAccount.getIdentity();
         hasRoles = hasRoles || !!(identity === null || identity === void 0 ? void 0 : identity.isEqual(issuer));
         return {
             roles: hasRoles ||
@@ -89,10 +89,10 @@ function prepareStorage({ authRequest: { target } }) {
         const { context } = this;
         // AddRelayerPayingKey Authorizations always target an Account
         const targetAccount = target;
-        const signingAccount = context.getSigningAccount();
-        const calledByTarget = targetAccount.isEqual(signingAccount);
+        const actingAccount = yield context.getActingAccount();
+        const calledByTarget = targetAccount.isEqual(actingAccount);
         return {
-            signingAccount,
+            actingAccount,
             calledByTarget,
         };
     });

package/api/procedures/consumeAddRelayerPayingKeyAuthorization.js.map

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

package/api/procedures/consumeAuthorizationRequests.js

@@ -87,7 +87,7 @@ function getAuthorization({ authRequests, accept }) {
         const authorized = yield bluebird_1.default.mapSeries(unexpiredRequests, ({ target, issuer }) => __awaiter(this, void 0, void 0, function* () {
             let condition;
             if (target instanceof internal_1.Account) {
-                const account = context.getSigningAccount();
+                const account = yield context.getActingAccount();
                 condition = target.isEqual(account);
             }
             else {

package/api/procedures/consumeAuthorizationRequests.js.map

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