diff --git a/Cargo.lock b/Cargo.lock index 9012b0a..2173d38 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -230,21 +230,6 @@ dependencies = [ "paste", ] -[[package]] -name = "backtrace" -version = "0.3.73" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - [[package]] name = "baid64" version = "0.2.2" @@ -408,7 +393,7 @@ dependencies = [ [[package]] name = "bp-derive" version = "0.11.0-beta.6" -source = "git+https://github.com/BP-WG/bp-std?branch=signer#924397cbb200fe91ef86c874d6ed5e16c5e2695d" +source = "git+https://github.com/BP-WG/bp-std?branch=signer#bae92ecc987937702d7e1153b07e1bafe614320d" dependencies = [ "amplify", "bitcoin_hashes", @@ -456,7 +441,7 @@ dependencies = [ [[package]] name = "bp-invoice" version = "0.11.0-beta.6" -source = "git+https://github.com/BP-WG/bp-std?branch=signer#924397cbb200fe91ef86c874d6ed5e16c5e2695d" +source = "git+https://github.com/BP-WG/bp-std?branch=signer#bae92ecc987937702d7e1153b07e1bafe614320d" dependencies = [ "amplify", "bech32", @@ -485,7 +470,7 @@ dependencies = [ [[package]] name = "bp-std" version = "0.11.0-beta.6" -source = "git+https://github.com/BP-WG/bp-std?branch=signer#924397cbb200fe91ef86c874d6ed5e16c5e2695d" +source = "git+https://github.com/BP-WG/bp-std?branch=signer#bae92ecc987937702d7e1153b07e1bafe614320d" dependencies = [ "amplify", "bp-consensus", @@ -500,7 +485,7 @@ dependencies = [ [[package]] name = "bp-wallet" version = "0.11.0-beta.6.1" -source = "git+https://github.com/BP-WG/bp-wallet?branch=master#418bf29b9408f90888c9f234749b6ddc57bed9ed" +source = "git+https://github.com/BP-WG/bp-wallet?branch=signer#48f0c01862ef32a8aa212bf81398610f50adf292" dependencies = [ "amplify", "base64", @@ -508,6 +493,7 @@ dependencies = [ "bp-esplora", "bp-std", "clap", + "colored", "descriptors", "env_logger", "log", @@ -515,6 +501,7 @@ dependencies = [ "serde", "serde_json", "serde_yaml", + "sha2", "shellexpand", "strict_encoding", "toml", @@ -532,12 +519,6 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" -[[package]] -name = "bytes" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a12916984aab3fa6e39d655a33e09c0071eb36d6ab3aea5c2d78551f1df6d952" - [[package]] name = "cc" version = "1.1.5" @@ -644,6 +625,16 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" +[[package]] +name = "colored" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbf2150cce219b664a8a70df7a1f933836724b503f8a413af9365b4dcc4d90b8" +dependencies = [ + "lazy_static", + "windows-sys 0.48.0", +] + [[package]] name = "commit_encoding_derive" version = "0.11.0-beta.5" @@ -778,7 +769,7 @@ dependencies = [ [[package]] name = "descriptors" version = "0.11.0-beta.6" -source = "git+https://github.com/BP-WG/bp-std?branch=signer#924397cbb200fe91ef86c874d6ed5e16c5e2695d" +source = "git+https://github.com/BP-WG/bp-std?branch=signer#bae92ecc987937702d7e1153b07e1bafe614320d" dependencies = [ "amplify", "bp-derive", @@ -1001,107 +992,12 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "http" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - -[[package]] -name = "http-body" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" -dependencies = [ - "bytes", - "http", -] - -[[package]] -name = "http-body-util" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" -dependencies = [ - "bytes", - "futures-util", - "http", - "http-body", - "pin-project-lite", -] - -[[package]] -name = "httparse" -version = "1.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" - [[package]] name = "humantime" version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" -[[package]] -name = "hyper" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" -dependencies = [ - "bytes", - "futures-channel", - "futures-util", - "http", - "http-body", - "httparse", - "itoa", - "pin-project-lite", - "smallvec", - "tokio", - "want", -] - -[[package]] -name = "hyper-tls" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" -dependencies = [ - "bytes", - "http-body-util", - "hyper", - "hyper-util", - "native-tls", - "tokio", - "tokio-native-tls", - "tower-service", -] - -[[package]] -name = "hyper-util" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab92f4f49ee4fb4f997c784b7a2e0fa70050211e0b6a287f898c3c9785ca956" -dependencies = [ - "bytes", - "futures-channel", - "futures-util", - "http", - "http-body", - "hyper", - "pin-project-lite", - "socket2", - "tokio", - "tower", - "tower-service", - "tracing", -] - [[package]] name = "iana-time-zone" version = "0.1.60" @@ -1316,65 +1212,12 @@ dependencies = [ "autocfg", ] -[[package]] -name = "object" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce" -dependencies = [ - "memchr", -] - [[package]] name = "once_cell" version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" -[[package]] -name = "openssl" -version = "0.10.64" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" -dependencies = [ - "bitflags 2.6.0", - "cfg-if", - "foreign-types", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.71", -] - -[[package]] -name = "openssl-probe" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - -[[package]] -name = "openssl-sys" -version = "0.9.102" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - [[package]] name = "option-ext" version = "0.2.0" @@ -1393,44 +1236,6 @@ version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" -[[package]] -name = "pin-project" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.71", -] - -[[package]] -name = "pin-project-lite" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "pkg-config" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" - [[package]] name = "powerfmt" version = "0.2.0" @@ -1465,7 +1270,7 @@ dependencies = [ [[package]] name = "psbt" version = "0.11.0-beta.6" -source = "git+https://github.com/BP-WG/bp-std?branch=signer#924397cbb200fe91ef86c874d6ed5e16c5e2695d" +source = "git+https://github.com/BP-WG/bp-std?branch=signer#bae92ecc987937702d7e1153b07e1bafe614320d" dependencies = [ "amplify", "base64", @@ -1558,46 +1363,6 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" -[[package]] -name = "reqwest" -version = "0.12.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37" -dependencies = [ - "base64 0.22.1", - "bytes", - "futures-core", - "futures-util", - "http", - "http-body", - "http-body-util", - "hyper", - "hyper-tls", - "hyper-util", - "ipnet", - "js-sys", - "log", - "mime", - "native-tls", - "once_cell", - "percent-encoding", - "pin-project-lite", - "rustls-pemfile", - "serde", - "serde_json", - "serde_urlencoded", - "sync_wrapper", - "tokio", - "tokio-native-tls", - "tokio-socks", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "winreg", -] - [[package]] name = "rgb-core" version = "0.11.0-beta.6" @@ -1639,7 +1404,7 @@ dependencies = [ [[package]] name = "rgb-invoice" version = "0.11.0-beta.6" -source = "git+https://github.com/RGB-WG/rgb-std?branch=master#de91f0e72ec24f8768c66b5a86c48447a051bfed" +source = "git+https://github.com/RGB-WG/rgb-std?branch=master#48bb105d8b99d2c88dfbb574cee9ecb2021c439b" dependencies = [ "amplify", "baid64", @@ -1701,7 +1466,7 @@ dependencies = [ [[package]] name = "rgb-std" version = "0.11.0-beta.6" -source = "git+https://github.com/RGB-WG/rgb-std?branch=master#de91f0e72ec24f8768c66b5a86c48447a051bfed" +source = "git+https://github.com/RGB-WG/rgb-std?branch=master#48bb105d8b99d2c88dfbb574cee9ecb2021c439b" dependencies = [ "aluvm", "amplify", @@ -1899,29 +1664,6 @@ dependencies = [ "secp256k1-sys 0.9.2", ] -[[package]] -name = "security-framework" -version = "2.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" -dependencies = [ - "bitflags 2.6.0", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" -dependencies = [ - "core-foundation-sys", - "libc", -] - [[package]] name = "serde" version = "1.0.204" @@ -2156,33 +1898,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "sync_wrapper" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" - -[[package]] -name = "tempfile" -version = "3.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" -dependencies = [ - "cfg-if", - "fastrand", - "rustix", - "windows-sys 0.52.0", -] - -[[package]] -name = "termcolor" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" -dependencies = [ - "winapi-util", -] - [[package]] name = "thiserror" version = "1.0.62" diff --git a/Cargo.toml b/Cargo.toml index 520cbcf..65f6b8f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -100,3 +100,7 @@ bp-invoice = { git = "https://github.com/BP-WG/bp-std", branch = "signer" } descriptors = { git = "https://github.com/BP-WG/bp-std", branch = "signer" } psbt = { git = "https://github.com/BP-WG/bp-std", branch = "signer" } bp-std = { git = "https://github.com/BP-WG/bp-std", branch = "signer" } +bp-wallet = { git = "https://github.com/BP-WG/bp-wallet", branch = "signer" } +rgb-core = { git = "https://github.com/RGB-WG/rgb-core", branch = "master" } +rgb-invoice = { git = "https://github.com/RGB-WG/rgb-std", branch = "master" } +rgb-std = { git = "https://github.com/RGB-WG/rgb-std", branch = "master" } diff --git a/src/indexers/any.rs b/src/indexers/any.rs index 97d4da4..725fdf3 100644 --- a/src/indexers/any.rs +++ b/src/indexers/any.rs @@ -73,6 +73,7 @@ impl AnyResolver { let expected_block_hash = match network { Network::Mainnet => "000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f", Network::Testnet3 => "000000000933ea01ad0ee984209779baaec3ced90fa3f408719526f8d77f4943", + Network::Testnet4 => "000000000933ea01ad0ee984209779baaec3ced90fa3f408719526f8d77f4943", Network::Signet => "00000008819873e925422c1ff0f99f7cc9bbb232af63a077a480a3633bee1ef6", Network::Regtest => "0f9188f13cb7b2c71f2a335e3a4fc328bf5beb436012afca590b1a11466e2206", } diff --git a/src/indexers/electrum_blocking.rs b/src/indexers/electrum_blocking.rs index aca0d0b..b4a628e 100644 --- a/src/indexers/electrum_blocking.rs +++ b/src/indexers/electrum_blocking.rs @@ -48,6 +48,7 @@ impl RgbResolver for Client { let txid = match network { Network::Mainnet => "33e794d097969002ee05d336686fc03c9e15a597c1b9827669460fac98799036", Network::Testnet3 => "5e6560fd518aadbed67ee4a55bdc09f19e619544f5511e9343ebba66d2f62653", + Network::Testnet4 => "5e6560fd518aadbed67ee4a55bdc09f19e619544f5511e9343ebba66d2f62653", Network::Signet => "8153034f45e695453250a8fb7225a5e545144071d8ed7b0d3211efa1f3c92ad8", Network::Regtest => "4a5e1e4baab89f3a32518a88c31bc87f618f76673e2cc77ab2127b7afdeda33b", };