diff --git a/Cargo.lock b/Cargo.lock index e3e3eeb..3ff16a5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -21,7 +21,7 @@ dependencies = [ "ascii-armor", "baid64", "blake3", - "getrandom 0.3.2", + "getrandom 0.3.3", "half", "paste", "ripemd", @@ -149,12 +149,12 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "3.0.7" +version = "3.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e" +checksum = "6680de5231bd6ee4c6191b8a1325daa282b415391ec9d3a37bd34f2060dc73fa" dependencies = [ "anstyle", - "once_cell", + "once_cell_polyfill", "windows-sys 0.59.0", ] @@ -200,9 +200,9 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "aws-lc-rs" -version = "1.13.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b756939cb2f8dc900aa6dcd505e6e2428e9cae7ff7b028c49e3946efa70878" +checksum = "93fcc8f365936c834db5514fc45aee5b1202d677e6b40e48468aaaa8183ca8c7" dependencies = [ "aws-lc-sys", "zeroize", @@ -210,9 +210,9 @@ dependencies = [ [[package]] name = "aws-lc-sys" -version = "0.28.2" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa9b6986f250236c27e5a204062434a773a13243d2ffc2955f37bdba4c5c6a1" +checksum = "61b1d86e7705efe1be1b569bab41d4fa1e14e220b60a160f78de2db687add079" dependencies = [ "bindgen", "cc", @@ -295,9 +295,9 @@ dependencies = [ [[package]] name = "bitflags" -version = "2.9.0" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd" +checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967" [[package]] name = "blake3" @@ -354,7 +354,7 @@ dependencies = [ "bp-seals", "commit_verify", "getrandom 0.2.16", - "getrandom 0.3.2", + "getrandom 0.3.3", "serde", "single_use_seals", "strict_encoding", @@ -404,11 +404,11 @@ dependencies = [ "byteorder", "libc", "log", - "rustls 0.23.26", + "rustls 0.23.27", "serde", "serde_json", "sha2", - "webpki-roots 0.26.10", + "webpki-roots 0.26.11", "winapi", ] @@ -471,7 +471,7 @@ dependencies = [ "bp-invoice", "descriptors", "getrandom 0.2.16", - "getrandom 0.3.2", + "getrandom 0.3.3", "psbt", "secp256k1", "serde", @@ -519,9 +519,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "cc" -version = "1.2.20" +version = "1.2.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04da6a0d40b948dfc4fa8f5bbf402b0fc1a64a28dbf7d12ffd683550f2c1b63a" +checksum = "16595d3be041c03b09d08d0858631facccee9221e579704070e6e9e4915d3bc7" dependencies = [ "jobserver", "libc", @@ -571,9 +571,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.37" +version = "4.5.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eccb054f56cbd38340b380d4a8e69ef1f02f1af43db2f0cc817a4774d80ae071" +checksum = "ed93b9805f8ba930df42c2590f05453d5ec36cbb85d018868a5b24d31f6ac000" dependencies = [ "clap_builder", "clap_derive", @@ -581,9 +581,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.37" +version = "4.5.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd9466fac8543255d3b1fcad4762c5e116ffe808c8a3043d4263cd4fd4862a2" +checksum = "379026ff283facf611b0ea629334361c4211d1b12ee01024eec1591133b04120" dependencies = [ "anstream", "anstyle", @@ -832,9 +832,9 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" [[package]] name = "errno" -version = "0.3.11" +version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "976dd42dc7e85965fe702eb8164f21f450704bdde31faefd6471dba214cb594e" +checksum = "cea14ef9355e3beab063703aa9dab15afd25f0667c341310c1e5274bb1d0da18" dependencies = [ "libc", "windows-sys 0.59.0", @@ -893,9 +893,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73fea8450eea4bac3940448fb7ae50d91f034f941199fcd9d909a5a07aa455f0" +checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4" dependencies = [ "cfg-if", "js-sys", @@ -1047,9 +1047,9 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" [[package]] name = "jiff" -version = "0.2.10" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a064218214dc6a10fbae5ec5fa888d80c45d611aba169222fc272072bf7aef6" +checksum = "a194df1107f33c79f4f93d02c80798520551949d59dfad22b6157048a88cca93" dependencies = [ "jiff-static", "log", @@ -1060,9 +1060,9 @@ dependencies = [ [[package]] name = "jiff-static" -version = "0.2.10" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "199b7932d97e325aff3a7030e141eafe7f2c6268e1d1b24859b753a627f45254" +checksum = "6c6e1db7ed32c6c71b759497fae34bf7933636f75a251b9e736555da426f6442" dependencies = [ "proc-macro2", "quote", @@ -1075,7 +1075,7 @@ version = "0.1.33" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38f262f097c174adebe41eb73d66ae9c06b2844fb0da69969647bbddd9b0538a" dependencies = [ - "getrandom 0.3.2", + "getrandom 0.3.3", "libc", ] @@ -1109,12 +1109,12 @@ checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa" [[package]] name = "libloading" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34" +checksum = "6a793df0d7afeac54f95b471d3af7f0d4fb975699f972341a4b76988d49cdf0c" dependencies = [ "cfg-if", - "windows-targets", + "windows-targets 0.53.0", ] [[package]] @@ -1229,6 +1229,12 @@ version = "1.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" +[[package]] +name = "once_cell_polyfill" +version = "1.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad" + [[package]] name = "option-ext" version = "0.2.0" @@ -1385,7 +1391,7 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38" dependencies = [ - "getrandom 0.3.2", + "getrandom 0.3.3", ] [[package]] @@ -1450,9 +1456,9 @@ checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "rgb-core" -version = "0.11.1-alpha.2+unreviewed" +version = "0.11.1-alpha.3+unreviewed" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eba005ded4929a2d7a6e4cb97103858b9e0d47e9fe7a378ca2b2f1595451d659" +checksum = "9ee6739c9704151ca82f9346f73b1d80189637c8291565866fee6859511e2008" dependencies = [ "aluvm", "amplify", @@ -1460,7 +1466,7 @@ dependencies = [ "bp-core", "chrono", "commit_verify", - "getrandom 0.3.2", + "getrandom 0.3.3", "mime", "secp256k1", "serde", @@ -1472,9 +1478,9 @@ dependencies = [ [[package]] name = "rgb-invoice" -version = "0.11.1-alpha.2+unreviewed" +version = "0.11.1-alpha.3+unreviewed" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c74a3dc19886db08f3492634b3a2b978cf722b0014a8c5d6af46a627c1674179" +checksum = "a53ec3ab57e6727c702b53afb4310b4832e6e93100e6afb52a20b3d9dd0cf7f2" dependencies = [ "amplify", "baid64", @@ -1493,14 +1499,14 @@ dependencies = [ [[package]] name = "rgb-psbt" -version = "0.11.1-alpha.2+unreviewed" +version = "0.11.1-alpha.3+unreviewed" dependencies = [ "amplify", "baid64", "bp-core", "bp-std", "commit_verify", - "getrandom 0.3.2", + "getrandom 0.3.3", "rand 0.9.1", "rgb-std", "strict_encoding", @@ -1510,7 +1516,7 @@ dependencies = [ [[package]] name = "rgb-runtime" -version = "0.11.1-alpha.2+unreviewed" +version = "0.11.1-alpha.3+unreviewed" dependencies = [ "amplify", "baid64", @@ -1519,7 +1525,7 @@ dependencies = [ "bp-wallet", "chrono", "commit_verify", - "getrandom 0.3.2", + "getrandom 0.3.3", "indexmap 2.9.0", "log", "nonasync", @@ -1535,9 +1541,9 @@ dependencies = [ [[package]] name = "rgb-std" -version = "0.11.1-alpha.2+unreviewed" +version = "0.11.1-alpha.3+unreviewed" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7484c24898614862d547316b631ac8c6bb34f401a56f32249b9d1dd4677dc739" +checksum = "df04db909a75c8e4090091cfa7ca2b67f5ccec7ee26e847d377cbc1a1bfc0a49" dependencies = [ "aluvm", "amplify", @@ -1549,7 +1555,7 @@ dependencies = [ "bp-esplora", "chrono", "commit_verify", - "getrandom 0.3.2", + "getrandom 0.3.3", "indexmap 2.9.0", "nonasync", "rand 0.9.1", @@ -1563,7 +1569,7 @@ dependencies = [ [[package]] name = "rgb-wallet" -version = "0.11.1-alpha.2+unreviewed" +version = "0.11.1-alpha.3+unreviewed" dependencies = [ "amplify", "baid64", @@ -1639,24 +1645,27 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.26" +version = "0.23.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df51b5869f3a441595eac5e8ff14d486ff285f7b8c0df8770e49c3b56351f0f0" +checksum = "730944ca083c1c233a75c09f199e973ca499344a2b7ba9e755c457e86fb4a321" dependencies = [ "aws-lc-rs", "log", "once_cell", "rustls-pki-types", - "rustls-webpki 0.103.1", + "rustls-webpki 0.103.3", "subtle", "zeroize", ] [[package]] name = "rustls-pki-types" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "917ce264624a4b4db1c364dcc35bfca9ded014d0a958cd47ad3e960e988ea51c" +checksum = "229a4a4c221013e7e1f1a043678c5cc39fe5171437c88fb47151a21e6f5b5c79" +dependencies = [ + "zeroize", +] [[package]] name = "rustls-webpki" @@ -1670,9 +1679,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.103.1" +version = "0.103.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fef8b8769aaccf73098557a87cd1816b4f9c7c16811c9c77142aa695c16f2c03" +checksum = "e4a72fe2bcf7a6ac6fd7d0b9e5cb68aeb7d4c0a0271730218b3e92d43b4eb435" dependencies = [ "aws-lc-rs", "ring", @@ -1682,9 +1691,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.20" +version = "1.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2" +checksum = "8a0d197bd2c9dc6e53b84da9556a69ba4cdfab8619eb41a8bd1cc2027a0f6b1d" [[package]] name = "ryu" @@ -2246,9 +2255,18 @@ checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" [[package]] name = "webpki-roots" -version = "0.26.10" +version = "0.26.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "521bc38abb08001b01866da9f51eb7c5d647a19260e00054a8c7fd5f9e57f7a9" +dependencies = [ + "webpki-roots 1.0.0", +] + +[[package]] +name = "webpki-roots" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37493cadf42a2a939ed404698ded7fb378bf301b5011f973361779a3a74f8c93" +checksum = "2853738d1cc4f2da3a225c18ec6c3721abb31961096e9dbf5ab35fa88b19cfdb" dependencies = [ "rustls-pki-types", ] @@ -2298,9 +2316,9 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows-core" -version = "0.61.0" +version = "0.61.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4763c1de310c86d75a878046489e2e5ba02c649d185f21c67d4cf8a56d098980" +checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3" dependencies = [ "windows-implement", "windows-interface", @@ -2339,18 +2357,18 @@ checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38" [[package]] name = "windows-result" -version = "0.3.2" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c64fd11a4fd95df68efcfee5f44a294fe71b8bc6a91993e2791938abcc712252" +checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6" dependencies = [ "windows-link", ] [[package]] name = "windows-strings" -version = "0.4.0" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a2ba9642430ee452d5a7aa78d72907ebe8cfda358e8cb7918a2050581322f97" +checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57" dependencies = [ "windows-link", ] @@ -2361,7 +2379,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets", + "windows-targets 0.52.6", ] [[package]] @@ -2370,7 +2388,7 @@ version = "0.59.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" dependencies = [ - "windows-targets", + "windows-targets 0.52.6", ] [[package]] @@ -2379,14 +2397,30 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_gnullvm", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm 0.52.6", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", +] + +[[package]] +name = "windows-targets" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1e4c7e8ceaaf9cb7d7507c974735728ab453b67ef8f18febdd7c11fe59dca8b" +dependencies = [ + "windows_aarch64_gnullvm 0.53.0", + "windows_aarch64_msvc 0.53.0", + "windows_i686_gnu 0.53.0", + "windows_i686_gnullvm 0.53.0", + "windows_i686_msvc 0.53.0", + "windows_x86_64_gnu 0.53.0", + "windows_x86_64_gnullvm 0.53.0", + "windows_x86_64_msvc 0.53.0", ] [[package]] @@ -2395,53 +2429,101 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764" + [[package]] name = "windows_aarch64_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" +[[package]] +name = "windows_aarch64_msvc" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c" + [[package]] name = "windows_i686_gnu" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" +[[package]] +name = "windows_i686_gnu" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3" + [[package]] name = "windows_i686_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" +[[package]] +name = "windows_i686_gnullvm" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11" + [[package]] name = "windows_i686_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" +[[package]] +name = "windows_i686_msvc" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d" + [[package]] name = "windows_x86_64_gnu" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" +[[package]] +name = "windows_x86_64_gnu" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba" + [[package]] name = "windows_x86_64_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57" + [[package]] name = "windows_x86_64_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" +[[package]] +name = "windows_x86_64_msvc" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486" + [[package]] name = "winnow" -version = "0.7.8" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e27d6ad3dac991091e4d35de9ba2d2d00647c5d0fc26c5496dee55984ae111b" +checksum = "c06928c8748d81b05c9be96aad92e1b6ff01833332f281e8cfca3be4b35fc9ec" dependencies = [ "memchr", ] diff --git a/Cargo.toml b/Cargo.toml index f2acec1..a7eb7ff 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,7 +10,7 @@ default-members = [ ] [workspace.package] -version = "0.11.1-alpha.2+unreviewed" +version = "0.11.1-alpha.3+unreviewed" keywords = ["bitcoin", "lightning", "rgb", "smart-contracts", "lnp-bp"] categories = ["cryptography::cryptocurrencies"] authors = ["Dr Maxim Orlovsky "] @@ -30,8 +30,8 @@ commit_verify = "0.11.1-alpha.2" bp-core = "0.11.1-alpha.2" bp-std = { version = "0.11.1-alpha.2", features = ["client-side-validation"] } bp-wallet = { version = "0.11.1-alpha.2" } -rgb-std = { version = "0.11.1-alpha.2" } -rgb-psbt = { version = "0.11.1-alpha.2", path = "psbt" } +rgb-std = { version = "0.11.1-alpha.3" } +rgb-psbt = { version = "0.11.1-alpha.3", path = "psbt" } indexmap = "2.4.0" chrono = "0.4.38" serde_crate = { package = "serde", version = "1", features = ["derive"] } diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 31a3b3c..99e727a 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -24,7 +24,7 @@ commit_verify = { workspace = true } bp-std = { workspace = true, features = ["serde"] } bp-wallet = { workspace = true, features = ["cli"] } rgb-std = { workspace = true, features = ["serde"] } -rgb-runtime = { version = "0.11.1-alpha.2", path = "..", features = ["electrum_blocking", "esplora_blocking", "mempool_blocking", "log", "serde", "fs", "cli"] } +rgb-runtime = { version = "0.11.1-alpha.3", path = "..", features = ["electrum_blocking", "esplora_blocking", "mempool_blocking", "log", "serde", "fs", "cli"] } log = { workspace = true } env_logger = "0.11.5" clap = { version = "4.5.17", features = ["derive", "env"] } diff --git a/cli/src/args.rs b/cli/src/args.rs index 224cfcf..d4ad647 100644 --- a/cli/src/args.rs +++ b/cli/src/args.rs @@ -19,7 +19,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#![allow(clippy::needless_update)] // Required by From derive macro +#![allow(clippy::needless_update, clippy::result_large_err)] // Required by From derive macro use std::fs; use std::io::ErrorKind; @@ -163,17 +163,16 @@ impl RgbArgs { ) -> Result>, WalletError> { let stock = self.rgb_stock()?; self.rgb_wallet_from_stock(config, stock) - .map_err(|(_, err)| err) } pub fn rgb_wallet_from_stock( &self, config: &Config, stock: Stock, - ) -> Result>, (Stock, WalletError)> { + ) -> Result>, WalletError> { let wallet = match self.inner.bp_wallet::(config) { Ok(wallet) => wallet, - Err(e) => return Err((stock, e.into())), + Err(e) => return Err(e.into()), }; let wallet = RgbWallet::new(stock, wallet); diff --git a/cli/src/command.rs b/cli/src/command.rs index b897e33..b8d5845 100644 --- a/cli/src/command.rs +++ b/cli/src/command.rs @@ -27,12 +27,12 @@ use std::str::FromStr; use amplify::confinement::{SmallOrdMap, U16 as MAX16}; use baid64::DisplayBaid64; use bpstd::psbt::{Psbt, PsbtVer}; -use bpstd::seals::SecretSeal; use bpstd::{Sats, Txid, XpubDerivable}; use bpwallet::cli::{BpCommand, Config, Exec}; use bpwallet::Wallet; use rgb::containers::{ - BuilderSeal, ConsignmentExt, ContainerVer, Contract, FileContent, Transfer, UniversalFile, + BuilderSeal, ConsignmentExt, ContainerVer, Contract, FileContent, SecretSeals, Transfer, + UniversalFile, }; use rgb::invoice::{Beneficiary, Pay2Vout, RgbInvoice, RgbInvoiceBuilder, XChainNet}; use rgb::persistence::{MemContract, StashReadProvider, Stock}; @@ -410,7 +410,7 @@ impl Exec for RgbArgs { eprintln!("- script library {}", lib.id()); } eprintln!("- strict types: {} definitions", kit.types.len()); - let kit = kit.validate().map_err(|(status, _)| status.to_string())?; + let kit = kit.validate().map_err(|status| status.to_string())?; stock.import_kit(kit)?; eprintln!("Kit is imported"); } @@ -421,7 +421,7 @@ impl Exec for RgbArgs { eprint!("- validating the contract {} ... ", contract.contract_id()); let contract = contract .validate(&resolver, self.chain_net(), None) - .map_err(|(status, _)| { + .map_err(|status| { eprintln!("failure"); status.to_string() })?; @@ -461,11 +461,11 @@ impl Exec for RgbArgs { Command::State { contract_id, all } => { let stock_path = self.general.base_dir(); - let stock = self.load_stock(stock_path)?; + let stock = self.load_stock(stock_path.clone())?; enum StockOrWallet { - Stock(Stock), - Wallet(RgbWallet>), + Stock(Box), + Wallet(Box>>), } impl StockOrWallet { fn stock(&self) -> &Stock { @@ -477,8 +477,8 @@ impl Exec for RgbArgs { } let stock_wallet = match self.rgb_wallet_from_stock(&config, stock) { - Ok(wallet) => StockOrWallet::Wallet(wallet), - Err((stock, _)) => StockOrWallet::Stock(stock), + Ok(wallet) => StockOrWallet::Wallet(Box::new(wallet)), + Err(_) => StockOrWallet::Stock(Box::new(self.load_stock(stock_path)?)), }; let filter = match stock_wallet { @@ -862,7 +862,7 @@ impl Exec for RgbArgs { pub struct ConsignmentInspection { version: ContainerVer, transfer: bool, - terminals: SmallOrdMap, + terminals: SmallOrdMap, } let content = UniversalFile::load_file(file)?; @@ -1015,7 +1015,7 @@ impl Exec for RgbArgs { resolver.add_consignment_txes(&consignment); let status = match consignment.validate(&resolver, self.chain_net(), None) { Ok(consignment) => consignment.into_validation_status(), - Err((status, _)) => status, + Err(status) => status, }; if status.validity() == Validity::Valid { eprintln!("The provided consignment is valid") @@ -1029,9 +1029,7 @@ impl Exec for RgbArgs { let mut resolver = self.resolver()?; let transfer = Transfer::load_file(file)?; resolver.add_consignment_txes(&transfer); - let valid = transfer - .validate(&resolver, self.chain_net(), None) - .map_err(|(status, _)| status)?; + let valid = transfer.validate(&resolver, self.chain_net(), None)?; stock.accept_transfer(valid, &resolver)?; eprintln!("Transfer accepted into the stash"); } diff --git a/cli/src/main.rs b/cli/src/main.rs index a9c0122..75955b3 100644 --- a/cli/src/main.rs +++ b/cli/src/main.rs @@ -19,6 +19,8 @@ // See the License for the specific language governing permissions and // limitations under the License. +#![allow(clippy::result_large_err)] + #[macro_use] extern crate amplify; #[macro_use] diff --git a/src/pay.rs b/src/pay.rs index 395dd22..38b85ad 100644 --- a/src/pay.rs +++ b/src/pay.rs @@ -544,9 +544,9 @@ where Self::Descr: DescriptorRgb let (beneficiary1, beneficiary2) = match invoice.beneficiary.into_inner() { Beneficiary::WitnessVout(_, _) => { let seal = ExplicitSeal::new(Outpoint::new(witness_id, beneficiary_vout.unwrap())); - (None, vec![seal]) + (vec![], vec![seal]) } - Beneficiary::BlindedSeal(seal) => (Some(seal), vec![]), + Beneficiary::BlindedSeal(seal) => (vec![seal], vec![]), }; struct FasciaResolver {