@polymeshassociation/polymesh-sdk 25.1.1 → 26.0.0-alpha.1

package/utils/internal.js

@@ -26,8 +26,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.compareTransferRestrictionToStat = exports.compareStatsToInput = exports.assertTickerValid = exports.assertExpectedChainVersion = exports.extractProtocol = exports.warnUnexpectedSqVersion = exports.getLatestSqVersion = exports.getExemptedIds = exports.defusePromise = exports.checkTxType = exports.getPortfolioIdsByName = exports.assembleBatchTransactions = exports.getCheckpointValue = exports.conditionsAreEqual = exports.hasSameElements = exports.toHumanReadable = exports.isModuleOrTagMatch = exports.optionize = exports.xor = exports.asFungibleAsset = exports.asAsset = exports.asBaseAsset = exports.asTicker = exports.assertAddressValid = exports.assertIsPositive = exports.assertIsInteger = exports.createProcedureMethod = exports.calculateNextKey = exports.requestAtBlock = exports.requestMulti = exports.getApiAtBlock = exports.requestPaginated = exports.isAllowedCharacters = exports.isPrintableAscii = exports.removePadding = exports.padString = exports.mergeReceipts = exports.sliceBatchReceipt = exports.segmentEventsByTransaction = exports.filterEventRecords = exports.createClaim = exports.getIdentity = exports.asDid = exports.asAccount = exports.asChildIdentity = exports.asIdentity = exports.getDid = exports.unserialize = exports.serialize = exports.delay = void 0;
-exports.getAssetIdFromMiddleware = exports.getAssetIdForMiddleware = exports.getAccount = exports.assertIdentityExists = exports.assertNoPendingAuthorizationExists = exports.areSameClaims = exports.asNftId = exports.assembleAssetQuery = exports.getIdentityFromKeyRecord = exports.getExemptedBtreeSet = exports.getSecondaryAccountPermissions = exports.assertStatIsSet = exports.neededStatTypeForRestrictionInput = exports.compareStatTypeToTransferRestrictionType = exports.compareTransferRestrictionToInput = void 0;
+exports.extractProtocol = exports.warnUnexpectedSqVersion = exports.getLatestSqVersion = exports.getExemptedIds = exports.defusePromise = exports.checkTxType = exports.getPortfolioIdsByName = exports.assembleBatchTransactions = exports.getCheckpointValue = exports.conditionsAreEqual = exports.hasSameElements = exports.toHumanReadable = exports.isModuleOrTagMatch = exports.optionize = exports.xor = exports.asFungibleAsset = exports.asAsset = exports.asAssetId = exports.asBaseAsset = exports.getAssetIdAndTicker = exports.getAssetIdForTicker = exports.getTickerForAsset = exports.assertTickerValid = exports.assertAddressValid = exports.assertIsPositive = exports.assertIsInteger = exports.createProcedureMethod = exports.calculateNextKey = exports.requestAtBlock = exports.requestMulti = exports.getApiAtBlock = exports.requestPaginated = exports.isAllowedCharacters = exports.isPrintableAscii = exports.removePadding = exports.padString = exports.mergeReceipts = exports.sliceBatchReceipt = exports.segmentEventsByTransaction = exports.filterEventRecords = exports.createClaim = exports.getIdentity = exports.asDid = exports.asAccount = exports.asChildIdentity = exports.asIdentity = exports.getDid = exports.unserialize = exports.serialize = exports.delay = void 0;
+exports.getAssetIdFromMiddleware = exports.getAssetIdForMiddleware = exports.getAssetIdForStats = exports.getAccount = exports.assertIdentityExists = exports.assertNoPendingAuthorizationExists = exports.areSameClaims = exports.asNftId = exports.assembleAssetQuery = exports.getIdentityFromKeyRecord = exports.getExemptedBtreeSet = exports.getSecondaryAccountPermissions = exports.assertStatIsSet = exports.neededStatTypeForRestrictionInput = exports.compareStatTypeToTransferRestrictionType = exports.compareTransferRestrictionToInput = exports.compareTransferRestrictionToStat = exports.compareStatsToInput = exports.assertExpectedChainVersion = void 0;
 const util_1 = require("@polkadot/util");
 const util_crypto_1 = require("@polkadot/util-crypto");
 const bignumber_js_1 = __importDefault(require("bignumber.js"));
@@ -155,9 +155,9 @@ exports.getIdentity = getIdentity;
 /**
  * @hidden
  */
-function createClaim(claimType, jurisdiction, middlewareScope, cddId, customClaimTypeId) {
+function createClaim(claimType, jurisdiction, middlewareScope, cddId, customClaimTypeId, context) {
     const type = claimType;
-    const scope = (middlewareScope ? (0, conversion_1.middlewareScopeToScope)(middlewareScope) : {});
+    const scope = (middlewareScope ? (0, conversion_1.middlewareScopeToScope)(middlewareScope, context) : {});
     switch (type) {
         case types_2.ClaimType.Jurisdiction: {
             return {
@@ -559,22 +559,127 @@ function assertAddressValid(address, ss58Format) {
     }
 }
 exports.assertAddressValid = assertAddressValid;
+/**
+ * @hidden
+ *
+ * Validates a ticker value
+ */
+function assertTickerValid(ticker) {
+    if (!ticker.length || ticker.length > constants_1.MAX_TICKER_LENGTH) {
+        throw new internal_1.PolymeshError({
+            code: types_2.ErrorCode.ValidationError,
+            message: `Ticker length must be between 1 and ${constants_1.MAX_TICKER_LENGTH} characters`,
+        });
+    }
+    if (!isPrintableAscii(ticker)) {
+        throw new internal_1.PolymeshError({
+            code: types_2.ErrorCode.ValidationError,
+            message: 'Only printable ASCII is allowed as ticker name',
+        });
+    }
+    if (ticker !== ticker.toUpperCase()) {
+        throw new internal_1.PolymeshError({
+            code: types_2.ErrorCode.ValidationError,
+            message: 'Ticker cannot contain lower case letters',
+        });
+    }
+}
+exports.assertTickerValid = assertTickerValid;
 /**
  * @hidden
  */
-function asTicker(asset) {
-    return typeof asset === 'string' ? asset : asset.ticker;
+function getTickerForAsset(id, context) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const { polymeshApi: { query: { asset }, }, } = context;
+        let ticker;
+        const rawAssetId = (0, conversion_1.stringToAssetId)(id, context);
+        const rawTicker = yield asset.assetIDTicker(rawAssetId);
+        if (rawTicker.isSome) {
+            ticker = (0, conversion_1.tickerToString)(rawTicker.unwrap());
+        }
+        return ticker;
+    });
 }
-exports.asTicker = asTicker;
+exports.getTickerForAsset = getTickerForAsset;
+/**
+ * @hidden
+ */
+function getAssetIdForTicker(ticker, context) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const { polymeshApi: { query: { asset }, }, } = context;
+        assertTickerValid(ticker);
+        const rawTicker = (0, conversion_1.stringToTicker)(ticker, context);
+        const rawAssetId = yield asset.tickerAssetID(rawTicker);
+        if (rawAssetId.isNone) {
+            throw new internal_1.PolymeshError({
+                code: types_2.ErrorCode.DataUnavailable,
+                message: `There is no Asset with ticker: "${ticker}"`,
+            });
+        }
+        return (0, conversion_1.assetIdToString)(rawAssetId.unwrap());
+    });
+}
+exports.getAssetIdForTicker = getAssetIdForTicker;
+/**
+ * @hidden
+ */
+function getAssetIdAndTicker(assetId, context) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const { isV6 } = context;
+        /* istanbul ignore if: this will be removed after dual version support for v6-v7 */
+        if (isV6) {
+            return {
+                ticker: assetId,
+                assetId,
+            };
+        }
+        return {
+            assetId,
+            ticker: yield getTickerForAsset(assetId, context),
+        };
+    });
+}
+exports.getAssetIdAndTicker = getAssetIdAndTicker;
 /**
  * @hidden
- *
- * @note alternatively {@link asAsset} returns a more precise type but is async due to a network call
  */
 function asBaseAsset(asset, context) {
-    return typeof asset === 'string' ? new internal_1.BaseAsset({ ticker: asset }, context) : asset;
+    return __awaiter(this, void 0, void 0, function* () {
+        const { isV6 } = context;
+        if (asset instanceof internal_1.BaseAsset) {
+            return asset;
+        }
+        /* istanbul ignore if: this will be removed after dual version support for v6-v7 */
+        if (isV6) {
+            assertTickerValid(asset);
+            return new internal_1.BaseAsset({ assetId: asset }, context);
+        }
+        if ((0, util_1.isHex)(asset) && asset.length === 34) {
+            const ticker = yield getTickerForAsset(asset, context);
+            const baseAsset = new internal_1.BaseAsset({ assetId: asset }, context);
+            baseAsset.ticker = ticker;
+            return baseAsset;
+        }
+        else {
+            assertTickerValid(asset);
+            const id = yield getAssetIdForTicker(asset, context);
+            const baseAsset = new internal_1.BaseAsset({ assetId: id }, context);
+            baseAsset.ticker = asset;
+            return baseAsset;
+        }
+    });
 }
 exports.asBaseAsset = asBaseAsset;
+/**
+ * @hidden
+ */
+function asAssetId(asset, context) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const baseAsset = yield asBaseAsset(asset, context);
+        return baseAsset.id;
+    });
+}
+exports.asAssetId = asAssetId;
 /**
  * @hidden
  *
@@ -582,11 +687,15 @@ exports.asBaseAsset = asBaseAsset;
  */
 function asAsset(asset, context) {
     return __awaiter(this, void 0, void 0, function* () {
+        let assetId;
         if (typeof asset !== 'string') {
-            return asset;
+            assetId = asset.id;
+        }
+        else {
+            assetId = asset;
         }
-        const fungible = new internal_1.FungibleAsset({ ticker: asset }, context);
-        const collection = new internal_1.NftCollection({ ticker: asset }, context);
+        const fungible = new internal_1.FungibleAsset({ assetId }, context);
+        const collection = new internal_1.NftCollection({ assetId }, context);
         const [isAsset, isCollection] = yield Promise.all([fungible.exists(), collection.exists()]);
         if (isCollection) {
             return collection;
@@ -596,7 +705,7 @@ function asAsset(asset, context) {
         }
         throw new internal_1.PolymeshError({
             code: types_2.ErrorCode.DataUnavailable,
-            message: `No asset exists with ticker: "${asset}"`,
+            message: `No asset exists with asset ID: "${asset}"`,
         });
     });
 }
@@ -609,8 +718,8 @@ function asFungibleAsset(asset, context) {
     if (asset instanceof internal_1.FungibleAsset) {
         return asset;
     }
-    const ticker = typeof asset === 'string' ? asset : asset.ticker;
-    return new internal_1.FungibleAsset({ ticker }, context);
+    const assetId = typeof asset === 'string' ? asset : asset.id;
+    return new internal_1.FungibleAsset({ assetId }, context);
 }
 exports.asFungibleAsset = asFungibleAsset;
 /**
@@ -833,30 +942,42 @@ function getExemptedIds(identities, context) {
     });
 }
 exports.getExemptedIds = getExemptedIds;
+const getAllowedMajors = (range, supportedSpecSemver) => {
+    const lowMajor = (0, semver_1.major)(supportedSpecSemver).toString();
+    const versions = range.split('||');
+    if (versions.length === 1) {
+        return [lowMajor];
+    }
+    const higherAllowedSpec = versions[versions.length - 1].trim();
+    const higherVersion = (0, semver_1.coerce)(higherAllowedSpec).version;
+    const highMajor = (0, semver_1.major)(higherVersion).toString();
+    return [lowMajor, highMajor];
+};
 /**
  * @hidden
  */
 function assertExpectedNodeVersion(data, reject, isPrivateSupported) {
     const { result: version } = data;
-    const neededMajor = isPrivateSupported
-        ? (0, semver_1.major)(constants_1.PRIVATE_SUPPORTED_NODE_SEMVER).toString()
-        : (0, semver_1.major)(constants_1.SUPPORTED_NODE_SEMVER).toString();
-    const neededSemver = isPrivateSupported
+    const supportedSemver = isPrivateSupported
+        ? constants_1.PRIVATE_SUPPORTED_NODE_SEMVER
+        : constants_1.SUPPORTED_NODE_SEMVER;
+    const supportedSpecVersionRange = isPrivateSupported
         ? constants_1.PRIVATE_SUPPORTED_NODE_VERSION_RANGE
         : constants_1.SUPPORTED_NODE_VERSION_RANGE;
-    if (!(0, semver_1.satisfies)(version, neededMajor)) {
+    const neededMajors = getAllowedMajors(supportedSpecVersionRange, supportedSemver);
+    if (neededMajors.every(neededMajor => !(0, semver_1.satisfies)(version, neededMajor))) {
         const error = new internal_1.PolymeshError({
             code: types_2.ErrorCode.FatalError,
             message: 'Unsupported Polymesh RPC node version. Please upgrade the SDK',
             data: {
                 rpcNodeVersion: version,
-                supportedVersionRange: neededSemver,
+                supportedVersionRange: supportedSpecVersionRange,
             },
         });
         reject(error);
     }
-    if (!(0, semver_1.satisfies)(version, neededSemver)) {
-        console.warn(`This version of the SDK supports Polymesh RPC node version "${neededSemver}". The node is at version ${version}. Please upgrade the SDK`);
+    if (!(0, semver_1.satisfies)(version, supportedSpecVersionRange)) {
+        console.warn(`This version of the SDK supports Polymesh RPC node version "${supportedSpecVersionRange}". The node is at version ${version}. Please upgrade the SDK`);
     }
 }
 /**
@@ -893,25 +1014,26 @@ function assertExpectedSpecVersion(data, reject, isPrivateSupported) {
         // remove leading zeroes, for example 020 becomes 20, 000 becomes 0
         .map((ver) => ver.replace(/^0+(?!$)/g, ''))
         .join('.');
-    const neededMajor = isPrivateSupported
-        ? (0, semver_1.major)(constants_1.PRIVATE_SUPPORTED_SPEC_SEMVER).toString()
-        : (0, semver_1.major)(constants_1.SUPPORTED_SPEC_SEMVER).toString();
-    const neededSemver = isPrivateSupported
+    const supportedSemver = isPrivateSupported
+        ? constants_1.PRIVATE_SUPPORTED_SPEC_SEMVER
+        : constants_1.SUPPORTED_SPEC_SEMVER;
+    const supportedSpecVersionRange = isPrivateSupported
         ? constants_1.PRIVATE_SUPPORTED_SPEC_VERSION_RANGE
         : constants_1.SUPPORTED_SPEC_VERSION_RANGE;
-    if (!(0, semver_1.satisfies)(specVersionAsSemver, neededMajor)) {
+    const neededMajors = getAllowedMajors(supportedSpecVersionRange, supportedSemver);
+    if (neededMajors.every(neededMajor => !(0, semver_1.satisfies)(specVersionAsSemver, neededMajor))) {
         const error = new internal_1.PolymeshError({
             code: types_2.ErrorCode.FatalError,
             message: 'Unsupported Polymesh chain spec version. Please upgrade the SDK',
             data: {
                 specVersion: specVersionAsSemver,
-                supportedVersionRange: neededSemver,
+                supportedVersionRange: supportedSemver,
             },
         });
         reject(error);
     }
-    if (!(0, semver_1.satisfies)(specVersionAsSemver, neededSemver)) {
-        console.warn(`This version of the SDK supports Polymesh chain spec version "${neededSemver}". The chain spec is at version ${specVersionAsSemver}. Please upgrade the SDK`);
+    if (!(0, semver_1.satisfies)(specVersionAsSemver, supportedSpecVersionRange)) {
+        console.warn(`This version of the SDK supports Polymesh chain spec version "${supportedSpecVersionRange}". The chain spec is at version ${specVersionAsSemver}. Please upgrade the SDK`);
     }
 }
 /**
@@ -982,7 +1104,7 @@ function assertExpectedChainVersion(nodeUrl) {
                 if (cleanup) {
                     cleanup();
                 }
-                resolve();
+                resolve(specResponse.result.specVersion);
             }
         };
         const handleError = (error) => {
@@ -1059,37 +1181,11 @@ function assertExpectedChainVersion(nodeUrl) {
     });
 }
 exports.assertExpectedChainVersion = assertExpectedChainVersion;
-/**
- * @hidden
- *
- * Validates a ticker value
- */
-function assertTickerValid(ticker) {
-    if (!ticker.length || ticker.length > constants_1.MAX_TICKER_LENGTH) {
-        throw new internal_1.PolymeshError({
-            code: types_2.ErrorCode.ValidationError,
-            message: `Ticker length must be between 1 and ${constants_1.MAX_TICKER_LENGTH} characters`,
-        });
-    }
-    if (!isPrintableAscii(ticker)) {
-        throw new internal_1.PolymeshError({
-            code: types_2.ErrorCode.ValidationError,
-            message: 'Only printable ASCII is allowed as ticker name',
-        });
-    }
-    if (ticker !== ticker.toUpperCase()) {
-        throw new internal_1.PolymeshError({
-            code: types_2.ErrorCode.ValidationError,
-            message: 'Ticker cannot contain lower case letters',
-        });
-    }
-}
-exports.assertTickerValid = assertTickerValid;
 /**
  * @hidden
  * @returns true is the given stat is able to track the data for the given args
  */
-function compareStatsToInput(rawStatType, args) {
+function compareStatsToInput(rawStatType, args, context) {
     let claimIssuer;
     const { type } = args;
     if (type === types_2.StatType.ScopedCount || type === types_2.StatType.ScopedBalance) {
@@ -1113,7 +1209,7 @@ function compareStatsToInput(rawStatType, args) {
             return false;
         }
     }
-    const stat = (0, conversion_1.meshStatToStatType)(rawStatType);
+    const stat = (0, conversion_1.meshStatToStatType)(rawStatType, context);
     return stat === type;
 }
 exports.compareStatsToInput = compareStatsToInput;
@@ -1214,8 +1310,8 @@ exports.compareTransferRestrictionToInput = compareTransferRestrictionToInput;
 /**
  * @hidden
  */
-function compareStatTypeToTransferRestrictionType(statType, transferRestrictionType) {
-    const opType = (0, conversion_1.meshStatToStatType)(statType);
+function compareStatTypeToTransferRestrictionType(statType, transferRestrictionType, context) {
+    const opType = (0, conversion_1.meshStatToStatType)(statType, context);
     if (opType === types_2.StatType.Count) {
         return transferRestrictionType === types_2.TransferRestrictionType.Count;
     }
@@ -1241,7 +1337,7 @@ function neededStatTypeForRestrictionInput(args, context) {
     const { type, claimIssuer } = args;
     const rawOp = (0, conversion_1.transferRestrictionTypeToStatOpType)(type, context);
     const rawIssuer = claimIssuer ? (0, conversion_1.claimIssuerToMeshClaimIssuer)(claimIssuer, context) : undefined;
-    return (0, conversion_1.statisticsOpTypeToStatType)({ op: rawOp, claimIssuer: rawIssuer }, context);
+    return (0, conversion_1.statisticsOpTypeToStatType)({ operationType: rawOp, claimIssuer: rawIssuer }, context);
 }
 exports.neededStatTypeForRestrictionInput = neededStatTypeForRestrictionInput;
 /**
@@ -1261,33 +1357,50 @@ exports.assertStatIsSet = assertStatIsSet;
 // eslint-disable-next-line require-jsdoc
 function getSecondaryAccountPermissions(args, context, callback) {
     return __awaiter(this, void 0, void 0, function* () {
-        const { polymeshApi: { query: { identity: identityQuery }, }, } = context;
+        const { polymeshApi: { query: { identity: identityQuery }, }, isV6, } = context;
         const { accounts, identity } = args;
-        const assembleResult = (optKeyRecords) => {
-            return optKeyRecords.reduce((result, optKeyRecord, index) => {
-                const account = accounts[index];
-                if (optKeyRecord.isNone) {
-                    return result;
-                }
-                const record = optKeyRecord.unwrap();
-                if (record.isSecondaryKey) {
+        const assembleResult = (optKeyRecords) => __awaiter(this, void 0, void 0, function* () {
+            const result = [];
+            let index = 0;
+            const getAccountAsSecondaryKey = (record, account) => __awaiter(this, void 0, void 0, function* () {
+                /* istanbul ignore if: this will be removed after dual version support for v6-v7 */
+                if (isV6) {
                     const [rawIdentityId, rawPermissions] = record.asSecondaryKey;
-                    if (identity && (0, conversion_1.identityIdToString)(rawIdentityId) !== identity.did) {
-                        return result;
+                    if (!identity || (0, conversion_1.identityIdToString)(rawIdentityId) === identity.did) {
+                        result.push({
+                            account,
+                            permissions: (0, conversion_1.meshPermissionsToPermissions)(rawPermissions, context),
+                        });
                     }
-                    result.push({
-                        account,
-                        permissions: (0, conversion_1.meshPermissionsToPermissions)(rawPermissions, context),
-                    });
                 }
-                return result;
-            }, []);
-        };
+                else {
+                    const rawIdentityId = record.asSecondaryKey;
+                    if (!identity || (0, conversion_1.identityIdToString)(rawIdentityId) === identity.did) {
+                        result.push({
+                            account,
+                            permissions: yield (0, conversion_1.meshPermissionsToPermissionsV2)(account, context),
+                        });
+                    }
+                }
+            });
+            for (const optKeyRecord of optKeyRecords) {
+                const account = accounts[index];
+                if (optKeyRecord.isSome) {
+                    const record = optKeyRecord.unwrap();
+                    if (record.isSecondaryKey) {
+                        yield getAccountAsSecondaryKey(record, account);
+                    }
+                }
+                index++;
+            }
+            return result;
+        });
         const identityKeys = accounts.map(({ address }) => (0, conversion_1.stringToAccountId)(address, context));
         if (callback) {
-            return identityQuery.keyRecords.multi(identityKeys, result => {
-                return callback(assembleResult(result));
-            });
+            return identityQuery.keyRecords.multi(identityKeys, (result) => __awaiter(this, void 0, void 0, function* () {
+                const value = yield assembleResult(result);
+                yield callback(value);
+            }));
         }
         const rawResults = yield identityQuery.keyRecords.multi(identityKeys);
         return assembleResult(rawResults);
@@ -1297,7 +1410,7 @@ exports.getSecondaryAccountPermissions = getSecondaryAccountPermissions;
 /**
  * @hidden
  */
-function getExemptedBtreeSet(identities, ticker, context) {
+function getExemptedBtreeSet(identities, context) {
     return __awaiter(this, void 0, void 0, function* () {
         const exemptedIds = yield getExemptedIds(identities, context);
         const mapped = exemptedIds.map(exemptedId => asIdentity(exemptedId, context));
@@ -1310,14 +1423,21 @@ exports.getExemptedBtreeSet = getExemptedBtreeSet;
  */
 function getIdentityFromKeyRecord(keyRecord, context) {
     return __awaiter(this, void 0, void 0, function* () {
-        const { polymeshApi: { query: { identity }, }, } = context;
+        const { polymeshApi: { query: { identity }, }, isV6, } = context;
         if (keyRecord.isPrimaryKey) {
             const did = (0, conversion_1.identityIdToString)(keyRecord.asPrimaryKey);
             return new internal_1.Identity({ did }, context);
         }
         else if (keyRecord.isSecondaryKey) {
-            const did = (0, conversion_1.identityIdToString)(keyRecord.asSecondaryKey[0]);
-            return new internal_1.Identity({ did }, context);
+            /* istanbul ignore if: this will be removed after dual version support for v6-v7 */
+            if (isV6) {
+                const did = (0, conversion_1.identityIdToString)(keyRecord.asSecondaryKey[0]);
+                return new internal_1.Identity({ did }, context);
+            }
+            else {
+                const did = (0, conversion_1.identityIdToString)(keyRecord.asSecondaryKey);
+                return new internal_1.Identity({ did }, context);
+            }
         }
         else {
             const multiSigAddress = keyRecord.asMultiSigSignerKey;
@@ -1338,15 +1458,15 @@ exports.getIdentityFromKeyRecord = getIdentityFromKeyRecord;
  *
  * @note `assetDetails` and `tickers` must have the same offset
  */
-function assembleAssetQuery(assetDetails, tickers, context) {
+function assembleAssetQuery(assetDetails, assetIds, context) {
     return assetDetails.map((rawDetails, index) => {
-        const ticker = tickers[index];
+        const assetId = assetIds[index];
         const detail = rawDetails.unwrap();
         if (detail.assetType.isNonFungible) {
-            return new internal_1.NftCollection({ ticker }, context);
+            return new internal_1.NftCollection({ assetId }, context);
         }
         else {
-            return new internal_1.FungibleAsset({ ticker }, context);
+            return new internal_1.FungibleAsset({ assetId }, context);
         }
     });
 }
@@ -1366,7 +1486,7 @@ exports.asNftId = asNftId;
 /**
  * @hidden
  */
-function areSameClaims(claim, { scope, type, customClaimTypeId }) {
+function areSameClaims(claim, { scope, type, customClaimTypeId }, context) {
     // filter out deprecated claim types
     if (type === types_1.ClaimTypeEnum.NoData ||
         type === types_1.ClaimTypeEnum.NoType ||
@@ -1374,7 +1494,9 @@ function areSameClaims(claim, { scope, type, customClaimTypeId }) {
         type === types_1.ClaimTypeEnum.InvestorUniquenessV2) {
         return false;
     }
-    if ((0, typeguards_1.isScopedClaim)(claim) && scope && !(0, lodash_1.isEqual)((0, conversion_1.middlewareScopeToScope)(scope), claim.scope)) {
+    if ((0, typeguards_1.isScopedClaim)(claim) &&
+        scope &&
+        !(0, lodash_1.isEqual)((0, conversion_1.middlewareScopeToScope)(scope, context), claim.scope)) {
         return false;
     }
     if (type === types_1.ClaimTypeEnum.Custom &&
@@ -1459,14 +1581,23 @@ function getAccount(args, context) {
         const { polymeshApi: { query: { multiSig }, }, } = context;
         const { address } = args;
         const rawAddress = (0, conversion_1.stringToAccountId)(address, context);
-        const identity = yield multiSig.multiSigToIdentity(rawAddress);
-        if (identity.isEmpty) {
-            return new internal_1.Account(args, context);
+        const rawSigners = yield multiSig.multiSigSigners.entries(rawAddress);
+        if (rawSigners.length > 0) {
+            return new internal_1.MultiSig(args, context);
         }
-        return new internal_1.MultiSig(args, context);
+        return new internal_1.Account(args, context);
     });
 }
 exports.getAccount = getAccount;
+/**
+ * @hidden
+ */
+function getAssetIdForStats(asset, context) {
+    const rawAssetId = (0, conversion_1.assetToMeshAssetId)(asset, context);
+    /* istanbul ignore next: this will be removed after dual version support for v6-v7 */
+    return context.isV6 ? { Ticker: rawAssetId } : rawAssetId;
+}
+exports.getAssetIdForStats = getAssetIdForStats;
 /**
  * @hidden
  */
@@ -1478,24 +1609,31 @@ const getAssetIdForLegacyTicker = (ticker, context) => {
 /**
  * @hidden
  */
-function getAssetIdForMiddleware(asset, context) {
+function getAssetIdForMiddleware(assetIdOrTicker, context) {
     return __awaiter(this, void 0, void 0, function* () {
-        const ticker = asTicker(asset);
-        const sqVersion = yield getLatestSqVersion(context);
-        if ((0, semver_1.lt)(sqVersion, constants_1.SETTLEMENTS_V2_SQ_VERSION)) {
-            // old SQ requires no change
-            return ticker;
+        /**
+         * For cases where ticker is passed in with 7.x chain, we make sure we get assetId mapped with the ticker
+         * `asAssetId` creates a `BaseAsset` and returns the ID which is the ticker value for 6.x chain and ID for 7.x chain
+         */
+        const assetId = yield asAssetId(assetIdOrTicker, context);
+        if (!(0, util_1.hexHasPrefix)(assetId)) {
+            // this will only be true if chain 6.x is running
+            return getAssetIdForLegacyTicker(assetId, context);
         }
-        return getAssetIdForLegacyTicker(ticker, context);
+        return assetId;
     });
 }
 exports.getAssetIdForMiddleware = getAssetIdForMiddleware;
 /**
  * @hidden
  */
-function getAssetIdFromMiddleware(assetIdAndTicker) {
-    const { ticker } = assetIdAndTicker;
-    return (0, conversion_1.coerceHexToString)(ticker);
+function getAssetIdFromMiddleware(assetIdAndTicker, context) {
+    const { id, ticker } = assetIdAndTicker;
+    /* istanbul ignore next: this will be removed after dual version support for v6-v7 */
+    if (context.isV6) {
+        return (0, conversion_1.coerceHexToString)(ticker);
+    }
+    return id;
 }
 exports.getAssetIdFromMiddleware = getAssetIdFromMiddleware;
 //# sourceMappingURL=internal.js.map