Sargon 0.7.1 | Rust Analyzer is FAST again, thx to bumping Scrypto (a…

…nd RET) (#118) * Rust Analyzer is FAST again, by bumping RET and Scrypto --------- Co-authored-by: Alexander Cyon <[email protected]>
radixdlt · May 1, 2024 · 45414ce · 45414ce
1 parent 46f302f
commit 45414ce
Show file tree

Hide file tree

Showing 6 changed files with 60 additions and 64 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sargon"
-version = "0.6.56"
+version = "0.7.1"
 edition = "2021"
 build = "build.rs"
 
@@ -74,28 +74,22 @@ strum = { git = "https://github.com/Peternator7/strum/", rev = "f746c3699acf1501
     "derive",
 ] }
 
-# 587d5988cd4ca3c5193ddf37027ff4e4ecd637dc is the Scrypto commit that RET 1cfe879c7370cfa497857ada7a8973f8a3388abc uses
-radix-engine-common = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "587d5988cd4ca3c5193ddf37027ff4e4ecd637dc", features = [
+radix-engine-common = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "v1.1.2", features = [
     "serde",
 ] }
-
-radix-engine = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "587d5988cd4ca3c5193ddf37027ff4e4ecd637dc" }
-
-sbor = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "587d5988cd4ca3c5193ddf37027ff4e4ecd637dc" }
-
-radix-engine-derive = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "587d5988cd4ca3c5193ddf37027ff4e4ecd637dc" }
-
-radix-engine-interface = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "587d5988cd4ca3c5193ddf37027ff4e4ecd637dc", features = [
+radix-engine = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "v1.1.2" }
+sbor = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "v1.1.2" }
+radix-engine-derive = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "v1.1.2" }
+radix-engine-interface = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "v1.1.2", features = [
     "std",
 ] }
 
-transaction = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "587d5988cd4ca3c5193ddf37027ff4e4ecd637dc", features = [
+transaction = { git = "https://github.com/radixdlt/radixdlt-scrypto", rev = "v1.1.2", features = [
     "std",
 ] }
 
-radix-engine-toolkit-json = { git = "https://github.com/radixdlt/radix-engine-toolkit", rev = "1cfe879c7370cfa497857ada7a8973f8a3388abc" }
-
-radix-engine-toolkit = { git = "https://github.com/radixdlt/radix-engine-toolkit", rev = "1cfe879c7370cfa497857ada7a8973f8a3388abc" }
+radix-engine-toolkit-json = { git = "https://github.com/radixdlt/radix-engine-toolkit", rev = "v2.0.1" }
+radix-engine-toolkit = { git = "https://github.com/radixdlt/radix-engine-toolkit", rev = "v2.0.1" }
 
 # enum-iterator = "1.4.1"
 enum-iterator = { git = "https://github.com/stephaneyfx/enum-iterator/", rev = "9d472a1237cfd03b1c7657fdcba74c8070bfb4ea" }

diff --git a/src/core/types/keys/public_key.rs b/src/core/types/keys/public_key.rs
@@ -407,7 +407,7 @@ mod tests {
         "#;
 
         let result =
-            serde_json::from_str::<PublicKey>(&json_with_wrong_curve).unwrap();
+            serde_json::from_str::<PublicKey>(json_with_wrong_curve).unwrap();
         assert_eq!(expected_secp256k1, result);
     }
 

diff --git a/src/wrapped_radix_engine_toolkit/low_level/transaction_manifest/instructions/instructions.rs b/src/wrapped_radix_engine_toolkit/low_level/transaction_manifest/instructions/instructions.rs
@@ -6,7 +6,7 @@ use radix_engine_toolkit::functions::address::decode as RET_decode_address;
 #[derive(Clone, Debug, PartialEq, Eq, derive_more::Display, uniffi::Record)]
 #[display("{}", self.instructions_string())]
 pub struct Instructions {
-    secret_magic: InstructionsSecretMagic, // MUST be first prop, else you break build.
+    pub secret_magic: InstructionsSecretMagic, // MUST be first prop, else you break build.
     pub network_id: NetworkID,
 }
 

diff --git a/...x_engine_toolkit/low_level/transaction_manifest/instructions/instructions_secret_magic.rs b/...x_engine_toolkit/low_level/transaction_manifest/instructions/instructions_secret_magic.rs
@@ -7,7 +7,7 @@ use crate::prelude::*;
 /// `private let secretMagic: InstructionsSecretMagic`
 /// And hide its initializers.
 #[derive(Clone, Debug, PartialEq, Eq)]
-pub struct InstructionsSecretMagic(Vec<ScryptoInstruction>);
+pub struct InstructionsSecretMagic(pub Vec<ScryptoInstruction>);
 
 impl InstructionsSecretMagic {
     pub(crate) fn instructions(&self) -> &Vec<ScryptoInstruction> {

diff --git a/src/wrapped_radix_engine_toolkit/low_level/transaction_manifest/transaction_manifest.rs b/src/wrapped_radix_engine_toolkit/low_level/transaction_manifest/transaction_manifest.rs
@@ -126,7 +126,9 @@ impl TransactionManifest {
     }
 
     pub fn involved_resource_addresses(&self) -> Vec<ResourceAddress> {
-        let (addresses, _) = RET_ins_extract_addresses(self.instructions());
+        let (addresses, _) = RET_ins_extract_addresses(
+            self.secret_magic.instructions.secret_magic.0.as_slice(),
+        );
         addresses
             .into_iter()
             .filter_map(|a| {