Skip to content

Commit

Permalink
Update the version of scrypto used
Browse files Browse the repository at this point in the history
  • Loading branch information
0xOmarA committed Aug 31, 2024
1 parent 5d95bb6 commit 2ed7aff
Show file tree
Hide file tree
Showing 5 changed files with 69 additions and 941 deletions.
88 changes: 41 additions & 47 deletions Cargo.lock

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

33 changes: 20 additions & 13 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,25 +9,32 @@ members = [
"crates/sbor-json",
# Bindings Crates
"crates/generator",
"crates/uniffi-bindgen"
"crates/uniffi-bindgen",
]

# Shared dependencies that all of the crates need - for now this is just the
# `radixdlt-scrypto` dependencies
[workspace.dependencies]
sbor = { version = "1.2.0", features = ["serde"] }
scrypto = { version = "1.2.0", features = ["serde"] }
scrypto-test = { version = "1.2.0" }
radix-common = { version = "1.2.0", features = ["serde"] }
radix-engine = { version = "1.2.0" }
radix-engine-interface = { version = "1.2.0" }
radix-substate-store-queries = { version = "1.2.0" }
radix-substate-store-impls = { version = "1.2.0" }
radix-substate-store-interface = { version = "1.2.0" }
radix-transactions = { version = "1.2.0" }
radix-transaction-scenarios = { version = "1.2.0" }
sbor = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "6ec9c337246b5d4cf3c142bd9af80e9e8bd5fbae", features = [
"serde",
] }
scrypto = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "6ec9c337246b5d4cf3c142bd9af80e9e8bd5fbae", features = [
"serde",
] }
scrypto-test = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "6ec9c337246b5d4cf3c142bd9af80e9e8bd5fbae" }
radix-common = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "6ec9c337246b5d4cf3c142bd9af80e9e8bd5fbae", features = [
"serde",
] }
radix-engine = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "6ec9c337246b5d4cf3c142bd9af80e9e8bd5fbae" }
radix-engine-interface = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "6ec9c337246b5d4cf3c142bd9af80e9e8bd5fbae" }
radix-substate-store-queries = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "6ec9c337246b5d4cf3c142bd9af80e9e8bd5fbae" }
radix-substate-store-impls = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "6ec9c337246b5d4cf3c142bd9af80e9e8bd5fbae" }
radix-substate-store-interface = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "6ec9c337246b5d4cf3c142bd9af80e9e8bd5fbae" }
radix-transactions = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "6ec9c337246b5d4cf3c142bd9af80e9e8bd5fbae" }
radix-transaction-scenarios = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "6ec9c337246b5d4cf3c142bd9af80e9e8bd5fbae" }
native-radix-engine-toolkit = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "6ec9c337246b5d4cf3c142bd9af80e9e8bd5fbae", package = "radix-engine-toolkit" }

[profile.release]
incremental = false
panic = 'unwind'
codegen-units = 1
codegen-units = 1
13 changes: 8 additions & 5 deletions crates/radix-engine-toolkit/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,21 @@ radix-substate-store-impls = { workspace = true }
radix-substate-store-queries = { workspace = true }
radix-substate-store-interface = { workspace = true }
radix-transactions = { workspace = true }
native-radix-engine-toolkit = { workspace = true }

# Bech32 encoding and decoding of addresses. Used for the Olympia <-> Babylon address derivations.
# Bech32 encoding and decoding of addresses. Used for the Olympia <-> Babylon
# address derivations.
bech32 = { version = "0.9.1" }

# The serde-json dependency without the serde dependency. This is used for the SBOR serialization
# in the `scrypto_sbor.rs` and `manifest_sbor.rs` modules and ONLY there.
# The serde-json dependency without the serde dependency. This is used for the
# SBOR serialization in the `scrypto_sbor.rs` and `manifest_sbor.rs` modules and
# ONLY there.
serde_json = { version = "1.0.96", features = ["preserve_order"] }
serde_with = "3.6.1"
paste = "1.0.14"

# Used by the Radix Engine Toolkit to cashe the result of some operations that should only be
# computed once.
# Used by the Radix Engine Toolkit to cashe the result of some operations that
# should only be computed once.
lazy_static = { version = "1.4.0" }
regex = "1.8.4"

Expand Down
16 changes: 0 additions & 16 deletions crates/radix-engine-toolkit/tests/test_runner_extension.rs
Original file line number Diff line number Diff line change
Expand Up @@ -120,20 +120,4 @@ where
let current_epoch = self.get_current_epoch();
self.set_current_epoch(current_epoch.after(by).unwrap());
}

fn validate_and_get_trusted_worktop(
&mut self,
manifest: &TransactionManifestV1,
) -> Vec<TrustedWorktopInstruction> {
let receipt = LedgerSimulatorEDExt::preview(self, manifest.clone());
if !receipt.is_commit_success() {
panic!("Not commit success: {receipt:?}")
}

let mut trusted_worktop = StaticWorktopContentsTracker::default();

manifest_summary::traverse(&mut [&mut trusted_worktop], manifest);

trusted_worktop.output()
}
}
Loading

0 comments on commit 2ed7aff

Please sign in to comment.