From b0a77dc2fd2e62f51bd1acc3f3be7435f3e8e68d Mon Sep 17 00:00:00 2001 From: timbrinded <79199034+timbrinded@users.noreply.github.com> Date: Wed, 22 May 2024 10:47:17 +0100 Subject: [PATCH] fix: :bug: Fix build --- packages/cli/package.json | 2 +- packages/cli/src/lib/governanceProcedures.ts | 10 ++--- pnpm-lock.yaml | 40 ++++++++++---------- test/package.json | 2 +- 4 files changed, 25 insertions(+), 29 deletions(-) diff --git a/packages/cli/package.json b/packages/cli/package.json index 55a7c438..33364f99 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -58,7 +58,7 @@ "prepublish": "pnpm run build && pnpm run generate-types" }, "dependencies": { - "@acala-network/chopsticks": "0.9.13", + "@acala-network/chopsticks": "0.10.2", "@moonbeam-network/api-augment": "0.2902.0", "@moonwall/types": "workspace:*", "@moonwall/util": "workspace:*", diff --git a/packages/cli/src/lib/governanceProcedures.ts b/packages/cli/src/lib/governanceProcedures.ts index dc406ed4..70db9657 100644 --- a/packages/cli/src/lib/governanceProcedures.ts +++ b/packages/cli/src/lib/governanceProcedures.ts @@ -14,12 +14,8 @@ import { import type { ApiPromise } from "@polkadot/api"; import type { ApiTypes, SubmittableExtrinsic } from "@polkadot/api/types"; import type { KeyringPair } from "@polkadot/keyring/types"; -import type { - PalletDemocracyReferendumInfo, - PalletReferendaReferendumInfo, -} from "@polkadot/types/lookup"; +import type { PalletReferendaReferendumInfo } from "@polkadot/types/lookup"; import { blake2AsHex } from "@polkadot/util-crypto"; -import { u8aToBigInt, u8aToNumber } from "@polkadot/util"; export const COUNCIL_MEMBERS: KeyringPair[] = [baltathar, charleth, dorothy]; export const COUNCIL_THRESHOLD = Math.ceil((COUNCIL_MEMBERS.length * 2) / 3); @@ -700,7 +696,7 @@ export const executeOpenTechCommitteeProposal = async (api: ApiPromise, encodedH export const executeProposalWithCouncil = async (api: ApiPromise, encodedHash: string) => { let nonce = (await api.rpc.system.accountNextIndex(alith.address)).toNumber(); - const referendumNextIndex = (await api.query.democracy.referendumCount()).toNumber(); + const referendumNextIndex = ((await api.query.democracy.referendumCount()) as any).toNumber(); const callData = (api.consts.system.version as any).specVersion.toNumber() >= 2000 @@ -731,7 +727,7 @@ export const executeProposalWithCouncil = async (api: ApiPromise, encodedHash: s process.stdout.write("✅\n"); process.stdout.write(`Waiting for referendum [${referendumNextIndex}] to be executed...`); - let referenda: PalletDemocracyReferendumInfo | undefined; + let referenda: any; while (!referenda) { try { referenda = ( diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 89595b50..89a1ced9 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -34,8 +34,8 @@ importers: packages/cli: dependencies: '@acala-network/chopsticks': - specifier: 0.9.13 - version: 0.9.13(debug@4.3.4)(ts-node@10.9.2(@types/node@20.12.12)(typescript@5.4.5)) + specifier: 0.10.2 + version: 0.10.2(debug@4.3.4)(ts-node@10.9.2(@types/node@20.12.12)(typescript@5.4.5)) '@moonbeam-network/api-augment': specifier: 0.2902.0 version: 0.2902.0 @@ -362,8 +362,8 @@ importers: version: 9.2.22 devDependencies: '@acala-network/chopsticks': - specifier: 0.9.13 - version: 0.9.13(debug@4.3.4)(ts-node@10.9.2(@types/node@20.12.12)(typescript@5.4.5)) + specifier: 0.10.2 + version: 0.10.2(debug@4.3.4)(ts-node@10.9.2(@types/node@20.12.12)(typescript@5.4.5)) '@biomejs/biome': specifier: 1.7.3 version: 1.7.3 @@ -436,17 +436,17 @@ importers: packages: - '@acala-network/chopsticks-core@0.9.13': - resolution: {integrity: sha512-cuXTgg6hl9Jw6qHIxzsLd7rCWnfO+ZvCpFKx8MHCS6NXIyUj01O8S7vtz5B6pfDK8VoCKs8zEoOS/ahoTbDL/Q==} + '@acala-network/chopsticks-core@0.10.2': + resolution: {integrity: sha512-84wfUyY5vCZDmS71j1RMw+xYy7flENIvY+jWOF4KxJYrOj7z3AVoLVlyqrkcIXpsIqmKizUnF8ze5xcVGr/Elg==} - '@acala-network/chopsticks-db@0.9.13': - resolution: {integrity: sha512-Ipc3N9cxzSdrgyvDgcQDapnqN/hJpXsJ/WtDnhiQ8AbX2jZH9fd3kWMBvMRsUYx8TrT5HlQE7EryxTGYdy/y/A==} + '@acala-network/chopsticks-db@0.10.2': + resolution: {integrity: sha512-9MA+ByIb+YupFxK36V1N7FBiQeip99MFVG02dah9SWvM01m90bZFn9VIBUQivN/iFAVWMX/7Jt7W8/J9FhnEcg==} - '@acala-network/chopsticks-executor@0.9.13': - resolution: {integrity: sha512-3Wl9YuHcEV0xJUyXOQrAil3knu4GDJqKwJX5OiQBYxfuAYals0GyAP1q5GMzALmMkPt1GCyAkam3zjcdzXWTXQ==} + '@acala-network/chopsticks-executor@0.10.2': + resolution: {integrity: sha512-Y7oJqrxdH9WGSW5aE5RUXDz2SKrSH7NoRX+zr23dtR686Hqw8zKNGF8Vwj7HnHJbROVDHhGYVffyGvC4Ja2RgA==} - '@acala-network/chopsticks@0.9.13': - resolution: {integrity: sha512-8KY6fEO+6ErCttzKpHssifClijoq7FSenTy00Rut6EPTMYKOlrz+DMRsi9TO9vIEm9oUro9wjCUhQVh8hUMcuw==} + '@acala-network/chopsticks@0.10.2': + resolution: {integrity: sha512-QsOAjwosjiCR9oCnqtMLjO2D6Ov31qIm3AbVVqv9i/JS30ot9MljSJMyUibI5YRq6UhMvdRuxem5MBwrcVmFdQ==} hasBin: true '@adraffy/ens-normalize@1.10.0': @@ -4833,9 +4833,9 @@ packages: snapshots: - '@acala-network/chopsticks-core@0.9.13': + '@acala-network/chopsticks-core@0.10.2': dependencies: - '@acala-network/chopsticks-executor': 0.9.13 + '@acala-network/chopsticks-executor': 0.10.2 '@polkadot/rpc-provider': 10.13.1 '@polkadot/types': 10.13.1 '@polkadot/types-codec': 10.13.1 @@ -4855,9 +4855,9 @@ snapshots: - supports-color - utf-8-validate - '@acala-network/chopsticks-db@0.9.13(ts-node@10.9.2(@types/node@20.12.12)(typescript@5.4.5))': + '@acala-network/chopsticks-db@0.10.2(ts-node@10.9.2(@types/node@20.12.12)(typescript@5.4.5))': dependencies: - '@acala-network/chopsticks-core': 0.9.13 + '@acala-network/chopsticks-core': 0.10.2 '@polkadot/util': 12.6.2 idb: 8.0.0 sqlite3: 5.1.7 @@ -4884,15 +4884,15 @@ snapshots: - typeorm-aurora-data-api-driver - utf-8-validate - '@acala-network/chopsticks-executor@0.9.13': + '@acala-network/chopsticks-executor@0.10.2': dependencies: '@polkadot/util': 12.6.2 '@polkadot/wasm-util': 7.3.2(@polkadot/util@12.6.2) - '@acala-network/chopsticks@0.9.13(debug@4.3.4)(ts-node@10.9.2(@types/node@20.12.12)(typescript@5.4.5))': + '@acala-network/chopsticks@0.10.2(debug@4.3.4)(ts-node@10.9.2(@types/node@20.12.12)(typescript@5.4.5))': dependencies: - '@acala-network/chopsticks-core': 0.9.13 - '@acala-network/chopsticks-db': 0.9.13(ts-node@10.9.2(@types/node@20.12.12)(typescript@5.4.5)) + '@acala-network/chopsticks-core': 0.10.2 + '@acala-network/chopsticks-db': 0.10.2(ts-node@10.9.2(@types/node@20.12.12)(typescript@5.4.5)) '@pnpm/npm-conf': 2.2.2 '@polkadot/api-augment': 10.13.1 '@polkadot/types': 10.13.1 diff --git a/test/package.json b/test/package.json index c4de66dd..91ab5911 100644 --- a/test/package.json +++ b/test/package.json @@ -17,7 +17,7 @@ "bun_test": "bun test suites/bun_test/*" }, "devDependencies": { - "@acala-network/chopsticks": "0.9.13", + "@acala-network/chopsticks": "0.10.2", "@biomejs/biome": "1.7.3", "@moonbeam-network/api-augment": "0.2902.0", "@moonwall/cli": "workspace:*",