From d2ec5d3ee61662239e046709ae58a8d47469bb7e Mon Sep 17 00:00:00 2001 From: Shunji Zhan Date: Tue, 23 Jan 2024 17:55:07 +0800 Subject: [PATCH] test --- packages/eth-providers/package.json | 4 +-- packages/eth-providers/src/bodhi-provider.ts | 4 +-- packages/eth-providers/src/rpc-provider.ts | 4 +-- .../eth-rpc-adapter/src/wrapped-provider.ts | 4 +-- yarn.lock | 34 +++++++++---------- 5 files changed, 25 insertions(+), 25 deletions(-) diff --git a/packages/eth-providers/package.json b/packages/eth-providers/package.json index 498fbbda1..641c0f355 100644 --- a/packages/eth-providers/package.json +++ b/packages/eth-providers/package.json @@ -10,7 +10,7 @@ "test:e2e": "vitest --run --config vitest.config.e2e.ts" }, "peerDependencies": { - "@acala-network/api": "6.0.6-4", + "@acala-network/api": "6.0.6-6", "@polkadot/api": "^10.11.1" }, "dependencies": { @@ -23,7 +23,7 @@ "lru-cache": "~7.8.2" }, "devDependencies": { - "@acala-network/api": "6.0.6-4", + "@acala-network/api": "6.0.6-6", "@types/bn.js": "~5.1.0", "@types/lru-cache": "~7.6.1", "dotenv": "~10.0.0", diff --git a/packages/eth-providers/src/bodhi-provider.ts b/packages/eth-providers/src/bodhi-provider.ts index da6ce8360..12b61876c 100644 --- a/packages/eth-providers/src/bodhi-provider.ts +++ b/packages/eth-providers/src/bodhi-provider.ts @@ -1,12 +1,12 @@ import { ApiPromise } from '@polkadot/api'; import { BaseProvider } from './base-provider'; -import { withAcalaTypes } from '@acala-network/api'; +import { options } from '@acala-network/api'; import type { ApiOptions } from '@polkadot/api/types'; export class BodhiProvider extends BaseProvider { constructor(apiOptions: ApiOptions) { super(); - const api = new ApiPromise(withAcalaTypes(apiOptions)); + const api = new ApiPromise(options(apiOptions)); this.setApi(api); } diff --git a/packages/eth-providers/src/rpc-provider.ts b/packages/eth-providers/src/rpc-provider.ts index 7bf40ca92..f57c420cd 100644 --- a/packages/eth-providers/src/rpc-provider.ts +++ b/packages/eth-providers/src/rpc-provider.ts @@ -1,13 +1,13 @@ import { ApiPromise, WsProvider } from '@polkadot/api'; import { BaseProvider, BaseProviderOptions } from './base-provider'; -import { withAcalaTypes } from '@acala-network/api'; +import { options } from '@acala-network/api'; export class EvmRpcProvider extends BaseProvider { constructor(endpoint: string | string[], opts?: BaseProviderOptions) { super(opts); - const api = new ApiPromise(withAcalaTypes({ + const api = new ApiPromise(options({ provider: new WsProvider(endpoint), })); diff --git a/packages/eth-rpc-adapter/src/wrapped-provider.ts b/packages/eth-rpc-adapter/src/wrapped-provider.ts index c1a15326e..97d4d830b 100644 --- a/packages/eth-rpc-adapter/src/wrapped-provider.ts +++ b/packages/eth-rpc-adapter/src/wrapped-provider.ts @@ -1,6 +1,6 @@ import { ApiPromise, WsProvider } from '@polkadot/api'; import { BaseProvider, BaseProviderOptions } from '@acala-network/eth-providers/base-provider'; -import { withAcalaTypes } from '@acala-network/api'; +import { options } from '@acala-network/api'; import tracer from 'dd-trace'; const TRACE_METHODS = [ @@ -85,7 +85,7 @@ export class EvmRpcProviderWithTrace extends BaseProviderWithTrace { constructor(endpoint: string | string[], opts?: BaseProviderOptions) { super(opts); - const api = new ApiPromise(withAcalaTypes({ + const api = new ApiPromise(options({ provider: new WsProvider(endpoint), })); diff --git a/yarn.lock b/yarn.lock index 839e76950..d5037f475 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12,26 +12,26 @@ __metadata: languageName: node linkType: hard -"@acala-network/api-derive@npm:6.0.6-4": - version: 6.0.6-4 - resolution: "@acala-network/api-derive@npm:6.0.6-4" +"@acala-network/api-derive@npm:6.0.6-6": + version: 6.0.6-6 + resolution: "@acala-network/api-derive@npm:6.0.6-6" dependencies: - "@acala-network/types": 6.0.6-4 + "@acala-network/types": 6.0.6-6 peerDependencies: "@polkadot/api": ^10.9.1 - checksum: 4cc5a7005f0427593addf254cf3dd10c0d3758851f91b05a130506bf2d63df18199ab2c7a7eb1d55cf0eb3d0234aa00ab7c1edce24beed08e9a9866050bb439b + checksum: affdc5f15d9fb73051d5f833b0bfa05922de8ba7e794f59d01d61515805247179ed0c295233a3c9ed6bde39d0c116a828ea9bda649301af875b661755772d5ae languageName: node linkType: hard -"@acala-network/api@npm:6.0.6-4": - version: 6.0.6-4 - resolution: "@acala-network/api@npm:6.0.6-4" +"@acala-network/api@npm:6.0.6-6": + version: 6.0.6-6 + resolution: "@acala-network/api@npm:6.0.6-6" dependencies: - "@acala-network/api-derive": 6.0.6-4 - "@acala-network/types": 6.0.6-4 + "@acala-network/api-derive": 6.0.6-6 + "@acala-network/types": 6.0.6-6 peerDependencies: "@polkadot/api": ^10.9.1 - checksum: 3aff3960d1a4aabc73fcc6fa8174574b36ba2f84d3e7e436abc64bd581a6fa719b241d3cd206ca988fde75949c0f9aaa5ba997c58b9a9753fccab7d584dd57eb + checksum: 2b95b097a2bf4ac32d85d655c5ceb9ad9f0a2ab4c9a1a793ab2a6538c72410ada3b7ef2bb3db162185de62239ec3d7d969df5a94cc7b1893ce01b040a66745b8 languageName: node linkType: hard @@ -69,7 +69,7 @@ __metadata: version: 0.0.0-use.local resolution: "@acala-network/eth-providers@workspace:packages/eth-providers" dependencies: - "@acala-network/api": 6.0.6-4 + "@acala-network/api": 6.0.6-6 "@acala-network/contracts": 4.3.4 "@acala-network/eth-transactions": "workspace:*" "@types/bn.js": ~5.1.0 @@ -83,7 +83,7 @@ __metadata: lru-cache: ~7.8.2 vitest: 0.34.2 peerDependencies: - "@acala-network/api": 6.0.6-4 + "@acala-network/api": 6.0.6-6 "@polkadot/api": ^10.11.1 languageName: unknown linkType: soft @@ -148,12 +148,12 @@ __metadata: languageName: unknown linkType: soft -"@acala-network/types@npm:6.0.6-4": - version: 6.0.6-4 - resolution: "@acala-network/types@npm:6.0.6-4" +"@acala-network/types@npm:6.0.6-6": + version: 6.0.6-6 + resolution: "@acala-network/types@npm:6.0.6-6" peerDependencies: "@polkadot/api": ^10.9.1 - checksum: 5063989482cea5ae3e75ca2b251bdd2303bae418ef7038823997a5bb2a61b7e16aedd028cb64c22807f3b70d944e0b516e14408c86a0e2c7c414abff06fb8ff6 + checksum: 8308a7d171261f93fc28b1dc6543ea8505c1bc456ccc3ab10f9739dbffe3f12e284a4b063b4096d010ce36c3bfaecb297cc9a5fb80190879675b6b384b47ad01 languageName: node linkType: hard