From 6cdd4762b449c1d6c5156ef7de709185cb7ffc1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kuba=20P=C5=82askonka?= Date: Wed, 10 Dec 2025 11:17:02 +0100 Subject: [PATCH 1/3] Bumped crates. --- Cargo.toml | 148 +++++++++++++++---------- benchmark/Cargo.toml | 18 ++- core/Cargo.toml | 24 ++-- examples/.cargo/config.toml | 2 +- examples/Cargo.toml | 16 ++- examples/ourcoin/Cargo.toml | 13 ++- justfile | 8 +- modules/Cargo.toml | 23 ++-- odra-bdd/Cargo.toml | 20 ++-- odra-build/Cargo.toml | 18 +-- odra-casper/livenet-env/Cargo.toml | 21 ++-- odra-casper/proxy-caller/Cargo.toml | 23 ++-- odra-casper/rpc-client/Cargo.toml | 34 +++--- odra-casper/test-vm/Cargo.toml | 16 ++- odra-casper/wasm-env/Cargo.toml | 17 ++- odra-cli/Cargo.toml | 38 ++++--- odra-macros/Cargo.toml | 27 +++-- odra-schema/Cargo.toml | 20 ++-- odra-test/Cargo.toml | 10 +- odra-vm/Cargo.toml | 11 +- odra-wasm-client-builder/Cargo.toml | 27 +++-- odra-wasm-client/Cargo.toml | 41 +++---- odra/Cargo.toml | 9 +- rustfmt.toml | 4 +- templates/blank/_Cargo.toml | 2 +- templates/cargo-generate.toml | 2 +- templates/cep18/_Cargo.toml | 2 +- templates/cep95/_Cargo.toml | 2 +- templates/full/_Cargo.toml | 2 +- templates/wasm_client/_Cargo.toml | 8 +- templates/workspace/_Cargo.toml | 6 +- templates/workspace/cli/Cargo.toml | 4 +- templates/workspace/flapper/Cargo.toml | 2 +- templates/workspace/flipper/Cargo.toml | 2 +- 34 files changed, 351 insertions(+), 269 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 104c550c8..b1227de1f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,85 +1,111 @@ [workspace] -members = [ - "odra", - "odra-vm", - "benchmark", - "core", - "examples", - "examples/ourcoin", - "modules", - "odra-macros", - "odra-casper/rpc-client", - "odra-casper/livenet-env", - "odra-casper/wasm-env", - "odra-casper/test-vm", - "odra-cli", - "odra-schema", - "odra-test", - "odra-build", - "odra-bdd", - "odra-wasm-client", - "odra-wasm-client-builder", -] exclude = [ - "odra-casper/proxy-caller", - "templates/blank", - "templates/full", - "templates/workspace", - "tests", + "odra-casper/proxy-caller", + "templates/blank", + "templates/full", + "templates/workspace", + "tests", +] +members = [ + "benchmark", + "core", + "examples", + "examples/ourcoin", + "modules", + "odra", + "odra-bdd", + "odra-build", + "odra-casper/livenet-env", + "odra-casper/rpc-client", + "odra-casper/test-vm", + "odra-casper/wasm-env", + "odra-cli", + "odra-macros", + "odra-schema", + "odra-test", + "odra-vm", + "odra-wasm-client", + "odra-wasm-client-builder", ] resolver = "2" [workspace.package] -version = "2.4.1" authors = [ - "Jakub Płaskonka ", - "Krzysztof Pobiarżyn ", - "Maciej Zieliński ", + "Jakub Płaskonka ", + "Krzysztof Pobiarżyn ", + "Maciej Zieliński ", ] -license = "MIT" +edition = "2021" homepage = "https://odra.dev/docs" +license = "MIT" +readme = "README.md" repository = "https://github.com/odradev/odra" +version = "2.4.1" [workspace.dependencies] -odra-core = { path = "core", version = "2.4.1" } -odra-macros = { path = "odra-macros", version = "2.4.1" } -odra-casper-test-vm = { path = "odra-casper/test-vm", version = "2.4.1" } odra-casper-rpc-client = { path = "odra-casper/rpc-client", version = "2.4.1" } -odra-vm = { path = "odra-vm", version = "2.4.1" } +odra-casper-test-vm = { path = "odra-casper/test-vm", version = "2.4.1" } odra-casper-wasm-env = { path = "odra-casper/wasm-env", version = "2.4.1" } +odra-core = { path = "core", version = "2.4.1" } +odra-macros = { path = "odra-macros", version = "2.4.1" } odra-schema = { path = "odra-schema", version = "2.4.1" } +odra-vm = { path = "odra-vm", version = "2.4.1" } odra-wasm-client = { path = "odra-wasm-client", version = "2.4.1" } -casper-contract = { version = "5.1.0", default-features = false } -casper-contract-schema = { version = "0.6.0", git ="https://github.com/odradev/casper-contract-schema.git",branch = "feature/schema-deser" } -casper-types = "6.0.0" -casper-execution-engine = "8.1.0" -casper-engine-test-support = "8.1.0" -casper-storage = "2.0.0" + +casper-client = { version = "5.0", default-features = false } +casper-contract = { version = "5.1", default-features = false } +casper-contract-schema = { version = "0.6.0" } +casper-engine-test-support = "8.1" casper-event-standard = "0.7" -casper-client = { version = "5.0.0", default-features = false } -blake2 = "0.10.6" -log = "0.4.20" -env_logger = "0.11.1" -serde = { version = "1.0.195", default-features = false } -serde_json = { version = "1.0.113", default-features = false } -num-traits = { version = "0.2.14", default-features = false } -mockall = { version = "0.12.1" } -sha3 = { version = "0.10", default-features = false } -hex = "0.4" -tokio = "1.38" +casper-execution-engine = "8.1" +casper-storage = "2.1" +casper-types = "6.1" + +anyhow = { version = "1.0", default-features = false } +backtrace = { version = "0.3" } base16 = { version = "0.2", default-features = false } base64 = { version = "0.22", default-features = false, features = ["alloc"] } -serde-json-wasm = { version = "1.0", default-features = false } -anyhow = { version = "1.0.86", default-features = false } +blake2 = "0.10" +bytes = "1.11" +chrono = { version = "0.4"} +clap = { version = "4.5"} +convert_case = "0.6" +cucumber = "0.21" +derive-try-from-ref = "0.1" +derive_more = { version = "2.1.0", features = ["full"] } +dotenv = "0.15" +futures = "0.3" +futures-util = "0.3" +gloo-utils = { version = "0.2"} +hex = "0.4" +itertools = "0.14" +js-sys = "0.3" +lazy_static = "1.5.0" +log = "0.4" +mockall = { version = "0.14" } +num-traits = { version = "0.2", default-features = false } +pretty_assertions = "1.4" +prettycli = "0.1" +proc-macro2 = "1.0" +project-root = "0.2" +quote = "1.0" rand = { version = "0.9", default-features = false } rand_chacha = { version = "0.9", default-features = false } -convert_case = "0.5.0" -lazy_static = "1.5.0" -cucumber = "0.21.1" -futures = "0.3.5" -derive_more = { version = "1.0.0", features = ["full"] } -project-root = "0.2.2" -backtrace = { version = "0.3" } +reqwest = { version = "0.12" } +serde = { version = "1.0", default-features = false } +serde_derive = { version = "1.0" } +serde-json-wasm = { version = "1.0", default-features = false } +serde_json = { version = "1.0", default-features = false } +sha3 = { version = "0.10", default-features = false } +syn = "2.0" +syn_derive = "0.2" +thiserror = "1.0" +tokio = "1.48" +toml = "0.9" +wasm-bindgen = "=0.2.100" +wasm-bindgen-futures = "0.4" +web-sys = { version = "0.3"} + [profile.release] codegen-units = 1 diff --git a/benchmark/Cargo.toml b/benchmark/Cargo.toml index de9113fe4..dbb7355fc 100644 --- a/benchmark/Cargo.toml +++ b/benchmark/Cargo.toml @@ -1,12 +1,20 @@ [package] name = "benchmark" -version = "2.4.1" -edition = "2021" +description = "Benchmarking contracts and tools for Odra Framework" + +authors = { workspace = true } +edition = { workspace = true } +homepage = { workspace = true } +license = { workspace = true } +readme = { workspace = true } +repository = { workspace = true } +version = { workspace = true } [dependencies] odra = { path = "../odra" } -odra-test = { path = "../odra-test", optional = true } odra-modules = { path = "../modules" } +odra-test = { path = "../odra-test", optional = true } + base64 = { workspace = true } [target.'cfg(not(target_arch = "wasm32"))'.dependencies] @@ -25,8 +33,8 @@ test = false [[bin]] name = "benchmark" path = "bin/benchmark.rs" -test = false required-features = ["odra-test"] +test = false [[bin]] name = "evaluate_benchmark" @@ -34,5 +42,5 @@ path = "bin/evaluate_benchmark.rs" test = false [features] -default = [] benchmark = ["odra-test"] +default = [] diff --git a/core/Cargo.toml b/core/Cargo.toml index d84a3a0bd..7d63d1ffd 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -1,22 +1,30 @@ [package] name = "odra-core" description = "Core of the Odra Framework" -edition = "2021" -version = { workspace = true } + authors = { workspace = true } -license = { workspace = true } +edition = { workspace = true } homepage = { workspace = true } +license = { workspace = true } +readme = { workspace = true } repository = { workspace = true } +version = { workspace = true } [dependencies] -casper-types = { workspace = true } casper-event-standard = { workspace = true } -num-traits = { workspace = true } -serde = { workspace = true, default-features = false, features = ["alloc", "derive"] } -serde_json = { workspace = true, default-features = false, features = ["alloc"] } +casper-types = { workspace = true } + anyhow = { workspace = true } -rand_chacha = { workspace = true } +num-traits = { workspace = true } rand = { workspace = true } +rand_chacha = { workspace = true } +serde = { workspace = true, default-features = false, features = [ + "alloc", + "derive", +] } +serde_json = { workspace = true, default-features = false, features = [ + "alloc", +] } [dev-dependencies] mockall = { workspace = true } diff --git a/examples/.cargo/config.toml b/examples/.cargo/config.toml index a04ef11f5..dd4b8fadc 100644 --- a/examples/.cargo/config.toml +++ b/examples/.cargo/config.toml @@ -2,4 +2,4 @@ target-dir = "../target" [alias] -rl = "run --features=livenet" \ No newline at end of file +rl = "run --features=livenet" diff --git a/examples/Cargo.toml b/examples/Cargo.toml index 3cb96d895..f9f310814 100644 --- a/examples/Cargo.toml +++ b/examples/Cargo.toml @@ -1,12 +1,20 @@ [package] name = "odra-examples" -version = "2.4.1" -edition = "2021" +description = "Examples of features of Odra Framework" + +authors = { workspace = true } +edition = { workspace = true } +homepage = { workspace = true } +license = { workspace = true } +readme = { workspace = true } +repository = { workspace = true } +version = { workspace = true } [dependencies] odra = { path = "../odra", features = [], default-features = false } -odra-modules = { path = "../modules", features = [], default-features = false } odra-casper-livenet-env = { path = "../odra-casper/livenet-env", optional = true } +odra-modules = { path = "../modules", features = [], default-features = false } + sha3 = { workspace = true } [target.'cfg(not(target_arch = "wasm32"))'.dependencies] @@ -14,8 +22,8 @@ odra-build = { path = "../odra-build" } odra-cli = { path = "../odra-cli", features = [], default-features = false } [dev-dependencies] -odra-test = { path = "../odra-test" } hex = { workspace = true } +odra-test = { path = "../odra-test" } [build-dependencies] odra-build = { path = "../odra-build" } diff --git a/examples/ourcoin/Cargo.toml b/examples/ourcoin/Cargo.toml index 39074bfd1..ccb7c8ccd 100644 --- a/examples/ourcoin/Cargo.toml +++ b/examples/ourcoin/Cargo.toml @@ -1,19 +1,20 @@ [package] name = "ourcoin" -version = "0.1.0" edition = "2021" +version = "0.1.0" [dependencies] -odra = { path = "../../odra", features = [], default-features = false } -odra-modules = { path = "../../modules", features = [], default-features = false } +odra = { path = "../../odra", default-features = false } +odra-build = { path = "../../odra-build", default-features = false } odra-casper-livenet-env = { path = "../../odra-casper/livenet-env", optional = true } -odra-build = { path = "../../odra-build", features = [], default-features = false } +odra-modules = { path = "../../modules", default-features = false } [dev-dependencies] -odra-test = { path = "../../odra-test", features = [], default-features = false } +odra-test = { path = "../../odra-test", default-features = false } [build-dependencies] -odra-build = { path = "../../odra-build", features = [], default-features = false } +odra-build = { path = "../../odra-build", features = [ +], default-features = false } [features] default = [] diff --git a/justfile b/justfile index cd4292de4..0ab5fa99e 100644 --- a/justfile +++ b/justfile @@ -47,13 +47,9 @@ build-proxy-callers: wasm-opt --signext-lowering target/wasm32-unknown-unknown/release/proxy_caller.wasm -o target/wasm32-unknown-unknown/release/proxy_caller.wasm wasm-opt --signext-lowering target/wasm32-unknown-unknown/release/proxy_caller_with_return.wasm -o target/wasm32-unknown-unknown/release/proxy_caller_with_return.wasm cp target/wasm32-unknown-unknown/release/proxy_caller.wasm \ - odra-casper/test-vm/resources/proxy_caller.wasm + resources/proxy_caller.wasm cp target/wasm32-unknown-unknown/release/proxy_caller_with_return.wasm \ - odra-casper/test-vm/resources/proxy_caller_with_return.wasm - cp target/wasm32-unknown-unknown/release/proxy_caller.wasm \ - odra-casper/rpc-client/resources/proxy_caller.wasm - cp target/wasm32-unknown-unknown/release/proxy_caller_with_return.wasm \ - odra-casper/rpc-client/resources/proxy_caller_with_return.wasm + resources/proxy_caller_with_return.wasm test-odra: cargo test diff --git a/modules/Cargo.toml b/modules/Cargo.toml index e3670ad24..ef36e8532 100644 --- a/modules/Cargo.toml +++ b/modules/Cargo.toml @@ -1,28 +1,24 @@ [package] name = "odra-modules" -version = "2.4.1" -edition = "2021" -authors = ["Jakub Płaskonka ", "Krzysztof Pobiarżyn ", "Maciej Zieliński "] -license = "MIT" -repository = "https://github.com/odradev/odra" description = "Collection of reusable Odra modules." -keywords = ["wasm", "webassembly", "blockchain"] + +authors = { workspace = true } +edition = { workspace = true } +homepage = { workspace = true } +license = { workspace = true } +readme = { workspace = true } +repository = { workspace = true } +version = { workspace = true } [dependencies] -odra = { path = "../odra", version = "2.4.1", default-features = false } -serde = { workspace = true, default-features = false } -serde_json = { workspace = true, default-features = false } -serde-json-wasm = { workspace = true } -base16 = { workspace = true } base64 = { workspace = true } +odra = { path = "../odra", version = "2.4.1", default-features = false } [target.'cfg(not(target_arch = "wasm32"))'.dependencies] odra-build = { path = "../odra-build", version = "2.4.1" } [dev-dependencies] odra-test = { path = "../odra-test", version = "2.4.1" } -once_cell = "1" -blake2 = "0.10.6" [build-dependencies] odra-build = { path = "../odra-build", version = "2.4.1" } @@ -43,4 +39,3 @@ test = false [lints.rust] missing_docs = "warn" - diff --git a/odra-bdd/Cargo.toml b/odra-bdd/Cargo.toml index e0dbb30fe..23b2c0b6d 100644 --- a/odra-bdd/Cargo.toml +++ b/odra-bdd/Cargo.toml @@ -1,15 +1,17 @@ [package] name = "odra-bdd" description = "BDD helper for Odra smart contracts." -edition = "2021" -version.workspace = true -authors.workspace = true -license.workspace = true -homepage.workspace = true -repository.workspace = true + +authors = { workspace = true } +edition = { workspace = true } +homepage = { workspace = true } +license = { workspace = true } +readme = { workspace = true } +repository = { workspace = true } +version = { workspace = true } [dependencies] -cucumber.workspace = true -futures.workspace = true -derive_more.workspace = true odra = { path = "../odra", version = "2.4.1" } + +cucumber = { workspace = true} +futures = { workspace = true } diff --git a/odra-build/Cargo.toml b/odra-build/Cargo.toml index c0f8bdccc..f71d67c1c 100644 --- a/odra-build/Cargo.toml +++ b/odra-build/Cargo.toml @@ -1,13 +1,17 @@ [package] name = "odra-build" description = "Function used in build.rs files of Odra projects" -edition = "2021" -version.workspace = true -authors.workspace = true -license.workspace = true -homepage.workspace = true -repository.workspace = true + +authors = { workspace = true } +edition = { workspace = true } +homepage = { workspace = true } +license = { workspace = true } +readme = { workspace = true } +repository = { workspace = true } +version = { workspace = true } [dependencies] serde = { workspace = true } -serde_json = { workspace = true, default-features = false, features = ["alloc"] } \ No newline at end of file +serde_json = { workspace = true, default-features = false, features = [ + "alloc", +] } diff --git a/odra-casper/livenet-env/Cargo.toml b/odra-casper/livenet-env/Cargo.toml index cdfe08435..e163e8c6b 100644 --- a/odra-casper/livenet-env/Cargo.toml +++ b/odra-casper/livenet-env/Cargo.toml @@ -1,23 +1,26 @@ [package] -name = "odra-casper-livenet-env" description = "Odra's backend for interacting with the Casper Node." -edition = "2021" -version = { workspace = true } +name = "odra-casper-livenet-env" + authors = { workspace = true } -license = { workspace = true } +edition = { workspace = true } homepage = { workspace = true } +license = { workspace = true } +readme = { workspace = true } repository = { workspace = true } +version = { workspace = true } [dependencies] -odra-core = { workspace = true } odra-casper-rpc-client = { workspace = true } +odra-core = { workspace = true } +odra-schema = { workspace = true } + +anyhow = { workspace = true } blake2 = { workspace = true } log = { workspace = true } -tokio = { workspace = true, features = ["rt-multi-thread"]} -anyhow = { workspace = true } -serde_json = { workspace = true } -odra-schema = { workspace = true } project-root = { workspace = true } +serde_json = { workspace = true } +tokio = { workspace = true, features = ["rt-multi-thread"] } [lints.rust] missing_docs = "warn" diff --git a/odra-casper/proxy-caller/Cargo.toml b/odra-casper/proxy-caller/Cargo.toml index 44b5f70fe..499b6dd6b 100644 --- a/odra-casper/proxy-caller/Cargo.toml +++ b/odra-casper/proxy-caller/Cargo.toml @@ -1,28 +1,35 @@ [package] name = "odra-casper-proxy-caller" +description = "Proxy caller used by Odra Framework" + +authors = [ + "Jakub Płaskonka ", + "Krzysztof Pobiarżyn ", + "Maciej Zieliński ", +] edition = "2021" -version = "2.4.1" -authors = ["Jakub Płaskonka ", "Krzysztof Pobiarżyn ", "Maciej Zieliński "] -license = "MIT" homepage = "https://odra.dev/docs" +license = "MIT" +readme = "README.md" repository = "https://github.com/odradev/odra" +version = "2.4.1" [dependencies] -odra-core = { path = "../../core" } odra-casper-wasm-env = { path = "../wasm-env" } +odra-core = { path = "../../core" } [[bin]] -name = "proxy_caller" -path = "bin/proxy_caller.rs" bench = false doctest = false +name = "proxy_caller" +path = "bin/proxy_caller.rs" test = false [[bin]] -name = "proxy_caller_with_return" -path = "bin/proxy_caller_with_return.rs" bench = false doctest = false +name = "proxy_caller_with_return" +path = "bin/proxy_caller_with_return.rs" test = false [lints.rust] diff --git a/odra-casper/rpc-client/Cargo.toml b/odra-casper/rpc-client/Cargo.toml index d78645c6f..b21d14fe8 100644 --- a/odra-casper/rpc-client/Cargo.toml +++ b/odra-casper/rpc-client/Cargo.toml @@ -1,29 +1,31 @@ [package] name = "odra-casper-rpc-client" description = "RPC Client for the Casper Node." -edition = "2021" -version = { workspace = true } + authors = { workspace = true } -license = { workspace = true } +edition = { workspace = true } homepage = { workspace = true } +license = { workspace = true } +readme = { workspace = true } repository = { workspace = true } +version = { workspace = true } [dependencies] odra-core = { workspace = true } -casper-types = { workspace = true, features = ["std-fs-io"] } + casper-client = { workspace = true } -project-root = { workspace = true } +casper-types = { workspace = true, features = ["std-fs-io"] } -serde_json = { version = "1.0", features = ["raw_value"] } -itertools = "0.14.0" -dotenv = "0.15.0" -prettycli = "0.1.1" -thiserror = "1.0.40" base16 = { workspace = true } +bytes = { workspace = true } +dotenv = { workspace = true } +futures-util = { workspace = true } +itertools = { workspace = true } +prettycli = { workspace = true } +project-root = { workspace = true } +rand = { workspace = true } +reqwest = { workspace = true, features = ["stream"] } +serde_json = { workspace = true, features = ["raw_value"] } +thiserror = { workspace = true } tokio = { workspace = true, features = ["rt"] } -toml = "0.8.20" -rand = "0.8.5" -reqwest = { version = "0.11", features = ["stream"] } -futures-util = "0.3" -serde = { version = "1.0", features = ["derive"] } -bytes = "1.0" +toml = { workspace = true } diff --git a/odra-casper/test-vm/Cargo.toml b/odra-casper/test-vm/Cargo.toml index b5fe81c73..554be689c 100644 --- a/odra-casper/test-vm/Cargo.toml +++ b/odra-casper/test-vm/Cargo.toml @@ -1,25 +1,29 @@ [package] name = "odra-casper-test-vm" -edition = "2021" description = "Odra test environment for the Casper Blockchain." -keywords = ["wasm", "webassembly", "blockchain"] -version = { workspace = true } + authors = { workspace = true } -license = { workspace = true } +edition = { workspace = true } homepage = { workspace = true } +license = { workspace = true } +readme = { workspace = true } repository = { workspace = true } +version = { workspace = true } [dependencies] +odra-core = { workspace = true } + casper-engine-test-support = { workspace = true } casper-execution-engine = { workspace = true } casper-storage = { workspace = true } -odra-core = { workspace = true } [target.'cfg(target_arch = "wasm32")'.dependencies] casper-contract = { workspace = true, default-features = false } [target.'cfg(not(target_arch = "wasm32"))'.dependencies] -casper-contract = { workspace = true, default-features = false, features = ["test-support"] } +casper-contract = { workspace = true, default-features = false, features = [ + "test-support", +] } [lints.rust] missing_docs = "warn" diff --git a/odra-casper/wasm-env/Cargo.toml b/odra-casper/wasm-env/Cargo.toml index 0764410ff..3f286134c 100644 --- a/odra-casper/wasm-env/Cargo.toml +++ b/odra-casper/wasm-env/Cargo.toml @@ -1,23 +1,28 @@ [package] name = "odra-casper-wasm-env" description = "Odra Casper WASM backend." -edition = "2021" -version = { workspace = true } + authors = { workspace = true } -license = { workspace = true } +edition = { workspace = true } homepage = { workspace = true } +license = { workspace = true } +readme = { workspace = true } repository = { workspace = true } +version = { workspace = true } [dependencies] -lazy_static = { workspace = true, features = [ "spin_no_std" ] } odra-core = { workspace = true } +lazy_static = { workspace = true, features = ["spin_no_std"] } + [target.'cfg(target_arch = "wasm32")'.dependencies] -casper-contract = { workspace = true, default-features = false } +casper-contract = { workspace = true, default-features = false } ink_allocator = { version = "5.0.0", default-features = false } [target.'cfg(not(target_arch = "wasm32"))'.dependencies] -casper-contract = { workspace = true, default-features = false, features = ["test-support"] } +casper-contract = { workspace = true, default-features = false, features = [ + "test-support", +] } [lints.rust] missing_docs = "warn" diff --git a/odra-cli/Cargo.toml b/odra-cli/Cargo.toml index 223917e8d..83bd41b53 100644 --- a/odra-cli/Cargo.toml +++ b/odra-cli/Cargo.toml @@ -1,29 +1,31 @@ [package] name = "odra-cli" description = "Odra CLI - Command Line Interface for Odra smart contracts." -edition = "2021" -version.workspace = true -authors.workspace = true -license.workspace = true -homepage.workspace = true -repository.workspace = true +authors = { workspace = true } +edition = { workspace = true } +homepage = { workspace = true } +license = { workspace = true } +readme = { workspace = true } +repository = { workspace = true } +version = { workspace = true } [dependencies] -clap = { version = "4.5.21", features = ["derive", "cargo", "string"] } -prettycli = "0.1.1" odra = { path = "../odra", version = "2.4.1", default-features = false } -odra-casper-livenet-env = { path = "../odra-casper/livenet-env", version = "2.4.1"} -chrono = { version = "0.4", features = ["serde"] } -serde = { version = "1", default-features = false } -serde_json = { version = "1", default-features = false } -serde_derive = { version = "1", features = ["default"] } -toml = "0.8.13" +odra-casper-livenet-env = { path = "../odra-casper/livenet-env", version = "2.4.1" } + +anyhow = { workspace = true } +chrono = { workspace = true, features = ["serde"] } +clap = { workspace = true, features = ["cargo", "derive", "string"] } +hex = { workspace = true } +pretty_assertions = { workspace = true } +prettycli = { workspace = true } project-root = { workspace = true } -pretty_assertions = "1.4.0" -anyhow = "1.0.86" -thiserror = "1.0.30" -hex = "0.4.3" +serde = { workspace = true, default-features = false } +serde_derive = { workspace = true, features = ["default"] } +serde_json = { workspace = true, default-features = false } +thiserror = { workspace = true } +toml = { workspace = true } [build-dependencies] odra-build = { path = "../odra-build", version = "2.4.1", default-features = false } diff --git a/odra-macros/Cargo.toml b/odra-macros/Cargo.toml index 5870c88c7..5e0d820df 100644 --- a/odra-macros/Cargo.toml +++ b/odra-macros/Cargo.toml @@ -1,29 +1,28 @@ [package] name = "odra-macros" -edition = "2021" description = "Macros for Odra-based smart contracts." -keywords = ["wasm", "webassembly", "blockchain"] -version = { workspace = true } + authors = { workspace = true } -license = { workspace = true } +edition = { workspace = true } homepage = { workspace = true } +license = { workspace = true } +readme = { workspace = true } repository = { workspace = true } +version = { workspace = true } [dependencies] -proc-macro2 = "1.0.69" -quote = "1.0.33" -syn = { version = "2.0.29", features = ["full", "extra-traits"] } -syn_derive = "0.1.8" -convert_case = { version = "0.5.0" } -derive-try-from-ref = "0.1.0" -derive_more = "0.99.17" -itertools = "0.12.0" -static_assertions = "1.1.0" +convert_case = { workspace = true } +derive-try-from-ref = { workspace = true } +itertools = { workspace = true } +proc-macro2 = { workspace = true } +quote = { workspace = true } +syn = { workspace = true, features = ["extra-traits", "full"] } +syn_derive = { workspace = true } [dev-dependencies] +casper-types = { workspace = true } pretty_assertions = "1.4.0" prettyplease = "0.2.15" -casper-types = { workspace = true } [lib] proc-macro = true diff --git a/odra-schema/Cargo.toml b/odra-schema/Cargo.toml index 38c809959..626a92a19 100644 --- a/odra-schema/Cargo.toml +++ b/odra-schema/Cargo.toml @@ -1,19 +1,23 @@ [package] name = "odra-schema" -edition = "2021" description = "Generates Casper Contract Schema from Odra contracts." -version.workspace = true -authors.workspace = true -license.workspace = true -homepage.workspace = true -repository.workspace = true + +authors = { workspace = true } +edition = { workspace = true } +homepage = { workspace = true } +license = { workspace = true } +readme = { workspace = true } +repository = { workspace = true } +version = { workspace = true } [dependencies] +odra-core = { workspace = true } + casper-contract-schema = { workspace = true } casper-types = { workspace = true } -odra-core = { workspace = true } -num-traits = { workspace = true } + convert_case = { workspace = true } +num-traits = { workspace = true } [lints.rust] missing_docs = "warn" diff --git a/odra-test/Cargo.toml b/odra-test/Cargo.toml index 39ea23422..bfd57c3f0 100644 --- a/odra-test/Cargo.toml +++ b/odra-test/Cargo.toml @@ -1,16 +1,18 @@ [package] name = "odra-test" description = "Test backend for the Odra smart contracts." -edition = "2021" -version = { workspace = true } + authors = { workspace = true } -license = { workspace = true } +edition = { workspace = true } homepage = { workspace = true } +license = { workspace = true } +readme = { workspace = true } repository = { workspace = true } +version = { workspace = true } [dependencies] -odra-core = { workspace = true } odra-casper-test-vm = { workspace = true } +odra-core = { workspace = true } odra-vm = { workspace = true } [lints.rust] diff --git a/odra-vm/Cargo.toml b/odra-vm/Cargo.toml index 4e78e741c..001fb9b40 100644 --- a/odra-vm/Cargo.toml +++ b/odra-vm/Cargo.toml @@ -1,19 +1,22 @@ [package] name = "odra-vm" description = "Odra Virtual Machine for testing and development." -edition = "2021" -version = { workspace = true } + authors = { workspace = true } -license = { workspace = true } +edition = { workspace = true } homepage = { workspace = true } +license = { workspace = true } +readme = { workspace = true } repository = { workspace = true } +version = { workspace = true } [dependencies] odra-core = { workspace = true } + anyhow = { workspace = true } +backtrace = { workspace = true } blake2 = { workspace = true } rand = { workspace = true, features = ["thread_rng"] } -backtrace = { workspace = true } [lints.rust] missing_docs = "warn" diff --git a/odra-wasm-client-builder/Cargo.toml b/odra-wasm-client-builder/Cargo.toml index f1eee6ed1..e7c40975f 100644 --- a/odra-wasm-client-builder/Cargo.toml +++ b/odra-wasm-client-builder/Cargo.toml @@ -1,21 +1,24 @@ [package] name = "odra-wasm-client-builder" description = "Wasm client" -edition = "2021" -version.workspace = true -authors.workspace = true -license.workspace = true -homepage.workspace = true -repository.workspace = true + +authors = { workspace = true } +edition = { workspace = true } +homepage = { workspace = true } +license = { workspace = true } +readme = { workspace = true } +repository = { workspace = true } +version = { workspace = true } [dependencies] -odra-schema = { workspace = true} -serde_json = { workspace = true } -quote = { version = "1.0.33" } -syn = { version = "2.0.29", features = ["full", "extra-traits"] } -proc-macro2 = { version = "1.0.36" } +odra-schema = { workspace = true } + convert_case = { workspace = true } -thiserror = "1.0.40" +proc-macro2 = { workspace = true } +quote = { workspace = true } +serde_json = { workspace = true } +syn = { workspace = true } +thiserror = { workspace = true } [dev-dependencies] pretty_assertions = "1.4.0" diff --git a/odra-wasm-client/Cargo.toml b/odra-wasm-client/Cargo.toml index e28edff72..8209017b4 100644 --- a/odra-wasm-client/Cargo.toml +++ b/odra-wasm-client/Cargo.toml @@ -1,29 +1,30 @@ [package] -name = "odra-wasm-client" description = "Wasm client" -edition = "2021" -version.workspace = true -authors.workspace = true -license.workspace = true -homepage.workspace = true -repository.workspace = true +name = "odra-wasm-client" + +authors = { workspace = true } +edition = { workspace = true } +homepage = { workspace = true } +license = { workspace = true } +readme = { workspace = true } +repository = { workspace = true } +version = { workspace = true } [dependencies] -casper-types = { workspace = true, features = ["datasize"] } -casper-client = { workspace = true} odra-core = { workspace = true } -wasm-bindgen = "=0.2.100" -wasm-bindgen-futures = "0.4.50" -serde-wasm-bindgen = "0.6.5" -js-sys = "0.3.77" -web-sys = { version = "0.3.77", features = ["HtmlInputElement", "Response"] } -rand = { version = "0.8.5", default-features = false } + +casper-client = { workspace = true } +casper-types = { workspace = true, features = ["datasize"] } + +gloo-utils = { workspace = true, default-features = false, features = ["serde"] } +hex = { workspace = true } +js-sys = { workspace = true } serde = { workspace = true, features = ["derive"] } serde_json = { workspace = true } -hex = { workspace = true } -gloo-utils = { version = "0.2", default-features = false, features = ["serde"] } -futures-channel = "0.3.31" -thiserror = "1.0.40" +thiserror = { workspace = true } +wasm-bindgen = { workspace = true } +wasm-bindgen-futures = { workspace = true } +web-sys = { workspace = true, features = ["HtmlInputElement", "Response"] } [lib] crate-type = ["cdylib", "rlib"] @@ -31,6 +32,6 @@ name = "odra_wasm_client" path = "src/lib.rs" [features] -default = [] cep18 = [] +default = [] wcspr = [] diff --git a/odra/Cargo.toml b/odra/Cargo.toml index 44a736759..634b3d75a 100644 --- a/odra/Cargo.toml +++ b/odra/Cargo.toml @@ -1,13 +1,14 @@ [package] name = "odra" -edition = "2021" description = "Smart contracts for Casper Network." -version = { workspace = true } + authors = { workspace = true } -license = { workspace = true } +edition = { workspace = true } homepage = { workspace = true } +license = { workspace = true } +readme = { workspace = true } repository = { workspace = true } -readme = "../README.md" +version = { workspace = true } [dependencies] odra-core = { workspace = true } diff --git a/rustfmt.toml b/rustfmt.toml index fc5c080bc..ffc08ecbb 100644 --- a/rustfmt.toml +++ b/rustfmt.toml @@ -1,2 +1,4 @@ +ignore = [ + "odra-macros/src/ast/*", +] # cargo fmt incorectly formats the code under `quote!` macro adding trailing commas trailing_comma = "Never" -ignore = ["odra-macros/src/ast/*"] # cargo fmt incorectly formats the code under `quote!` macro adding trailing commas \ No newline at end of file diff --git a/templates/blank/_Cargo.toml b/templates/blank/_Cargo.toml index 74297274e..d4c5375ad 100644 --- a/templates/blank/_Cargo.toml +++ b/templates/blank/_Cargo.toml @@ -1,7 +1,7 @@ [package] +edition = "2021" name = "{{project-name}}" version = "0.1.0" -edition = "2021" [dependencies] #odra_dependency diff --git a/templates/cargo-generate.toml b/templates/cargo-generate.toml index 14a405c5e..e261456cd 100644 --- a/templates/cargo-generate.toml +++ b/templates/cargo-generate.toml @@ -1,2 +1,2 @@ [template] -sub_templates = ["full", "blank"] \ No newline at end of file +sub_templates = ["blank", "full"] diff --git a/templates/cep18/_Cargo.toml b/templates/cep18/_Cargo.toml index 4363ba3b2..2e062153c 100644 --- a/templates/cep18/_Cargo.toml +++ b/templates/cep18/_Cargo.toml @@ -1,7 +1,7 @@ [package] +edition = "2021" name = "{{project-name}}" version = "0.1.0" -edition = "2021" [dependencies] #odra_dependency diff --git a/templates/cep95/_Cargo.toml b/templates/cep95/_Cargo.toml index 4363ba3b2..2e062153c 100644 --- a/templates/cep95/_Cargo.toml +++ b/templates/cep95/_Cargo.toml @@ -1,7 +1,7 @@ [package] +edition = "2021" name = "{{project-name}}" version = "0.1.0" -edition = "2021" [dependencies] #odra_dependency diff --git a/templates/full/_Cargo.toml b/templates/full/_Cargo.toml index 74297274e..d4c5375ad 100644 --- a/templates/full/_Cargo.toml +++ b/templates/full/_Cargo.toml @@ -1,7 +1,7 @@ [package] +edition = "2021" name = "{{project-name}}" version = "0.1.0" -edition = "2021" [dependencies] #odra_dependency diff --git a/templates/wasm_client/_Cargo.toml b/templates/wasm_client/_Cargo.toml index 58ad5102e..9b572e091 100644 --- a/templates/wasm_client/_Cargo.toml +++ b/templates/wasm_client/_Cargo.toml @@ -1,7 +1,7 @@ [package] -name = "{{project-name}}-wasm-client" description = "Wasm client" edition = "2021" +name = "{{project-name}}-wasm-client" [dependencies] #odra_wasm_client_dependency @@ -16,11 +16,11 @@ name = "{{lib-name}}_wasm_client" path = "src/lib.rs" [features] -default = ["client"] -codegen = ["odra-wasm-client-builder"] client = [] +codegen = ["odra-wasm-client-builder"] +default = ["client"] [[bin]] name = "codegen" path = "src/main.rs" -required-features = ["codegen"] \ No newline at end of file +required-features = ["codegen"] diff --git a/templates/workspace/_Cargo.toml b/templates/workspace/_Cargo.toml index 39f9e3f3a..953f485f9 100644 --- a/templates/workspace/_Cargo.toml +++ b/templates/workspace/_Cargo.toml @@ -1,9 +1,5 @@ [workspace] -members = [ - "cli", - "flipper", - "flapper", -] +members = ["cli", "flapper", "flipper"] resolver = "2" [workspace.dependencies] diff --git a/templates/workspace/cli/Cargo.toml b/templates/workspace/cli/Cargo.toml index 1cc022b5a..3148575f8 100644 --- a/templates/workspace/cli/Cargo.toml +++ b/templates/workspace/cli/Cargo.toml @@ -1,7 +1,7 @@ [package] +edition = "2021" name = "casper-cli" version = "0.1.0" -edition = "2021" [dependencies] flapper = { path = "../flapper" } @@ -11,4 +11,4 @@ odra-cli = { workspace = true } [[bin]] name = "{{project-name}}_cli" -path = "cli.rs" \ No newline at end of file +path = "cli.rs" diff --git a/templates/workspace/flapper/Cargo.toml b/templates/workspace/flapper/Cargo.toml index 903716b34..b611f1465 100644 --- a/templates/workspace/flapper/Cargo.toml +++ b/templates/workspace/flapper/Cargo.toml @@ -1,7 +1,7 @@ [package] +edition = "2021" name = "flapper" version = "0.1.0" -edition = "2021" [dependencies] odra = { workspace = true } diff --git a/templates/workspace/flipper/Cargo.toml b/templates/workspace/flipper/Cargo.toml index 8c7f086ad..fe6ee673a 100644 --- a/templates/workspace/flipper/Cargo.toml +++ b/templates/workspace/flipper/Cargo.toml @@ -1,7 +1,7 @@ [package] +edition = "2021" name = "flipper" version = "0.1.0" -edition = "2021" [dependencies] odra = { workspace = true } From 181fbd47bf02b9a99cd0e61f53ef3ece20feab0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kuba=20P=C5=82askonka?= Date: Wed, 10 Dec 2025 14:13:19 +0100 Subject: [PATCH 2/3] Bump version to 2.5.0 --- CHANGELOG.md | 2 +- Cargo.toml | 18 +++--- .../balance_checker_schema.json | 12 ++-- .../better_counter_factory_schema.json | 30 +++------ .../counter_factory_schema.json | 30 +++------ .../counter_schema.json | 12 ++-- .../counterv1_schema.json | 12 ++-- .../counterv2_schema.json | 12 ++-- .../cross_contract_schema.json | 12 ++-- .../dog_contract2_schema.json | 12 ++-- .../dog_contract3_schema.json | 12 ++-- .../dog_contract_schema.json | 12 ++-- .../f_token_factory_schema.json | 30 +++------ .../f_token_schema.json | 12 ++-- .../factory_proxy_schema.json | 63 ++++++++++++++++++ .../host_contract_schema.json | 12 ++-- .../livenet_contract_schema.json | 12 ++-- .../math_engine_schema.json | 12 ++-- .../mock_moderated_schema.json | 12 ++-- .../modules_contract_schema.json | 12 ++-- .../my_contract_schema.json | 12 ++-- .../nested_odra_types_contract_schema.json | 12 ++-- .../owned_cep95_schema.json | 12 ++-- .../owned_contract_schema.json | 12 ++-- .../owned_token_schema.json | 10 ++- .../party_contract_schema.json | 12 ++-- .../pauseable_counter_schema.json | 12 ++-- .../public_wallet_schema.json | 12 ++-- .../reentrancy_mock_schema.json | 12 ++-- .../signature_verifier_schema.json | 12 ++-- .../testing_contract_schema.json | 12 ++-- .../time_lock_wallet_schema.json | 12 ++-- .../token_manager_schema.json | 12 ++-- .../casper_contract_schemas/token_schema.json | 12 ++-- .../validators_contract_schema.json | 12 ++-- .../legacy/better_counter_factory_schema.json | 20 +----- .../legacy/counter_factory_schema.json | 20 +----- .../legacy/f_token_factory_schema.json | 20 +----- .../legacy/factory_proxy_schema.json | 30 +++++++++ justfile | 2 +- modules/Cargo.toml | 8 +-- .../basic_cep95_schema.json | 64 ++++++++++++++++++- .../basic_contract_schema.json | 4 +- .../cep18_client_contract_schema.json | 4 +- .../cep18_example_schema.json | 4 +- .../casper_contract_schemas/cep18_schema.json | 4 +- .../erc1155_receiver_schema.json | 4 +- .../erc1155_token_schema.json | 4 +- .../casper_contract_schemas/erc20_schema.json | 4 +- .../erc721_receiver_schema.json | 4 +- .../erc721_token_schema.json | 4 +- .../nft_receiver_schema.json | 4 +- .../ownable2_step_schema.json | 4 +- .../ownable_schema.json | 4 +- .../rejectingnft_receiver_schema.json | 4 +- .../wrapped_native_token_schema.json | 26 +++++++- .../resources/legacy/basic_cep95_schema.json | 31 +++++++++ .../legacy/wrapped_native_token_schema.json | 23 +++++++ odra-bdd/Cargo.toml | 2 +- odra-casper/proxy-caller/Cargo.toml | 2 +- odra-casper/rpc-client/Cargo.toml | 2 +- odra-cli/Cargo.toml | 6 +- odra-wasm-client/Cargo.toml | 2 +- odra-wasm-client/example/package-lock.json | 2 +- 64 files changed, 543 insertions(+), 288 deletions(-) create mode 100644 examples/resources/casper_contract_schemas/factory_proxy_schema.json create mode 100644 examples/resources/legacy/factory_proxy_schema.json diff --git a/CHANGELOG.md b/CHANGELOG.md index 425fb359a..7f9bd4677 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ Changelog for `odra`. -## [2.4.1] - 2025-09-10 +## [2.5.0] - 2025-12-XX ### Changed - Refactor of `CEP-95` token implementation. diff --git a/Cargo.toml b/Cargo.toml index b1227de1f..4045899db 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -40,17 +40,17 @@ homepage = "https://odra.dev/docs" license = "MIT" readme = "README.md" repository = "https://github.com/odradev/odra" -version = "2.4.1" +version = "2.5.0" [workspace.dependencies] -odra-casper-rpc-client = { path = "odra-casper/rpc-client", version = "2.4.1" } -odra-casper-test-vm = { path = "odra-casper/test-vm", version = "2.4.1" } -odra-casper-wasm-env = { path = "odra-casper/wasm-env", version = "2.4.1" } -odra-core = { path = "core", version = "2.4.1" } -odra-macros = { path = "odra-macros", version = "2.4.1" } -odra-schema = { path = "odra-schema", version = "2.4.1" } -odra-vm = { path = "odra-vm", version = "2.4.1" } -odra-wasm-client = { path = "odra-wasm-client", version = "2.4.1" } +odra-casper-rpc-client = { path = "odra-casper/rpc-client", version = "2.5.0" } +odra-casper-test-vm = { path = "odra-casper/test-vm", version = "2.5.0" } +odra-casper-wasm-env = { path = "odra-casper/wasm-env", version = "2.5.0" } +odra-core = { path = "core", version = "2.5.0" } +odra-macros = { path = "odra-macros", version = "2.5.0" } +odra-schema = { path = "odra-schema", version = "2.5.0" } +odra-vm = { path = "odra-vm", version = "2.5.0" } +odra-wasm-client = { path = "odra-wasm-client", version = "2.5.0" } casper-client = { version = "5.0", default-features = false } casper-contract = { version = "5.1", default-features = false } diff --git a/examples/resources/casper_contract_schemas/balance_checker_schema.json b/examples/resources/casper_contract_schemas/balance_checker_schema.json index faa9dd9c8..a0b571e66 100644 --- a/examples/resources/casper_contract_schemas/balance_checker_schema.json +++ b/examples/resources/casper_contract_schemas/balance_checker_schema.json @@ -1,11 +1,15 @@ { "casper_contract_schema_version": 1, "toolchain": "rustc 1.85.0-nightly (d117b7f21 2024-12-31)", - "authors": [], - "repository": null, - "homepage": null, + "authors": [ + "Jakub Płaskonka ", + "Krzysztof Pobiarżyn ", + "Maciej Zieliński " + ], + "repository": "https://github.com/odradev/odra", + "homepage": "https://odra.dev/docs", "contract_name": "BalanceChecker", - "contract_version": "2.4.1", + "contract_version": "2.5.0", "types": [], "errors": [], "entry_points": [ diff --git a/examples/resources/casper_contract_schemas/better_counter_factory_schema.json b/examples/resources/casper_contract_schemas/better_counter_factory_schema.json index 9b1b1bcc9..58164f74d 100644 --- a/examples/resources/casper_contract_schemas/better_counter_factory_schema.json +++ b/examples/resources/casper_contract_schemas/better_counter_factory_schema.json @@ -1,11 +1,15 @@ { "casper_contract_schema_version": 1, "toolchain": "rustc 1.85.0-nightly (d117b7f21 2024-12-31)", - "authors": [], - "repository": null, - "homepage": null, + "authors": [ + "Jakub Płaskonka ", + "Krzysztof Pobiarżyn ", + "Maciej Zieliński " + ], + "repository": "https://github.com/odradev/odra", + "homepage": "https://odra.dev/docs", "contract_name": "BetterCounterFactory", - "contract_version": "2.4.1", + "contract_version": "2.5.0", "types": [ { "struct": { @@ -83,23 +87,7 @@ "is_mutable": true, "arguments": [ { - "name": "default_args", - "description": null, - "ty": { - "List": "U8" - }, - "optional": false - }, - { - "name": "names_to_upgrade", - "description": null, - "ty": { - "List": "U8" - }, - "optional": false - }, - { - "name": "specific_args", + "name": "args", "description": null, "ty": { "List": "U8" diff --git a/examples/resources/casper_contract_schemas/counter_factory_schema.json b/examples/resources/casper_contract_schemas/counter_factory_schema.json index 8eabec91d..9f824c2b9 100644 --- a/examples/resources/casper_contract_schemas/counter_factory_schema.json +++ b/examples/resources/casper_contract_schemas/counter_factory_schema.json @@ -1,11 +1,15 @@ { "casper_contract_schema_version": 1, "toolchain": "rustc 1.85.0-nightly (d117b7f21 2024-12-31)", - "authors": [], - "repository": null, - "homepage": null, + "authors": [ + "Jakub Płaskonka ", + "Krzysztof Pobiarżyn ", + "Maciej Zieliński " + ], + "repository": "https://github.com/odradev/odra", + "homepage": "https://odra.dev/docs", "contract_name": "CounterFactory", - "contract_version": "2.4.1", + "contract_version": "2.5.0", "types": [ { "struct": { @@ -77,23 +81,7 @@ "is_mutable": true, "arguments": [ { - "name": "default_args", - "description": null, - "ty": { - "List": "U8" - }, - "optional": false - }, - { - "name": "names_to_upgrade", - "description": null, - "ty": { - "List": "U8" - }, - "optional": false - }, - { - "name": "specific_args", + "name": "args", "description": null, "ty": { "List": "U8" diff --git a/examples/resources/casper_contract_schemas/counter_schema.json b/examples/resources/casper_contract_schemas/counter_schema.json index ecc21d502..d22016bf2 100644 --- a/examples/resources/casper_contract_schemas/counter_schema.json +++ b/examples/resources/casper_contract_schemas/counter_schema.json @@ -1,11 +1,15 @@ { "casper_contract_schema_version": 1, "toolchain": "rustc 1.85.0-nightly (d117b7f21 2024-12-31)", - "authors": [], - "repository": null, - "homepage": null, + "authors": [ + "Jakub Płaskonka ", + "Krzysztof Pobiarżyn ", + "Maciej Zieliński " + ], + "repository": "https://github.com/odradev/odra", + "homepage": "https://odra.dev/docs", "contract_name": "Counter", - "contract_version": "2.4.1", + "contract_version": "2.5.0", "types": [], "errors": [], "entry_points": [ diff --git a/examples/resources/casper_contract_schemas/counterv1_schema.json b/examples/resources/casper_contract_schemas/counterv1_schema.json index 98e299635..9c6f1e406 100644 --- a/examples/resources/casper_contract_schemas/counterv1_schema.json +++ b/examples/resources/casper_contract_schemas/counterv1_schema.json @@ -1,11 +1,15 @@ { "casper_contract_schema_version": 1, "toolchain": "rustc 1.85.0-nightly (d117b7f21 2024-12-31)", - "authors": [], - "repository": null, - "homepage": null, + "authors": [ + "Jakub Płaskonka ", + "Krzysztof Pobiarżyn ", + "Maciej Zieliński " + ], + "repository": "https://github.com/odradev/odra", + "homepage": "https://odra.dev/docs", "contract_name": "CounterV1", - "contract_version": "2.4.1", + "contract_version": "2.5.0", "types": [ { "struct": { diff --git a/examples/resources/casper_contract_schemas/counterv2_schema.json b/examples/resources/casper_contract_schemas/counterv2_schema.json index 61374eb27..31fc1841d 100644 --- a/examples/resources/casper_contract_schemas/counterv2_schema.json +++ b/examples/resources/casper_contract_schemas/counterv2_schema.json @@ -1,11 +1,15 @@ { "casper_contract_schema_version": 1, "toolchain": "rustc 1.85.0-nightly (d117b7f21 2024-12-31)", - "authors": [], - "repository": null, - "homepage": null, + "authors": [ + "Jakub Płaskonka ", + "Krzysztof Pobiarżyn ", + "Maciej Zieliński " + ], + "repository": "https://github.com/odradev/odra", + "homepage": "https://odra.dev/docs", "contract_name": "CounterV2", - "contract_version": "2.4.1", + "contract_version": "2.5.0", "types": [ { "struct": { diff --git a/examples/resources/casper_contract_schemas/cross_contract_schema.json b/examples/resources/casper_contract_schemas/cross_contract_schema.json index 535696bce..782e026e5 100644 --- a/examples/resources/casper_contract_schemas/cross_contract_schema.json +++ b/examples/resources/casper_contract_schemas/cross_contract_schema.json @@ -1,11 +1,15 @@ { "casper_contract_schema_version": 1, "toolchain": "rustc 1.85.0-nightly (d117b7f21 2024-12-31)", - "authors": [], - "repository": null, - "homepage": null, + "authors": [ + "Jakub Płaskonka ", + "Krzysztof Pobiarżyn ", + "Maciej Zieliński " + ], + "repository": "https://github.com/odradev/odra", + "homepage": "https://odra.dev/docs", "contract_name": "CrossContract", - "contract_version": "2.4.1", + "contract_version": "2.5.0", "types": [], "errors": [], "entry_points": [ diff --git a/examples/resources/casper_contract_schemas/dog_contract2_schema.json b/examples/resources/casper_contract_schemas/dog_contract2_schema.json index a4c65821c..96cb95a98 100644 --- a/examples/resources/casper_contract_schemas/dog_contract2_schema.json +++ b/examples/resources/casper_contract_schemas/dog_contract2_schema.json @@ -1,11 +1,15 @@ { "casper_contract_schema_version": 1, "toolchain": "rustc 1.85.0-nightly (d117b7f21 2024-12-31)", - "authors": [], - "repository": null, - "homepage": null, + "authors": [ + "Jakub Płaskonka ", + "Krzysztof Pobiarżyn ", + "Maciej Zieliński " + ], + "repository": "https://github.com/odradev/odra", + "homepage": "https://odra.dev/docs", "contract_name": "DogContract2", - "contract_version": "2.4.1", + "contract_version": "2.5.0", "types": [], "errors": [], "entry_points": [ diff --git a/examples/resources/casper_contract_schemas/dog_contract3_schema.json b/examples/resources/casper_contract_schemas/dog_contract3_schema.json index 19b682f16..15d7386f1 100644 --- a/examples/resources/casper_contract_schemas/dog_contract3_schema.json +++ b/examples/resources/casper_contract_schemas/dog_contract3_schema.json @@ -1,11 +1,15 @@ { "casper_contract_schema_version": 1, "toolchain": "rustc 1.85.0-nightly (d117b7f21 2024-12-31)", - "authors": [], - "repository": null, - "homepage": null, + "authors": [ + "Jakub Płaskonka ", + "Krzysztof Pobiarżyn ", + "Maciej Zieliński " + ], + "repository": "https://github.com/odradev/odra", + "homepage": "https://odra.dev/docs", "contract_name": "DogContract3", - "contract_version": "2.4.1", + "contract_version": "2.5.0", "types": [], "errors": [], "entry_points": [ diff --git a/examples/resources/casper_contract_schemas/dog_contract_schema.json b/examples/resources/casper_contract_schemas/dog_contract_schema.json index 97e2f38d9..5df64ed7d 100644 --- a/examples/resources/casper_contract_schemas/dog_contract_schema.json +++ b/examples/resources/casper_contract_schemas/dog_contract_schema.json @@ -1,11 +1,15 @@ { "casper_contract_schema_version": 1, "toolchain": "rustc 1.85.0-nightly (d117b7f21 2024-12-31)", - "authors": [], - "repository": null, - "homepage": null, + "authors": [ + "Jakub Płaskonka ", + "Krzysztof Pobiarżyn ", + "Maciej Zieliński " + ], + "repository": "https://github.com/odradev/odra", + "homepage": "https://odra.dev/docs", "contract_name": "DogContract", - "contract_version": "2.4.1", + "contract_version": "2.5.0", "types": [ { "struct": { diff --git a/examples/resources/casper_contract_schemas/f_token_factory_schema.json b/examples/resources/casper_contract_schemas/f_token_factory_schema.json index e1bdb7e34..f86f78755 100644 --- a/examples/resources/casper_contract_schemas/f_token_factory_schema.json +++ b/examples/resources/casper_contract_schemas/f_token_factory_schema.json @@ -1,11 +1,15 @@ { "casper_contract_schema_version": 1, "toolchain": "rustc 1.85.0-nightly (d117b7f21 2024-12-31)", - "authors": [], - "repository": null, - "homepage": null, + "authors": [ + "Jakub Płaskonka ", + "Krzysztof Pobiarżyn ", + "Maciej Zieliński " + ], + "repository": "https://github.com/odradev/odra", + "homepage": "https://odra.dev/docs", "contract_name": "FTokenFactory", - "contract_version": "2.4.1", + "contract_version": "2.5.0", "types": [ { "struct": { @@ -95,23 +99,7 @@ "is_mutable": true, "arguments": [ { - "name": "default_args", - "description": null, - "ty": { - "List": "U8" - }, - "optional": false - }, - { - "name": "names_to_upgrade", - "description": null, - "ty": { - "List": "U8" - }, - "optional": false - }, - { - "name": "specific_args", + "name": "args", "description": null, "ty": { "List": "U8" diff --git a/examples/resources/casper_contract_schemas/f_token_schema.json b/examples/resources/casper_contract_schemas/f_token_schema.json index e2e0ecc3e..9234ef7a0 100644 --- a/examples/resources/casper_contract_schemas/f_token_schema.json +++ b/examples/resources/casper_contract_schemas/f_token_schema.json @@ -1,11 +1,15 @@ { "casper_contract_schema_version": 1, "toolchain": "rustc 1.85.0-nightly (d117b7f21 2024-12-31)", - "authors": [], - "repository": null, - "homepage": null, + "authors": [ + "Jakub Płaskonka ", + "Krzysztof Pobiarżyn ", + "Maciej Zieliński " + ], + "repository": "https://github.com/odradev/odra", + "homepage": "https://odra.dev/docs", "contract_name": "FToken", - "contract_version": "2.4.1", + "contract_version": "2.5.0", "types": [ { "struct": { diff --git a/examples/resources/casper_contract_schemas/factory_proxy_schema.json b/examples/resources/casper_contract_schemas/factory_proxy_schema.json new file mode 100644 index 000000000..9ee8fd2d2 --- /dev/null +++ b/examples/resources/casper_contract_schemas/factory_proxy_schema.json @@ -0,0 +1,63 @@ +{ + "casper_contract_schema_version": 1, + "toolchain": "rustc 1.85.0-nightly (d117b7f21 2024-12-31)", + "authors": [ + "Jakub Płaskonka ", + "Krzysztof Pobiarżyn ", + "Maciej Zieliński " + ], + "repository": "https://github.com/odradev/odra", + "homepage": "https://odra.dev/docs", + "contract_name": "FactoryProxy", + "contract_version": "2.5.0", + "types": [], + "errors": [], + "entry_points": [ + { + "name": "deploy_new_contract", + "description": "", + "is_mutable": false, + "arguments": [], + "return_ty": "Key", + "is_contract_context": true, + "access": "public" + } + ], + "events": [], + "call": { + "wasm_file_name": "FactoryProxy.wasm", + "description": "", + "arguments": [ + { + "name": "odra_cfg_package_hash_key_name", + "description": "The arg name for the package hash key name.", + "ty": "String", + "optional": false + }, + { + "name": "odra_cfg_allow_key_override", + "description": "If true and the key specified in odra_cfg_package_hash_key_name already exists, it will be overwritten.", + "ty": "Bool", + "optional": false + }, + { + "name": "odra_cfg_is_upgradable", + "description": "The arg name for the contract upgradeability setting.", + "ty": "Bool", + "optional": false + }, + { + "name": "odra_cfg_is_upgrade", + "description": "The arg name for telling the installer that the contract is being upgraded.", + "ty": "Bool", + "optional": false + }, + { + "name": "address", + "description": null, + "ty": "Key", + "optional": false + } + ] + } +} \ No newline at end of file diff --git a/examples/resources/casper_contract_schemas/host_contract_schema.json b/examples/resources/casper_contract_schemas/host_contract_schema.json index 6583b1a3d..b0210539c 100644 --- a/examples/resources/casper_contract_schemas/host_contract_schema.json +++ b/examples/resources/casper_contract_schemas/host_contract_schema.json @@ -1,11 +1,15 @@ { "casper_contract_schema_version": 1, "toolchain": "rustc 1.85.0-nightly (d117b7f21 2024-12-31)", - "authors": [], - "repository": null, - "homepage": null, + "authors": [ + "Jakub Płaskonka ", + "Krzysztof Pobiarżyn ", + "Maciej Zieliński " + ], + "repository": "https://github.com/odradev/odra", + "homepage": "https://odra.dev/docs", "contract_name": "HostContract", - "contract_version": "2.4.1", + "contract_version": "2.5.0", "types": [], "errors": [], "entry_points": [ diff --git a/examples/resources/casper_contract_schemas/livenet_contract_schema.json b/examples/resources/casper_contract_schemas/livenet_contract_schema.json index 40a5c16ff..bec4e5ba2 100644 --- a/examples/resources/casper_contract_schemas/livenet_contract_schema.json +++ b/examples/resources/casper_contract_schemas/livenet_contract_schema.json @@ -1,11 +1,15 @@ { "casper_contract_schema_version": 1, "toolchain": "rustc 1.85.0-nightly (d117b7f21 2024-12-31)", - "authors": [], - "repository": null, - "homepage": null, + "authors": [ + "Jakub Płaskonka ", + "Krzysztof Pobiarżyn ", + "Maciej Zieliński " + ], + "repository": "https://github.com/odradev/odra", + "homepage": "https://odra.dev/docs", "contract_name": "LivenetContract", - "contract_version": "2.4.1", + "contract_version": "2.5.0", "types": [ { "struct": { diff --git a/examples/resources/casper_contract_schemas/math_engine_schema.json b/examples/resources/casper_contract_schemas/math_engine_schema.json index f3dbffbae..a411da440 100644 --- a/examples/resources/casper_contract_schemas/math_engine_schema.json +++ b/examples/resources/casper_contract_schemas/math_engine_schema.json @@ -1,11 +1,15 @@ { "casper_contract_schema_version": 1, "toolchain": "rustc 1.85.0-nightly (d117b7f21 2024-12-31)", - "authors": [], - "repository": null, - "homepage": null, + "authors": [ + "Jakub Płaskonka ", + "Krzysztof Pobiarżyn ", + "Maciej Zieliński " + ], + "repository": "https://github.com/odradev/odra", + "homepage": "https://odra.dev/docs", "contract_name": "MathEngine", - "contract_version": "2.4.1", + "contract_version": "2.5.0", "types": [], "errors": [], "entry_points": [ diff --git a/examples/resources/casper_contract_schemas/mock_moderated_schema.json b/examples/resources/casper_contract_schemas/mock_moderated_schema.json index 3e4e2c47f..cdf016373 100644 --- a/examples/resources/casper_contract_schemas/mock_moderated_schema.json +++ b/examples/resources/casper_contract_schemas/mock_moderated_schema.json @@ -1,11 +1,15 @@ { "casper_contract_schema_version": 1, "toolchain": "rustc 1.85.0-nightly (d117b7f21 2024-12-31)", - "authors": [], - "repository": null, - "homepage": null, + "authors": [ + "Jakub Płaskonka ", + "Krzysztof Pobiarżyn ", + "Maciej Zieliński " + ], + "repository": "https://github.com/odradev/odra", + "homepage": "https://odra.dev/docs", "contract_name": "MockModerated", - "contract_version": "2.4.1", + "contract_version": "2.5.0", "types": [ { "struct": { diff --git a/examples/resources/casper_contract_schemas/modules_contract_schema.json b/examples/resources/casper_contract_schemas/modules_contract_schema.json index cac5ff587..d52106f25 100644 --- a/examples/resources/casper_contract_schemas/modules_contract_schema.json +++ b/examples/resources/casper_contract_schemas/modules_contract_schema.json @@ -1,11 +1,15 @@ { "casper_contract_schema_version": 1, "toolchain": "rustc 1.85.0-nightly (d117b7f21 2024-12-31)", - "authors": [], - "repository": null, - "homepage": null, + "authors": [ + "Jakub Płaskonka ", + "Krzysztof Pobiarżyn ", + "Maciej Zieliński " + ], + "repository": "https://github.com/odradev/odra", + "homepage": "https://odra.dev/docs", "contract_name": "ModulesContract", - "contract_version": "2.4.1", + "contract_version": "2.5.0", "types": [], "errors": [], "entry_points": [ diff --git a/examples/resources/casper_contract_schemas/my_contract_schema.json b/examples/resources/casper_contract_schemas/my_contract_schema.json index 7362138a8..b4054b85e 100644 --- a/examples/resources/casper_contract_schemas/my_contract_schema.json +++ b/examples/resources/casper_contract_schemas/my_contract_schema.json @@ -1,11 +1,15 @@ { "casper_contract_schema_version": 1, "toolchain": "rustc 1.85.0-nightly (d117b7f21 2024-12-31)", - "authors": [], - "repository": null, - "homepage": null, + "authors": [ + "Jakub Płaskonka ", + "Krzysztof Pobiarżyn ", + "Maciej Zieliński " + ], + "repository": "https://github.com/odradev/odra", + "homepage": "https://odra.dev/docs", "contract_name": "MyContract", - "contract_version": "2.4.1", + "contract_version": "2.5.0", "types": [ { "struct": { diff --git a/examples/resources/casper_contract_schemas/nested_odra_types_contract_schema.json b/examples/resources/casper_contract_schemas/nested_odra_types_contract_schema.json index d8e1c8432..02c2fcb97 100644 --- a/examples/resources/casper_contract_schemas/nested_odra_types_contract_schema.json +++ b/examples/resources/casper_contract_schemas/nested_odra_types_contract_schema.json @@ -1,11 +1,15 @@ { "casper_contract_schema_version": 1, "toolchain": "rustc 1.85.0-nightly (d117b7f21 2024-12-31)", - "authors": [], - "repository": null, - "homepage": null, + "authors": [ + "Jakub Płaskonka ", + "Krzysztof Pobiarżyn ", + "Maciej Zieliński " + ], + "repository": "https://github.com/odradev/odra", + "homepage": "https://odra.dev/docs", "contract_name": "NestedOdraTypesContract", - "contract_version": "2.4.1", + "contract_version": "2.5.0", "types": [ { "struct": { diff --git a/examples/resources/casper_contract_schemas/owned_cep95_schema.json b/examples/resources/casper_contract_schemas/owned_cep95_schema.json index a6e902cca..e8696a496 100644 --- a/examples/resources/casper_contract_schemas/owned_cep95_schema.json +++ b/examples/resources/casper_contract_schemas/owned_cep95_schema.json @@ -1,11 +1,15 @@ { "casper_contract_schema_version": 1, "toolchain": "rustc 1.85.0-nightly (d117b7f21 2024-12-31)", - "authors": [], - "repository": null, - "homepage": null, + "authors": [ + "Jakub Płaskonka ", + "Krzysztof Pobiarżyn ", + "Maciej Zieliński " + ], + "repository": "https://github.com/odradev/odra", + "homepage": "https://odra.dev/docs", "contract_name": "OwnedCep95", - "contract_version": "2.4.1", + "contract_version": "2.5.0", "types": [ { "struct": { diff --git a/examples/resources/casper_contract_schemas/owned_contract_schema.json b/examples/resources/casper_contract_schemas/owned_contract_schema.json index b477e2bbb..3ec281194 100644 --- a/examples/resources/casper_contract_schemas/owned_contract_schema.json +++ b/examples/resources/casper_contract_schemas/owned_contract_schema.json @@ -1,11 +1,15 @@ { "casper_contract_schema_version": 1, "toolchain": "rustc 1.85.0-nightly (d117b7f21 2024-12-31)", - "authors": [], - "repository": null, - "homepage": null, + "authors": [ + "Jakub Płaskonka ", + "Krzysztof Pobiarżyn ", + "Maciej Zieliński " + ], + "repository": "https://github.com/odradev/odra", + "homepage": "https://odra.dev/docs", "contract_name": "OwnedContract", - "contract_version": "2.4.1", + "contract_version": "2.5.0", "types": [], "errors": [ { diff --git a/examples/resources/casper_contract_schemas/owned_token_schema.json b/examples/resources/casper_contract_schemas/owned_token_schema.json index 5194197f1..47a27d675 100644 --- a/examples/resources/casper_contract_schemas/owned_token_schema.json +++ b/examples/resources/casper_contract_schemas/owned_token_schema.json @@ -1,9 +1,13 @@ { "casper_contract_schema_version": 1, "toolchain": "rustc 1.85.0-nightly (d117b7f21 2024-12-31)", - "authors": [], - "repository": null, - "homepage": null, + "authors": [ + "Jakub Płaskonka ", + "Krzysztof Pobiarżyn ", + "Maciej Zieliński " + ], + "repository": "https://github.com/odradev/odra", + "homepage": "https://odra.dev/docs", "contract_name": "MyTokenContact", "contract_version": "1.0.0", "types": [ diff --git a/examples/resources/casper_contract_schemas/party_contract_schema.json b/examples/resources/casper_contract_schemas/party_contract_schema.json index 015b1cc8e..2a541877e 100644 --- a/examples/resources/casper_contract_schemas/party_contract_schema.json +++ b/examples/resources/casper_contract_schemas/party_contract_schema.json @@ -1,11 +1,15 @@ { "casper_contract_schema_version": 1, "toolchain": "rustc 1.85.0-nightly (d117b7f21 2024-12-31)", - "authors": [], - "repository": null, - "homepage": null, + "authors": [ + "Jakub Płaskonka ", + "Krzysztof Pobiarżyn ", + "Maciej Zieliński " + ], + "repository": "https://github.com/odradev/odra", + "homepage": "https://odra.dev/docs", "contract_name": "PartyContract", - "contract_version": "2.4.1", + "contract_version": "2.5.0", "types": [ { "struct": { diff --git a/examples/resources/casper_contract_schemas/pauseable_counter_schema.json b/examples/resources/casper_contract_schemas/pauseable_counter_schema.json index 008d42957..c94e5d14e 100644 --- a/examples/resources/casper_contract_schemas/pauseable_counter_schema.json +++ b/examples/resources/casper_contract_schemas/pauseable_counter_schema.json @@ -1,11 +1,15 @@ { "casper_contract_schema_version": 1, "toolchain": "rustc 1.85.0-nightly (d117b7f21 2024-12-31)", - "authors": [], - "repository": null, - "homepage": null, + "authors": [ + "Jakub Płaskonka ", + "Krzysztof Pobiarżyn ", + "Maciej Zieliński " + ], + "repository": "https://github.com/odradev/odra", + "homepage": "https://odra.dev/docs", "contract_name": "PauseableCounter", - "contract_version": "2.4.1", + "contract_version": "2.5.0", "types": [ { "struct": { diff --git a/examples/resources/casper_contract_schemas/public_wallet_schema.json b/examples/resources/casper_contract_schemas/public_wallet_schema.json index 22e9542c8..819688afd 100644 --- a/examples/resources/casper_contract_schemas/public_wallet_schema.json +++ b/examples/resources/casper_contract_schemas/public_wallet_schema.json @@ -1,11 +1,15 @@ { "casper_contract_schema_version": 1, "toolchain": "rustc 1.85.0-nightly (d117b7f21 2024-12-31)", - "authors": [], - "repository": null, - "homepage": null, + "authors": [ + "Jakub Płaskonka ", + "Krzysztof Pobiarżyn ", + "Maciej Zieliński " + ], + "repository": "https://github.com/odradev/odra", + "homepage": "https://odra.dev/docs", "contract_name": "PublicWallet", - "contract_version": "2.4.1", + "contract_version": "2.5.0", "types": [], "errors": [], "entry_points": [ diff --git a/examples/resources/casper_contract_schemas/reentrancy_mock_schema.json b/examples/resources/casper_contract_schemas/reentrancy_mock_schema.json index b185cd17d..9ac1982dc 100644 --- a/examples/resources/casper_contract_schemas/reentrancy_mock_schema.json +++ b/examples/resources/casper_contract_schemas/reentrancy_mock_schema.json @@ -1,11 +1,15 @@ { "casper_contract_schema_version": 1, "toolchain": "rustc 1.85.0-nightly (d117b7f21 2024-12-31)", - "authors": [], - "repository": null, - "homepage": null, + "authors": [ + "Jakub Płaskonka ", + "Krzysztof Pobiarżyn ", + "Maciej Zieliński " + ], + "repository": "https://github.com/odradev/odra", + "homepage": "https://odra.dev/docs", "contract_name": "ReentrancyMock", - "contract_version": "2.4.1", + "contract_version": "2.5.0", "types": [], "errors": [], "entry_points": [ diff --git a/examples/resources/casper_contract_schemas/signature_verifier_schema.json b/examples/resources/casper_contract_schemas/signature_verifier_schema.json index bff857254..6c33eac96 100644 --- a/examples/resources/casper_contract_schemas/signature_verifier_schema.json +++ b/examples/resources/casper_contract_schemas/signature_verifier_schema.json @@ -1,11 +1,15 @@ { "casper_contract_schema_version": 1, "toolchain": "rustc 1.85.0-nightly (d117b7f21 2024-12-31)", - "authors": [], - "repository": null, - "homepage": null, + "authors": [ + "Jakub Płaskonka ", + "Krzysztof Pobiarżyn ", + "Maciej Zieliński " + ], + "repository": "https://github.com/odradev/odra", + "homepage": "https://odra.dev/docs", "contract_name": "SignatureVerifier", - "contract_version": "2.4.1", + "contract_version": "2.5.0", "types": [], "errors": [], "entry_points": [ diff --git a/examples/resources/casper_contract_schemas/testing_contract_schema.json b/examples/resources/casper_contract_schemas/testing_contract_schema.json index 5e658ef9f..3abf46473 100644 --- a/examples/resources/casper_contract_schemas/testing_contract_schema.json +++ b/examples/resources/casper_contract_schemas/testing_contract_schema.json @@ -1,11 +1,15 @@ { "casper_contract_schema_version": 1, "toolchain": "rustc 1.85.0-nightly (d117b7f21 2024-12-31)", - "authors": [], - "repository": null, - "homepage": null, + "authors": [ + "Jakub Płaskonka ", + "Krzysztof Pobiarżyn ", + "Maciej Zieliński " + ], + "repository": "https://github.com/odradev/odra", + "homepage": "https://odra.dev/docs", "contract_name": "TestingContract", - "contract_version": "2.4.1", + "contract_version": "2.5.0", "types": [], "errors": [], "entry_points": [ diff --git a/examples/resources/casper_contract_schemas/time_lock_wallet_schema.json b/examples/resources/casper_contract_schemas/time_lock_wallet_schema.json index c307c9d83..47db25564 100644 --- a/examples/resources/casper_contract_schemas/time_lock_wallet_schema.json +++ b/examples/resources/casper_contract_schemas/time_lock_wallet_schema.json @@ -1,11 +1,15 @@ { "casper_contract_schema_version": 1, "toolchain": "rustc 1.85.0-nightly (d117b7f21 2024-12-31)", - "authors": [], - "repository": null, - "homepage": null, + "authors": [ + "Jakub Płaskonka ", + "Krzysztof Pobiarżyn ", + "Maciej Zieliński " + ], + "repository": "https://github.com/odradev/odra", + "homepage": "https://odra.dev/docs", "contract_name": "TimeLockWallet", - "contract_version": "2.4.1", + "contract_version": "2.5.0", "types": [ { "struct": { diff --git a/examples/resources/casper_contract_schemas/token_manager_schema.json b/examples/resources/casper_contract_schemas/token_manager_schema.json index 81ce12e47..0ce5eef7f 100644 --- a/examples/resources/casper_contract_schemas/token_manager_schema.json +++ b/examples/resources/casper_contract_schemas/token_manager_schema.json @@ -1,11 +1,15 @@ { "casper_contract_schema_version": 1, "toolchain": "rustc 1.85.0-nightly (d117b7f21 2024-12-31)", - "authors": [], - "repository": null, - "homepage": null, + "authors": [ + "Jakub Płaskonka ", + "Krzysztof Pobiarżyn ", + "Maciej Zieliński " + ], + "repository": "https://github.com/odradev/odra", + "homepage": "https://odra.dev/docs", "contract_name": "TokenManager", - "contract_version": "2.4.1", + "contract_version": "2.5.0", "types": [], "errors": [], "entry_points": [ diff --git a/examples/resources/casper_contract_schemas/token_schema.json b/examples/resources/casper_contract_schemas/token_schema.json index a72969d0e..73aedfcbc 100644 --- a/examples/resources/casper_contract_schemas/token_schema.json +++ b/examples/resources/casper_contract_schemas/token_schema.json @@ -1,11 +1,15 @@ { "casper_contract_schema_version": 1, "toolchain": "rustc 1.85.0-nightly (d117b7f21 2024-12-31)", - "authors": [], - "repository": null, - "homepage": null, + "authors": [ + "Jakub Płaskonka ", + "Krzysztof Pobiarżyn ", + "Maciej Zieliński " + ], + "repository": "https://github.com/odradev/odra", + "homepage": "https://odra.dev/docs", "contract_name": "Token", - "contract_version": "2.4.1", + "contract_version": "2.5.0", "types": [], "errors": [], "entry_points": [ diff --git a/examples/resources/casper_contract_schemas/validators_contract_schema.json b/examples/resources/casper_contract_schemas/validators_contract_schema.json index b8e31e613..88df657ed 100644 --- a/examples/resources/casper_contract_schemas/validators_contract_schema.json +++ b/examples/resources/casper_contract_schemas/validators_contract_schema.json @@ -1,11 +1,15 @@ { "casper_contract_schema_version": 1, "toolchain": "rustc 1.85.0-nightly (d117b7f21 2024-12-31)", - "authors": [], - "repository": null, - "homepage": null, + "authors": [ + "Jakub Płaskonka ", + "Krzysztof Pobiarżyn ", + "Maciej Zieliński " + ], + "repository": "https://github.com/odradev/odra", + "homepage": "https://odra.dev/docs", "contract_name": "ValidatorsContract", - "contract_version": "2.4.1", + "contract_version": "2.5.0", "types": [], "errors": [], "entry_points": [ diff --git a/examples/resources/legacy/better_counter_factory_schema.json b/examples/resources/legacy/better_counter_factory_schema.json index c02016f94..47b4a1fc8 100644 --- a/examples/resources/legacy/better_counter_factory_schema.json +++ b/examples/resources/legacy/better_counter_factory_schema.json @@ -85,25 +85,7 @@ "name": "batch_upgrade_child_contract", "args": [ { - "name": "default_args", - "ty": { - "List": "U8" - }, - "is_ref": false, - "is_slice": false, - "is_required": true - }, - { - "name": "names_to_upgrade", - "ty": { - "List": "U8" - }, - "is_ref": false, - "is_slice": false, - "is_required": true - }, - { - "name": "specific_args", + "name": "args", "ty": { "List": "U8" }, diff --git a/examples/resources/legacy/counter_factory_schema.json b/examples/resources/legacy/counter_factory_schema.json index 4dcf7ddbc..1e21fc866 100644 --- a/examples/resources/legacy/counter_factory_schema.json +++ b/examples/resources/legacy/counter_factory_schema.json @@ -78,25 +78,7 @@ "name": "batch_upgrade_child_contract", "args": [ { - "name": "default_args", - "ty": { - "List": "U8" - }, - "is_ref": false, - "is_slice": false, - "is_required": true - }, - { - "name": "names_to_upgrade", - "ty": { - "List": "U8" - }, - "is_ref": false, - "is_slice": false, - "is_required": true - }, - { - "name": "specific_args", + "name": "args", "ty": { "List": "U8" }, diff --git a/examples/resources/legacy/f_token_factory_schema.json b/examples/resources/legacy/f_token_factory_schema.json index 843bc252a..7fd7eb0f0 100644 --- a/examples/resources/legacy/f_token_factory_schema.json +++ b/examples/resources/legacy/f_token_factory_schema.json @@ -99,25 +99,7 @@ "name": "batch_upgrade_child_contract", "args": [ { - "name": "default_args", - "ty": { - "List": "U8" - }, - "is_ref": false, - "is_slice": false, - "is_required": true - }, - { - "name": "names_to_upgrade", - "ty": { - "List": "U8" - }, - "is_ref": false, - "is_slice": false, - "is_required": true - }, - { - "name": "specific_args", + "name": "args", "ty": { "List": "U8" }, diff --git a/examples/resources/legacy/factory_proxy_schema.json b/examples/resources/legacy/factory_proxy_schema.json new file mode 100644 index 000000000..2fb71f057 --- /dev/null +++ b/examples/resources/legacy/factory_proxy_schema.json @@ -0,0 +1,30 @@ +{ + "name": "FactoryProxy", + "events": [], + "entrypoints": [ + { + "name": "init", + "args": [ + { + "name": "address", + "ty": "Key", + "is_ref": false, + "is_slice": false, + "is_required": true + } + ], + "is_mutable": true, + "return_ty": "Unit", + "ty": "Constructor", + "attributes": [] + }, + { + "name": "deploy_new_contract", + "args": [], + "is_mutable": false, + "return_ty": "Key", + "ty": "Public", + "attributes": [] + } + ] +} \ No newline at end of file diff --git a/justfile b/justfile index 0ab5fa99e..daaece1cb 100644 --- a/justfile +++ b/justfile @@ -1,5 +1,5 @@ CARGO_ODRA_GIT_REPO := "https://github.com/odradev/cargo-odra" -CARGO_ODRA_BRANCH := "feature/wasm-client-kpob" +CARGO_ODRA_BRANCH := "release/0.1.6" BINARYEN_VERSION := "version_116" BINARYEN_CHECKSUM := "c55b74f3109cdae97490faf089b0286d3bba926bb6ea5ed00c8c784fc53718fd" set dotenv-load := true diff --git a/modules/Cargo.toml b/modules/Cargo.toml index ef36e8532..91e625928 100644 --- a/modules/Cargo.toml +++ b/modules/Cargo.toml @@ -12,16 +12,16 @@ version = { workspace = true } [dependencies] base64 = { workspace = true } -odra = { path = "../odra", version = "2.4.1", default-features = false } +odra = { path = "../odra", version = "2.5.0", default-features = false } [target.'cfg(not(target_arch = "wasm32"))'.dependencies] -odra-build = { path = "../odra-build", version = "2.4.1" } +odra-build = { path = "../odra-build", version = "2.5.0" } [dev-dependencies] -odra-test = { path = "../odra-test", version = "2.4.1" } +odra-test = { path = "../odra-test", version = "2.5.0" } [build-dependencies] -odra-build = { path = "../odra-build", version = "2.4.1" } +odra-build = { path = "../odra-build", version = "2.5.0" } [features] default = [] diff --git a/modules/resources/casper_contract_schemas/basic_cep95_schema.json b/modules/resources/casper_contract_schemas/basic_cep95_schema.json index 6009f83d7..f4b9e3771 100644 --- a/modules/resources/casper_contract_schemas/basic_cep95_schema.json +++ b/modules/resources/casper_contract_schemas/basic_cep95_schema.json @@ -7,9 +7,9 @@ "Maciej Zieliński " ], "repository": "https://github.com/odradev/odra", - "homepage": null, + "homepage": "https://odra.dev/docs", "contract_name": "BasicCep95", - "contract_version": "2.4.1", + "contract_version": "2.5.0", "types": [ { "struct": { @@ -101,6 +101,28 @@ ] } }, + { + "struct": { + "name": "OwnershipTransferred", + "description": null, + "members": [ + { + "name": "previous_owner", + "description": null, + "ty": { + "Option": "Key" + } + }, + { + "name": "new_owner", + "description": null, + "ty": { + "Option": "Key" + } + } + ] + } + }, { "struct": { "name": "RevokeApproval", @@ -177,16 +199,41 @@ "description": "The caller is the same as the operator.", "discriminant": 40004 }, + { + "name": "CallerNotTheNewOwner", + "description": "The caller is not the new owner.", + "discriminant": 20002 + }, + { + "name": "CallerNotTheOwner", + "description": "The caller is not the owner.", + "discriminant": 20001 + }, { "name": "InvalidTokenId", "description": "The token ID is invalid.", "discriminant": 40005 }, + { + "name": "MissingRole", + "description": "The role is missing.", + "discriminant": 20003 + }, { "name": "NotAnOwnerOrApproved", "description": "The token ID is invalid.", "discriminant": 40002 }, + { + "name": "OwnerNotSet", + "description": "The owner is not set.", + "discriminant": 20000 + }, + { + "name": "RoleRenounceForAnotherAddress", + "description": "The role cannot be renounced for another address.", + "discriminant": 20004 + }, { "name": "TokenAlreadyExists", "description": "The token with the given ID already exists.", @@ -313,6 +360,15 @@ "is_contract_context": true, "access": "public" }, + { + "name": "assert_owner", + "description": "", + "is_mutable": false, + "arguments": [], + "return_ty": "Unit", + "is_contract_context": true, + "access": "public" + }, { "name": "name", "description": "Delegated. See `self.token.name()` for details.", @@ -586,6 +642,10 @@ "name": "Mint", "ty": "Mint" }, + { + "name": "OwnershipTransferred", + "ty": "OwnershipTransferred" + }, { "name": "RevokeApproval", "ty": "RevokeApproval" diff --git a/modules/resources/casper_contract_schemas/basic_contract_schema.json b/modules/resources/casper_contract_schemas/basic_contract_schema.json index 6c88cfb68..e6038d3a5 100644 --- a/modules/resources/casper_contract_schemas/basic_contract_schema.json +++ b/modules/resources/casper_contract_schemas/basic_contract_schema.json @@ -7,9 +7,9 @@ "Maciej Zieliński " ], "repository": "https://github.com/odradev/odra", - "homepage": null, + "homepage": "https://odra.dev/docs", "contract_name": "BasicContract", - "contract_version": "2.4.1", + "contract_version": "2.5.0", "types": [], "errors": [], "entry_points": [], diff --git a/modules/resources/casper_contract_schemas/cep18_client_contract_schema.json b/modules/resources/casper_contract_schemas/cep18_client_contract_schema.json index d2c283f13..7e60c5f5b 100644 --- a/modules/resources/casper_contract_schemas/cep18_client_contract_schema.json +++ b/modules/resources/casper_contract_schemas/cep18_client_contract_schema.json @@ -7,9 +7,9 @@ "Maciej Zieliński " ], "repository": "https://github.com/odradev/odra", - "homepage": null, + "homepage": "https://odra.dev/docs", "contract_name": "Cep18ClientContract", - "contract_version": "2.4.1", + "contract_version": "2.5.0", "types": [], "errors": [], "entry_points": [ diff --git a/modules/resources/casper_contract_schemas/cep18_example_schema.json b/modules/resources/casper_contract_schemas/cep18_example_schema.json index a316386c8..fc31aa318 100644 --- a/modules/resources/casper_contract_schemas/cep18_example_schema.json +++ b/modules/resources/casper_contract_schemas/cep18_example_schema.json @@ -7,9 +7,9 @@ "Maciej Zieliński " ], "repository": "https://github.com/odradev/odra", - "homepage": null, + "homepage": "https://odra.dev/docs", "contract_name": "Cep18Example", - "contract_version": "2.4.1", + "contract_version": "2.5.0", "types": [ { "struct": { diff --git a/modules/resources/casper_contract_schemas/cep18_schema.json b/modules/resources/casper_contract_schemas/cep18_schema.json index 9bfb8e47b..d859a600f 100644 --- a/modules/resources/casper_contract_schemas/cep18_schema.json +++ b/modules/resources/casper_contract_schemas/cep18_schema.json @@ -7,9 +7,9 @@ "Maciej Zieliński " ], "repository": "https://github.com/odradev/odra", - "homepage": null, + "homepage": "https://odra.dev/docs", "contract_name": "Cep18", - "contract_version": "2.4.1", + "contract_version": "2.5.0", "types": [ { "struct": { diff --git a/modules/resources/casper_contract_schemas/erc1155_receiver_schema.json b/modules/resources/casper_contract_schemas/erc1155_receiver_schema.json index f6e26c653..6e82f0ff5 100644 --- a/modules/resources/casper_contract_schemas/erc1155_receiver_schema.json +++ b/modules/resources/casper_contract_schemas/erc1155_receiver_schema.json @@ -7,9 +7,9 @@ "Maciej Zieliński " ], "repository": "https://github.com/odradev/odra", - "homepage": null, + "homepage": "https://odra.dev/docs", "contract_name": "Erc1155Receiver", - "contract_version": "2.4.1", + "contract_version": "2.5.0", "types": [ { "struct": { diff --git a/modules/resources/casper_contract_schemas/erc1155_token_schema.json b/modules/resources/casper_contract_schemas/erc1155_token_schema.json index 89cd0dad8..24d25dc4e 100644 --- a/modules/resources/casper_contract_schemas/erc1155_token_schema.json +++ b/modules/resources/casper_contract_schemas/erc1155_token_schema.json @@ -7,9 +7,9 @@ "Maciej Zieliński " ], "repository": "https://github.com/odradev/odra", - "homepage": null, + "homepage": "https://odra.dev/docs", "contract_name": "Erc1155Token", - "contract_version": "2.4.1", + "contract_version": "2.5.0", "types": [ { "struct": { diff --git a/modules/resources/casper_contract_schemas/erc20_schema.json b/modules/resources/casper_contract_schemas/erc20_schema.json index 164d1c687..fce12d566 100644 --- a/modules/resources/casper_contract_schemas/erc20_schema.json +++ b/modules/resources/casper_contract_schemas/erc20_schema.json @@ -7,9 +7,9 @@ "Maciej Zieliński " ], "repository": "https://github.com/odradev/odra", - "homepage": null, + "homepage": "https://odra.dev/docs", "contract_name": "Erc20", - "contract_version": "2.4.1", + "contract_version": "2.5.0", "types": [ { "struct": { diff --git a/modules/resources/casper_contract_schemas/erc721_receiver_schema.json b/modules/resources/casper_contract_schemas/erc721_receiver_schema.json index 64bac2428..192b6395a 100644 --- a/modules/resources/casper_contract_schemas/erc721_receiver_schema.json +++ b/modules/resources/casper_contract_schemas/erc721_receiver_schema.json @@ -7,9 +7,9 @@ "Maciej Zieliński " ], "repository": "https://github.com/odradev/odra", - "homepage": null, + "homepage": "https://odra.dev/docs", "contract_name": "Erc721Receiver", - "contract_version": "2.4.1", + "contract_version": "2.5.0", "types": [], "errors": [], "entry_points": [ diff --git a/modules/resources/casper_contract_schemas/erc721_token_schema.json b/modules/resources/casper_contract_schemas/erc721_token_schema.json index 5ee459833..ceba7efaa 100644 --- a/modules/resources/casper_contract_schemas/erc721_token_schema.json +++ b/modules/resources/casper_contract_schemas/erc721_token_schema.json @@ -7,9 +7,9 @@ "Maciej Zieliński " ], "repository": "https://github.com/odradev/odra", - "homepage": null, + "homepage": "https://odra.dev/docs", "contract_name": "Erc721Token", - "contract_version": "2.4.1", + "contract_version": "2.5.0", "types": [ { "struct": { diff --git a/modules/resources/casper_contract_schemas/nft_receiver_schema.json b/modules/resources/casper_contract_schemas/nft_receiver_schema.json index 9b7f005f1..97230598c 100644 --- a/modules/resources/casper_contract_schemas/nft_receiver_schema.json +++ b/modules/resources/casper_contract_schemas/nft_receiver_schema.json @@ -7,9 +7,9 @@ "Maciej Zieliński " ], "repository": "https://github.com/odradev/odra", - "homepage": null, + "homepage": "https://odra.dev/docs", "contract_name": "NFTReceiver", - "contract_version": "2.4.1", + "contract_version": "2.5.0", "types": [], "errors": [], "entry_points": [ diff --git a/modules/resources/casper_contract_schemas/ownable2_step_schema.json b/modules/resources/casper_contract_schemas/ownable2_step_schema.json index d2047cb61..dcd28c30c 100644 --- a/modules/resources/casper_contract_schemas/ownable2_step_schema.json +++ b/modules/resources/casper_contract_schemas/ownable2_step_schema.json @@ -7,9 +7,9 @@ "Maciej Zieliński " ], "repository": "https://github.com/odradev/odra", - "homepage": null, + "homepage": "https://odra.dev/docs", "contract_name": "Ownable2Step", - "contract_version": "2.4.1", + "contract_version": "2.5.0", "types": [ { "struct": { diff --git a/modules/resources/casper_contract_schemas/ownable_schema.json b/modules/resources/casper_contract_schemas/ownable_schema.json index 146a2771e..04612043b 100644 --- a/modules/resources/casper_contract_schemas/ownable_schema.json +++ b/modules/resources/casper_contract_schemas/ownable_schema.json @@ -7,9 +7,9 @@ "Maciej Zieliński " ], "repository": "https://github.com/odradev/odra", - "homepage": null, + "homepage": "https://odra.dev/docs", "contract_name": "Ownable", - "contract_version": "2.4.1", + "contract_version": "2.5.0", "types": [ { "struct": { diff --git a/modules/resources/casper_contract_schemas/rejectingnft_receiver_schema.json b/modules/resources/casper_contract_schemas/rejectingnft_receiver_schema.json index 27fc8c98d..7beb703de 100644 --- a/modules/resources/casper_contract_schemas/rejectingnft_receiver_schema.json +++ b/modules/resources/casper_contract_schemas/rejectingnft_receiver_schema.json @@ -7,9 +7,9 @@ "Maciej Zieliński " ], "repository": "https://github.com/odradev/odra", - "homepage": null, + "homepage": "https://odra.dev/docs", "contract_name": "RejectingNFTReceiver", - "contract_version": "2.4.1", + "contract_version": "2.5.0", "types": [], "errors": [], "entry_points": [ diff --git a/modules/resources/casper_contract_schemas/wrapped_native_token_schema.json b/modules/resources/casper_contract_schemas/wrapped_native_token_schema.json index 2649915d1..97aa66662 100644 --- a/modules/resources/casper_contract_schemas/wrapped_native_token_schema.json +++ b/modules/resources/casper_contract_schemas/wrapped_native_token_schema.json @@ -7,9 +7,9 @@ "Maciej Zieliński " ], "repository": "https://github.com/odradev/odra", - "homepage": null, + "homepage": "https://odra.dev/docs", "contract_name": "WrappedNativeToken", - "contract_version": "2.4.1", + "contract_version": "2.5.0", "types": [ { "struct": { @@ -264,6 +264,28 @@ "is_contract_context": true, "access": "public" }, + { + "name": "withdraw_to", + "description": "Withdraws native tokens from the contract to a specific recipient.", + "is_mutable": true, + "arguments": [ + { + "name": "recipient", + "description": null, + "ty": "Key", + "optional": false + }, + { + "name": "amount", + "description": null, + "ty": "U256", + "optional": false + } + ], + "return_ty": "Unit", + "is_contract_context": true, + "access": "public" + }, { "name": "allowance", "description": "Sets the allowance for `spender` to spend `amount` of the caller's tokens.", diff --git a/modules/resources/legacy/basic_cep95_schema.json b/modules/resources/legacy/basic_cep95_schema.json index ae3e3a389..0667cff1c 100644 --- a/modules/resources/legacy/basic_cep95_schema.json +++ b/modules/resources/legacy/basic_cep95_schema.json @@ -166,6 +166,29 @@ "is_required": true } ] + }, + { + "name": "OwnershipTransferred", + "args": [ + { + "name": "previous_owner", + "ty": { + "Option": "Key" + }, + "is_ref": false, + "is_slice": false, + "is_required": true + }, + { + "name": "new_owner", + "ty": { + "Option": "Key" + }, + "is_ref": false, + "is_slice": false, + "is_required": true + } + ] } ], "entrypoints": [ @@ -305,6 +328,14 @@ "ty": "Public", "attributes": [] }, + { + "name": "assert_owner", + "args": [], + "is_mutable": false, + "return_ty": "Unit", + "ty": "Public", + "attributes": [] + }, { "name": "name", "args": [], diff --git a/modules/resources/legacy/wrapped_native_token_schema.json b/modules/resources/legacy/wrapped_native_token_schema.json index b94351ce3..e3f79da4d 100644 --- a/modules/resources/legacy/wrapped_native_token_schema.json +++ b/modules/resources/legacy/wrapped_native_token_schema.json @@ -264,6 +264,29 @@ "ty": "Public", "attributes": [] }, + { + "name": "withdraw_to", + "args": [ + { + "name": "recipient", + "ty": "Key", + "is_ref": false, + "is_slice": false, + "is_required": true + }, + { + "name": "amount", + "ty": "U256", + "is_ref": false, + "is_slice": false, + "is_required": true + } + ], + "is_mutable": true, + "return_ty": "Unit", + "ty": "Public", + "attributes": [] + }, { "name": "allowance", "args": [ diff --git a/odra-bdd/Cargo.toml b/odra-bdd/Cargo.toml index 23b2c0b6d..18a23e567 100644 --- a/odra-bdd/Cargo.toml +++ b/odra-bdd/Cargo.toml @@ -11,7 +11,7 @@ repository = { workspace = true } version = { workspace = true } [dependencies] -odra = { path = "../odra", version = "2.4.1" } +odra = { path = "../odra", version = "2.5.0" } cucumber = { workspace = true} futures = { workspace = true } diff --git a/odra-casper/proxy-caller/Cargo.toml b/odra-casper/proxy-caller/Cargo.toml index 499b6dd6b..c78b13c47 100644 --- a/odra-casper/proxy-caller/Cargo.toml +++ b/odra-casper/proxy-caller/Cargo.toml @@ -12,7 +12,7 @@ homepage = "https://odra.dev/docs" license = "MIT" readme = "README.md" repository = "https://github.com/odradev/odra" -version = "2.4.1" +version = "2.5.0" [dependencies] odra-casper-wasm-env = { path = "../wasm-env" } diff --git a/odra-casper/rpc-client/Cargo.toml b/odra-casper/rpc-client/Cargo.toml index b21d14fe8..4baba9437 100644 --- a/odra-casper/rpc-client/Cargo.toml +++ b/odra-casper/rpc-client/Cargo.toml @@ -23,7 +23,7 @@ futures-util = { workspace = true } itertools = { workspace = true } prettycli = { workspace = true } project-root = { workspace = true } -rand = { workspace = true } +rand = { workspace = true, features = ["default"] } reqwest = { workspace = true, features = ["stream"] } serde_json = { workspace = true, features = ["raw_value"] } thiserror = { workspace = true } diff --git a/odra-cli/Cargo.toml b/odra-cli/Cargo.toml index 83bd41b53..63a556e7c 100644 --- a/odra-cli/Cargo.toml +++ b/odra-cli/Cargo.toml @@ -11,8 +11,8 @@ repository = { workspace = true } version = { workspace = true } [dependencies] -odra = { path = "../odra", version = "2.4.1", default-features = false } -odra-casper-livenet-env = { path = "../odra-casper/livenet-env", version = "2.4.1" } +odra = { path = "../odra", version = "2.5.0", default-features = false } +odra-casper-livenet-env = { path = "../odra-casper/livenet-env", version = "2.5.0" } anyhow = { workspace = true } chrono = { workspace = true, features = ["serde"] } @@ -28,4 +28,4 @@ thiserror = { workspace = true } toml = { workspace = true } [build-dependencies] -odra-build = { path = "../odra-build", version = "2.4.1", default-features = false } +odra-build = { path = "../odra-build", version = "2.5.0", default-features = false } diff --git a/odra-wasm-client/Cargo.toml b/odra-wasm-client/Cargo.toml index 8209017b4..105e303f8 100644 --- a/odra-wasm-client/Cargo.toml +++ b/odra-wasm-client/Cargo.toml @@ -16,7 +16,7 @@ odra-core = { workspace = true } casper-client = { workspace = true } casper-types = { workspace = true, features = ["datasize"] } -gloo-utils = { workspace = true, default-features = false, features = ["serde"] } +gloo-utils = { workspace = true, features = ["serde"] } hex = { workspace = true } js-sys = { workspace = true } serde = { workspace = true, features = ["derive"] } diff --git a/odra-wasm-client/example/package-lock.json b/odra-wasm-client/example/package-lock.json index 23c736c22..26647a502 100644 --- a/odra-wasm-client/example/package-lock.json +++ b/odra-wasm-client/example/package-lock.json @@ -31,7 +31,7 @@ }, "../pkg-web": { "name": "odra-wasm-client", - "version": "2.4.1", + "version": "2.5.0", "license": "MIT" }, "node_modules/@cspotcode/source-map-support": { From a94bfb71205de72df0537b21bdb00158c2618a55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kuba=20P=C5=82askonka?= Date: Wed, 10 Dec 2025 15:34:03 +0100 Subject: [PATCH 3/3] Fix parsing chainspec from nctl. --- odra-casper/rpc-client/src/casper_client/node.rs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/odra-casper/rpc-client/src/casper_client/node.rs b/odra-casper/rpc-client/src/casper_client/node.rs index 3323a9c00..cc56f6c6f 100644 --- a/odra-casper/rpc-client/src/casper_client/node.rs +++ b/odra-casper/rpc-client/src/casper_client/node.rs @@ -73,9 +73,8 @@ impl super::CasperClient { }) .result; let toml_bytes: &[u8] = chainspec.chainspec_bytes.chainspec_bytes(); - let toml = String::from_utf8_lossy(toml_bytes); - toml.parse::() - .unwrap_or_else(|_| panic!("Couldn't parse chainspec bytes: {:?}", toml)) + let toml = String::from_utf8(toml_bytes.to_vec()).unwrap(); + toml::from_str(&toml).unwrap_or_else(|e| panic!("Couldn't parse chainspec bytes: {:?}", e)) } /// Extracts era duration from chainspec.