Skip to content

Commit 75536c5

Browse files
sinziisinzii
committed
fix build
1 parent e76aeba commit 75536c5

File tree

19 files changed

+167
-102
lines changed

19 files changed

+167
-102
lines changed

e2e/zombienet/src/contracts/flipper/constructor-query.d.ts renamed to e2e/zombienet/src/contracts/flipper-v5/constructor-query.d.ts

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,14 @@ import type {
88
GenericConstructorCallResult,
99
ConstructorCallOptions,
1010
ContractInstantiateResult,
11+
MetadataType,
1112
} from 'dedot/contracts';
1213
import type { InkPrimitivesLangError, FlipperFlipperError } from './types.js';
1314

14-
export interface ConstructorQuery<ChainApi extends GenericSubstrateApi> extends GenericConstructorQuery<ChainApi> {
15+
export interface ConstructorQuery<
16+
ChainApi extends GenericSubstrateApi,
17+
Type extends MetadataType,
18+
> extends GenericConstructorQuery<ChainApi, Type> {
1519
/**
1620
* Creates a new flipper smart contract initialized with the given value.
1721
*
@@ -25,7 +29,8 @@ export interface ConstructorQuery<ChainApi extends GenericSubstrateApi> extends
2529
(
2630
initValue: boolean,
2731
options?: ConstructorCallOptions,
28-
) => Promise<GenericConstructorCallResult<[], ContractInstantiateResult<ChainApi>>>
32+
) => Promise<GenericConstructorCallResult<[], ContractInstantiateResult>>,
33+
Type
2934
>;
3035

3136
/**
@@ -37,7 +42,8 @@ export interface ConstructorQuery<ChainApi extends GenericSubstrateApi> extends
3742
**/
3843
newDefault: GenericConstructorQueryCall<
3944
ChainApi,
40-
(options?: ConstructorCallOptions) => Promise<GenericConstructorCallResult<[], ContractInstantiateResult<ChainApi>>>
45+
(options?: ConstructorCallOptions) => Promise<GenericConstructorCallResult<[], ContractInstantiateResult>>,
46+
Type
4147
>;
4248

4349
/**
@@ -53,6 +59,7 @@ export interface ConstructorQuery<ChainApi extends GenericSubstrateApi> extends
5359
(
5460
seed: Hash,
5561
options?: ConstructorCallOptions,
56-
) => Promise<GenericConstructorCallResult<Result<[], FlipperFlipperError>, ContractInstantiateResult<ChainApi>>>
62+
) => Promise<GenericConstructorCallResult<Result<[], FlipperFlipperError>, ContractInstantiateResult>>,
63+
Type
5764
>;
5865
}

e2e/zombienet/src/contracts/flipper/constructor-tx.d.ts renamed to e2e/zombienet/src/contracts/flipper-v5/constructor-tx.d.ts

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,16 @@ import type {
66
GenericConstructorTx,
77
GenericConstructorTxCall,
88
ConstructorTxOptions,
9-
GenericContractApi,
9+
InkGenericContractApi,
1010
GenericInstantiateSubmittableExtrinsic,
11+
MetadataType,
1112
} from 'dedot/contracts';
1213

1314
export interface ConstructorTx<
1415
ChainApi extends GenericSubstrateApi,
15-
ContractApi extends GenericContractApi = GenericContractApi,
16-
> extends GenericConstructorTx<ChainApi> {
16+
ContractApi extends InkGenericContractApi,
17+
Type extends MetadataType,
18+
> extends GenericConstructorTx<ChainApi, Type> {
1719
/**
1820
* Creates a new flipper smart contract initialized with the given value.
1921
*
@@ -27,7 +29,8 @@ export interface ConstructorTx<
2729
(
2830
initValue: boolean,
2931
options?: ConstructorTxOptions,
30-
) => GenericInstantiateSubmittableExtrinsic<ChainApi, ContractApi>
32+
) => GenericInstantiateSubmittableExtrinsic<ChainApi, ContractApi>,
33+
Type
3134
>;
3235

3336
/**
@@ -39,7 +42,8 @@ export interface ConstructorTx<
3942
**/
4043
newDefault: GenericConstructorTxCall<
4144
ChainApi,
42-
(options?: ConstructorTxOptions) => GenericInstantiateSubmittableExtrinsic<ChainApi, ContractApi>
45+
(options?: ConstructorTxOptions) => GenericInstantiateSubmittableExtrinsic<ChainApi, ContractApi>,
46+
Type
4347
>;
4448

4549
/**
@@ -52,6 +56,7 @@ export interface ConstructorTx<
5256
**/
5357
fromSeed: GenericConstructorTxCall<
5458
ChainApi,
55-
(seed: Hash, options?: ConstructorTxOptions) => GenericInstantiateSubmittableExtrinsic<ChainApi, ContractApi>
59+
(seed: Hash, options?: ConstructorTxOptions) => GenericInstantiateSubmittableExtrinsic<ChainApi, ContractApi>,
60+
Type
5661
>;
5762
}

e2e/zombienet/src/contracts/flipper/events.d.ts renamed to e2e/zombienet/src/contracts/flipper-v5/events.d.ts

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
// Generated by dedot cli
22

33
import type { GenericSubstrateApi } from 'dedot/types';
4-
import type { GenericContractEvents, GenericContractEvent } from 'dedot/contracts';
4+
import type { GenericContractEvents, GenericContractEvent, MetadataType } from 'dedot/contracts';
55

6-
export interface ContractEvents<ChainApi extends GenericSubstrateApi> extends GenericContractEvents<ChainApi> {
6+
export interface ContractEvents<
7+
ChainApi extends GenericSubstrateApi,
8+
Type extends MetadataType,
9+
> extends GenericContractEvents<ChainApi, Type> {
710
/**
811
* Emitted when the flip function is called.
912
*
@@ -24,6 +27,7 @@ export interface ContractEvents<ChainApi extends GenericSubstrateApi> extends Ge
2427
* @indexed: false
2528
**/
2629
new: boolean;
27-
}
30+
},
31+
Type
2832
>;
2933
}

e2e/zombienet/src/contracts/flipper/index.d.ts renamed to e2e/zombienet/src/contracts/flipper-v5/index.d.ts

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Generated by dedot cli
22

3-
import type { VersionedGenericSubstrateApi, RpcVersion, RpcV2 } from 'dedot/types';
4-
import type { GenericContractApi, WithLazyStorage } from 'dedot/contracts';
3+
import type { GenericSubstrateApi, RpcVersion, RpcV2 } from 'dedot/types';
4+
import type { InkGenericContractApi, WithLazyStorage } from 'dedot/contracts';
55
import type { SubstrateApi } from 'dedot/chaintypes';
66
import type { InkPrimitivesLangError, Flipper } from './types.js';
77
import { ContractQuery } from './query.js';
@@ -13,30 +13,30 @@ import { ContractEvents } from './events.js';
1313
export * from './types.js';
1414

1515
/**
16-
* @name: FlipperContractApi
16+
* @name: FlipperV5ContractApi
1717
* @contractName: flipper
1818
* @contractVersion: 5.0.0
1919
* @authors: Parity Technologies <admin@parity.io>
2020
* @language: ink! 5.0.0
2121
**/
22-
export interface FlipperContractApi<
23-
Rv extends RpcVersion = RpcVersion,
24-
ChainApi extends VersionedGenericSubstrateApi = SubstrateApi,
25-
> extends GenericContractApi<Rv, ChainApi> {
26-
query: ContractQuery<ChainApi[Rv]>;
27-
tx: ContractTx<ChainApi[Rv]>;
28-
constructorQuery: ConstructorQuery<ChainApi[Rv]>;
29-
constructorTx: ConstructorTx<ChainApi[Rv], FlipperContractApi>;
30-
events: ContractEvents<ChainApi[Rv]>;
22+
export interface FlipperV5ContractApi<
23+
ChainApi extends GenericSubstrateApi = SubstrateApi,
24+
> extends InkGenericContractApi<ChainApi> {
25+
metadataType: 'ink';
26+
query: ContractQuery<ChainApi, 'ink'>;
27+
tx: ContractTx<ChainApi, 'ink'>;
28+
constructorQuery: ConstructorQuery<ChainApi, 'ink'>;
29+
constructorTx: ConstructorTx<ChainApi, FlipperV5ContractApi, 'ink'>;
30+
events: ContractEvents<ChainApi, 'ink'>;
3131
storage: {
3232
root(): Promise<Flipper>;
3333
lazy(): WithLazyStorage<Flipper>;
3434
};
3535

3636
types: {
37+
ChainApi: ChainApi;
3738
RootStorage: Flipper;
3839
LazyStorage: WithLazyStorage<Flipper>;
3940
LangError: InkPrimitivesLangError;
40-
ChainApi: ChainApi[Rv];
4141
};
4242
}

e2e/zombienet/src/contracts/flipper/query.d.ts renamed to e2e/zombienet/src/contracts/flipper-v5/query.d.ts

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,14 @@ import type {
88
ContractCallOptions,
99
GenericContractCallResult,
1010
ContractCallResult,
11+
MetadataType,
1112
} from 'dedot/contracts';
1213
import type { FlipperFlipperError, InkPrimitivesLangError } from './types.js';
1314

14-
export interface ContractQuery<ChainApi extends GenericSubstrateApi> extends GenericContractQuery<ChainApi> {
15+
export interface ContractQuery<
16+
ChainApi extends GenericSubstrateApi,
17+
Type extends MetadataType,
18+
> extends GenericContractQuery<ChainApi, Type> {
1519
/**
1620
* Flips the current value, value based on seed.
1721
*
@@ -25,7 +29,8 @@ export interface ContractQuery<ChainApi extends GenericSubstrateApi> extends Gen
2529
(
2630
seed: Hash,
2731
options?: ContractCallOptions,
28-
) => Promise<GenericContractCallResult<Result<boolean, FlipperFlipperError>, ContractCallResult<ChainApi>>>
32+
) => Promise<GenericContractCallResult<Result<boolean, FlipperFlipperError>, ContractCallResult>>,
33+
Type
2934
>;
3035

3136
/**
@@ -37,7 +42,8 @@ export interface ContractQuery<ChainApi extends GenericSubstrateApi> extends Gen
3742
**/
3843
flip: GenericContractQueryCall<
3944
ChainApi,
40-
(options?: ContractCallOptions) => Promise<GenericContractCallResult<[], ContractCallResult<ChainApi>>>
45+
(options?: ContractCallOptions) => Promise<GenericContractCallResult<[], ContractCallResult>>,
46+
Type
4147
>;
4248

4349
/**
@@ -49,6 +55,7 @@ export interface ContractQuery<ChainApi extends GenericSubstrateApi> extends Gen
4955
**/
5056
get: GenericContractQueryCall<
5157
ChainApi,
52-
(options?: ContractCallOptions) => Promise<GenericContractCallResult<boolean, ContractCallResult<ChainApi>>>
58+
(options?: ContractCallOptions) => Promise<GenericContractCallResult<boolean, ContractCallResult>>,
59+
Type
5360
>;
5461
}

e2e/zombienet/src/contracts/flipper/tx.d.ts renamed to e2e/zombienet/src/contracts/flipper-v5/tx.d.ts

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,13 @@ import type {
77
GenericContractTxCall,
88
ContractTxOptions,
99
ContractSubmittableExtrinsic,
10+
MetadataType,
1011
} from 'dedot/contracts';
1112

12-
export interface ContractTx<ChainApi extends GenericSubstrateApi> extends GenericContractTx<ChainApi> {
13+
export interface ContractTx<ChainApi extends GenericSubstrateApi, Type extends MetadataType> extends GenericContractTx<
14+
ChainApi,
15+
Type
16+
> {
1317
/**
1418
* Flips the current value, value based on seed.
1519
*
@@ -20,7 +24,8 @@ export interface ContractTx<ChainApi extends GenericSubstrateApi> extends Generi
2024
**/
2125
flipWithSeed: GenericContractTxCall<
2226
ChainApi,
23-
(seed: Hash, options?: ContractTxOptions) => ContractSubmittableExtrinsic<ChainApi>
27+
(seed: Hash, options?: ContractTxOptions) => ContractSubmittableExtrinsic<ChainApi>,
28+
Type
2429
>;
2530

2631
/**
@@ -30,5 +35,5 @@ export interface ContractTx<ChainApi extends GenericSubstrateApi> extends Generi
3035
*
3136
* @selector 0x633aa551
3237
**/
33-
flip: GenericContractTxCall<ChainApi, (options?: ContractTxOptions) => ContractSubmittableExtrinsic<ChainApi>>;
38+
flip: GenericContractTxCall<ChainApi, (options?: ContractTxOptions) => ContractSubmittableExtrinsic<ChainApi>, Type>;
3439
}

e2e/zombienet/src/contracts/flipper/types.d.ts renamed to e2e/zombienet/src/contracts/flipper-v5/types.d.ts

File renamed without changes.

‎e2e/zombienet/src/hooks/useContract.test.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ import { beforeAll, describe, expect, it } from 'vitest';
22
import { ALICE, BOB, ContractId, deployFlipperContract, flipperMetadata, newDeployment, wrapperFn } from '../utils.js';
33
import { numberToHex } from 'dedot/utils';
44
import { Contract } from 'dedot/contracts';
5-
import { FlipperContractApi } from '../contracts/flipper/index.js';
5+
import { FlipperV5ContractApi } from '../contracts/flipper-v5/index.js';
66
import { renderHook, waitFor } from '@testing-library/react';
77
import { useContract } from 'typink';
88

99
describe('useContract', () => {
10-
let contractAddress: string, contract: Contract<FlipperContractApi>;
10+
let contractAddress: string, contract: Contract<FlipperV5ContractApi>;
1111
beforeAll(async () => {
1212
const randomSalt = numberToHex(Date.now());
1313
contractAddress = await deployFlipperContract(randomSalt);
@@ -23,7 +23,7 @@ describe('useContract', () => {
2323
});
2424

2525
it('should initialize contract instance successfully', async () => {
26-
const { result } = renderHook(() => useContract<FlipperContractApi>(ContractId.FLIPPER), {
26+
const { result } = renderHook(() => useContract<FlipperV5ContractApi>(ContractId.FLIPPER), {
2727
wrapper: wrapperFn([newDeployment(ContractId.FLIPPER, contractAddress)]),
2828
});
2929

‎e2e/zombienet/src/hooks/useContractTx.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { numberToHex } from 'dedot/utils';
44
import { renderHook, waitFor } from '@testing-library/react';
55
import { useContractTx, useRawContract } from 'typink';
66
import { Psp22ContractApi } from '../contracts/psp22/index.js';
7-
import { FlipperContractApi } from '../contracts/flipper/index.js';
7+
import { FlipperV5ContractApi } from '../contracts/flipper-v5/index.js';
88

99
describe('useContractTx', () => {
1010
let contractAddress: string;
@@ -87,7 +87,7 @@ describe('useContractTx', () => {
8787

8888
it('should throw a lang error for invalid input', async () => {
8989
const { result: rawContract } = renderHook(
90-
() => useRawContract<FlipperContractApi>(flipperMetadata, contractAddress),
90+
() => useRawContract<FlipperV5ContractApi>(flipperMetadata, contractAddress),
9191
{
9292
wrapper,
9393
},

‎e2e/zombienet/src/hooks/useDeployer.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ import { describe, expect, it } from 'vitest';
22
import { renderHook, waitFor } from '@testing-library/react';
33
import { useDeployer } from 'typink';
44
import { ALICE, BOB, flipperMetadata, wrapper } from '../utils.js';
5-
import { FlipperContractApi } from '../contracts/flipper/index.js';
5+
import { FlipperV5ContractApi } from '../contracts/flipper-v5/index.js';
66

77
describe('useDeployer', () => {
88
it('should load deployer properly', async () => {
99
const { result } = renderHook(
10-
() => useDeployer<FlipperContractApi>(flipperMetadata, flipperMetadata.source.wasm!),
10+
() => useDeployer<FlipperV5ContractApi>(flipperMetadata, flipperMetadata.source.wasm!),
1111
{ wrapper },
1212
);
1313

0 commit comments

Comments
 (0)