Merge pull request #12 from PolymeshAssociation/master-into-beta

Master into beta
PolymeshAssociation · Mar 11, 2024 · 8289e4f · 8289e4f
2 parents fb8238c + a898d98
commit 8289e4f
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 7 deletions.
diff --git a/src/polkadot/augment-api-events.ts b/src/polkadot/augment-api-events.ts
@@ -2274,6 +2274,11 @@ declare module '@polkadot/api-base/types/events' {
        * Instruction failed execution (did, instruction_id)
        **/
       InstructionFailed: AugmentedEvent<ApiType, [PolymeshPrimitivesIdentityId, u64]>;
+      /**
+       * An instruction with mediators has been created.
+       * Parameters: [`InstructionId`] of the instruction and the [`IdentityId`] of all mediators.
+       **/
+      InstructionMediators: AugmentedEvent<ApiType, [u64, BTreeSet<PolymeshPrimitivesIdentityId>]>;
       /**
        * An instruction has been rejected (did, instruction_id)
        **/

diff --git a/src/polkadot/lookup.ts b/src/polkadot/lookup.ts
@@ -1647,6 +1647,7 @@ export default {
         '(PolymeshPrimitivesIdentityId,PolymeshPrimitivesIdentityIdPortfolioId,u64)',
       MediatorAffirmationReceived: '(PolymeshPrimitivesIdentityId,u64,Option<u64>)',
       MediatorAffirmationWithdrawn: '(PolymeshPrimitivesIdentityId,u64)',
+      InstructionMediators: '(u64,BTreeSet<PolymeshPrimitivesIdentityId>)',
     },
   },
   /**
@@ -4954,21 +4955,21 @@ export default {
     _enum: ['RequireSudo'],
   },
   /**
-   * Lookup666: pallet_asset::TickerRegistration<U>
+   * Lookup666: pallet_asset::types::TickerRegistration<T>
    **/
   PalletAssetTickerRegistration: {
     owner: 'PolymeshPrimitivesIdentityId',
     expiry: 'Option<u64>',
   },
   /**
-   * Lookup667: pallet_asset::TickerRegistrationConfig<U>
+   * Lookup667: pallet_asset::types::TickerRegistrationConfig<T>
    **/
   PalletAssetTickerRegistrationConfig: {
     maxTickerLength: 'u8',
     registrationLength: 'Option<u64>',
   },
   /**
-   * Lookup668: pallet_asset::SecurityToken
+   * Lookup668: pallet_asset::types::SecurityToken
    **/
   PalletAssetSecurityToken: {
     totalSupply: 'u128',
@@ -4977,13 +4978,13 @@ export default {
     assetType: 'PolymeshPrimitivesAssetAssetType',
   },
   /**
-   * Lookup672: pallet_asset::AssetOwnershipRelation
+   * Lookup672: pallet_asset::types::AssetOwnershipRelation
    **/
   PalletAssetAssetOwnershipRelation: {
     _enum: ['NotOwned', 'TickerOwned', 'AssetOwned'],
   },
   /**
-   * Lookup678: pallet_asset::Error<T>
+   * Lookup678: pallet_asset::error::Error<T>
    **/
   PalletAssetError: {
     _enum: [

diff --git a/src/polkadot/types-lookup.ts b/src/polkadot/types-lookup.ts
@@ -2798,6 +2798,8 @@ declare module '@polkadot/types/lookup' {
     >;
     readonly isMediatorAffirmationWithdrawn: boolean;
     readonly asMediatorAffirmationWithdrawn: ITuple<[PolymeshPrimitivesIdentityId, u64]>;
+    readonly isInstructionMediators: boolean;
+    readonly asInstructionMediators: ITuple<[u64, BTreeSet<PolymeshPrimitivesIdentityId>]>;
     readonly type:
       | 'VenueCreated'
       | 'VenueDetailsUpdated'
@@ -2821,7 +2823,8 @@ declare module '@polkadot/types/lookup' {
       | 'FailedToExecuteInstruction'
       | 'InstructionAutomaticallyAffirmed'
       | 'MediatorAffirmationReceived'
-      | 'MediatorAffirmationWithdrawn';
+      | 'MediatorAffirmationWithdrawn'
+      | 'InstructionMediators';
   }
 
   /** @name PolymeshPrimitivesSettlementVenueType (249) */

diff --git a/src/utils/__tests__/conversion.ts b/src/utils/__tests__/conversion.ts
@@ -3691,6 +3691,7 @@ describe('nftDispatchErrorToTransferError', () => {
       NFTNotFound: { is: jest.fn().mockReturnValue(false) },
       InvalidNFTTransferNFTNotOwned: { is: jest.fn().mockReturnValue(false) },
       InvalidNFTTransferSamePortfolio: { is: jest.fn().mockReturnValue(false) },
+      InvalidNFTTransferNFTIsLocked: { is: jest.fn().mockReturnValue(false) },
     } as unknown as DecoratedErrors<'promise'>['nft'];
 
     const mockError = dsMockUtils.createMockDispatchResult({

diff --git a/src/utils/conversion.ts b/src/utils/conversion.ts
@@ -3263,11 +3263,16 @@ export function nftDispatchErrorToTransferError(
     NFTNotFound: notFoundErr,
     InvalidNFTTransferNFTNotOwned: notOwnedErr,
     InvalidNFTTransferSamePortfolio: samePortfolioErr,
+    InvalidNFTTransferNFTIsLocked: nftLockedErr,
   } = context.polymeshApi.errors.nft;
 
   if (error.isModule) {
     const moduleErr = error.asModule;
-    if ([notOwnedErr, notFoundErr, insufficientErr, duplicateErr].some(err => err.is(moduleErr))) {
+    if (
+      [notOwnedErr, notFoundErr, insufficientErr, duplicateErr, nftLockedErr].some(err =>
+        err.is(moduleErr)
+      )
+    ) {
       return TransferError.InsufficientPortfolioBalance;
     } else if (frozenErr.is(moduleErr)) {
       return TransferError.TransfersFrozen;