diff --git a/Cargo.lock b/Cargo.lock index 03019458..19ec3521 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -72,13 +72,11 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "bitcoinsv" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09792e7e7778ea1f45f5eedbf7805a490f03a8fc5c2d706462f90e89e1922d9d" +version = "0.2.9-alpha" +source = "git+https://github.com/Danconnolly/rust-bitcoinsv.git#35526d56834dc10009f9e31598ac0ad53b7b2318" dependencies = [ "async-trait", "base58", - "byteorder", "bytes", "futures", "hex", @@ -102,7 +100,7 @@ version = "1.0.2" dependencies = [ "async-trait", "bitcoinsv", - "bitcoinsv-rpc-json 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "bitcoinsv-rpc-json", "hex", "jsonrpc", "log", @@ -124,18 +122,6 @@ dependencies = [ "serde_json", ] -[[package]] -name = "bitcoinsv-rpc-json" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "171a48356852e051ae361e5079e077fb33ac5882304077bb6c0861464091edce" -dependencies = [ - "bitcoinsv", - "hex", - "serde", - "serde_json", -] - [[package]] name = "bitflags" version = "2.6.0" @@ -159,9 +145,12 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.7.2" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" +checksum = "f61dac84819c6588b558454b194026eb1f09c293b9036ae9b159e74e73ab6cf9" +dependencies = [ + "serde", +] [[package]] name = "cc" @@ -225,9 +214,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" dependencies = [ "futures-channel", "futures-core", @@ -240,9 +229,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" dependencies = [ "futures-core", "futures-sink", @@ -250,15 +239,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" [[package]] name = "futures-executor" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" dependencies = [ "futures-core", "futures-task", @@ -267,15 +256,15 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" [[package]] name = "futures-macro" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", @@ -284,21 +273,21 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" [[package]] name = "futures-task" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" [[package]] name = "futures-util" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" dependencies = [ "futures-channel", "futures-core", @@ -731,6 +720,7 @@ checksum = "9465315bc9d4566e1724f0fffcbcc446268cb522e60f9a27bcded6b19c108113" dependencies = [ "rand", "secp256k1-sys", + "serde", ] [[package]] @@ -890,9 +880,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.16" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1" +checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047" dependencies = [ "futures-core", "pin-project-lite", diff --git a/Cargo.toml b/Cargo.toml index 2bb2c623..d2153ac7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,4 +7,5 @@ members = [ ] [workspace.dependencies] -bitcoinsv = "0.2.7" +bitcoinsv = { git = "https://github.com/Danconnolly/rust-bitcoinsv.git" } + diff --git a/client/Cargo.toml b/client/Cargo.toml index c1d4f599..d5c488f3 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -19,7 +19,7 @@ path = "src/lib.rs" [dependencies] async-trait = "0.1.75" bitcoinsv = { workspace = true } -bitcoinsv-rpc-json = { version = "1.0.2" } +bitcoinsv-rpc-json = { path = "../json" } hex = "0.4.3" jsonrpc = { version = "0.16.0", features = ["minreq_http"]} log = "0.4.5" diff --git a/client/src/error.rs b/client/src/error.rs index 26310ba6..e4c98b3a 100644 --- a/client/src/error.rs +++ b/client/src/error.rs @@ -18,7 +18,7 @@ pub enum Error { /// The URI could not be parsed. InvalidUri, MinReqError(jsonrpc::minreq_http::Error), - SVJsonError(bitcoinsv::BsvError), + SVJsonError(bitcoinsv::Error), } impl From for Error { @@ -51,8 +51,8 @@ impl From for Error { } } -impl From for Error { - fn from(e: bitcoinsv::BsvError) -> Error { +impl From for Error { + fn from(e: bitcoinsv::Error) -> Error { Error::SVJsonError(e) } } diff --git a/integration_test/Cargo.toml b/integration_test/Cargo.toml index 03ee2cfb..f73e7330 100644 --- a/integration_test/Cargo.toml +++ b/integration_test/Cargo.toml @@ -8,5 +8,5 @@ edition = "2021" bitcoinsv = { workspace = true } bitcoinsv-rpc = { path = "../client" } tokio = { version = "1", features = ["full"] } -tokio-stream = "0.1" +tokio-stream = "0.1.17" diff --git a/json/src/lib.rs b/json/src/lib.rs index ec5027a0..585506e9 100644 --- a/json/src/lib.rs +++ b/json/src/lib.rs @@ -646,7 +646,7 @@ impl GetRawTransactionResult { self.vin.len() == 1 && self.vin[0].is_coinbase() } - pub fn transaction(&self) -> Result { + pub fn transaction(&self) -> Result { let tx = Tx::from_hex(&self.hex)?; Ok(tx) }