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

package/utils/conversion.js

@@ -17,10 +17,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.u32ToBigNumber = exports.bigNumberToU32 = exports.meshPermissionsToPermissions = exports.extrinsicPermissionsToTransactionPermissions = exports.permissionsToMeshPermissions = exports.transactionPermissionsToExtrinsicPermissions = exports.transactionPermissionsToTxGroups = exports.txGroupToTxTags = exports.textToString = exports.stringToText = exports.portfolioToPortfolioKind = exports.portfolioIdToMeshPortfolioId = exports.portfolioLikeToPortfolio = exports.portfolioIdToPortfolio = exports.portfolioLikeToPortfolioId = exports.portfolioToPortfolioId = exports.meshPortfolioIdToPortfolio = exports.claimPercentageToClaimPercentageRestrictionValue = exports.claimCountToClaimCountRestrictionValue = exports.meshClaimToInputStatClaim = exports.permillToBigNumber = exports.percentageToPermill = exports.bigNumberToU128 = exports.bigNumberToU64 = exports.u128ToBigNumber = exports.u64ToBigNumber = exports.signerToString = exports.signerToSignatory = exports.signerValueToSigner = exports.signerToSignerValue = exports.signatoryToSignerValue = exports.signerValueToSignatory = exports.identityIdToString = exports.stringToIdentityId = exports.stringToBlockHash = exports.stringToHash = exports.hashToString = exports.accountIdToString = exports.stringToAccountId = exports.momentToDate = exports.dateToMoment = exports.stringToU8aFixed = exports.tickerToString = exports.stringToTickerKey = exports.stringToTicker = exports.bytesToString = exports.stringToBytes = exports.boolToBoolean = exports.booleanToBool = exports.tickerToDid = void 0;
-exports.txTagToExtrinsicIdentifier = exports.extrinsicIdentifierToTxTag = exports.txTagToProtocolOp = exports.complianceRequirementToRequirement = exports.complianceRequirementResultToRequirementCompliance = exports.requirementToComplianceRequirement = exports.trustedClaimIssuerToTrustedIssuer = exports.trustedIssuerToTrustedClaimIssuer = exports.meshClaimTypeToClaimType = exports.stringToTargetIdentity = exports.statsClaimToStatClaimInputType = exports.meshClaimToClaim = exports.middlewareEventDetailsToEventIdentifier = exports.scopeToMiddlewareScope = exports.middlewareScopeToScope = exports.claimToMeshClaim = exports.cddIdToString = exports.stringToCddId = exports.meshScopeToScope = exports.scopeToMeshScope = exports.canTransferResultToTransferStatus = exports.cddStatusToBoolean = exports.documentToAssetDocument = exports.assetDocumentToDocument = exports.documentHashToString = exports.stringToDocumentHash = exports.assetIdentifierToSecurityIdentifier = exports.securityIdentifierToAssetIdentifier = exports.isFigiValid = exports.isLeiValid = exports.isCusipValid = exports.isIsinValid = exports.fundingRoundToAssetFundingRound = exports.nameToAssetName = exports.posRatioToBigNumber = exports.assetTypeToKnownOrId = exports.internalNftTypeToNftType = exports.internalAssetTypeToAssetType = exports.u8ToTransferStatus = exports.stringToMemo = exports.authorizationDataToAuthorization = exports.agentGroupToPermissionGroup = exports.balanceToBigNumber = exports.bigNumberToBalance = exports.authorizationTypeToMeshAuthorizationType = exports.authorizationToAuthorizationData = exports.agentGroupToPermissionGroupIdentifier = exports.permissionGroupIdentifierToAgentGroup = exports.u8ToBigNumber = exports.u16ToBigNumber = void 0;
-exports.transferRestrictionTypeToStatOpType = exports.statTypeToStatOpType = exports.meshStatToStatType = exports.statUpdatesToBtreeStatUpdate = exports.keyAndValueToStatUpdate = exports.transferConditionsToBtreeTransferConditions = exports.statisticStatTypesToBtreeStatType = exports.sortStatsByClaimType = exports.statisticsOpTypeToStatType = exports.corporateActionParamsToMeshCorporateActionArgs = exports.corporateActionIdentifierToCaId = exports.distributionToDividendDistributionParams = exports.caTaxWithholdingsToMeshTaxWithholdings = exports.targetsToTargetIdentities = exports.targetIdentitiesToCorporateActionTargets = exports.checkpointToRecordDateSpec = exports.corporateActionKindToCaKind = exports.meshCorporateActionToCorporateActionParams = exports.fundraiserToOfferingDetails = exports.fundraiserTierToTier = exports.middlewarePortfolioToPortfolio = exports.permissionsLikeToPermissions = exports.offeringTierToPriceTier = exports.granularCanTransferResultToTransferBreakdown = exports.nftDispatchErrorToTransferError = exports.transferConditionToTransferRestriction = exports.identitiesSetToIdentities = exports.identitiesToBtreeSet = exports.transferRestrictionToPolymeshTransferCondition = exports.claimIssuerToMeshClaimIssuer = exports.claimTypeToMeshClaimType = exports.nftMovementToPortfolioFund = exports.fungibleMovementToPortfolioFund = exports.nftToMeshNft = exports.toIdentityWithClaimsArray = exports.middlewareClaimToClaimData = exports.endConditionToSettlementType = exports.meshSettlementTypeToEndCondition = exports.meshAffirmationStatusToAffirmationStatus = exports.meshInstructionStatusToInstructionStatus = exports.venueTypeToMeshVenueType = exports.meshVenueTypeToVenueType = exports.secondaryAccountToMeshSecondaryKey = exports.transactionToTxTag = exports.transactionHexToTxTag = exports.coerceHexToString = exports.addressToKey = exports.keyToAddress = exports.moduleAddressToString = exports.assetComplianceResultToCompliance = void 0;
-exports.receiptDetailsToMeshReceiptDetails = exports.offChainMetadataToMeshReceiptMetadata = exports.signatureToMeshRuntimeMultiSignature = exports.createRawExtrinsicStatus = exports.assetCountToRaw = exports.mediatorAffirmationStatusToStatus = exports.toHistoricalSettlements = exports.toCustomClaimTypeWithIdentity = exports.nftInputToNftMetadataVec = exports.nftInputToNftMetadataAttribute = exports.meshNftToNftId = exports.meshMetadataKeyToMetadataKey = exports.collectionKeysToMetadataKeys = exports.middlewareAuthorizationDataToAuthorization = exports.middlewarePermissionsDataToPermissions = exports.datesToScheduleCheckpoints = exports.middlewareAgentGroupDataToPermissionGroup = exports.legToOffChainLeg = exports.legToNonFungibleLeg = exports.legToFungibleLeg = exports.middlewarePortfolioDataToPortfolio = exports.expiryToMoment = exports.middlewareInstructionToHistoricInstruction = exports.instructionMemoToString = exports.metadataValueDetailToMeshMetadataValueDetail = exports.metadataValueToMeshMetadataValue = exports.meshMetadataValueToMetadataValue = exports.metadataToMeshMetadataKey = exports.meshMetadataSpecToMetadataSpec = exports.metadataSpecToMeshMetadataSpec = exports.meshProposalStatusToProposalStatus = exports.inputStatTypeToMeshStatType = exports.countStatInputToStatUpdates = exports.claimCountStatInputToStatUpdates = exports.toExemptKey = exports.complianceConditionsToBtreeSet = exports.sortTransferRestrictionByClaimValue = exports.createStat2ndKey = void 0;
+exports.bigNumberToU32 = exports.meshPermissionsToPermissions = exports.extrinsicPermissionsToTransactionPermissions = exports.permissionsToMeshPermissions = exports.transactionPermissionsToExtrinsicPermissions = exports.transactionPermissionsToTxGroups = exports.txGroupToTxTags = exports.textToString = exports.stringToText = exports.portfolioToPortfolioKind = exports.portfolioIdToMeshPortfolioId = exports.portfolioLikeToPortfolio = exports.portfolioIdToPortfolio = exports.portfolioLikeToPortfolioId = exports.portfolioToPortfolioId = exports.meshPortfolioIdToPortfolio = exports.claimPercentageToClaimPercentageRestrictionValue = exports.claimCountToClaimCountRestrictionValue = exports.meshClaimToInputStatClaim = exports.permillToBigNumber = exports.percentageToPermill = exports.bigNumberToU128 = exports.bigNumberToU64 = exports.u128ToBigNumber = exports.u64ToBigNumber = exports.signerToString = exports.signerToSignatory = exports.signerValueToSigner = exports.signerToSignerValue = exports.signatoryToSignerValue = exports.signerValueToSignatory = exports.identityIdToString = exports.stringToIdentityId = exports.stringToBlockHash = exports.stringToHash = exports.hashToString = exports.accountIdToString = exports.stringToAccountId = exports.momentToDate = exports.dateToMoment = exports.stringToH512 = exports.stringToU8aFixed = exports.tickerToString = exports.stringToTickerKey = exports.stringToTicker = exports.bytesToString = exports.stringToBytes = exports.boolToBoolean = exports.booleanToBool = exports.tickerToDid = void 0;
+exports.extrinsicIdentifierToTxTag = exports.txTagToProtocolOp = exports.complianceRequirementToRequirement = exports.complianceRequirementResultToRequirementCompliance = exports.requirementToComplianceRequirement = exports.trustedClaimIssuerToTrustedIssuer = exports.trustedIssuerToTrustedClaimIssuer = exports.meshClaimTypeToClaimType = exports.stringToTargetIdentity = exports.statsClaimToStatClaimInputType = exports.meshClaimToClaim = exports.middlewareEventDetailsToEventIdentifier = exports.scopeToMiddlewareScope = exports.middlewareScopeToScope = exports.claimToMeshClaim = exports.cddIdToString = exports.stringToCddId = exports.meshScopeToScope = exports.scopeToMeshScope = exports.canTransferResultToTransferStatus = exports.cddStatusToBoolean = exports.documentToAssetDocument = exports.assetDocumentToDocument = exports.documentHashToString = exports.stringToDocumentHash = exports.assetIdentifierToSecurityIdentifier = exports.securityIdentifierToAssetIdentifier = exports.isFigiValid = exports.isLeiValid = exports.isCusipValid = exports.isIsinValid = exports.fundingRoundToAssetFundingRound = exports.nameToAssetName = exports.posRatioToBigNumber = exports.assetTypeToKnownOrId = exports.internalNftTypeToNftType = exports.internalAssetTypeToAssetType = exports.u8ToTransferStatus = exports.stringToMemo = exports.authorizationDataToAuthorization = exports.agentGroupToPermissionGroup = exports.balanceToBigNumber = exports.bigNumberToBalance = exports.authorizationTypeToMeshAuthorizationType = exports.authorizationToAuthorizationData = exports.agentGroupToPermissionGroupIdentifier = exports.permissionGroupIdentifierToAgentGroup = exports.u8ToBigNumber = exports.u16ToBigNumber = exports.u32ToBigNumber = void 0;
+exports.statTypeToStatOpType = exports.meshStatToStatType = exports.statUpdatesToBtreeStatUpdate = exports.keyAndValueToStatUpdate = exports.transferConditionsToBtreeTransferConditions = exports.statisticStatTypesToBtreeStatType = exports.sortStatsByClaimType = exports.statisticsOpTypeToStatType = exports.corporateActionParamsToMeshCorporateActionArgs = exports.corporateActionIdentifierToCaId = exports.distributionToDividendDistributionParams = exports.caTaxWithholdingsToMeshTaxWithholdings = exports.targetsToTargetIdentities = exports.targetIdentitiesToCorporateActionTargets = exports.checkpointToRecordDateSpec = exports.corporateActionKindToCaKind = exports.meshCorporateActionToCorporateActionParams = exports.fundraiserToOfferingDetails = exports.fundraiserTierToTier = exports.middlewarePortfolioToPortfolio = exports.permissionsLikeToPermissions = exports.offeringTierToPriceTier = exports.granularCanTransferResultToTransferBreakdown = exports.nftDispatchErrorToTransferError = exports.transferConditionToTransferRestriction = exports.identitiesSetToIdentities = exports.identitiesToBtreeSet = exports.transferRestrictionToPolymeshTransferCondition = exports.claimIssuerToMeshClaimIssuer = exports.claimTypeToMeshClaimType = exports.nftMovementToPortfolioFund = exports.fungibleMovementToPortfolioFund = exports.nftToMeshNft = exports.toIdentityWithClaimsArray = exports.middlewareClaimToClaimData = exports.endConditionToSettlementType = exports.meshSettlementTypeToEndCondition = exports.meshAffirmationStatusToAffirmationStatus = exports.meshInstructionStatusToInstructionStatus = exports.venueTypeToMeshVenueType = exports.meshVenueTypeToVenueType = exports.secondaryAccountToMeshSecondaryKey = exports.transactionToTxTag = exports.transactionHexToTxTag = exports.coerceHexToString = exports.addressToKey = exports.keyToAddress = exports.moduleAddressToString = exports.assetComplianceResultToCompliance = exports.txTagToExtrinsicIdentifier = void 0;
+exports.childKeysWithAuthToCreateChildIdentitiesWithAuth = exports.secondaryAccountWithAuthToSecondaryKeyWithAuth = exports.receiptDetailsToMeshReceiptDetails = exports.offChainMetadataToMeshReceiptMetadata = exports.signatureToMeshRuntimeMultiSignature = exports.createRawExtrinsicStatus = exports.assetCountToRaw = exports.mediatorAffirmationStatusToStatus = exports.toHistoricalSettlements = exports.oldMiddlewareDataToHistoricalSettlements = exports.toCustomClaimTypeWithIdentity = exports.nftInputToNftMetadataVec = exports.nftInputToNftMetadataAttribute = exports.meshNftToNftId = exports.meshMetadataKeyToMetadataKey = exports.collectionKeysToMetadataKeys = exports.middlewareAuthorizationDataToAuthorization = exports.middlewarePermissionsDataToPermissions = exports.datesToScheduleCheckpoints = exports.middlewareAgentGroupDataToPermissionGroup = exports.legToOffChainLeg = exports.legToNonFungibleLeg = exports.legToFungibleLeg = exports.middlewarePortfolioDataToPortfolio = exports.expiryToMoment = exports.middlewareInstructionToHistoricInstruction = exports.middlewareLegToLeg = exports.oldMiddlewareInstructionToHistoricInstruction = exports.portfolioIdStringToPortfolio = exports.instructionMemoToString = exports.metadataValueDetailToMeshMetadataValueDetail = exports.metadataValueToMeshMetadataValue = exports.meshMetadataValueToMetadataValue = exports.metadataToMeshMetadataKey = exports.meshMetadataSpecToMetadataSpec = exports.metadataSpecToMeshMetadataSpec = exports.meshProposalStatusToProposalStatus = exports.inputStatTypeToMeshStatType = exports.countStatInputToStatUpdates = exports.claimCountStatInputToStatUpdates = exports.toExemptKey = exports.complianceConditionsToBtreeSet = exports.sortTransferRestrictionByClaimValue = exports.createStat2ndKey = exports.transferRestrictionTypeToStatOpType = void 0;
 const util_1 = require("@polkadot/util");
 const util_crypto_1 = require("@polkadot/util-crypto");
 const bignumber_js_1 = __importDefault(require("bignumber.js"));
@@ -31,6 +31,7 @@ const utils_2 = require("../generated/utils");
 const internal_1 = require("../internal");
 const types_1 = require("../middleware/types");
 const typesV1_1 = require("../middleware/typesV1");
+const typesV6_1 = require("../middleware/typesV6");
 const types_2 = require("../types");
 const internal_2 = require("../types/internal");
 const utils_3 = require("../types/utils");
@@ -102,6 +103,13 @@ function stringToU8aFixed(value, context) {
     return context.createType('U8aFixed', value);
 }
 exports.stringToU8aFixed = stringToU8aFixed;
+/**
+ * @hidden
+ */
+function stringToH512(value, context) {
+    return context.createType('H512', value);
+}
+exports.stringToH512 = stringToH512;
 /**
  * @hidden
  */
@@ -2174,9 +2182,9 @@ exports.transactionToTxTag = transactionToTxTag;
  * @hidden
  */
 function secondaryAccountToMeshSecondaryKey(secondaryKey, context) {
-    const { account, permissions } = secondaryKey;
+    const { account: { address }, permissions, } = secondaryKey;
     return context.createType('PolymeshPrimitivesSecondaryKey', {
-        signer: signerValueToSignatory(signerToSignerValue(account), context),
+        key: stringToAccountId(address, context),
         permissions: permissionsToMeshPermissions(permissions, context),
     });
 }
@@ -3281,7 +3289,16 @@ exports.instructionMemoToString = instructionMemoToString;
 /**
  * @hidden
  */
-function middlewareInstructionToHistoricInstruction(instruction, context) {
+function portfolioIdStringToPortfolio(id) {
+    const [identityId, number] = id.split('/');
+    return { identityId, number: parseInt(number, 10) };
+}
+exports.portfolioIdStringToPortfolio = portfolioIdStringToPortfolio;
+// TODO @prashantasdeveloper Remove after SQ dual version support
+/**
+ * @hidden
+ */
+function oldMiddlewareInstructionToHistoricInstruction(instruction, context) {
     /* eslint-disable @typescript-eslint/no-non-null-assertion */
     const { id: instructionId, status, settlementType, endBlock, tradeDate, valueDate, legs: { nodes: legs }, memo, createdBlock, venueId, } = instruction;
     const { blockId, hash, datetime } = createdBlock;
@@ -3299,14 +3316,76 @@ function middlewareInstructionToHistoricInstruction(instruction, context) {
     }
     return Object.assign(Object.assign({ id: new bignumber_js_1.default(instructionId), blockNumber: new bignumber_js_1.default(blockId), blockHash: hash, status,
         tradeDate,
-        valueDate }, typeDetails), { memo: memo !== null && memo !== void 0 ? memo : null, venueId: new bignumber_js_1.default(venueId), createdAt: new Date(datetime), legs: legs.map(({ from, to, assetId, amount }) => ({
+        valueDate }, typeDetails), { memo: memo !== null && memo !== void 0 ? memo : null, venueId: new bignumber_js_1.default(venueId), createdAt: new Date(datetime), legs: legs.map(({ fromId, toId, assetId, amount }) => ({
             asset: new internal_1.FungibleAsset({ ticker: assetId }, context),
             amount: new bignumber_js_1.default(amount).shiftedBy(-6),
-            from: middlewarePortfolioToPortfolio(from, context),
-            to: middlewarePortfolioToPortfolio(to, context),
+            from: middlewarePortfolioToPortfolio(portfolioIdStringToPortfolio(fromId), context),
+            to: middlewarePortfolioToPortfolio(portfolioIdStringToPortfolio(toId), context),
         })) });
     /* eslint-enable @typescript-eslint/no-non-null-assertion */
 }
+exports.oldMiddlewareInstructionToHistoricInstruction = oldMiddlewareInstructionToHistoricInstruction;
+// Dual version support end
+/**
+ * @hidden
+ */
+function middlewareLegToLeg(leg, context) {
+    const { legType, from, fromPortfolio, to, toPortfolio, assetId, nftIds, amount } = leg;
+    if (legType === types_1.LegTypeEnum.Fungible) {
+        return {
+            asset: new internal_1.FungibleAsset({ ticker: assetId }, context),
+            amount: new bignumber_js_1.default(amount).shiftedBy(-6),
+            from: middlewarePortfolioToPortfolio({ identityId: from, number: fromPortfolio }, context),
+            to: middlewarePortfolioToPortfolio({ identityId: to, number: toPortfolio }, context),
+        };
+    }
+    if (legType === types_1.LegTypeEnum.NonFungible) {
+        return {
+            from: middlewarePortfolioToPortfolio({ identityId: from, number: fromPortfolio }, context),
+            to: middlewarePortfolioToPortfolio({ identityId: to, number: toPortfolio }, context),
+            nfts: nftIds.map((nftId) => new internal_1.Nft({ ticker: assetId, id: new bignumber_js_1.default(nftId) }, context)),
+            asset: new internal_1.NftCollection({ ticker: assetId }, context),
+        };
+    }
+    // presume off chain
+    return {
+        from: new internal_1.Identity({ did: from }, context),
+        to: new internal_1.Identity({ did: to }, context),
+        asset: assetId,
+        offChainAmount: new bignumber_js_1.default(amount).shiftedBy(-6),
+    };
+}
+exports.middlewareLegToLeg = middlewareLegToLeg;
+/**
+ * @hidden
+ */
+function middlewareInstructionToHistoricInstruction(instruction, context) {
+    /* eslint-disable @typescript-eslint/no-non-null-assertion */
+    const { id: instructionId, status, type, endBlock, endAfterBlock, tradeDate, valueDate, legs: { nodes: legs }, memo, createdBlock, venueId, } = instruction;
+    const { blockId, hash, datetime } = createdBlock;
+    let typeDetails;
+    if (type === types_1.InstructionTypeEnum.SettleManual) {
+        typeDetails = {
+            type: types_2.InstructionType.SettleManual,
+            endAfterBlock: new bignumber_js_1.default(endAfterBlock),
+        };
+    }
+    else if (type === types_1.InstructionTypeEnum.SettleOnBlock) {
+        typeDetails = {
+            type: types_2.InstructionType.SettleOnBlock,
+            endBlock: new bignumber_js_1.default(endBlock),
+        };
+    }
+    else {
+        typeDetails = {
+            type: types_2.InstructionType.SettleOnAffirmation,
+        };
+    }
+    return Object.assign(Object.assign({ id: new bignumber_js_1.default(instructionId), blockNumber: new bignumber_js_1.default(blockId), blockHash: hash, status,
+        tradeDate,
+        valueDate }, typeDetails), { memo: memo !== null && memo !== void 0 ? memo : null, venueId: new bignumber_js_1.default(venueId), createdAt: new Date(datetime), legs: legs.map(leg => middlewareLegToLeg(leg, context)) });
+    /* eslint-enable @typescript-eslint/no-non-null-assertion */
+}
 exports.middlewareInstructionToHistoricInstruction = middlewareInstructionToHistoricInstruction;
 /**
  * @hidden
@@ -3629,21 +3708,42 @@ exports.nftInputToNftMetadataVec = nftInputToNftMetadataVec;
  * @hidden
  */
 function toCustomClaimTypeWithIdentity(data) {
-    return data.map(item => {
-        var _a;
-        return ({
-            name: item.name,
-            id: new bignumber_js_1.default(item.id),
-            did: (_a = item.identity) === null || _a === void 0 ? void 0 : _a.did,
-        });
-    });
+    return data.map(({ id, name, identityId: did }) => ({
+        id: new bignumber_js_1.default(id),
+        name,
+        did,
+    }));
 }
 exports.toCustomClaimTypeWithIdentity = toCustomClaimTypeWithIdentity;
 /**
  * @hidden
  */
-function toHistoricalSettlements(settlementsResult, portfolioMovementsResult, filter, context) {
-    const data = [];
+function portfolioMovementsToHistoricSettlements(portfolioMovements, context, handleMiddlewareAddress) {
+    return portfolioMovements.map(({ createdBlock, fromId, toId, assetId, amount, address: accountAddress }) => {
+        const { blockId, hash } = createdBlock;
+        return {
+            blockNumber: new bignumber_js_1.default(blockId),
+            blockHash: hash,
+            status: typesV6_1.SettlementResultEnum.Executed,
+            accounts: [handleMiddlewareAddress(accountAddress, context)],
+            legs: [
+                {
+                    asset: new internal_1.FungibleAsset({ ticker: assetId }, context),
+                    amount: new bignumber_js_1.default(amount).shiftedBy(-6),
+                    direction: typesV1_1.SettlementDirectionEnum.None,
+                    from: middlewarePortfolioToPortfolio(portfolioIdStringToPortfolio(fromId), context),
+                    to: middlewarePortfolioToPortfolio(portfolioIdStringToPortfolio(toId), context),
+                },
+            ],
+        };
+    });
+}
+// TODO @prashantasdeveloper Remove after SQ dual version support
+/**
+ * @hidden
+ */
+function oldMiddlewareDataToHistoricalSettlements(settlementsResult, portfolioMovements, filter, context) {
+    let data = [];
     const getDirection = (fromId, toId) => {
         const [fromDid] = fromId.split('/');
         const [toDid] = toId.split('/');
@@ -3666,41 +3766,74 @@ function toHistoricalSettlements(settlementsResult, portfolioMovementsResult, fi
         return typesV1_1.SettlementDirectionEnum.None;
     };
     /* eslint-disable @typescript-eslint/no-non-null-assertion */
-    settlementsResult.data.legs.nodes.forEach(({ settlement }) => {
-        const { createdBlock, result: settlementResult, legs: { nodes: legs }, } = settlement;
+    settlementsResult.forEach(({ settlement }) => {
+        const { createdBlock, result: settlementResult, legs: { nodes: legs }, instructionsByLegSettlementIdAndInstructionId: { nodes: [instruction], }, } = settlement;
+        const { id: instructionId } = instruction;
         const { blockId, hash } = createdBlock;
         data.push({
             blockNumber: new bignumber_js_1.default(blockId),
             blockHash: hash,
             status: settlementResult,
             accounts: legs[0].addresses.map((accountAddress) => new internal_1.Account({ address: keyToAddress(accountAddress, context) }, context)),
-            legs: legs.map(({ from, to, fromId, toId, assetId, amount }) => ({
+            instruction: new internal_1.Instruction({ id: new bignumber_js_1.default(instructionId) }, context),
+            legs: legs.map(({ fromId, toId, assetId, amount }) => ({
                 asset: new internal_1.FungibleAsset({ ticker: assetId }, context),
                 amount: new bignumber_js_1.default(amount).shiftedBy(-6),
                 direction: getDirection(fromId, toId),
-                from: middlewarePortfolioToPortfolio(from, context),
-                to: middlewarePortfolioToPortfolio(to, context),
+                from: middlewarePortfolioToPortfolio(portfolioIdStringToPortfolio(fromId), context),
+                to: middlewarePortfolioToPortfolio(portfolioIdStringToPortfolio(toId), context),
             })),
         });
     });
-    portfolioMovementsResult.data.portfolioMovements.nodes.forEach(({ createdBlock, from, to, fromId, toId, assetId, amount, address: accountAddress }) => {
+    data = [
+        ...data,
+        ...portfolioMovementsToHistoricSettlements(portfolioMovements, context, (accountAddress) => new internal_1.Account({ address: keyToAddress(accountAddress, context) }, context)),
+    ];
+    /* eslint-enable @typescript-eslint/no-non-null-assertion */
+    return data.sort((a, b) => a.blockNumber.minus(b.blockNumber).toNumber());
+}
+exports.oldMiddlewareDataToHistoricalSettlements = oldMiddlewareDataToHistoricalSettlements;
+/**
+ * @hidden
+ */
+function toHistoricalSettlements(settlementsResult, portfolioMovements, filter, context) {
+    let data = [];
+    const getDirection = (leg) => {
+        const { from, fromPortfolio, to, toPortfolio } = leg;
+        const { identityId, portfolio } = filter;
+        let result = typesV1_1.SettlementDirectionEnum.None;
+        if (from === to) {
+            result = typesV1_1.SettlementDirectionEnum.None;
+        }
+        else if (from === identityId) {
+            if (!portfolio || fromPortfolio === portfolio) {
+                result = typesV1_1.SettlementDirectionEnum.Incoming;
+            }
+        }
+        else if (to === identityId) {
+            if (!portfolio || toPortfolio === portfolio) {
+                result = typesV1_1.SettlementDirectionEnum.Outgoing;
+            }
+        }
+        return result;
+    };
+    /* eslint-disable @typescript-eslint/no-non-null-assertion */
+    settlementsResult.forEach(({ instruction }) => {
+        const { id, createdBlock, status, legs: { nodes: legs }, } = instruction;
         const { blockId, hash } = createdBlock;
         data.push({
             blockNumber: new bignumber_js_1.default(blockId),
             blockHash: hash,
-            status: types_1.SettlementResultEnum.Executed,
-            accounts: [new internal_1.Account({ address: keyToAddress(accountAddress, context) }, context)],
-            legs: [
-                {
-                    asset: new internal_1.FungibleAsset({ ticker: assetId }, context),
-                    amount: new bignumber_js_1.default(amount).shiftedBy(-6),
-                    direction: getDirection(fromId, toId),
-                    from: middlewarePortfolioToPortfolio(from, context),
-                    to: middlewarePortfolioToPortfolio(to, context),
-                },
-            ],
+            status: status,
+            accounts: legs[0].addresses.map((address) => new internal_1.Account({ address }, context)),
+            instruction: new internal_1.Instruction({ id: new bignumber_js_1.default(id) }, context),
+            legs: legs.map(leg => (Object.assign(Object.assign({}, middlewareLegToLeg(leg, context)), { direction: getDirection(leg) }))),
         });
     });
+    data = [
+        ...data,
+        ...portfolioMovementsToHistoricSettlements(portfolioMovements, context, (accountAddress) => new internal_1.Account({ address: accountAddress }, context)),
+    ];
     /* eslint-enable @typescript-eslint/no-non-null-assertion */
     return data.sort((a, b) => a.blockNumber.minus(b.blockNumber).toNumber());
 }
@@ -3793,4 +3926,32 @@ function receiptDetailsToMeshReceiptDetails(receiptDetails, instructionId, conte
     return context.createType('Vec<PolymeshPrimitivesSettlementReceiptDetails>', rawReceiptDetails);
 }
 exports.receiptDetailsToMeshReceiptDetails = receiptDetailsToMeshReceiptDetails;
+/**
+ * @hidden
+ */
+function secondaryAccountWithAuthToSecondaryKeyWithAuth(accounts, context) {
+    const keyWithAuths = accounts.map(({ secondaryAccount, authSignature }) => {
+        const { account, permissions } = secondaryAccount;
+        return {
+            secondaryKey: secondaryAccountToMeshSecondaryKey({
+                account: (0, internal_3.asAccount)(account, context),
+                permissions: permissionsLikeToPermissions(permissions, context),
+            }, context),
+            authSignature: stringToH512(authSignature, context),
+        };
+    });
+    return context.createType('Vec<PolymeshCommonUtilitiesIdentitySecondaryKeyWithAuth>', keyWithAuths);
+}
+exports.secondaryAccountWithAuthToSecondaryKeyWithAuth = secondaryAccountWithAuthToSecondaryKeyWithAuth;
+/**
+ * @hidden
+ */
+function childKeysWithAuthToCreateChildIdentitiesWithAuth(childKeyAuths, context) {
+    const keyWithAuths = childKeyAuths.map(({ key, authSignature }) => ({
+        key: stringToAccountId((0, internal_3.asAccount)(key, context).address, context),
+        authSignature: stringToH512(authSignature, context),
+    }));
+    return context.createType('Vec<PolymeshCommonUtilitiesIdentityCreateChildIdentityWithAuth>', keyWithAuths);
+}
+exports.childKeysWithAuthToCreateChildIdentitiesWithAuth = childKeysWithAuthToCreateChildIdentitiesWithAuth;
 //# sourceMappingURL=conversion.js.map