From b37cdba13786091e6e153add0c2beda9c6650ea1 Mon Sep 17 00:00:00 2001 From: Dr Maxim Orlovsky Date: Sat, 20 Jan 2024 17:06:41 +0100 Subject: [PATCH 1/7] derive: add constant constructor for Keychain --- derive/src/derive.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/derive/src/derive.rs b/derive/src/derive.rs index 0d3ad5f..81da782 100644 --- a/derive/src/derive.rs +++ b/derive/src/derive.rs @@ -60,6 +60,8 @@ impl From for DerivationIndex { impl Keychain { pub const OUTER: Self = Keychain(0); pub const INNER: Self = Keychain(1); + + pub const fn with(idx: u8) -> Self { Keychain(idx) } } impl IdxBase for Keychain { From 20605f1cfac51c197806580884bcb26719439bcf Mon Sep 17 00:00:00 2001 From: cosminmart Date: Sun, 21 Jan 2024 22:36:57 +0800 Subject: [PATCH 2/7] test: test_xpub_derivable_from_str_with_normal_index --- derive/src/xpub.rs | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/derive/src/xpub.rs b/derive/src/xpub.rs index e7372ab..37909ca 100644 --- a/derive/src/xpub.rs +++ b/derive/src/xpub.rs @@ -620,9 +620,23 @@ mod test { use super::*; #[test] - fn display_from_str() { + fn test_xpub_derivable_from_str_with_hardened_index() { let s = "[643a7adc/86h/1h/0h]tpubDCNiWHaiSkgnQjuhsg9kjwaUzaxQjUcmhagvYzqQ3TYJTgFGJstVaqnu4yhtFktBhCVFmBNLQ5sN53qKzZbMksm3XEyGJsEhQPfVZdWmTE2/<0;1>/*"; let xpub = XpubDerivable::from_str(s).unwrap(); assert_eq!(s, xpub.to_string()); } + + #[test] + fn test_xpub_derivable_from_str_with_normal_index() { + let s = "[643a7adc/86'/1'/0']tpubDCNiWHaiSkgnQjuhsg9kjwaUzaxQjUcmhagvYzqQ3TYJTgFGJstVaqnu4yhtFktBhCVFmBNLQ5sN53qKzZbMksm3XEyGJsEhQPfVZdWmTE2/<0;1>/*"; + let xpub = XpubDerivable::from_str(s).unwrap(); + assert_eq!(s, format!("{xpub:#}")); + } + + #[test] + fn test_xpub_derivable_from_str_with_normal_index_rgb_keychain() { + let s = "[643a7adc/86'/1'/0']tpubDCNiWHaiSkgnQjuhsg9kjwaUzaxQjUcmhagvYzqQ3TYJTgFGJstVaqnu4yhtFktBhCVFmBNLQ5sN53qKzZbMksm3XEyGJsEhQPfVZdWmTE2/<0;1;9;10>/*"; + let xpub = XpubDerivable::from_str(s).unwrap(); + assert_eq!(s, format!("{xpub:#}")); + } } From 115ae2aea6db408978e621a1cf452c7ad1a2feef Mon Sep 17 00:00:00 2001 From: Dr Maxim Orlovsky Date: Sun, 4 Feb 2024 13:17:52 +0100 Subject: [PATCH 3/7] chore: update dependencies --- Cargo.lock | 230 ++++++++++++++++++++++++------------------ Cargo.toml | 13 ++- psbt/src/csval/dbc.rs | 10 +- psbt/src/csval/mpc.rs | 4 +- psbt/src/maps.rs | 2 +- 5 files changed, 148 insertions(+), 111 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ffd9f25..95feba2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "amplify" -version = "4.5.0" +version = "4.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8629db306c0bbeb0a402e2918bdcf0026b5ddb24c46460f3bf5410b350d98710" +checksum = "f8dd50780fa78a67bae725dd164bc993500656112815a9301fd8b797e9006803" dependencies = [ "amplify_apfloat", "amplify_derive", @@ -126,9 +126,9 @@ checksum = "6107fe1be6682a68940da878d9e9f5e90ca5745b3dec9fd1bb393c8777d4f581" [[package]] name = "base64" -version = "0.21.5" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] name = "base85" @@ -192,8 +192,7 @@ dependencies = [ [[package]] name = "bp-consensus" version = "0.11.0-beta.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190ac89a2a3c79d5bfb677f48e5393691832c540973341831572edaffdce0881" +source = "git+https://github.com/BP-WG/bp-core?branch=v0.11#e5da72f8ffae49ccca6a9dbabf24f961cb619761" dependencies = [ "amplify", "chrono", @@ -206,23 +205,23 @@ dependencies = [ [[package]] name = "bp-core" version = "0.11.0-beta.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69269d27e32d784e37f7ca7cdf964fe5e30c5bff1ca2e229a118c84c8efdd179" +source = "git+https://github.com/BP-WG/bp-core?branch=v0.11#e5da72f8ffae49ccca6a9dbabf24f961cb619761" dependencies = [ "amplify", "bp-consensus", "bp-dbc", "bp-seals", "commit_verify", + "getrandom", "single_use_seals", "strict_encoding", + "wasm-bindgen", ] [[package]] name = "bp-dbc" version = "0.11.0-beta.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cef9a98c7ae4f1bb333ad8e55c9d8a91f071c347d35b62e19959faa07572b11" +source = "git+https://github.com/BP-WG/bp-core?branch=v0.11#e5da72f8ffae49ccca6a9dbabf24f961cb619761" dependencies = [ "amplify", "base85", @@ -259,8 +258,7 @@ dependencies = [ [[package]] name = "bp-seals" version = "0.11.0-beta.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d211bb77e320abf4bba6c272fc85d73e5203140ca39e299271f4714d8b6029fe" +source = "git+https://github.com/BP-WG/bp-core?branch=v0.11#e5da72f8ffae49ccca6a9dbabf24f961cb619761" dependencies = [ "amplify", "baid58", @@ -315,9 +313,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.31" +version = "0.4.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +checksum = "9f13690e35a5e4ace198e7beea2895d29f3a9cc55015fcebe6336bd2010af9eb" dependencies = [ "android-tzdata", "iana-time-zone", @@ -329,9 +327,8 @@ dependencies = [ [[package]] name = "commit_encoding_derive" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00033f14d67c4169d588f085ea2faeb7b610cf03a74d42ea09eeba31abef2047" +version = "0.11.0-beta.3" +source = "git+https://github.com/LNP-BP/client_side_validation?branch=v0.11#61b0f4969da8a69cef438de6b3085344c5626ec2" dependencies = [ "amplify", "amplify_syn", @@ -343,8 +340,7 @@ dependencies = [ [[package]] name = "commit_verify" version = "0.11.0-beta.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85e001679b9be6a5df24facdae179e6ba1cffb503c875d691eac024db8d0f8d1" +source = "git+https://github.com/LNP-BP/client_side_validation?branch=v0.11#61b0f4969da8a69cef438de6b3085344c5626ec2" dependencies = [ "amplify", "commit_encoding_derive", @@ -352,6 +348,7 @@ dependencies = [ "ripemd", "sha2", "strict_encoding", + "strict_types", ] [[package]] @@ -368,13 +365,19 @@ checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "cpufeatures" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" dependencies = [ "libc", ] +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + [[package]] name = "crypto-common" version = "0.1.6" @@ -423,13 +426,24 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" dependencies = [ "cfg-if", + "js-sys", "libc", "wasi", + "wasm-bindgen", +] + +[[package]] +name = "half" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02b4af3693f1b705df946e9fe5631932443781d0aabb423b62fcd4d73f6d2fd0" +dependencies = [ + "crunchy", ] [[package]] @@ -452,9 +466,9 @@ checksum = "30ed443af458ccb6d81c1e7e661545f94d3176752fb1df2f543b902a1e0f51e2" [[package]] name = "iana-time-zone" -version = "0.1.58" +version = "0.1.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -475,9 +489,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.1.0" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +checksum = "824b2ae422412366ba479e8111fd301f7b5faece8149317bb81925979a53f520" dependencies = [ "equivalent", "hashbrown", @@ -492,9 +506,9 @@ checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" [[package]] name = "js-sys" -version = "0.3.66" +version = "0.3.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" +checksum = "9a1d36f1235bc969acba30b7f5990b864423a6068a10f7c90ae8f0112e3a59d1" dependencies = [ "wasm-bindgen", ] @@ -507,9 +521,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.151" +version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "log" @@ -562,9 +576,9 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro2" -version = "1.0.71" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75cb1540fadbd5b8fbccc4dddad2734eba435053f725621c070711a14bb5f4b8" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] @@ -587,9 +601,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.33" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] @@ -641,9 +655,9 @@ checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" [[package]] name = "secp256k1" -version = "0.28.0" +version = "0.28.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2acea373acb8c21ecb5a23741452acd2593ed44ee3d343e72baaa143bc89d0d5" +checksum = "d24b59d129cdadea20aea4fb2352fa053712e5d713eee47d700cd4b2bc002f10" dependencies = [ "rand", "secp256k1-sys", @@ -652,38 +666,38 @@ dependencies = [ [[package]] name = "secp256k1-sys" -version = "0.9.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dd97a086ec737e30053fd5c46f097465d25bb81dd3608825f65298c4c98be83" +checksum = "e5d1746aae42c19d583c3c1a8c646bfad910498e2051c551a7f2e3c0c9fbb7eb" dependencies = [ "cc", ] [[package]] name = "serde" -version = "1.0.193" +version = "1.0.196" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" +checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.193" +version = "1.0.196" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" +checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.48", ] [[package]] name = "serde_json" -version = "1.0.108" +version = "1.0.113" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" +checksum = "69801b70b1c3dac963ecb03a364ba0ceda9cf60c71cfe475e99864759c8b8a79" dependencies = [ "itoa", "ryu", @@ -711,9 +725,9 @@ dependencies = [ [[package]] name = "serde_yaml" -version = "0.9.29" +version = "0.9.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a15e0ef66bf939a7c890a0bf6d5a733c70202225f9888a89ed5c62298b019129" +checksum = "adf8a49373e98a4c5f0ceb5d05aa7c648d75f63774981ed95b7c7443bbd50c6e" dependencies = [ "indexmap", "itoa", @@ -744,19 +758,18 @@ dependencies = [ [[package]] name = "strict_encoding" -version = "2.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa76decc8ac190a56ba7857c023b69ed52b781ed974c5a181eac62cdbfc99521" +version = "2.7.0" +source = "git+https://github.com/strict-types/strict-encoding?branch=refactor/io#f95dbcbf8b01a4ea92dea92bd6492e9ae8c73c67" dependencies = [ "amplify", + "half", "strict_encoding_derive", ] [[package]] name = "strict_encoding_derive" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37064ec285e2a633465eb525c8698eea51373dee889fe310e0d32df8343e7f4f" +version = "2.7.0" +source = "git+https://github.com/strict-types/strict-encoding?branch=refactor/io#f95dbcbf8b01a4ea92dea92bd6492e9ae8c73c67" dependencies = [ "amplify_syn", "heck", @@ -765,6 +778,20 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "strict_types" +version = "2.7.0" +source = "git+https://github.com/strict-types/strict-types?branch=refactor/io#ada11c04ab6e6483e769885f2fe93eae0bd42f85" +dependencies = [ + "amplify", + "baid58", + "half", + "indexmap", + "sha2", + "strict_encoding", + "vesper", +] + [[package]] name = "stringly_conversions" version = "0.1.1" @@ -788,9 +815,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.43" +version = "2.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee659fb5f3d355364e1f3e5bc10fb82068efbf824a1e9d1c9504244a6469ad53" +checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" dependencies = [ "proc-macro2", "quote", @@ -799,29 +826,29 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.52" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83a48fd946b02c0a526b2e9481c8e2a17755e47039164a86c4070446e3a4614d" +checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.52" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7fbe9b594d6568a6a1443250a7e67d80b74e1e96f6d1715e1e21cc1888291d3" +checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.48", ] [[package]] name = "toml" -version = "0.8.8" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" +checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d" dependencies = [ "serde", "serde_spanned", @@ -840,9 +867,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.21.0" +version = "0.20.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" +checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" dependencies = [ "indexmap", "serde", @@ -875,6 +902,15 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +[[package]] +name = "vesper" +version = "0.1.0" +source = "git+https://github.com/UBIDECO/vesper#18107cbbdffeb91d992dc7c76da0640aea152e8f" +dependencies = [ + "amplify", + "strict_encoding", +] + [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -883,9 +919,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.89" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" +checksum = "b1223296a201415c7fad14792dbefaace9bd52b62d33453ade1c5b5f07555406" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -893,24 +929,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.89" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" +checksum = "fcdc935b63408d58a32f8cc9738a0bffd8f05cc7c002086c6ef20b7312ad9dcd" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.48", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.89" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" +checksum = "3e4c238561b2d428924c49815533a8b9121c664599558a5d9ec51f8a1740a999" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -918,37 +954,37 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.89" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" +checksum = "bae1abb6806dc1ad9e560ed242107c0f6c84335f1749dd4e8ddb012ebd5e25a7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.48", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.89" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" +checksum = "4d91413b1c31d7539ba5ef2451af3f0b833a005eb27a631cec32bc0635a8602b" [[package]] name = "windows-core" -version = "0.51.1" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ "windows-targets", ] [[package]] name = "windows-targets" -version = "0.48.5" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" dependencies = [ "windows_aarch64_gnullvm", "windows_aarch64_msvc", @@ -961,51 +997,51 @@ dependencies = [ [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.5" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" [[package]] name = "windows_aarch64_msvc" -version = "0.48.5" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" [[package]] name = "windows_i686_gnu" -version = "0.48.5" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" [[package]] name = "windows_i686_msvc" -version = "0.48.5" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" [[package]] name = "windows_x86_64_gnu" -version = "0.48.5" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.5" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" [[package]] name = "windows_x86_64_msvc" -version = "0.48.5" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" [[package]] name = "winnow" -version = "0.5.31" +version = "0.5.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97a4882e6b134d6c28953a387571f1acdd3496830d5e36c5e3a1075580ea641c" +checksum = "a7cad8365489051ae9f054164e459304af2e7e9bb407c958076c8bf4aef52da5" dependencies = [ "memchr", ] diff --git a/Cargo.toml b/Cargo.toml index 4258076..beb4be2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,11 +14,11 @@ edition = "2021" license = "Apache-2.0" [workspace.dependencies] -amplify = "4.5.0" +amplify = "4.5.1" bech32 = "0.9.1" bitcoin_hashes = "0.13.0" # TODO: Remove and replace with commit_verify commit_verify = "0.11.0-beta.3" -strict_encoding = "2.6.2" +strict_encoding = "2.7.0" bp-consensus = "0.11.0-beta.3" bp-core = { version = "0.11.0-beta.3" } bp-invoice = { version = "0.11.0-beta.3", path = "invoice" } @@ -61,3 +61,12 @@ all = ["client-side-validation", "strict_encoding", "serde"] strict_encoding = ["psbt/strict_encoding"] client-side-validation = ["bp-core", "psbt/client-side-validation"] serde = ["serde_crate", "bp-consensus/serde", "bp-invoice/serde", "bp-derive/serde", "descriptors/serde", "psbt/serde"] + +[patch.crates-io] +strict_encoding = { git = "https://github.com/strict-types/strict-encoding", branch = "refactor/io" } +strict_types = { git = "https://github.com/strict-types/strict-types", branch = "refactor/io" } +commit_verify = { git = "https://github.com/LNP-BP/client_side_validation", branch = "v0.11" } +bp-consensus = { git = "https://github.com/BP-WG/bp-core", branch = "v0.11" } +bp-dbc = { git = "https://github.com/BP-WG/bp-core", branch = "v0.11" } +bp-seals = { git = "https://github.com/BP-WG/bp-core", branch = "v0.11" } +bp-core = { git = "https://github.com/BP-WG/bp-core", branch = "v0.11" } diff --git a/psbt/src/csval/dbc.rs b/psbt/src/csval/dbc.rs index 0dc0605..64c098d 100644 --- a/psbt/src/csval/dbc.rs +++ b/psbt/src/csval/dbc.rs @@ -80,15 +80,7 @@ impl Psbt { let output = self.dbc_output_mut::().ok_or(DbcPsbtError::NoProperOutput(D::METHOD))?; let (mpc_proof, dbc_proof) = D::dbc_commit(output)?; - - let anchor = Anchor { - txid: self.txid(), - mpc_proof, - dbc_proof, - _method: default!(), - }; - - Ok(anchor) + Ok(Anchor::new(self.txid(), mpc_proof, dbc_proof)) } } diff --git a/psbt/src/csval/mpc.rs b/psbt/src/csval/mpc.rs index 9e6c13e..7bcefe8 100644 --- a/psbt/src/csval/mpc.rs +++ b/psbt/src/csval/mpc.rs @@ -25,7 +25,7 @@ use amplify::confinement::{Confined, U32}; use amplify::num::u5; use amplify::{confinement, FromSliceError}; use commit_verify::mpc::{self, Commitment, Message, ProtocolId, MPC_MINIMAL_DEPTH}; -use commit_verify::{CommitmentId, TryCommitVerify}; +use commit_verify::{CommitId, TryCommitVerify}; use derive::ByteStr; use strict_encoding::StrictSerialize; @@ -271,7 +271,7 @@ impl Output { let merkle_tree = mpc::MerkleTree::try_commit(&source)?; let entropy = merkle_tree.entropy(); self.set_mpc_entropy(entropy)?; - let commitment = merkle_tree.commitment_id(); + let commitment = merkle_tree.commit_id(); let mpc_proof = mpc::MerkleBlock::from(merkle_tree); self.push_proprietary(PropKey::mpc_commitment(), commitment) diff --git a/psbt/src/maps.rs b/psbt/src/maps.rs index fad31db..ea25e41 100644 --- a/psbt/src/maps.rs +++ b/psbt/src/maps.rs @@ -240,7 +240,7 @@ pub trait KeyMap: Sized { Ok(()) } fn remove_proprietary(&mut self, key: &PropKey) -> Option { - self._proprietary_map_mut().remove(key) + self._proprietary_map_mut().shift_remove(key) } #[doc(hidden)] From 5fc1209336c1684fd1c1373ad366b6497adacc8b Mon Sep 17 00:00:00 2001 From: Dr Maxim Orlovsky Date: Sun, 4 Feb 2024 13:20:34 +0100 Subject: [PATCH 4/7] chore: bump MSRV due to TOML dependency in amplify crate --- .github/workflows/build.yml | 2 +- Cargo.toml | 2 +- MANIFEST.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0eab3ac..09ea0ec 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -72,7 +72,7 @@ jobs: strategy: fail-fast: false matrix: - toolchain: [ nightly, beta, stable, 1.67.0 ] + toolchain: [ nightly, beta, stable, 1.69.0 ] steps: - uses: actions/checkout@v2 - name: Install rust ${{ matrix.toolchain }} diff --git a/Cargo.toml b/Cargo.toml index beb4be2..dd15a47 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,7 +9,7 @@ categories = ["cryptography::cryptocurrencies"] authors = ["Dr Maxim Orlovsky "] homepage = "https://lnp-bp.org" repository = "https://github.com/BP-WG/bp-wallet" -rust-version = "1.67" # Due to strict encoding library +rust-version = "1.69.0" # Due to TOML dependency in amplify crate edition = "2021" license = "Apache-2.0" diff --git a/MANIFEST.yml b/MANIFEST.yml index d7a84ba..3620a8c 100644 --- a/MANIFEST.yml +++ b/MANIFEST.yml @@ -3,7 +3,7 @@ Type: Library Kind: Free software License: Apache-2.0 Language: Rust -Compiler: 1.67 +Compiler: 1.69 Author: Maxim Orlovsky Maintained: LNP/BP Standards Association, Switzerland Maintainers: From 82cf5b1a2ab48ed1ca9be242769978d77b43775b Mon Sep 17 00:00:00 2001 From: Dr Maxim Orlovsky Date: Sun, 4 Feb 2024 13:21:26 +0100 Subject: [PATCH 5/7] chore: update years --- LICENSE | 4 ++-- derive/src/derive.rs | 6 +++--- derive/src/index.rs | 6 +++--- derive/src/lib.rs | 6 +++--- derive/src/path.rs | 6 +++--- derive/src/taptree.rs | 6 +++--- derive/src/xpub.rs | 6 +++--- descriptors/src/descriptor.rs | 6 +++--- descriptors/src/factory.rs | 6 +++--- descriptors/src/lib.rs | 6 +++--- descriptors/src/multisig.rs | 6 +++--- descriptors/src/segwit.rs | 6 +++--- descriptors/src/taproot.rs | 6 +++--- invoice/src/address.rs | 6 +++--- invoice/src/lib.rs | 6 +++--- invoice/src/network.rs | 6 +++--- psbt/src/coders.rs | 6 +++--- psbt/src/csval/dbc.rs | 4 ++-- psbt/src/csval/mod.rs | 4 ++-- psbt/src/csval/mpc.rs | 4 ++-- psbt/src/csval/opret.rs | 4 ++-- psbt/src/csval/tapret.rs | 4 ++-- psbt/src/data.rs | 6 +++--- psbt/src/keys.rs | 6 +++--- psbt/src/lib.rs | 6 +++--- psbt/src/maps.rs | 6 +++--- psbt/tests/bip174.rs | 6 +++--- psbt/tests/bip370.rs | 6 +++--- psbt/tests/bip371.rs | 6 +++--- src/lib.rs | 6 +++--- src/rbf.rs | 6 +++--- 31 files changed, 87 insertions(+), 87 deletions(-) diff --git a/LICENSE b/LICENSE index e4d3074..18b79f0 100644 --- a/LICENSE +++ b/LICENSE @@ -186,8 +186,8 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2020-2023 LNP/BP Standards Association, Switzerland - Copyright 2020-2023 Dr Maxim Orlovsky + Copyright 2020-2024 LNP/BP Standards Association, Switzerland + Copyright 2020-2024 Dr Maxim Orlovsky Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/derive/src/derive.rs b/derive/src/derive.rs index 81da782..55eeae5 100644 --- a/derive/src/derive.rs +++ b/derive/src/derive.rs @@ -2,11 +2,11 @@ // // SPDX-License-Identifier: Apache-2.0 // -// Written in 2020-2023 by +// Written in 2020-2024 by // Dr Maxim Orlovsky // -// Copyright (C) 2020-2023 LNP/BP Standards Association. All rights reserved. -// Copyright (C) 2020-2023 Dr Maxim Orlovsky. All rights reserved. +// Copyright (C) 2020-2024 LNP/BP Standards Association. All rights reserved. +// Copyright (C) 2020-2024 Dr Maxim Orlovsky. All rights reserved. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/derive/src/index.rs b/derive/src/index.rs index 9f645d7..2ddca0a 100644 --- a/derive/src/index.rs +++ b/derive/src/index.rs @@ -2,11 +2,11 @@ // // SPDX-License-Identifier: Apache-2.0 // -// Written in 2020-2023 by +// Written in 2020-2024 by // Dr Maxim Orlovsky // -// Copyright (C) 2020-2023 LNP/BP Standards Association. All rights reserved. -// Copyright (C) 2020-2023 Dr Maxim Orlovsky. All rights reserved. +// Copyright (C) 2020-2024 LNP/BP Standards Association. All rights reserved. +// Copyright (C) 2020-2024 Dr Maxim Orlovsky. All rights reserved. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/derive/src/lib.rs b/derive/src/lib.rs index 81c1a07..8a9797e 100644 --- a/derive/src/lib.rs +++ b/derive/src/lib.rs @@ -2,11 +2,11 @@ // // SPDX-License-Identifier: Apache-2.0 // -// Written in 2020-2023 by +// Written in 2020-2024 by // Dr Maxim Orlovsky // -// Copyright (C) 2020-2023 LNP/BP Standards Association. All rights reserved. -// Copyright (C) 2020-2023 Dr Maxim Orlovsky. All rights reserved. +// Copyright (C) 2020-2024 LNP/BP Standards Association. All rights reserved. +// Copyright (C) 2020-2024 Dr Maxim Orlovsky. All rights reserved. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/derive/src/path.rs b/derive/src/path.rs index f4816a6..eb72ee2 100644 --- a/derive/src/path.rs +++ b/derive/src/path.rs @@ -2,11 +2,11 @@ // // SPDX-License-Identifier: Apache-2.0 // -// Written in 2020-2023 by +// Written in 2020-2024 by // Dr Maxim Orlovsky // -// Copyright (C) 2020-2023 LNP/BP Standards Association. All rights reserved. -// Copyright (C) 2020-2023 Dr Maxim Orlovsky. All rights reserved. +// Copyright (C) 2020-2024 LNP/BP Standards Association. All rights reserved. +// Copyright (C) 2020-2024 Dr Maxim Orlovsky. All rights reserved. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/derive/src/taptree.rs b/derive/src/taptree.rs index a09afac..7334055 100644 --- a/derive/src/taptree.rs +++ b/derive/src/taptree.rs @@ -2,11 +2,11 @@ // // SPDX-License-Identifier: Apache-2.0 // -// Written in 2020-2023 by +// Written in 2020-2024 by // Dr Maxim Orlovsky // -// Copyright (C) 2020-2023 LNP/BP Standards Association. All rights reserved. -// Copyright (C) 2020-2023 Dr Maxim Orlovsky. All rights reserved. +// Copyright (C) 2020-2024 LNP/BP Standards Association. All rights reserved. +// Copyright (C) 2020-2024 Dr Maxim Orlovsky. All rights reserved. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/derive/src/xpub.rs b/derive/src/xpub.rs index 37909ca..6b27a36 100644 --- a/derive/src/xpub.rs +++ b/derive/src/xpub.rs @@ -2,11 +2,11 @@ // // SPDX-License-Identifier: Apache-2.0 // -// Written in 2020-2023 by +// Written in 2020-2024 by // Dr Maxim Orlovsky // -// Copyright (C) 2020-2023 LNP/BP Standards Association. All rights reserved. -// Copyright (C) 2020-2023 Dr Maxim Orlovsky. All rights reserved. +// Copyright (C) 2020-2024 LNP/BP Standards Association. All rights reserved. +// Copyright (C) 2020-2024 Dr Maxim Orlovsky. All rights reserved. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/descriptors/src/descriptor.rs b/descriptors/src/descriptor.rs index f87bd5e..d7fa0a6 100644 --- a/descriptors/src/descriptor.rs +++ b/descriptors/src/descriptor.rs @@ -2,11 +2,11 @@ // // SPDX-License-Identifier: Apache-2.0 // -// Written in 2020-2023 by +// Written in 2020-2024 by // Dr Maxim Orlovsky // -// Copyright (C) 2020-2023 LNP/BP Standards Association. All rights reserved. -// Copyright (C) 2020-2023 Dr Maxim Orlovsky. All rights reserved. +// Copyright (C) 2020-2024 LNP/BP Standards Association. All rights reserved. +// Copyright (C) 2020-2024 Dr Maxim Orlovsky. All rights reserved. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/descriptors/src/factory.rs b/descriptors/src/factory.rs index d062cf6..6896234 100644 --- a/descriptors/src/factory.rs +++ b/descriptors/src/factory.rs @@ -2,11 +2,11 @@ // // SPDX-License-Identifier: Apache-2.0 // -// Written in 2020-2023 by +// Written in 2020-2024 by // Dr Maxim Orlovsky // -// Copyright (C) 2020-2023 LNP/BP Standards Association. All rights reserved. -// Copyright (C) 2020-2023 Dr Maxim Orlovsky. All rights reserved. +// Copyright (C) 2020-2024 LNP/BP Standards Association. All rights reserved. +// Copyright (C) 2020-2024 Dr Maxim Orlovsky. All rights reserved. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/descriptors/src/lib.rs b/descriptors/src/lib.rs index 0665e71..263cdf7 100644 --- a/descriptors/src/lib.rs +++ b/descriptors/src/lib.rs @@ -2,11 +2,11 @@ // // SPDX-License-Identifier: Apache-2.0 // -// Written in 2020-2023 by +// Written in 2020-2024 by // Dr Maxim Orlovsky // -// Copyright (C) 2020-2023 LNP/BP Standards Association. All rights reserved. -// Copyright (C) 2020-2023 Dr Maxim Orlovsky. All rights reserved. +// Copyright (C) 2020-2024 LNP/BP Standards Association. All rights reserved. +// Copyright (C) 2020-2024 Dr Maxim Orlovsky. All rights reserved. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/descriptors/src/multisig.rs b/descriptors/src/multisig.rs index fa51f7a..dc861c9 100644 --- a/descriptors/src/multisig.rs +++ b/descriptors/src/multisig.rs @@ -2,11 +2,11 @@ // // SPDX-License-Identifier: Apache-2.0 // -// Written in 2020-2023 by +// Written in 2020-2024 by // Dr Maxim Orlovsky // -// Copyright (C) 2020-2023 LNP/BP Standards Association. All rights reserved. -// Copyright (C) 2020-2023 Dr Maxim Orlovsky. All rights reserved. +// Copyright (C) 2020-2024 LNP/BP Standards Association. All rights reserved. +// Copyright (C) 2020-2024 Dr Maxim Orlovsky. All rights reserved. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/descriptors/src/segwit.rs b/descriptors/src/segwit.rs index 17e99ce..197aadd 100644 --- a/descriptors/src/segwit.rs +++ b/descriptors/src/segwit.rs @@ -2,11 +2,11 @@ // // SPDX-License-Identifier: Apache-2.0 // -// Written in 2020-2023 by +// Written in 2020-2024 by // Dr Maxim Orlovsky // -// Copyright (C) 2020-2023 LNP/BP Standards Association. All rights reserved. -// Copyright (C) 2020-2023 Dr Maxim Orlovsky. All rights reserved. +// Copyright (C) 2020-2024 LNP/BP Standards Association. All rights reserved. +// Copyright (C) 2020-2024 Dr Maxim Orlovsky. All rights reserved. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/descriptors/src/taproot.rs b/descriptors/src/taproot.rs index 36a3da2..0bc08f1 100644 --- a/descriptors/src/taproot.rs +++ b/descriptors/src/taproot.rs @@ -2,11 +2,11 @@ // // SPDX-License-Identifier: Apache-2.0 // -// Written in 2020-2023 by +// Written in 2020-2024 by // Dr Maxim Orlovsky // -// Copyright (C) 2020-2023 LNP/BP Standards Association. All rights reserved. -// Copyright (C) 2020-2023 Dr Maxim Orlovsky. All rights reserved. +// Copyright (C) 2020-2024 LNP/BP Standards Association. All rights reserved. +// Copyright (C) 2020-2024 Dr Maxim Orlovsky. All rights reserved. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/invoice/src/address.rs b/invoice/src/address.rs index 442c606..59f219b 100644 --- a/invoice/src/address.rs +++ b/invoice/src/address.rs @@ -2,11 +2,11 @@ // // SPDX-License-Identifier: Apache-2.0 // -// Written in 2020-2023 by +// Written in 2020-2024 by // Dr Maxim Orlovsky // -// Copyright (C) 2020-2023 LNP/BP Standards Association. All rights reserved. -// Copyright (C) 2020-2023 Dr Maxim Orlovsky. All rights reserved. +// Copyright (C) 2020-2024 LNP/BP Standards Association. All rights reserved. +// Copyright (C) 2020-2024 Dr Maxim Orlovsky. All rights reserved. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/invoice/src/lib.rs b/invoice/src/lib.rs index bb30c25..bba10e3 100644 --- a/invoice/src/lib.rs +++ b/invoice/src/lib.rs @@ -2,11 +2,11 @@ // // SPDX-License-Identifier: Apache-2.0 // -// Written in 2020-2023 by +// Written in 2020-2024 by // Dr Maxim Orlovsky // -// Copyright (C) 2020-2023 LNP/BP Standards Association. All rights reserved. -// Copyright (C) 2020-2023 Dr Maxim Orlovsky. All rights reserved. +// Copyright (C) 2020-2024 LNP/BP Standards Association. All rights reserved. +// Copyright (C) 2020-2024 Dr Maxim Orlovsky. All rights reserved. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/invoice/src/network.rs b/invoice/src/network.rs index 5a2845b..7799e3b 100644 --- a/invoice/src/network.rs +++ b/invoice/src/network.rs @@ -2,11 +2,11 @@ // // SPDX-License-Identifier: Apache-2.0 // -// Written in 2020-2023 by +// Written in 2020-2024 by // Dr Maxim Orlovsky // -// Copyright (C) 2020-2023 LNP/BP Standards Association. All rights reserved. -// Copyright (C) 2020-2023 Dr Maxim Orlovsky. All rights reserved. +// Copyright (C) 2020-2024 LNP/BP Standards Association. All rights reserved. +// Copyright (C) 2020-2024 Dr Maxim Orlovsky. All rights reserved. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/psbt/src/coders.rs b/psbt/src/coders.rs index 972479a..7ff6223 100644 --- a/psbt/src/coders.rs +++ b/psbt/src/coders.rs @@ -2,11 +2,11 @@ // // SPDX-License-Identifier: Apache-2.0 // -// Written in 2020-2023 by +// Written in 2020-2024 by // Dr Maxim Orlovsky // -// Copyright (C) 2020-2023 LNP/BP Standards Association. All rights reserved. -// Copyright (C) 2020-2023 Dr Maxim Orlovsky. All rights reserved. +// Copyright (C) 2020-2024 LNP/BP Standards Association. All rights reserved. +// Copyright (C) 2020-2024 Dr Maxim Orlovsky. All rights reserved. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/psbt/src/csval/dbc.rs b/psbt/src/csval/dbc.rs index 64c098d..01174b1 100644 --- a/psbt/src/csval/dbc.rs +++ b/psbt/src/csval/dbc.rs @@ -2,10 +2,10 @@ // // SPDX-License-Identifier: Apache-2.0 // -// Written in 2019-2023 by +// Written in 2019-2024 by // Dr Maxim Orlovsky // -// Copyright (C) 2019-2023 LNP/BP Standards Association. All rights reserved. +// Copyright (C) 2019-2024 LNP/BP Standards Association. All rights reserved. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/psbt/src/csval/mod.rs b/psbt/src/csval/mod.rs index 32e093a..834ba89 100644 --- a/psbt/src/csval/mod.rs +++ b/psbt/src/csval/mod.rs @@ -2,10 +2,10 @@ // // SPDX-License-Identifier: Apache-2.0 // -// Written in 2019-2023 by +// Written in 2019-2024 by // Dr Maxim Orlovsky // -// Copyright (C) 2019-2023 LNP/BP Standards Association. All rights reserved. +// Copyright (C) 2019-2024 LNP/BP Standards Association. All rights reserved. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/psbt/src/csval/mpc.rs b/psbt/src/csval/mpc.rs index 7bcefe8..220e421 100644 --- a/psbt/src/csval/mpc.rs +++ b/psbt/src/csval/mpc.rs @@ -2,10 +2,10 @@ // // SPDX-License-Identifier: Apache-2.0 // -// Written in 2019-2023 by +// Written in 2019-2024 by // Dr Maxim Orlovsky // -// Copyright (C) 2019-2023 LNP/BP Standards Association. All rights reserved. +// Copyright (C) 2019-2024 LNP/BP Standards Association. All rights reserved. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/psbt/src/csval/opret.rs b/psbt/src/csval/opret.rs index 2fa527f..bfec7cd 100644 --- a/psbt/src/csval/opret.rs +++ b/psbt/src/csval/opret.rs @@ -2,10 +2,10 @@ // // SPDX-License-Identifier: Apache-2.0 // -// Written in 2019-2023 by +// Written in 2019-2024 by // Dr Maxim Orlovsky // -// Copyright (C) 2019-2023 LNP/BP Standards Association. All rights reserved. +// Copyright (C) 2019-2024 LNP/BP Standards Association. All rights reserved. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/psbt/src/csval/tapret.rs b/psbt/src/csval/tapret.rs index a2a396e..bd97fc6 100644 --- a/psbt/src/csval/tapret.rs +++ b/psbt/src/csval/tapret.rs @@ -2,10 +2,10 @@ // // SPDX-License-Identifier: Apache-2.0 // -// Written in 2019-2023 by +// Written in 2019-2024 by // Dr Maxim Orlovsky // -// Copyright (C) 2019-2023 LNP/BP Standards Association. All rights reserved. +// Copyright (C) 2019-2024 LNP/BP Standards Association. All rights reserved. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/psbt/src/data.rs b/psbt/src/data.rs index 3174a53..adb3f1b 100644 --- a/psbt/src/data.rs +++ b/psbt/src/data.rs @@ -2,11 +2,11 @@ // // SPDX-License-Identifier: Apache-2.0 // -// Written in 2020-2023 by +// Written in 2020-2024 by // Dr Maxim Orlovsky // -// Copyright (C) 2020-2023 LNP/BP Standards Association. All rights reserved. -// Copyright (C) 2020-2023 Dr Maxim Orlovsky. All rights reserved. +// Copyright (C) 2020-2024 LNP/BP Standards Association. All rights reserved. +// Copyright (C) 2020-2024 Dr Maxim Orlovsky. All rights reserved. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/psbt/src/keys.rs b/psbt/src/keys.rs index e7abe24..d6ce1f3 100644 --- a/psbt/src/keys.rs +++ b/psbt/src/keys.rs @@ -2,11 +2,11 @@ // // SPDX-License-Identifier: Apache-2.0 // -// Written in 2020-2023 by +// Written in 2020-2024 by // Dr Maxim Orlovsky // -// Copyright (C) 2020-2023 LNP/BP Standards Association. All rights reserved. -// Copyright (C) 2020-2023 Dr Maxim Orlovsky. All rights reserved. +// Copyright (C) 2020-2024 LNP/BP Standards Association. All rights reserved. +// Copyright (C) 2020-2024 Dr Maxim Orlovsky. All rights reserved. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/psbt/src/lib.rs b/psbt/src/lib.rs index 2ebd700..de7ef0e 100644 --- a/psbt/src/lib.rs +++ b/psbt/src/lib.rs @@ -2,11 +2,11 @@ // // SPDX-License-Identifier: Apache-2.0 // -// Written in 2020-2023 by +// Written in 2020-2024 by // Dr Maxim Orlovsky // -// Copyright (C) 2020-2023 LNP/BP Standards Association. All rights reserved. -// Copyright (C) 2020-2023 Dr Maxim Orlovsky. All rights reserved. +// Copyright (C) 2020-2024 LNP/BP Standards Association. All rights reserved. +// Copyright (C) 2020-2024 Dr Maxim Orlovsky. All rights reserved. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/psbt/src/maps.rs b/psbt/src/maps.rs index ea25e41..f773f5c 100644 --- a/psbt/src/maps.rs +++ b/psbt/src/maps.rs @@ -2,11 +2,11 @@ // // SPDX-License-Identifier: Apache-2.0 // -// Written in 2020-2023 by +// Written in 2020-2024 by // Dr Maxim Orlovsky // -// Copyright (C) 2020-2023 LNP/BP Standards Association. All rights reserved. -// Copyright (C) 2020-2023 Dr Maxim Orlovsky. All rights reserved. +// Copyright (C) 2020-2024 LNP/BP Standards Association. All rights reserved. +// Copyright (C) 2020-2024 Dr Maxim Orlovsky. All rights reserved. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/psbt/tests/bip174.rs b/psbt/tests/bip174.rs index 387dadc..4bfe6df 100644 --- a/psbt/tests/bip174.rs +++ b/psbt/tests/bip174.rs @@ -2,11 +2,11 @@ // // SPDX-License-Identifier: Apache-2.0 // -// Written in 2020-2023 by +// Written in 2020-2024 by // Dr Maxim Orlovsky // -// Copyright (C) 2020-2023 LNP/BP Standards Association. All rights reserved. -// Copyright (C) 2020-2023 Dr Maxim Orlovsky. All rights reserved. +// Copyright (C) 2020-2024 LNP/BP Standards Association. All rights reserved. +// Copyright (C) 2020-2024 Dr Maxim Orlovsky. All rights reserved. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/psbt/tests/bip370.rs b/psbt/tests/bip370.rs index 0b94149..cf54662 100644 --- a/psbt/tests/bip370.rs +++ b/psbt/tests/bip370.rs @@ -2,11 +2,11 @@ // // SPDX-License-Identifier: Apache-2.0 // -// Written in 2020-2023 by +// Written in 2020-2024 by // Dr Maxim Orlovsky // -// Copyright (C) 2020-2023 LNP/BP Standards Association. All rights reserved. -// Copyright (C) 2020-2023 Dr Maxim Orlovsky. All rights reserved. +// Copyright (C) 2020-2024 LNP/BP Standards Association. All rights reserved. +// Copyright (C) 2020-2024 Dr Maxim Orlovsky. All rights reserved. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/psbt/tests/bip371.rs b/psbt/tests/bip371.rs index f5aa270..3fee018 100644 --- a/psbt/tests/bip371.rs +++ b/psbt/tests/bip371.rs @@ -2,11 +2,11 @@ // // SPDX-License-Identifier: Apache-2.0 // -// Written in 2020-2023 by +// Written in 2020-2024 by // Dr Maxim Orlovsky // -// Copyright (C) 2020-2023 LNP/BP Standards Association. All rights reserved. -// Copyright (C) 2020-2023 Dr Maxim Orlovsky. All rights reserved. +// Copyright (C) 2020-2024 LNP/BP Standards Association. All rights reserved. +// Copyright (C) 2020-2024 Dr Maxim Orlovsky. All rights reserved. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/lib.rs b/src/lib.rs index 67da2c1..89584ea 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -2,11 +2,11 @@ // // SPDX-License-Identifier: Apache-2.0 // -// Written in 2020-2023 by +// Written in 2020-2024 by // Dr Maxim Orlovsky // -// Copyright (C) 2020-2023 LNP/BP Standards Association. All rights reserved. -// Copyright (C) 2020-2023 Dr Maxim Orlovsky. All rights reserved. +// Copyright (C) 2020-2024 LNP/BP Standards Association. All rights reserved. +// Copyright (C) 2020-2024 Dr Maxim Orlovsky. All rights reserved. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/src/rbf.rs b/src/rbf.rs index e397f9e..e5e2d19 100644 --- a/src/rbf.rs +++ b/src/rbf.rs @@ -2,11 +2,11 @@ // // SPDX-License-Identifier: Apache-2.0 // -// Written in 2020-2023 by +// Written in 2020-2024 by // Dr Maxim Orlovsky // -// Copyright (C) 2020-2023 LNP/BP Standards Association. All rights reserved. -// Copyright (C) 2020-2023 Dr Maxim Orlovsky. All rights reserved. +// Copyright (C) 2020-2024 LNP/BP Standards Association. All rights reserved. +// Copyright (C) 2020-2024 Dr Maxim Orlovsky. All rights reserved. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. From 219389ae9e2704f5229167bfd456550f3429b5d0 Mon Sep 17 00:00:00 2001 From: Dr Maxim Orlovsky Date: Sun, 4 Feb 2024 13:21:43 +0100 Subject: [PATCH 6/7] ci: update macos version --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 09ea0ec..9c8001c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -54,7 +54,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ ubuntu-20.04, ubuntu-22.04, macos-11, macos-12, windows-2019, windows-2022 ] + os: [ ubuntu-20.04, ubuntu-22.04, macos-12, macos-13, windows-2019, windows-2022 ] steps: - uses: actions/checkout@v2 - name: Install rust stable From e9da55c5515bca126af818a811357a25e2706d2f Mon Sep 17 00:00:00 2001 From: Dr Maxim Orlovsky Date: Fri, 16 Feb 2024 16:24:02 +0100 Subject: [PATCH 7/7] chore: update dependencies --- Cargo.lock | 224 +++++++++++++++-------------------------------------- Cargo.toml | 8 +- 2 files changed, 66 insertions(+), 166 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 95feba2..5c5e1a0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "amplify" -version = "4.5.1" +version = "4.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8dd50780fa78a67bae725dd164bc993500656112815a9301fd8b797e9006803" +checksum = "9e711289a6cb28171b4f0e6c8019c69ff9476050508dc082167575d458ff74d0" dependencies = [ "amplify_apfloat", "amplify_derive", @@ -14,21 +14,19 @@ dependencies = [ "amplify_syn", "ascii", "serde", - "serde_json", - "serde_yaml", "stringly_conversions", - "toml", "wasm-bindgen", ] [[package]] name = "amplify_apfloat" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5b7f29fad2a3def5dfbfed0da85b886eb927a18fe0296c06e39880b7a96db05" +checksum = "72e23f5ede99065fa6957a633498d2728d51016d61dae23b69c866112b7c61ee" dependencies = [ "amplify_num", "bitflags", + "wasm-bindgen", ] [[package]] @@ -45,9 +43,9 @@ dependencies = [ [[package]] name = "amplify_num" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9681187211554ab98f138ba159e90861b136c20afc680dcff2ba82d020721e27" +checksum = "04c009c5c4de814911b177e2ea59e4930bb918978ed3cce4900d846a6ceb0838" dependencies = [ "serde", "wasm-bindgen", @@ -163,9 +161,9 @@ dependencies = [ [[package]] name = "bitflags" -version = "1.3.2" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "blake3" @@ -192,7 +190,7 @@ dependencies = [ [[package]] name = "bp-consensus" version = "0.11.0-beta.3" -source = "git+https://github.com/BP-WG/bp-core?branch=v0.11#e5da72f8ffae49ccca6a9dbabf24f961cb619761" +source = "git+https://github.com/BP-WG/bp-core?branch=v0.11#19cf59adea068dbda7a617a1c514b544c008b10d" dependencies = [ "amplify", "chrono", @@ -205,7 +203,7 @@ dependencies = [ [[package]] name = "bp-core" version = "0.11.0-beta.3" -source = "git+https://github.com/BP-WG/bp-core?branch=v0.11#e5da72f8ffae49ccca6a9dbabf24f961cb619761" +source = "git+https://github.com/BP-WG/bp-core?branch=v0.11#19cf59adea068dbda7a617a1c514b544c008b10d" dependencies = [ "amplify", "bp-consensus", @@ -221,7 +219,7 @@ dependencies = [ [[package]] name = "bp-dbc" version = "0.11.0-beta.3" -source = "git+https://github.com/BP-WG/bp-core?branch=v0.11#e5da72f8ffae49ccca6a9dbabf24f961cb619761" +source = "git+https://github.com/BP-WG/bp-core?branch=v0.11#19cf59adea068dbda7a617a1c514b544c008b10d" dependencies = [ "amplify", "base85", @@ -233,7 +231,7 @@ dependencies = [ [[package]] name = "bp-derive" -version = "0.11.0-beta.3.1" +version = "0.11.0-beta.4" dependencies = [ "amplify", "bitcoin_hashes", @@ -246,7 +244,7 @@ dependencies = [ [[package]] name = "bp-invoice" -version = "0.11.0-beta.3.1" +version = "0.11.0-beta.4" dependencies = [ "amplify", "bech32", @@ -258,7 +256,7 @@ dependencies = [ [[package]] name = "bp-seals" version = "0.11.0-beta.3" -source = "git+https://github.com/BP-WG/bp-core?branch=v0.11#e5da72f8ffae49ccca6a9dbabf24f961cb619761" +source = "git+https://github.com/BP-WG/bp-core?branch=v0.11#19cf59adea068dbda7a617a1c514b544c008b10d" dependencies = [ "amplify", "baid58", @@ -272,7 +270,7 @@ dependencies = [ [[package]] name = "bp-std" -version = "0.11.0-beta.3.1" +version = "0.11.0-beta.4" dependencies = [ "amplify", "bp-consensus", @@ -286,9 +284,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.14.0" +version = "3.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" +checksum = "d32a994c2b3ca201d9b263612a374263f05e7adde37c4707f693dcd375076d1f" [[package]] name = "byteorder" @@ -313,9 +311,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.33" +version = "0.4.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f13690e35a5e4ace198e7beea2895d29f3a9cc55015fcebe6336bd2010af9eb" +checksum = "5bc015644b92d5890fab7489e49d21f879d5c990186827d42ec511919404f38b" dependencies = [ "android-tzdata", "iana-time-zone", @@ -328,7 +326,7 @@ dependencies = [ [[package]] name = "commit_encoding_derive" version = "0.11.0-beta.3" -source = "git+https://github.com/LNP-BP/client_side_validation?branch=v0.11#61b0f4969da8a69cef438de6b3085344c5626ec2" +source = "git+https://github.com/LNP-BP/client_side_validation?branch=v0.11#5359d8437f5e63289ad0a63ecb66a3bd7d42f816" dependencies = [ "amplify", "amplify_syn", @@ -340,7 +338,7 @@ dependencies = [ [[package]] name = "commit_verify" version = "0.11.0-beta.3" -source = "git+https://github.com/LNP-BP/client_side_validation?branch=v0.11#61b0f4969da8a69cef438de6b3085344c5626ec2" +source = "git+https://github.com/LNP-BP/client_side_validation?branch=v0.11#5359d8437f5e63289ad0a63ecb66a3bd7d42f816" dependencies = [ "amplify", "commit_encoding_derive", @@ -390,7 +388,7 @@ dependencies = [ [[package]] name = "descriptors" -version = "0.11.0-beta.3.1" +version = "0.11.0-beta.4" dependencies = [ "amplify", "bp-derive", @@ -489,26 +487,20 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.2" +version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "824b2ae422412366ba479e8111fd301f7b5faece8149317bb81925979a53f520" +checksum = "233cf39063f058ea2caae4091bf4a3ef70a653afbc026f5c4a4135d114e3c177" dependencies = [ "equivalent", "hashbrown", "serde", ] -[[package]] -name = "itoa" -version = "1.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" - [[package]] name = "js-sys" -version = "0.3.67" +version = "0.3.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a1d36f1235bc969acba30b7f5990b864423a6068a10f7c90ae8f0112e3a59d1" +checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee" dependencies = [ "wasm-bindgen", ] @@ -531,12 +523,6 @@ version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" -[[package]] -name = "memchr" -version = "2.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" - [[package]] name = "mnemonic" version = "1.0.1" @@ -549,9 +535,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" dependencies = [ "autocfg", ] @@ -585,7 +571,7 @@ dependencies = [ [[package]] name = "psbt" -version = "0.11.0-beta.3.1" +version = "0.11.0-beta.4" dependencies = [ "amplify", "base64", @@ -647,12 +633,6 @@ dependencies = [ "digest", ] -[[package]] -name = "ryu" -version = "1.0.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" - [[package]] name = "secp256k1" version = "0.28.2" @@ -690,27 +670,7 @@ checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", -] - -[[package]] -name = "serde_json" -version = "1.0.113" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69801b70b1c3dac963ecb03a364ba0ceda9cf60c71cfe475e99864759c8b8a79" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_spanned" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" -dependencies = [ - "serde", + "syn 2.0.49", ] [[package]] @@ -723,19 +683,6 @@ dependencies = [ "serde_derive", ] -[[package]] -name = "serde_yaml" -version = "0.9.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adf8a49373e98a4c5f0ceb5d05aa7c648d75f63774981ed95b7c7443bbd50c6e" -dependencies = [ - "indexmap", - "itoa", - "ryu", - "serde", - "unsafe-libyaml", -] - [[package]] name = "sha2" version = "0.10.8" @@ -758,8 +705,9 @@ dependencies = [ [[package]] name = "strict_encoding" -version = "2.7.0" -source = "git+https://github.com/strict-types/strict-encoding?branch=refactor/io#f95dbcbf8b01a4ea92dea92bd6492e9ae8c73c67" +version = "2.7.0-beta.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a12eaa6985afa31deacc86cdc4935a36960ae09131a1f4e1db430127ebc4f05d" dependencies = [ "amplify", "half", @@ -768,8 +716,9 @@ dependencies = [ [[package]] name = "strict_encoding_derive" -version = "2.7.0" -source = "git+https://github.com/strict-types/strict-encoding?branch=refactor/io#f95dbcbf8b01a4ea92dea92bd6492e9ae8c73c67" +version = "2.7.0-beta.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b1b064a62618a785e6d8f4df13d905dc335b56400d48f9b4f8b12dcba82b260" dependencies = [ "amplify_syn", "heck", @@ -780,8 +729,9 @@ dependencies = [ [[package]] name = "strict_types" -version = "2.7.0" -source = "git+https://github.com/strict-types/strict-types?branch=refactor/io#ada11c04ab6e6483e769885f2fe93eae0bd42f85" +version = "2.7.0-beta.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66de5cdf197b68e13fcac9fad7ed288f44052a319a3df3abbaba9c6e52f735b" dependencies = [ "amplify", "baid58", @@ -789,7 +739,7 @@ dependencies = [ "indexmap", "sha2", "strict_encoding", - "vesper", + "vesper-lang", ] [[package]] @@ -815,9 +765,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.48" +version = "2.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" +checksum = "915aea9e586f80826ee59f8453c1101f9d1c4b3964cd2460185ee8e299ada496" dependencies = [ "proc-macro2", "quote", @@ -826,56 +776,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.56" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" +checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.56" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" +checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", -] - -[[package]] -name = "toml" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit", -] - -[[package]] -name = "toml_datetime" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_edit" -version = "0.20.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" -dependencies = [ - "indexmap", - "serde", - "serde_spanned", - "toml_datetime", - "winnow", + "syn 2.0.49", ] [[package]] @@ -890,12 +806,6 @@ version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" -[[package]] -name = "unsafe-libyaml" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab4c90930b95a82d00dc9e9ac071b4991924390d46cbd0dfe566148667605e4b" - [[package]] name = "version_check" version = "0.9.4" @@ -903,9 +813,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] -name = "vesper" +name = "vesper-lang" version = "0.1.0" -source = "git+https://github.com/UBIDECO/vesper#18107cbbdffeb91d992dc7c76da0640aea152e8f" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f72ebd3b32f16ee8ace2bd3058c2bfa0f4820992bd4ea86e73ba228bb13dd2b0" dependencies = [ "amplify", "strict_encoding", @@ -919,9 +830,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.90" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1223296a201415c7fad14792dbefaace9bd52b62d33453ade1c5b5f07555406" +checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -929,24 +840,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.90" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcdc935b63408d58a32f8cc9738a0bffd8f05cc7c002086c6ef20b7312ad9dcd" +checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.49", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.90" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e4c238561b2d428924c49815533a8b9121c664599558a5d9ec51f8a1740a999" +checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -954,22 +865,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.90" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bae1abb6806dc1ad9e560ed242107c0f6c84335f1749dd4e8ddb012ebd5e25a7" +checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.49", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.90" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d91413b1c31d7539ba5ef2451af3f0b833a005eb27a631cec32bc0635a8602b" +checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838" [[package]] name = "windows-core" @@ -1036,12 +947,3 @@ name = "windows_x86_64_msvc" version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" - -[[package]] -name = "winnow" -version = "0.5.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7cad8365489051ae9f054164e459304af2e7e9bb407c958076c8bf4aef52da5" -dependencies = [ - "memchr", -] diff --git a/Cargo.toml b/Cargo.toml index dd15a47..398ae3c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,7 @@ members = ["invoice", "derive", "descriptors", "psbt", "."] resolver = "2" [workspace.package] -version = "0.11.0-beta.3.1" +version = "0.11.0-beta.4" keywords = ["bitcoin", "wallet", "descriptors", "psbt", "taproot"] categories = ["cryptography::cryptocurrencies"] authors = ["Dr Maxim Orlovsky "] @@ -14,11 +14,11 @@ edition = "2021" license = "Apache-2.0" [workspace.dependencies] -amplify = "4.5.1" +amplify = "4.6.0" bech32 = "0.9.1" bitcoin_hashes = "0.13.0" # TODO: Remove and replace with commit_verify commit_verify = "0.11.0-beta.3" -strict_encoding = "2.7.0" +strict_encoding = "2.7.0-beta.1" bp-consensus = "0.11.0-beta.3" bp-core = { version = "0.11.0-beta.3" } bp-invoice = { version = "0.11.0-beta.3", path = "invoice" } @@ -63,8 +63,6 @@ client-side-validation = ["bp-core", "psbt/client-side-validation"] serde = ["serde_crate", "bp-consensus/serde", "bp-invoice/serde", "bp-derive/serde", "descriptors/serde", "psbt/serde"] [patch.crates-io] -strict_encoding = { git = "https://github.com/strict-types/strict-encoding", branch = "refactor/io" } -strict_types = { git = "https://github.com/strict-types/strict-types", branch = "refactor/io" } commit_verify = { git = "https://github.com/LNP-BP/client_side_validation", branch = "v0.11" } bp-consensus = { git = "https://github.com/BP-WG/bp-core", branch = "v0.11" } bp-dbc = { git = "https://github.com/BP-WG/bp-core", branch = "v0.11" }