From 26f7c2875d4a22d5ee267ffddb02bf655961bbc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zoe=20Faltib=C3=A0?= Date: Fri, 24 Jan 2025 17:34:54 +0100 Subject: [PATCH] unified seals --- Cargo.lock | 1106 ++++++++++------- rgb | 2 +- rgb-core | 2 +- rgb-interfaces | 2 +- rgb-schemata | 2 +- rgb-std | 2 +- ...9c3780c74f1d4696369414617d7650ea83a09.yaml | 16 - ...5377c6faf0003eed47e9d036b81d9d30139fd.yaml | 16 + ...8e8f3b81adbbe967e95f15460fd74a32d9a4e.yaml | 14 + ...41d2fb761d9840f9d8a255528af7d974bdc6d.yaml | 14 - ...075323afec5ad766579de5b2c6869b2ed6b53.yaml | 16 - ...1b1860124162242bd03d43100074ed3e9bcea.yaml | 16 + ...3d65c905a5ea91a79b7f4200070ea7aff1e96.yaml | 14 + ...0ff62c485fc31a50afe769b161eca91059a19.yaml | 14 + ...5d1fe8dde012a1993acac9f0485578a25d2ea.yaml | 14 - ...97cb889930192cae359576765dacae4e5805c.yaml | 16 - ...undles_pubWitness_data_input_sequence.yaml | 124 +- tests/fixtures/attack_chain.yaml | 124 +- tests/fixtures/attack_genesis_schema_id.yaml | 138 +- tests/fixtures/attack_genesis_testnet.yaml | 138 +- tests/fixtures/attack_resolver_error.yaml | 136 +- tests/fixtures/consignment_A.yaml | 124 +- tests/fixtures/consignment_B.yaml | 138 +- ...46fe994b9e3ed1521e395a18f1868f2c977f4.yaml | 14 - ...295b107db07bf35f784f48a8544cbcc192420.yaml | 16 + tests/issuance.rs | 56 +- tests/stress.rs | 2 +- tests/transfers.rs | 168 +-- tests/utils/helpers.rs | 23 +- tests/validation.rs | 38 +- 30 files changed, 1260 insertions(+), 1245 deletions(-) delete mode 100644 tests/fixtures/5703c396115f79a590b092c5e8e9c3780c74f1d4696369414617d7650ea83a09.yaml create mode 100644 tests/fixtures/5af032ce20c361e53d6e339b0985377c6faf0003eed47e9d036b81d9d30139fd.yaml create mode 100644 tests/fixtures/6c05545f455f9a28fdf1c695f1c8e8f3b81adbbe967e95f15460fd74a32d9a4e.yaml delete mode 100644 tests/fixtures/6d28dcc62ff3b7077e852bc022641d2fb761d9840f9d8a255528af7d974bdc6d.yaml delete mode 100644 tests/fixtures/797cbdf8b72425b3e4ca512ee58075323afec5ad766579de5b2c6869b2ed6b53.yaml create mode 100644 tests/fixtures/8031b8bcababaf4fa55cd2b63271b1860124162242bd03d43100074ed3e9bcea.yaml create mode 100644 tests/fixtures/85227b4362a8acebfbe798f63dd3d65c905a5ea91a79b7f4200070ea7aff1e96.yaml create mode 100644 tests/fixtures/8f388cc11a7d96e5f792b9b90530ff62c485fc31a50afe769b161eca91059a19.yaml delete mode 100644 tests/fixtures/91abc4f81b1f62fb064903111a45d1fe8dde012a1993acac9f0485578a25d2ea.yaml delete mode 100644 tests/fixtures/ab749bdcd8bc3c5bf8f72ac3ad997cb889930192cae359576765dacae4e5805c.yaml delete mode 100644 tests/fixtures/dba8e954792ca34d8fc0de4199346fe994b9e3ed1521e395a18f1868f2c977f4.yaml create mode 100644 tests/fixtures/ebb24d28abb46a2b9b7fb3170df295b107db07bf35f784f48a8544cbcc192420.yaml diff --git a/Cargo.lock b/Cargo.lock index 2f08427..75b3546 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,18 +4,18 @@ version = 3 [[package]] name = "addr2line" -version = "0.21.0" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" dependencies = [ "gimli", ] [[package]] -name = "adler" -version = "1.0.2" +name = "adler2" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" [[package]] name = "aho-corasick" @@ -34,7 +34,7 @@ dependencies = [ "ascii-armor", "baid64", "blake3", - "getrandom", + "getrandom 0.2.15", "half", "paste", "ripemd", @@ -65,7 +65,7 @@ name = "amplify_apfloat" version = "0.3.1" dependencies = [ "amplify_num", - "bitflags 2.5.0", + "bitflags 2.8.0", "wasm-bindgen", ] @@ -113,15 +113,15 @@ dependencies = [ [[package]] name = "arrayref" -version = "0.3.7" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" +checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb" [[package]] name = "arrayvec" -version = "0.7.4" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "ascii" @@ -145,50 +145,48 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.2.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "aws-lc-rs" -version = "1.7.3" +version = "1.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf7d844e282b4b56750b2d4e893b2205581ded8709fddd2b6aa5418c150ca877" +checksum = "4c2b7ddaa2c56a367ad27a094ad8ef4faacf8a617c2575acb2ba88949df999ca" dependencies = [ "aws-lc-sys", - "mirai-annotations", "paste", "zeroize", ] [[package]] name = "aws-lc-sys" -version = "0.18.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3a2c29203f6bf296d01141cc8bb9dbd5ecd4c27843f2ee0767bcd5985a927da" +checksum = "71b2ddd3ada61a305e1d8bb6c005d1eaa7d14d903681edfc400406d523a9b491" dependencies = [ "bindgen", "cc", "cmake", "dunce", "fs_extra", - "libc", "paste", ] [[package]] name = "backtrace" -version = "0.3.71" +version = "0.3.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" +checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" dependencies = [ "addr2line", - "cc", "cfg-if", "libc", "miniz_oxide", "object", "rustc-demangle", + "windows-targets", ] [[package]] @@ -230,11 +228,11 @@ checksum = "d86b93f97252c47b41663388e6d155714a9d0c398b99f1005cbc5f978b29f445" [[package]] name = "bindgen" -version = "0.69.4" +version = "0.69.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" +checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.8.0", "cexpr", "clang-sys", "itertools", @@ -247,15 +245,15 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.66", + "syn 2.0.96", "which", ] [[package]] name = "bitcoin-io" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "340e09e8399c7bd8912f495af6aa58bea0c9214773417ffaa8f6460f93aaee56" +checksum = "0b47c4ab7a93edb0c7198c5535ed9b52b63095f4e9b45279c6736cec4b856baf" [[package]] name = "bitcoin_hashes" @@ -275,15 +273,15 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36" [[package]] name = "blake3" -version = "1.5.4" +version = "1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d82033247fd8e890df8f740e407ad4d038debb9eb1f40533fffb32e7d17dc6f7" +checksum = "b8ee0c1824c4dea5b5f81736aff91bae041d2c07ee1192bec91054e10e3e601e" dependencies = [ "arrayref", "arrayvec", @@ -323,7 +321,7 @@ dependencies = [ "bp-dbc", "bp-seals", "commit_verify", - "getrandom", + "getrandom 0.2.15", "serde", "single_use_seals", "strict_encoding", @@ -353,7 +351,7 @@ dependencies = [ "bp-invoice", "commit_verify", "hmac", - "indexmap 2.6.0", + "indexmap 2.7.1", "serde", "sha2", ] @@ -367,11 +365,11 @@ dependencies = [ "byteorder", "libc", "log", - "rustls 0.23.7", + "rustls 0.23.21", "serde", "serde_json", "sha2", - "webpki-roots 0.26.1", + "webpki-roots 0.26.7", "winapi", ] @@ -426,7 +424,7 @@ dependencies = [ "bp-derive", "bp-invoice", "descriptors", - "getrandom", + "getrandom 0.2.15", "psbt", "secp256k1", "serde", @@ -455,9 +453,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.16.0" +version = "3.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" +checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf" [[package]] name = "byteorder" @@ -467,15 +465,15 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.6.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" +checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b" [[package]] name = "cc" -version = "1.1.18" +version = "1.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62ac837cdb5cb22e10a256099b4fc502b1dfe560cb282963a974d7abd80e476" +checksum = "13208fcbb66eaeffe09b99fffbe1af420f00a7b35aa99ad683dfc1aa76145229" dependencies = [ "jobserver", "libc", @@ -499,9 +497,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.38" +version = "0.4.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" +checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825" dependencies = [ "android-tzdata", "iana-time-zone", @@ -509,7 +507,7 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-targets 0.52.6", + "windows-targets", ] [[package]] @@ -525,9 +523,9 @@ dependencies = [ [[package]] name = "cmake" -version = "0.1.50" +version = "0.1.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130" +checksum = "e24a03c8b52922d68a1589ad61032f2c1aa5a8158d2aa0d93c6e9534944bbad6" dependencies = [ "cc", ] @@ -560,9 +558,9 @@ dependencies = [ [[package]] name = "constant_time_eq" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" +checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" [[package]] name = "core-foundation" @@ -576,24 +574,24 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "cpufeatures" -version = "0.2.12" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280" dependencies = [ "libc", ] [[package]] name = "crunchy" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" +checksum = "43da5946c66ffcc7745f48db692ffbb10a83bfe0afd96235c5c2a4fb23994929" [[package]] name = "crypto-common" @@ -626,7 +624,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.66", + "syn 2.0.96", ] [[package]] @@ -637,7 +635,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.66", + "syn 2.0.96", ] [[package]] @@ -656,7 +654,7 @@ version = "0.11.0-beta.9.1" dependencies = [ "amplify", "bp-derive", - "indexmap 2.6.0", + "indexmap 2.7.1", "serde", ] @@ -671,17 +669,28 @@ dependencies = [ "subtle", ] +[[package]] +name = "displaydoc" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.96", +] + [[package]] name = "dunce" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" +checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" [[package]] name = "either" -version = "1.11.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "equivalent" @@ -691,12 +700,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.8" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -707,9 +716,9 @@ checksum = "a35a73237400bde66c82e38387343f90d7182a2f2f22729e096a2abd57d75db9" [[package]] name = "fastrand" -version = "2.0.2" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" +checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" [[package]] name = "file-format" @@ -764,9 +773,9 @@ checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" [[package]] name = "futures" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" dependencies = [ "futures-channel", "futures-core", @@ -779,9 +788,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" dependencies = [ "futures-core", "futures-sink", @@ -789,15 +798,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" [[package]] name = "futures-executor" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" dependencies = [ "futures-core", "futures-task", @@ -806,32 +815,32 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" [[package]] name = "futures-macro" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.96", ] [[package]] name = "futures-sink" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" [[package]] name = "futures-task" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" [[package]] name = "futures-timer" @@ -841,9 +850,9 @@ checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" [[package]] name = "futures-util" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" dependencies = [ "futures-channel", "futures-core", @@ -869,28 +878,40 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "js-sys", "libc", - "wasi", + "wasi 0.11.0+wasi-snapshot-preview1", "wasm-bindgen", ] +[[package]] +name = "getrandom" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a49c392881ce6d5c3b8cb70f98717b7c07aabbdff06687b9030dbfbe2725f8" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.13.3+wasi-0.2.2", + "windows-targets", +] + [[package]] name = "gimli" -version = "0.28.1" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" [[package]] name = "glob" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" +checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2" [[package]] name = "half" @@ -910,15 +931,9 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "hashbrown" -version = "0.15.0" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" - -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" [[package]] name = "heck" @@ -952,11 +967,11 @@ dependencies = [ [[package]] name = "home" -version = "0.5.9" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" +checksum = "589533453244b0995c858700322199b2becb13b627df2851f64a2775d024abcf" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -995,15 +1010,15 @@ dependencies = [ [[package]] name = "httparse" -version = "1.8.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" +checksum = "f2d708df4e7140240a16cd6ab0ab65c972d7433ab77819ea693fde9c43811e2a" [[package]] name = "hyper" -version = "1.5.2" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "256fb8d4bd6413123cc9d91832d78325c48ff41677595be797d90f42969beae0" +checksum = "cc2b571658e38e0c01b1fdca3bbbe93c00d3d71693ff2770043f8c29bc7d6f80" dependencies = [ "bytes", "futures-channel", @@ -1036,9 +1051,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.7" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9" +checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4" dependencies = [ "bytes", "futures-channel", @@ -1049,16 +1064,15 @@ dependencies = [ "pin-project-lite", "socket2", "tokio", - "tower", "tower-service", "tracing", ] [[package]] name = "iana-time-zone" -version = "0.1.60" +version = "0.1.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -1077,6 +1091,124 @@ dependencies = [ "cc", ] +[[package]] +name = "icu_collections" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_locid" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" +dependencies = [ + "displaydoc", + "litemap", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_locid_transform" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_locid_transform_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_locid_transform_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" + +[[package]] +name = "icu_normalizer" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_normalizer_data", + "icu_properties", + "icu_provider", + "smallvec", + "utf16_iter", + "utf8_iter", + "write16", + "zerovec", +] + +[[package]] +name = "icu_normalizer_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516" + +[[package]] +name = "icu_properties" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_locid_transform", + "icu_properties_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_properties_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" + +[[package]] +name = "icu_provider" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_provider_macros", + "stable_deref_trait", + "tinystr", + "writeable", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_provider_macros" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.96", +] + [[package]] name = "ident_case" version = "1.0.1" @@ -1085,12 +1217,23 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" -version = "0.5.0" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e" +dependencies = [ + "idna_adapter", + "smallvec", + "utf8_iter", +] + +[[package]] +name = "idna_adapter" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71" dependencies = [ - "unicode-bidi", - "unicode-normalization", + "icu_normalizer", + "icu_properties", ] [[package]] @@ -1106,20 +1249,20 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.6.0" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" +checksum = "8c9c992b02b5b4c94ea26e32fe5bccb7aa7d9f390ab5c1221ff895bc7ea8b652" dependencies = [ "equivalent", - "hashbrown 0.15.0", + "hashbrown 0.15.2", "serde", ] [[package]] name = "ipnet" -version = "2.9.0" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" +checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130" [[package]] name = "itertools" @@ -1132,33 +1275,34 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.11" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" +checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" [[package]] name = "jobserver" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" dependencies = [ "libc", ] [[package]] name = "js-sys" -version = "0.3.69" +version = "0.3.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" dependencies = [ + "once_cell", "wasm-bindgen", ] [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "lazycell" @@ -1168,25 +1312,31 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.153" +version = "0.2.169" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" [[package]] name = "libloading" -version = "0.8.3" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" +checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34" dependencies = [ "cfg-if", - "windows-targets 0.52.6", + "windows-targets", ] [[package]] name = "linux-raw-sys" -version = "0.4.13" +version = "0.4.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" + +[[package]] +name = "litemap" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104" [[package]] name = "lock_api" @@ -1200,15 +1350,15 @@ dependencies = [ [[package]] name = "log" -version = "0.4.22" +version = "0.4.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" +checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f" [[package]] name = "memchr" -version = "2.7.2" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "mime" @@ -1224,18 +1374,18 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +checksum = "b8402cab7aefae129c6977bb0ff1b8fd9a04eb5b51efc50a70bea51cda0c7924" dependencies = [ - "adler", + "adler2", ] [[package]] name = "minreq" -version = "2.13.0" +version = "2.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36a8e50e917e18a37d500d27d40b7bc7d127e71c0c94fb2d83f43b4afd308390" +checksum = "da0c420feb01b9fb5061f8c8f452534361dd783756dcf38ec45191ce55e7a161" dependencies = [ "base64 0.12.3", "log", @@ -1249,21 +1399,15 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.11" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd" dependencies = [ "libc", - "wasi", - "windows-sys 0.48.0", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys 0.52.0", ] -[[package]] -name = "mirai-annotations" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9be0862c1b3f26a88803c4a49de6889c10e608b3ee9344e6ef5b45fb37ad3d1" - [[package]] name = "mnemonic" version = "1.1.1" @@ -1272,11 +1416,10 @@ checksum = "f2b8f3a258db515d5e91a904ce4ae3f73e091149b90cadbdb93d210bee07f63b" [[package]] name = "native-tls" -version = "0.2.11" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" +checksum = "0dab59f8e050d5df8e4dd87d9206fb6f65a483e20ac9fda365ade4fab353196c" dependencies = [ - "lazy_static", "libc", "log", "openssl", @@ -1314,35 +1457,35 @@ checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" [[package]] name = "num-traits" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", ] [[package]] name = "object" -version = "0.32.2" +version = "0.36.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.19.0" +version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[package]] name = "openssl" -version = "0.10.64" +version = "0.10.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" +checksum = "f5e534d133a060a3c19daec1eb3e98ec6f4685978834f2dbadfe2ec215bab64e" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.8.0", "cfg-if", "foreign-types", "libc", @@ -1359,20 +1502,20 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.96", ] [[package]] name = "openssl-probe" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" +checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e" [[package]] name = "openssl-sys" -version = "0.9.102" +version = "0.9.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" +checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741" dependencies = [ "cc", "libc", @@ -1400,14 +1543,14 @@ dependencies = [ "libc", "redox_syscall", "smallvec", - "windows-targets 0.52.6", + "windows-targets", ] [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "percent-encoding" @@ -1415,31 +1558,11 @@ version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" -[[package]] -name = "pin-project" -version = "1.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e2ec53ad785f4d35dac0adea7f7dc6f1bb277ad84a680c7afefeae05d1f5916" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d56a66c0c55993aa927429d0f8a0abfd74f084e4d9c192cffed01e418d83eefb" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - [[package]] name = "pin-project-lite" -version = "0.2.14" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" +checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" [[package]] name = "pin-utils" @@ -1449,9 +1572,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" [[package]] name = "powerfmt" @@ -1461,25 +1584,28 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "ppv-lite86" -version = "0.2.17" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] [[package]] name = "prettyplease" -version = "0.2.20" +version = "0.2.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" +checksum = "6924ced06e1f7dfe3fa48d57b9f74f55d8915f5036121bef647ef4b204895fac" dependencies = [ "proc-macro2", - "syn 2.0.66", + "syn 2.0.96", ] [[package]] name = "proc-macro2" -version = "1.0.85" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23" +checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99" dependencies = [ "unicode-ident", ] @@ -1495,16 +1621,16 @@ dependencies = [ "chrono", "commit_verify", "descriptors", - "indexmap 2.6.0", + "indexmap 2.7.1", "serde", "strict_encoding", ] [[package]] name = "quote" -version = "1.0.36" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" dependencies = [ "proc-macro2", ] @@ -1536,7 +1662,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom", + "getrandom 0.2.15", ] [[package]] @@ -1545,14 +1671,14 @@ version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.8.0", ] [[package]] name = "regex" -version = "1.10.4" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ "aho-corasick", "memchr", @@ -1562,9 +1688,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.6" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" dependencies = [ "aho-corasick", "memchr", @@ -1573,9 +1699,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "relative-path" @@ -1585,9 +1711,9 @@ checksum = "ba39f3699c378cd8970968dcbff9c43159ea4cfbd88d43c00b22f2ef10a435d2" [[package]] name = "reqwest" -version = "0.12.9" +version = "0.12.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f" +checksum = "43e734407157c3c2034e0258f5e4473ddb361b1e85f95a66690d67264d7cd1da" dependencies = [ "base64 0.22.1", "bytes", @@ -1615,6 +1741,7 @@ dependencies = [ "tokio", "tokio-native-tls", "tokio-socks", + "tower", "tower-service", "url", "wasm-bindgen", @@ -1633,7 +1760,7 @@ dependencies = [ "bp-core", "chrono", "commit_verify", - "getrandom", + "getrandom 0.2.15", "mime", "secp256k1", "serde", @@ -1651,7 +1778,7 @@ dependencies = [ "amplify", "bp-core", "chrono", - "getrandom", + "getrandom 0.2.15", "rgb-std", "serde_json", "sha2", @@ -1670,7 +1797,7 @@ dependencies = [ "bp-invoice", "fast32", "fluent-uri", - "indexmap 2.6.0", + "indexmap 2.7.1", "percent-encoding", "rand", "rgb-core", @@ -1688,7 +1815,7 @@ dependencies = [ "bp-core", "bp-std", "commit_verify", - "getrandom", + "getrandom 0.2.15", "rgb-std", "strict_encoding", "wasm-bindgen", @@ -1697,14 +1824,14 @@ dependencies = [ [[package]] name = "rgb-psbt" version = "0.11.0-beta.9" -source = "git+https://github.com/RGB-WG/rgb?branch=revert_fix_same_blinded_transfer#a12c638dd3a0a85ece74e9f1fd0540152bea83d7" +source = "git+https://github.com/RGB-WG/rgb?branch=revert_fix_same_blinded_transfer#14df7f7df0b8099455a59c4a1f6428585b04fee4" dependencies = [ "amplify", "baid64", "bp-core", "bp-std", "commit_verify", - "getrandom", + "getrandom 0.2.15", "rgb-std", "strict_encoding", "wasm-bindgen", @@ -1723,8 +1850,8 @@ dependencies = [ "bp-wallet", "chrono", "commit_verify", - "getrandom", - "indexmap 2.6.0", + "getrandom 0.2.15", + "indexmap 2.7.1", "nonasync", "rgb-psbt 0.11.0-beta.9", "rgb-std", @@ -1737,7 +1864,7 @@ dependencies = [ [[package]] name = "rgb-runtime" version = "0.11.0-beta.9" -source = "git+https://github.com/RGB-WG/rgb?branch=revert_fix_same_blinded_transfer#a12c638dd3a0a85ece74e9f1fd0540152bea83d7" +source = "git+https://github.com/RGB-WG/rgb?branch=revert_fix_same_blinded_transfer#14df7f7df0b8099455a59c4a1f6428585b04fee4" dependencies = [ "amplify", "baid64", @@ -1748,8 +1875,8 @@ dependencies = [ "bp-wallet", "chrono", "commit_verify", - "getrandom", - "indexmap 2.6.0", + "getrandom 0.2.15", + "indexmap 2.7.1", "nonasync", "rgb-psbt 0.11.0-beta.9 (git+https://github.com/RGB-WG/rgb?branch=revert_fix_same_blinded_transfer)", "rgb-std", @@ -1788,8 +1915,8 @@ dependencies = [ "bp-core", "chrono", "commit_verify", - "getrandom", - "indexmap 2.6.0", + "getrandom 0.2.15", + "indexmap 2.7.1", "nonasync", "rand", "rgb-core", @@ -1843,7 +1970,7 @@ checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", "cfg-if", - "getrandom", + "getrandom 0.2.15", "libc", "spin", "untrusted", @@ -1884,7 +2011,7 @@ dependencies = [ "regex", "relative-path", "rustc_version", - "syn 2.0.66", + "syn 2.0.96", "unicode-ident", ] @@ -1897,14 +2024,14 @@ dependencies = [ "quote", "rand", "rustc_version", - "syn 2.0.66", + "syn 2.0.96", ] [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc-hash" @@ -1914,24 +2041,24 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustc_version" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" dependencies = [ "semver", ] [[package]] name = "rustix" -version = "0.38.34" +version = "0.38.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.8.0", "errno", "libc", "linux-raw-sys", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -1948,34 +2075,33 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.7" +version = "0.23.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebbbdb961df0ad3f2652da8f3fdc4b36122f568f968f45ad3316f26c025c677b" +checksum = "8f287924602bf649d949c63dc8ac8b235fa5387d394020705b80c4eb597ce5b8" dependencies = [ "aws-lc-rs", "log", "once_cell", "rustls-pki-types", - "rustls-webpki 0.102.3", + "rustls-webpki 0.102.8", "subtle", "zeroize", ] [[package]] name = "rustls-pemfile" -version = "2.1.2" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" +checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" dependencies = [ - "base64 0.22.1", "rustls-pki-types", ] [[package]] name = "rustls-pki-types" -version = "1.5.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "beb461507cee2c2ff151784c52762cf4d9ff6a61f3e80968600ed24fa837fa54" +checksum = "917ce264624a4b4db1c364dcc35bfca9ded014d0a958cd47ad3e960e988ea51c" [[package]] name = "rustls-webpki" @@ -1989,9 +2115,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.102.3" +version = "0.102.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3bce581c0dd41bce533ce695a1437fa16a7ab5ac3ccfa99fe1a620a7885eabf" +checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" dependencies = [ "aws-lc-rs", "ring", @@ -2001,32 +2127,32 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.15" +version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80af6f9131f277a45a3fba6ce8e2258037bb0477a67e610d3c1fe046ab31de47" +checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4" [[package]] name = "ryu" -version = "1.0.17" +version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" +checksum = "6ea1a2d0a644769cc99faa24c3ad26b379b786fe7c36fd3c546254801650e6dd" [[package]] name = "scc" -version = "2.2.6" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94b13f8ea6177672c49d12ed964cca44836f59621981b04a3e26b87e675181de" +checksum = "28e1c91382686d21b5ac7959341fcb9780fa7c03773646995a87c950fa7be640" dependencies = [ "sdd", ] [[package]] name = "schannel" -version = "0.1.23" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -2065,20 +2191,20 @@ dependencies = [ [[package]] name = "secp256k1-sys" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1433bd67156263443f14d603720b082dd3121779323fce20cba2aa07b874bc1b" +checksum = "d4387882333d3aa8cb20530a17c69a3752e97837832f34f6dccc760e715001d9" dependencies = [ "cc", ] [[package]] name = "security-framework" -version = "2.10.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "770452e37cad93e0a50d5abc3990d2bc351c36d0328f86cefec2f2fb206eaef6" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.8.0", "core-foundation", "core-foundation-sys", "libc", @@ -2087,9 +2213,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.10.0" +version = "2.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41f3cc463c0ef97e11c3461a9d3787412d30e8e7eb907c79180c4a57bf7c04ef" +checksum = "49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32" dependencies = [ "core-foundation-sys", "libc", @@ -2097,46 +2223,47 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.23" +version = "1.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" +checksum = "f79dfe2d285b0488816f30e700a7438c5a73d816b5b7d3ac72fbc48b0d185e03" [[package]] name = "serde" -version = "1.0.198" +version = "1.0.217" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9846a40c979031340571da2545a4e5b7c4163bdae79b301d5f86d03979451fcc" +checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.198" +version = "1.0.217" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e88edab869b01783ba905e7d0153f9fc1a6505a96e4ad3018011eedb838566d9" +checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.96", ] [[package]] name = "serde_json" -version = "1.0.116" +version = "1.0.138" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" +checksum = "d434192e7da787e94a6ea7e9670b26a036d0ca41e0b7efb2676dd32bae872949" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] [[package]] name = "serde_spanned" -version = "0.6.7" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" +checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" dependencies = [ "serde", ] @@ -2173,7 +2300,7 @@ dependencies = [ "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.6.0", + "indexmap 2.7.1", "serde", "serde_derive", "serde_json", @@ -2190,7 +2317,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.96", ] [[package]] @@ -2199,7 +2326,7 @@ version = "0.9.34+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" dependencies = [ - "indexmap 2.6.0", + "indexmap 2.7.1", "itoa", "ryu", "serde", @@ -2228,7 +2355,7 @@ checksum = "5d69265a08751de7844521fd15003ae0a888e035773ba05695c5c759a6f89eef" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.96", ] [[package]] @@ -2272,9 +2399,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "socket2" -version = "0.5.6" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" +checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8" dependencies = [ "libc", "windows-sys 0.52.0", @@ -2286,6 +2413,12 @@ version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + [[package]] name = "strict_encoding" version = "2.7.0" @@ -2302,7 +2435,7 @@ name = "strict_encoding_derive" version = "2.7.0" dependencies = [ "amplify_syn", - "heck 0.5.0", + "heck", "proc-macro2", "quote", "syn 1.0.109", @@ -2316,7 +2449,7 @@ dependencies = [ "ascii-armor", "baid64", "half", - "indexmap 2.6.0", + "indexmap 2.7.1", "serde", "serde_json", "serde_yaml", @@ -2345,31 +2478,31 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "strum" -version = "0.26.2" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" dependencies = [ "strum_macros", ] [[package]] name = "strum_macros" -version = "0.26.2" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946" +checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" dependencies = [ - "heck 0.4.1", + "heck", "proc-macro2", "quote", "rustversion", - "syn 2.0.66", + "syn 2.0.96", ] [[package]] name = "subtle" -version = "2.5.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" @@ -2384,9 +2517,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.66" +version = "2.0.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" +checksum = "d5d0adab1ae378d7f53bdebc67a39f1f151407ef230f0ce2883572f5d8985c80" dependencies = [ "proc-macro2", "quote", @@ -2402,43 +2535,56 @@ dependencies = [ "futures-core", ] +[[package]] +name = "synstructure" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.96", +] + [[package]] name = "tempfile" -version = "3.10.1" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +checksum = "38c246215d7d24f48ae091a2902398798e05d978b24315d6efbc00ede9a8bb91" dependencies = [ "cfg-if", "fastrand", + "getrandom 0.3.1", + "once_cell", "rustix", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "thiserror" -version = "1.0.59" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa" +checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.59" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66" +checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.96", ] [[package]] name = "time" -version = "0.3.36" +version = "0.3.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21" dependencies = [ "deranged", "itoa", @@ -2457,34 +2603,29 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" +checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de" dependencies = [ "num-conv", "time-core", ] [[package]] -name = "tinyvec" -version = "1.6.0" +name = "tinystr" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" dependencies = [ - "tinyvec_macros", + "displaydoc", + "zerovec", ] -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - [[package]] name = "tokio" -version = "1.37.0" +version = "1.43.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" +checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e" dependencies = [ "backtrace", "bytes", @@ -2492,7 +2633,7 @@ dependencies = [ "mio", "pin-project-lite", "socket2", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -2540,11 +2681,11 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.20" +version = "0.22.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" +checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" dependencies = [ - "indexmap 2.6.0", + "indexmap 2.7.1", "serde", "serde_spanned", "toml_datetime", @@ -2553,14 +2694,14 @@ dependencies = [ [[package]] name = "tower" -version = "0.4.13" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9" dependencies = [ "futures-core", "futures-util", - "pin-project", "pin-project-lite", + "sync_wrapper", "tokio", "tower-layer", "tower-service", @@ -2574,15 +2715,15 @@ checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" [[package]] name = "tower-service" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" -version = "0.1.40" +version = "0.1.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" dependencies = [ "pin-project-lite", "tracing-core", @@ -2590,9 +2731,9 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.32" +version = "0.1.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c" dependencies = [ "once_cell", ] @@ -2609,26 +2750,11 @@ version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" -[[package]] -name = "unicode-bidi" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" - [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[package]] -name = "unicode-normalization" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" -dependencies = [ - "tinyvec", -] +checksum = "a210d160f08b701c8721ba1c726c11662f877ea6b7094007e1ca9a1041945034" [[package]] name = "unsafe-libyaml" @@ -2644,15 +2770,27 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.5.0" +version = "2.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60" dependencies = [ "form_urlencoded", "idna", "percent-encoding", ] +[[package]] +name = "utf16_iter" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" + +[[package]] +name = "utf8_iter" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" + [[package]] name = "vcpkg" version = "0.2.15" @@ -2661,9 +2799,9 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "version_check" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "vesper-lang" @@ -2688,48 +2826,59 @@ version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +[[package]] +name = "wasi" +version = "0.13.3+wasi-0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26816d2e1a4a36a2940b96c5296ce403917633dff8f3440e9b236ed6f6bacad2" +dependencies = [ + "wit-bindgen-rt", +] + [[package]] name = "wasm-bindgen" -version = "0.2.92" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" dependencies = [ "cfg-if", + "once_cell", + "rustversion", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.92" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" dependencies = [ "bumpalo", "log", - "once_cell", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.96", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.42" +version = "0.4.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" +checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61" dependencies = [ "cfg-if", "js-sys", + "once_cell", "wasm-bindgen", "web-sys", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.92" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2737,28 +2886,31 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.92" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.96", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.92" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" +checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" +dependencies = [ + "unicode-ident", +] [[package]] name = "web-sys" -version = "0.3.69" +version = "0.3.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2" dependencies = [ "js-sys", "wasm-bindgen", @@ -2772,9 +2924,9 @@ checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" [[package]] name = "webpki-roots" -version = "0.26.1" +version = "0.26.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009" +checksum = "5d642ff16b7e79272ae451b7322067cdc17cadf68c23264be9d94a32319efe7e" dependencies = [ "rustls-pki-types", ] @@ -2819,7 +2971,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.6", + "windows-targets", ] [[package]] @@ -2830,7 +2982,7 @@ checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" dependencies = [ "windows-result", "windows-strings", - "windows-targets 0.52.6", + "windows-targets", ] [[package]] @@ -2839,7 +2991,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" dependencies = [ - "windows-targets 0.52.6", + "windows-targets", ] [[package]] @@ -2849,16 +3001,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" dependencies = [ "windows-result", - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets 0.48.5", + "windows-targets", ] [[package]] @@ -2867,22 +3010,16 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.6", + "windows-targets", ] [[package]] -name = "windows-targets" -version = "0.48.5" +name = "windows-sys" +version = "0.59.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" dependencies = [ - "windows_aarch64_gnullvm 0.48.5", - "windows_aarch64_msvc 0.48.5", - "windows_i686_gnu 0.48.5", - "windows_i686_msvc 0.48.5", - "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm 0.48.5", - "windows_x86_64_msvc 0.48.5", + "windows-targets", ] [[package]] @@ -2891,46 +3028,28 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.6", - "windows_aarch64_msvc 0.52.6", - "windows_i686_gnu 0.52.6", + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", "windows_i686_gnullvm", - "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", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", ] -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - [[package]] name = "windows_aarch64_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - [[package]] name = "windows_aarch64_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" -[[package]] -name = "windows_i686_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" - [[package]] name = "windows_i686_gnu" version = "0.52.6" @@ -2945,77 +3064,148 @@ checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] -name = "windows_i686_msvc" +name = "windows_x86_64_gnu" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] -name = "windows_x86_64_gnu" -version = "0.48.5" +name = "windows_x86_64_gnullvm" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] -name = "windows_x86_64_gnu" +name = "windows_x86_64_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.5" +name = "winnow" +version = "0.6.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" +checksum = "ad699df48212c6cc6eb4435f35500ac6fd3b9913324f938aea302022ce19d310" +dependencies = [ + "memchr", +] [[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.6" +name = "wit-bindgen-rt" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" +checksum = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c" +dependencies = [ + "bitflags 2.8.0", +] [[package]] -name = "windows_x86_64_msvc" -version = "0.48.5" +name = "write16" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" +checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" [[package]] -name = "windows_x86_64_msvc" -version = "0.52.6" +name = "writeable" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" +checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" [[package]] -name = "winnow" -version = "0.6.18" +name = "yoke" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" +checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40" dependencies = [ - "memchr", + "serde", + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.96", + "synstructure", +] + +[[package]] +name = "zerocopy" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "byteorder", + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.96", +] + +[[package]] +name = "zerofrom" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.96", + "synstructure", ] [[package]] name = "zeroize" -version = "1.8.0" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" + +[[package]] +name = "zerovec" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63381fa6624bf92130a6b87c0d07380116f80b565c42cf0d754136f0238359ef" +checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" dependencies = [ - "zeroize_derive", + "yoke", + "zerofrom", + "zerovec-derive", ] [[package]] -name = "zeroize_derive" -version = "1.4.2" +name = "zerovec-derive" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" +checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.96", ] diff --git a/rgb b/rgb index eb84e9f..b434a33 160000 --- a/rgb +++ b/rgb @@ -1 +1 @@ -Subproject commit eb84e9f263c28d8f2476cf5be562f6535c65c4c0 +Subproject commit b434a337766a75edd5542964ae1d221a641e628f diff --git a/rgb-core b/rgb-core index aec5944..657ab35 160000 --- a/rgb-core +++ b/rgb-core @@ -1 +1 @@ -Subproject commit aec5944f314cb070fe1aa707ff52eae0f43f56ea +Subproject commit 657ab35778b3ab26d639a194f27087077516ddc5 diff --git a/rgb-interfaces b/rgb-interfaces index 79c6d26..87a7acc 160000 --- a/rgb-interfaces +++ b/rgb-interfaces @@ -1 +1 @@ -Subproject commit 79c6d261025c6a728925657151f159b5283002d0 +Subproject commit 87a7acc09e8e07bbfd6eadf0325e8000115b0893 diff --git a/rgb-schemata b/rgb-schemata index 2eefb09..1f4769f 160000 --- a/rgb-schemata +++ b/rgb-schemata @@ -1 +1 @@ -Subproject commit 2eefb0944452c31917940bd2e13e4e11c47aada9 +Subproject commit 1f4769fa81a7e714244eed455ed7dcd6c9e0d538 diff --git a/rgb-std b/rgb-std index 22ffcca..08fc1e9 160000 --- a/rgb-std +++ b/rgb-std @@ -1 +1 @@ -Subproject commit 22ffccae511189b8afe0a2624fc1fd6d73b9c8e4 +Subproject commit 08fc1e94d2db535413847a5d454e67efa093030e diff --git a/tests/fixtures/5703c396115f79a590b092c5e8e9c3780c74f1d4696369414617d7650ea83a09.yaml b/tests/fixtures/5703c396115f79a590b092c5e8e9c3780c74f1d4696369414617d7650ea83a09.yaml deleted file mode 100644 index 89acec1..0000000 --- a/tests/fixtures/5703c396115f79a590b092c5e8e9c3780c74f1d4696369414617d7650ea83a09.yaml +++ /dev/null @@ -1,16 +0,0 @@ -version: 2 -inputs: -- prevOutput: 6eb6e645a0e2e9cb8779a2c8cbfe905988762850f8d4fa307e71c5b71940a4c4:1 - sigScript: '' - sequence: 0 - witness: - - 304402203f537bfa81193ecc7d87ac072abcebb64d1a16f29c7c1cb0d66cdb3ecfa82e0902200f3e94346881f8798c9b6f356b84b9da6401b17406b58cf4e236cbce4bea484001 - - 025241e3da7a8cb9c5f84473edfcee189469c6f7080c47b3069e8243dee0457cf7 -outputs: -- value: 9000 - scriptPubkey: 0014167c8f6c3607bad497ea58a00c8fdc9370f0967a -- value: 99990600 - scriptPubkey: 0014cb239da10e4be279d341c534820558922c7d915c -- value: 0 - scriptPubkey: 6a20f306282396294e3abd121d223a76789cbf1000f929877ae4af8990028cd30b2d -lockTime: 0 diff --git a/tests/fixtures/5af032ce20c361e53d6e339b0985377c6faf0003eed47e9d036b81d9d30139fd.yaml b/tests/fixtures/5af032ce20c361e53d6e339b0985377c6faf0003eed47e9d036b81d9d30139fd.yaml new file mode 100644 index 0000000..b57c118 --- /dev/null +++ b/tests/fixtures/5af032ce20c361e53d6e339b0985377c6faf0003eed47e9d036b81d9d30139fd.yaml @@ -0,0 +1,16 @@ +version: 2 +inputs: +- prevOutput: 8031b8bcababaf4fa55cd2b63271b1860124162242bd03d43100074ed3e9bcea:2 + sigScript: '' + sequence: 0 + witness: + - 304402205a595de6db33a03c52d583863e263ed5a097a859385d4df033ef09a1debfbd5b022004a1bad019abd53b936b7b04f114365b97248125dc8c3fe2713ba41ae94b90c201 + - 03c3e72885a74c65f2261476962bf09a89ac5062d0b9031d58cbeeafbb47a71ca7 +outputs: +- value: 0 + scriptPubkey: 6a20dfca805ff5aa9ead9344c20cd55d957eaf3b71293c741c8c7c7a8e669eccbe4a +- value: 9000 + scriptPubkey: 00140fe0cf9c0629111587c373f9062049ba266512a0 +- value: 99981200 + scriptPubkey: 0014895ab6d909b7dc9a3ffdf78f43040d73d3e8dac6 +lockTime: 0 diff --git a/tests/fixtures/6c05545f455f9a28fdf1c695f1c8e8f3b81adbbe967e95f15460fd74a32d9a4e.yaml b/tests/fixtures/6c05545f455f9a28fdf1c695f1c8e8f3b81adbbe967e95f15460fd74a32d9a4e.yaml new file mode 100644 index 0000000..6dce88c --- /dev/null +++ b/tests/fixtures/6c05545f455f9a28fdf1c695f1c8e8f3b81adbbe967e95f15460fd74a32d9a4e.yaml @@ -0,0 +1,14 @@ +version: 2 +inputs: +- prevOutput: 51005f3bfd454ba7920b85c7484ad95a81fcf0ffa33140c7a3462bd321490140:1 + sigScript: '' + sequence: 0 + witness: + - 3045022100965d3e2bea02c8b6522a7113ceae4a2f769a698c42b5d19c63c6377cb441506d0220041d25bc7510384183d3b2fb2eae0b79fdbc5a9388c48520a6481b4ef25b17e301 + - 02ae658613aefddc5f12a7ec08a6e069d7bce33106213b8f7798de5fdc03592a21 +outputs: +- value: 0 + scriptPubkey: 6a20a8470310f52a2bc380b699566b7f4c46a619a3b784869d76f2525052daed4707 +- value: 99999600 + scriptPubkey: 0014297a04b21b2feba046ade79989ceb49b8f5fdbee +lockTime: 0 diff --git a/tests/fixtures/6d28dcc62ff3b7077e852bc022641d2fb761d9840f9d8a255528af7d974bdc6d.yaml b/tests/fixtures/6d28dcc62ff3b7077e852bc022641d2fb761d9840f9d8a255528af7d974bdc6d.yaml deleted file mode 100644 index 5f059fd..0000000 --- a/tests/fixtures/6d28dcc62ff3b7077e852bc022641d2fb761d9840f9d8a255528af7d974bdc6d.yaml +++ /dev/null @@ -1,14 +0,0 @@ -version: 2 -inputs: -- prevOutput: 4e87943d33d5e2bc8d9fa3d32a016e29a8025fd0e84a0887132b86954b35b773:1 - sigScript: '' - sequence: 0 - witness: - - 3044022003caec05b934a29d33785af3957c3807a10f49e4f2fa6d01d87e3810e3b5d51f022062e109379dbb6102a0778922f791f44136a7fd3193300bf9d976f4352457623a01 - - 03590b8b5f96bf8643055d6ab70be1fc00efd5a3444b8d37267c0398c473a1a6eb -outputs: -- value: 99999600 - scriptPubkey: 00148ce0c67963bffa9ea6c9374be5f24492f36aacfa -- value: 0 - scriptPubkey: 6a20333d646c7d6be9217622962c4046ebf222c52ce68cedbe0833e53bf451b02624 -lockTime: 0 diff --git a/tests/fixtures/797cbdf8b72425b3e4ca512ee58075323afec5ad766579de5b2c6869b2ed6b53.yaml b/tests/fixtures/797cbdf8b72425b3e4ca512ee58075323afec5ad766579de5b2c6869b2ed6b53.yaml deleted file mode 100644 index 43f9e14..0000000 --- a/tests/fixtures/797cbdf8b72425b3e4ca512ee58075323afec5ad766579de5b2c6869b2ed6b53.yaml +++ /dev/null @@ -1,16 +0,0 @@ -version: 2 -inputs: -- prevOutput: ab749bdcd8bc3c5bf8f72ac3ad997cb889930192cae359576765dacae4e5805c:1 - sigScript: '' - sequence: 0 - witness: - - 3045022100ead670ee10ba486e1afe6947dc44bc65a6b60523f9e04e75a5dd230fabbe2bd4022038f39cb7e550cd1935145fc7b57daac02694016941c25f17ec638d75b9ccfb4e01 - - 02e2b1b31881c0fb2670dcdb454ac8ae02de3ced3661e1e666a5d22df5204b4722 -outputs: -- value: 9000 - scriptPubkey: 0014167c8f6c3607bad497ea58a00c8fdc9370f0967a -- value: 99971800 - scriptPubkey: 0014b9216e6cb4140d3bbcd84acfc864f4e885c82251 -- value: 0 - scriptPubkey: 6a208d628fb0a26ce2d9afbef12a9652f690f24aae8c70e55ab8b0041a53b46ba8f8 -lockTime: 0 diff --git a/tests/fixtures/8031b8bcababaf4fa55cd2b63271b1860124162242bd03d43100074ed3e9bcea.yaml b/tests/fixtures/8031b8bcababaf4fa55cd2b63271b1860124162242bd03d43100074ed3e9bcea.yaml new file mode 100644 index 0000000..88e5947 --- /dev/null +++ b/tests/fixtures/8031b8bcababaf4fa55cd2b63271b1860124162242bd03d43100074ed3e9bcea.yaml @@ -0,0 +1,16 @@ +version: 2 +inputs: +- prevOutput: 4fe6ac5345d4eee9118d8c3e6141d733e5aea74e30aa2799a278a10bf562289f:1 + sigScript: '' + sequence: 0 + witness: + - 30440220399c02e2478185981cb62d9d53f38ae6c59e4871e044dd992bf81a25a503d62a02205e06ac14a0fe117a4807d0da1944421fd2dda899857d5a1b4080e7269b0b31ec01 + - 035cf3fac2f4d7747286660ad01aa4cc0ef531acdafe27f9e67482f6fb2fdb7d24 +outputs: +- value: 0 + scriptPubkey: 6a203205d1f39eb4b174ed5c59a6e8fb95465cf19f92dd43094d47e23a149f965120 +- value: 9000 + scriptPubkey: 00140fe0cf9c0629111587c373f9062049ba266512a0 +- value: 99990600 + scriptPubkey: 0014db3384b8be7c824e5bf603db9f222cd6c9bc7501 +lockTime: 0 diff --git a/tests/fixtures/85227b4362a8acebfbe798f63dd3d65c905a5ea91a79b7f4200070ea7aff1e96.yaml b/tests/fixtures/85227b4362a8acebfbe798f63dd3d65c905a5ea91a79b7f4200070ea7aff1e96.yaml new file mode 100644 index 0000000..4fe9fab --- /dev/null +++ b/tests/fixtures/85227b4362a8acebfbe798f63dd3d65c905a5ea91a79b7f4200070ea7aff1e96.yaml @@ -0,0 +1,14 @@ +version: 2 +inputs: +- prevOutput: 6c05545f455f9a28fdf1c695f1c8e8f3b81adbbe967e95f15460fd74a32d9a4e:1 + sigScript: '' + sequence: 0 + witness: + - 30440220687e708f53cf0d1f295cd44883bd97d4d7aed5fc993272eece78c0eda6e9a8ab022051be0e5960eb1792e614c4d705110555e82c1a27608bdd4763e3ed7729870a6101 + - 022ca7364f0b2e813b72f79521fce503e7fdc1dfbfafb84b801925dee0b56263cd +outputs: +- value: 0 + scriptPubkey: 6a2019abe7b35945c3a7d69b2e6b801f64cfdaae151030cd535871e031b92bb43647 +- value: 99999200 + scriptPubkey: 0014e63f5766b92a682cd503014f6350824f1d5f3bf2 +lockTime: 0 diff --git a/tests/fixtures/8f388cc11a7d96e5f792b9b90530ff62c485fc31a50afe769b161eca91059a19.yaml b/tests/fixtures/8f388cc11a7d96e5f792b9b90530ff62c485fc31a50afe769b161eca91059a19.yaml new file mode 100644 index 0000000..35eb414 --- /dev/null +++ b/tests/fixtures/8f388cc11a7d96e5f792b9b90530ff62c485fc31a50afe769b161eca91059a19.yaml @@ -0,0 +1,14 @@ +version: 2 +inputs: +- prevOutput: 85227b4362a8acebfbe798f63dd3d65c905a5ea91a79b7f4200070ea7aff1e96:1 + sigScript: '' + sequence: 0 + witness: + - 3044022031f49f7c3afe7d3f1d13bc0d2eafee63899972dc54ab7445b7a16b0b790869710220144467f5554eea9aa26e15b3603e85443fbd8a5471111fad99f904b0121be37701 + - 0245952387f8fdc06576f66a8dce8713ebe416a7abf79739aeeab947b7335620c4 +outputs: +- value: 0 + scriptPubkey: 6a2099956cf8dff28e684ef46a9d0d818440ceeb32e7945ec5d13e4727a7b4598389 +- value: 99998800 + scriptPubkey: 00143b86b2c751ce26bd310f4aafac5cd5bd517b7fe7 +lockTime: 0 diff --git a/tests/fixtures/91abc4f81b1f62fb064903111a45d1fe8dde012a1993acac9f0485578a25d2ea.yaml b/tests/fixtures/91abc4f81b1f62fb064903111a45d1fe8dde012a1993acac9f0485578a25d2ea.yaml deleted file mode 100644 index ab6cdae..0000000 --- a/tests/fixtures/91abc4f81b1f62fb064903111a45d1fe8dde012a1993acac9f0485578a25d2ea.yaml +++ /dev/null @@ -1,14 +0,0 @@ -version: 2 -inputs: -- prevOutput: 6d28dcc62ff3b7077e852bc022641d2fb761d9840f9d8a255528af7d974bdc6d:0 - sigScript: '' - sequence: 0 - witness: - - 3045022100f1bbf049b1b534a07f8fb7b7fa21ab823c94e3e8501c15acae50b7ddebd16eda0220374b11b9d76b6ac9c8cc29ddcd77584b65ed51c127c10e4c4f5626ae1e85303101 - - 03559f560bb964429088da7af4b4b05b5b9cf8b964dcbae1153adc24acb8cf2c54 -outputs: -- value: 99999200 - scriptPubkey: 001497c953ba395e9870e343f7cdc9c57aa08554809e -- value: 0 - scriptPubkey: 6a20a5dbd41b832cf3a5f8e2819fbedea11d8022bd1b699acc158157cc32f33f1034 -lockTime: 0 diff --git a/tests/fixtures/ab749bdcd8bc3c5bf8f72ac3ad997cb889930192cae359576765dacae4e5805c.yaml b/tests/fixtures/ab749bdcd8bc3c5bf8f72ac3ad997cb889930192cae359576765dacae4e5805c.yaml deleted file mode 100644 index 849c8ac..0000000 --- a/tests/fixtures/ab749bdcd8bc3c5bf8f72ac3ad997cb889930192cae359576765dacae4e5805c.yaml +++ /dev/null @@ -1,16 +0,0 @@ -version: 2 -inputs: -- prevOutput: 5703c396115f79a590b092c5e8e9c3780c74f1d4696369414617d7650ea83a09:1 - sigScript: '' - sequence: 0 - witness: - - 3045022100beb283024bf3d70fedf686e859953fa81f3f7a68b5d5c20d1eb82ae164c2d71a02200591cfc41e328c0ff9de6408ae6a22c847936786a4055d9bd5c46d82e1a5627401 - - 03cbfae1276fc46b158b57cc0a987af6c856e0c339544a11f730a7481078b7d4ab -outputs: -- value: 9000 - scriptPubkey: 0014167c8f6c3607bad497ea58a00c8fdc9370f0967a -- value: 99981200 - scriptPubkey: 001414ffa1967ed9728dba71bf67d4a14d75e74f1297 -- value: 0 - scriptPubkey: 6a209ba6bd0a97040cb45503385ef66b9b63a7e8b5c4ba85ba1676941b8940acbf34 -lockTime: 0 diff --git a/tests/fixtures/attack_bundles_pubWitness_data_input_sequence.yaml b/tests/fixtures/attack_bundles_pubWitness_data_input_sequence.yaml index 1486c36..3893d19 100644 --- a/tests/fixtures/attack_bundles_pubWitness_data_input_sequence.yaml +++ b/tests/fixtures/attack_bundles_pubWitness_data_input_sequence.yaml @@ -1,16 +1,15 @@ version: v2 transfer: true terminals: - 3676470959eb3d3eb390bdf50e5e87ee1906380574270b4420c6a359dd5997e3: 948c0713ae91d12ac2d39c98257bbf0ee561a44d481c54537b423841e509748a + 4ab3bef60afe5fbd9c0c5d08feec73b01687b347ea79e0d3970663ad9850daa9: 12497163e047b0cb755b5c23bfc0ce3801eaf563ee411aa0cd2e1f44e1235f2f genesis: ffv: 0 schemaId: rgb:sch:RDYhMTR!9gv8Y2GLv9UNBEK1hcrCmdLDFk9Qd5fnO8k#brave-dinner-banana flags: null - timestamp: 1737730419 + timestamp: 1738145372 issuer: ssi:anonymous layer1: bitcoin testnet: true - closeMethod: opretFirst metadata: {} globals: 2000: @@ -24,9 +23,9 @@ genesis: type: fungible items: - seal: - txid: 4e87943d33d5e2bc8d9fa3d32a016e29a8025fd0e84a0887132b86954b35b773 + txid: 51005f3bfd454ba7920b85c7484ad95a81fcf0ffa33140c7a3462bd321490140 vout: 1 - blinding: 4599635048961286613 + blinding: 2004000911213883459 state: value: 666 lock: null @@ -37,40 +36,39 @@ bundles: - pubWitness: !tx version: 2 inputs: - - prevOutput: 4e87943d33d5e2bc8d9fa3d32a016e29a8025fd0e84a0887132b86954b35b773:1 + - prevOutput: 85227b4362a8acebfbe798f63dd3d65c905a5ea91a79b7f4200070ea7aff1e96:1 sigScript: '' sequence: 1 witness: [] outputs: - - value: 99999600 - scriptPubkey: 00148ce0c67963bffa9ea6c9374be5f24492f36aacfa - value: 0 - scriptPubkey: 6a20333d646c7d6be9217622962c4046ebf222c52ce68cedbe0833e53bf451b02624 + scriptPubkey: 6a2099956cf8dff28e684ef46a9d0d818440ceeb32e7945ec5d13e4727a7b4598389 + - value: 99998800 + scriptPubkey: 00143b86b2c751ce26bd310f4aafac5cd5bd517b7fe7 lockTime: 0 - anchoredBundles: !opret + anchoredBundle: !opret mpcProof: - pos: 1 + pos: 3 cofactor: 0 path: - - 3eda4607c8099cee7ed29058cc208d11b6c6bb75336deb5e4b7c650084a6f56b - - c83ac65ea18a27464bd05f56623aad0357fd76ad5bbabd7b58cde8e4a536b284 - - 3d1bde5ea62b810147de240df8e334f66325f783698af6f4f3fd4665ad941708 + - fb885abdd5a2e72bf1714b5666c1c77ce6b7347e872274622d1baa0349431217 + - 03157050a93f59ae418217da5635c306f1d3ee81d005c42283c5de7ad204db76 + - f50a8164b53c017fec1138ba6b7c429b24df41e6c066636d7a251a5e751ecd3e dbcProof: null bundle: - closeMethod: opretFirst inputMap: - 0: 747b3d26714b00ba375f890ab7f61088f9b6666a42374b580914aa9614bebb0a + 0: bae1252c01d9bc2e0f0c179bc62552953d3053f58b5742e03ec1945a373147a4 knownTransitions: - 747b3d26714b00ba375f890ab7f61088f9b6666a42374b580914aa9614bebb0a: + bae1252c01d9bc2e0f0c179bc62552953d3053f58b5742e03ec1945a373147a4: ffv: 0 - contractId: rgb:0YoUHEEQ-V0JX1pF-AzYkTkJ-qDP8meQ-Qr1UM8I-YDhlOyI + contractId: rgb:8zzFt!vC-g142mXf-C58$HSD-l2$UscZ-jhW3MO2-YQcLN$U nonce: 18446744073709551615 - transitionType: 65535 + transitionType: 10000 metadata: {} globals: {} inputs: - prevOut: - op: d18a141c4110574257d69140cd8913909a833fc99e410af550cf086038653b22 + op: 81ea350c64c959ae35344da8011dafb38e6dddad342b398956c2f3ebc82ee15e ty: 4000 no: 0 assignments: @@ -79,10 +77,14 @@ bundles: items: - seal: txid: null - vout: 0 - blinding: 9973624271426555302 + vout: 1 + blinding: 13755779618184824973 state: - value: 666 + value: 539 + lock: null + - seal: 12497163e047b0cb755b5c23bfc0ce3801eaf563ee411aa0cd2e1f44e1235f2f + state: + value: 77 lock: null valencies: [] validator: null @@ -90,40 +92,39 @@ bundles: - pubWitness: !tx version: 2 inputs: - - prevOutput: 6d28dcc62ff3b7077e852bc022641d2fb761d9840f9d8a255528af7d974bdc6d:0 + - prevOutput: 51005f3bfd454ba7920b85c7484ad95a81fcf0ffa33140c7a3462bd321490140:1 sigScript: '' sequence: 0 witness: [] outputs: - - value: 99999200 - scriptPubkey: 001497c953ba395e9870e343f7cdc9c57aa08554809e - value: 0 - scriptPubkey: 6a20a5dbd41b832cf3a5f8e2819fbedea11d8022bd1b699acc158157cc32f33f1034 + scriptPubkey: 6a20a8470310f52a2bc380b699566b7f4c46a619a3b784869d76f2525052daed4707 + - value: 99999600 + scriptPubkey: 0014297a04b21b2feba046ade79989ceb49b8f5fdbee lockTime: 0 - anchoredBundles: !opret + anchoredBundle: !opret mpcProof: - pos: 1 + pos: 3 cofactor: 0 path: - - 145227bc721c182a22e23c22743e06695be97bfc2caed28b891e0a7d9ed3d47e - - 73eb9075ad2905ddd0e8d9072f8ea27b190ef866c946b64b83c297eab84b93d9 - - eecec0f90c7e30d5ad9cc6e1efb4ff64bd4c3334343733c7f4694a0b0c13ad10 + - 1a04c3f3848176b61be3f16150f0e17ef145a93592c4d49f076052249d728f46 + - 3e01d0697270bee19915aab7889a8ed25330d7635dc9799fe94c2ae9503cd8f0 + - 9f6c2320546549c859b701e15e87d0fa7b0196ca342372ca9c5ed1d4c01e47df dbcProof: null bundle: - closeMethod: opretFirst inputMap: - 0: e241bab92562f8668d81bccbf1ece30aa6f5c0fbf28207937405a0066ce55af9 + 0: 8d68ac6fde82bca2848d5ad1ce4d595cc550313f73db216593d5ff0adf889d7b knownTransitions: - e241bab92562f8668d81bccbf1ece30aa6f5c0fbf28207937405a0066ce55af9: + 8d68ac6fde82bca2848d5ad1ce4d595cc550313f73db216593d5ff0adf889d7b: ffv: 0 - contractId: rgb:0YoUHEEQ-V0JX1pF-AzYkTkJ-qDP8meQ-Qr1UM8I-YDhlOyI + contractId: rgb:8zzFt!vC-g142mXf-C58$HSD-l2$UscZ-jhW3MO2-YQcLN$U nonce: 18446744073709551615 - transitionType: 10000 + transitionType: 65535 metadata: {} globals: {} inputs: - prevOut: - op: 747b3d26714b00ba375f890ab7f61088f9b6666a42374b580914aa9614bebb0a + op: f33cc5b7ebc2835e369977c2e7cfc7483976fd4b1c663856dcc3b661070b37f5 ty: 4000 no: 0 assignments: @@ -132,14 +133,10 @@ bundles: items: - seal: txid: null - vout: 0 - blinding: 6657697891347327806 - state: - value: 616 - lock: null - - seal: 6b113470a4988f61b771777b911ebe47f373115a66ef36b7f5858359b81de2f8 + vout: 1 + blinding: 1993587569937574720 state: - value: 50 + value: 666 lock: null valencies: [] validator: null @@ -147,40 +144,39 @@ bundles: - pubWitness: !tx version: 2 inputs: - - prevOutput: 91abc4f81b1f62fb064903111a45d1fe8dde012a1993acac9f0485578a25d2ea:0 + - prevOutput: 6c05545f455f9a28fdf1c695f1c8e8f3b81adbbe967e95f15460fd74a32d9a4e:1 sigScript: '' sequence: 0 witness: [] outputs: - - value: 99998800 - scriptPubkey: 0014050e4d2fb6b8bedec6c381d88133bef3568e5f2c - value: 0 - scriptPubkey: 6a20d7c3c06fb6c859455a1f2d429d8b533a7b483acff93a8fa8d2638eb96fc2be86 + scriptPubkey: 6a2019abe7b35945c3a7d69b2e6b801f64cfdaae151030cd535871e031b92bb43647 + - value: 99999200 + scriptPubkey: 0014e63f5766b92a682cd503014f6350824f1d5f3bf2 lockTime: 0 - anchoredBundles: !opret + anchoredBundle: !opret mpcProof: - pos: 1 + pos: 3 cofactor: 0 path: - - c741f798afb91b88054c9cb37f4498c49b3e69ed5e0ac58758f8de36bae37dca - - 8adb7c1594553820d30732e6e0958682439eb98cf689b7fb72b2d13d3585873d - - 2e912950ba884793e3ee6fc605cbd54d2a9eefcf8559c84a0ed7030d693c9230 + - f92c5d431658da44c83a1de8e9e4b750dfc16ebb5cd1629d6875d858092bf207 + - bc67304b537304ee64f5b30bae54be1965e7a5128ec54c8feddfc8079e2dc83a + - dfd7cbed07016493b74ab9305facafb750f2f75a3fbc536f6fefe02b758bcc86 dbcProof: null bundle: - closeMethod: opretFirst inputMap: - 0: 46b2ed3ca20f155d93175ba0778d9c56482d686a0ca8b6434a0b34e76865b3d7 + 0: 81ea350c64c959ae35344da8011dafb38e6dddad342b398956c2f3ebc82ee15e knownTransitions: - 46b2ed3ca20f155d93175ba0778d9c56482d686a0ca8b6434a0b34e76865b3d7: + 81ea350c64c959ae35344da8011dafb38e6dddad342b398956c2f3ebc82ee15e: ffv: 0 - contractId: rgb:0YoUHEEQ-V0JX1pF-AzYkTkJ-qDP8meQ-Qr1UM8I-YDhlOyI + contractId: rgb:8zzFt!vC-g142mXf-C58$HSD-l2$UscZ-jhW3MO2-YQcLN$U nonce: 18446744073709551615 transitionType: 10000 metadata: {} globals: {} inputs: - prevOut: - op: e241bab92562f8668d81bccbf1ece30aa6f5c0fbf28207937405a0066ce55af9 + op: 8d68ac6fde82bca2848d5ad1ce4d595cc550313f73db216593d5ff0adf889d7b ty: 4000 no: 0 assignments: @@ -189,14 +185,14 @@ bundles: items: - seal: txid: null - vout: 0 - blinding: 17716466475096873734 + vout: 1 + blinding: 534524423585145607 state: - value: 539 + value: 616 lock: null - - seal: 948c0713ae91d12ac2d39c98257bbf0ee561a44d481c54537b423841e509748a + - seal: e73cfbbe876bc9b571343881f1c019b1de22aa35dea11a377116af988bd4f22a state: - value: 77 + value: 50 lock: null valencies: [] validator: null diff --git a/tests/fixtures/attack_chain.yaml b/tests/fixtures/attack_chain.yaml index 7264901..1301081 100644 --- a/tests/fixtures/attack_chain.yaml +++ b/tests/fixtures/attack_chain.yaml @@ -1,16 +1,15 @@ version: v2 transfer: true terminals: - 3676470959eb3d3eb390bdf50e5e87ee1906380574270b4420c6a359dd5997e3: 948c0713ae91d12ac2d39c98257bbf0ee561a44d481c54537b423841e509748a + 4ab3bef60afe5fbd9c0c5d08feec73b01687b347ea79e0d3970663ad9850daa9: 12497163e047b0cb755b5c23bfc0ce3801eaf563ee411aa0cd2e1f44e1235f2f genesis: ffv: 0 schemaId: rgb:sch:RDYhMTR!9gv8Y2GLv9UNBEK1hcrCmdLDFk9Qd5fnO8k#brave-dinner-banana flags: null - timestamp: 1737730419 + timestamp: 1738145372 issuer: ssi:anonymous layer1: liquid testnet: true - closeMethod: opretFirst metadata: {} globals: 2000: @@ -24,9 +23,9 @@ genesis: type: fungible items: - seal: - txid: 4e87943d33d5e2bc8d9fa3d32a016e29a8025fd0e84a0887132b86954b35b773 + txid: 51005f3bfd454ba7920b85c7484ad95a81fcf0ffa33140c7a3462bd321490140 vout: 1 - blinding: 4599635048961286613 + blinding: 2004000911213883459 state: value: 666 lock: null @@ -37,40 +36,39 @@ bundles: - pubWitness: !tx version: 2 inputs: - - prevOutput: 4e87943d33d5e2bc8d9fa3d32a016e29a8025fd0e84a0887132b86954b35b773:1 + - prevOutput: 85227b4362a8acebfbe798f63dd3d65c905a5ea91a79b7f4200070ea7aff1e96:1 sigScript: '' sequence: 0 witness: [] outputs: - - value: 99999600 - scriptPubkey: 00148ce0c67963bffa9ea6c9374be5f24492f36aacfa - value: 0 - scriptPubkey: 6a20333d646c7d6be9217622962c4046ebf222c52ce68cedbe0833e53bf451b02624 + scriptPubkey: 6a2099956cf8dff28e684ef46a9d0d818440ceeb32e7945ec5d13e4727a7b4598389 + - value: 99998800 + scriptPubkey: 00143b86b2c751ce26bd310f4aafac5cd5bd517b7fe7 lockTime: 0 - anchoredBundles: !opret + anchoredBundle: !opret mpcProof: - pos: 1 + pos: 3 cofactor: 0 path: - - 3eda4607c8099cee7ed29058cc208d11b6c6bb75336deb5e4b7c650084a6f56b - - c83ac65ea18a27464bd05f56623aad0357fd76ad5bbabd7b58cde8e4a536b284 - - 3d1bde5ea62b810147de240df8e334f66325f783698af6f4f3fd4665ad941708 + - fb885abdd5a2e72bf1714b5666c1c77ce6b7347e872274622d1baa0349431217 + - 03157050a93f59ae418217da5635c306f1d3ee81d005c42283c5de7ad204db76 + - f50a8164b53c017fec1138ba6b7c429b24df41e6c066636d7a251a5e751ecd3e dbcProof: null bundle: - closeMethod: opretFirst inputMap: - 0: 747b3d26714b00ba375f890ab7f61088f9b6666a42374b580914aa9614bebb0a + 0: bae1252c01d9bc2e0f0c179bc62552953d3053f58b5742e03ec1945a373147a4 knownTransitions: - 747b3d26714b00ba375f890ab7f61088f9b6666a42374b580914aa9614bebb0a: + bae1252c01d9bc2e0f0c179bc62552953d3053f58b5742e03ec1945a373147a4: ffv: 0 - contractId: rgb:0YoUHEEQ-V0JX1pF-AzYkTkJ-qDP8meQ-Qr1UM8I-YDhlOyI + contractId: rgb:8zzFt!vC-g142mXf-C58$HSD-l2$UscZ-jhW3MO2-YQcLN$U nonce: 18446744073709551615 - transitionType: 65535 + transitionType: 10000 metadata: {} globals: {} inputs: - prevOut: - op: d18a141c4110574257d69140cd8913909a833fc99e410af550cf086038653b22 + op: 81ea350c64c959ae35344da8011dafb38e6dddad342b398956c2f3ebc82ee15e ty: 4000 no: 0 assignments: @@ -79,10 +77,14 @@ bundles: items: - seal: txid: null - vout: 0 - blinding: 9973624271426555302 + vout: 1 + blinding: 13755779618184824973 state: - value: 666 + value: 539 + lock: null + - seal: 12497163e047b0cb755b5c23bfc0ce3801eaf563ee411aa0cd2e1f44e1235f2f + state: + value: 77 lock: null valencies: [] validator: null @@ -90,40 +92,39 @@ bundles: - pubWitness: !tx version: 2 inputs: - - prevOutput: 6d28dcc62ff3b7077e852bc022641d2fb761d9840f9d8a255528af7d974bdc6d:0 + - prevOutput: 51005f3bfd454ba7920b85c7484ad95a81fcf0ffa33140c7a3462bd321490140:1 sigScript: '' sequence: 0 witness: [] outputs: - - value: 99999200 - scriptPubkey: 001497c953ba395e9870e343f7cdc9c57aa08554809e - value: 0 - scriptPubkey: 6a20a5dbd41b832cf3a5f8e2819fbedea11d8022bd1b699acc158157cc32f33f1034 + scriptPubkey: 6a20a8470310f52a2bc380b699566b7f4c46a619a3b784869d76f2525052daed4707 + - value: 99999600 + scriptPubkey: 0014297a04b21b2feba046ade79989ceb49b8f5fdbee lockTime: 0 - anchoredBundles: !opret + anchoredBundle: !opret mpcProof: - pos: 1 + pos: 3 cofactor: 0 path: - - 145227bc721c182a22e23c22743e06695be97bfc2caed28b891e0a7d9ed3d47e - - 73eb9075ad2905ddd0e8d9072f8ea27b190ef866c946b64b83c297eab84b93d9 - - eecec0f90c7e30d5ad9cc6e1efb4ff64bd4c3334343733c7f4694a0b0c13ad10 + - 1a04c3f3848176b61be3f16150f0e17ef145a93592c4d49f076052249d728f46 + - 3e01d0697270bee19915aab7889a8ed25330d7635dc9799fe94c2ae9503cd8f0 + - 9f6c2320546549c859b701e15e87d0fa7b0196ca342372ca9c5ed1d4c01e47df dbcProof: null bundle: - closeMethod: opretFirst inputMap: - 0: e241bab92562f8668d81bccbf1ece30aa6f5c0fbf28207937405a0066ce55af9 + 0: 8d68ac6fde82bca2848d5ad1ce4d595cc550313f73db216593d5ff0adf889d7b knownTransitions: - e241bab92562f8668d81bccbf1ece30aa6f5c0fbf28207937405a0066ce55af9: + 8d68ac6fde82bca2848d5ad1ce4d595cc550313f73db216593d5ff0adf889d7b: ffv: 0 - contractId: rgb:0YoUHEEQ-V0JX1pF-AzYkTkJ-qDP8meQ-Qr1UM8I-YDhlOyI + contractId: rgb:8zzFt!vC-g142mXf-C58$HSD-l2$UscZ-jhW3MO2-YQcLN$U nonce: 18446744073709551615 - transitionType: 10000 + transitionType: 65535 metadata: {} globals: {} inputs: - prevOut: - op: 747b3d26714b00ba375f890ab7f61088f9b6666a42374b580914aa9614bebb0a + op: f33cc5b7ebc2835e369977c2e7cfc7483976fd4b1c663856dcc3b661070b37f5 ty: 4000 no: 0 assignments: @@ -132,14 +133,10 @@ bundles: items: - seal: txid: null - vout: 0 - blinding: 6657697891347327806 - state: - value: 616 - lock: null - - seal: 6b113470a4988f61b771777b911ebe47f373115a66ef36b7f5858359b81de2f8 + vout: 1 + blinding: 1993587569937574720 state: - value: 50 + value: 666 lock: null valencies: [] validator: null @@ -147,40 +144,39 @@ bundles: - pubWitness: !tx version: 2 inputs: - - prevOutput: 91abc4f81b1f62fb064903111a45d1fe8dde012a1993acac9f0485578a25d2ea:0 + - prevOutput: 6c05545f455f9a28fdf1c695f1c8e8f3b81adbbe967e95f15460fd74a32d9a4e:1 sigScript: '' sequence: 0 witness: [] outputs: - - value: 99998800 - scriptPubkey: 0014050e4d2fb6b8bedec6c381d88133bef3568e5f2c - value: 0 - scriptPubkey: 6a20d7c3c06fb6c859455a1f2d429d8b533a7b483acff93a8fa8d2638eb96fc2be86 + scriptPubkey: 6a2019abe7b35945c3a7d69b2e6b801f64cfdaae151030cd535871e031b92bb43647 + - value: 99999200 + scriptPubkey: 0014e63f5766b92a682cd503014f6350824f1d5f3bf2 lockTime: 0 - anchoredBundles: !opret + anchoredBundle: !opret mpcProof: - pos: 1 + pos: 3 cofactor: 0 path: - - c741f798afb91b88054c9cb37f4498c49b3e69ed5e0ac58758f8de36bae37dca - - 8adb7c1594553820d30732e6e0958682439eb98cf689b7fb72b2d13d3585873d - - 2e912950ba884793e3ee6fc605cbd54d2a9eefcf8559c84a0ed7030d693c9230 + - f92c5d431658da44c83a1de8e9e4b750dfc16ebb5cd1629d6875d858092bf207 + - bc67304b537304ee64f5b30bae54be1965e7a5128ec54c8feddfc8079e2dc83a + - dfd7cbed07016493b74ab9305facafb750f2f75a3fbc536f6fefe02b758bcc86 dbcProof: null bundle: - closeMethod: opretFirst inputMap: - 0: 46b2ed3ca20f155d93175ba0778d9c56482d686a0ca8b6434a0b34e76865b3d7 + 0: 81ea350c64c959ae35344da8011dafb38e6dddad342b398956c2f3ebc82ee15e knownTransitions: - 46b2ed3ca20f155d93175ba0778d9c56482d686a0ca8b6434a0b34e76865b3d7: + 81ea350c64c959ae35344da8011dafb38e6dddad342b398956c2f3ebc82ee15e: ffv: 0 - contractId: rgb:0YoUHEEQ-V0JX1pF-AzYkTkJ-qDP8meQ-Qr1UM8I-YDhlOyI + contractId: rgb:8zzFt!vC-g142mXf-C58$HSD-l2$UscZ-jhW3MO2-YQcLN$U nonce: 18446744073709551615 transitionType: 10000 metadata: {} globals: {} inputs: - prevOut: - op: e241bab92562f8668d81bccbf1ece30aa6f5c0fbf28207937405a0066ce55af9 + op: 8d68ac6fde82bca2848d5ad1ce4d595cc550313f73db216593d5ff0adf889d7b ty: 4000 no: 0 assignments: @@ -189,14 +185,14 @@ bundles: items: - seal: txid: null - vout: 0 - blinding: 17716466475096873734 + vout: 1 + blinding: 534524423585145607 state: - value: 539 + value: 616 lock: null - - seal: 948c0713ae91d12ac2d39c98257bbf0ee561a44d481c54537b423841e509748a + - seal: e73cfbbe876bc9b571343881f1c019b1de22aa35dea11a377116af988bd4f22a state: - value: 77 + value: 50 lock: null valencies: [] validator: null diff --git a/tests/fixtures/attack_genesis_schema_id.yaml b/tests/fixtures/attack_genesis_schema_id.yaml index 8a96641..58882cc 100644 --- a/tests/fixtures/attack_genesis_schema_id.yaml +++ b/tests/fixtures/attack_genesis_schema_id.yaml @@ -5,11 +5,10 @@ genesis: ffv: 0 schemaId: rgb:sch:cJjPZfUpkOqIWhpCTqYJtFYzLfz$AB3JNxIEOJZYn28#circus-version-silence flags: null - timestamp: 1737730619 + timestamp: 1738145453 issuer: ssi:anonymous layer1: bitcoin testnet: true - closeMethod: opretFirst metadata: {} globals: 2000: @@ -23,9 +22,9 @@ genesis: type: fungible items: - seal: - txid: 6eb6e645a0e2e9cb8779a2c8cbfe905988762850f8d4fa307e71c5b71940a4c4 + txid: 4fe6ac5345d4eee9118d8c3e6141d733e5aea74e30aa2799a278a10bf562289f vout: 1 - blinding: 8363182511491119200 + blinding: 18353740783625039159 state: value: 666 lock: null @@ -36,44 +35,43 @@ bundles: - pubWitness: !tx version: 2 inputs: - - prevOutput: 6eb6e645a0e2e9cb8779a2c8cbfe905988762850f8d4fa307e71c5b71940a4c4:1 + - prevOutput: 5af032ce20c361e53d6e339b0985377c6faf0003eed47e9d036b81d9d30139fd:2 sigScript: '' sequence: 0 witness: [] outputs: - - value: 9000 - scriptPubkey: 0014167c8f6c3607bad497ea58a00c8fdc9370f0967a - - value: 99990600 - scriptPubkey: 0014cb239da10e4be279d341c534820558922c7d915c - value: 0 - scriptPubkey: 6a20f306282396294e3abd121d223a76789cbf1000f929877ae4af8990028cd30b2d + scriptPubkey: 6a20890df36a5f4d5fc083c1da585765585942e1f0083f3c942d9520dbd89b941ca4 + - value: 9000 + scriptPubkey: 00140fe0cf9c0629111587c373f9062049ba266512a0 + - value: 99971800 + scriptPubkey: 0014d55f8eb4af477a4d1a9a32c7a95ee42af25ddf68 lockTime: 0 - anchoredBundles: !opret + anchoredBundle: !opret mpcProof: - pos: 3 + pos: 6 cofactor: 0 path: - - 19b79517f4760ebbe9884cc3bcc8a54311e0acb3cee3cd385aba8da5f915661e - - 8b708aefd48fd30b6969144ab46dd160215cfa5031cc47a6a9d59764b35089e1 - - 4b486c77626335d32930625b27d5bc34eba1cc63b947570881c9768751478704 + - 8d7deebca350381891ee7fd2e630be0679c93b9ab0502d26e009591308ec4275 + - 73fc1e645e295ff2097b531a8714df07b87fd77d90e168fdb0ee4117e7c567f8 + - 5169c2e1286b17e8b8341043bb1d55f33905475679e2d837efea2636bca50429 dbcProof: null bundle: - closeMethod: opretFirst inputMap: - 0: 845add8c4eab05069a2a42ae95fb042dedec33332a3e9191c77db61f4df84244 + 0: cf0c2dceda7ec15da1b95c79801323917c3f3cdb6c7533b4470d4b6695ad0a6f knownTransitions: - 845add8c4eab05069a2a42ae95fb042dedec33332a3e9191c77db61f4df84244: + cf0c2dceda7ec15da1b95c79801323917c3f3cdb6c7533b4470d4b6695ad0a6f: ffv: 0 - contractId: rgb:4wAZhgAm-cDJ159t-0p8mhJh-4NnMUU5-67zpHfC-IGMDAyE + contractId: rgb:dhbpy4Ok-FTh0FR4-jKPwY$F-hYyBk8F-0DWa0nT-afM6yU0 nonce: 18446744073709551615 - transitionType: 65535 + transitionType: 10000 metadata: {} globals: {} inputs: - prevOut: - op: e30019860026703275e7db74a7c9a1261e0d9cc514e7aef3a477c22063030321 + op: 174281dbbc943694f1f01a98895b70e62a0fc962f5a1f6f9077895eaa0868b57 ty: 4000 - no: 0 + no: 1 assignments: 4000: type: fungible @@ -81,9 +79,16 @@ bundles: - seal: txid: null vout: 1 - blinding: 3683730669581162294 + blinding: 3760686973782879092 state: - value: 666 + value: 77 + lock: null + - seal: + txid: null + vout: 2 + blinding: 7733269115535512569 + state: + value: 539 lock: null valencies: [] validator: null @@ -91,61 +96,53 @@ bundles: - pubWitness: !tx version: 2 inputs: - - prevOutput: ab749bdcd8bc3c5bf8f72ac3ad997cb889930192cae359576765dacae4e5805c:1 + - prevOutput: 4fe6ac5345d4eee9118d8c3e6141d733e5aea74e30aa2799a278a10bf562289f:1 sigScript: '' sequence: 0 witness: [] outputs: - - value: 9000 - scriptPubkey: 0014167c8f6c3607bad497ea58a00c8fdc9370f0967a - - value: 99971800 - scriptPubkey: 0014b9216e6cb4140d3bbcd84acfc864f4e885c82251 - value: 0 - scriptPubkey: 6a208d628fb0a26ce2d9afbef12a9652f690f24aae8c70e55ab8b0041a53b46ba8f8 + scriptPubkey: 6a203205d1f39eb4b174ed5c59a6e8fb95465cf19f92dd43094d47e23a149f965120 + - value: 9000 + scriptPubkey: 00140fe0cf9c0629111587c373f9062049ba266512a0 + - value: 99990600 + scriptPubkey: 0014db3384b8be7c824e5bf603db9f222cd6c9bc7501 lockTime: 0 - anchoredBundles: !opret + anchoredBundle: !opret mpcProof: - pos: 3 + pos: 6 cofactor: 0 path: - - dbc3161e11e0e25a38da146721b44478e1b7dddae65199f44e79b8205964ad13 - - af278414d3ec80bc1ac581ecf534b73265aa48d9d786106d13c81260cf39b33b - - 6d8922dfc2cb6dc28b2e7554ee79532136aecf58a3b98c279da601fa244cf7c3 + - ba39220a30243a8e15e0ebf2afe8d16837b04c20c170a99fdbf2fe185e8a6618 + - 9c09ac6b0271a99972326ddf37900893af168fe1adf2127536ad59858a5d00ca + - 048a6d0e0184cc10dbb4a7bb2b377e94fd12ed388ef34c716e5dc25fa60cecf8 dbcProof: null bundle: - closeMethod: opretFirst inputMap: - 0: 12ed1c6ee5c46cd77a7a46e7327e51264124eb260a8af329d0bef43b8aedf306 + 0: d6d79b07beff62930f6c110ecf83088d8d023057725561074cf549765deff3fc knownTransitions: - 12ed1c6ee5c46cd77a7a46e7327e51264124eb260a8af329d0bef43b8aedf306: + d6d79b07beff62930f6c110ecf83088d8d023057725561074cf549765deff3fc: ffv: 0 - contractId: rgb:4wAZhgAm-cDJ159t-0p8mhJh-4NnMUU5-67zpHfC-IGMDAyE + contractId: rgb:dhbpy4Ok-FTh0FR4-jKPwY$F-hYyBk8F-0DWa0nT-afM6yU0 nonce: 18446744073709551615 - transitionType: 10000 + transitionType: 65535 metadata: {} globals: {} inputs: - prevOut: - op: 63f5746aa199a97d4327f4ca46fb850137befcfa51710c2165d70a16bf5a108d + op: 7616e9cb83a4153874151e2328fc18fc5858c8193c1740d66b49d369f33ac94d ty: 4000 - no: 1 + no: 0 assignments: 4000: type: fungible items: - seal: txid: null - vout: 0 - blinding: 17652372255402873474 + vout: 2 + blinding: 4823689504124827659 state: - value: 77 - lock: null - - seal: - txid: null - vout: 1 - blinding: 3871916531693334801 - state: - value: 539 + value: 666 lock: null valencies: [] validator: null @@ -153,42 +150,41 @@ bundles: - pubWitness: !tx version: 2 inputs: - - prevOutput: 5703c396115f79a590b092c5e8e9c3780c74f1d4696369414617d7650ea83a09:1 + - prevOutput: 8031b8bcababaf4fa55cd2b63271b1860124162242bd03d43100074ed3e9bcea:2 sigScript: '' sequence: 0 witness: [] outputs: + - value: 0 + scriptPubkey: 6a20dfca805ff5aa9ead9344c20cd55d957eaf3b71293c741c8c7c7a8e669eccbe4a - value: 9000 - scriptPubkey: 0014167c8f6c3607bad497ea58a00c8fdc9370f0967a + scriptPubkey: 00140fe0cf9c0629111587c373f9062049ba266512a0 - value: 99981200 - scriptPubkey: 001414ffa1967ed9728dba71bf67d4a14d75e74f1297 - - value: 0 - scriptPubkey: 6a209ba6bd0a97040cb45503385ef66b9b63a7e8b5c4ba85ba1676941b8940acbf34 + scriptPubkey: 0014895ab6d909b7dc9a3ffdf78f43040d73d3e8dac6 lockTime: 0 - anchoredBundles: !opret + anchoredBundle: !opret mpcProof: - pos: 3 + pos: 6 cofactor: 0 path: - - 3286e7c5016bf783c0b7447875c9d1ba41781c7916631e79dc72c154c9300109 - - 63c3d73bedc75d7330ad1ff8f81717302c1d1a5b8896dcc1c0f6357b463748cf - - e37f2e45d0af97639eafbabdd1ff22fd4df29f7b965b070fbb74032ab884be03 + - fa92482fc4f4eb8259f1724f0f0bc0b3d7301d7394a7d6964528d89f7b2a4498 + - 03d9a36380b63976a07be6c512fa14be63e9a1ecaa50c1bb3299410957587007 + - 70ed976056471c1783946dfbce682b5f294579738f470de92dbf0d458a33c471 dbcProof: null bundle: - closeMethod: opretFirst inputMap: - 0: 63f5746aa199a97d4327f4ca46fb850137befcfa51710c2165d70a16bf5a108d + 0: 174281dbbc943694f1f01a98895b70e62a0fc962f5a1f6f9077895eaa0868b57 knownTransitions: - 63f5746aa199a97d4327f4ca46fb850137befcfa51710c2165d70a16bf5a108d: + 174281dbbc943694f1f01a98895b70e62a0fc962f5a1f6f9077895eaa0868b57: ffv: 0 - contractId: rgb:4wAZhgAm-cDJ159t-0p8mhJh-4NnMUU5-67zpHfC-IGMDAyE + contractId: rgb:dhbpy4Ok-FTh0FR4-jKPwY$F-hYyBk8F-0DWa0nT-afM6yU0 nonce: 18446744073709551615 transitionType: 10000 metadata: {} globals: {} inputs: - prevOut: - op: 845add8c4eab05069a2a42ae95fb042dedec33332a3e9191c77db61f4df84244 + op: d6d79b07beff62930f6c110ecf83088d8d023057725561074cf549765deff3fc ty: 4000 no: 0 assignments: @@ -197,15 +193,15 @@ bundles: items: - seal: txid: null - vout: 0 - blinding: 4832660419085226933 + vout: 1 + blinding: 2830032041885698870 state: value: 50 lock: null - seal: txid: null - vout: 1 - blinding: 10554107260595836881 + vout: 2 + blinding: 12263532041373393736 state: value: 616 lock: null diff --git a/tests/fixtures/attack_genesis_testnet.yaml b/tests/fixtures/attack_genesis_testnet.yaml index 5656336..a450f63 100644 --- a/tests/fixtures/attack_genesis_testnet.yaml +++ b/tests/fixtures/attack_genesis_testnet.yaml @@ -5,11 +5,10 @@ genesis: ffv: 0 schemaId: rgb:sch:RDYhMTR!9gv8Y2GLv9UNBEK1hcrCmdLDFk9Qd5fnO8k#brave-dinner-banana flags: null - timestamp: 1737730619 + timestamp: 1738145453 issuer: ssi:anonymous layer1: bitcoin testnet: false - closeMethod: opretFirst metadata: {} globals: 2000: @@ -23,9 +22,9 @@ genesis: type: fungible items: - seal: - txid: 6eb6e645a0e2e9cb8779a2c8cbfe905988762850f8d4fa307e71c5b71940a4c4 + txid: 4fe6ac5345d4eee9118d8c3e6141d733e5aea74e30aa2799a278a10bf562289f vout: 1 - blinding: 8363182511491119200 + blinding: 18353740783625039159 state: value: 666 lock: null @@ -36,44 +35,43 @@ bundles: - pubWitness: !tx version: 2 inputs: - - prevOutput: 6eb6e645a0e2e9cb8779a2c8cbfe905988762850f8d4fa307e71c5b71940a4c4:1 + - prevOutput: 5af032ce20c361e53d6e339b0985377c6faf0003eed47e9d036b81d9d30139fd:2 sigScript: '' sequence: 0 witness: [] outputs: - - value: 9000 - scriptPubkey: 0014167c8f6c3607bad497ea58a00c8fdc9370f0967a - - value: 99990600 - scriptPubkey: 0014cb239da10e4be279d341c534820558922c7d915c - value: 0 - scriptPubkey: 6a20f306282396294e3abd121d223a76789cbf1000f929877ae4af8990028cd30b2d + scriptPubkey: 6a20890df36a5f4d5fc083c1da585765585942e1f0083f3c942d9520dbd89b941ca4 + - value: 9000 + scriptPubkey: 00140fe0cf9c0629111587c373f9062049ba266512a0 + - value: 99971800 + scriptPubkey: 0014d55f8eb4af477a4d1a9a32c7a95ee42af25ddf68 lockTime: 0 - anchoredBundles: !opret + anchoredBundle: !opret mpcProof: - pos: 3 + pos: 6 cofactor: 0 path: - - 19b79517f4760ebbe9884cc3bcc8a54311e0acb3cee3cd385aba8da5f915661e - - 8b708aefd48fd30b6969144ab46dd160215cfa5031cc47a6a9d59764b35089e1 - - 4b486c77626335d32930625b27d5bc34eba1cc63b947570881c9768751478704 + - 8d7deebca350381891ee7fd2e630be0679c93b9ab0502d26e009591308ec4275 + - 73fc1e645e295ff2097b531a8714df07b87fd77d90e168fdb0ee4117e7c567f8 + - 5169c2e1286b17e8b8341043bb1d55f33905475679e2d837efea2636bca50429 dbcProof: null bundle: - closeMethod: opretFirst inputMap: - 0: 845add8c4eab05069a2a42ae95fb042dedec33332a3e9191c77db61f4df84244 + 0: cf0c2dceda7ec15da1b95c79801323917c3f3cdb6c7533b4470d4b6695ad0a6f knownTransitions: - 845add8c4eab05069a2a42ae95fb042dedec33332a3e9191c77db61f4df84244: + cf0c2dceda7ec15da1b95c79801323917c3f3cdb6c7533b4470d4b6695ad0a6f: ffv: 0 - contractId: rgb:4wAZhgAm-cDJ159t-0p8mhJh-4NnMUU5-67zpHfC-IGMDAyE + contractId: rgb:dhbpy4Ok-FTh0FR4-jKPwY$F-hYyBk8F-0DWa0nT-afM6yU0 nonce: 18446744073709551615 - transitionType: 65535 + transitionType: 10000 metadata: {} globals: {} inputs: - prevOut: - op: e30019860026703275e7db74a7c9a1261e0d9cc514e7aef3a477c22063030321 + op: 174281dbbc943694f1f01a98895b70e62a0fc962f5a1f6f9077895eaa0868b57 ty: 4000 - no: 0 + no: 1 assignments: 4000: type: fungible @@ -81,9 +79,16 @@ bundles: - seal: txid: null vout: 1 - blinding: 3683730669581162294 + blinding: 3760686973782879092 state: - value: 666 + value: 77 + lock: null + - seal: + txid: null + vout: 2 + blinding: 7733269115535512569 + state: + value: 539 lock: null valencies: [] validator: null @@ -91,61 +96,53 @@ bundles: - pubWitness: !tx version: 2 inputs: - - prevOutput: ab749bdcd8bc3c5bf8f72ac3ad997cb889930192cae359576765dacae4e5805c:1 + - prevOutput: 4fe6ac5345d4eee9118d8c3e6141d733e5aea74e30aa2799a278a10bf562289f:1 sigScript: '' sequence: 0 witness: [] outputs: - - value: 9000 - scriptPubkey: 0014167c8f6c3607bad497ea58a00c8fdc9370f0967a - - value: 99971800 - scriptPubkey: 0014b9216e6cb4140d3bbcd84acfc864f4e885c82251 - value: 0 - scriptPubkey: 6a208d628fb0a26ce2d9afbef12a9652f690f24aae8c70e55ab8b0041a53b46ba8f8 + scriptPubkey: 6a203205d1f39eb4b174ed5c59a6e8fb95465cf19f92dd43094d47e23a149f965120 + - value: 9000 + scriptPubkey: 00140fe0cf9c0629111587c373f9062049ba266512a0 + - value: 99990600 + scriptPubkey: 0014db3384b8be7c824e5bf603db9f222cd6c9bc7501 lockTime: 0 - anchoredBundles: !opret + anchoredBundle: !opret mpcProof: - pos: 3 + pos: 6 cofactor: 0 path: - - dbc3161e11e0e25a38da146721b44478e1b7dddae65199f44e79b8205964ad13 - - af278414d3ec80bc1ac581ecf534b73265aa48d9d786106d13c81260cf39b33b - - 6d8922dfc2cb6dc28b2e7554ee79532136aecf58a3b98c279da601fa244cf7c3 + - ba39220a30243a8e15e0ebf2afe8d16837b04c20c170a99fdbf2fe185e8a6618 + - 9c09ac6b0271a99972326ddf37900893af168fe1adf2127536ad59858a5d00ca + - 048a6d0e0184cc10dbb4a7bb2b377e94fd12ed388ef34c716e5dc25fa60cecf8 dbcProof: null bundle: - closeMethod: opretFirst inputMap: - 0: 12ed1c6ee5c46cd77a7a46e7327e51264124eb260a8af329d0bef43b8aedf306 + 0: d6d79b07beff62930f6c110ecf83088d8d023057725561074cf549765deff3fc knownTransitions: - 12ed1c6ee5c46cd77a7a46e7327e51264124eb260a8af329d0bef43b8aedf306: + d6d79b07beff62930f6c110ecf83088d8d023057725561074cf549765deff3fc: ffv: 0 - contractId: rgb:4wAZhgAm-cDJ159t-0p8mhJh-4NnMUU5-67zpHfC-IGMDAyE + contractId: rgb:dhbpy4Ok-FTh0FR4-jKPwY$F-hYyBk8F-0DWa0nT-afM6yU0 nonce: 18446744073709551615 - transitionType: 10000 + transitionType: 65535 metadata: {} globals: {} inputs: - prevOut: - op: 63f5746aa199a97d4327f4ca46fb850137befcfa51710c2165d70a16bf5a108d + op: 7616e9cb83a4153874151e2328fc18fc5858c8193c1740d66b49d369f33ac94d ty: 4000 - no: 1 + no: 0 assignments: 4000: type: fungible items: - seal: txid: null - vout: 0 - blinding: 17652372255402873474 + vout: 2 + blinding: 4823689504124827659 state: - value: 77 - lock: null - - seal: - txid: null - vout: 1 - blinding: 3871916531693334801 - state: - value: 539 + value: 666 lock: null valencies: [] validator: null @@ -153,42 +150,41 @@ bundles: - pubWitness: !tx version: 2 inputs: - - prevOutput: 5703c396115f79a590b092c5e8e9c3780c74f1d4696369414617d7650ea83a09:1 + - prevOutput: 8031b8bcababaf4fa55cd2b63271b1860124162242bd03d43100074ed3e9bcea:2 sigScript: '' sequence: 0 witness: [] outputs: + - value: 0 + scriptPubkey: 6a20dfca805ff5aa9ead9344c20cd55d957eaf3b71293c741c8c7c7a8e669eccbe4a - value: 9000 - scriptPubkey: 0014167c8f6c3607bad497ea58a00c8fdc9370f0967a + scriptPubkey: 00140fe0cf9c0629111587c373f9062049ba266512a0 - value: 99981200 - scriptPubkey: 001414ffa1967ed9728dba71bf67d4a14d75e74f1297 - - value: 0 - scriptPubkey: 6a209ba6bd0a97040cb45503385ef66b9b63a7e8b5c4ba85ba1676941b8940acbf34 + scriptPubkey: 0014895ab6d909b7dc9a3ffdf78f43040d73d3e8dac6 lockTime: 0 - anchoredBundles: !opret + anchoredBundle: !opret mpcProof: - pos: 3 + pos: 6 cofactor: 0 path: - - 3286e7c5016bf783c0b7447875c9d1ba41781c7916631e79dc72c154c9300109 - - 63c3d73bedc75d7330ad1ff8f81717302c1d1a5b8896dcc1c0f6357b463748cf - - e37f2e45d0af97639eafbabdd1ff22fd4df29f7b965b070fbb74032ab884be03 + - fa92482fc4f4eb8259f1724f0f0bc0b3d7301d7394a7d6964528d89f7b2a4498 + - 03d9a36380b63976a07be6c512fa14be63e9a1ecaa50c1bb3299410957587007 + - 70ed976056471c1783946dfbce682b5f294579738f470de92dbf0d458a33c471 dbcProof: null bundle: - closeMethod: opretFirst inputMap: - 0: 63f5746aa199a97d4327f4ca46fb850137befcfa51710c2165d70a16bf5a108d + 0: 174281dbbc943694f1f01a98895b70e62a0fc962f5a1f6f9077895eaa0868b57 knownTransitions: - 63f5746aa199a97d4327f4ca46fb850137befcfa51710c2165d70a16bf5a108d: + 174281dbbc943694f1f01a98895b70e62a0fc962f5a1f6f9077895eaa0868b57: ffv: 0 - contractId: rgb:4wAZhgAm-cDJ159t-0p8mhJh-4NnMUU5-67zpHfC-IGMDAyE + contractId: rgb:dhbpy4Ok-FTh0FR4-jKPwY$F-hYyBk8F-0DWa0nT-afM6yU0 nonce: 18446744073709551615 transitionType: 10000 metadata: {} globals: {} inputs: - prevOut: - op: 845add8c4eab05069a2a42ae95fb042dedec33332a3e9191c77db61f4df84244 + op: d6d79b07beff62930f6c110ecf83088d8d023057725561074cf549765deff3fc ty: 4000 no: 0 assignments: @@ -197,15 +193,15 @@ bundles: items: - seal: txid: null - vout: 0 - blinding: 4832660419085226933 + vout: 1 + blinding: 2830032041885698870 state: value: 50 lock: null - seal: txid: null - vout: 1 - blinding: 10554107260595836881 + vout: 2 + blinding: 12263532041373393736 state: value: 616 lock: null diff --git a/tests/fixtures/attack_resolver_error.yaml b/tests/fixtures/attack_resolver_error.yaml index ba3c2a9..76b6f95 100644 --- a/tests/fixtures/attack_resolver_error.yaml +++ b/tests/fixtures/attack_resolver_error.yaml @@ -1,16 +1,15 @@ version: v2 transfer: true terminals: - 3676470959eb3d3eb390bdf50e5e87ee1906380574270b4420c6a359dd5997e3: 948c0713ae91d12ac2d39c98257bbf0ee561a44d481c54537b423841e509748a + 4ab3bef60afe5fbd9c0c5d08feec73b01687b347ea79e0d3970663ad9850daa9: 12497163e047b0cb755b5c23bfc0ce3801eaf563ee411aa0cd2e1f44e1235f2f genesis: ffv: 0 schemaId: rgb:sch:RDYhMTR!9gv8Y2GLv9UNBEK1hcrCmdLDFk9Qd5fnO8k#brave-dinner-banana flags: null - timestamp: 1737730419 + timestamp: 1738145372 issuer: ssi:anonymous layer1: bitcoin testnet: true - closeMethod: opretFirst metadata: {} globals: 2000: @@ -24,9 +23,9 @@ genesis: type: fungible items: - seal: - txid: 4e87943d33d5e2bc8d9fa3d32a016e29a8025fd0e84a0887132b86954b35b773 + txid: 51005f3bfd454ba7920b85c7484ad95a81fcf0ffa33140c7a3462bd321490140 vout: 1 - blinding: 4599635048961286613 + blinding: 2004000911213883459 state: value: 666 lock: null @@ -37,40 +36,39 @@ bundles: - pubWitness: !tx version: 2 inputs: - - prevOutput: 4e87943d33d5e2bc8d9fa3d32a016e29a8025fd0e84a0887132b86954b35b773:1 + - prevOutput: 85227b4362a8acebfbe798f63dd3d65c905a5ea91a79b7f4200070ea7aff1e96:1 sigScript: '' sequence: 0 witness: [] outputs: - - value: 99999600 - scriptPubkey: 00148ce0c67963bffa9ea6c9374be5f24492f36aacfa - value: 0 - scriptPubkey: 6a20333d646c7d6be9217622962c4046ebf222c52ce68cedbe0833e53bf451b02624 + scriptPubkey: 6a2099956cf8dff28e684ef46a9d0d818440ceeb32e7945ec5d13e4727a7b4598389 + - value: 99998800 + scriptPubkey: 00143b86b2c751ce26bd310f4aafac5cd5bd517b7fe7 lockTime: 0 - anchoredBundles: !opret + anchoredBundle: !opret mpcProof: - pos: 1 + pos: 3 cofactor: 0 path: - - 3eda4607c8099cee7ed29058cc208d11b6c6bb75336deb5e4b7c650084a6f56b - - c83ac65ea18a27464bd05f56623aad0357fd76ad5bbabd7b58cde8e4a536b284 - - 3d1bde5ea62b810147de240df8e334f66325f783698af6f4f3fd4665ad941708 + - fb885abdd5a2e72bf1714b5666c1c77ce6b7347e872274622d1baa0349431217 + - 03157050a93f59ae418217da5635c306f1d3ee81d005c42283c5de7ad204db76 + - f50a8164b53c017fec1138ba6b7c429b24df41e6c066636d7a251a5e751ecd3e dbcProof: null bundle: - closeMethod: opretFirst inputMap: - 0: 747b3d26714b00ba375f890ab7f61088f9b6666a42374b580914aa9614bebb0a + 0: bae1252c01d9bc2e0f0c179bc62552953d3053f58b5742e03ec1945a373147a4 knownTransitions: - 747b3d26714b00ba375f890ab7f61088f9b6666a42374b580914aa9614bebb0a: + bae1252c01d9bc2e0f0c179bc62552953d3053f58b5742e03ec1945a373147a4: ffv: 0 - contractId: rgb:0YoUHEEQ-V0JX1pF-AzYkTkJ-qDP8meQ-Qr1UM8I-YDhlOyI + contractId: rgb:8zzFt!vC-g142mXf-C58$HSD-l2$UscZ-jhW3MO2-YQcLN$U nonce: 18446744073709551615 - transitionType: 65535 + transitionType: 10000 metadata: {} globals: {} inputs: - prevOut: - op: d18a141c4110574257d69140cd8913909a833fc99e410af550cf086038653b22 + op: 81ea350c64c959ae35344da8011dafb38e6dddad342b398956c2f3ebc82ee15e ty: 4000 no: 0 assignments: @@ -79,39 +77,54 @@ bundles: items: - seal: txid: null - vout: 0 - blinding: 9973624271426555302 + vout: 1 + blinding: 13755779618184824973 state: - value: 666 + value: 539 + lock: null + - seal: 12497163e047b0cb755b5c23bfc0ce3801eaf563ee411aa0cd2e1f44e1235f2f + state: + value: 77 lock: null valencies: [] validator: null witness: null -- pubWitness: !txid 91abc4f81b1f62fb064903111a45d1fe8dde012a1993acac9f0485578a25d2ea - anchoredBundles: !opret +- pubWitness: !tx + version: 2 + inputs: + - prevOutput: 51005f3bfd454ba7920b85c7484ad95a81fcf0ffa33140c7a3462bd321490140:1 + sigScript: '' + sequence: 0 + witness: [] + outputs: + - value: 0 + scriptPubkey: 6a20a8470310f52a2bc380b699566b7f4c46a619a3b784869d76f2525052daed4707 + - value: 99999600 + scriptPubkey: 0014297a04b21b2feba046ade79989ceb49b8f5fdbee + lockTime: 0 + anchoredBundle: !opret mpcProof: - pos: 1 + pos: 3 cofactor: 0 path: - - 145227bc721c182a22e23c22743e06695be97bfc2caed28b891e0a7d9ed3d47e - - 73eb9075ad2905ddd0e8d9072f8ea27b190ef866c946b64b83c297eab84b93d9 - - eecec0f90c7e30d5ad9cc6e1efb4ff64bd4c3334343733c7f4694a0b0c13ad10 + - 1a04c3f3848176b61be3f16150f0e17ef145a93592c4d49f076052249d728f46 + - 3e01d0697270bee19915aab7889a8ed25330d7635dc9799fe94c2ae9503cd8f0 + - 9f6c2320546549c859b701e15e87d0fa7b0196ca342372ca9c5ed1d4c01e47df dbcProof: null bundle: - closeMethod: opretFirst inputMap: - 0: e241bab92562f8668d81bccbf1ece30aa6f5c0fbf28207937405a0066ce55af9 + 0: 8d68ac6fde82bca2848d5ad1ce4d595cc550313f73db216593d5ff0adf889d7b knownTransitions: - e241bab92562f8668d81bccbf1ece30aa6f5c0fbf28207937405a0066ce55af9: + 8d68ac6fde82bca2848d5ad1ce4d595cc550313f73db216593d5ff0adf889d7b: ffv: 0 - contractId: rgb:0YoUHEEQ-V0JX1pF-AzYkTkJ-qDP8meQ-Qr1UM8I-YDhlOyI + contractId: rgb:8zzFt!vC-g142mXf-C58$HSD-l2$UscZ-jhW3MO2-YQcLN$U nonce: 18446744073709551615 - transitionType: 10000 + transitionType: 65535 metadata: {} globals: {} inputs: - prevOut: - op: 747b3d26714b00ba375f890ab7f61088f9b6666a42374b580914aa9614bebb0a + op: f33cc5b7ebc2835e369977c2e7cfc7483976fd4b1c663856dcc3b661070b37f5 ty: 4000 no: 0 assignments: @@ -120,55 +133,38 @@ bundles: items: - seal: txid: null - vout: 0 - blinding: 6657697891347327806 + vout: 1 + blinding: 1993587569937574720 state: - value: 616 - lock: null - - seal: 6b113470a4988f61b771777b911ebe47f373115a66ef36b7f5858359b81de2f8 - state: - value: 50 + value: 666 lock: null valencies: [] validator: null witness: null -- pubWitness: !tx - version: 2 - inputs: - - prevOutput: 91abc4f81b1f62fb064903111a45d1fe8dde012a1993acac9f0485578a25d2ea:0 - sigScript: '' - sequence: 0 - witness: [] - outputs: - - value: 99998800 - scriptPubkey: 0014050e4d2fb6b8bedec6c381d88133bef3568e5f2c - - value: 0 - scriptPubkey: 6a20d7c3c06fb6c859455a1f2d429d8b533a7b483acff93a8fa8d2638eb96fc2be86 - lockTime: 0 - anchoredBundles: !opret +- pubWitness: !txid 85227b4362a8acebfbe798f63dd3d65c905a5ea91a79b7f4200070ea7aff1e96 + anchoredBundle: !opret mpcProof: - pos: 1 + pos: 3 cofactor: 0 path: - - c741f798afb91b88054c9cb37f4498c49b3e69ed5e0ac58758f8de36bae37dca - - 8adb7c1594553820d30732e6e0958682439eb98cf689b7fb72b2d13d3585873d - - 2e912950ba884793e3ee6fc605cbd54d2a9eefcf8559c84a0ed7030d693c9230 + - f92c5d431658da44c83a1de8e9e4b750dfc16ebb5cd1629d6875d858092bf207 + - bc67304b537304ee64f5b30bae54be1965e7a5128ec54c8feddfc8079e2dc83a + - dfd7cbed07016493b74ab9305facafb750f2f75a3fbc536f6fefe02b758bcc86 dbcProof: null bundle: - closeMethod: opretFirst inputMap: - 0: 46b2ed3ca20f155d93175ba0778d9c56482d686a0ca8b6434a0b34e76865b3d7 + 0: 81ea350c64c959ae35344da8011dafb38e6dddad342b398956c2f3ebc82ee15e knownTransitions: - 46b2ed3ca20f155d93175ba0778d9c56482d686a0ca8b6434a0b34e76865b3d7: + 81ea350c64c959ae35344da8011dafb38e6dddad342b398956c2f3ebc82ee15e: ffv: 0 - contractId: rgb:0YoUHEEQ-V0JX1pF-AzYkTkJ-qDP8meQ-Qr1UM8I-YDhlOyI + contractId: rgb:8zzFt!vC-g142mXf-C58$HSD-l2$UscZ-jhW3MO2-YQcLN$U nonce: 18446744073709551615 transitionType: 10000 metadata: {} globals: {} inputs: - prevOut: - op: e241bab92562f8668d81bccbf1ece30aa6f5c0fbf28207937405a0066ce55af9 + op: 8d68ac6fde82bca2848d5ad1ce4d595cc550313f73db216593d5ff0adf889d7b ty: 4000 no: 0 assignments: @@ -177,14 +173,14 @@ bundles: items: - seal: txid: null - vout: 0 - blinding: 17716466475096873734 + vout: 1 + blinding: 534524423585145607 state: - value: 539 + value: 616 lock: null - - seal: 948c0713ae91d12ac2d39c98257bbf0ee561a44d481c54537b423841e509748a + - seal: e73cfbbe876bc9b571343881f1c019b1de22aa35dea11a377116af988bd4f22a state: - value: 77 + value: 50 lock: null valencies: [] validator: null diff --git a/tests/fixtures/consignment_A.yaml b/tests/fixtures/consignment_A.yaml index a8225bf..f90a2ad 100644 --- a/tests/fixtures/consignment_A.yaml +++ b/tests/fixtures/consignment_A.yaml @@ -1,16 +1,15 @@ version: v2 transfer: true terminals: - 3676470959eb3d3eb390bdf50e5e87ee1906380574270b4420c6a359dd5997e3: 948c0713ae91d12ac2d39c98257bbf0ee561a44d481c54537b423841e509748a + 4ab3bef60afe5fbd9c0c5d08feec73b01687b347ea79e0d3970663ad9850daa9: 12497163e047b0cb755b5c23bfc0ce3801eaf563ee411aa0cd2e1f44e1235f2f genesis: ffv: 0 schemaId: rgb:sch:RDYhMTR!9gv8Y2GLv9UNBEK1hcrCmdLDFk9Qd5fnO8k#brave-dinner-banana flags: null - timestamp: 1737730419 + timestamp: 1738145372 issuer: ssi:anonymous layer1: bitcoin testnet: true - closeMethod: opretFirst metadata: {} globals: 2000: @@ -24,9 +23,9 @@ genesis: type: fungible items: - seal: - txid: 4e87943d33d5e2bc8d9fa3d32a016e29a8025fd0e84a0887132b86954b35b773 + txid: 51005f3bfd454ba7920b85c7484ad95a81fcf0ffa33140c7a3462bd321490140 vout: 1 - blinding: 4599635048961286613 + blinding: 2004000911213883459 state: value: 666 lock: null @@ -37,40 +36,39 @@ bundles: - pubWitness: !tx version: 2 inputs: - - prevOutput: 4e87943d33d5e2bc8d9fa3d32a016e29a8025fd0e84a0887132b86954b35b773:1 + - prevOutput: 85227b4362a8acebfbe798f63dd3d65c905a5ea91a79b7f4200070ea7aff1e96:1 sigScript: '' sequence: 0 witness: [] outputs: - - value: 99999600 - scriptPubkey: 00148ce0c67963bffa9ea6c9374be5f24492f36aacfa - value: 0 - scriptPubkey: 6a20333d646c7d6be9217622962c4046ebf222c52ce68cedbe0833e53bf451b02624 + scriptPubkey: 6a2099956cf8dff28e684ef46a9d0d818440ceeb32e7945ec5d13e4727a7b4598389 + - value: 99998800 + scriptPubkey: 00143b86b2c751ce26bd310f4aafac5cd5bd517b7fe7 lockTime: 0 - anchoredBundles: !opret + anchoredBundle: !opret mpcProof: - pos: 1 + pos: 3 cofactor: 0 path: - - 3eda4607c8099cee7ed29058cc208d11b6c6bb75336deb5e4b7c650084a6f56b - - c83ac65ea18a27464bd05f56623aad0357fd76ad5bbabd7b58cde8e4a536b284 - - 3d1bde5ea62b810147de240df8e334f66325f783698af6f4f3fd4665ad941708 + - fb885abdd5a2e72bf1714b5666c1c77ce6b7347e872274622d1baa0349431217 + - 03157050a93f59ae418217da5635c306f1d3ee81d005c42283c5de7ad204db76 + - f50a8164b53c017fec1138ba6b7c429b24df41e6c066636d7a251a5e751ecd3e dbcProof: null bundle: - closeMethod: opretFirst inputMap: - 0: 747b3d26714b00ba375f890ab7f61088f9b6666a42374b580914aa9614bebb0a + 0: bae1252c01d9bc2e0f0c179bc62552953d3053f58b5742e03ec1945a373147a4 knownTransitions: - 747b3d26714b00ba375f890ab7f61088f9b6666a42374b580914aa9614bebb0a: + bae1252c01d9bc2e0f0c179bc62552953d3053f58b5742e03ec1945a373147a4: ffv: 0 - contractId: rgb:0YoUHEEQ-V0JX1pF-AzYkTkJ-qDP8meQ-Qr1UM8I-YDhlOyI + contractId: rgb:8zzFt!vC-g142mXf-C58$HSD-l2$UscZ-jhW3MO2-YQcLN$U nonce: 18446744073709551615 - transitionType: 65535 + transitionType: 10000 metadata: {} globals: {} inputs: - prevOut: - op: d18a141c4110574257d69140cd8913909a833fc99e410af550cf086038653b22 + op: 81ea350c64c959ae35344da8011dafb38e6dddad342b398956c2f3ebc82ee15e ty: 4000 no: 0 assignments: @@ -79,10 +77,14 @@ bundles: items: - seal: txid: null - vout: 0 - blinding: 9973624271426555302 + vout: 1 + blinding: 13755779618184824973 state: - value: 666 + value: 539 + lock: null + - seal: 12497163e047b0cb755b5c23bfc0ce3801eaf563ee411aa0cd2e1f44e1235f2f + state: + value: 77 lock: null valencies: [] validator: null @@ -90,40 +92,39 @@ bundles: - pubWitness: !tx version: 2 inputs: - - prevOutput: 6d28dcc62ff3b7077e852bc022641d2fb761d9840f9d8a255528af7d974bdc6d:0 + - prevOutput: 51005f3bfd454ba7920b85c7484ad95a81fcf0ffa33140c7a3462bd321490140:1 sigScript: '' sequence: 0 witness: [] outputs: - - value: 99999200 - scriptPubkey: 001497c953ba395e9870e343f7cdc9c57aa08554809e - value: 0 - scriptPubkey: 6a20a5dbd41b832cf3a5f8e2819fbedea11d8022bd1b699acc158157cc32f33f1034 + scriptPubkey: 6a20a8470310f52a2bc380b699566b7f4c46a619a3b784869d76f2525052daed4707 + - value: 99999600 + scriptPubkey: 0014297a04b21b2feba046ade79989ceb49b8f5fdbee lockTime: 0 - anchoredBundles: !opret + anchoredBundle: !opret mpcProof: - pos: 1 + pos: 3 cofactor: 0 path: - - 145227bc721c182a22e23c22743e06695be97bfc2caed28b891e0a7d9ed3d47e - - 73eb9075ad2905ddd0e8d9072f8ea27b190ef866c946b64b83c297eab84b93d9 - - eecec0f90c7e30d5ad9cc6e1efb4ff64bd4c3334343733c7f4694a0b0c13ad10 + - 1a04c3f3848176b61be3f16150f0e17ef145a93592c4d49f076052249d728f46 + - 3e01d0697270bee19915aab7889a8ed25330d7635dc9799fe94c2ae9503cd8f0 + - 9f6c2320546549c859b701e15e87d0fa7b0196ca342372ca9c5ed1d4c01e47df dbcProof: null bundle: - closeMethod: opretFirst inputMap: - 0: e241bab92562f8668d81bccbf1ece30aa6f5c0fbf28207937405a0066ce55af9 + 0: 8d68ac6fde82bca2848d5ad1ce4d595cc550313f73db216593d5ff0adf889d7b knownTransitions: - e241bab92562f8668d81bccbf1ece30aa6f5c0fbf28207937405a0066ce55af9: + 8d68ac6fde82bca2848d5ad1ce4d595cc550313f73db216593d5ff0adf889d7b: ffv: 0 - contractId: rgb:0YoUHEEQ-V0JX1pF-AzYkTkJ-qDP8meQ-Qr1UM8I-YDhlOyI + contractId: rgb:8zzFt!vC-g142mXf-C58$HSD-l2$UscZ-jhW3MO2-YQcLN$U nonce: 18446744073709551615 - transitionType: 10000 + transitionType: 65535 metadata: {} globals: {} inputs: - prevOut: - op: 747b3d26714b00ba375f890ab7f61088f9b6666a42374b580914aa9614bebb0a + op: f33cc5b7ebc2835e369977c2e7cfc7483976fd4b1c663856dcc3b661070b37f5 ty: 4000 no: 0 assignments: @@ -132,14 +133,10 @@ bundles: items: - seal: txid: null - vout: 0 - blinding: 6657697891347327806 - state: - value: 616 - lock: null - - seal: 6b113470a4988f61b771777b911ebe47f373115a66ef36b7f5858359b81de2f8 + vout: 1 + blinding: 1993587569937574720 state: - value: 50 + value: 666 lock: null valencies: [] validator: null @@ -147,40 +144,39 @@ bundles: - pubWitness: !tx version: 2 inputs: - - prevOutput: 91abc4f81b1f62fb064903111a45d1fe8dde012a1993acac9f0485578a25d2ea:0 + - prevOutput: 6c05545f455f9a28fdf1c695f1c8e8f3b81adbbe967e95f15460fd74a32d9a4e:1 sigScript: '' sequence: 0 witness: [] outputs: - - value: 99998800 - scriptPubkey: 0014050e4d2fb6b8bedec6c381d88133bef3568e5f2c - value: 0 - scriptPubkey: 6a20d7c3c06fb6c859455a1f2d429d8b533a7b483acff93a8fa8d2638eb96fc2be86 + scriptPubkey: 6a2019abe7b35945c3a7d69b2e6b801f64cfdaae151030cd535871e031b92bb43647 + - value: 99999200 + scriptPubkey: 0014e63f5766b92a682cd503014f6350824f1d5f3bf2 lockTime: 0 - anchoredBundles: !opret + anchoredBundle: !opret mpcProof: - pos: 1 + pos: 3 cofactor: 0 path: - - c741f798afb91b88054c9cb37f4498c49b3e69ed5e0ac58758f8de36bae37dca - - 8adb7c1594553820d30732e6e0958682439eb98cf689b7fb72b2d13d3585873d - - 2e912950ba884793e3ee6fc605cbd54d2a9eefcf8559c84a0ed7030d693c9230 + - f92c5d431658da44c83a1de8e9e4b750dfc16ebb5cd1629d6875d858092bf207 + - bc67304b537304ee64f5b30bae54be1965e7a5128ec54c8feddfc8079e2dc83a + - dfd7cbed07016493b74ab9305facafb750f2f75a3fbc536f6fefe02b758bcc86 dbcProof: null bundle: - closeMethod: opretFirst inputMap: - 0: 46b2ed3ca20f155d93175ba0778d9c56482d686a0ca8b6434a0b34e76865b3d7 + 0: 81ea350c64c959ae35344da8011dafb38e6dddad342b398956c2f3ebc82ee15e knownTransitions: - 46b2ed3ca20f155d93175ba0778d9c56482d686a0ca8b6434a0b34e76865b3d7: + 81ea350c64c959ae35344da8011dafb38e6dddad342b398956c2f3ebc82ee15e: ffv: 0 - contractId: rgb:0YoUHEEQ-V0JX1pF-AzYkTkJ-qDP8meQ-Qr1UM8I-YDhlOyI + contractId: rgb:8zzFt!vC-g142mXf-C58$HSD-l2$UscZ-jhW3MO2-YQcLN$U nonce: 18446744073709551615 transitionType: 10000 metadata: {} globals: {} inputs: - prevOut: - op: e241bab92562f8668d81bccbf1ece30aa6f5c0fbf28207937405a0066ce55af9 + op: 8d68ac6fde82bca2848d5ad1ce4d595cc550313f73db216593d5ff0adf889d7b ty: 4000 no: 0 assignments: @@ -189,14 +185,14 @@ bundles: items: - seal: txid: null - vout: 0 - blinding: 17716466475096873734 + vout: 1 + blinding: 534524423585145607 state: - value: 539 + value: 616 lock: null - - seal: 948c0713ae91d12ac2d39c98257bbf0ee561a44d481c54537b423841e509748a + - seal: e73cfbbe876bc9b571343881f1c019b1de22aa35dea11a377116af988bd4f22a state: - value: 77 + value: 50 lock: null valencies: [] validator: null diff --git a/tests/fixtures/consignment_B.yaml b/tests/fixtures/consignment_B.yaml index b48de95..27dde41 100644 --- a/tests/fixtures/consignment_B.yaml +++ b/tests/fixtures/consignment_B.yaml @@ -5,11 +5,10 @@ genesis: ffv: 0 schemaId: rgb:sch:RDYhMTR!9gv8Y2GLv9UNBEK1hcrCmdLDFk9Qd5fnO8k#brave-dinner-banana flags: null - timestamp: 1737730619 + timestamp: 1738145453 issuer: ssi:anonymous layer1: bitcoin testnet: true - closeMethod: opretFirst metadata: {} globals: 2000: @@ -23,9 +22,9 @@ genesis: type: fungible items: - seal: - txid: 6eb6e645a0e2e9cb8779a2c8cbfe905988762850f8d4fa307e71c5b71940a4c4 + txid: 4fe6ac5345d4eee9118d8c3e6141d733e5aea74e30aa2799a278a10bf562289f vout: 1 - blinding: 8363182511491119200 + blinding: 18353740783625039159 state: value: 666 lock: null @@ -36,44 +35,43 @@ bundles: - pubWitness: !tx version: 2 inputs: - - prevOutput: 6eb6e645a0e2e9cb8779a2c8cbfe905988762850f8d4fa307e71c5b71940a4c4:1 + - prevOutput: 5af032ce20c361e53d6e339b0985377c6faf0003eed47e9d036b81d9d30139fd:2 sigScript: '' sequence: 0 witness: [] outputs: - - value: 9000 - scriptPubkey: 0014167c8f6c3607bad497ea58a00c8fdc9370f0967a - - value: 99990600 - scriptPubkey: 0014cb239da10e4be279d341c534820558922c7d915c - value: 0 - scriptPubkey: 6a20f306282396294e3abd121d223a76789cbf1000f929877ae4af8990028cd30b2d + scriptPubkey: 6a20890df36a5f4d5fc083c1da585765585942e1f0083f3c942d9520dbd89b941ca4 + - value: 9000 + scriptPubkey: 00140fe0cf9c0629111587c373f9062049ba266512a0 + - value: 99971800 + scriptPubkey: 0014d55f8eb4af477a4d1a9a32c7a95ee42af25ddf68 lockTime: 0 - anchoredBundles: !opret + anchoredBundle: !opret mpcProof: - pos: 3 + pos: 6 cofactor: 0 path: - - 19b79517f4760ebbe9884cc3bcc8a54311e0acb3cee3cd385aba8da5f915661e - - 8b708aefd48fd30b6969144ab46dd160215cfa5031cc47a6a9d59764b35089e1 - - 4b486c77626335d32930625b27d5bc34eba1cc63b947570881c9768751478704 + - 8d7deebca350381891ee7fd2e630be0679c93b9ab0502d26e009591308ec4275 + - 73fc1e645e295ff2097b531a8714df07b87fd77d90e168fdb0ee4117e7c567f8 + - 5169c2e1286b17e8b8341043bb1d55f33905475679e2d837efea2636bca50429 dbcProof: null bundle: - closeMethod: opretFirst inputMap: - 0: 845add8c4eab05069a2a42ae95fb042dedec33332a3e9191c77db61f4df84244 + 0: cf0c2dceda7ec15da1b95c79801323917c3f3cdb6c7533b4470d4b6695ad0a6f knownTransitions: - 845add8c4eab05069a2a42ae95fb042dedec33332a3e9191c77db61f4df84244: + cf0c2dceda7ec15da1b95c79801323917c3f3cdb6c7533b4470d4b6695ad0a6f: ffv: 0 - contractId: rgb:4wAZhgAm-cDJ159t-0p8mhJh-4NnMUU5-67zpHfC-IGMDAyE + contractId: rgb:dhbpy4Ok-FTh0FR4-jKPwY$F-hYyBk8F-0DWa0nT-afM6yU0 nonce: 18446744073709551615 - transitionType: 65535 + transitionType: 10000 metadata: {} globals: {} inputs: - prevOut: - op: e30019860026703275e7db74a7c9a1261e0d9cc514e7aef3a477c22063030321 + op: 174281dbbc943694f1f01a98895b70e62a0fc962f5a1f6f9077895eaa0868b57 ty: 4000 - no: 0 + no: 1 assignments: 4000: type: fungible @@ -81,9 +79,16 @@ bundles: - seal: txid: null vout: 1 - blinding: 3683730669581162294 + blinding: 3760686973782879092 state: - value: 666 + value: 77 + lock: null + - seal: + txid: null + vout: 2 + blinding: 7733269115535512569 + state: + value: 539 lock: null valencies: [] validator: null @@ -91,61 +96,53 @@ bundles: - pubWitness: !tx version: 2 inputs: - - prevOutput: ab749bdcd8bc3c5bf8f72ac3ad997cb889930192cae359576765dacae4e5805c:1 + - prevOutput: 4fe6ac5345d4eee9118d8c3e6141d733e5aea74e30aa2799a278a10bf562289f:1 sigScript: '' sequence: 0 witness: [] outputs: - - value: 9000 - scriptPubkey: 0014167c8f6c3607bad497ea58a00c8fdc9370f0967a - - value: 99971800 - scriptPubkey: 0014b9216e6cb4140d3bbcd84acfc864f4e885c82251 - value: 0 - scriptPubkey: 6a208d628fb0a26ce2d9afbef12a9652f690f24aae8c70e55ab8b0041a53b46ba8f8 + scriptPubkey: 6a203205d1f39eb4b174ed5c59a6e8fb95465cf19f92dd43094d47e23a149f965120 + - value: 9000 + scriptPubkey: 00140fe0cf9c0629111587c373f9062049ba266512a0 + - value: 99990600 + scriptPubkey: 0014db3384b8be7c824e5bf603db9f222cd6c9bc7501 lockTime: 0 - anchoredBundles: !opret + anchoredBundle: !opret mpcProof: - pos: 3 + pos: 6 cofactor: 0 path: - - dbc3161e11e0e25a38da146721b44478e1b7dddae65199f44e79b8205964ad13 - - af278414d3ec80bc1ac581ecf534b73265aa48d9d786106d13c81260cf39b33b - - 6d8922dfc2cb6dc28b2e7554ee79532136aecf58a3b98c279da601fa244cf7c3 + - ba39220a30243a8e15e0ebf2afe8d16837b04c20c170a99fdbf2fe185e8a6618 + - 9c09ac6b0271a99972326ddf37900893af168fe1adf2127536ad59858a5d00ca + - 048a6d0e0184cc10dbb4a7bb2b377e94fd12ed388ef34c716e5dc25fa60cecf8 dbcProof: null bundle: - closeMethod: opretFirst inputMap: - 0: 12ed1c6ee5c46cd77a7a46e7327e51264124eb260a8af329d0bef43b8aedf306 + 0: d6d79b07beff62930f6c110ecf83088d8d023057725561074cf549765deff3fc knownTransitions: - 12ed1c6ee5c46cd77a7a46e7327e51264124eb260a8af329d0bef43b8aedf306: + d6d79b07beff62930f6c110ecf83088d8d023057725561074cf549765deff3fc: ffv: 0 - contractId: rgb:4wAZhgAm-cDJ159t-0p8mhJh-4NnMUU5-67zpHfC-IGMDAyE + contractId: rgb:dhbpy4Ok-FTh0FR4-jKPwY$F-hYyBk8F-0DWa0nT-afM6yU0 nonce: 18446744073709551615 - transitionType: 10000 + transitionType: 65535 metadata: {} globals: {} inputs: - prevOut: - op: 63f5746aa199a97d4327f4ca46fb850137befcfa51710c2165d70a16bf5a108d + op: 7616e9cb83a4153874151e2328fc18fc5858c8193c1740d66b49d369f33ac94d ty: 4000 - no: 1 + no: 0 assignments: 4000: type: fungible items: - seal: txid: null - vout: 0 - blinding: 17652372255402873474 + vout: 2 + blinding: 4823689504124827659 state: - value: 77 - lock: null - - seal: - txid: null - vout: 1 - blinding: 3871916531693334801 - state: - value: 539 + value: 666 lock: null valencies: [] validator: null @@ -153,42 +150,41 @@ bundles: - pubWitness: !tx version: 2 inputs: - - prevOutput: 5703c396115f79a590b092c5e8e9c3780c74f1d4696369414617d7650ea83a09:1 + - prevOutput: 8031b8bcababaf4fa55cd2b63271b1860124162242bd03d43100074ed3e9bcea:2 sigScript: '' sequence: 0 witness: [] outputs: + - value: 0 + scriptPubkey: 6a20dfca805ff5aa9ead9344c20cd55d957eaf3b71293c741c8c7c7a8e669eccbe4a - value: 9000 - scriptPubkey: 0014167c8f6c3607bad497ea58a00c8fdc9370f0967a + scriptPubkey: 00140fe0cf9c0629111587c373f9062049ba266512a0 - value: 99981200 - scriptPubkey: 001414ffa1967ed9728dba71bf67d4a14d75e74f1297 - - value: 0 - scriptPubkey: 6a209ba6bd0a97040cb45503385ef66b9b63a7e8b5c4ba85ba1676941b8940acbf34 + scriptPubkey: 0014895ab6d909b7dc9a3ffdf78f43040d73d3e8dac6 lockTime: 0 - anchoredBundles: !opret + anchoredBundle: !opret mpcProof: - pos: 3 + pos: 6 cofactor: 0 path: - - 3286e7c5016bf783c0b7447875c9d1ba41781c7916631e79dc72c154c9300109 - - 63c3d73bedc75d7330ad1ff8f81717302c1d1a5b8896dcc1c0f6357b463748cf - - e37f2e45d0af97639eafbabdd1ff22fd4df29f7b965b070fbb74032ab884be03 + - fa92482fc4f4eb8259f1724f0f0bc0b3d7301d7394a7d6964528d89f7b2a4498 + - 03d9a36380b63976a07be6c512fa14be63e9a1ecaa50c1bb3299410957587007 + - 70ed976056471c1783946dfbce682b5f294579738f470de92dbf0d458a33c471 dbcProof: null bundle: - closeMethod: opretFirst inputMap: - 0: 63f5746aa199a97d4327f4ca46fb850137befcfa51710c2165d70a16bf5a108d + 0: 174281dbbc943694f1f01a98895b70e62a0fc962f5a1f6f9077895eaa0868b57 knownTransitions: - 63f5746aa199a97d4327f4ca46fb850137befcfa51710c2165d70a16bf5a108d: + 174281dbbc943694f1f01a98895b70e62a0fc962f5a1f6f9077895eaa0868b57: ffv: 0 - contractId: rgb:4wAZhgAm-cDJ159t-0p8mhJh-4NnMUU5-67zpHfC-IGMDAyE + contractId: rgb:dhbpy4Ok-FTh0FR4-jKPwY$F-hYyBk8F-0DWa0nT-afM6yU0 nonce: 18446744073709551615 transitionType: 10000 metadata: {} globals: {} inputs: - prevOut: - op: 845add8c4eab05069a2a42ae95fb042dedec33332a3e9191c77db61f4df84244 + op: d6d79b07beff62930f6c110ecf83088d8d023057725561074cf549765deff3fc ty: 4000 no: 0 assignments: @@ -197,15 +193,15 @@ bundles: items: - seal: txid: null - vout: 0 - blinding: 4832660419085226933 + vout: 1 + blinding: 2830032041885698870 state: value: 50 lock: null - seal: txid: null - vout: 1 - blinding: 10554107260595836881 + vout: 2 + blinding: 12263532041373393736 state: value: 616 lock: null diff --git a/tests/fixtures/dba8e954792ca34d8fc0de4199346fe994b9e3ed1521e395a18f1868f2c977f4.yaml b/tests/fixtures/dba8e954792ca34d8fc0de4199346fe994b9e3ed1521e395a18f1868f2c977f4.yaml deleted file mode 100644 index ad174af..0000000 --- a/tests/fixtures/dba8e954792ca34d8fc0de4199346fe994b9e3ed1521e395a18f1868f2c977f4.yaml +++ /dev/null @@ -1,14 +0,0 @@ -version: 2 -inputs: -- prevOutput: 91abc4f81b1f62fb064903111a45d1fe8dde012a1993acac9f0485578a25d2ea:0 - sigScript: '' - sequence: 0 - witness: - - 3045022100f7a776efd47655ed6a15810185c8021a0f5417421f4ae1e2a80c4aabe990698e02205e69c772e56ad4fa956f7e07ba96b6d1af53676e60063da2f9fb1cd054300f2301 - - 027cf5117a84e3effddefbd3fc0d4aedac9c657c216c28b4b2f2276b6abb53a21a -outputs: -- value: 99998800 - scriptPubkey: 0014050e4d2fb6b8bedec6c381d88133bef3568e5f2c -- value: 0 - scriptPubkey: 6a20d7c3c06fb6c859455a1f2d429d8b533a7b483acff93a8fa8d2638eb96fc2be86 -lockTime: 0 diff --git a/tests/fixtures/ebb24d28abb46a2b9b7fb3170df295b107db07bf35f784f48a8544cbcc192420.yaml b/tests/fixtures/ebb24d28abb46a2b9b7fb3170df295b107db07bf35f784f48a8544cbcc192420.yaml new file mode 100644 index 0000000..a95dcbd --- /dev/null +++ b/tests/fixtures/ebb24d28abb46a2b9b7fb3170df295b107db07bf35f784f48a8544cbcc192420.yaml @@ -0,0 +1,16 @@ +version: 2 +inputs: +- prevOutput: 5af032ce20c361e53d6e339b0985377c6faf0003eed47e9d036b81d9d30139fd:2 + sigScript: '' + sequence: 0 + witness: + - 3044022035576c2ce48e9cdabf5769f737b72c90796599ce82b3c9a7bb215501717d0c5302206e1ba2d51cc389f983638a89c3f635766abe2fbbbb806db5cb10369b0525690a01 + - 0224ea396e40e79425a7583fee4030ee741bf039ab8be33508b64b5d1d3e25a49c +outputs: +- value: 0 + scriptPubkey: 6a20890df36a5f4d5fc083c1da585765585942e1f0083f3c942d9520dbd89b941ca4 +- value: 9000 + scriptPubkey: 00140fe0cf9c0629111587c373f9062049ba266512a0 +- value: 99971800 + scriptPubkey: 0014d55f8eb4af477a4d1a9a32c7a95ee42af25ddf68 +lockTime: 0 diff --git a/tests/issuance.rs b/tests/issuance.rs index 811ab97..8fbe7a2 100644 --- a/tests/issuance.rs +++ b/tests/issuance.rs @@ -7,20 +7,14 @@ const MEDIA_FPATH: &str = "tests/fixtures/rgb_logo.jpeg"; #[template] #[rstest] -#[case(DescriptorType::Wpkh, CloseMethod::OpretFirst)] -#[case(DescriptorType::Wpkh, CloseMethod::TapretFirst)] -#[case(DescriptorType::Tr, CloseMethod::OpretFirst)] -#[case(DescriptorType::Tr, CloseMethod::TapretFirst)] -fn descriptor_and_close_method( - #[case] wallet_desc: DescriptorType, - #[case] close_method: CloseMethod, -) { -} +#[case(DescriptorType::Wpkh)] +#[case(DescriptorType::Tr)] +fn descriptor(#[case] wallet_desc: DescriptorType) {} #[cfg(not(feature = "altered"))] -#[apply(descriptor_and_close_method)] -fn issue_nia(wallet_desc: DescriptorType, close_method: CloseMethod) { - println!("wallet_desc {wallet_desc:?} close_method {close_method:?}"); +#[apply(descriptor)] +fn issue_nia(wallet_desc: DescriptorType) { + println!("wallet_desc {wallet_desc:?}"); initialize(); @@ -42,7 +36,7 @@ fn issue_nia(wallet_desc: DescriptorType, close_method: CloseMethod) { terms_media_fpath, vec![issued_supply], ); - let (contract_id, iface_type_name) = wallet.issue_with_info(asset_info, close_method, vec![]); + let (contract_id, iface_type_name) = wallet.issue_with_info(asset_info, vec![]); let contract = wallet.contract_iface_class::(contract_id); let spec = contract.spec(); @@ -66,9 +60,9 @@ fn issue_nia(wallet_desc: DescriptorType, close_method: CloseMethod) { } #[cfg(not(feature = "altered"))] -#[apply(descriptor_and_close_method)] -fn issue_uda(wallet_desc: DescriptorType, close_method: CloseMethod) { - println!("wallet_desc {wallet_desc:?} close_method {close_method:?}"); +#[apply(descriptor)] +fn issue_uda(wallet_desc: DescriptorType) { + println!("wallet_desc {wallet_desc:?}"); initialize(); @@ -115,7 +109,7 @@ fn issue_uda(wallet_desc: DescriptorType, close_method: CloseMethod) { terms_media_fpath, token_data, ); - let (contract_id, iface_type_name) = wallet.issue_with_info(asset_info, close_method, vec![]); + let (contract_id, iface_type_name) = wallet.issue_with_info(asset_info, vec![]); let contract = wallet.contract_iface_class::(contract_id); let spec = contract.spec(); @@ -150,9 +144,9 @@ fn issue_uda(wallet_desc: DescriptorType, close_method: CloseMethod) { } #[cfg(not(feature = "altered"))] -#[apply(descriptor_and_close_method)] -fn issue_cfa(wallet_desc: DescriptorType, close_method: CloseMethod) { - println!("wallet_desc {wallet_desc:?} close_method {close_method:?}"); +#[apply(descriptor)] +fn issue_cfa(wallet_desc: DescriptorType) { + println!("wallet_desc {wallet_desc:?}"); initialize(); @@ -172,7 +166,7 @@ fn issue_cfa(wallet_desc: DescriptorType, close_method: CloseMethod) { terms_media_fpath, vec![issued_supply], ); - let (contract_id, iface_type_name) = wallet.issue_with_info(asset_info, close_method, vec![]); + let (contract_id, iface_type_name) = wallet.issue_with_info(asset_info, vec![]); let contract = wallet.contract_iface_class::(contract_id); assert_eq!(contract.name().to_string(), name.to_string()); @@ -198,9 +192,9 @@ fn issue_cfa(wallet_desc: DescriptorType, close_method: CloseMethod) { } #[cfg(not(feature = "altered"))] -#[apply(descriptor_and_close_method)] -fn issue_nia_multiple_utxos(wallet_desc: DescriptorType, close_method: CloseMethod) { - println!("wallet_desc {wallet_desc:?} close_method {close_method:?}"); +#[apply(descriptor)] +fn issue_nia_multiple_utxos(wallet_desc: DescriptorType) { + println!("wallet_desc {wallet_desc:?}"); initialize(); @@ -211,8 +205,7 @@ fn issue_nia_multiple_utxos(wallet_desc: DescriptorType, close_method: CloseMeth .map(|_| Some(wallet.get_utxo(None))) .collect(); let asset_info = AssetInfo::default_nia(amounts.clone()); - let (contract_id, iface_type_name) = - wallet.issue_with_info(asset_info, close_method, outpoints.clone()); + let (contract_id, iface_type_name) = wallet.issue_with_info(asset_info, outpoints.clone()); let contract = wallet.contract_iface_class::(contract_id); assert_eq!( @@ -233,9 +226,9 @@ fn issue_nia_multiple_utxos(wallet_desc: DescriptorType, close_method: CloseMeth } #[cfg(not(feature = "altered"))] -#[apply(descriptor_and_close_method)] -fn issue_cfa_multiple_utxos(wallet_desc: DescriptorType, close_method: CloseMethod) { - println!("wallet_desc {wallet_desc:?} close_method {close_method:?}"); +#[apply(descriptor)] +fn issue_cfa_multiple_utxos(wallet_desc: DescriptorType) { + println!("wallet_desc {wallet_desc:?}"); initialize(); @@ -246,8 +239,7 @@ fn issue_cfa_multiple_utxos(wallet_desc: DescriptorType, close_method: CloseMeth .map(|_| Some(wallet.get_utxo(None))) .collect(); let asset_info = AssetInfo::default_cfa(amounts.clone()); - let (contract_id, iface_type_name) = - wallet.issue_with_info(asset_info, close_method, outpoints.clone()); + let (contract_id, iface_type_name) = wallet.issue_with_info(asset_info, outpoints.clone()); let contract = wallet.contract_iface_class::(contract_id); assert_eq!( @@ -280,11 +272,9 @@ fn issue_on_different_layers(#[case] custom_invoice: bool) { let mut wlt_1 = get_wallet(&DescriptorType::Wpkh); - let close_method = wlt_1.close_method(); let amounts = vec![100]; let asset_info = AssetInfo::default_nia(amounts.clone()); let mut builder = ContractBuilder::with( - close_method, Identity::default(), asset_info.iface(), asset_info.schema(), diff --git a/tests/stress.rs b/tests/stress.rs index 9d61f80..28e7cb4 100644 --- a/tests/stress.rs +++ b/tests/stress.rs @@ -48,7 +48,7 @@ fn back_and_forth( let issued_supply = u64::MAX; - let (contract_id, iface_type_name) = wlt_1.issue_nia(issued_supply, wlt_1.close_method(), None); + let (contract_id, iface_type_name) = wlt_1.issue_nia(issued_supply, None); let loops = match std::env::var("LOOPS") { Ok(val) if u16::from_str(&val).is_ok() => u16::from_str(&val).unwrap(), diff --git a/tests/transfers.rs b/tests/transfers.rs index 1e9d9b2..6092bf3 100644 --- a/tests/transfers.rs +++ b/tests/transfers.rs @@ -120,23 +120,17 @@ fn transfer_loop( let mut sats = 9000; - let issue_close_method = if wlt_2.close_method() == CloseMethod::OpretFirst { - CloseMethod::OpretFirst - } else { - wlt_1.close_method() - }; - // wlt_1 issues 2 assets on the same UTXO let utxo = wlt_1.get_utxo(None); let (contract_id_1, iface_type_name_1) = match asset_schema_1 { - AssetSchema::Nia => wlt_1.issue_nia(issued_supply_1, issue_close_method, Some(&utxo)), - AssetSchema::Uda => wlt_1.issue_uda(issue_close_method, Some(&utxo)), - AssetSchema::Cfa => wlt_1.issue_cfa(issued_supply_1, issue_close_method, Some(&utxo)), + AssetSchema::Nia => wlt_1.issue_nia(issued_supply_1, Some(&utxo)), + AssetSchema::Uda => wlt_1.issue_uda(Some(&utxo)), + AssetSchema::Cfa => wlt_1.issue_cfa(issued_supply_1, Some(&utxo)), }; let (contract_id_2, iface_type_name_2) = match asset_schema_2 { - AssetSchema::Nia => wlt_1.issue_nia(issued_supply_2, issue_close_method, Some(&utxo)), - AssetSchema::Uda => wlt_1.issue_uda(issue_close_method, Some(&utxo)), - AssetSchema::Cfa => wlt_1.issue_cfa(issued_supply_2, issue_close_method, Some(&utxo)), + AssetSchema::Nia => wlt_1.issue_nia(issued_supply_2, Some(&utxo)), + AssetSchema::Uda => wlt_1.issue_uda(Some(&utxo)), + AssetSchema::Cfa => wlt_1.issue_cfa(issued_supply_2, Some(&utxo)), }; wlt_1.check_allocations( contract_id_1, @@ -459,7 +453,7 @@ fn rbf_transfer() { let mut wlt_2 = get_wallet(&DescriptorType::Wpkh); let issue_supply = 600; - let (contract_id, iface_type_name) = wlt_1.issue_nia(issue_supply, wlt_1.close_method(), None); + let (contract_id, iface_type_name) = wlt_1.issue_nia(issue_supply, None); stop_mining(); let initial_height = get_height(); @@ -525,7 +519,7 @@ fn same_transfer_twice_no_update_witnesses(#[case] transfer_type: TransferType) let mut wlt_2 = get_wallet(&DescriptorType::Wpkh); let issue_supply = 2000; - let (contract_id, iface_type_name) = wlt_1.issue_nia(issue_supply, wlt_1.close_method(), None); + let (contract_id, iface_type_name) = wlt_1.issue_nia(issue_supply, None); let amount = 100; let invoice = wlt_2.invoice(contract_id, &iface_type_name, amount, transfer_type.into()); @@ -598,7 +592,7 @@ fn same_transfer_twice_update_witnesses(#[case] transfer_type: TransferType) { let mut wlt_2 = get_wallet(&DescriptorType::Wpkh); let issue_supply = 2000; - let (contract_id, iface_type_name) = wlt_1.issue_nia(issue_supply, wlt_1.close_method(), None); + let (contract_id, iface_type_name) = wlt_1.issue_nia(issue_supply, None); let amount = 100; let invoice = wlt_2.invoice(contract_id, &iface_type_name, amount, transfer_type.into()); @@ -652,8 +646,7 @@ fn invoice_reuse(#[case] transfer_type: TransferType) { let mut wlt_2 = get_wallet(&DescriptorType::Wpkh); let asset_info = AssetInfo::default_nia(vec![500, 400]); - let (contract_id, iface_type_name) = - wlt_1.issue_with_info(asset_info, wlt_1.close_method(), vec![None, None]); + let (contract_id, iface_type_name) = wlt_1.issue_with_info(asset_info, vec![None, None]); let amount = 300; let invoice = wlt_2.invoice(contract_id, &iface_type_name, amount, transfer_type.into()); @@ -688,7 +681,7 @@ fn accept_0conf() { let mut wlt_2 = get_wallet(&DescriptorType::Wpkh); let issue_supply = 600; - let (contract_id, iface_type_name) = wlt_1.issue_nia(issue_supply, wlt_1.close_method(), None); + let (contract_id, iface_type_name) = wlt_1.issue_nia(issue_supply, None); let amt = 200; let invoice = wlt_2.invoice(contract_id, &iface_type_name, amt, InvoiceType::Witness); @@ -749,8 +742,7 @@ fn ln_transfers(#[case] update_witnesses_before_htlc: bool) { let amounts = vec![600, 600]; let outpoints = vec![Some(utxo_1), Some(utxo_2)]; let asset_info = AssetInfo::default_nia(amounts.clone()); - let (contract_id, iface_type_name) = - wlt_1.issue_with_info(asset_info, wlt_1.close_method(), outpoints); + let (contract_id, iface_type_name) = wlt_1.issue_with_info(asset_info, outpoints); struct LNFasciaResolver {} impl ResolveWitness for LNFasciaResolver { @@ -1006,7 +998,7 @@ fn mainnet_wlt_receiving_test_asset() { let mut wlt_1 = get_wallet(&DescriptorType::Wpkh); let mut wlt_2 = get_mainnet_wallet(); - let (contract_id, iface_type_name) = wlt_1.issue_nia(700, wlt_1.close_method(), None); + let (contract_id, iface_type_name) = wlt_1.issue_nia(700, None); let utxo = Outpoint::from_str("bebcfcb200a17763f6932a6d6fca9448a4b46c5b737cc3810769a7403ef79ce6:0") @@ -1041,109 +1033,6 @@ fn sync_mainnet_wlt() { wlt_1.sync(); } -#[cfg(not(feature = "altered"))] -#[rstest] -// close_method_in_invoice=true -#[case(TT::Blinded, DT::Tr, DT::Wpkh, CloseMethod::OpretFirst, true)] -#[case(TT::Witness, DT::Tr, DT::Wpkh, CloseMethod::OpretFirst, true)] -#[case(TT::Blinded, DT::Wpkh, DT::Tr, CloseMethod::OpretFirst, true)] -#[case(TT::Witness, DT::Wpkh, DT::Tr, CloseMethod::OpretFirst, true)] -#[should_panic(expected = "InvoiceUnsupportsCloseMethod(TapretFirst)")] -#[case(TT::Blinded, DT::Tr, DT::Wpkh, CloseMethod::TapretFirst, true)] -#[should_panic(expected = "InvoiceUnsupportsCloseMethod(TapretFirst)")] -#[case(TT::Witness, DT::Tr, DT::Wpkh, CloseMethod::TapretFirst, true)] -#[should_panic(expected = "WalletUnsupportsCloseMethod(TapretFirst)")] -#[case(TT::Blinded, DT::Wpkh, DT::Tr, CloseMethod::TapretFirst, true)] -#[should_panic(expected = "WalletUnsupportsCloseMethod(TapretFirst)")] -#[case(TT::Witness, DT::Wpkh, DT::Tr, CloseMethod::TapretFirst, true)] -// close_method_in_invoice=false -#[should_panic(expected = "WalletUnsupportsCloseMethod(TapretFirst)")] -#[case(TT::Blinded, DT::Tr, DT::Wpkh, CloseMethod::TapretFirst, false)] -#[should_panic(expected = "WalletUnsupportsCloseMethod(TapretFirst)")] -#[case(TT::Witness, DT::Tr, DT::Wpkh, CloseMethod::TapretFirst, false)] -#[should_panic(expected = "WalletUnsupportsCloseMethod(TapretFirst)")] -#[case(TT::Blinded, DT::Wpkh, DT::Tr, CloseMethod::TapretFirst, false)] -#[should_panic(expected = "WalletUnsupportsCloseMethod(TapretFirst)")] -#[case(TT::Witness, DT::Wpkh, DT::Tr, CloseMethod::TapretFirst, false)] -fn wlt_receiving_from_different_close_method( - #[case] transfer_type: TransferType, - #[case] wlt_1_desc: DescriptorType, - #[case] wlt_2_desc: DescriptorType, - #[case] contract_close_method: CloseMethod, - #[case] close_method_in_invoice: bool, -) { - println!( - "transfer_type {transfer_type:?} wlt_1_desc {wlt_1_desc:?} wlt_2_desc {wlt_2_desc:?} \ - contract_close_method {contract_close_method:?} \ - close_method_in_invoice {close_method_in_invoice:?}" - ); - - initialize(); - - let mut wlt_1 = get_wallet(&wlt_1_desc); - let mut wlt_2 = get_wallet(&wlt_2_desc); - - let (contract_id, iface_type_name) = wlt_1.issue_nia(600, contract_close_method, None); - - println!("1st transfer"); - let mut invoice = wlt_2.invoice(contract_id, &iface_type_name, 100, transfer_type.into()); - if !close_method_in_invoice { - invoice.close_methods = vec![]; - } - wlt_1.send_to_invoice(&mut wlt_2, invoice, None, None, None); - wlt_2.check_allocations( - contract_id, - &iface_type_name, - AssetSchema::Nia, - vec![100], - false, - ); - - println!("2nd transfer"); - wlt_2.send( - &mut wlt_1, - TransferType::Blinded, - contract_id, - &iface_type_name, - 90, - 1000, - None, - ); - - println!("3rd transfer"); - wlt_1.send( - &mut wlt_2, - TransferType::Blinded, - contract_id, - &iface_type_name, - 290, - 1000, - None, - ); - - println!("4th transfer"); - wlt_2.send( - &mut wlt_1, - TransferType::Blinded, - contract_id, - &iface_type_name, - 280, - 1000, - None, - ); - - println!("5th transfer"); - wlt_1.send( - &mut wlt_2, - TransferType::Blinded, - contract_id, - &iface_type_name, - 295, - 1000, - None, - ); -} - #[cfg(not(feature = "altered"))] #[test] fn collaborative_transfer() { @@ -1156,7 +1045,7 @@ fn collaborative_transfer() { let sats = 30_000; let utxo_0 = wlt_1.get_utxo(Some(sats)); - let (contract_id, iface_type_name) = wlt_1.issue_nia(600, wlt_1.close_method(), Some(&utxo_0)); + let (contract_id, iface_type_name) = wlt_1.issue_nia(600, Some(&utxo_0)); let (_, tx) = wlt_1.send( &mut wlt_2, TransferType::Witness, @@ -1166,8 +1055,8 @@ fn collaborative_transfer() { 18_000, None, ); - let utxo_1 = Outpoint::new(tx.txid(), 1); // change: 11_600 sat - let utxo_2 = Outpoint::new(tx.txid(), 0); // transfered: 18_000 sat + let utxo_1 = Outpoint::new(tx.txid(), 2); // change: 11_600 sat + let utxo_2 = Outpoint::new(tx.txid(), 1); // transfered: 18_000 sat let mut psbt = Psbt::default(); @@ -1252,7 +1141,7 @@ fn receive_from_unbroadcasted_transfer_to_blinded() { let mut wlt_2 = get_wallet(&DescriptorType::Wpkh); let mut wlt_3 = get_wallet(&DescriptorType::Wpkh); - let (contract_id, iface_type_name) = wlt_1.issue_nia(600, wlt_1.close_method(), None); + let (contract_id, iface_type_name) = wlt_1.issue_nia(600, None); let utxo = wlt_2.get_utxo(None); mine(false); @@ -1328,7 +1217,7 @@ fn check_fungible_history() { let issue_supply = 600; - let (contract_id, iface_type_name) = wlt_1.issue_nia(issue_supply, wlt_1.close_method(), None); + let (contract_id, iface_type_name) = wlt_1.issue_nia(issue_supply, None); wlt_1.debug_contracts(); wlt_1.debug_history(contract_id, &iface_type_name, false); @@ -1383,7 +1272,7 @@ fn send_to_oneself() { let issue_supply = 600; - let (contract_id, iface_type_name) = wlt.issue_nia(issue_supply, wlt.close_method(), None); + let (contract_id, iface_type_name) = wlt.issue_nia(issue_supply, None); let amt = 200; @@ -1430,11 +1319,11 @@ fn blank_tapret_opret(#[case] close_method_0: CloseMethod, #[case] close_method_ let utxo = wlt_1.get_utxo(None); let amt_0 = 200; - let (contract_id_0, iface_type_name_0) = wlt_1.issue_nia(amt_0, close_method_0, Some(&utxo)); + let (contract_id_0, iface_type_name_0) = wlt_1.issue_nia(amt_0, Some(&utxo)); // asset to be moved in blank let amt_1 = 100; - let (contract_id_1, iface_type_name_1) = wlt_1.issue_nia(amt_1, close_method_1, Some(&utxo)); + let (contract_id_1, iface_type_name_1) = wlt_1.issue_nia(amt_1, Some(&utxo)); wlt_1.send( &mut wlt_2, @@ -1476,12 +1365,10 @@ fn reorg_history(#[case] history_type: HistoryType, #[case] reorg_type: ReorgTyp let mut wlt_2 = get_wallet_custom(&DescriptorType::Wpkh, INSTANCE_2); let (contract_id, iface_type_name) = match history_type { - HistoryType::Linear | HistoryType::Branching => { - wlt_1.issue_nia(600, wlt_1.close_method(), None) - } + HistoryType::Linear | HistoryType::Branching => wlt_1.issue_nia(600, None), HistoryType::Merging => { let asset_info = AssetInfo::default_nia(vec![400, 200]); - wlt_1.issue_with_info(asset_info, wlt_1.close_method(), vec![None, None]) + wlt_1.issue_with_info(asset_info, vec![None, None]) } }; @@ -1872,12 +1759,10 @@ fn reorg_revert_multiple(#[case] history_type: HistoryType) { let mut wlt_2 = get_wallet_custom(&DescriptorType::Wpkh, INSTANCE_2); let (contract_id, iface_type_name) = match history_type { - HistoryType::Linear | HistoryType::Branching => { - wlt_1.issue_nia(600, wlt_1.close_method(), None) - } + HistoryType::Linear | HistoryType::Branching => wlt_1.issue_nia(600, None), HistoryType::Merging => { let asset_info = AssetInfo::default_nia(vec![400, 200]); - wlt_1.issue_with_info(asset_info, wlt_1.close_method(), vec![None, None]) + wlt_1.issue_with_info(asset_info, vec![None, None]) } }; @@ -2066,8 +1951,7 @@ fn revert_genesis(#[case] with_transfers: bool) { let issued_supply = 600; let utxo = wlt.get_utxo(None); - let (contract_id, iface_type_name) = - wlt.issue_nia(issued_supply, wlt.close_method(), Some(&utxo)); + let (contract_id, iface_type_name) = wlt.issue_nia(issued_supply, Some(&utxo)); wlt.check_allocations( contract_id, &iface_type_name, diff --git a/tests/utils/helpers.rs b/tests/utils/helpers.rs index 72eeda4..4128636 100644 --- a/tests/utils/helpers.rs +++ b/tests/utils/helpers.rs @@ -806,7 +806,6 @@ impl TestWallet { pub fn issue_with_info( &mut self, asset_info: AssetInfo, - close_method: CloseMethod, outpoints: Vec>, ) -> (ContractId, TypeName) { let outpoints = if outpoints.is_empty() { @@ -819,7 +818,6 @@ impl TestWallet { }; let mut builder = ContractBuilder::with( - close_method, Identity::default(), asset_info.iface(), asset_info.schema(), @@ -843,30 +841,24 @@ impl TestWallet { pub fn issue_nia( &mut self, issued_supply: u64, - close_method: CloseMethod, outpoint: Option<&Outpoint>, ) -> (ContractId, TypeName) { let asset_info = AssetInfo::default_nia(vec![issued_supply]); - self.issue_with_info(asset_info, close_method, vec![outpoint.copied()]) + self.issue_with_info(asset_info, vec![outpoint.copied()]) } - pub fn issue_uda( - &mut self, - close_method: CloseMethod, - outpoint: Option<&Outpoint>, - ) -> (ContractId, TypeName) { + pub fn issue_uda(&mut self, outpoint: Option<&Outpoint>) -> (ContractId, TypeName) { let asset_info = AssetInfo::default_uda(); - self.issue_with_info(asset_info, close_method, vec![outpoint.copied()]) + self.issue_with_info(asset_info, vec![outpoint.copied()]) } pub fn issue_cfa( &mut self, issued_supply: u64, - close_method: CloseMethod, outpoint: Option<&Outpoint>, ) -> (ContractId, TypeName) { let asset_info = AssetInfo::default_cfa(vec![issued_supply]); - self.issue_with_info(asset_info, close_method, vec![outpoint.copied()]) + self.issue_with_info(asset_info, vec![outpoint.copied()]) } pub fn invoice( @@ -897,9 +889,6 @@ impl TestWallet { let mut builder = RgbInvoiceBuilder::new(XChainNet::bitcoin(network, beneficiary)) .set_contract(contract_id) .set_interface(iface_type_name.clone()); - if self.close_method() == CloseMethod::OpretFirst { - builder = builder.set_close_methods(vec![CloseMethod::OpretFirst]); - } if *iface_type_name == AssetSchema::Uda.iface_type_name() { if amount != 1 { panic!("UDA amount must be 1"); @@ -1468,6 +1457,7 @@ impl TestWallet { coloring_info: ColoringInfo, ) -> (Fascia, AssetBeneficiariesMap) { let asset_beneficiaries = self.color_psbt_init(psbt, coloring_info); + psbt.set_rgb_close_method(CloseMethod::OpretFirst); psbt.complete_construction(); let fascia = psbt.rgb_commit().unwrap(); (fascia, asset_beneficiaries) @@ -1600,8 +1590,7 @@ impl TestWallet { .unwrap(); } } - psbt.push_rgb_transition(transition, CloseMethod::OpretFirst) - .unwrap(); + psbt.push_rgb_transition(transition).unwrap(); } asset_beneficiaries diff --git a/tests/validation.rs b/tests/validation.rs index aaf9ad8..3b42ac0 100644 --- a/tests/validation.rs +++ b/tests/validation.rs @@ -61,11 +61,11 @@ impl Scenario { match self { Self::A => { let (tx_1, witness_id_1) = - get_tx("6d28dcc62ff3b7077e852bc022641d2fb761d9840f9d8a255528af7d974bdc6d"); + get_tx("6c05545f455f9a28fdf1c695f1c8e8f3b81adbbe967e95f15460fd74a32d9a4e"); let (tx_2, witness_id_2) = - get_tx("91abc4f81b1f62fb064903111a45d1fe8dde012a1993acac9f0485578a25d2ea"); + get_tx("85227b4362a8acebfbe798f63dd3d65c905a5ea91a79b7f4200070ea7aff1e96"); let (tx_3, witness_id_3) = - get_tx("dba8e954792ca34d8fc0de4199346fe994b9e3ed1521e395a18f1868f2c977f4"); + get_tx("8f388cc11a7d96e5f792b9b90530ff62c485fc31a50afe769b161eca91059a19"); MockResolver { pub_witnesses: map![ witness_id_1 => MockResolvePubWitness::Success(tx_1), @@ -81,11 +81,11 @@ impl Scenario { } Self::B => { let (tx_1, witness_id_1) = - get_tx("5703c396115f79a590b092c5e8e9c3780c74f1d4696369414617d7650ea83a09"); + get_tx("8031b8bcababaf4fa55cd2b63271b1860124162242bd03d43100074ed3e9bcea"); let (tx_2, witness_id_2) = - get_tx("ab749bdcd8bc3c5bf8f72ac3ad997cb889930192cae359576765dacae4e5805c"); + get_tx("5af032ce20c361e53d6e339b0985377c6faf0003eed47e9d036b81d9d30139fd"); let (tx_3, witness_id_3) = - get_tx("797cbdf8b72425b3e4ca512ee58075323afec5ad766579de5b2c6869b2ed6b53"); + get_tx("ebb24d28abb46a2b9b7fb3170df295b107db07bf35f784f48a8544cbcc192420"); MockResolver { pub_witnesses: map![ witness_id_1 => MockResolvePubWitness::Success(tx_1), @@ -120,10 +120,8 @@ fn get_consignment(scenario: Scenario) -> (Transfer, Vec) { let sats = 9000; let utxo = wlt_1.get_utxo(None); - let (contract_id_1, iface_type_name_1) = - wlt_1.issue_nia(issued_supply_1, wlt_1.close_method(), Some(&utxo)); - let (contract_id_2, iface_type_name_2) = - wlt_1.issue_nia(issued_supply_2, wlt_1.close_method(), Some(&utxo)); + let (contract_id_1, iface_type_name_1) = wlt_1.issue_nia(issued_supply_1, Some(&utxo)); + let (contract_id_2, iface_type_name_2) = wlt_1.issue_nia(issued_supply_2, Some(&utxo)); let mut txes = vec![]; @@ -271,19 +269,19 @@ fn validate_consignment_genesis_fail() { assert_eq!(validation_status.failures.len(), 5); assert!(matches!( validation_status.failures[0], - Failure::OperationAbsent(_) + Failure::MpcInvalid(_, _, _) )); assert!(matches!( validation_status.failures[1], - Failure::MpcInvalid(_, _, _) + Failure::OperationAbsent(_) )); assert!(matches!( validation_status.failures[2], - Failure::BundleExtraTransition(_, _) + Failure::MpcInvalid(_, _, _) )); assert!(matches!( validation_status.failures[3], - Failure::MpcInvalid(_, _, _) + Failure::BundleExtraTransition(_, _) )); assert!(matches!( validation_status.failures[4], @@ -328,19 +326,11 @@ fn validate_consignment_bundles_fail() { Err((status, _consignment)) => status, }; dbg!(&validation_status); - assert_eq!(validation_status.failures.len(), 3); + assert_eq!(validation_status.failures.len(), 1); assert!(matches!( validation_status.failures[0], Failure::SealNoPubWitness(_, _, _) )); - assert!(matches!( - validation_status.failures[1], - Failure::SealsInvalid(_, _, _) - )); - assert!(matches!( - validation_status.failures[2], - Failure::BundleInvalidCommitment(_, _, _, _) - )); assert!(validation_status.warnings.is_empty()); assert!(validation_status.info.is_empty()); let validity = validation_status.validity(); @@ -353,7 +343,7 @@ fn validate_consignment_resolver_error() { let scenario = Scenario::A; let mut resolver = scenario.resolver(); let txid = - Txid::from_str("91abc4f81b1f62fb064903111a45d1fe8dde012a1993acac9f0485578a25d2ea").unwrap(); + Txid::from_str("85227b4362a8acebfbe798f63dd3d65c905a5ea91a79b7f4200070ea7aff1e96").unwrap(); // resolve_pub_witness error *resolver.pub_witnesses.get_mut(&txid).unwrap() =