diff --git a/Cargo.lock b/Cargo.lock index a2c38ca..367db18 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -27,7 +27,7 @@ version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" dependencies = [ - "gimli 0.27.0", + "gimli 0.27.2", ] [[package]] @@ -42,16 +42,28 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" dependencies = [ - "getrandom 0.2.8", + "getrandom 0.2.9", + "once_cell", + "version_check", +] + +[[package]] +name = "ahash" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +dependencies = [ + "cfg-if", + "getrandom 0.2.9", "once_cell", "version_check", ] [[package]] name = "aho-corasick" -version = "0.7.20" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" dependencies = [ "memchr", ] @@ -76,9 +88,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.68" +version = "1.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61" +checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" [[package]] name = "array-bytes" @@ -88,9 +100,9 @@ checksum = "f52f63c5c1316a16a4b35eaac8b76a98248961a533f061684cb2a7cb0eafb6c6" [[package]] name = "arrayref" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" +checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" [[package]] name = "arrayvec" @@ -104,17 +116,6 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" -[[package]] -name = "async-trait" -version = "0.1.60" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d1d8ab452a3936018a687b20e6f7cf5363d713b732b8884001317b0e48aa3" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "autocfg" version = "1.1.0" @@ -132,16 +133,10 @@ dependencies = [ "cfg-if", "libc", "miniz_oxide", - "object 0.30.0", + "object 0.30.3", "rustc-demangle", ] -[[package]] -name = "base58" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6107fe1be6682a68940da878d9e9f5e90ca5745b3dec9fd1bb393c8777d4f581" - [[package]] name = "base64" version = "0.13.1" @@ -184,6 +179,17 @@ dependencies = [ "digest 0.10.6", ] +[[package]] +name = "blake2b_simd" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c2f0dc9a68c6317d884f97cc36cf5a3d20ba14ce404227df55e1af708ab04bc" +dependencies = [ + "arrayref", + "arrayvec 0.7.2", + "constant_time_eq", +] + [[package]] name = "block-buffer" version = "0.7.3" @@ -202,16 +208,16 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", ] [[package]] name = "block-buffer" -version = "0.10.3" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", ] [[package]] @@ -223,11 +229,29 @@ dependencies = [ "byte-tools", ] +[[package]] +name = "bounded-collections" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3888522b497857eb606bf51695988dba7096941822c1bcf676e3a929a9ae7a0" +dependencies = [ + "log", + "parity-scale-codec", + "scale-info", + "serde", +] + +[[package]] +name = "bs58" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" + [[package]] name = "bumpalo" -version = "3.11.1" +version = "3.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" +checksum = "9b1ce199063694f33ffb7dd4e0ee620741495c32833cde5aa08f02a0bf96f0c8" [[package]] name = "byte-slice-cast" @@ -249,15 +273,15 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c" +checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" [[package]] name = "cc" -version = "1.0.78" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" [[package]] name = "cfg-if" @@ -267,9 +291,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.23" +version = "0.4.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f" +checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b" dependencies = [ "iana-time-zone", "num-integer", @@ -287,11 +311,17 @@ dependencies = [ "unicode-width", ] +[[package]] +name = "constant_time_eq" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13418e745008f7349ec7e449155f419a61b92b58a99cc3616942b926825ec76b" + [[package]] name = "core-foundation-sys" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "cpp_demangle" @@ -304,18 +334,18 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.5" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" +checksum = "3e4c1eaa2012c47becbbad2ab175484c2a84d1185b566fb2cc5b8707343dfe58" dependencies = [ "libc", ] [[package]] name = "cranelift-entity" -version = "0.88.2" +version = "0.93.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87a0f1b2fdc18776956370cf8d9b009ded3f855350c480c1c52142510961f352" +checksum = "f42ea692c7b450ad18b8c9889661505d51c09ec4380cf1c2d278dbb2da22cae1" dependencies = [ "serde", ] @@ -341,7 +371,7 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", "typenum", ] @@ -351,7 +381,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", "subtle", ] @@ -361,7 +391,7 @@ version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", "subtle", ] @@ -393,9 +423,9 @@ dependencies = [ [[package]] name = "cxx" -version = "1.0.85" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5add3fc1717409d029b20c5b6903fc0c0b02fa6741d820054f4a2efa5e5816fd" +checksum = "f61f1b6389c3fe1c316bf8a4dccc90a38208354b330925bce1f74a6c4756eb93" dependencies = [ "cc", "cxxbridge-flags", @@ -405,9 +435,9 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.85" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4c87959ba14bc6fbc61df77c3fcfe180fc32b93538c4f1031dd802ccb5f2ff0" +checksum = "12cee708e8962df2aeb38f594aae5d827c022b6460ac71a7a3e2c3c2aae5a07b" dependencies = [ "cc", "codespan-reporting", @@ -415,24 +445,24 @@ dependencies = [ "proc-macro2", "quote", "scratch", - "syn", + "syn 2.0.15", ] [[package]] name = "cxxbridge-flags" -version = "1.0.85" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69a3e162fde4e594ed2b07d0f83c6c67b745e7f28ce58c6df5e6b6bef99dfb59" +checksum = "7944172ae7e4068c533afbb984114a56c46e9ccddda550499caa222902c7f7bb" [[package]] name = "cxxbridge-macro" -version = "1.0.85" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e7e2adeb6a0d4a282e581096b06e1791532b7d576dcde5ccd9382acf55db8e6" +checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.15", ] [[package]] @@ -443,7 +473,7 @@ checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -461,7 +491,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", ] [[package]] @@ -470,7 +500,7 @@ version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" dependencies = [ - "block-buffer 0.10.3", + "block-buffer 0.10.4", "crypto-common", "subtle", ] @@ -499,20 +529,20 @@ checksum = "558e40ea573c374cf53507fd240b7ee2f5477df7cfebdb97323ec61c719399c5" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "dyn-clone" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9b0705efd4599c15a38151f4721f7bc388306f61084d3bfd50bd07fbca5cb60" +checksum = "68b0cf012f1230e43cd00ebb729c6bb58707ecfa8ad08b52ef3a4ccd2697fc30" [[package]] name = "ed25519" -version = "1.5.2" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e9c280362032ea4203659fc489832d0204ef09f247a0506f170dafcac08c369" +checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7" dependencies = [ "signature", ] @@ -536,7 +566,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c24f403d068ad0b359e577a77f92392118be3f3c927538f2bb544a5ecd828c6" dependencies = [ "curve25519-dalek 3.2.0", - "hashbrown", + "hashbrown 0.12.3", "hex", "rand_core 0.6.4", "sha2 0.9.9", @@ -545,9 +575,9 @@ dependencies = [ [[package]] name = "either" -version = "1.8.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" +checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" [[package]] name = "environmental" @@ -557,13 +587,13 @@ checksum = "e48c92028aaa870e83d51c64e5d4e0b6981b360c522198c23959f219a4e1b15b" [[package]] name = "errno" -version = "0.2.8" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" dependencies = [ "errno-dragonfly", "libc", - "winapi", + "windows-sys 0.48.0", ] [[package]] @@ -600,6 +630,15 @@ dependencies = [ "static_assertions", ] +[[package]] +name = "form_urlencoded" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +dependencies = [ + "percent-encoding", +] + [[package]] name = "funty" version = "2.0.0" @@ -608,9 +647,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futures" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0" +checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" dependencies = [ "futures-channel", "futures-core", @@ -623,9 +662,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed" +checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" dependencies = [ "futures-core", "futures-sink", @@ -633,15 +672,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac" +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" [[package]] name = "futures-executor" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2" +checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" dependencies = [ "futures-core", "futures-task", @@ -651,38 +690,38 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb" +checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" [[package]] name = "futures-macro" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d" +checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.15", ] [[package]] name = "futures-sink" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9" +checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" [[package]] name = "futures-task" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea" +checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" [[package]] name = "futures-util" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6" +checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" dependencies = [ "futures-channel", "futures-core", @@ -707,9 +746,9 @@ dependencies = [ [[package]] name = "generic-array" -version = "0.14.6" +version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ "typenum", "version_check", @@ -728,9 +767,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" +checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" dependencies = [ "cfg-if", "libc", @@ -749,15 +788,15 @@ dependencies = [ [[package]] name = "gimli" -version = "0.27.0" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dec7af912d60cdbd3677c1af9352ebae6fb8394d165568a2234df0fa00f87793" +checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" [[package]] name = "hash-db" -version = "0.15.2" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d23bd4e7b5eda0d0f3a307e8b381fdc8ba9000f26fbe912250c0a4cc3956364a" +checksum = "8e7d7786361d7425ae2fe4f9e407eb0efaa0840f5212d109cc018c40c35c6ab4" [[package]] name = "hash256-std-hasher" @@ -774,7 +813,16 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" dependencies = [ - "ahash", + "ahash 0.7.6", +] + +[[package]] +name = "hashbrown" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" +dependencies = [ + "ahash 0.8.3", ] [[package]] @@ -786,6 +834,12 @@ dependencies = [ "libc", ] +[[package]] +name = "hermit-abi" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" + [[package]] name = "hex" version = "0.4.3" @@ -828,22 +882,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "17ea0a1394df5b6574da6e0c1ade9e78868c9fb0a4e5ef4428e32da4676b85b1" dependencies = [ "digest 0.9.0", - "generic-array 0.14.6", + "generic-array 0.14.7", "hmac 0.8.1", ] [[package]] name = "iana-time-zone" -version = "0.1.53" +version = "0.1.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" +checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "winapi", + "windows", ] [[package]] @@ -856,6 +910,16 @@ dependencies = [ "cxx-build", ] +[[package]] +name = "idna" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + [[package]] name = "impl-codec" version = "0.6.0" @@ -882,7 +946,7 @@ checksum = "11d7a9f6330b71fea57921c9b61c47ee6e84f72d394754eff6163ae67e7395eb" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -893,12 +957,12 @@ checksum = "4161ceaf2f41b6cd3f6502f5da085d4ad4393a51e0c70ed2fce1d5698d798fae" [[package]] name = "indexmap" -version = "1.9.2" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", - "hashbrown", + "hashbrown 0.12.3", "serde", ] @@ -913,30 +977,35 @@ dependencies = [ [[package]] name = "io-lifetimes" -version = "0.7.5" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59ce5ef949d49ee85593fc4d3f3f95ad61657076395cbbce23e2121fc5542074" +checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" +dependencies = [ + "hermit-abi 0.3.1", + "libc", + "windows-sys 0.48.0", +] [[package]] name = "itoa" -version = "1.0.5" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" +checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" [[package]] name = "js-sys" -version = "0.3.60" +version = "0.3.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" +checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" dependencies = [ "wasm-bindgen", ] [[package]] name = "keccak" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3afef3b6eff9ce9d8ff9b3601125eec7f0c8cbac7abd14f355d053fa56c98768" +checksum = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940" dependencies = [ "cpufeatures", ] @@ -952,9 +1021,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.138" +version = "0.2.144" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db6d7e329c562c5dfab7a46a2afabc8b987ab9a4834c9d1ca04dc54c1546cef8" +checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1" [[package]] name = "libm" @@ -1021,9 +1090,15 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.0.46" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d" +checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" + +[[package]] +name = "linux-raw-sys" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ece97ea872ece730aed82664c424eb4c8291e1ff2480247ccf7409044bc6479f" [[package]] name = "lock_api" @@ -1044,15 +1119,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "lru" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6e8aaa3f231bb4bd57b84b2d5dc3ae7f350265df8aa96492e0bc394a1571909" -dependencies = [ - "hashbrown", -] - [[package]] name = "mach" version = "0.3.2" @@ -1077,6 +1143,15 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +[[package]] +name = "memfd" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffc89ccdc6e10d6907450f753537ebc5c5d3460d2e4e62ea74bd571db62c0f9e" +dependencies = [ + "rustix 0.37.19", +] + [[package]] name = "memoffset" version = "0.6.5" @@ -1088,12 +1163,11 @@ dependencies = [ [[package]] name = "memory-db" -version = "0.31.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e0c7cba9ce19ac7ffd2053ac9f49843bbd3f4318feedfd74e85c19d5fb0ba66" +checksum = "808b50db46293432a45e63bc15ea51e0ab4c0a1647b8eb114e31a3e698dd6fbe" dependencies = [ "hash-db", - "hashbrown", ] [[package]] @@ -1187,7 +1261,7 @@ version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" dependencies = [ - "hermit-abi", + "hermit-abi 0.2.6", "libc", ] @@ -1198,25 +1272,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53" dependencies = [ "crc32fast", - "hashbrown", + "hashbrown 0.12.3", "indexmap", "memchr", ] [[package]] name = "object" -version = "0.30.0" +version = "0.30.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "239da7f290cfa979f43f85a8efeee9a8a76d0827c356d37f9d3d7254d6b537fb" +checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.16.0" +version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" +checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" [[package]] name = "opaque-debug" @@ -1232,9 +1306,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "parity-scale-codec" -version = "3.2.1" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "366e44391a8af4cfd6002ef6ba072bae071a96aafca98d7d448a34c5dca38b6a" +checksum = "5ddb756ca205bd108aee3c62c6d3c994e1df84a59b9d6d4a5ea42ee1fd5a9a28" dependencies = [ "arrayvec 0.7.2", "bitvec", @@ -1247,14 +1321,14 @@ dependencies = [ [[package]] name = "parity-scale-codec-derive" -version = "3.1.3" +version = "3.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9299338969a3d2f491d65f140b00ddec470858402f888af98e8642fb5e8965cd" +checksum = "86b26a931f824dd4eca30b3e43bb4f31cd5f0d3a403c5f5ff27106b805bfde7b" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1275,22 +1349,22 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.5" +version = "0.9.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ff9f3fef3968a3ec5945535ed654cb38ff72d7495a25619e2247fb15a2ed9ba" +checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" dependencies = [ "cfg-if", "libc", "redox_syscall", "smallvec", - "windows-sys 0.42.0", + "windows-sys 0.45.0", ] [[package]] name = "paste" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d01a5bd0424d00070b0098dd17ebca6f961a959dead1dbcbbbc1d1cd8d3deeba" +checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79" [[package]] name = "pbkdf2" @@ -1310,6 +1384,12 @@ dependencies = [ "digest 0.10.6", ] +[[package]] +name = "percent-encoding" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" + [[package]] name = "pin-project-lite" version = "0.2.9" @@ -1343,20 +1423,19 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "1.2.1" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eda0fc3b0fb7c975631757e14d9049da17374063edb6ebbcbc54d880d4fe94e9" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" dependencies = [ "once_cell", - "thiserror", - "toml", + "toml_edit", ] [[package]] name = "proc-macro2" -version = "1.0.49" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57a8eca9f9c4ffde41714334dee777596264c7825420f521abc92b5b5deb63a5" +checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" dependencies = [ "unicode-ident", ] @@ -1372,9 +1451,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.23" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" +checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500" dependencies = [ "proc-macro2", ] @@ -1444,7 +1523,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.8", + "getrandom 0.2.9", ] [[package]] @@ -1467,33 +1546,33 @@ dependencies = [ [[package]] name = "ref-cast" -version = "1.0.14" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c78fb8c9293bcd48ef6fce7b4ca950ceaf21210de6e105a883ee280c0f7b9ed" +checksum = "f43faa91b1c8b36841ee70e97188a869d37ae21759da6846d4be66de5bf7b12c" dependencies = [ "ref-cast-impl", ] [[package]] name = "ref-cast-impl" -version = "1.0.14" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f9c0c92af03644e4806106281fe2e068ac5bc0ae74a707266d06ea27bccee5f" +checksum = "8d2275aab483050ab2a7364c1a46604865ee7d6906684e08db0f090acf74f9e7" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.15", ] [[package]] name = "regex" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" +checksum = "af83e617f331cc6ae2da5443c602dfa5af81e517212d9d611a5b3ba1777b5370" dependencies = [ "aho-corasick", "memchr", - "regex-syntax", + "regex-syntax 0.7.1", ] [[package]] @@ -1502,20 +1581,26 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" dependencies = [ - "regex-syntax", + "regex-syntax 0.6.29", ] [[package]] name = "regex-syntax" -version = "0.6.28" +version = "0.6.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + +[[package]] +name = "regex-syntax" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c" [[package]] name = "rustc-demangle" -version = "0.1.21" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" [[package]] name = "rustc-hash" @@ -1531,29 +1616,49 @@ checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6" [[package]] name = "rustix" -version = "0.35.13" +version = "0.36.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "727a1a6d65f786ec22df8a81ca3121107f235970dc1705ed681d3e6e8b9cd5f9" +checksum = "3a38f9520be93aba504e8ca974197f46158de5dcaa9fa04b57c57cd6a679d658" dependencies = [ "bitflags", "errno", "io-lifetimes", "libc", - "linux-raw-sys", - "windows-sys 0.42.0", + "linux-raw-sys 0.1.4", + "windows-sys 0.45.0", ] +[[package]] +name = "rustix" +version = "0.37.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" +dependencies = [ + "bitflags", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys 0.3.7", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustversion" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" + [[package]] name = "ryu" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" +checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" [[package]] name = "scale-info" -version = "2.3.1" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "001cf62ece89779fd16105b5f515ad0e5cedcd5440d3dd806bb067978e7c3608" +checksum = "dfdef77228a4c05dc94211441595746732131ad7f6530c6c18f045da7b7ab937" dependencies = [ "bitvec", "cfg-if", @@ -1564,14 +1669,25 @@ dependencies = [ [[package]] name = "scale-info-derive" -version = "2.3.1" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "303959cf613a6f6efd19ed4b4ad5bf79966a13352716299ad532cfb115f4205c" +checksum = "53012eae69e5aa5c14671942a5dd47de59d4cdcff8532a6dd0e081faf1119482" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 1.0.109", +] + +[[package]] +name = "schnellru" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "772575a524feeb803e5b0fcbc6dd9f367e579488197c94c6e4023aad2305774d" +dependencies = [ + "ahash 0.8.3", + "cfg-if", + "hashbrown 0.13.2", ] [[package]] @@ -1600,15 +1716,15 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "scratch" -version = "1.0.3" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2" +checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1" [[package]] name = "secp256k1" -version = "0.24.2" +version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9512ffd81e3a3503ed401f79c33168b9148c75038956039166cd750eaa037c3" +checksum = "6b1629c9c557ef9b293568b338dddfc8208c98a18c59d722a9d53f859d9c9b62" dependencies = [ "secp256k1-sys", ] @@ -1633,29 +1749,29 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.151" +version = "1.0.162" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97fed41fc1a24994d044e6db6935e69511a1153b52c15eb42493b26fa87feba0" +checksum = "71b2f6e1ab5c2b98c05f0f35b236b22e8df7ead6ffbf51d7808da7f8817e7ab6" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.151" +version = "1.0.162" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "255abe9a125a985c05190d687b320c12f9b1f0b99445e608c21ba0782c719ad8" +checksum = "a2a0814352fd64b58489904a44ea8d90cb1a91dcb6b4f5ebabc32c8318e93cb6" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.15", ] [[package]] name = "serde_json" -version = "1.0.91" +version = "1.0.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883" +checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" dependencies = [ "itoa", "ryu", @@ -1700,9 +1816,9 @@ dependencies = [ [[package]] name = "sha3" -version = "0.10.6" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdf0c33fae925bdc080598b84bc15c55e7b9a4a43b3c704da051f977469691c9" +checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60" dependencies = [ "digest 0.10.6", "keccak", @@ -1725,9 +1841,9 @@ checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" [[package]] name = "slab" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" +checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" dependencies = [ "autocfg", ] @@ -1750,7 +1866,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#946507ba9ef13e263534176b7b74e26fc56efbd4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" dependencies = [ "parity-scale-codec", "scale-info", @@ -1763,7 +1879,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#946507ba9ef13e263534176b7b74e26fc56efbd4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" dependencies = [ "integer-sqrt", "num-traits", @@ -1777,12 +1893,13 @@ dependencies = [ [[package]] name = "sp-core" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#946507ba9ef13e263534176b7b74e26fc56efbd4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" dependencies = [ "array-bytes", - "base58", "bitflags", "blake2", + "bounded-collections", + "bs58", "dyn-clonable", "ed25519-zebra", "futures", @@ -1795,6 +1912,7 @@ dependencies = [ "merlin", "parity-scale-codec", "parking_lot", + "paste", "primitive-types", "rand 0.8.5", "regex", @@ -1819,9 +1937,9 @@ dependencies = [ [[package]] name = "sp-core-hashing" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#946507ba9ef13e263534176b7b74e26fc56efbd4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" dependencies = [ - "blake2", + "blake2b_simd", "byteorder", "digest 0.10.6", "sha2 0.10.6", @@ -1833,17 +1951,17 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#946507ba9ef13e263534176b7b74e26fc56efbd4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.15", ] [[package]] name = "sp-externalities" version = "0.13.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#946507ba9ef13e263534176b7b74e26fc56efbd4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" dependencies = [ "environmental", "parity-scale-codec", @@ -1854,7 +1972,7 @@ dependencies = [ [[package]] name = "sp-io" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#946507ba9ef13e263534176b7b74e26fc56efbd4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" dependencies = [ "bytes", "ed25519", @@ -1863,6 +1981,7 @@ dependencies = [ "libsecp256k1", "log", "parity-scale-codec", + "rustversion", "secp256k1", "sp-core", "sp-externalities", @@ -1879,14 +1998,11 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.13.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#946507ba9ef13e263534176b7b74e26fc56efbd4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" dependencies = [ - "async-trait", "futures", - "merlin", "parity-scale-codec", "parking_lot", - "schnorrkel", "sp-core", "sp-externalities", "thiserror", @@ -1895,7 +2011,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#946507ba9ef13e263534176b7b74e26fc56efbd4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" dependencies = [ "backtrace", "lazy_static", @@ -1905,7 +2021,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#946507ba9ef13e263534176b7b74e26fc56efbd4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" dependencies = [ "either", "hash256-std-hasher", @@ -1927,7 +2043,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#946507ba9ef13e263534176b7b74e26fc56efbd4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" dependencies = [ "bytes", "impl-trait-for-tuples", @@ -1945,19 +2061,19 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#946507ba9ef13e263534176b7b74e26fc56efbd4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" dependencies = [ "Inflector", "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 2.0.15", ] [[package]] name = "sp-state-machine" version = "0.13.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#946507ba9ef13e263534176b7b74e26fc56efbd4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" dependencies = [ "hash-db", "log", @@ -1977,12 +2093,12 @@ dependencies = [ [[package]] name = "sp-std" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#946507ba9ef13e263534176b7b74e26fc56efbd4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" [[package]] name = "sp-storage" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#946507ba9ef13e263534176b7b74e26fc56efbd4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" dependencies = [ "impl-serde", "parity-scale-codec", @@ -1995,7 +2111,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#946507ba9ef13e263534176b7b74e26fc56efbd4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" dependencies = [ "parity-scale-codec", "sp-std", @@ -2007,18 +2123,18 @@ dependencies = [ [[package]] name = "sp-trie" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#946507ba9ef13e263534176b7b74e26fc56efbd4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" dependencies = [ - "ahash", + "ahash 0.8.3", "hash-db", - "hashbrown", + "hashbrown 0.13.2", "lazy_static", - "lru", "memory-db", "nohash-hasher", "parity-scale-codec", "parking_lot", "scale-info", + "schnellru", "sp-core", "sp-std", "thiserror", @@ -2030,8 +2146,9 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#946507ba9ef13e263534176b7b74e26fc56efbd4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" dependencies = [ + "anyhow", "impl-trait-for-tuples", "log", "parity-scale-codec", @@ -2043,7 +2160,7 @@ dependencies = [ [[package]] name = "sp-weights" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#946507ba9ef13e263534176b7b74e26fc56efbd4" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" dependencies = [ "parity-scale-codec", "scale-info", @@ -2063,9 +2180,9 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" [[package]] name = "ss58-registry" -version = "1.36.0" +version = "1.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23d92659e7d18d82b803824a9ba5a6022cff101c3491d027c1c1d8d30e749284" +checksum = "eb47a8ad42e5fc72d5b1eb104a5546937eaf39843499948bb666d6e93c62423b" dependencies = [ "Inflector", "num-format", @@ -2109,6 +2226,7 @@ dependencies = [ "hex", "lazy_static", "num-rational", + "scale-info", "serde", "serde_json", "sha2 0.9.9", @@ -2126,9 +2244,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "syn" -version = "1.0.107" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ "proc-macro2", "quote", @@ -2136,15 +2254,14 @@ dependencies = [ ] [[package]] -name = "synstructure" -version = "0.12.6" +name = "syn" +version = "2.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" +checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" dependencies = [ "proc-macro2", "quote", - "syn", - "unicode-xid", + "unicode-ident", ] [[package]] @@ -2155,45 +2272,46 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "target-lexicon" -version = "0.12.5" +version = "0.12.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9410d0f6853b1d94f0e519fb95df60f29d2c1eff2d921ffdf01a4c8a3b54f12d" +checksum = "fd1ba337640d60c3e96bc6f0638a939b9c9a7f2c316a1598c279828b3d1dc8c5" [[package]] name = "termcolor" -version = "1.1.3" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" dependencies = [ "winapi-util", ] [[package]] name = "thiserror" -version = "1.0.38" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" +checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.38" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" +checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.15", ] [[package]] name = "thread_local" -version = "1.1.4" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180" +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" dependencies = [ + "cfg-if", "once_cell", ] @@ -2227,17 +2345,25 @@ dependencies = [ [[package]] name = "tinyvec_macros" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] -name = "toml" -version = "0.5.10" +name = "toml_datetime" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" + +[[package]] +name = "toml_edit" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1333c76748e868a4d9d1017b5ab53171dfd095f70c712fdb4653a406547f598f" +checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13" dependencies = [ - "serde", + "indexmap", + "toml_datetime", + "winnow", ] [[package]] @@ -2254,13 +2380,13 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" +checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.15", ] [[package]] @@ -2318,12 +2444,12 @@ dependencies = [ [[package]] name = "trie-db" -version = "0.24.0" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "004e1e8f92535694b4cb1444dc5a8073ecf0815e3357f729638b9f8fc4062908" +checksum = "767abe6ffed88a1889671a102c2861ae742726f52e0a5a425b92c9fbfa7e9c85" dependencies = [ "hash-db", - "hashbrown", + "hashbrown 0.13.2", "log", "rustc-hex", "smallvec", @@ -2331,9 +2457,9 @@ dependencies = [ [[package]] name = "trie-root" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a36c5ca3911ed3c9a5416ee6c679042064b93fc637ded67e25f92e68d783891" +checksum = "d4ed310ef5ab98f5fa467900ed906cb9232dd5376597e00fd4cba2a449d06c0b" dependencies = [ "hash-db", ] @@ -2368,11 +2494,17 @@ dependencies = [ "static_assertions", ] +[[package]] +name = "unicode-bidi" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" + [[package]] name = "unicode-ident" -version = "1.0.6" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" +checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" [[package]] name = "unicode-normalization" @@ -2395,6 +2527,17 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" +[[package]] +name = "url" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", +] + [[package]] name = "valuable" version = "0.1.0" @@ -2421,9 +2564,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" +checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -2431,24 +2574,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" +checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn", + "syn 1.0.109", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" +checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2456,22 +2599,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" +checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" +checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" [[package]] name = "wasmi" @@ -2508,18 +2651,19 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.89.1" +version = "0.100.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab5d3e08b13876f96dd55608d03cd4883a0545884932d5adf11925876c96daef" +checksum = "64b20236ab624147dfbb62cf12a19aaf66af0e41b8398838b66e997d07d269d4" dependencies = [ "indexmap", + "url", ] [[package]] name = "wasmtime" -version = "1.0.2" +version = "6.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ad5af6ba38311282f2a21670d96e78266e8c8e2f38cbcd52c254df6ccbc7731" +checksum = "76a222f5fa1e14b2cefc286f1b68494d7a965f4bf57ec04c59bb62673d639af6" dependencies = [ "anyhow", "bincode", @@ -2537,23 +2681,23 @@ dependencies = [ "wasmtime-environ", "wasmtime-jit", "wasmtime-runtime", - "windows-sys 0.36.1", + "windows-sys 0.42.0", ] [[package]] name = "wasmtime-asm-macros" -version = "1.0.2" +version = "6.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45de63ddfc8b9223d1adc8f7b2ee5f35d1f6d112833934ad7ea66e4f4339e597" +checksum = "4407a7246e7d2f3d8fb1cf0c72fda8dbafdb6dd34d555ae8bea0e5ae031089cc" dependencies = [ "cfg-if", ] [[package]] name = "wasmtime-environ" -version = "1.0.2" +version = "6.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebb881c61f4f627b5d45c54e629724974f8a8890d455bcbe634330cc27309644" +checksum = "47b8b50962eae38ee319f7b24900b7cf371f03eebdc17400c1dc8575fc10c9a7" dependencies = [ "anyhow", "cranelift-entity", @@ -2570,9 +2714,9 @@ dependencies = [ [[package]] name = "wasmtime-jit" -version = "1.0.2" +version = "6.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1985c628011fe26adf5e23a5301bdc79b245e0e338f14bb58b39e4e25e4d8681" +checksum = "ffaed4f9a234ba5225d8e64eac7b4a5d13b994aeb37353cde2cbeb3febda9eaa" dependencies = [ "addr2line 0.17.0", "anyhow", @@ -2583,29 +2727,39 @@ dependencies = [ "log", "object 0.29.0", "rustc-demangle", - "rustix", "serde", "target-lexicon", - "thiserror", "wasmtime-environ", + "wasmtime-jit-icache-coherence", "wasmtime-runtime", - "windows-sys 0.36.1", + "windows-sys 0.42.0", ] [[package]] name = "wasmtime-jit-debug" -version = "1.0.2" +version = "6.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f671b588486f5ccec8c5a3dba6b4c07eac2e66ab8c60e6f4e53717c77f709731" +checksum = "eed41cbcbf74ce3ff6f1d07d1b707888166dc408d1a880f651268f4f7c9194b2" dependencies = [ "once_cell", ] +[[package]] +name = "wasmtime-jit-icache-coherence" +version = "6.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a28ae1e648461bfdbb79db3efdaee1bca5b940872e4175390f465593a2e54c" +dependencies = [ + "cfg-if", + "libc", + "windows-sys 0.42.0", +] + [[package]] name = "wasmtime-runtime" -version = "1.0.2" +version = "6.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee8f92ad4b61736339c29361da85769ebc200f184361959d1792832e592a1afd" +checksum = "e704b126e4252788ccfc3526d4d4511d4b23c521bf123e447ac726c14545217b" dependencies = [ "anyhow", "cc", @@ -2614,22 +2768,22 @@ dependencies = [ "libc", "log", "mach", + "memfd", "memoffset", "paste", "rand 0.8.5", - "rustix", - "thiserror", + "rustix 0.36.13", "wasmtime-asm-macros", "wasmtime-environ", "wasmtime-jit-debug", - "windows-sys 0.36.1", + "windows-sys 0.42.0", ] [[package]] name = "wasmtime-types" -version = "1.0.2" +version = "6.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d23d61cb4c46e837b431196dd06abb11731541021916d03476a178b54dc07aeb" +checksum = "83e5572c5727c1ee7e8f28717aaa8400e4d22dcbd714ea5457d85b5005206568" dependencies = [ "cranelift-entity", "serde", @@ -2669,16 +2823,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] -name = "windows-sys" -version = "0.36.1" +name = "windows" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "windows_aarch64_msvc 0.36.1", - "windows_i686_gnu 0.36.1", - "windows_i686_msvc 0.36.1", - "windows_x86_64_gnu 0.36.1", - "windows_x86_64_msvc 0.36.1", + "windows-targets 0.48.0", ] [[package]] @@ -2687,86 +2837,155 @@ version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc 0.42.0", - "windows_i686_gnu 0.42.0", - "windows_i686_msvc 0.42.0", - "windows_x86_64_gnu 0.42.0", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc 0.42.0", + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets 0.42.2", +] + +[[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.0", +] + +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-targets" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +dependencies = [ + "windows_aarch64_gnullvm 0.48.0", + "windows_aarch64_msvc 0.48.0", + "windows_i686_gnu 0.48.0", + "windows_i686_msvc 0.48.0", + "windows_x86_64_gnu 0.48.0", + "windows_x86_64_gnullvm 0.48.0", + "windows_x86_64_msvc 0.48.0", ] [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.0" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" [[package]] name = "windows_aarch64_msvc" -version = "0.36.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" [[package]] name = "windows_aarch64_msvc" -version = "0.42.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" +checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" [[package]] name = "windows_i686_gnu" -version = "0.36.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] name = "windows_i686_gnu" -version = "0.42.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" [[package]] name = "windows_i686_msvc" -version = "0.36.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] name = "windows_i686_msvc" -version = "0.42.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" +checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" [[package]] name = "windows_x86_64_gnu" -version = "0.36.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[package]] name = "windows_x86_64_gnu" -version = "0.42.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" +checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.0" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" +checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" [[package]] name = "windows_x86_64_msvc" -version = "0.36.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] name = "windows_x86_64_msvc" -version = "0.42.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" + +[[package]] +name = "winnow" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61de7bac303dc551fe038e2b3cef0f571087a47571ea6e79a87692ac99b99699" +dependencies = [ + "memchr", +] [[package]] name = "wyz" @@ -2779,21 +2998,20 @@ dependencies = [ [[package]] name = "zeroize" -version = "1.5.7" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c394b5bd0c6f669e7275d9c20aa90ae064cb22e75a1cad54e1b34088034b149f" +checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" dependencies = [ "zeroize_derive", ] [[package]] name = "zeroize_derive" -version = "1.3.3" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44bf07cb3e50ea2003396695d58bf46bc9887a1f362260446fad6bc4e79bd36c" +checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn", - "synstructure", + "syn 2.0.15", ] diff --git a/Cargo.toml b/Cargo.toml index 6613e35..65b0706 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,7 @@ name = "substrate-stellar-sdk" version = "0.2.4" authors = ["Torsten Stüber "] edition = "2018" -license = "Apache-2.0" +license = "Apache-2.0" description = "A Substrate compatible SDK for Stellar" repository = "https://github.com/pendulum-chain/substrate-stellar-sdk" readme = "README.md" @@ -12,28 +12,29 @@ exclude = ["autogenerator/*"] [dependencies] serde_json = { version = '1.0.64', default-features = false, features = ["alloc"], optional = true } -serde = { version = "1.0.100", default-features = false, features = ["derive", "alloc"], optional = true } -hex = { version = "0.4", default-features = false, features = ["alloc"] } -sp-std = { version = "5.0.0", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } -sp-runtime = { version = "7.0.0", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37", optional = true } -sp-io = { version = "7.0.0", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37", optional = true } +serde = { version = "1.0.136", default-features = false, features = ["derive", "alloc"], optional = true } +hex = { version = "0.4", default-features = false , features = ["alloc"]} +sp-std = { version = "5.0.0", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" } +sp-runtime = { version = "7.0.0", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42", optional = true } +sp-io = { version = "7.0.0", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42", optional = true } sodalite = { version = "0.4.0" } sha2 = { default-features = false, version = "0.9.9" } lazy_static = { version = "1.4.0", features = ["spin_no_std"] } base64 = { default-features = false, version = "0.13.0" } -num-rational = { version = "0.4", default-features = false } - +num-rational = {version = "0.4", default-features = false} +scale-info = {version = "2.1.1", default-features = false, features = ["derive"]} [features] -default = ["offchain", "std"] +default = [ "offchain", "std" ] all-types = [] -offchain = ["sp-runtime", "sp-io", "serde_json", "serde"] +offchain = [ "sp-runtime", "sp-io", "serde_json", "serde" ] std = [ - "sp-runtime/std", - "sp-std/std", - "sp-io/std", - "serde_json/std", - "serde/std", - "hex/std", - "num-rational/std" + "sp-runtime/std", + "sp-std/std", + "sp-io/std", + "serde_json/std", + "serde/std", + "scale-info/std", + "hex/std", + "num-rational/std" ] diff --git a/autogenerator/x2JavaScript/ruby/Rakefile b/autogenerator/x2JavaScript/ruby/Rakefile index 083a932..8fdafb9 100644 --- a/autogenerator/x2JavaScript/ruby/Rakefile +++ b/autogenerator/x2JavaScript/ruby/Rakefile @@ -20,7 +20,7 @@ namespace :xdr do "Stellar-contract-env-meta.x", "Stellar-contract-meta.x", "Stellar-contract-spec.x" - + ] task :update => [:download, :generate] diff --git a/src/error.rs b/src/error.rs index 2e848cc..e5e6d00 100644 --- a/src/error.rs +++ b/src/error.rs @@ -4,6 +4,8 @@ use hex::FromHexError; #[cfg(feature = "offchain")] use crate::horizon::FetchError; +use sp_std::vec::Vec; + #[derive(Debug, Clone, PartialEq)] pub enum StellarSdkError { InvalidBase32Character { @@ -86,4 +88,6 @@ pub enum StellarSdkError { #[cfg(feature = "offchain")] FetchError(FetchError), + + DecodeError(Vec), // String converted as Bytes of u8 } diff --git a/src/lib.rs b/src/lib.rs index 1740cc5..88c47ac 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -8,9 +8,9 @@ extern crate alloc; mod lib { #[cfg(not(feature = "std"))] - pub use alloc::string::{String, ToString, FromUtf8Error}; + pub use alloc::string::{FromUtf8Error, String, ToString}; #[cfg(feature = "std")] - pub use std::string::{String, ToString, FromUtf8Error}; + pub use std::string::{FromUtf8Error, String, ToString}; } mod amount; @@ -47,6 +47,9 @@ pub use xdr::{ #[cfg(feature = "all-types")] pub use xdr::impls::transaction_set_type::*; +#[cfg(feature = "all-types")] +pub use xdr::impls::error::*; + pub use utils::std::StellarTypeToString; pub use amount::*; diff --git a/src/xdr/impls/claimable_balance_id.rs b/src/xdr/impls/claimable_balance_id.rs index 1602b0f..f51cab9 100644 --- a/src/xdr/impls/claimable_balance_id.rs +++ b/src/xdr/impls/claimable_balance_id.rs @@ -1,5 +1,7 @@ -use crate::{AsBinary, ClaimableBalanceId, StellarSdkError, XdrCodec}; -use crate::lib::{String, ToString}; +use crate::{ + lib::{String, ToString}, + AsBinary, ClaimableBalanceId, StellarSdkError, XdrCodec, +}; pub trait IntoClaimbleBalanceId { fn into_claimable_balance_id(self) -> Result; diff --git a/src/xdr/impls/error.rs b/src/xdr/impls/error.rs new file mode 100644 index 0000000..386d4a3 --- /dev/null +++ b/src/xdr/impls/error.rs @@ -0,0 +1,10 @@ +use crate::{lib::String, types::Error}; +use scale_info::prelude::format; + +impl> crate::StellarTypeToString for Error { + fn as_encoded_string(&self) -> Result { + let msg = self.msg.get_vec(); + let msg = sp_std::str::from_utf8(msg).map_err(E::from)?; + Ok(format!("Error{{ code:{:?} message:{msg} }}", self.code)) + } +} diff --git a/src/xdr/impls/generalized_transaction_set.rs b/src/xdr/impls/generalized_transaction_set.rs index 54c01c5..bdfadb4 100644 --- a/src/xdr/impls/generalized_transaction_set.rs +++ b/src/xdr/impls/generalized_transaction_set.rs @@ -1,6 +1,6 @@ use crate::{ - lib::{String, FromUtf8Error}, compound_types::UnlimitedVarArray, + lib::{FromUtf8Error, String}, types::{GeneralizedTransactionSet, TransactionPhase, TxSetComponent}, Hash, IntoHash, StellarSdkError, TransactionEnvelope, XdrCodec, }; diff --git a/src/xdr/impls/mod.rs b/src/xdr/impls/mod.rs index 82456d9..4321358 100644 --- a/src/xdr/impls/mod.rs +++ b/src/xdr/impls/mod.rs @@ -2,6 +2,9 @@ pub mod operations; pub mod transaction; pub mod transaction_envelope; +#[cfg(feature = "all-types")] +pub mod error; + #[cfg(feature = "all-types")] pub mod generalized_transaction_set; diff --git a/src/xdr/impls/transaction_set_type.rs b/src/xdr/impls/transaction_set_type.rs index 7a358e8..1ecc033 100644 --- a/src/xdr/impls/transaction_set_type.rs +++ b/src/xdr/impls/transaction_set_type.rs @@ -1,9 +1,10 @@ #![allow(dead_code)] -use crate::{Hash, IntoHash, ReadStream, TransactionEnvelope, WriteStream, XdrCodec}; -use crate::compound_types::UnlimitedVarArray; -use crate::types::{GeneralizedTransactionSet, TransactionSet}; -use crate::xdr::streams::DecodeError; - +use crate::{ + compound_types::UnlimitedVarArray, + types::{GeneralizedTransactionSet, TransactionSet}, + xdr::streams::DecodeError, + Hash, IntoHash, ReadStream, TransactionEnvelope, WriteStream, XdrCodec, +}; #[derive(Debug, Clone, Eq, PartialEq)] pub enum TransactionSetType { @@ -12,7 +13,7 @@ pub enum TransactionSetType { } pub trait InitExt { - fn new(tx_set:T) -> Self; + fn new(tx_set: T) -> Self; } impl InitExt for TransactionSetType { @@ -28,13 +29,10 @@ impl InitExt for TransactionSetType { } impl TransactionSetType { - pub fn get_tx_set_hash(&self) -> Result { match self { - TransactionSetType::TransactionSet(tx_set) => - tx_set.clone().into_hash().map_err(|_| ()), - TransactionSetType::GeneralizedTransactionSet(tx_set) => - tx_set.clone().into_hash().map_err(|_| ()), + TransactionSetType::TransactionSet(tx_set) => tx_set.clone().into_hash().map_err(|_| ()), + TransactionSetType::GeneralizedTransactionSet(tx_set) => tx_set.clone().into_hash().map_err(|_| ()), } } @@ -48,26 +46,39 @@ impl TransactionSetType { } } +impl From for TransactionSetType { + fn from(value: TransactionSet) -> Self { + TransactionSetType::TransactionSet(value) + } +} + +impl From for TransactionSetType { + fn from(value: GeneralizedTransactionSet) -> Self { + TransactionSetType::GeneralizedTransactionSet(value) + } +} + impl XdrCodec for TransactionSetType { fn to_xdr_buffered(&self, write_stream: &mut WriteStream) { match self { TransactionSetType::TransactionSet(set) => { (0 as i32).to_xdr_buffered(write_stream); set.to_xdr_buffered(write_stream) - } + }, TransactionSetType::GeneralizedTransactionSet(set) => { (1 as i32).to_xdr_buffered(write_stream); set.to_xdr_buffered(write_stream) - } + }, } } fn from_xdr_buffered>(read_stream: &mut ReadStream) -> Result { match i32::from_xdr_buffered(read_stream)? { 0 => Ok(TransactionSetType::TransactionSet(TransactionSet::from_xdr_buffered(read_stream)?)), - 1 => Ok(TransactionSetType::GeneralizedTransactionSet(GeneralizedTransactionSet::from_xdr_buffered(read_stream)?)), - _ => Err(DecodeError::InvalidEnumDiscriminator { at_position: 0 }) + 1 => Ok(TransactionSetType::GeneralizedTransactionSet(GeneralizedTransactionSet::from_xdr_buffered( + read_stream, + )?)), + _ => Err(DecodeError::InvalidEnumDiscriminator { at_position: 0 }), } } } - diff --git a/src/xdr/mod.rs b/src/xdr/mod.rs index 23a7916..10803fa 100644 --- a/src/xdr/mod.rs +++ b/src/xdr/mod.rs @@ -2,4 +2,6 @@ pub mod compound_types; pub mod impls; pub mod streams; pub mod types; + +#[macro_use] pub mod xdr_codec; diff --git a/src/xdr/types.rs b/src/xdr/types.rs index 73eeec9..3b05b83 100644 --- a/src/xdr/types.rs +++ b/src/xdr/types.rs @@ -1,6 +1,6 @@ //! Autogenerated XDR types //! -// This code has been automatically generated on 2023-10-06 +// This code has been automatically generated on 2023-10-10 // using the code in folder `/autogenerator` // Do not edit this file manually! @@ -604,42 +604,42 @@ impl XdrCodec for ContractCostParamEntry { } } -/// Autogenerated definition for type StateExpirationSettings +/// Autogenerated definition for type StateArchivalSettings #[allow(dead_code)] #[derive(Debug, Clone, Eq, PartialEq)] -pub struct StateExpirationSettings { - pub max_entry_expiration: Uint32, - pub min_temp_entry_expiration: Uint32, - pub min_persistent_entry_expiration: Uint32, +pub struct StateArchivalSettings { + pub max_entry_ttl: Uint32, + pub min_temporary_ttl: Uint32, + pub min_persistent_ttl: Uint32, pub persistent_rent_rate_denominator: Int64, pub temp_rent_rate_denominator: Int64, - pub max_entries_to_expire: Uint32, + pub max_entries_to_archive: Uint32, pub bucket_list_size_window_sample_size: Uint32, pub eviction_scan_size: Uint64, pub starting_eviction_scan_level: Uint32, } -impl XdrCodec for StateExpirationSettings { +impl XdrCodec for StateArchivalSettings { fn to_xdr_buffered(&self, write_stream: &mut WriteStream) { - self.max_entry_expiration.to_xdr_buffered(write_stream); - self.min_temp_entry_expiration.to_xdr_buffered(write_stream); - self.min_persistent_entry_expiration.to_xdr_buffered(write_stream); + self.max_entry_ttl.to_xdr_buffered(write_stream); + self.min_temporary_ttl.to_xdr_buffered(write_stream); + self.min_persistent_ttl.to_xdr_buffered(write_stream); self.persistent_rent_rate_denominator.to_xdr_buffered(write_stream); self.temp_rent_rate_denominator.to_xdr_buffered(write_stream); - self.max_entries_to_expire.to_xdr_buffered(write_stream); + self.max_entries_to_archive.to_xdr_buffered(write_stream); self.bucket_list_size_window_sample_size.to_xdr_buffered(write_stream); self.eviction_scan_size.to_xdr_buffered(write_stream); self.starting_eviction_scan_level.to_xdr_buffered(write_stream); } fn from_xdr_buffered>(read_stream: &mut ReadStream) -> Result { - Ok(StateExpirationSettings { - max_entry_expiration: Uint32::from_xdr_buffered(read_stream)?, - min_temp_entry_expiration: Uint32::from_xdr_buffered(read_stream)?, - min_persistent_entry_expiration: Uint32::from_xdr_buffered(read_stream)?, + Ok(StateArchivalSettings { + max_entry_ttl: Uint32::from_xdr_buffered(read_stream)?, + min_temporary_ttl: Uint32::from_xdr_buffered(read_stream)?, + min_persistent_ttl: Uint32::from_xdr_buffered(read_stream)?, persistent_rent_rate_denominator: Int64::from_xdr_buffered(read_stream)?, temp_rent_rate_denominator: Int64::from_xdr_buffered(read_stream)?, - max_entries_to_expire: Uint32::from_xdr_buffered(read_stream)?, + max_entries_to_archive: Uint32::from_xdr_buffered(read_stream)?, bucket_list_size_window_sample_size: Uint32::from_xdr_buffered(read_stream)?, eviction_scan_size: Uint64::from_xdr_buffered(read_stream)?, starting_eviction_scan_level: Uint32::from_xdr_buffered(read_stream)?, @@ -690,7 +690,7 @@ pub enum ConfigSettingId { ConfigSettingContractCostParamsMemoryBytes = 7, ConfigSettingContractDataKeySizeBytes = 8, ConfigSettingContractDataEntrySizeBytes = 9, - ConfigSettingStateExpiration = 10, + ConfigSettingStateArchival = 10, ConfigSettingContractExecutionLanes = 11, ConfigSettingBucketlistSizeWindow = 12, ConfigSettingEvictionIterator = 13, @@ -715,7 +715,7 @@ impl XdrCodec for ConfigSettingId { 7 => Ok(ConfigSettingId::ConfigSettingContractCostParamsMemoryBytes), 8 => Ok(ConfigSettingId::ConfigSettingContractDataKeySizeBytes), 9 => Ok(ConfigSettingId::ConfigSettingContractDataEntrySizeBytes), - 10 => Ok(ConfigSettingId::ConfigSettingStateExpiration), + 10 => Ok(ConfigSettingId::ConfigSettingStateArchival), 11 => Ok(ConfigSettingId::ConfigSettingContractExecutionLanes), 12 => Ok(ConfigSettingId::ConfigSettingBucketlistSizeWindow), 13 => Ok(ConfigSettingId::ConfigSettingEvictionIterator), @@ -1623,7 +1623,7 @@ impl XdrCodec for Int256Parts { #[derive(Debug, Copy, Clone, Eq, PartialEq)] pub enum ContractExecutableType { ContractExecutableWasm = 0, - ContractExecutableToken = 1, + ContractExecutableStellarAsset = 1, } impl XdrCodec for ContractExecutableType { @@ -1636,7 +1636,7 @@ impl XdrCodec for ContractExecutableType { let enum_value = i32::from_xdr_buffered(read_stream)?; match enum_value { 0 => Ok(ContractExecutableType::ContractExecutableWasm), - 1 => Ok(ContractExecutableType::ContractExecutableToken), + 1 => Ok(ContractExecutableType::ContractExecutableStellarAsset), _ => Err(DecodeError::InvalidEnumDiscriminator { at_position: read_stream.get_position() }), } } @@ -2010,7 +2010,7 @@ pub enum LedgerEntryType { ContractData = 6, ContractCode = 7, ConfigSetting = 8, - Expiration = 9, + Ttl = 9, } impl XdrCodec for LedgerEntryType { @@ -2031,7 +2031,7 @@ impl XdrCodec for LedgerEntryType { 6 => Ok(LedgerEntryType::ContractData), 7 => Ok(LedgerEntryType::ContractCode), 8 => Ok(LedgerEntryType::ConfigSetting), - 9 => Ok(LedgerEntryType::Expiration), + 9 => Ok(LedgerEntryType::Ttl), _ => Err(DecodeError::InvalidEnumDiscriminator { at_position: read_stream.get_position() }), } } @@ -2764,24 +2764,24 @@ impl XdrCodec for ContractCodeEntry { } } -/// Autogenerated definition for type ExpirationEntry +/// Autogenerated definition for type TtlEntry #[allow(dead_code)] #[derive(Debug, Clone, Eq, PartialEq)] -pub struct ExpirationEntry { +pub struct TtlEntry { pub key_hash: Hash, - pub expiration_ledger_seq: Uint32, + pub live_until_ledger_seq: Uint32, } -impl XdrCodec for ExpirationEntry { +impl XdrCodec for TtlEntry { fn to_xdr_buffered(&self, write_stream: &mut WriteStream) { self.key_hash.to_xdr_buffered(write_stream); - self.expiration_ledger_seq.to_xdr_buffered(write_stream); + self.live_until_ledger_seq.to_xdr_buffered(write_stream); } fn from_xdr_buffered>(read_stream: &mut ReadStream) -> Result { - Ok(ExpirationEntry { + Ok(TtlEntry { key_hash: Hash::from_xdr_buffered(read_stream)?, - expiration_ledger_seq: Uint32::from_xdr_buffered(read_stream)?, + live_until_ledger_seq: Uint32::from_xdr_buffered(read_stream)?, }) } } @@ -3009,20 +3009,20 @@ impl XdrCodec for LedgerKeyConfigSetting { } } -/// Autogenerated definition for type LedgerKeyExpiration +/// Autogenerated definition for type LedgerKeyTtl #[allow(dead_code)] #[derive(Debug, Clone, Eq, PartialEq)] -pub struct LedgerKeyExpiration { +pub struct LedgerKeyTtl { pub key_hash: Hash, } -impl XdrCodec for LedgerKeyExpiration { +impl XdrCodec for LedgerKeyTtl { fn to_xdr_buffered(&self, write_stream: &mut WriteStream) { self.key_hash.to_xdr_buffered(write_stream); } fn from_xdr_buffered>(read_stream: &mut ReadStream) -> Result { - Ok(LedgerKeyExpiration { key_hash: Hash::from_xdr_buffered(read_stream)? }) + Ok(LedgerKeyTtl { key_hash: Hash::from_xdr_buffered(read_stream)? }) } } @@ -4035,39 +4035,6 @@ impl XdrCodec for LedgerCloseMetaV0 { #[cfg(feature = "all-types")] #[derive(Debug, Clone, Eq, PartialEq)] pub struct LedgerCloseMetaV1 { - pub ledger_header: LedgerHeaderHistoryEntry, - pub tx_set: GeneralizedTransactionSet, - pub tx_processing: UnlimitedVarArray, - pub upgrades_processing: UnlimitedVarArray, - pub scp_info: UnlimitedVarArray, -} - -#[cfg(feature = "all-types")] -impl XdrCodec for LedgerCloseMetaV1 { - fn to_xdr_buffered(&self, write_stream: &mut WriteStream) { - self.ledger_header.to_xdr_buffered(write_stream); - self.tx_set.to_xdr_buffered(write_stream); - self.tx_processing.to_xdr_buffered(write_stream); - self.upgrades_processing.to_xdr_buffered(write_stream); - self.scp_info.to_xdr_buffered(write_stream); - } - - fn from_xdr_buffered>(read_stream: &mut ReadStream) -> Result { - Ok(LedgerCloseMetaV1 { - ledger_header: LedgerHeaderHistoryEntry::from_xdr_buffered(read_stream)?, - tx_set: GeneralizedTransactionSet::from_xdr_buffered(read_stream)?, - tx_processing: UnlimitedVarArray::::from_xdr_buffered(read_stream)?, - upgrades_processing: UnlimitedVarArray::::from_xdr_buffered(read_stream)?, - scp_info: UnlimitedVarArray::::from_xdr_buffered(read_stream)?, - }) - } -} - -/// Autogenerated definition for type LedgerCloseMetaV2 -#[allow(dead_code)] -#[cfg(feature = "all-types")] -#[derive(Debug, Clone, Eq, PartialEq)] -pub struct LedgerCloseMetaV2 { pub ext: ExtensionPoint, pub ledger_header: LedgerHeaderHistoryEntry, pub tx_set: GeneralizedTransactionSet, @@ -4080,7 +4047,7 @@ pub struct LedgerCloseMetaV2 { } #[cfg(feature = "all-types")] -impl XdrCodec for LedgerCloseMetaV2 { +impl XdrCodec for LedgerCloseMetaV1 { fn to_xdr_buffered(&self, write_stream: &mut WriteStream) { self.ext.to_xdr_buffered(write_stream); self.ledger_header.to_xdr_buffered(write_stream); @@ -4094,7 +4061,7 @@ impl XdrCodec for LedgerCloseMetaV2 { } fn from_xdr_buffered>(read_stream: &mut ReadStream) -> Result { - Ok(LedgerCloseMetaV2 { + Ok(LedgerCloseMetaV1 { ext: ExtensionPoint::from_xdr_buffered(read_stream)?, ledger_header: LedgerHeaderHistoryEntry::from_xdr_buffered(read_stream)?, tx_set: GeneralizedTransactionSet::from_xdr_buffered(read_stream)?, @@ -4888,7 +4855,7 @@ pub enum OperationType { LiquidityPoolDeposit = 22, LiquidityPoolWithdraw = 23, InvokeHostFunction = 24, - BumpFootprintExpiration = 25, + ExtendFootprintTtl = 25, RestoreFootprint = 26, } @@ -4926,7 +4893,7 @@ impl XdrCodec for OperationType { 22 => Ok(OperationType::LiquidityPoolDeposit), 23 => Ok(OperationType::LiquidityPoolWithdraw), 24 => Ok(OperationType::InvokeHostFunction), - 25 => Ok(OperationType::BumpFootprintExpiration), + 25 => Ok(OperationType::ExtendFootprintTtl), 26 => Ok(OperationType::RestoreFootprint), _ => Err(DecodeError::InvalidEnumDiscriminator { at_position: read_stream.get_position() }), } @@ -5762,24 +5729,24 @@ impl XdrCodec for InvokeHostFunctionOp { } } -/// Autogenerated definition for type BumpFootprintExpirationOp +/// Autogenerated definition for type ExtendFootprintTtlOp #[allow(dead_code)] #[derive(Debug, Clone, Eq, PartialEq)] -pub struct BumpFootprintExpirationOp { +pub struct ExtendFootprintTtlOp { pub ext: ExtensionPoint, - pub ledgers_to_expire: Uint32, + pub extend_to: Uint32, } -impl XdrCodec for BumpFootprintExpirationOp { +impl XdrCodec for ExtendFootprintTtlOp { fn to_xdr_buffered(&self, write_stream: &mut WriteStream) { self.ext.to_xdr_buffered(write_stream); - self.ledgers_to_expire.to_xdr_buffered(write_stream); + self.extend_to.to_xdr_buffered(write_stream); } fn from_xdr_buffered>(read_stream: &mut ReadStream) -> Result { - Ok(BumpFootprintExpirationOp { + Ok(ExtendFootprintTtlOp { ext: ExtensionPoint::from_xdr_buffered(read_stream)?, - ledgers_to_expire: Uint32::from_xdr_buffered(read_stream)?, + extend_to: Uint32::from_xdr_buffered(read_stream)?, }) } } @@ -6127,21 +6094,21 @@ impl XdrCodec for SorobanResources { pub struct SorobanTransactionData { pub ext: ExtensionPoint, pub resources: SorobanResources, - pub refundable_fee: Int64, + pub resource_fee: Int64, } impl XdrCodec for SorobanTransactionData { fn to_xdr_buffered(&self, write_stream: &mut WriteStream) { self.ext.to_xdr_buffered(write_stream); self.resources.to_xdr_buffered(write_stream); - self.refundable_fee.to_xdr_buffered(write_stream); + self.resource_fee.to_xdr_buffered(write_stream); } fn from_xdr_buffered>(read_stream: &mut ReadStream) -> Result { Ok(SorobanTransactionData { ext: ExtensionPoint::from_xdr_buffered(read_stream)?, resources: SorobanResources::from_xdr_buffered(read_stream)?, - refundable_fee: Int64::from_xdr_buffered(read_stream)?, + resource_fee: Int64::from_xdr_buffered(read_stream)?, }) } } @@ -7396,7 +7363,7 @@ pub enum InvokeHostFunctionResultCode { InvokeHostFunctionMalformed = -1, InvokeHostFunctionTrapped = -2, InvokeHostFunctionResourceLimitExceeded = -3, - InvokeHostFunctionEntryExpired = -4, + InvokeHostFunctionEntryArchived = -4, InvokeHostFunctionInsufficientRefundableFee = -5, } @@ -7413,24 +7380,24 @@ impl XdrCodec for InvokeHostFunctionResultCode { -1 => Ok(InvokeHostFunctionResultCode::InvokeHostFunctionMalformed), -2 => Ok(InvokeHostFunctionResultCode::InvokeHostFunctionTrapped), -3 => Ok(InvokeHostFunctionResultCode::InvokeHostFunctionResourceLimitExceeded), - -4 => Ok(InvokeHostFunctionResultCode::InvokeHostFunctionEntryExpired), + -4 => Ok(InvokeHostFunctionResultCode::InvokeHostFunctionEntryArchived), -5 => Ok(InvokeHostFunctionResultCode::InvokeHostFunctionInsufficientRefundableFee), _ => Err(DecodeError::InvalidEnumDiscriminator { at_position: read_stream.get_position() }), } } } -/// Autogenerated definition for type BumpFootprintExpirationResultCode +/// Autogenerated definition for type ExtendFootprintTtlResultCode #[allow(dead_code)] #[derive(Debug, Copy, Clone, Eq, PartialEq)] -pub enum BumpFootprintExpirationResultCode { - BumpFootprintExpirationSuccess = 0, - BumpFootprintExpirationMalformed = -1, - BumpFootprintExpirationResourceLimitExceeded = -2, - BumpFootprintExpirationInsufficientRefundableFee = -3, +pub enum ExtendFootprintTtlResultCode { + ExtendFootprintTtlSuccess = 0, + ExtendFootprintTtlMalformed = -1, + ExtendFootprintTtlResourceLimitExceeded = -2, + ExtendFootprintTtlInsufficientRefundableFee = -3, } -impl XdrCodec for BumpFootprintExpirationResultCode { +impl XdrCodec for ExtendFootprintTtlResultCode { fn to_xdr_buffered(&self, write_stream: &mut WriteStream) { let value = *self as i32; value.to_xdr_buffered(write_stream); @@ -7439,10 +7406,10 @@ impl XdrCodec for BumpFootprintExpirationResultCode { fn from_xdr_buffered>(read_stream: &mut ReadStream) -> Result { let enum_value = i32::from_xdr_buffered(read_stream)?; match enum_value { - 0 => Ok(BumpFootprintExpirationResultCode::BumpFootprintExpirationSuccess), - -1 => Ok(BumpFootprintExpirationResultCode::BumpFootprintExpirationMalformed), - -2 => Ok(BumpFootprintExpirationResultCode::BumpFootprintExpirationResourceLimitExceeded), - -3 => Ok(BumpFootprintExpirationResultCode::BumpFootprintExpirationInsufficientRefundableFee), + 0 => Ok(ExtendFootprintTtlResultCode::ExtendFootprintTtlSuccess), + -1 => Ok(ExtendFootprintTtlResultCode::ExtendFootprintTtlMalformed), + -2 => Ok(ExtendFootprintTtlResultCode::ExtendFootprintTtlResourceLimitExceeded), + -3 => Ok(ExtendFootprintTtlResultCode::ExtendFootprintTtlInsufficientRefundableFee), _ => Err(DecodeError::InvalidEnumDiscriminator { at_position: read_stream.get_position() }), } } @@ -7927,7 +7894,7 @@ pub enum ConfigSettingEntry { ConfigSettingContractCostParamsMemoryBytes(ContractCostParams), ConfigSettingContractDataKeySizeBytes(Uint32), ConfigSettingContractDataEntrySizeBytes(Uint32), - ConfigSettingStateExpiration(StateExpirationSettings), + ConfigSettingStateArchival(StateArchivalSettings), ConfigSettingContractExecutionLanes(ConfigSettingContractExecutionLanesV0), ConfigSettingBucketlistSizeWindow(UnlimitedVarArray), ConfigSettingEvictionIterator(EvictionIterator), @@ -7976,8 +7943,8 @@ impl XdrCodec for ConfigSettingEntry { ConfigSettingId::ConfigSettingContractDataEntrySizeBytes.to_xdr_buffered(write_stream); value.to_xdr_buffered(write_stream) }, - ConfigSettingEntry::ConfigSettingStateExpiration(value) => { - ConfigSettingId::ConfigSettingStateExpiration.to_xdr_buffered(write_stream); + ConfigSettingEntry::ConfigSettingStateArchival(value) => { + ConfigSettingId::ConfigSettingStateArchival.to_xdr_buffered(write_stream); value.to_xdr_buffered(write_stream) }, ConfigSettingEntry::ConfigSettingContractExecutionLanes(value) => { @@ -8029,8 +7996,8 @@ impl XdrCodec for ConfigSettingEntry { Ok(ConfigSettingEntry::ConfigSettingContractDataKeySizeBytes(Uint32::from_xdr_buffered(read_stream)?)), ConfigSettingId::ConfigSettingContractDataEntrySizeBytes => Ok(ConfigSettingEntry::ConfigSettingContractDataEntrySizeBytes(Uint32::from_xdr_buffered(read_stream)?)), - ConfigSettingId::ConfigSettingStateExpiration => Ok(ConfigSettingEntry::ConfigSettingStateExpiration( - StateExpirationSettings::from_xdr_buffered(read_stream)?, + ConfigSettingId::ConfigSettingStateArchival => Ok(ConfigSettingEntry::ConfigSettingStateArchival( + StateArchivalSettings::from_xdr_buffered(read_stream)?, )), ConfigSettingId::ConfigSettingContractExecutionLanes => Ok(ConfigSettingEntry::ConfigSettingContractExecutionLanes( @@ -8396,7 +8363,7 @@ impl XdrCodec for ScError { #[derive(Debug, Clone, Eq, PartialEq)] pub enum ContractExecutable { ContractExecutableWasm(Hash), - ContractExecutableToken, + ContractExecutableStellarAsset, } impl XdrCodec for ContractExecutable { @@ -8406,8 +8373,8 @@ impl XdrCodec for ContractExecutable { ContractExecutableType::ContractExecutableWasm.to_xdr_buffered(write_stream); value.to_xdr_buffered(write_stream) }, - ContractExecutable::ContractExecutableToken => - ContractExecutableType::ContractExecutableToken.to_xdr_buffered(write_stream), + ContractExecutable::ContractExecutableStellarAsset => + ContractExecutableType::ContractExecutableStellarAsset.to_xdr_buffered(write_stream), } } @@ -8415,7 +8382,8 @@ impl XdrCodec for ContractExecutable { match ContractExecutableType::from_xdr_buffered(read_stream)? { ContractExecutableType::ContractExecutableWasm => Ok(ContractExecutable::ContractExecutableWasm(Hash::from_xdr_buffered(read_stream)?)), - ContractExecutableType::ContractExecutableToken => Ok(ContractExecutable::ContractExecutableToken), + ContractExecutableType::ContractExecutableStellarAsset => + Ok(ContractExecutable::ContractExecutableStellarAsset), } } } @@ -9233,7 +9201,7 @@ pub enum LedgerEntryData { ContractData(ContractDataEntry), ContractCode(ContractCodeEntry), ConfigSetting(ConfigSettingEntry), - Expiration(ExpirationEntry), + Ttl(TtlEntry), } impl XdrCodec for LedgerEntryData { @@ -9275,8 +9243,8 @@ impl XdrCodec for LedgerEntryData { LedgerEntryType::ConfigSetting.to_xdr_buffered(write_stream); value.to_xdr_buffered(write_stream) }, - LedgerEntryData::Expiration(value) => { - LedgerEntryType::Expiration.to_xdr_buffered(write_stream); + LedgerEntryData::Ttl(value) => { + LedgerEntryType::Ttl.to_xdr_buffered(write_stream); value.to_xdr_buffered(write_stream) }, } @@ -9299,8 +9267,7 @@ impl XdrCodec for LedgerEntryData { Ok(LedgerEntryData::ContractCode(ContractCodeEntry::from_xdr_buffered(read_stream)?)), LedgerEntryType::ConfigSetting => Ok(LedgerEntryData::ConfigSetting(ConfigSettingEntry::from_xdr_buffered(read_stream)?)), - LedgerEntryType::Expiration => - Ok(LedgerEntryData::Expiration(ExpirationEntry::from_xdr_buffered(read_stream)?)), + LedgerEntryType::Ttl => Ok(LedgerEntryData::Ttl(TtlEntry::from_xdr_buffered(read_stream)?)), } } } @@ -9348,7 +9315,7 @@ pub enum LedgerKey { ContractData(LedgerKeyContractData), ContractCode(LedgerKeyContractCode), ConfigSetting(LedgerKeyConfigSetting), - Expiration(LedgerKeyExpiration), + Ttl(LedgerKeyTtl), } impl XdrCodec for LedgerKey { @@ -9390,8 +9357,8 @@ impl XdrCodec for LedgerKey { LedgerEntryType::ConfigSetting.to_xdr_buffered(write_stream); value.to_xdr_buffered(write_stream) }, - LedgerKey::Expiration(value) => { - LedgerEntryType::Expiration.to_xdr_buffered(write_stream); + LedgerKey::Ttl(value) => { + LedgerEntryType::Ttl.to_xdr_buffered(write_stream); value.to_xdr_buffered(write_stream) }, } @@ -9413,8 +9380,7 @@ impl XdrCodec for LedgerKey { Ok(LedgerKey::ContractCode(LedgerKeyContractCode::from_xdr_buffered(read_stream)?)), LedgerEntryType::ConfigSetting => Ok(LedgerKey::ConfigSetting(LedgerKeyConfigSetting::from_xdr_buffered(read_stream)?)), - LedgerEntryType::Expiration => - Ok(LedgerKey::Expiration(LedgerKeyExpiration::from_xdr_buffered(read_stream)?)), + LedgerEntryType::Ttl => Ok(LedgerKey::Ttl(LedgerKeyTtl::from_xdr_buffered(read_stream)?)), } } } @@ -9970,7 +9936,6 @@ impl XdrCodec for TransactionMeta { pub enum LedgerCloseMeta { V0(LedgerCloseMetaV0), V1(LedgerCloseMetaV1), - V2(LedgerCloseMetaV2), Default(i32), } @@ -9986,10 +9951,6 @@ impl XdrCodec for LedgerCloseMeta { (1 as i32).to_xdr_buffered(write_stream); value.to_xdr_buffered(write_stream) }, - LedgerCloseMeta::V2(value) => { - (2 as i32).to_xdr_buffered(write_stream); - value.to_xdr_buffered(write_stream) - }, LedgerCloseMeta::Default(code) => code.to_xdr_buffered(write_stream), } } @@ -9998,7 +9959,6 @@ impl XdrCodec for LedgerCloseMeta { match i32::from_xdr_buffered(read_stream)? { 0 => Ok(LedgerCloseMeta::V0(LedgerCloseMetaV0::from_xdr_buffered(read_stream)?)), 1 => Ok(LedgerCloseMeta::V1(LedgerCloseMetaV1::from_xdr_buffered(read_stream)?)), - 2 => Ok(LedgerCloseMeta::V2(LedgerCloseMetaV2::from_xdr_buffered(read_stream)?)), code => Ok(LedgerCloseMeta::Default(code)), } } @@ -10553,7 +10513,7 @@ pub enum OperationBody { LiquidityPoolDeposit(LiquidityPoolDepositOp), LiquidityPoolWithdraw(LiquidityPoolWithdrawOp), InvokeHostFunction(InvokeHostFunctionOp), - BumpFootprintExpiration(BumpFootprintExpirationOp), + ExtendFootprintTtl(ExtendFootprintTtlOp), RestoreFootprint(RestoreFootprintOp), } @@ -10655,8 +10615,8 @@ impl XdrCodec for OperationBody { OperationType::InvokeHostFunction.to_xdr_buffered(write_stream); value.to_xdr_buffered(write_stream) }, - OperationBody::BumpFootprintExpiration(value) => { - OperationType::BumpFootprintExpiration.to_xdr_buffered(write_stream); + OperationBody::ExtendFootprintTtl(value) => { + OperationType::ExtendFootprintTtl.to_xdr_buffered(write_stream); value.to_xdr_buffered(write_stream) }, OperationBody::RestoreFootprint(value) => { @@ -10712,8 +10672,8 @@ impl XdrCodec for OperationBody { Ok(OperationBody::LiquidityPoolWithdraw(LiquidityPoolWithdrawOp::from_xdr_buffered(read_stream)?)), OperationType::InvokeHostFunction => Ok(OperationBody::InvokeHostFunction(InvokeHostFunctionOp::from_xdr_buffered(read_stream)?)), - OperationType::BumpFootprintExpiration => - Ok(OperationBody::BumpFootprintExpiration(BumpFootprintExpirationOp::from_xdr_buffered(read_stream)?)), + OperationType::ExtendFootprintTtl => + Ok(OperationBody::ExtendFootprintTtl(ExtendFootprintTtlOp::from_xdr_buffered(read_stream)?)), OperationType::RestoreFootprint => Ok(OperationBody::RestoreFootprint(RestoreFootprintOp::from_xdr_buffered(read_stream)?)), } @@ -12309,7 +12269,7 @@ pub enum InvokeHostFunctionResult { InvokeHostFunctionMalformed, InvokeHostFunctionTrapped, InvokeHostFunctionResourceLimitExceeded, - InvokeHostFunctionEntryExpired, + InvokeHostFunctionEntryArchived, InvokeHostFunctionInsufficientRefundableFee, } @@ -12326,8 +12286,8 @@ impl XdrCodec for InvokeHostFunctionResult { InvokeHostFunctionResultCode::InvokeHostFunctionTrapped.to_xdr_buffered(write_stream), InvokeHostFunctionResult::InvokeHostFunctionResourceLimitExceeded => InvokeHostFunctionResultCode::InvokeHostFunctionResourceLimitExceeded.to_xdr_buffered(write_stream), - InvokeHostFunctionResult::InvokeHostFunctionEntryExpired => - InvokeHostFunctionResultCode::InvokeHostFunctionEntryExpired.to_xdr_buffered(write_stream), + InvokeHostFunctionResult::InvokeHostFunctionEntryArchived => + InvokeHostFunctionResultCode::InvokeHostFunctionEntryArchived.to_xdr_buffered(write_stream), InvokeHostFunctionResult::InvokeHostFunctionInsufficientRefundableFee => InvokeHostFunctionResultCode::InvokeHostFunctionInsufficientRefundableFee.to_xdr_buffered(write_stream), } @@ -12343,50 +12303,48 @@ impl XdrCodec for InvokeHostFunctionResult { Ok(InvokeHostFunctionResult::InvokeHostFunctionTrapped), InvokeHostFunctionResultCode::InvokeHostFunctionResourceLimitExceeded => Ok(InvokeHostFunctionResult::InvokeHostFunctionResourceLimitExceeded), - InvokeHostFunctionResultCode::InvokeHostFunctionEntryExpired => - Ok(InvokeHostFunctionResult::InvokeHostFunctionEntryExpired), + InvokeHostFunctionResultCode::InvokeHostFunctionEntryArchived => + Ok(InvokeHostFunctionResult::InvokeHostFunctionEntryArchived), InvokeHostFunctionResultCode::InvokeHostFunctionInsufficientRefundableFee => Ok(InvokeHostFunctionResult::InvokeHostFunctionInsufficientRefundableFee), } } } -/// Autogenerated definition for type BumpFootprintExpirationResult +/// Autogenerated definition for type ExtendFootprintTtlResult #[allow(dead_code)] #[derive(Debug, Clone, Eq, PartialEq)] -pub enum BumpFootprintExpirationResult { - BumpFootprintExpirationSuccess, - BumpFootprintExpirationMalformed, - BumpFootprintExpirationResourceLimitExceeded, - BumpFootprintExpirationInsufficientRefundableFee, +pub enum ExtendFootprintTtlResult { + ExtendFootprintTtlSuccess, + ExtendFootprintTtlMalformed, + ExtendFootprintTtlResourceLimitExceeded, + ExtendFootprintTtlInsufficientRefundableFee, } -impl XdrCodec for BumpFootprintExpirationResult { +impl XdrCodec for ExtendFootprintTtlResult { fn to_xdr_buffered(&self, write_stream: &mut WriteStream) { match self { - BumpFootprintExpirationResult::BumpFootprintExpirationSuccess => - BumpFootprintExpirationResultCode::BumpFootprintExpirationSuccess.to_xdr_buffered(write_stream), - BumpFootprintExpirationResult::BumpFootprintExpirationMalformed => - BumpFootprintExpirationResultCode::BumpFootprintExpirationMalformed.to_xdr_buffered(write_stream), - BumpFootprintExpirationResult::BumpFootprintExpirationResourceLimitExceeded => - BumpFootprintExpirationResultCode::BumpFootprintExpirationResourceLimitExceeded - .to_xdr_buffered(write_stream), - BumpFootprintExpirationResult::BumpFootprintExpirationInsufficientRefundableFee => - BumpFootprintExpirationResultCode::BumpFootprintExpirationInsufficientRefundableFee - .to_xdr_buffered(write_stream), + ExtendFootprintTtlResult::ExtendFootprintTtlSuccess => + ExtendFootprintTtlResultCode::ExtendFootprintTtlSuccess.to_xdr_buffered(write_stream), + ExtendFootprintTtlResult::ExtendFootprintTtlMalformed => + ExtendFootprintTtlResultCode::ExtendFootprintTtlMalformed.to_xdr_buffered(write_stream), + ExtendFootprintTtlResult::ExtendFootprintTtlResourceLimitExceeded => + ExtendFootprintTtlResultCode::ExtendFootprintTtlResourceLimitExceeded.to_xdr_buffered(write_stream), + ExtendFootprintTtlResult::ExtendFootprintTtlInsufficientRefundableFee => + ExtendFootprintTtlResultCode::ExtendFootprintTtlInsufficientRefundableFee.to_xdr_buffered(write_stream), } } fn from_xdr_buffered>(read_stream: &mut ReadStream) -> Result { - match BumpFootprintExpirationResultCode::from_xdr_buffered(read_stream)? { - BumpFootprintExpirationResultCode::BumpFootprintExpirationSuccess => - Ok(BumpFootprintExpirationResult::BumpFootprintExpirationSuccess), - BumpFootprintExpirationResultCode::BumpFootprintExpirationMalformed => - Ok(BumpFootprintExpirationResult::BumpFootprintExpirationMalformed), - BumpFootprintExpirationResultCode::BumpFootprintExpirationResourceLimitExceeded => - Ok(BumpFootprintExpirationResult::BumpFootprintExpirationResourceLimitExceeded), - BumpFootprintExpirationResultCode::BumpFootprintExpirationInsufficientRefundableFee => - Ok(BumpFootprintExpirationResult::BumpFootprintExpirationInsufficientRefundableFee), + match ExtendFootprintTtlResultCode::from_xdr_buffered(read_stream)? { + ExtendFootprintTtlResultCode::ExtendFootprintTtlSuccess => + Ok(ExtendFootprintTtlResult::ExtendFootprintTtlSuccess), + ExtendFootprintTtlResultCode::ExtendFootprintTtlMalformed => + Ok(ExtendFootprintTtlResult::ExtendFootprintTtlMalformed), + ExtendFootprintTtlResultCode::ExtendFootprintTtlResourceLimitExceeded => + Ok(ExtendFootprintTtlResult::ExtendFootprintTtlResourceLimitExceeded), + ExtendFootprintTtlResultCode::ExtendFootprintTtlInsufficientRefundableFee => + Ok(ExtendFootprintTtlResult::ExtendFootprintTtlInsufficientRefundableFee), } } } @@ -12457,7 +12415,7 @@ pub enum OperationResultTr { LiquidityPoolDeposit(LiquidityPoolDepositResult), LiquidityPoolWithdraw(LiquidityPoolWithdrawResult), InvokeHostFunction(InvokeHostFunctionResult), - BumpFootprintExpiration(BumpFootprintExpirationResult), + ExtendFootprintTtl(ExtendFootprintTtlResult), RestoreFootprint(RestoreFootprintResult), } @@ -12564,8 +12522,8 @@ impl XdrCodec for OperationResultTr { OperationType::InvokeHostFunction.to_xdr_buffered(write_stream); value.to_xdr_buffered(write_stream) }, - OperationResultTr::BumpFootprintExpiration(value) => { - OperationType::BumpFootprintExpiration.to_xdr_buffered(write_stream); + OperationResultTr::ExtendFootprintTtl(value) => { + OperationType::ExtendFootprintTtl.to_xdr_buffered(write_stream); value.to_xdr_buffered(write_stream) }, OperationResultTr::RestoreFootprint(value) => { @@ -12633,9 +12591,8 @@ impl XdrCodec for OperationResultTr { )), OperationType::InvokeHostFunction => Ok(OperationResultTr::InvokeHostFunction(InvokeHostFunctionResult::from_xdr_buffered(read_stream)?)), - OperationType::BumpFootprintExpiration => Ok(OperationResultTr::BumpFootprintExpiration( - BumpFootprintExpirationResult::from_xdr_buffered(read_stream)?, - )), + OperationType::ExtendFootprintTtl => + Ok(OperationResultTr::ExtendFootprintTtl(ExtendFootprintTtlResult::from_xdr_buffered(read_stream)?)), OperationType::RestoreFootprint => Ok(OperationResultTr::RestoreFootprint(RestoreFootprintResult::from_xdr_buffered(read_stream)?)), } diff --git a/src/xdr/xdr_codec.rs b/src/xdr/xdr_codec.rs index c6f1fba..1b91d8c 100644 --- a/src/xdr/xdr_codec.rs +++ b/src/xdr/xdr_codec.rs @@ -203,3 +203,30 @@ impl XdrCodec for Box { Ok(Box::new(T::from_xdr_buffered(read_stream)?)) } } + +/// To easily convert any bytes to a Stellar type. +/// +/// # Examples +/// +/// Basic usage: +/// +#[cfg_attr(feature = "all-types", doc = "```")] +#[cfg_attr(not(feature = "all-types"), doc = "```ignore")] +/// # // For this test, we require the usage of `Auth` which is only compiled with +/// # // the `all-types` feature. +/// # // We will ignore the test if the feature is not enabled. +/// use substrate_stellar_sdk::{types::Auth, parse_stellar_type}; +/// let auth_xdr = [0, 0, 0, 1]; +/// let result = parse_stellar_type!(auth_xdr,Auth); +/// assert_eq!(result, Ok(Auth { flags: 1 })) +/// ``` +#[macro_export] +macro_rules! parse_stellar_type { + ($ref:ident, $struct_str:ident) => {{ + use $crate::{types::$struct_str, StellarSdkError, XdrCodec}; + + let ret: Result<$struct_str, StellarSdkError> = + $struct_str::from_xdr($ref).map_err(|_| StellarSdkError::DecodeError(stringify!($struct_str).into())); + ret + }}; +}