From fb45ce0ccf08f260720801a7ab8c8a7129cd2ccd Mon Sep 17 00:00:00 2001 From: Shunji Zhan Date: Tue, 23 Jan 2024 13:18:24 +0800 Subject: [PATCH] test latest types bundle --- packages/eth-providers/package.json | 4 +-- packages/eth-providers/src/bodhi-provider.ts | 4 +-- packages/eth-providers/src/rpc-provider.ts | 8 ++--- .../eth-rpc-adapter/src/wrapped-provider.ts | 8 ++--- yarn.lock | 34 +++++++++---------- 5 files changed, 27 insertions(+), 31 deletions(-) diff --git a/packages/eth-providers/package.json b/packages/eth-providers/package.json index 0524368cd..d98282d5d 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.5", + "@acala-network/api": "6.0.6-1", "@polkadot/api": "^10.11.1" }, "dependencies": { @@ -23,7 +23,7 @@ "lru-cache": "~7.8.2" }, "devDependencies": { - "@acala-network/api": "~6.0.5", + "@acala-network/api": "6.0.6-1", "@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 12b61876c..da6ce8360 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 { options } from '@acala-network/api'; +import { withAcalaTypes } from '@acala-network/api'; import type { ApiOptions } from '@polkadot/api/types'; export class BodhiProvider extends BaseProvider { constructor(apiOptions: ApiOptions) { super(); - const api = new ApiPromise(options(apiOptions)); + const api = new ApiPromise(withAcalaTypes(apiOptions)); this.setApi(api); } diff --git a/packages/eth-providers/src/rpc-provider.ts b/packages/eth-providers/src/rpc-provider.ts index 56284a537..7bf40ca92 100644 --- a/packages/eth-providers/src/rpc-provider.ts +++ b/packages/eth-providers/src/rpc-provider.ts @@ -1,17 +1,15 @@ import { ApiPromise, WsProvider } from '@polkadot/api'; -import { acalaRuntime, acalaTypesBundle } from '@acala-network/types'; import { BaseProvider, BaseProviderOptions } from './base-provider'; +import { withAcalaTypes } from '@acala-network/api'; export class EvmRpcProvider extends BaseProvider { constructor(endpoint: string | string[], opts?: BaseProviderOptions) { super(opts); - const api = new ApiPromise({ + const api = new ApiPromise(withAcalaTypes({ provider: new WsProvider(endpoint), - runtime: acalaRuntime, - typesBundle: acalaTypesBundle, - }); + })); this.setApi(api); } diff --git a/packages/eth-rpc-adapter/src/wrapped-provider.ts b/packages/eth-rpc-adapter/src/wrapped-provider.ts index dc3e80937..c1a15326e 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 { acalaRuntime, acalaTypesBundle } from '@acala-network/types'; +import { withAcalaTypes } from '@acala-network/api'; import tracer from 'dd-trace'; const TRACE_METHODS = [ @@ -85,11 +85,9 @@ export class EvmRpcProviderWithTrace extends BaseProviderWithTrace { constructor(endpoint: string | string[], opts?: BaseProviderOptions) { super(opts); - const api = new ApiPromise({ + const api = new ApiPromise(withAcalaTypes({ provider: new WsProvider(endpoint), - runtime: acalaRuntime, - typesBundle: acalaTypesBundle, - }); + })); this.setApi(api); } diff --git a/yarn.lock b/yarn.lock index e921d0765..4328e39a9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12,26 +12,26 @@ __metadata: languageName: node linkType: hard -"@acala-network/api-derive@npm:6.0.5": - version: 6.0.5 - resolution: "@acala-network/api-derive@npm:6.0.5" +"@acala-network/api-derive@npm:6.0.6-1": + version: 6.0.6-1 + resolution: "@acala-network/api-derive@npm:6.0.6-1" dependencies: - "@acala-network/types": 6.0.5 + "@acala-network/types": 6.0.6-1 peerDependencies: "@polkadot/api": ^10.9.1 - checksum: c7ffbb88f00a47e9c2568df796cae5dee1013b1eb0f504854a3ddcb3438a24e29972a06af2779f1cff20f5fbb017c377dfc445af81f12d158e2b19ffafc4d8c6 + checksum: 548938b934494d7d57a35cf95953aa18b72c11e3d46bef2b8dbbc096e9c57eb1f998148c7129a657f7b65348e7d025a40928e87484e65a7e95b53c412e6443eb languageName: node linkType: hard -"@acala-network/api@npm:~6.0.5": - version: 6.0.5 - resolution: "@acala-network/api@npm:6.0.5" +"@acala-network/api@npm:6.0.6-1": + version: 6.0.6-1 + resolution: "@acala-network/api@npm:6.0.6-1" dependencies: - "@acala-network/api-derive": 6.0.5 - "@acala-network/types": 6.0.5 + "@acala-network/api-derive": 6.0.6-1 + "@acala-network/types": 6.0.6-1 peerDependencies: "@polkadot/api": ^10.9.1 - checksum: 38878c641ba0ecb2fe1516550b99b2c4975e31ee48298a2cfad1bee5ef5f13e180e8b71557806aa5ada91e8b7fc70fec59c8d43ff3243be4654790671a52ffe6 + checksum: 60057e4158e330851fd9df8bd164dbee600ddc8baca692a0d1f36d59bdce0c8b6fb38b5d9a245bc447af8d17dbd5db87424fe48f9e5586f8ef83df432dd3a853 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.5 + "@acala-network/api": 6.0.6-1 "@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.5 + "@acala-network/api": 6.0.6-1 "@polkadot/api": ^10.11.1 languageName: unknown linkType: soft @@ -148,12 +148,12 @@ __metadata: languageName: unknown linkType: soft -"@acala-network/types@npm:6.0.5": - version: 6.0.5 - resolution: "@acala-network/types@npm:6.0.5" +"@acala-network/types@npm:6.0.6-1": + version: 6.0.6-1 + resolution: "@acala-network/types@npm:6.0.6-1" peerDependencies: "@polkadot/api": ^10.9.1 - checksum: db2f3ee924db1fb27dda7e3383f63a22bba00184d16b9d15c7bd16f6cba91935cf2f6b3a7029da8f405517a1289e6e74b2ffa52189ab714f70f637ed45b8d461 + checksum: 4972d9c0804d131f409f33f3e43a06b48f717cc43210ab268be0408a699c128723077c49a5e10b3d3dc8afcf08a1a3413863739ad04b9279664ffb7eedad8f95 languageName: node linkType: hard