Imports Support by LesterEvSe · Pull Request #95 · BlockstreamResearch/smplx

LesterEvSe · 2026-06-11T13:06:45Z

This PR suggests a bug fix and I've added the necessary tests.
This PR introduces a new feature and I've discussed the update in an Issue or with the team.
This PR is just a minor change like a typo fix.

Replaces #69. Now that SimplicityHL natively supports flattening (PR #337) functionality, it made more sense to rewrite this implementation from scratch in a clean PR rather than trying to salvage and rebase the old one

Arvolear · 2026-06-16T15:10:02Z

        #[command(flatten)]
        flags: TestFlags,
    },
+    /// Install the simplicity dependency


Suggested change

/// Install the simplicity dependency

/// Installs a SimplicityHL dependency (requires the dep to be a Simplex project)

Arvolear · 2026-06-16T15:10:50Z

+                }
+                installed_repos.push(target_dir.clone());


Suggested change

}

installed_repos.push(target_dir.clone());

}

installed_repos.push(target_dir.clone());

Arvolear · 2026-06-16T15:22:07Z

+    /// - `Some(PathBuf)` when a repository name can be extracted from the URL.
+    /// - `None` when the URL is empty or malformed such that no repository name
+    ///   can be determined.
+    pub fn generate_hashed_repo_path(url: &str) -> Option<PathBuf> {


Let's move this function to resolver and rename it to resolve_hashed_repo_path.

Arvolear · 2026-06-16T15:26:35Z

+/// A temporary context struct to hold global state during recursion.
+/// This eliminates the need to pass `builder`, `visited`, and `config_filename`
+/// into every single recursive call.
+struct DepCollector {


Let's move this to a separate file and change the interface a bit. Add a pub collect function that calls rec_collect and handles visiting logic internally.

Arvolear · 2026-06-16T15:27:28Z

+            let nested_deps = DependencyConfig::from_source(&config_source)?;
+            self.rec_collect(&nested_deps, &loaded_simf_dir, &loaded_context)?;


Suggested change

let nested_deps = DependencyConfig::from_source(&config_source)?;

self.rec_collect(&nested_deps, &loaded_simf_dir, &loaded_context)?;

let nested_deps = DependencyConfig::from_source(&config_source)?;

self.rec_collect(&nested_deps, &loaded_simf_dir, &loaded_context)?;

Arvolear · 2026-06-16T15:28:54Z

+        config.dependencies.validate()?;
+        Ok(())


Suggested change

config.dependencies.validate()?;

Ok(())

config.dependencies.validate()?;

Ok(())

Arvolear · 2026-06-16T15:29:28Z

@@ -0,0 +1,3 @@
+pub fn hash(x: u32, y: u32) -> u32 {
+    jet::xor_32(x, y)
+}


Suggested change

}

}

Arvolear · 2026-06-16T15:29:36Z

@@ -0,0 +1 @@
+pub use hl_compiler::simple_op::hash;


Suggested change

pub use hl_compiler::simple_op::hash;

pub use hl_compiler::simple_op::hash;

Arvolear · 2026-06-16T15:29:52Z

 fn main() {
    jet::bip_0340_verify((param::PUBLIC_KEY, jet::sig_all_hash()), witness::SIGNATURE)
-}
+}


Suggested change

}

}

Arvolear · 2026-06-16T15:30:00Z

@@ -1 +1 @@
-src/artifacts
+src/artifacts


Suggested change

src/artifacts

src/artifacts

Arvolear · 2026-06-16T15:30:44Z

Arvolear · 2026-06-16T15:38:19Z

        let output_dir = ArtifactsResolver::resolve_local_dir(&config.out_dir)?;
        let src_dir = ArtifactsResolver::resolve_local_dir(&config.src_dir)?;
+
+        // NOTE: Assume that remappings already install


Suggested change

// NOTE: Assume that remappings already install

// NOTE: Assumes that remappings are already installed

Arvolear · 2026-06-16T15:38:29Z

+        // NOTE: Assume that remappings already install
+        let dependency_builder = ArtifactsResolver::resolve_remappings(deps, CONFIG_FILENAME)?;
+
+        // TODO: For all remappings need to check `files_to_build` and concatenate it to `Vec<Path>`


Suggested change

// TODO: For all remappings need to check `files_to_build` and concatenate it to `Vec<Path>`

Arvolear · 2026-06-16T15:40:27Z


 electrsd = { version = "0.29.0", features = ["legacy"] }
-simplicityhl = { version = "0.5.0" }
+# simplicityhl = { version = "0.5.0" }


LesterEvSe self-assigned this Jun 11, 2026

LesterEvSe requested a review from Arvolear as a code owner June 11, 2026 13:06

LesterEvSe added the enhancement New feature or request label Jun 11, 2026

LesterEvSe linked an issue Jun 11, 2026 that may be closed by this pull request

Dependencies management #38

Open

LesterEvSe marked this pull request as draft June 11, 2026 14:23

LesterEvSe mentioned this pull request Jun 11, 2026

Add Dependency Management #69

Closed

3 tasks

LesterEvSe force-pushed the feature/imports-v2 branch from 667340e to 4084ed0 Compare June 11, 2026 15:37

LesterEvSe changed the base branch from master to dev June 11, 2026 16:24

LesterEvSe force-pushed the feature/imports-v2 branch from 4084ed0 to 3cab2bd Compare June 12, 2026 10:44

Arvolear reviewed Jun 12, 2026

View reviewed changes

Comment thread crates/build/src/resolver.rs Outdated

Arvolear reviewed Jun 12, 2026

View reviewed changes

Comment thread crates/build/src/resolver.rs Outdated

Arvolear reviewed Jun 12, 2026

View reviewed changes

Comment thread crates/build/src/resolver.rs

Arvolear reviewed Jun 12, 2026

View reviewed changes

Comment thread crates/build/src/resolver.rs Outdated

Arvolear reviewed Jun 12, 2026

View reviewed changes

Comment thread crates/build/src/generator.rs Outdated

feat: add imports support

e509d10

LesterEvSe force-pushed the feature/imports-v2 branch from 3cab2bd to e509d10 Compare June 12, 2026 14:41

feat: filter files with fn main

3e90f31

LesterEvSe marked this pull request as ready for review June 15, 2026 10:42