From 8398d46fcd9d57fa2b190bb7cbee39199256bb66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marijan=20Petri=C4=8Devi=C4=87?= Date: Tue, 3 Sep 2024 16:04:15 +0200 Subject: [PATCH] depend on casper-node relesase-2.0.0-rc4 --- Cargo.lock | 57 ++++++++++++++++++++++++++++------------------- Cargo.toml | 6 ++--- nixos/default.nix | 2 +- 3 files changed, 38 insertions(+), 27 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 10b8138..119015a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -89,7 +89,7 @@ checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.77", ] [[package]] @@ -216,7 +216,7 @@ checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" [[package]] name = "casper-client" version = "2.0.0" -source = "git+https://github.com/casper-ecosystem/casper-client-rs?branch=rustSDK-feat-2.0#cf272535677e6a3870dd251f136bd88f8132c8c4" +source = "git+https://github.com/casper-ecosystem/casper-client-rs?branch=feat-track-node-2.0#2227d5ada7a02f9406a7fb0cb290e55bea3e30e5" dependencies = [ "async-trait", "base16", @@ -225,7 +225,7 @@ dependencies = [ "clap_complete", "hex-buffer-serde", "humantime", - "itertools 0.12.1", + "itertools 0.11.0", "jsonrpc-lite", "num-traits", "once_cell", @@ -243,7 +243,7 @@ dependencies = [ [[package]] name = "casper-types" version = "5.0.0" -source = "git+https://github.com/casper-network/casper-node?branch=rustSDK-feat-2.0#06e962bec1930c8bc83194f0130df95aed6e3bb1" +source = "git+https://github.com/casper-network/casper-node?branch=release-2.0.0-rc4#4e2ddf485e5cec830f9ff402b052f5f55801eb54" dependencies = [ "base16", "base64 0.13.1", @@ -351,7 +351,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn", + "syn 2.0.77", ] [[package]] @@ -465,7 +465,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.77", ] [[package]] @@ -488,7 +488,7 @@ dependencies = [ "proc-macro2", "quote", "rustc_version", - "syn", + "syn 2.0.77", ] [[package]] @@ -984,9 +984,9 @@ dependencies = [ [[package]] name = "itertools" -version = "0.12.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" dependencies = [ "either", ] @@ -1192,13 +1192,13 @@ dependencies = [ [[package]] name = "num-derive" -version = "0.4.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" +checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1286,7 +1286,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.77", ] [[package]] @@ -1370,7 +1370,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.77", ] [[package]] @@ -1683,7 +1683,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn", + "syn 2.0.77", ] [[package]] @@ -1775,7 +1775,7 @@ checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.77", ] [[package]] @@ -1786,7 +1786,7 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.77", ] [[package]] @@ -1918,6 +1918,17 @@ version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + [[package]] name = "syn" version = "2.0.77" @@ -1989,7 +2000,7 @@ checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.77", ] [[package]] @@ -2044,7 +2055,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.77", ] [[package]] @@ -2127,7 +2138,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.77", ] [[package]] @@ -2298,7 +2309,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn", + "syn 2.0.77", "wasm-bindgen-shared", ] @@ -2332,7 +2343,7 @@ checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.77", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -2505,7 +2516,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.77", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index b991c3c..7931408 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,8 +20,8 @@ path = "src/lib.rs" anyhow = "1" backoff = { version = "0.4", features = ["tokio", "futures"]} clap = { version = "4", features = ["derive"] } -casper-client = { git = "https://github.com/casper-ecosystem/casper-client-rs", branch = "rustSDK-feat-2.0"} -casper-types= { git = "https://github.com/casper-network/casper-node", branch = "rustSDK-feat-2.0" } +casper-client = { git = "https://github.com/casper-ecosystem/casper-client-rs", branch = "feat-track-node-2.0"} +casper-types= { git = "https://github.com/casper-network/casper-node", branch = "release-2.0.0-rc4" } itertools = "0.13" nom = "7" hex = "0.4" @@ -32,4 +32,4 @@ tracing = "0.1" tracing-subscriber = { version = "0.3", features = ["std", "env-filter"] } [patch.crates-io] -casper-types = { git = "https://github.com/casper-network/casper-node", branch = "rustSDK-feat-2.0" } +casper-types = { git = "https://github.com/casper-network/casper-node", branch = "release-2.0.0-rc4" } diff --git a/nixos/default.nix b/nixos/default.nix index 0b77a9f..4e85883 100644 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -11,7 +11,7 @@ { inherit (inputs.csprpkgs.packages.${pkgs.system}) casper-client-rs; cctlModule = self.nixosModules.cctl; - contractWasm = ../test-resources/demo-contract-optimized.wasm; + contractWasm = "${self.packages.${pkgs.system}.dummy-contract}/bin/dummy-contract.wasm"; }; }; nixosModules = {