From bfb5f6066bbf6d1fe787f5970d83f31185d1946f Mon Sep 17 00:00:00 2001 From: Igor Papandinas Date: Mon, 25 Mar 2024 16:51:11 +0400 Subject: [PATCH] Revert "chore: ink v5 compatibility (#217)" This reverts commit 340129caa611a4230ccaed45eb525c45d2f1230e. --- base-image/Dockerfile | 2 +- src/lib/nodeInfo.ts | 2 +- src/templates/contracts/blank/contract/Cargo.toml.hbs | 4 ++-- src/templates/contracts/flipper/contract/Cargo.toml.hbs | 6 +++--- src/templates/contracts/psp22/contract/Cargo.toml.hbs | 6 +++--- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/base-image/Dockerfile b/base-image/Dockerfile index 8d399114..a4e13086 100644 --- a/base-image/Dockerfile +++ b/base-image/Dockerfile @@ -24,7 +24,7 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y && \ rustup component add rust-src && \ rustup target add wasm32-unknown-unknown && \ cargo install cargo-dylint dylint-link && \ - cargo install cargo-contract --version 4.0.2 && \ + cargo install cargo-contract --version 4.0.0-rc.2 && \ rustc --version" # Install Yarn 1.x diff --git a/src/lib/nodeInfo.ts b/src/lib/nodeInfo.ts index cb53e8dd..9051baa6 100644 --- a/src/lib/nodeInfo.ts +++ b/src/lib/nodeInfo.ts @@ -20,7 +20,7 @@ export const swankyNodeVersions = new Map([ { version: "1.6.0", polkadotPalletVersions: "polkadot-v0.9.39", - supportedInk: "v5.0.0", + supportedInk: "v4.3.0", downloadUrl: { darwin: { arm64: diff --git a/src/templates/contracts/blank/contract/Cargo.toml.hbs b/src/templates/contracts/blank/contract/Cargo.toml.hbs index 39718191..e0bff533 100644 --- a/src/templates/contracts/blank/contract/Cargo.toml.hbs +++ b/src/templates/contracts/blank/contract/Cargo.toml.hbs @@ -5,10 +5,10 @@ authors = ["{{author_name}}"] edition = "2021" [dependencies] -ink = { version = "5", default-features = false } +ink = { version = "4.2.1", default-features = false } scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } -scale-info = { version = "2.11", default-features = false, features = ["derive"], optional = true } +scale-info = { version = "2.6", default-features = false, features = ["derive"], optional = true } [lib] name = "{{contract_name_snake}}" diff --git a/src/templates/contracts/flipper/contract/Cargo.toml.hbs b/src/templates/contracts/flipper/contract/Cargo.toml.hbs index 0abd0b32..2de5449d 100644 --- a/src/templates/contracts/flipper/contract/Cargo.toml.hbs +++ b/src/templates/contracts/flipper/contract/Cargo.toml.hbs @@ -5,13 +5,13 @@ authors = ["{{author_name}}"] edition = "2021" [dependencies] -ink = { version = "5", default-features = false } +ink = { version = "4.2.1", default-features = false } scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } -scale-info = { version = "2.11", default-features = false, features = ["derive"], optional = true } +scale-info = { version = "2.6", default-features = false, features = ["derive"], optional = true } [dev-dependencies] -ink_e2e = "5" +ink_e2e = "4.2.1" [lib] name = "{{contract_name_snake}}" diff --git a/src/templates/contracts/psp22/contract/Cargo.toml.hbs b/src/templates/contracts/psp22/contract/Cargo.toml.hbs index 154d087c..0cf1e1d6 100644 --- a/src/templates/contracts/psp22/contract/Cargo.toml.hbs +++ b/src/templates/contracts/psp22/contract/Cargo.toml.hbs @@ -5,15 +5,15 @@ authors = ["{{author_name}}"] edition = "2021" [dependencies] -ink = { version = "5", default-features = false} +ink = { version = "4.2.1", default-features = false} scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } -scale-info = { version = "2.11", default-features = false, features = ["derive"], optional = true } +scale-info = { version = "2.6", default-features = false, features = ["derive"], optional = true } openbrush = { git = "https://github.com/Brushfam/openbrush-contracts", tag = "4.0.0", default-features = false, features = ["psp22"] } [dev-dependencies] -ink_e2e = "5" +ink_e2e = "4.2.1" test_helpers = { path = "../../tests/test_helpers", default-features = false } [lib]