Skip to content

fix(contracts): check contracts presence #603

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sinzii merged 6 commits into from
Sep 18, 2025
Merged

fix(contracts): check contracts presence #603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f668a72
fix client input types for contract classes
sinzii Sep 17, 2025
0cb02e8
fix checking contract presence
sinzii Sep 17, 2025
93190cc
update contract code
sinzii Sep 17, 2025
947a0f7
fix ci
sinzii Sep 17, 2025
427f556
update flipper v6 contract, fix ci
sinzii Sep 18, 2025
ac4b196
revert code
sinzii Sep 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/e2e-contracts-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
mv ./substrate-contracts-node-linux/substrate-contracts-node ./substrate-contracts-node
chmod +x substrate-contracts-node

curl -L -O https://github.com/use-ink/ink-node/releases/download/v0.44.0/ink-node-linux.tar.gz
curl -L -O https://github.com/use-ink/ink-node/releases/download/v0.45.1/ink-node-linux.tar.gz
tar -xzf ink-node-linux.tar.gz
mv ./ink-node-linux/ink-node ./ink-node
chmod +x ink-node
Expand Down
959 changes: 274 additions & 685 deletions e2e/contracts/src/contracts/flipper_v6.json
View file
Open in desktop

Large diffs are not rendered by default.

22 changes: 10 additions & 12 deletions examples/scripts/inkv6/flipperv6.json
View file
Open in desktop

Large diffs are not rendered by default.

1,665 changes: 424 additions & 1,241 deletions examples/scripts/inkv6/psp22v6.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/contracts/src/Contract.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export class Contract<ContractApi extends GenericContractApi = GenericContractAp
readonly #options?: ExecutionOptions;

constructor(
readonly client: ISubstrateClient<ContractApi['types']['ChainApi']>,
readonly client: ISubstrateClient<any, any>,
metadata: LooseContractMetadata | string,
address: ContractAddress,
options?: ExecutionOptions,
Expand Down
2 changes: 1 addition & 1 deletion packages/contracts/src/ContractDeployer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export class ContractDeployer<ContractApi extends GenericContractApi = GenericCo
readonly #options?: ExecutionOptions;

constructor(
readonly client: ISubstrateClient<ContractApi['types']['ChainApi']>,
readonly client: ISubstrateClient<any, any>,
metadata: LooseContractMetadata | string,
codeHashOrCode: Hash | Uint8Array | string,
options?: ExecutionOptions,
Expand Down
7 changes: 5 additions & 2 deletions packages/contracts/src/utils/ensure.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,12 @@ export async function ensureContractPresence(
registry: TypinkRegistry,
address: ContractAddress,
) {
const contractInfo = await (() => {
const contractInfo = await (async () => {
if (registry.isRevive()) {
return client.query.revive.contractInfoOf(address as HexString);
const accountInfo = await client.query.revive.accountInfoOf(address as HexString);
if (accountInfo?.accountType && accountInfo?.accountType?.type === 'Contract') {
return accountInfo.accountType.value;
}
} else {
return client.query.contracts.contractInfoOf(address);
}
Expand Down