Skip to content

Commit

Permalink
Merge pull request #1275 from radixdlt/release/rcnet-v2
Browse files Browse the repository at this point in the history
  • Loading branch information
0xOmarA authored Jul 20, 2023
2 parents bc272a1 + b40aa9c commit f9a4ef3
Show file tree
Hide file tree
Showing 25 changed files with 967 additions and 83 deletions.
75 changes: 55 additions & 20 deletions assets/blueprints/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion radix-engine-common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ num-integer = { version = "0.1.45", default-features = false }
num-bigint = { version = "0.4.3", default-features = false }
bnum = { version = "0.7.0", default-features = false, features = ["numtraits"] }
bech32 = { version = "0.9.0", default-features = false }
paste = { version = "1.0.7"}
paste = { version = "1.0.13" }
blake2 = { version = "0.10.6", default-features = false }
lazy_static = "1.4.0"
strum = { version = "0.24", default-features = false, features = ["derive"] }
Expand Down
3 changes: 3 additions & 0 deletions radix-engine-common/tests/scrypto_codec.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// This test module fails to compile if we do not increase the recursion limit.
#![recursion_limit = "256"]

use radix_engine_common::data::scrypto::model::NonFungibleLocalId;
use radix_engine_common::data::scrypto::*;
use radix_engine_common::*;
Expand Down
2 changes: 1 addition & 1 deletion radix-engine-interface/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ serde_json = { version = "1.0", default-features = false }
lazy_static = "1.4.0"
const-sha1 = { git = "https://github.com/radixdlt/const-sha1", default-features = false } # Chosen because of its small size and 0 transitive dependencies
arbitrary = { version = "1.3.0", features = ["derive"], optional = true }
paste = { version = "1.0.12" }
paste = { version = "1.0.13" }

[features]
# You should enable either `std` or `alloc`
Expand Down
5 changes: 3 additions & 2 deletions radix-engine-queries/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,13 @@ transaction = { path = "../transaction", default-features = false }
utils = { path = "../utils", default-features = false }
itertools = { version = "0.10.3", default-features = false }
hex = { version = "0.4.3", default-features = false }
paste = { version = "1.0.13" }

[features]
# You should enable either `std` or `alloc`
default = ["std", "moka"]
std = ["hex/std", "sbor/std", "transaction/std", "radix-engine-interface/std", "radix-engine-store-interface/std", "utils/std"]
alloc = ["hex/alloc", "sbor/alloc", "transaction/alloc", "radix-engine-interface/alloc", "radix-engine-store-interface/alloc", "utils/alloc"]
std = ["radix-engine/std", "hex/std", "sbor/std", "transaction/std", "radix-engine-interface/std", "radix-engine-store-interface/std", "utils/std"]
alloc = ["radix-engine/alloc", "hex/alloc", "sbor/alloc", "transaction/alloc", "radix-engine-interface/alloc", "radix-engine-store-interface/alloc", "utils/alloc"]

moka = ["radix-engine/moka"]
lru = ["radix-engine/lru"]
Expand Down
1 change: 1 addition & 0 deletions radix-engine-queries/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ compile_error!("Either feature `std` or `alloc` must be enabled for this crate."
compile_error!("Feature `std` and `alloc` can't be enabled at the same time.");

pub mod query;
pub mod typed_native_events;
pub mod typed_substate_layout;
Loading

0 comments on commit f9a4ef3

Please sign in to comment.