From b08539bbda4c3904344345ff5ac9efbc077d5120 Mon Sep 17 00:00:00 2001
From: Omar <OmarAbdulla7@hotmail.com>
Date: Fri, 5 Jul 2024 16:25:27 +0300
Subject: [PATCH] Update the package-loader

---
 Cargo.lock                          |  1 -
 libraries/package-loader/Cargo.toml |  4 +---
 libraries/package-loader/src/lib.rs | 27 +++++++++++++++++++++------
 3 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ea6da660..3f188ecf 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2021,7 +2021,6 @@ dependencies = [
  "radix-common",
  "radix-engine",
  "radix-engine-interface",
- "radix-substate-store-queries",
  "scrypto-compiler 1.3.0-dev (git+https://github.com/radixdlt/radixdlt-scrypto?rev=93ab38386333e7c9b3658e63392e6493692a9291)",
  "walkdir",
  "wasm-opt",
diff --git a/libraries/package-loader/Cargo.toml b/libraries/package-loader/Cargo.toml
index 2c49ce92..550b4979 100644
--- a/libraries/package-loader/Cargo.toml
+++ b/libraries/package-loader/Cargo.toml
@@ -8,7 +8,7 @@ build = "build.rs"
 [dependencies]
 radix-common = { workspace = true }
 scrypto-compiler = { workspace = true }
-radix-substate-store-queries = { workspace = true }
+radix-engine-interface = { workspace = true }
 
 getrandom = { version = "0.2.12", features = ["js"] }
 
@@ -19,7 +19,6 @@ cargo_toml = { version = "0.18.0", optional = true }
 
 radix-engine = { workspace = true, optional = true }
 radix-common = { workspace = true, optional = true }
-radix-engine-interface = { workspace = true, optional = true }
 
 [features]
 default = []
@@ -28,7 +27,6 @@ build-time-blueprints = [
     "dep:cargo_toml",
     "dep:radix-engine",
     "dep:radix-common",
-    "dep:radix-engine-interface",
     "dep:wasm-opt",
 ]
 
diff --git a/libraries/package-loader/src/lib.rs b/libraries/package-loader/src/lib.rs
index 7d03e8a2..b68110d5 100644
--- a/libraries/package-loader/src/lib.rs
+++ b/libraries/package-loader/src/lib.rs
@@ -19,18 +19,29 @@
 #[allow(unused, clippy::module_inception)]
 mod package_loader {
     use radix_common::prelude::*;
-    use radix_substate_store_queries::typed_substate_layout::*;
     use std::sync::*;
 
     const PACKAGES_BINARY: &[u8] =
         include_bytes!(concat!(env!("OUT_DIR"), "/compiled_packages.bin"));
 
-    static PACKAGES: OnceLock<HashMap<String, (Vec<u8>, PackageDefinition)>> =
-        OnceLock::new();
+    static PACKAGES: OnceLock<
+        HashMap<
+            String,
+            (
+                Vec<u8>,
+                radix_engine_interface::blueprints::package::PackageDefinition,
+            ),
+        >,
+    > = OnceLock::new();
 
     pub struct PackageLoader;
     impl PackageLoader {
-        pub fn get(name: &str) -> (Vec<u8>, PackageDefinition) {
+        pub fn get(
+            name: &str,
+        ) -> (
+            Vec<u8>,
+            radix_engine_interface::blueprints::package::PackageDefinition,
+        ) {
             let packages = PACKAGES
                 .get_or_init(|| scrypto_decode(PACKAGES_BINARY).unwrap());
             if let Some(rtn) = packages.get(name) {
@@ -46,12 +57,16 @@ mod package_loader {
 #[allow(unused, clippy::module_inception)]
 mod package_loader {
     use radix_common::prelude::*;
-    use radix_substate_store_queries::typed_substate_layout::*;
     use std::path::PathBuf;
 
     pub struct PackageLoader;
     impl PackageLoader {
-        pub fn get(name: &str) -> (Vec<u8>, PackageDefinition) {
+        pub fn get(
+            name: &str,
+        ) -> (
+            Vec<u8>,
+            radix_engine_interface::blueprints::package::PackageDefinition,
+        ) {
             let package_dir = PathBuf::from_str(env!("CARGO_MANIFEST_DIR"))
                 .unwrap()
                 .parent()