From fd0cde00243bb4ca6467b84e6d6242c8ee1dcfb0 Mon Sep 17 00:00:00 2001 From: Omar Date: Thu, 31 Aug 2023 02:24:10 +0300 Subject: [PATCH] Update scrypto dependency --- build_wasm.sh | 13 + generator/Cargo.lock | 350 +++++++++--------- generator/Cargo.toml | 18 +- generator/src/function_examples/execution.rs | 2 +- radix-engine-toolkit-core/Cargo.lock | 203 +++++----- radix-engine-toolkit-core/Cargo.toml | 20 +- .../general_transaction_visitor.rs | 1 - radix-engine-toolkit-core/src/utils.rs | 1 - .../tests/account_interactions.rs | 6 +- .../tests/account_proofs.rs | 4 +- radix-engine-toolkit-core/tests/execution.rs | 2 +- .../tests/simple_transfer_visitor.rs | 4 +- radix-engine-toolkit-core/tests/test_data.rs | 2 +- .../tests/transfer_visitor.rs | 2 +- radix-engine-toolkit-core/tests/utils.rs | 5 +- radix-engine-toolkit-uniffi/Cargo.lock | 248 +++++++------ radix-engine-toolkit-uniffi/Cargo.toml | 20 +- .../src/common/entity_type.rs | 3 - .../tests/typed_events.rs | 2 +- radix-engine-toolkit/Cargo.lock | 249 +++++++------ radix-engine-toolkit/Cargo.toml | 10 +- .../src/functions/instructions.rs | 4 - sbor-json/Cargo.lock | 84 ++--- sbor-json/Cargo.toml | 6 +- uniffi-bindgen/Cargo.lock | 187 +++------- 25 files changed, 701 insertions(+), 745 deletions(-) create mode 100755 build_wasm.sh diff --git a/build_wasm.sh b/build_wasm.sh new file mode 100755 index 00000000..88b1a8ce --- /dev/null +++ b/build_wasm.sh @@ -0,0 +1,13 @@ +cd radix-engine-toolkit +cargo +nightly build \ + -Z build-std=std,panic_abort \ + -Z build-std-features=panic_immediate_abort \ + --target wasm32-unknown-unknown \ + --release +npx wasm-opt@1.4 -Oz -g \ + --strip-dwarf \ + --strip-debug \ + --strip-producers \ + -o \ + ./target/wasm32-unknown-unknown/release/radix_engine_toolkit.wasm \ + ./target/wasm32-unknown-unknown/release/radix_engine_toolkit.wasm \ No newline at end of file diff --git a/generator/Cargo.lock b/generator/Cargo.lock index 8bdff170..320407ae 100644 --- a/generator/Cargo.lock +++ b/generator/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" dependencies = [ "gimli", ] @@ -19,9 +19,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aho-corasick" -version = "1.0.2" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" +checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" dependencies = [ "memchr", ] @@ -43,9 +43,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.72" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "async-stream" @@ -66,18 +66,18 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] name = "async-trait" -version = "0.1.72" +version = "0.1.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc6dde6e4ed435a4c1ee4e73592f5ba9da2151af10076cc04858746af9352d09" +checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -94,9 +94,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "backtrace" -version = "0.3.68" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" dependencies = [ "addr2line", "cc", @@ -109,9 +109,9 @@ dependencies = [ [[package]] name = "base64" -version = "0.21.2" +version = "0.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" +checksum = "414dcefbc63d77c526a76b3afcf6fbb9b5e2791c19c3aa2297733208750c6e53" [[package]] name = "bech32" @@ -133,9 +133,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" [[package]] name = "blake2" @@ -241,9 +241,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.82" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "305fe645edc1442a0fa8b6726ba61d422798d37a52e12eaecf4b022ebbb88f01" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ "libc", ] @@ -262,9 +262,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.26" +version = "0.4.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" +checksum = "95ed24df0632f708f5f6d8082675bef2596f7084dee3dd55f632290bf35bfe0f" dependencies = [ "android-tzdata", "iana-time-zone", @@ -272,7 +272,7 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "winapi", + "windows-targets 0.48.5", ] [[package]] @@ -436,7 +436,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -458,14 +458,14 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core 0.20.3", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] name = "deranged" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7684a49fb1af197853ef7b2ee694bc1f5b4179556f1e5710e1760c5db6f5e929" +checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" dependencies = [ "serde", ] @@ -496,11 +496,11 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35b50dba0afdca80b187392b24f2499a88c336d5a8493e4b4ccfb608708be56a" dependencies = [ - "bitflags 2.3.3", + "bitflags 2.4.0", "proc-macro2", "proc-macro2-diagnostics", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -531,9 +531,9 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" [[package]] name = "dyn-clone" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "304e6508efa593091e97a9abbc10f90aa7ca635b6d2784feff3c89d41dd12272" +checksum = "bbfc4744c1b8f2a09adc0e55242f60b1af195d88596bd8700be74418c056c555" [[package]] name = "ed25519" @@ -566,9 +566,9 @@ checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "encoding_rs" -version = "0.8.32" +version = "0.8.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" +checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" dependencies = [ "cfg-if", ] @@ -581,9 +581,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" +checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" dependencies = [ "errno-dragonfly", "libc", @@ -779,9 +779,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.27.3" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" [[package]] name = "glob" @@ -864,9 +864,9 @@ checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" [[package]] name = "httpdate" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "hyper" @@ -884,7 +884,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2", + "socket2 0.4.9", "tokio", "tower-service", "tracing", @@ -1062,9 +1062,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.19" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "loom" @@ -1092,9 +1092,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.5.0" +version = "2.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "5486aed0026218e61b8a01d5fbd5a0a134649abb71a0e53b7bc088529dced86e" [[package]] name = "memoffset" @@ -1176,7 +1176,7 @@ dependencies = [ [[package]] name = "native-sdk" version = "0.12.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "radix-engine-common", "radix-engine-derive", @@ -1197,9 +1197,9 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" dependencies = [ "autocfg", "num-integer", @@ -1237,9 +1237,9 @@ dependencies = [ [[package]] name = "object" -version = "0.31.1" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" +checksum = "77ac5bbd07aea88c60a577a1ce218075ffd59208b2d7ca97adf9bfc5aeb21ebe" dependencies = [ "memchr", ] @@ -1293,7 +1293,7 @@ dependencies = [ "libc", "redox_syscall", "smallvec", - "windows-targets 0.48.1", + "windows-targets 0.48.5", ] [[package]] @@ -1310,7 +1310,7 @@ checksum = "61a386cd715229d399604b50d1361683fe687066f42d56f54be995bc6868f71c" dependencies = [ "inlinable_string", "pear_codegen", - "yansi 1.0.0-rc", + "yansi 1.0.0-rc.1", ] [[package]] @@ -1322,7 +1322,7 @@ dependencies = [ "proc-macro2", "proc-macro2-diagnostics", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -1333,9 +1333,9 @@ checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "pin-project-lite" -version = "0.2.11" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c516611246607d0c04186886dbb3a754368ef82c79e9827a802c6d836dd111c" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pin-utils" @@ -1366,9 +1366,9 @@ checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", "version_check", - "yansi 1.0.0-rc", + "yansi 1.0.0-rc.1", ] [[package]] @@ -1384,9 +1384,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.32" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] @@ -1394,7 +1394,7 @@ dependencies = [ [[package]] name = "radix-engine" version = "0.12.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "bitflags 1.3.2", "colored", @@ -1406,6 +1406,7 @@ dependencies = [ "paste", "radix-engine-common", "radix-engine-interface", + "radix-engine-macros", "radix-engine-store-interface", "resources-tracker-macro", "sbor", @@ -1422,7 +1423,7 @@ dependencies = [ [[package]] name = "radix-engine-common" version = "0.12.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "bech32", "blake2", @@ -1443,7 +1444,7 @@ dependencies = [ [[package]] name = "radix-engine-derive" version = "0.12.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "proc-macro2", "quote", @@ -1454,7 +1455,7 @@ dependencies = [ [[package]] name = "radix-engine-interface" version = "0.12.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "bitflags 1.3.2", "const-sha1", @@ -1471,10 +1472,20 @@ dependencies = [ "utils", ] +[[package]] +name = "radix-engine-macros" +version = "0.12.0" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.29", +] + [[package]] name = "radix-engine-profiling" version = "0.9.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "fixedstr", ] @@ -1482,7 +1493,7 @@ dependencies = [ [[package]] name = "radix-engine-queries" version = "0.12.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "hex", "itertools", @@ -1498,7 +1509,7 @@ dependencies = [ [[package]] name = "radix-engine-store-interface" version = "0.12.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "hex", "itertools", @@ -1512,7 +1523,7 @@ dependencies = [ [[package]] name = "radix-engine-stores" version = "0.12.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "hex", "itertools", @@ -1648,22 +1659,22 @@ dependencies = [ [[package]] name = "ref-cast" -version = "1.0.19" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61ef7e18e8841942ddb1cf845054f8008410030a3997875d9e49b7a363063df1" +checksum = "acde58d073e9c79da00f2b5b84eed919c8326832648a5b109b3fce1bb1175280" dependencies = [ "ref-cast-impl", ] [[package]] name = "ref-cast-impl" -version = "1.0.19" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dfaf0c85b766276c797f3791f5bc6d5bd116b41d53049af2789666b0c0bc9fa" +checksum = "7f7473c2cfcf90008193dd0e3e16599455cb601a9fce322b5bb55de799664925" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -1674,8 +1685,8 @@ checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.3.6", - "regex-syntax 0.7.4", + "regex-automata 0.3.7", + "regex-syntax 0.7.5", ] [[package]] @@ -1689,13 +1700,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69" +checksum = "49530408a136e16e5b486e883fbb6ba058e8e4e8ae6621a77b048b314336e629" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.7.4", + "regex-syntax 0.7.5", ] [[package]] @@ -1706,14 +1717,14 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] name = "resources-tracker-macro" version = "0.1.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "proc-macro2", "quote", @@ -1772,7 +1783,7 @@ dependencies = [ "proc-macro2", "quote", "rocket_http", - "syn 2.0.28", + "syn 2.0.29", "unicode-xid", ] @@ -1847,11 +1858,11 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.7" +version = "0.38.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "172891ebdceb05aa0005f533a6cbfca599ddd7d966f6f5d4d9b2e70478e70399" +checksum = "ed6248e1caa625eb708e266e06159f135e8c26f2bb7ceb72dc4b2766d0340964" dependencies = [ - "bitflags 2.3.3", + "bitflags 2.4.0", "errno", "libc", "linux-raw-sys", @@ -1882,7 +1893,7 @@ dependencies = [ [[package]] name = "sbor" version = "0.12.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "const-sha1", "hex", @@ -1896,7 +1907,7 @@ dependencies = [ [[package]] name = "sbor-derive" version = "0.12.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "proc-macro2", "sbor-derive-common", @@ -1905,7 +1916,7 @@ dependencies = [ [[package]] name = "sbor-derive-common" version = "0.12.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "const-sha1", "itertools", @@ -1939,9 +1950,9 @@ dependencies = [ [[package]] name = "schemars" -version = "0.8.12" +version = "0.8.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02c613288622e5f0c3fdc5dbd4db1c5fbe752746b1d1a56a0630b78fd00de44f" +checksum = "763f8cd0d4c71ed8389c90cb8100cba87e763bd01a8e614d4f0af97bcd50a161" dependencies = [ "dyn-clone", "indexmap 1.9.3", @@ -1953,9 +1964,9 @@ dependencies = [ [[package]] name = "schemars_derive" -version = "0.8.12" +version = "0.8.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "109da1e6b197438deb6db99952990c7f959572794b80ff93707d55a232545e7c" +checksum = "ec0f696e21e10fa546b7ffb1c9672c6de8fbc7a81acf59524386d8639bf12737" dependencies = [ "proc-macro2", "quote", @@ -1978,7 +1989,7 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "scrypto" version = "0.12.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "bech32", "const-sha1", @@ -2000,7 +2011,7 @@ dependencies = [ [[package]] name = "scrypto-derive" version = "0.12.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "proc-macro2", "quote", @@ -2015,7 +2026,7 @@ dependencies = [ [[package]] name = "scrypto-schema" version = "0.12.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "bitflags 1.3.2", "radix-engine-common", @@ -2026,7 +2037,7 @@ dependencies = [ [[package]] name = "scrypto-unit" version = "0.12.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "radix-engine", "radix-engine-interface", @@ -2071,22 +2082,22 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.185" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be9b6f69f1dfd54c3b568ffa45c310d6973a5e5148fd40cf515acaf38cf5bc31" +checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.185" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc59dfdcbad1437773485e0367fea4b090a2e0a16d9ffc46af47764536a298ec" +checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -2123,9 +2134,9 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1402f54f9a3b9e2efe71c1cea24e648acce55887983553eeb858cf3115acfd49" +checksum = "1ca3b16a3d82c4088f343b7480a93550b3eabe1a358569c2dfe38bbcead07237" dependencies = [ "base64", "chrono", @@ -2140,14 +2151,14 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9197f1ad0e3c173a0222d3c4404fb04c3afe87e962bcb327af73e8301fa203c7" +checksum = "2e6be15c453eb305019bfa438b1593c731f36a289a7853f7707ee29e870b3b3c" dependencies = [ "darling 0.20.3", "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -2217,9 +2228,9 @@ dependencies = [ [[package]] name = "slab" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" dependencies = [ "autocfg", ] @@ -2240,6 +2251,16 @@ dependencies = [ "winapi", ] +[[package]] +name = "socket2" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" +dependencies = [ + "libc", + "windows-sys 0.48.0", +] + [[package]] name = "spin" version = "0.9.8" @@ -2311,9 +2332,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.28" +version = "2.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567" +checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" dependencies = [ "proc-macro2", "quote", @@ -2328,9 +2349,9 @@ checksum = "7b2093cf4c8eb1e67749a6762251bc9cd836b6fc171623bd0a9d324d37af2417" [[package]] name = "tempfile" -version = "3.7.1" +version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc02fddf48964c42031a0b3fe0428320ecf3a73c401040fc0096f97794310651" +checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" dependencies = [ "cfg-if", "fastrand", @@ -2341,22 +2362,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.44" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90" +checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.44" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" +checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -2371,9 +2392,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fdd63d58b18d663fbdf70e049f00a22c8e42be082203be7f26589213cd75ea" +checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48" dependencies = [ "deranged", "itoa", @@ -2390,20 +2411,19 @@ checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" [[package]] name = "time-macros" -version = "0.2.11" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb71511c991639bb078fd5bf97757e03914361c48100d52878b8e52b46fb92cd" +checksum = "1a942f44339478ef67935ab2bbaec2fb0322496cf3cbe84b261e06ac3814c572" dependencies = [ "time-core", ] [[package]] name = "tokio" -version = "1.29.1" +version = "1.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da" +checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" dependencies = [ - "autocfg", "backtrace", "bytes", "libc", @@ -2411,7 +2431,7 @@ dependencies = [ "num_cpus", "pin-project-lite", "signal-hook-registry", - "socket2", + "socket2 0.5.3", "tokio-macros", "windows-sys 0.48.0", ] @@ -2424,7 +2444,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -2511,7 +2531,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -2556,7 +2576,7 @@ dependencies = [ [[package]] name = "transaction" version = "0.12.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "bech32", "ed25519-dalek", @@ -2573,7 +2593,7 @@ dependencies = [ [[package]] name = "transaction-scenarios" version = "0.12.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "hex", "itertools", @@ -2649,9 +2669,9 @@ dependencies = [ [[package]] name = "unicase" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" dependencies = [ "version_check", ] @@ -2677,7 +2697,7 @@ checksum = "f28467d3e1d3c6586d8f25fa243f544f5800fec42d97032474e17222c2b75cfa" [[package]] name = "utils" version = "0.12.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "indexmap 2.0.0-pre", "serde", @@ -2779,7 +2799,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", "wasm-bindgen-shared", ] @@ -2801,7 +2821,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -2872,9 +2892,9 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.110.0" +version = "0.112.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dfcdb72d96f01e6c85b6bf20102e7423bdbaad5c337301bab2bbf253d26413c" +checksum = "e986b010f47fcce49cf8ea5d5f9e5d2737832f12b53ae8ae785bbe895d0877bf" dependencies = [ "indexmap 2.0.0", "semver", @@ -2891,12 +2911,12 @@ dependencies = [ [[package]] name = "wasmprinter" -version = "0.2.62" +version = "0.2.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42cd12ed4d96a984e4b598a17457f1126d01640cc7461afbb319642111ff9e7f" +checksum = "34ddf5892036cd4b780d505eff1194a0cbc10ed896097656fdcea3744b5e7c2f" dependencies = [ "anyhow", - "wasmparser 0.110.0", + "wasmparser 0.112.0", ] [[package]] @@ -2936,7 +2956,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "windows-targets 0.48.1", + "windows-targets 0.48.5", ] [[package]] @@ -2954,7 +2974,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets 0.48.1", + "windows-targets 0.48.5", ] [[package]] @@ -2974,17 +2994,17 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" 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", + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", ] [[package]] @@ -2995,9 +3015,9 @@ checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" @@ -3007,9 +3027,9 @@ checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" [[package]] name = "windows_aarch64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" @@ -3019,9 +3039,9 @@ checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] name = "windows_i686_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" @@ -3031,9 +3051,9 @@ checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] name = "windows_i686_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" @@ -3043,9 +3063,9 @@ checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[package]] name = "windows_x86_64_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" @@ -3055,9 +3075,9 @@ checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" @@ -3067,15 +3087,15 @@ checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] name = "windows_x86_64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winnow" -version = "0.5.4" +version = "0.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acaaa1190073b2b101e15083c38ee8ec891b5e05cbee516521e94ec008f61e64" +checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" dependencies = [ "memchr", ] @@ -3088,9 +3108,9 @@ checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" [[package]] name = "yansi" -version = "1.0.0-rc" +version = "1.0.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ee746ad3851dd3bc40e4a028ab3b00b99278d929e48957bcb2d111874a7e43e" +checksum = "1367295b8f788d371ce2dbc842c7b709c73ee1364d30351dd300ec2203b12377" [[package]] name = "zeroize" @@ -3109,5 +3129,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] diff --git a/generator/Cargo.toml b/generator/Cargo.toml index 43c8aac7..3242fd1f 100644 --- a/generator/Cargo.toml +++ b/generator/Cargo.toml @@ -5,15 +5,15 @@ edition = "2021" [dependencies] # radixdlt-scrypto dependencies. -sbor = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-a74271b895", features = ["serde"] } -scrypto = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-a74271b895", features = ["serde"] } -scrypto-unit = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-a74271b895" } -transaction = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-a74271b895" } -transaction-scenarios = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-a74271b895" } -radix-engine = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-a74271b895" } -radix-engine-stores = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-a74271b895" } -radix-engine-common = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-a74271b895", features = ["serde"] } -radix-engine-interface = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-a74271b895" } +sbor = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-da3dbedc", features = ["serde"] } +scrypto = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-da3dbedc", features = ["serde"] } +scrypto-unit = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-da3dbedc" } +transaction = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-da3dbedc" } +transaction-scenarios = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-da3dbedc" } +radix-engine = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-da3dbedc" } +radix-engine-stores = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-da3dbedc" } +radix-engine-common = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-da3dbedc", features = ["serde"] } +radix-engine-interface = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-da3dbedc" } # Core Radix Engine Toolkit and Toolkit Native Library radix-engine-toolkit-core = { path = "../radix-engine-toolkit-core", default-features = false, features = ["moka"]} diff --git a/generator/src/function_examples/execution.rs b/generator/src/function_examples/execution.rs index 6fd1658e..6ad10866 100644 --- a/generator/src/function_examples/execution.rs +++ b/generator/src/function_examples/execution.rs @@ -182,7 +182,7 @@ pub fn execute_scenarios( let native_vm = DefaultNativeVm::new(); let vm = Vm::new(&scrypto_vm, native_vm); let fee_reserve_config = CostingParameters::default(); - let execution_config = ExecutionConfig::for_preview(); + let execution_config = ExecutionConfig::for_preview(NetworkDefinition::simulator()); let mut previous = None; loop { diff --git a/radix-engine-toolkit-core/Cargo.lock b/radix-engine-toolkit-core/Cargo.lock index edc894c1..c9be855d 100644 --- a/radix-engine-toolkit-core/Cargo.lock +++ b/radix-engine-toolkit-core/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "aho-corasick" -version = "1.0.2" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" +checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" dependencies = [ "memchr", ] @@ -28,9 +28,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.72" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "autocfg" @@ -40,9 +40,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "base64" -version = "0.21.2" +version = "0.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" +checksum = "414dcefbc63d77c526a76b3afcf6fbb9b5e2791c19c3aa2297733208750c6e53" [[package]] name = "bech32" @@ -58,9 +58,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" [[package]] name = "blake2" @@ -160,9 +160,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.82" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "305fe645edc1442a0fa8b6726ba61d422798d37a52e12eaecf4b022ebbb88f01" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ "libc", ] @@ -175,15 +175,15 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.26" +version = "0.4.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" +checksum = "95ed24df0632f708f5f6d8082675bef2596f7084dee3dd55f632290bf35bfe0f" dependencies = [ "android-tzdata", "iana-time-zone", "num-traits", "serde", - "winapi", + "windows-targets", ] [[package]] @@ -302,7 +302,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -313,7 +313,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -388,9 +388,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" +checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" dependencies = [ "errno-dragonfly", "libc", @@ -672,9 +672,9 @@ checksum = "b6e8aaa3f231bb4bd57b84b2d5dc3ae7f350265df8aa96492e0bc394a1571909" [[package]] name = "memchr" -version = "2.5.0" +version = "2.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "5486aed0026218e61b8a01d5fbd5a0a134649abb71a0e53b7bc088529dced86e" [[package]] name = "memoffset" @@ -710,7 +710,7 @@ dependencies = [ [[package]] name = "native-sdk" version = "0.12.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "radix-engine-common", "radix-engine-derive", @@ -721,9 +721,9 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" dependencies = [ "autocfg", "num-integer", @@ -828,9 +828,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.32" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] @@ -838,7 +838,7 @@ dependencies = [ [[package]] name = "radix-engine" version = "0.12.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "bitflags 1.3.2", "colored", @@ -851,6 +851,7 @@ dependencies = [ "paste", "radix-engine-common", "radix-engine-interface", + "radix-engine-macros", "radix-engine-store-interface", "resources-tracker-macro", "sbor", @@ -867,7 +868,7 @@ dependencies = [ [[package]] name = "radix-engine-common" version = "0.12.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "bech32", "blake2", @@ -888,7 +889,7 @@ dependencies = [ [[package]] name = "radix-engine-derive" version = "0.12.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "proc-macro2", "quote", @@ -899,7 +900,7 @@ dependencies = [ [[package]] name = "radix-engine-interface" version = "0.12.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "bitflags 1.3.2", "const-sha1", @@ -916,10 +917,20 @@ dependencies = [ "utils", ] +[[package]] +name = "radix-engine-macros" +version = "0.12.0" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.29", +] + [[package]] name = "radix-engine-profiling" version = "0.9.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "fixedstr", ] @@ -927,7 +938,7 @@ dependencies = [ [[package]] name = "radix-engine-queries" version = "0.12.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "hex", "itertools", @@ -943,7 +954,7 @@ dependencies = [ [[package]] name = "radix-engine-store-interface" version = "0.12.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "hex", "itertools", @@ -957,7 +968,7 @@ dependencies = [ [[package]] name = "radix-engine-stores" version = "0.12.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "hex", "itertools", @@ -1054,9 +1065,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69" +checksum = "49530408a136e16e5b486e883fbb6ba058e8e4e8ae6621a77b048b314336e629" dependencies = [ "aho-corasick", "memchr", @@ -1065,14 +1076,14 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] name = "resources-tracker-macro" version = "0.1.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "proc-macro2", "quote", @@ -1091,11 +1102,11 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.7" +version = "0.38.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "172891ebdceb05aa0005f533a6cbfca599ddd7d966f6f5d4d9b2e70478e70399" +checksum = "ed6248e1caa625eb708e266e06159f135e8c26f2bb7ceb72dc4b2766d0340964" dependencies = [ - "bitflags 2.3.3", + "bitflags 2.4.0", "errno", "libc", "linux-raw-sys", @@ -1126,7 +1137,7 @@ dependencies = [ [[package]] name = "sbor" version = "0.12.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "const-sha1", "hex", @@ -1140,7 +1151,7 @@ dependencies = [ [[package]] name = "sbor-derive" version = "0.12.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "proc-macro2", "sbor-derive-common", @@ -1149,7 +1160,7 @@ dependencies = [ [[package]] name = "sbor-derive-common" version = "0.12.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "const-sha1", "itertools", @@ -1190,7 +1201,7 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "scrypto" version = "0.12.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "bech32", "const-sha1", @@ -1212,7 +1223,7 @@ dependencies = [ [[package]] name = "scrypto-derive" version = "0.12.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "proc-macro2", "quote", @@ -1227,7 +1238,7 @@ dependencies = [ [[package]] name = "scrypto-schema" version = "0.12.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "bitflags 1.3.2", "radix-engine-common", @@ -1238,7 +1249,7 @@ dependencies = [ [[package]] name = "scrypto-unit" version = "0.12.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "radix-engine", "radix-engine-interface", @@ -1283,22 +1294,22 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.185" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be9b6f69f1dfd54c3b568ffa45c310d6973a5e5148fd40cf515acaf38cf5bc31" +checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.185" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc59dfdcbad1437773485e0367fea4b090a2e0a16d9ffc46af47764536a298ec" +checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -1348,7 +1359,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -1444,9 +1455,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.28" +version = "2.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567" +checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" dependencies = [ "proc-macro2", "quote", @@ -1461,9 +1472,9 @@ checksum = "7b2093cf4c8eb1e67749a6762251bc9cd836b6fc171623bd0a9d324d37af2417" [[package]] name = "tempfile" -version = "3.7.1" +version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc02fddf48964c42031a0b3fe0428320ecf3a73c401040fc0096f97794310651" +checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" dependencies = [ "cfg-if", "fastrand", @@ -1474,29 +1485,29 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.44" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90" +checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.44" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" +checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] name = "time" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fdd63d58b18d663fbdf70e049f00a22c8e42be082203be7f26589213cd75ea" +checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48" dependencies = [ "deranged", "itoa", @@ -1513,9 +1524,9 @@ checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" [[package]] name = "time-macros" -version = "0.2.11" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb71511c991639bb078fd5bf97757e03914361c48100d52878b8e52b46fb92cd" +checksum = "1a942f44339478ef67935ab2bbaec2fb0322496cf3cbe84b261e06ac3814c572" dependencies = [ "time-core", ] @@ -1557,7 +1568,7 @@ dependencies = [ [[package]] name = "transaction" version = "0.12.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "bech32", "ed25519-dalek", @@ -1585,9 +1596,9 @@ checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] name = "unicase" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" dependencies = [ "version_check", ] @@ -1601,7 +1612,7 @@ checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" [[package]] name = "utils" version = "0.12.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "indexmap 2.0.0-pre", "serde", @@ -1688,7 +1699,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", "wasm-bindgen-shared", ] @@ -1710,7 +1721,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -1781,9 +1792,9 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.110.0" +version = "0.112.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dfcdb72d96f01e6c85b6bf20102e7423bdbaad5c337301bab2bbf253d26413c" +checksum = "e986b010f47fcce49cf8ea5d5f9e5d2737832f12b53ae8ae785bbe895d0877bf" dependencies = [ "indexmap 2.0.0", "semver", @@ -1800,12 +1811,12 @@ dependencies = [ [[package]] name = "wasmprinter" -version = "0.2.62" +version = "0.2.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42cd12ed4d96a984e4b598a17457f1126d01640cc7461afbb319642111ff9e7f" +checksum = "34ddf5892036cd4b780d505eff1194a0cbc10ed896097656fdcea3744b5e7c2f" dependencies = [ "anyhow", - "wasmparser 0.110.0", + "wasmparser 0.112.0", ] [[package]] @@ -1859,9 +1870,9 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ "windows_aarch64_gnullvm", "windows_aarch64_msvc", @@ -1874,51 +1885,51 @@ dependencies = [ [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winnow" -version = "0.5.4" +version = "0.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acaaa1190073b2b101e15083c38ee8ec891b5e05cbee516521e94ec008f61e64" +checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" dependencies = [ "memchr", ] @@ -1940,5 +1951,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] diff --git a/radix-engine-toolkit-core/Cargo.toml b/radix-engine-toolkit-core/Cargo.toml index 171cbcf0..0198276c 100644 --- a/radix-engine-toolkit-core/Cargo.toml +++ b/radix-engine-toolkit-core/Cargo.toml @@ -6,15 +6,15 @@ build = "build.rs" [dependencies] # radixdlt-scrypto dependencies. -sbor = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-a74271b895", features = ["serde"] } -scrypto = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-a74271b895", features = ["serde"] } -transaction = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-a74271b895" } -radix-engine = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-a74271b895", default-features= false, features = ["std"] } -radix-engine-stores = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-a74271b895" } -radix-engine-common = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-a74271b895", features = ["serde"] } -radix-engine-queries = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-a74271b895", default-features= false, features = ["std"] } -radix-engine-interface = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-a74271b895" } -radix-engine-store-interface = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-a74271b895" } +sbor = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-da3dbedc", features = ["serde"] } +scrypto = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-da3dbedc", features = ["serde"] } +transaction = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-da3dbedc" } +radix-engine = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-da3dbedc", default-features= false, features = ["std"] } +radix-engine-stores = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-da3dbedc" } +radix-engine-common = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-da3dbedc", features = ["serde"] } +radix-engine-queries = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-da3dbedc", default-features= false, features = ["std"] } +radix-engine-interface = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-da3dbedc" } +radix-engine-store-interface = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-da3dbedc" } # Bech32 encoding and decoding of addresses. Used for the Olympia <-> Babylon address derivations. bech32 = { version = "0.9.1" } @@ -35,7 +35,7 @@ sbor-json = { path = "../sbor-json" } cargo_toml = { version = "0.15.3" } [dev-dependencies] -scrypto-unit = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-a74271b895", default-features = false, features = ["std", "resource_tracker"] } +scrypto-unit = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-da3dbedc", default-features = false, features = ["std", "resource_tracker"] } [features] default = ["moka"] diff --git a/radix-engine-toolkit-core/src/instruction_visitor/visitors/transaction_type/general_transaction_visitor.rs b/radix-engine-toolkit-core/src/instruction_visitor/visitors/transaction_type/general_transaction_visitor.rs index 15cc5e84..8f4fa0b5 100644 --- a/radix-engine-toolkit-core/src/instruction_visitor/visitors/transaction_type/general_transaction_visitor.rs +++ b/radix-engine-toolkit-core/src/instruction_visitor/visitors/transaction_type/general_transaction_visitor.rs @@ -726,7 +726,6 @@ fn is_fn_permitted(entity_type: EntityType, fn_name: &str) -> bool { fn construct_fn_rules(entity_type: EntityType) -> FnRules { match entity_type { EntityType::GlobalAccount - | EntityType::InternalAccount | EntityType::GlobalVirtualSecp256k1Account | EntityType::GlobalVirtualEd25519Account => FnRules { allowed: vec![ diff --git a/radix-engine-toolkit-core/src/utils.rs b/radix-engine-toolkit-core/src/utils.rs index 10d225cd..d506be16 100644 --- a/radix-engine-toolkit-core/src/utils.rs +++ b/radix-engine-toolkit-core/src/utils.rs @@ -197,7 +197,6 @@ pub fn is_account + Clone>(node_id: &A) -> bool { address.as_node_id().entity_type(), Some( EntityType::GlobalAccount - | EntityType::InternalAccount | EntityType::GlobalVirtualSecp256k1Account | EntityType::GlobalVirtualEd25519Account ) diff --git a/radix-engine-toolkit-core/tests/account_interactions.rs b/radix-engine-toolkit-core/tests/account_interactions.rs index 38df6523..55f29ad8 100644 --- a/radix-engine-toolkit-core/tests/account_interactions.rs +++ b/radix-engine-toolkit-core/tests/account_interactions.rs @@ -49,7 +49,7 @@ fn account_withdraw_non_fungibles_interactions_count_as_withdraws_and_auth_requi let account = account(); let ids = non_fungible_ids(); let manifest = ManifestBuilder::new() - .withdraw_non_fungibles_from_account(account, XRD, &ids) + .withdraw_non_fungibles_from_account(account, XRD, ids) .build(); // Act @@ -94,7 +94,7 @@ fn account_lock_fee_and_withdraw_non_fungibles_interactions_count_as_withdraws_a let account = account(); let ids = non_fungible_ids(); let manifest = ManifestBuilder::new() - .lock_fee_and_withdraw_non_fungibles(account, dec!("1"), XRD, &ids) + .lock_fee_and_withdraw_non_fungibles(account, dec!("1"), XRD, ids) .build(); // Act @@ -194,7 +194,7 @@ fn account_create_proof_by_ids_interactions_count_as_auth_requiring_interactions let account = account(); let ids = non_fungible_ids(); let manifest = ManifestBuilder::new() - .create_proof_from_account_of_non_fungibles(account, XRD, &ids) + .create_proof_from_account_of_non_fungibles(account, XRD, ids) .build(); // Act diff --git a/radix-engine-toolkit-core/tests/account_proofs.rs b/radix-engine-toolkit-core/tests/account_proofs.rs index 372c1347..c93981d6 100644 --- a/radix-engine-toolkit-core/tests/account_proofs.rs +++ b/radix-engine-toolkit-core/tests/account_proofs.rs @@ -63,12 +63,12 @@ fn account_proofs_visitor_picks_up_on_calls_to_create_proof_of_non_fungibles() { .create_proof_from_account_of_non_fungibles( account(), XRD, - &BTreeSet::from([NonFungibleLocalId::integer(1)]), + BTreeSet::from([NonFungibleLocalId::integer(1)]), ) .create_proof_from_account_of_non_fungibles( account(), ACCOUNT_OWNER_BADGE, - &BTreeSet::from([NonFungibleLocalId::integer(1)]), + BTreeSet::from([NonFungibleLocalId::integer(1)]), ) .build(); diff --git a/radix-engine-toolkit-core/tests/execution.rs b/radix-engine-toolkit-core/tests/execution.rs index e1b145d4..8e8554a3 100644 --- a/radix-engine-toolkit-core/tests/execution.rs +++ b/radix-engine-toolkit-core/tests/execution.rs @@ -181,7 +181,7 @@ fn general_transaction_handles_take_non_fungible_ids_from_worktop_correctly() { NonFungibleLocalId::integer(2) => (), )), ) - .try_deposit_batch_or_abort(account1, None) + .try_deposit_entire_worktop_or_abort(account1, None) .build(); let resource_address = *test_runner .execute_manifest_ignoring_fee(manifest, vec![]) diff --git a/radix-engine-toolkit-core/tests/simple_transfer_visitor.rs b/radix-engine-toolkit-core/tests/simple_transfer_visitor.rs index f8b37437..e564fe89 100644 --- a/radix-engine-toolkit-core/tests/simple_transfer_visitor.rs +++ b/radix-engine-toolkit-core/tests/simple_transfer_visitor.rs @@ -65,7 +65,7 @@ pub fn simple_transfer_visitor_can_pick_up_non_fungible_transfer() { .withdraw_non_fungibles_from_account( account1, XRD, - &BTreeSet::from([ + BTreeSet::from([ NonFungibleLocalId::integer(1), NonFungibleLocalId::integer(2), ]), @@ -109,7 +109,7 @@ pub fn simple_transfer_visitor_invalidated_transfer_with_an_additional_withdraw( .withdraw_non_fungibles_from_account( account1, XRD, - &BTreeSet::from([ + BTreeSet::from([ NonFungibleLocalId::integer(1), NonFungibleLocalId::integer(2), ]), diff --git a/radix-engine-toolkit-core/tests/test_data.rs b/radix-engine-toolkit-core/tests/test_data.rs index 67df6c82..e3399516 100644 --- a/radix-engine-toolkit-core/tests/test_data.rs +++ b/radix-engine-toolkit-core/tests/test_data.rs @@ -32,7 +32,7 @@ pub fn notarized_transaction() -> NotarizedTransactionV1 { .manifest( ManifestBuilder::new() .withdraw_from_account(account1, XRD, dec!("10")) - .try_deposit_batch_or_abort(account2, None) + .try_deposit_entire_worktop_or_abort(account2, None) .build(), ) .header(TransactionHeaderV1 { diff --git a/radix-engine-toolkit-core/tests/transfer_visitor.rs b/radix-engine-toolkit-core/tests/transfer_visitor.rs index 83d2987c..e1e55edd 100644 --- a/radix-engine-toolkit-core/tests/transfer_visitor.rs +++ b/radix-engine-toolkit-core/tests/transfer_visitor.rs @@ -132,7 +132,7 @@ pub fn transfer_visitor_can_pick_up_non_fungible_transfer() { .withdraw_non_fungibles_from_account( account1, XRD, - &BTreeSet::from([ + BTreeSet::from([ NonFungibleLocalId::integer(1), NonFungibleLocalId::integer(2), ]), diff --git a/radix-engine-toolkit-core/tests/utils.rs b/radix-engine-toolkit-core/tests/utils.rs index 5acbf225..b9acba4d 100644 --- a/radix-engine-toolkit-core/tests/utils.rs +++ b/radix-engine-toolkit-core/tests/utils.rs @@ -105,7 +105,7 @@ fn extraction_of_non_fungible_data_from_receipts_succeeds() { }, )), ) - .try_deposit_batch_or_abort(account, None) + .try_deposit_entire_worktop_or_abort(account, None) .build(); let receipt = add_execution_trace(test_runner.execute_manifest_ignoring_fee(manifest, vec![])); let new_non_fungibles = radix_engine_toolkit_core::utils::data_of_newly_minted_non_fungibles( @@ -160,7 +160,8 @@ fn able_to_extract_metadata_of_new_entities_in_genesis() { let native_vm = DefaultNativeVm::new(); let vm = Vm::new(&scrypto_vm, native_vm.clone()); let mut substate_db = InMemorySubstateDatabase::standard(); - let mut bootstrapper = Bootstrapper::new(&mut substate_db, vm, false); + let mut bootstrapper = + Bootstrapper::new(NetworkDefinition::simulator(), &mut substate_db, vm, false); let GenesisReceipts { system_bootstrap_receipt, data_ingestion_receipts, diff --git a/radix-engine-toolkit-uniffi/Cargo.lock b/radix-engine-toolkit-uniffi/Cargo.lock index 73d2204d..5d80853a 100644 --- a/radix-engine-toolkit-uniffi/Cargo.lock +++ b/radix-engine-toolkit-uniffi/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "aho-corasick" -version = "1.0.2" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" +checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" dependencies = [ "memchr", ] @@ -28,24 +28,23 @@ dependencies = [ [[package]] name = "anstream" -version = "0.3.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" +checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", - "is-terminal", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" +checksum = "15c4c2c83f81532e5845a733998b6971faca23490340a418e9b72a3ec9de12ea" [[package]] name = "anstyle-parse" @@ -67,9 +66,9 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "1.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" +checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd" dependencies = [ "anstyle", "windows-sys", @@ -77,9 +76,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.72" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "askama" @@ -104,7 +103,7 @@ dependencies = [ "proc-macro2", "quote", "serde", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -121,9 +120,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "base64" -version = "0.21.2" +version = "0.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" +checksum = "414dcefbc63d77c526a76b3afcf6fbb9b5e2791c19c3aa2297733208750c6e53" [[package]] name = "basic-toml" @@ -157,9 +156,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" [[package]] name = "blake2" @@ -279,9 +278,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.82" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "305fe645edc1442a0fa8b6726ba61d422798d37a52e12eaecf4b022ebbb88f01" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ "libc", ] @@ -294,22 +293,22 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.26" +version = "0.4.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" +checksum = "95ed24df0632f708f5f6d8082675bef2596f7084dee3dd55f632290bf35bfe0f" dependencies = [ "android-tzdata", "iana-time-zone", "num-traits", "serde", - "winapi", + "windows-targets", ] [[package]] name = "clap" -version = "4.3.19" +version = "4.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fd304a20bff958a57f04c4e96a2e7594cc4490a0e809cbd48bb6437edaa452d" +checksum = "7c8d502cbaec4595d2e7d5f61e318f05417bd2b66fdc3809498f0d3fdf0bea27" dependencies = [ "clap_builder", "clap_derive", @@ -318,9 +317,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.3.19" +version = "4.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01c6a3f08f1fe5662a35cfe393aec09c4df95f60ee93b7556505260f75eee9e1" +checksum = "5891c7bc0edb3e1c2204fc5e94009affabeb1821c9e5fdc3959536c5c0bb984d" dependencies = [ "anstream", "anstyle", @@ -331,21 +330,21 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.3.12" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050" +checksum = "c9fd1a5729c4548118d7d70ff234a44868d00489a4b6597b0b020918a0e91a1a" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] name = "clap_lex" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" +checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" [[package]] name = "cmake" @@ -469,7 +468,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -480,7 +479,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -555,9 +554,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" +checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" dependencies = [ "errno-dragonfly", "libc", @@ -844,15 +843,15 @@ dependencies = [ [[package]] name = "log" -version = "0.4.19" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "memchr" -version = "2.5.0" +version = "2.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "5486aed0026218e61b8a01d5fbd5a0a134649abb71a0e53b7bc088529dced86e" [[package]] name = "memoffset" @@ -910,7 +909,7 @@ dependencies = [ [[package]] name = "native-sdk" version = "0.12.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "radix-engine-common", "radix-engine-derive", @@ -931,9 +930,9 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" dependencies = [ "autocfg", "num-integer", @@ -1044,9 +1043,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.32" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] @@ -1054,7 +1053,7 @@ dependencies = [ [[package]] name = "radix-engine" version = "0.12.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "bitflags 1.3.2", "colored", @@ -1066,6 +1065,7 @@ dependencies = [ "paste", "radix-engine-common", "radix-engine-interface", + "radix-engine-macros", "radix-engine-store-interface", "resources-tracker-macro", "sbor", @@ -1082,7 +1082,7 @@ dependencies = [ [[package]] name = "radix-engine-common" version = "0.12.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "bech32", "blake2", @@ -1103,7 +1103,7 @@ dependencies = [ [[package]] name = "radix-engine-derive" version = "0.12.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "proc-macro2", "quote", @@ -1114,7 +1114,7 @@ dependencies = [ [[package]] name = "radix-engine-interface" version = "0.12.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "bitflags 1.3.2", "const-sha1", @@ -1131,10 +1131,20 @@ dependencies = [ "utils", ] +[[package]] +name = "radix-engine-macros" +version = "0.12.0" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.29", +] + [[package]] name = "radix-engine-profiling" version = "0.9.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "fixedstr", ] @@ -1142,7 +1152,7 @@ dependencies = [ [[package]] name = "radix-engine-queries" version = "0.12.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "hex", "itertools", @@ -1158,7 +1168,7 @@ dependencies = [ [[package]] name = "radix-engine-store-interface" version = "0.12.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "hex", "itertools", @@ -1172,7 +1182,7 @@ dependencies = [ [[package]] name = "radix-engine-stores" version = "0.12.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "hex", "itertools", @@ -1289,9 +1299,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69" +checksum = "49530408a136e16e5b486e883fbb6ba058e8e4e8ae6621a77b048b314336e629" dependencies = [ "aho-corasick", "memchr", @@ -1300,14 +1310,14 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] name = "resources-tracker-macro" version = "0.1.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "proc-macro2", "quote", @@ -1326,11 +1336,11 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.7" +version = "0.38.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "172891ebdceb05aa0005f533a6cbfca599ddd7d966f6f5d4d9b2e70478e70399" +checksum = "ed6248e1caa625eb708e266e06159f135e8c26f2bb7ceb72dc4b2766d0340964" dependencies = [ - "bitflags 2.3.3", + "bitflags 2.4.0", "errno", "libc", "linux-raw-sys", @@ -1361,7 +1371,7 @@ dependencies = [ [[package]] name = "sbor" version = "0.12.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "const-sha1", "hex", @@ -1375,7 +1385,7 @@ dependencies = [ [[package]] name = "sbor-derive" version = "0.12.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "proc-macro2", "sbor-derive-common", @@ -1384,7 +1394,7 @@ dependencies = [ [[package]] name = "sbor-derive-common" version = "0.12.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "const-sha1", "itertools", @@ -1439,13 +1449,13 @@ checksum = "1db149f81d46d2deba7cd3c50772474707729550221e69588478ebf9ada425ae" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] name = "scrypto" version = "0.12.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "bech32", "const-sha1", @@ -1467,7 +1477,7 @@ dependencies = [ [[package]] name = "scrypto-derive" version = "0.12.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "proc-macro2", "quote", @@ -1482,7 +1492,7 @@ dependencies = [ [[package]] name = "scrypto-schema" version = "0.12.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "bitflags 1.3.2", "radix-engine-common", @@ -1493,7 +1503,7 @@ dependencies = [ [[package]] name = "scrypto-unit" version = "0.12.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "radix-engine", "radix-engine-interface", @@ -1538,22 +1548,22 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.185" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be9b6f69f1dfd54c3b568ffa45c310d6973a5e5148fd40cf515acaf38cf5bc31" +checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.185" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc59dfdcbad1437773485e0367fea4b090a2e0a16d9ffc46af47764536a298ec" +checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -1603,7 +1613,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -1627,9 +1637,9 @@ checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" [[package]] name = "siphasher" -version = "0.3.10" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" [[package]] name = "skeptic" @@ -1711,9 +1721,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.28" +version = "2.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567" +checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" dependencies = [ "proc-macro2", "quote", @@ -1741,29 +1751,29 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.44" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90" +checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.44" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" +checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] name = "time" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fdd63d58b18d663fbdf70e049f00a22c8e42be082203be7f26589213cd75ea" +checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48" dependencies = [ "deranged", "itoa", @@ -1780,9 +1790,9 @@ checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" [[package]] name = "time-macros" -version = "0.2.11" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb71511c991639bb078fd5bf97757e03914361c48100d52878b8e52b46fb92cd" +checksum = "1a942f44339478ef67935ab2bbaec2fb0322496cf3cbe84b261e06ac3814c572" dependencies = [ "time-core", ] @@ -1833,7 +1843,7 @@ dependencies = [ [[package]] name = "transaction" version = "0.12.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "bech32", "ed25519-dalek", @@ -1850,7 +1860,7 @@ dependencies = [ [[package]] name = "transaction-scenarios" version = "0.12.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "hex", "itertools", @@ -1879,9 +1889,9 @@ checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] name = "unicase" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" dependencies = [ "version_check", ] @@ -1946,7 +1956,7 @@ version = "0.24.1" source = "git+https://github.com/mozilla/uniffi-rs/?rev=7b18fa787336aa738f205a44f7b2df728e83a097#7b18fa787336aa738f205a44f7b2df728e83a097" dependencies = [ "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -1976,7 +1986,7 @@ dependencies = [ "proc-macro2", "quote", "serde", - "syn 2.0.28", + "syn 2.0.29", "toml 0.5.11", "uniffi_build", "uniffi_meta", @@ -2028,7 +2038,7 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "utils" version = "0.12.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "indexmap 2.0.0-pre", "serde", @@ -2115,7 +2125,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", "wasm-bindgen-shared", ] @@ -2137,7 +2147,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -2208,9 +2218,9 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.110.0" +version = "0.112.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dfcdb72d96f01e6c85b6bf20102e7423bdbaad5c337301bab2bbf253d26413c" +checksum = "e986b010f47fcce49cf8ea5d5f9e5d2737832f12b53ae8ae785bbe895d0877bf" dependencies = [ "indexmap 2.0.0", "semver", @@ -2227,12 +2237,12 @@ dependencies = [ [[package]] name = "wasmprinter" -version = "0.2.62" +version = "0.2.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42cd12ed4d96a984e4b598a17457f1126d01640cc7461afbb319642111ff9e7f" +checksum = "34ddf5892036cd4b780d505eff1194a0cbc10ed896097656fdcea3744b5e7c2f" dependencies = [ "anyhow", - "wasmparser 0.110.0", + "wasmparser 0.112.0", ] [[package]] @@ -2294,9 +2304,9 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ "windows_aarch64_gnullvm", "windows_aarch64_msvc", @@ -2309,51 +2319,51 @@ dependencies = [ [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winnow" -version = "0.5.4" +version = "0.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acaaa1190073b2b101e15083c38ee8ec891b5e05cbee516521e94ec008f61e64" +checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" dependencies = [ "memchr", ] @@ -2375,5 +2385,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] diff --git a/radix-engine-toolkit-uniffi/Cargo.toml b/radix-engine-toolkit-uniffi/Cargo.toml index a254dabf..e68cbfce 100644 --- a/radix-engine-toolkit-uniffi/Cargo.toml +++ b/radix-engine-toolkit-uniffi/Cargo.toml @@ -6,13 +6,13 @@ build = "build.rs" [dependencies] # radixdlt-scrypto dependencies. -sbor = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-a74271b895", features = ["serde"] } -scrypto = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-a74271b895", features = ["serde"] } -transaction = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-a74271b895" } -radix-engine = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-a74271b895", default-features= false, features = ["std", "moka"] } -radix-engine-common = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-a74271b895", features = ["serde"] } -radix-engine-queries = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-a74271b895", default-features = false, features = ["std", "moka"] } -radix-engine-interface = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-a74271b895" } +sbor = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-da3dbedc", features = ["serde"] } +scrypto = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-da3dbedc", features = ["serde"] } +transaction = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-da3dbedc" } +radix-engine = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-da3dbedc", default-features= false, features = ["std", "moka"] } +radix-engine-common = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-da3dbedc", features = ["serde"] } +radix-engine-queries = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-da3dbedc", default-features = false, features = ["std", "moka"] } +radix-engine-interface = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-da3dbedc" } # Core Radix Engine Toolkit radix-engine-toolkit-core = { path = "../radix-engine-toolkit-core" } @@ -30,9 +30,9 @@ uniffi = { git = "https://github.com/mozilla/uniffi-rs/", rev = "7b18fa787336aa7 [dev-dependencies] # The UniFFI crate for generating bindings to other languages uniffi = { git = "https://github.com/mozilla/uniffi-rs/", rev = "7b18fa787336aa738f205a44f7b2df728e83a097", features = ["bindgen-tests"] } -scrypto-unit = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-a74271b895", default-features = false, features = ["std", "moka"] } -radix-engine-stores = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-a74271b895" } -transaction-scenarios = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-a74271b895" } +scrypto-unit = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-da3dbedc", default-features = false, features = ["std", "moka"] } +radix-engine-stores = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-da3dbedc" } +transaction-scenarios = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-da3dbedc" } [lib] crate-type = ["staticlib", "cdylib", "lib"] diff --git a/radix-engine-toolkit-uniffi/src/common/entity_type.rs b/radix-engine-toolkit-uniffi/src/common/entity_type.rs index d5f76573..3f17bd92 100644 --- a/radix-engine-toolkit-uniffi/src/common/entity_type.rs +++ b/radix-engine-toolkit-uniffi/src/common/entity_type.rs @@ -38,7 +38,6 @@ pub enum EntityType { GlobalTransactionTracker, InternalFungibleVault, InternalNonFungibleVault, - InternalAccount, InternalGenericComponent, InternalKeyValueStore, } @@ -65,7 +64,6 @@ impl From for NativeEntityType { EntityType::GlobalTransactionTracker => Self::GlobalTransactionTracker, EntityType::InternalFungibleVault => Self::InternalFungibleVault, EntityType::InternalNonFungibleVault => Self::InternalNonFungibleVault, - EntityType::InternalAccount => Self::InternalAccount, EntityType::InternalGenericComponent => Self::InternalGenericComponent, EntityType::InternalKeyValueStore => Self::InternalKeyValueStore, } @@ -98,7 +96,6 @@ impl From for EntityType { NativeEntityType::GlobalTransactionTracker => Self::GlobalTransactionTracker, NativeEntityType::InternalFungibleVault => Self::InternalFungibleVault, NativeEntityType::InternalNonFungibleVault => Self::InternalNonFungibleVault, - NativeEntityType::InternalAccount => Self::InternalAccount, NativeEntityType::InternalGenericComponent => Self::InternalGenericComponent, NativeEntityType::InternalKeyValueStore => Self::InternalKeyValueStore, } diff --git a/radix-engine-toolkit-uniffi/tests/typed_events.rs b/radix-engine-toolkit-uniffi/tests/typed_events.rs index 8e0ba02c..df7b548e 100644 --- a/radix-engine-toolkit-uniffi/tests/typed_events.rs +++ b/radix-engine-toolkit-uniffi/tests/typed_events.rs @@ -96,7 +96,7 @@ pub fn execute_scenarios( let native_vm = DefaultNativeVm::new(); let vm = Vm::new(&scrypto_vm, native_vm); let fee_reserve_config = CostingParameters::default(); - let execution_config = ExecutionConfig::for_preview(); + let execution_config = ExecutionConfig::for_preview(NetworkDefinition::simulator()); let mut previous = None; loop { diff --git a/radix-engine-toolkit/Cargo.lock b/radix-engine-toolkit/Cargo.lock index f9afe9ef..b5a9383b 100644 --- a/radix-engine-toolkit/Cargo.lock +++ b/radix-engine-toolkit/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "aho-corasick" -version = "1.0.2" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" +checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" dependencies = [ "memchr", ] @@ -28,9 +28,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.72" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "autocfg" @@ -40,9 +40,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "base64" -version = "0.21.2" +version = "0.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" +checksum = "414dcefbc63d77c526a76b3afcf6fbb9b5e2791c19c3aa2297733208750c6e53" [[package]] name = "bech32" @@ -58,9 +58,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" [[package]] name = "blake2" @@ -166,9 +166,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.82" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "305fe645edc1442a0fa8b6726ba61d422798d37a52e12eaecf4b022ebbb88f01" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ "libc", ] @@ -187,9 +187,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.26" +version = "0.4.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" +checksum = "95ed24df0632f708f5f6d8082675bef2596f7084dee3dd55f632290bf35bfe0f" dependencies = [ "android-tzdata", "iana-time-zone", @@ -197,7 +197,7 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "winapi", + "windows-targets 0.48.5", ] [[package]] @@ -317,7 +317,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -328,14 +328,14 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] name = "deranged" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7684a49fb1af197853ef7b2ee694bc1f5b4179556f1e5710e1760c5db6f5e929" +checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" dependencies = [ "serde", ] @@ -368,9 +368,9 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" [[package]] name = "dyn-clone" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "304e6508efa593091e97a9abbc10f90aa7ca635b6d2784feff3c89d41dd12272" +checksum = "bbfc4744c1b8f2a09adc0e55242f60b1af195d88596bd8700be74418c056c555" [[package]] name = "ed25519" @@ -409,9 +409,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" +checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" dependencies = [ "errno-dragonfly", "libc", @@ -697,9 +697,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.19" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "lru" @@ -709,9 +709,9 @@ checksum = "b6e8aaa3f231bb4bd57b84b2d5dc3ae7f350265df8aa96492e0bc394a1571909" [[package]] name = "memchr" -version = "2.5.0" +version = "2.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "5486aed0026218e61b8a01d5fbd5a0a134649abb71a0e53b7bc088529dced86e" [[package]] name = "memoffset" @@ -747,7 +747,7 @@ dependencies = [ [[package]] name = "native-sdk" version = "0.12.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "radix-engine-common", "radix-engine-derive", @@ -758,9 +758,9 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" dependencies = [ "autocfg", "num-integer", @@ -828,7 +828,7 @@ dependencies = [ "libc", "redox_syscall", "smallvec", - "windows-targets 0.48.1", + "windows-targets 0.48.5", ] [[package]] @@ -865,9 +865,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.32" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] @@ -875,7 +875,7 @@ dependencies = [ [[package]] name = "radix-engine" version = "0.12.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "bitflags 1.3.2", "colored", @@ -888,6 +888,7 @@ dependencies = [ "paste", "radix-engine-common", "radix-engine-interface", + "radix-engine-macros", "radix-engine-store-interface", "resources-tracker-macro", "sbor", @@ -904,7 +905,7 @@ dependencies = [ [[package]] name = "radix-engine-common" version = "0.12.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "bech32", "blake2", @@ -925,7 +926,7 @@ dependencies = [ [[package]] name = "radix-engine-derive" version = "0.12.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "proc-macro2", "quote", @@ -936,7 +937,7 @@ dependencies = [ [[package]] name = "radix-engine-interface" version = "0.12.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "bitflags 1.3.2", "const-sha1", @@ -953,10 +954,20 @@ dependencies = [ "utils", ] +[[package]] +name = "radix-engine-macros" +version = "0.12.0" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.29", +] + [[package]] name = "radix-engine-profiling" version = "0.9.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "fixedstr", ] @@ -964,7 +975,7 @@ dependencies = [ [[package]] name = "radix-engine-queries" version = "0.12.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "hex", "itertools", @@ -980,7 +991,7 @@ dependencies = [ [[package]] name = "radix-engine-store-interface" version = "0.12.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "hex", "itertools", @@ -994,7 +1005,7 @@ dependencies = [ [[package]] name = "radix-engine-stores" version = "0.12.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "hex", "itertools", @@ -1112,9 +1123,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69" +checksum = "49530408a136e16e5b486e883fbb6ba058e8e4e8ae6621a77b048b314336e629" dependencies = [ "aho-corasick", "memchr", @@ -1123,14 +1134,14 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] name = "resources-tracker-macro" version = "0.1.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "proc-macro2", "quote", @@ -1149,11 +1160,11 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.7" +version = "0.38.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "172891ebdceb05aa0005f533a6cbfca599ddd7d966f6f5d4d9b2e70478e70399" +checksum = "ed6248e1caa625eb708e266e06159f135e8c26f2bb7ceb72dc4b2766d0340964" dependencies = [ - "bitflags 2.3.3", + "bitflags 2.4.0", "errno", "libc", "linux-raw-sys", @@ -1184,7 +1195,7 @@ dependencies = [ [[package]] name = "sbor" version = "0.12.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "const-sha1", "hex", @@ -1198,7 +1209,7 @@ dependencies = [ [[package]] name = "sbor-derive" version = "0.12.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "proc-macro2", "sbor-derive-common", @@ -1207,7 +1218,7 @@ dependencies = [ [[package]] name = "sbor-derive-common" version = "0.12.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "const-sha1", "itertools", @@ -1241,9 +1252,9 @@ dependencies = [ [[package]] name = "schemars" -version = "0.8.12" +version = "0.8.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02c613288622e5f0c3fdc5dbd4db1c5fbe752746b1d1a56a0630b78fd00de44f" +checksum = "763f8cd0d4c71ed8389c90cb8100cba87e763bd01a8e614d4f0af97bcd50a161" dependencies = [ "dyn-clone", "indexmap 1.9.3", @@ -1254,9 +1265,9 @@ dependencies = [ [[package]] name = "schemars_derive" -version = "0.8.12" +version = "0.8.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "109da1e6b197438deb6db99952990c7f959572794b80ff93707d55a232545e7c" +checksum = "ec0f696e21e10fa546b7ffb1c9672c6de8fbc7a81acf59524386d8639bf12737" dependencies = [ "proc-macro2", "quote", @@ -1273,7 +1284,7 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "scrypto" version = "0.12.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "bech32", "const-sha1", @@ -1295,7 +1306,7 @@ dependencies = [ [[package]] name = "scrypto-derive" version = "0.12.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "proc-macro2", "quote", @@ -1310,7 +1321,7 @@ dependencies = [ [[package]] name = "scrypto-schema" version = "0.12.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "bitflags 1.3.2", "radix-engine-common", @@ -1347,22 +1358,22 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.185" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be9b6f69f1dfd54c3b568ffa45c310d6973a5e5148fd40cf515acaf38cf5bc31" +checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.185" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc59dfdcbad1437773485e0367fea4b090a2e0a16d9ffc46af47764536a298ec" +checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -1399,9 +1410,9 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1402f54f9a3b9e2efe71c1cea24e648acce55887983553eeb858cf3115acfd49" +checksum = "1ca3b16a3d82c4088f343b7480a93550b3eabe1a358569c2dfe38bbcead07237" dependencies = [ "base64", "chrono", @@ -1416,14 +1427,14 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9197f1ad0e3c173a0222d3c4404fb04c3afe87e962bcb327af73e8301fa203c7" +checksum = "2e6be15c453eb305019bfa438b1593c731f36a289a7853f7707ee29e870b3b3c" dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -1519,9 +1530,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.28" +version = "2.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567" +checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" dependencies = [ "proc-macro2", "quote", @@ -1536,9 +1547,9 @@ checksum = "7b2093cf4c8eb1e67749a6762251bc9cd836b6fc171623bd0a9d324d37af2417" [[package]] name = "tempfile" -version = "3.7.1" +version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc02fddf48964c42031a0b3fe0428320ecf3a73c401040fc0096f97794310651" +checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" dependencies = [ "cfg-if", "fastrand", @@ -1549,29 +1560,29 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.44" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90" +checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.44" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" +checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] name = "time" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fdd63d58b18d663fbdf70e049f00a22c8e42be082203be7f26589213cd75ea" +checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48" dependencies = [ "deranged", "itoa", @@ -1588,9 +1599,9 @@ checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" [[package]] name = "time-macros" -version = "0.2.11" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb71511c991639bb078fd5bf97757e03914361c48100d52878b8e52b46fb92cd" +checksum = "1a942f44339478ef67935ab2bbaec2fb0322496cf3cbe84b261e06ac3814c572" dependencies = [ "time-core", ] @@ -1632,7 +1643,7 @@ dependencies = [ [[package]] name = "transaction" version = "0.12.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "bech32", "ed25519-dalek", @@ -1682,9 +1693,9 @@ dependencies = [ [[package]] name = "unicase" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" dependencies = [ "version_check", ] @@ -1698,7 +1709,7 @@ checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" [[package]] name = "utils" version = "0.12.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "indexmap 2.0.0-pre", "serde", @@ -1762,7 +1773,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", "wasm-bindgen-shared", ] @@ -1784,7 +1795,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -1855,9 +1866,9 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.110.0" +version = "0.112.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dfcdb72d96f01e6c85b6bf20102e7423bdbaad5c337301bab2bbf253d26413c" +checksum = "e986b010f47fcce49cf8ea5d5f9e5d2737832f12b53ae8ae785bbe895d0877bf" dependencies = [ "indexmap 2.0.0", "semver", @@ -1874,12 +1885,12 @@ dependencies = [ [[package]] name = "wasmprinter" -version = "0.2.62" +version = "0.2.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42cd12ed4d96a984e4b598a17457f1126d01640cc7461afbb319642111ff9e7f" +checksum = "34ddf5892036cd4b780d505eff1194a0cbc10ed896097656fdcea3744b5e7c2f" dependencies = [ "anyhow", - "wasmparser 0.110.0", + "wasmparser 0.112.0", ] [[package]] @@ -1919,7 +1930,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "windows-targets 0.48.1", + "windows-targets 0.48.5", ] [[package]] @@ -1937,7 +1948,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets 0.48.1", + "windows-targets 0.48.5", ] [[package]] @@ -1957,17 +1968,17 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" 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", + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", ] [[package]] @@ -1978,9 +1989,9 @@ checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" @@ -1990,9 +2001,9 @@ checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" [[package]] name = "windows_aarch64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" @@ -2002,9 +2013,9 @@ checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] name = "windows_i686_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" @@ -2014,9 +2025,9 @@ checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] name = "windows_i686_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" @@ -2026,9 +2037,9 @@ checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[package]] name = "windows_x86_64_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" @@ -2038,9 +2049,9 @@ checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" @@ -2050,15 +2061,15 @@ checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] name = "windows_x86_64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winnow" -version = "0.5.4" +version = "0.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acaaa1190073b2b101e15083c38ee8ec891b5e05cbee516521e94ec008f61e64" +checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" dependencies = [ "memchr", ] @@ -2080,5 +2091,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] diff --git a/radix-engine-toolkit/Cargo.toml b/radix-engine-toolkit/Cargo.toml index 73e1fa46..64731182 100644 --- a/radix-engine-toolkit/Cargo.toml +++ b/radix-engine-toolkit/Cargo.toml @@ -5,11 +5,11 @@ edition = "2021" [dependencies] # radixdlt-scrypto dependencies. -sbor = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-a74271b895", features = ["serde"] } -scrypto = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-a74271b895", features = ["serde"] } -transaction = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-a74271b895" } -radix-engine = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-a74271b895", default-features= false, features = ["std"] } -radix-engine-common = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-a74271b895", features = ["serde"] } +sbor = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-da3dbedc", features = ["serde"] } +scrypto = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-da3dbedc", features = ["serde"] } +transaction = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-da3dbedc" } +radix-engine = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-da3dbedc", default-features= false, features = ["std"] } +radix-engine-common = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-da3dbedc", features = ["serde"] } # Core Radix Engine Toolkit radix-engine-toolkit-core = { path = "../radix-engine-toolkit-core", default-features = false } diff --git a/radix-engine-toolkit/src/functions/instructions.rs b/radix-engine-toolkit/src/functions/instructions.rs index e0f8251b..d35a6f79 100644 --- a/radix-engine-toolkit/src/functions/instructions.rs +++ b/radix-engine-toolkit/src/functions/instructions.rs @@ -294,7 +294,6 @@ pub enum SerializableEntityType { GlobalNonFungibleResourceManager, InternalNonFungibleVault, InternalGenericComponent, - InternalAccount, InternalKeyValueStore, } @@ -321,7 +320,6 @@ impl SerializableEntityType { Self::GlobalNonFungibleResourceManager, Self::InternalNonFungibleVault, Self::InternalGenericComponent, - Self::InternalAccount, Self::InternalKeyValueStore, ] } @@ -350,7 +348,6 @@ impl From for SerializableEntityType { EntityType::GlobalNonFungibleResourceManager => Self::GlobalNonFungibleResourceManager, EntityType::InternalNonFungibleVault => Self::InternalNonFungibleVault, EntityType::InternalGenericComponent => Self::InternalGenericComponent, - EntityType::InternalAccount => Self::InternalAccount, EntityType::InternalKeyValueStore => Self::InternalKeyValueStore, } } @@ -391,7 +388,6 @@ impl From for EntityType { } SerializableEntityType::InternalNonFungibleVault => Self::InternalNonFungibleVault, SerializableEntityType::InternalGenericComponent => Self::InternalGenericComponent, - SerializableEntityType::InternalAccount => Self::InternalAccount, SerializableEntityType::InternalKeyValueStore => Self::InternalKeyValueStore, } } diff --git a/sbor-json/Cargo.lock b/sbor-json/Cargo.lock index 55807d6f..e8ffe6ba 100644 --- a/sbor-json/Cargo.lock +++ b/sbor-json/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "aho-corasick" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a" +checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" dependencies = [ "memchr", ] @@ -34,9 +34,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "base64" -version = "0.21.2" +version = "0.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" +checksum = "414dcefbc63d77c526a76b3afcf6fbb9b5e2791c19c3aa2297733208750c6e53" [[package]] name = "bech32" @@ -101,15 +101,15 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.26" +version = "0.4.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" +checksum = "95ed24df0632f708f5f6d8082675bef2596f7084dee3dd55f632290bf35bfe0f" dependencies = [ "android-tzdata", "iana-time-zone", "num-traits", "serde", - "winapi", + "windows-targets", ] [[package]] @@ -353,15 +353,15 @@ checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "memchr" -version = "2.5.0" +version = "2.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "5486aed0026218e61b8a01d5fbd5a0a134649abb71a0e53b7bc088529dced86e" [[package]] name = "num-bigint" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" dependencies = [ "autocfg", "num-integer", @@ -420,7 +420,7 @@ dependencies = [ [[package]] name = "radix-engine-common" version = "0.12.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "bech32", "blake2", @@ -441,7 +441,7 @@ dependencies = [ [[package]] name = "radix-engine-derive" version = "0.12.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "proc-macro2", "quote", @@ -452,7 +452,7 @@ dependencies = [ [[package]] name = "radix-engine-interface" version = "0.12.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "bitflags", "const-sha1", @@ -483,9 +483,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69" +checksum = "49530408a136e16e5b486e883fbb6ba058e8e4e8ae6621a77b048b314336e629" dependencies = [ "aho-corasick", "memchr", @@ -494,9 +494,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] name = "rustversion" @@ -513,7 +513,7 @@ checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "sbor" version = "0.12.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "const-sha1", "hex", @@ -527,7 +527,7 @@ dependencies = [ [[package]] name = "sbor-derive" version = "0.12.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "proc-macro2", "sbor-derive-common", @@ -536,7 +536,7 @@ dependencies = [ [[package]] name = "sbor-derive-common" version = "0.12.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "const-sha1", "itertools", @@ -562,7 +562,7 @@ dependencies = [ [[package]] name = "scrypto-schema" version = "0.12.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "bitflags", "radix-engine-common", @@ -572,18 +572,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.185" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be9b6f69f1dfd54c3b568ffa45c310d6973a5e5148fd40cf515acaf38cf5bc31" +checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.185" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc59dfdcbad1437773485e0367fea4b090a2e0a16d9ffc46af47764536a298ec" +checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", @@ -689,9 +689,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fdd63d58b18d663fbdf70e049f00a22c8e42be082203be7f26589213cd75ea" +checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48" dependencies = [ "deranged", "itoa", @@ -708,9 +708,9 @@ checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" [[package]] name = "time-macros" -version = "0.2.11" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb71511c991639bb078fd5bf97757e03914361c48100d52878b8e52b46fb92cd" +checksum = "1a942f44339478ef67935ab2bbaec2fb0322496cf3cbe84b261e06ac3814c572" dependencies = [ "time-core", ] @@ -730,7 +730,7 @@ checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" [[package]] name = "utils" version = "0.12.0" -source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-a74271b895#a74271b8951e7a305b5d8fecd1faba7db5fdb56a" +source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3-da3dbedc#da3dbedca051c88ddaa1f9baa72d95350eba8cc6" dependencies = [ "indexmap 2.0.0-pre", "serde", @@ -796,28 +796,6 @@ version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - [[package]] name = "windows" version = "0.48.0" diff --git a/sbor-json/Cargo.toml b/sbor-json/Cargo.toml index 92a37010..7605f415 100644 --- a/sbor-json/Cargo.toml +++ b/sbor-json/Cargo.toml @@ -6,9 +6,9 @@ description = "The implementation of the SBOR JSON representations" [dependencies] # The Scrypto dependencies needed. -sbor = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-a74271b895", features = ["serde"] } -radix-engine-common = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-a74271b895", features = ["serde"] } -radix-engine-interface = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-a74271b895" } +sbor = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-da3dbedc", features = ["serde"] } +radix-engine-common = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-da3dbedc", features = ["serde"] } +radix-engine-interface = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3-da3dbedc" } # The serde dependenices used for the serialization and deserialization of the JSON representations. serde = { version = "1.0.185", features = ["derive"] } diff --git a/uniffi-bindgen/Cargo.lock b/uniffi-bindgen/Cargo.lock index a2f08e35..a4ee94b1 100644 --- a/uniffi-bindgen/Cargo.lock +++ b/uniffi-bindgen/Cargo.lock @@ -4,24 +4,23 @@ version = 3 [[package]] name = "anstream" -version = "0.3.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" +checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", - "is-terminal", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" +checksum = "15c4c2c83f81532e5845a733998b6971faca23490340a418e9b72a3ec9de12ea" [[package]] name = "anstyle-parse" @@ -43,9 +42,9 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "1.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" +checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd" dependencies = [ "anstyle", "windows-sys", @@ -53,9 +52,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.72" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "askama" @@ -107,12 +106,6 @@ dependencies = [ "serde", ] -[[package]] -name = "bitflags" -version = "2.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" - [[package]] name = "bytes" version = "1.4.0" @@ -151,20 +144,11 @@ dependencies = [ "thiserror", ] -[[package]] -name = "cc" -version = "1.0.82" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "305fe645edc1442a0fa8b6726ba61d422798d37a52e12eaecf4b022ebbb88f01" -dependencies = [ - "libc", -] - [[package]] name = "clap" -version = "4.3.19" +version = "4.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fd304a20bff958a57f04c4e96a2e7594cc4490a0e809cbd48bb6437edaa452d" +checksum = "7c8d502cbaec4595d2e7d5f61e318f05417bd2b66fdc3809498f0d3fdf0bea27" dependencies = [ "clap_builder", "clap_derive", @@ -173,9 +157,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.3.19" +version = "4.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01c6a3f08f1fe5662a35cfe393aec09c4df95f60ee93b7556505260f75eee9e1" +checksum = "5891c7bc0edb3e1c2204fc5e94009affabeb1821c9e5fdc3959536c5c0bb984d" dependencies = [ "anstream", "anstyle", @@ -186,9 +170,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.3.12" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050" +checksum = "c9fd1a5729c4548118d7d70ff234a44868d00489a4b6597b0b020918a0e91a1a" dependencies = [ "heck", "proc-macro2", @@ -198,9 +182,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" +checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" [[package]] name = "colorchoice" @@ -208,27 +192,6 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" -[[package]] -name = "errno" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" -dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys", -] - -[[package]] -name = "errno-dragonfly" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", - "libc", -] - [[package]] name = "fs-err" version = "2.9.0" @@ -258,52 +221,23 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" -[[package]] -name = "hermit-abi" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" - -[[package]] -name = "is-terminal" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" -dependencies = [ - "hermit-abi", - "rustix", - "windows-sys", -] - [[package]] name = "itoa" version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" -[[package]] -name = "libc" -version = "0.2.147" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" - -[[package]] -name = "linux-raw-sys" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" - [[package]] name = "log" -version = "0.4.19" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "memchr" -version = "2.5.0" +version = "2.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "5486aed0026218e61b8a01d5fbd5a0a134649abb71a0e53b7bc088529dced86e" [[package]] name = "mime" @@ -366,26 +300,13 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.32" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] -[[package]] -name = "rustix" -version = "0.38.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "172891ebdceb05aa0005f533a6cbfca599ddd7d966f6f5d4d9b2e70478e70399" -dependencies = [ - "bitflags", - "errno", - "libc", - "linux-raw-sys", - "windows-sys", -] - [[package]] name = "ryu" version = "1.0.15" @@ -423,18 +344,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.183" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32ac8da02677876d532745a130fc9d8e6edfa81a269b107c5b00829b91d8eb3c" +checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.183" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aafe972d60b0b9bee71a91b92fee2d4fb3c9d7e8f6b179aa99f27203d99a4816" +checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", @@ -443,9 +364,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.104" +version = "1.0.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c" +checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" dependencies = [ "itoa", "ryu", @@ -454,9 +375,9 @@ dependencies = [ [[package]] name = "siphasher" -version = "0.3.10" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" [[package]] name = "static_assertions" @@ -472,9 +393,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "syn" -version = "2.0.28" +version = "2.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567" +checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" dependencies = [ "proc-macro2", "quote", @@ -483,18 +404,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.44" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90" +checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.44" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" +checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" dependencies = [ "proc-macro2", "quote", @@ -512,9 +433,9 @@ dependencies = [ [[package]] name = "unicase" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" dependencies = [ "version_check", ] @@ -689,9 +610,9 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ "windows_aarch64_gnullvm", "windows_aarch64_msvc", @@ -704,42 +625,42 @@ dependencies = [ [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"