Merge pull request #117 from radixdlt/chore/update-scrypto-dependency

Updated scrypto dependency to latest version
radixdlt · May 1, 2024 · eeb10d3 · eeb10d3
2 parents b44005e + a27c293
commit eeb10d3
Show file tree

Hide file tree

Showing 111 changed files with 1,134 additions and 684 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -15,19 +15,17 @@ members = [
 # Shared dependencies that all of the crates need - for now this is just the 
 # `radixdlt-scrypto` dependencies
 [workspace.dependencies]
-sbor = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "ff21f24952318387803ae720105eec079afe33f3", features = ["serde"] }
-scrypto = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "ff21f24952318387803ae720105eec079afe33f3", features = ["serde"] }
-scrypto-unit = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "ff21f24952318387803ae720105eec079afe33f3" }
-transaction = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "ff21f24952318387803ae720105eec079afe33f3" }
-transaction-scenarios = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "ff21f24952318387803ae720105eec079afe33f3" }
-radix-engine = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "ff21f24952318387803ae720105eec079afe33f3" }
-radix-engine-stores = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "ff21f24952318387803ae720105eec079afe33f3" }
-radix-engine-common = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "ff21f24952318387803ae720105eec079afe33f3", features = ["serde"] }
-radix-engine-queries = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "ff21f24952318387803ae720105eec079afe33f3" }
-radix-engine-interface = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "ff21f24952318387803ae720105eec079afe33f3" }
-radix-engine-store-interface = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "ff21f24952318387803ae720105eec079afe33f3" }
-# Used by radix-engine-toolkit crate
-faucet = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "9b2de066a110ccf6dcf071f7b7158baf14b96836" }
+sbor = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "b82a7db0a0b2da62ea22a640143cd0caf73b6603", features = ["serde"] }
+scrypto = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "b82a7db0a0b2da62ea22a640143cd0caf73b6603", features = ["serde"] }
+scrypto-test = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "b82a7db0a0b2da62ea22a640143cd0caf73b6603" }
+radix-common = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "b82a7db0a0b2da62ea22a640143cd0caf73b6603", features = ["serde"] }
+radix-engine = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "b82a7db0a0b2da62ea22a640143cd0caf73b6603" }
+radix-engine-interface = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "b82a7db0a0b2da62ea22a640143cd0caf73b6603" }
+radix-substate-store-queries = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "b82a7db0a0b2da62ea22a640143cd0caf73b6603" }
+radix-substate-store-impls = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "b82a7db0a0b2da62ea22a640143cd0caf73b6603" }
+radix-substate-store-interface = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "b82a7db0a0b2da62ea22a640143cd0caf73b6603" }
+radix-transactions = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "b82a7db0a0b2da62ea22a640143cd0caf73b6603" }
+radix-transaction-scenarios = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "b82a7db0a0b2da62ea22a640143cd0caf73b6603" }
 
 [profile.release]
 incremental = false

diff --git a/crates/generator/Cargo.toml b/crates/generator/Cargo.toml
@@ -1,19 +1,19 @@
 [package]
 name = "generator"
-version = "2.0.0"
+version = "2.1.0-dev1"
 edition = "2021"
 
 [dependencies]
 # radixdlt-scrypto dependencies.
 sbor = { workspace = true }
 scrypto = { workspace = true }
-scrypto-unit = { workspace = true }
-transaction = { workspace = true }
-transaction-scenarios = { workspace = true }
+scrypto-test = { workspace = true }
+radix-common = { workspace = true }
 radix-engine = { workspace = true }
-radix-engine-stores = { workspace = true }
-radix-engine-common = { workspace = true }
 radix-engine-interface = { workspace = true }
+radix-substate-store-impls = { workspace = true }
+radix-transactions = { workspace = true }
+radix-transaction-scenarios = { workspace = true }
 
 # Core Radix Engine Toolkit and Toolkit Native Library
 radix-engine-toolkit = { path = "../radix-engine-toolkit" }

diff --git a/crates/generator/src/function_examples/address.rs b/crates/generator/src/function_examples/address.rs
@@ -15,9 +15,8 @@
 // specific language governing permissions and limitations
 // under the License.
 
-use radix_engine_common::prelude::*;
+use radix_common::prelude::*;
 use radix_engine_toolkit_json::prelude::*;
-use transaction::prelude::*;
 
 use super::traits::HasExamples;
 

diff --git a/crates/generator/src/function_examples/derive.rs b/crates/generator/src/function_examples/derive.rs
@@ -15,9 +15,8 @@
 // specific language governing permissions and limitations
 // under the License.
 
-use radix_engine_common::prelude::*;
+use radix_common::prelude::*;
 use radix_engine_toolkit_json::prelude::*;
-use transaction::prelude::*;
 
 use super::traits::HasExamples;
 

diff --git a/crates/generator/src/function_examples/instructions.rs b/crates/generator/src/function_examples/instructions.rs
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-use radix_engine_common::prelude::*;
+use radix_common::prelude::*;
 use radix_engine_toolkit_json::prelude::*;
 
 use super::manifest_provider::*;

diff --git a/crates/generator/src/function_examples/intent.rs b/crates/generator/src/function_examples/intent.rs
@@ -16,7 +16,7 @@
 // under the License.
 
 use radix_engine_toolkit_json::prelude::*;
-use transaction::validation::ValidationConfig;
+use radix_transactions::validation::ValidationConfig;
 
 use super::manifest_provider::*;
 use super::traits::HasExamples;

diff --git a/crates/generator/src/function_examples/manifest_provider.rs b/crates/generator/src/function_examples/manifest_provider.rs
@@ -15,9 +15,9 @@
 // specific language governing permissions and limitations
 // under the License.
 
-use radix_engine_common::prelude::*;
+use radix_common::prelude::*;
 use radix_engine_toolkit_json::prelude::*;
-use transaction::manifest::*;
+use radix_transactions::manifest::*;
 use walkdir::WalkDir;
 
 pub const NUMBER_OF_MANIFESTS: usize = 26;

diff --git a/crates/generator/src/function_examples/notarized_transaction.rs b/crates/generator/src/function_examples/notarized_transaction.rs
@@ -15,13 +15,13 @@
 // specific language governing permissions and limitations
 // under the License.
 
-use radix_engine_common::types::*;
+use radix_common::prelude::{Ed25519PrivateKey, Secp256k1PrivateKey};
+use radix_common::types::*;
 use radix_engine_toolkit_json::prelude::*;
-use transaction::prelude::{
-    Ed25519PrivateKey, Secp256k1PrivateKey, TransactionBuilder,
-    TransactionHeaderV1, TransactionManifestV1,
+use radix_transactions::prelude::{
+    TransactionBuilder, TransactionHeaderV1, TransactionManifestV1,
 };
-use transaction::validation::ValidationConfig;
+use radix_transactions::validation::ValidationConfig;
 
 use super::manifest_provider::*;
 use super::traits::HasExamples;

diff --git a/crates/generator/src/function_examples/signed_intent.rs b/crates/generator/src/function_examples/signed_intent.rs
@@ -16,7 +16,7 @@
 // under the License.
 
 use radix_engine_toolkit_json::prelude::*;
-use transaction::validation::ValidationConfig;
+use radix_transactions::validation::ValidationConfig;
 
 use super::manifest_provider::*;
 use super::traits::HasExamples;

diff --git a/crates/generator/src/serializable_models/cryptographic.rs b/crates/generator/src/serializable_models/cryptographic.rs
@@ -15,13 +15,12 @@
 // specific language governing permissions and limitations
 // under the License.
 
-use radix_engine_common::prelude::PublicKey;
+use radix_common::prelude::{
+    Ed25519PrivateKey, PublicKey, Secp256k1PrivateKey,
+};
 use radix_engine_toolkit_json::prelude::*;
+use radix_transactions::prelude::{SignatureV1, SignatureWithPublicKeyV1};
 use scrypto::prelude::{hash, Hash};
-use transaction::prelude::{
-    Ed25519PrivateKey, Secp256k1PrivateKey, SignatureV1,
-    SignatureWithPublicKeyV1,
-};
 
 use super::traits::HasExamples;
 

diff --git a/crates/generator/src/serializable_models/instruction.rs b/crates/generator/src/serializable_models/instruction.rs
@@ -18,9 +18,9 @@
 use super::traits::HasExamples;
 use crate::function_examples::notarized_transaction::*;
 use radix_engine_toolkit_json::prelude::*;
-use scrypto::api::node_modules::metadata::*;
+use radix_transactions::prelude::*;
+use scrypto::object_modules::metadata::*;
 use scrypto::prelude::*;
-use transaction::prelude::*;
 
 impl<'f> HasExamples<'f> for SerializableInstruction {
     fn examples() -> Vec<Self> {

diff --git a/crates/generator/src/serializable_models/non_fungible.rs b/crates/generator/src/serializable_models/non_fungible.rs
@@ -17,9 +17,10 @@
 
 use std::str::FromStr;
 
-use radix_engine_common::prelude::{NonFungibleLocalId, ACCOUNT_OWNER_BADGE};
+use radix_common::prelude::{
+    NonFungibleGlobalId, NonFungibleLocalId, ACCOUNT_OWNER_BADGE,
+};
 use radix_engine_toolkit_json::prelude::*;
-use transaction::prelude::NonFungibleGlobalId;
 
 use super::traits::HasExamples;
 

diff --git a/crates/generator/src/serializable_models/numbers.rs b/crates/generator/src/serializable_models/numbers.rs
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-use radix_engine_common::math::*;
+use radix_common::math::*;
 use radix_engine_toolkit_json::prelude::*;
 
 macro_rules! impl_example {

diff --git a/crates/radix-engine-toolkit-json/Cargo.toml b/crates/radix-engine-toolkit-json/Cargo.toml
@@ -1,17 +1,17 @@
 [package]
 name = "radix-engine-toolkit-json"
-version = "2.0.0"
+version = "2.1.0-dev1"
 edition = "2021"
 
 [dependencies]
 # radixdlt-scrypto dependencies.
 sbor = { workspace = true }
 scrypto = { workspace = true }
-transaction = { workspace = true }
+radix-common = { workspace = true }
 radix-engine = { workspace = true }
-radix-engine-common = { workspace = true }
-radix-engine-queries = { workspace = true }
 radix-engine-interface = { workspace = true }
+radix-substate-store-queries = { workspace = true }
+radix-transactions = { workspace = true }
 
 # Core Radix Engine Toolkit
 radix-engine-toolkit = { path = "../radix-engine-toolkit", default-features = false }

diff --git a/crates/radix-engine-toolkit-json/src/functions/derive.rs b/crates/radix-engine-toolkit-json/src/functions/derive.rs
@@ -16,10 +16,10 @@
 // under the License.
 
 use crate::prelude::*;
-use radix_engine_common::prelude::PublicKey;
+use radix_common::prelude::PublicKey;
+use radix_transactions::model::TransactionHashBech32Encoder;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use transaction::model::TransactionHashBech32Encoder;
 
 //================================================
 // Derive Virtual Account Address from Public Key
@@ -414,8 +414,9 @@ impl<'a> Function<'a> for DeriveBech32mTransactionIdentifierFromIntentHash {
             hash,
         } = input;
 
-        let intent_hash =
-            transaction::prelude::IntentHash(scrypto::prelude::Hash(hash.0));
+        let intent_hash = radix_transactions::prelude::IntentHash(
+            scrypto::prelude::Hash(hash.0),
+        );
         let network_definition =
             radix_engine_toolkit::utils::network_definition_from_network_id(
                 *network_id,

diff --git a/crates/radix-engine-toolkit-json/src/functions/instructions.rs b/crates/radix-engine-toolkit-json/src/functions/instructions.rs
@@ -17,7 +17,7 @@
 
 use crate::prelude::*;
 
-use radix_engine_common::types::EntityType;
+use radix_common::types::EntityType;
 use radix_engine_toolkit::models::node_id::TypedNodeId;
 use sbor::prelude::{HashMap, HashSet};
 use schemars::JsonSchema;
@@ -324,6 +324,7 @@ pub enum SerializableEntityType {
     GlobalOneResourcePool,
     GlobalTwoResourcePool,
     GlobalMultiResourcePool,
+    GlobalAccountLocker,
     GlobalVirtualSecp256k1Account,
     GlobalVirtualSecp256k1Identity,
     GlobalVirtualEd25519Account,
@@ -408,6 +409,7 @@ impl From<EntityType> for SerializableEntityType {
                 Self::InternalGenericComponent
             }
             EntityType::InternalKeyValueStore => Self::InternalKeyValueStore,
+            EntityType::GlobalAccountLocker => Self::GlobalAccountLocker,
         }
     }
 }
@@ -470,6 +472,9 @@ impl From<SerializableEntityType> for EntityType {
             SerializableEntityType::InternalKeyValueStore => {
                 Self::InternalKeyValueStore
             }
+            SerializableEntityType::GlobalAccountLocker => {
+                Self::GlobalAccountLocker
+            }
         }
     }
 }

diff --git a/crates/radix-engine-toolkit-json/src/functions/manifest_sbor.rs b/crates/radix-engine-toolkit-json/src/functions/manifest_sbor.rs
@@ -19,7 +19,7 @@ use std::ops::Deref;
 
 use crate::prelude::*;
 
-use radix_engine_common::prelude::*;
+use radix_common::prelude::*;
 use radix_engine_toolkit::functions::manifest_sbor::*;
 use radix_engine_toolkit::utils::*;
 use sbor::{LocalTypeId, Schema};

diff --git a/crates/radix-engine-toolkit-json/src/functions/scrypto_sbor.rs b/crates/radix-engine-toolkit-json/src/functions/scrypto_sbor.rs
@@ -19,7 +19,7 @@ use std::ops::Deref;
 
 use crate::prelude::*;
 
-use radix_engine_common::prelude::*;
+use radix_common::prelude::*;
 use radix_engine_toolkit::utils::*;
 use sbor::{LocalTypeId, Schema};
 use schemars::JsonSchema;

diff --git a/crates/radix-engine-toolkit-json/src/models/cryptographic/public_key.rs b/crates/radix-engine-toolkit-json/src/models/cryptographic/public_key.rs
@@ -15,9 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-use radix_engine_common::prelude::{
-    Ed25519PublicKey, PublicKey, Secp256k1PublicKey,
-};
+use radix_common::prelude::{Ed25519PublicKey, PublicKey, Secp256k1PublicKey};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use serde_with::serde_as;

diff --git a/crates/radix-engine-toolkit-json/src/models/cryptographic/signature.rs b/crates/radix-engine-toolkit-json/src/models/cryptographic/signature.rs
@@ -15,11 +15,11 @@
 // specific language governing permissions and limitations
 // under the License.
 
-use radix_engine_common::prelude::*;
+use radix_common::prelude::*;
+use radix_transactions::prelude::*;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use serde_with::serde_as;
-use transaction::prelude::*;
 
 use crate::prelude::*;
 

diff --git a/crates/radix-engine-toolkit-json/src/models/cryptographic/signature_with_public_key.rs b/crates/radix-engine-toolkit-json/src/models/cryptographic/signature_with_public_key.rs
@@ -17,9 +17,10 @@
 
 use crate::prelude::*;
 
+use radix_common::prelude::*;
+use radix_transactions::prelude::*;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use transaction::prelude::*;
 
 #[typeshare::typeshare]
 #[derive(Serialize, Deserialize, JsonSchema, Clone, Debug, PartialEq, Eq)]

diff --git a/crates/radix-engine-toolkit-json/src/models/manifest/runtime.rs b/crates/radix-engine-toolkit-json/src/models/manifest/runtime.rs
@@ -15,9 +15,12 @@
 // specific language governing permissions and limitations
 // under the License.
 
+use radix_common::prelude::{
+    ManifestAddressReservation, ManifestBucket, ManifestExpression,
+    ManifestProof,
+};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use transaction::prelude::*;
 
 use crate::prelude::*;
 

diff --git a/crates/radix-engine-toolkit-json/src/models/scrypto/node_id.rs b/crates/radix-engine-toolkit-json/src/models/scrypto/node_id.rs
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-use radix_engine_common::prelude::{
+use radix_common::prelude::{
     AddressBech32DecodeError, AddressBech32Decoder, AddressBech32Encoder,
 };
 use schemars::JsonSchema;

diff --git a/crates/radix-engine-toolkit-json/src/models/scrypto/non_fungible_global_id.rs b/crates/radix-engine-toolkit-json/src/models/scrypto/non_fungible_global_id.rs
@@ -17,16 +17,15 @@
 
 use crate::prelude::*;
 
-use radix_engine_common::prelude::{
-    AddressBech32Decoder, AddressBech32Encoder,
+use radix_common::prelude::{
+    AddressBech32Decoder, AddressBech32Encoder, NonFungibleGlobalId,
 };
 use radix_engine_toolkit::utils::network_definition_from_network_id;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use serde_with::serde_as;
 use std::fmt::{Debug, Display};
 use std::str::FromStr;
-use transaction::prelude::NonFungibleGlobalId;
 
 #[serde_as]
 #[derive(Serialize, Deserialize, JsonSchema, Clone, Debug, PartialEq, Eq)]

diff --git a/crates/radix-engine-toolkit-json/src/models/transaction/header.rs b/crates/radix-engine-toolkit-json/src/models/transaction/header.rs
@@ -15,10 +15,10 @@
 // specific language governing permissions and limitations
 // under the License.
 
-use radix_engine_common::types::Epoch;
+use radix_common::types::Epoch;
+use radix_transactions::prelude::TransactionHeaderV1;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use transaction::prelude::TransactionHeaderV1;
 
 use crate::prelude::*;
 

diff --git a/crates/radix-engine-toolkit-json/src/models/transaction/instruction.rs b/crates/radix-engine-toolkit-json/src/models/transaction/instruction.rs
@@ -19,10 +19,10 @@ use std::ops::Deref;
 
 use crate::prelude::*;
 
-use radix_engine::types::*;
+use radix_common::prelude::*;
+use radix_transactions::prelude::*;
 use schemars::*;
 use serde::*;
-use transaction::prelude::*;
 
 #[typeshare::typeshare]
 #[derive(