Skip to content

Commit ae76467

Browse files
committed
downgrade merkleize-metadata
1 parent cf9b86a commit ae76467

File tree

4 files changed

+5
-27
lines changed

4 files changed

+5
-27
lines changed

jest.config.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,5 @@ module.exports = {
1616
maxWorkers: '50%',
1717
testPathIgnorePatterns: ['/build/', '/node_modules/', '/docs/', '/e2e-tests/'],
1818
// The below resolves `jest-haste-map: Haste module naming collision: @substrate/api-sidecar`
19-
modulePathIgnorePatterns: ['/build'],
20-
// Transform ESM modules from @polkadot-api, @noble, and @scure packages
21-
transformIgnorePatterns: ['/node_modules/(?!(@polkadot-api|@noble|@scure)/)'],
19+
modulePathIgnorePatterns: ['/build']
2220
};

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
"test:test-release": "yarn build:scripts && node scripts/build/runYarnPack.js"
5252
},
5353
"dependencies": {
54-
"@polkadot-api/merkleize-metadata": "^1.1.29",
54+
"@polkadot-api/merkleize-metadata": "^1.1.22",
5555
"@polkadot/api": "16.5.2",
5656
"@polkadot/api-augment": "16.5.2",
5757
"@polkadot/api-contract": "16.5.2",

src/services/transaction/TransactionMetadataBlobService.ts

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -23,25 +23,7 @@ import { ITransactionMetadataBlob } from 'src/types/responses';
2323

2424
import { MetadataBlobParams } from '../../controllers/transaction/TransactionMetadataBlobController';
2525
import { AbstractService } from '../AbstractService';
26-
27-
// Dynamic import helper that TypeScript won't transform to require()
28-
// This is necessary because @polkadot-api/merkleize-metadata is an ESM-only package
29-
// eslint-disable-next-line @typescript-eslint/no-implied-eval
30-
const dynamicImport = new Function('specifier', 'return import(specifier)') as <T>(specifier: string) => Promise<T>;
31-
32-
// Cached module after first load
33-
let merkleizeMetadataModule: typeof import('@polkadot-api/merkleize-metadata') | null = null;
34-
35-
async function getMerkleizeMetadata(): Promise<
36-
(typeof import('@polkadot-api/merkleize-metadata'))['merkleizeMetadata']
37-
> {
38-
if (!merkleizeMetadataModule) {
39-
merkleizeMetadataModule = await dynamicImport<typeof import('@polkadot-api/merkleize-metadata')>(
40-
'@polkadot-api/merkleize-metadata',
41-
);
42-
}
43-
return merkleizeMetadataModule.merkleizeMetadata;
44-
}
26+
import { merkleizeMetadata } from '@polkadot-api/merkleize-metadata';
4527

4628
export class TransactionMetadataBlobService extends AbstractService {
4729
/**
@@ -105,8 +87,6 @@ export class TransactionMetadataBlobService extends AbstractService {
10587

10688
const base58Prefix = ss58Format?.toNumber() ?? 42;
10789

108-
// Use dynamic import for ESM module compatibility
109-
const merkleizeMetadata = await getMerkleizeMetadata();
11090
const merkleized = merkleizeMetadata(metadataV15Raw, {
11191
decimals,
11292
tokenSymbol,

yarn.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1464,7 +1464,7 @@ __metadata:
14641464
languageName: node
14651465
linkType: hard
14661466

1467-
"@polkadot-api/merkleize-metadata@npm:^1.1.29":
1467+
"@polkadot-api/merkleize-metadata@npm:^1.1.22":
14681468
version: 1.1.29
14691469
resolution: "@polkadot-api/merkleize-metadata@npm:1.1.29"
14701470
dependencies:
@@ -2498,7 +2498,7 @@ __metadata:
24982498
resolution: "@substrate/api-sidecar@workspace:."
24992499
dependencies:
25002500
"@acala-network/chopsticks-testing": "npm:^1.2.5"
2501-
"@polkadot-api/merkleize-metadata": "npm:^1.1.29"
2501+
"@polkadot-api/merkleize-metadata": "npm:^1.1.22"
25022502
"@polkadot/api": "npm:16.5.2"
25032503
"@polkadot/api-augment": "npm:16.5.2"
25042504
"@polkadot/api-contract": "npm:16.5.2"

0 commit comments

Comments
 (0)