From 9bf4f71b7b4c59bbb43e6026456164340054de35 Mon Sep 17 00:00:00 2001 From: Santiago Carmuega Date: Fri, 5 Jan 2024 15:13:46 -0300 Subject: [PATCH] chore(deps): upgrade Pallas to v0.21 (#146) --- Cargo.lock | 129 +++++++++++++++++++++++++++-------------------- src/sync/pull.rs | 6 --- 2 files changed, 73 insertions(+), 62 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8e6b72ac..a3c321b0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -303,7 +303,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "93f2635620bf0b9d4576eb7bb9a38a55df78bd1205d26fa994b25911a69f212f" dependencies = [ "bitcoin_hashes", - "rand_core 0.6.4", + "rand_core 0.5.1", "serde", "unicode-normalization", ] @@ -1594,6 +1594,16 @@ dependencies = [ "minicbor-derive", ] +[[package]] +name = "minicbor" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d15f4203d71fdf90903c2696e55426ac97a363c67b218488a73b534ce7aca10" +dependencies = [ + "half 1.8.2", + "minicbor-derive", +] + [[package]] name = "minicbor-derive" version = "0.13.0" @@ -1676,7 +1686,7 @@ dependencies = [ "kes-summed-ed25519", "mithril-stm", "nom", - "pallas-network 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", + "pallas-network 0.20.0", "rand_chacha", "rand_core 0.6.4", "rayon", @@ -1900,16 +1910,16 @@ checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" [[package]] name = "pallas" -version = "0.20.0" -source = "git+https://github.com/txpipe/pallas.git#408a41a9ea8466111620150bd59347d2c8615e98" +version = "0.21.0" +source = "git+https://github.com/txpipe/pallas.git#ca27aa91acf2bc579f3f1e4e8885cf2284fa90df" dependencies = [ "pallas-addresses", "pallas-applying", - "pallas-codec 0.20.0 (git+https://github.com/txpipe/pallas.git)", + "pallas-codec 0.21.0", "pallas-configs", - "pallas-crypto 0.20.0 (git+https://github.com/txpipe/pallas.git)", + "pallas-crypto 0.21.0", "pallas-hardano", - "pallas-network 0.20.0 (git+https://github.com/txpipe/pallas.git)", + "pallas-network 0.21.0", "pallas-primitives", "pallas-rolldb", "pallas-traverse", @@ -1920,27 +1930,27 @@ dependencies = [ [[package]] name = "pallas-addresses" -version = "0.20.0" -source = "git+https://github.com/txpipe/pallas.git#408a41a9ea8466111620150bd59347d2c8615e98" +version = "0.21.0" +source = "git+https://github.com/txpipe/pallas.git#ca27aa91acf2bc579f3f1e4e8885cf2284fa90df" dependencies = [ "base58", "bech32 0.9.1", "crc", "hex", - "pallas-codec 0.20.0 (git+https://github.com/txpipe/pallas.git)", - "pallas-crypto 0.20.0 (git+https://github.com/txpipe/pallas.git)", + "pallas-codec 0.21.0", + "pallas-crypto 0.21.0", "sha3", "thiserror", ] [[package]] name = "pallas-applying" -version = "0.20.0" -source = "git+https://github.com/txpipe/pallas.git#408a41a9ea8466111620150bd59347d2c8615e98" +version = "0.21.0" +source = "git+https://github.com/txpipe/pallas.git#ca27aa91acf2bc579f3f1e4e8885cf2284fa90df" dependencies = [ "pallas-addresses", - "pallas-codec 0.20.0 (git+https://github.com/txpipe/pallas.git)", - "pallas-crypto 0.20.0 (git+https://github.com/txpipe/pallas.git)", + "pallas-codec 0.21.0", + "pallas-crypto 0.21.0", "pallas-primitives", "pallas-traverse", "rand", @@ -1953,32 +1963,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5443cc4e8d59a8845282a8d35c4021a434a1911d3bc82914c3a8fcda8247d1ae" dependencies = [ "hex", - "minicbor", + "minicbor 0.19.1", "serde", "thiserror", ] [[package]] name = "pallas-codec" -version = "0.20.0" -source = "git+https://github.com/txpipe/pallas.git#408a41a9ea8466111620150bd59347d2c8615e98" +version = "0.21.0" +source = "git+https://github.com/txpipe/pallas.git#ca27aa91acf2bc579f3f1e4e8885cf2284fa90df" dependencies = [ "hex", - "minicbor", + "minicbor 0.20.0", "serde", "thiserror", ] [[package]] name = "pallas-configs" -version = "0.20.0" -source = "git+https://github.com/txpipe/pallas.git#408a41a9ea8466111620150bd59347d2c8615e98" +version = "0.21.0" +source = "git+https://github.com/txpipe/pallas.git#ca27aa91acf2bc579f3f1e4e8885cf2284fa90df" dependencies = [ "base64 0.21.5", "hex", "pallas-addresses", - "pallas-codec 0.20.0 (git+https://github.com/txpipe/pallas.git)", - "pallas-crypto 0.20.0 (git+https://github.com/txpipe/pallas.git)", + "pallas-codec 0.21.0", + "pallas-crypto 0.21.0", "serde", "serde_json", ] @@ -1991,7 +2001,7 @@ checksum = "cd1116c3da7bc5ae8aa3a87a3ccc42a46d07994458d084c7d3c1dc732320bfc0" dependencies = [ "cryptoxide", "hex", - "pallas-codec 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", + "pallas-codec 0.20.0", "rand_core 0.6.4", "serde", "thiserror", @@ -1999,12 +2009,12 @@ dependencies = [ [[package]] name = "pallas-crypto" -version = "0.20.0" -source = "git+https://github.com/txpipe/pallas.git#408a41a9ea8466111620150bd59347d2c8615e98" +version = "0.21.0" +source = "git+https://github.com/txpipe/pallas.git#ca27aa91acf2bc579f3f1e4e8885cf2284fa90df" dependencies = [ "cryptoxide", "hex", - "pallas-codec 0.20.0 (git+https://github.com/txpipe/pallas.git)", + "pallas-codec 0.21.0", "rand_core 0.6.4", "serde", "thiserror", @@ -2012,11 +2022,14 @@ dependencies = [ [[package]] name = "pallas-hardano" -version = "0.20.0" -source = "git+https://github.com/txpipe/pallas.git#408a41a9ea8466111620150bd59347d2c8615e98" +version = "0.21.0" +source = "git+https://github.com/txpipe/pallas.git#ca27aa91acf2bc579f3f1e4e8885cf2284fa90df" dependencies = [ "binary-layout", + "pallas-network 0.21.0", + "pallas-traverse", "tap", + "thiserror", "tracing", ] @@ -2029,8 +2042,8 @@ dependencies = [ "byteorder", "hex", "itertools", - "pallas-codec 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", - "pallas-crypto 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", + "pallas-codec 0.20.0", + "pallas-crypto 0.20.0", "thiserror", "tokio", "tracing", @@ -2038,14 +2051,16 @@ dependencies = [ [[package]] name = "pallas-network" -version = "0.20.0" -source = "git+https://github.com/txpipe/pallas.git#408a41a9ea8466111620150bd59347d2c8615e98" +version = "0.21.0" +source = "git+https://github.com/txpipe/pallas.git#ca27aa91acf2bc579f3f1e4e8885cf2284fa90df" dependencies = [ "byteorder", "hex", "itertools", - "pallas-codec 0.20.0 (git+https://github.com/txpipe/pallas.git)", - "pallas-crypto 0.20.0 (git+https://github.com/txpipe/pallas.git)", + "pallas-codec 0.21.0", + "pallas-crypto 0.21.0", + "rand", + "socket2 0.5.5", "thiserror", "tokio", "tracing", @@ -2053,29 +2068,29 @@ dependencies = [ [[package]] name = "pallas-primitives" -version = "0.20.0" -source = "git+https://github.com/txpipe/pallas.git#408a41a9ea8466111620150bd59347d2c8615e98" +version = "0.21.0" +source = "git+https://github.com/txpipe/pallas.git#ca27aa91acf2bc579f3f1e4e8885cf2284fa90df" dependencies = [ "base58", "bech32 0.9.1", "hex", "log", - "pallas-codec 0.20.0 (git+https://github.com/txpipe/pallas.git)", - "pallas-crypto 0.20.0 (git+https://github.com/txpipe/pallas.git)", + "pallas-codec 0.21.0", + "pallas-crypto 0.21.0", "serde", "serde_json", ] [[package]] name = "pallas-rolldb" -version = "0.20.0" -source = "git+https://github.com/txpipe/pallas.git#408a41a9ea8466111620150bd59347d2c8615e98" +version = "0.21.0" +source = "git+https://github.com/txpipe/pallas.git#ca27aa91acf2bc579f3f1e4e8885cf2284fa90df" dependencies = [ "async-stream", "bincode", "futures-core", "futures-util", - "pallas-crypto 0.20.0 (git+https://github.com/txpipe/pallas.git)", + "pallas-crypto 0.21.0", "rocksdb", "serde", "thiserror", @@ -2085,13 +2100,13 @@ dependencies = [ [[package]] name = "pallas-traverse" -version = "0.20.0" -source = "git+https://github.com/txpipe/pallas.git#408a41a9ea8466111620150bd59347d2c8615e98" +version = "0.21.0" +source = "git+https://github.com/txpipe/pallas.git#ca27aa91acf2bc579f3f1e4e8885cf2284fa90df" dependencies = [ "hex", "pallas-addresses", - "pallas-codec 0.20.0 (git+https://github.com/txpipe/pallas.git)", - "pallas-crypto 0.20.0 (git+https://github.com/txpipe/pallas.git)", + "pallas-codec 0.21.0", + "pallas-crypto 0.21.0", "pallas-primitives", "paste", "serde", @@ -2100,15 +2115,16 @@ dependencies = [ [[package]] name = "pallas-txbuilder" -version = "0.20.0" -source = "git+https://github.com/txpipe/pallas.git#408a41a9ea8466111620150bd59347d2c8615e98" +version = "0.21.0" +source = "git+https://github.com/txpipe/pallas.git#ca27aa91acf2bc579f3f1e4e8885cf2284fa90df" dependencies = [ "hex", "pallas-addresses", - "pallas-codec 0.20.0 (git+https://github.com/txpipe/pallas.git)", - "pallas-crypto 0.20.0 (git+https://github.com/txpipe/pallas.git)", + "pallas-codec 0.21.0", + "pallas-crypto 0.21.0", "pallas-primitives", "pallas-traverse", + "pallas-wallet", "serde", "serde_json", "thiserror", @@ -2116,10 +2132,10 @@ dependencies = [ [[package]] name = "pallas-utxorpc" -version = "0.20.0" -source = "git+https://github.com/txpipe/pallas.git#408a41a9ea8466111620150bd59347d2c8615e98" +version = "0.21.0" +source = "git+https://github.com/txpipe/pallas.git#ca27aa91acf2bc579f3f1e4e8885cf2284fa90df" dependencies = [ - "pallas-codec 0.20.0 (git+https://github.com/txpipe/pallas.git)", + "pallas-codec 0.21.0", "pallas-primitives", "pallas-traverse", "utxorpc", @@ -2127,14 +2143,15 @@ dependencies = [ [[package]] name = "pallas-wallet" -version = "0.20.0" -source = "git+https://github.com/txpipe/pallas.git#408a41a9ea8466111620150bd59347d2c8615e98" +version = "0.21.0" +source = "git+https://github.com/txpipe/pallas.git#ca27aa91acf2bc579f3f1e4e8885cf2284fa90df" dependencies = [ "bech32 0.9.1", "bip39", "cryptoxide", "ed25519-bip32", - "pallas-crypto 0.20.0 (git+https://github.com/txpipe/pallas.git)", + "pallas-crypto 0.21.0", + "rand", "thiserror", ] diff --git a/src/sync/pull.rs b/src/sync/pull.rs index dc42d2f3..14cf9cb4 100644 --- a/src/sync/pull.rs +++ b/src/sync/pull.rs @@ -209,12 +209,6 @@ impl gasket::framework::Worker for Worker { ) -> Result<(), WorkerError> { self.process_next(stage, unit).await } - - async fn teardown(&mut self) -> Result<(), WorkerError> { - self.peer_session.abort(); - - Ok(()) - } } #[derive(Stage)]