diff --git a/forc-pkg/src/lock.rs b/forc-pkg/src/lock.rs index 4115f3072e1..7fefdd03126 100644 --- a/forc-pkg/src/lock.rs +++ b/forc-pkg/src/lock.rs @@ -33,11 +33,23 @@ pub struct PkgLock { // `Option`. version: Option, source: Option, - // Dependency string is " ". The source string is included in order to be - // able to uniquely distinguish between multiple different versions of the same package. - dependencies: Vec, + dependencies: Vec, } +/// `PkgDepLine` is a terse, single-line, git-diff-friendly description of a package's +/// dependency. It is formatted like so: +/// +/// ```ignore +/// () +/// ``` +/// +/// The `()` segment is only included in the uncommon case that the dependency name does +/// not match the package name, i.e. if the `package` field was specified for the dependency. +/// +/// The source string is included in order to be able to uniquely distinguish between multiple +/// different versions of the same package. +pub type PkgDepLine = String; + /// Convert the given package source to a string for use in the package lock. /// /// Returns `None` for sources that refer to a direct `Path`. @@ -74,10 +86,16 @@ impl PkgLock { let mut dependencies: Vec = graph .edges_directed(node, Direction::Outgoing) .map(|edge| { + let dep_name = edge.weight(); let dep_node = edge.target(); - let dep = &graph[dep_node]; - let source_string = source_to_string(&dep.source); - pkg_unique_string(&dep.name, source_string.as_deref()) + let dep_pkg = &graph[dep_node]; + let dep_name = if *dep_name != dep_pkg.name { + Some(&dep_name[..]) + } else { + None + }; + let source_string = source_to_string(&dep_pkg.source); + pkg_dep_line(dep_name, &dep_pkg.name, source_string.as_deref()) }) .collect(); dependencies.sort(); @@ -123,9 +141,6 @@ impl Lock { for pkg in &self.package { let key = pkg.unique_string(); let name = pkg.name.clone(); - // TODO: We shouldn't use `pkg::SourcePinned` as we don't actually know the `Path` - // until we follow the dependency graph. Use something like a `ParsedSource` type here - // instead. let pkg_source_string = pkg.source.clone(); let source = match &pkg_source_string { None => pkg::SourcePinned::Path, @@ -142,12 +157,15 @@ impl Lock { for pkg in &self.package { let key = pkg.unique_string(); let node = pkg_to_node[&key]; - for dep_key in &pkg.dependencies { + for dep_line in &pkg.dependencies { + let (dep_name, dep_key) = parse_pkg_dep_line(dep_line) + .map_err(|e| anyhow!("failed to parse dependency \"{}\": {}", dep_line, e))?; let dep_node = pkg_to_node - .get(&dep_key[..]) + .get(dep_key) .cloned() .ok_or_else(|| anyhow!("found dep {} without node entry in graph", dep_key))?; - graph.add_edge(node, dep_node, ()); + let dep_name = dep_name.unwrap_or(&graph[dep_node].name).to_string(); + graph.add_edge(node, dep_node, dep_name); } } @@ -171,6 +189,38 @@ fn pkg_unique_string(name: &str, source: Option<&str>) -> String { } } +fn pkg_dep_line(dep_name: Option<&str>, name: &str, source: Option<&str>) -> PkgDepLine { + let pkg_string = pkg_unique_string(name, source); + match dep_name { + None => pkg_string, + Some(dep_name) => format!("({}) {}", dep_name, pkg_string), + } +} + +// Parse the given `PkgDepLine` into its dependency name and unique string segments. +// +// I.e. given "() ", returns ("", " "). +fn parse_pkg_dep_line(pkg_dep_line: &str) -> anyhow::Result<(Option<&str>, &str)> { + let s = pkg_dep_line.trim(); + + // Check for the open bracket. + if !s.starts_with('(') { + return Ok((None, s)); + } + + // If we have the open bracket, grab everything until the closing bracket. + let s = &s["(".len()..]; + let mut iter = s.split(')'); + let dep_name = iter + .next() + .ok_or_else(|| anyhow!("missing closing parenthesis"))?; + + // The rest is the unique package string. + let s = &s[dep_name.len() + ")".len()..]; + let pkg_str = s.trim_start(); + Ok((Some(dep_name), pkg_str)) +} + pub fn print_diff(proj_name: &str, diff: &Diff) { print_removed_pkgs(proj_name, diff.removed.iter().cloned()); print_added_pkgs(proj_name, diff.added.iter().cloned()); diff --git a/forc-pkg/src/manifest.rs b/forc-pkg/src/manifest.rs index 8e5f7e761ed..e50f5a1fa44 100644 --- a/forc-pkg/src/manifest.rs +++ b/forc-pkg/src/manifest.rs @@ -56,6 +56,17 @@ pub struct DependencyDetails { pub(crate) git: Option, pub(crate) branch: Option, pub(crate) tag: Option, + pub(crate) package: Option, +} + +impl Dependency { + /// The string of the `package` field if specified. + pub fn package(&self) -> Option<&str> { + match *self { + Self::Simple(_) => None, + Self::Detailed(ref det) => det.package.as_deref(), + } + } } impl Manifest { diff --git a/forc-pkg/src/pkg.rs b/forc-pkg/src/pkg.rs index 633b10d1081..5d610ce2bf3 100644 --- a/forc-pkg/src/pkg.rs +++ b/forc-pkg/src/pkg.rs @@ -4,8 +4,8 @@ use crate::{ }; use anyhow::{anyhow, bail, Result}; use forc_util::{ - find_file_name, git_checkouts_directory, print_on_failure, print_on_success, - print_on_success_library, println_yellow_err, + find_file_name, git_checkouts_directory, kebab_to_snake_case, print_on_failure, + print_on_success, print_on_success_library, println_yellow_err, }; use petgraph::{self, visit::EdgeRef, Directed, Direction}; use serde::{Deserialize, Serialize}; @@ -24,7 +24,7 @@ use url::Url; type GraphIx = u32; type Node = Pinned; -type Edge = (); +type Edge = DependencyName; pub type Graph = petgraph::Graph; pub type NodeIx = petgraph::graph::NodeIndex; pub type PathMap = HashMap; @@ -44,7 +44,7 @@ pub struct Compiled { /// A package uniquely identified by name along with its source. #[derive(Clone, Debug, Eq, Hash, Ord, PartialEq, PartialOrd, Deserialize, Serialize)] pub struct Pkg { - /// The unique name of the package. + /// The unique name of the package as declared in its manifest. pub name: String, /// Where the package is sourced from. pub source: Source, @@ -145,6 +145,26 @@ pub enum SourceGitPinnedParseError { CommitHash, } +/// The name specified on the left hand side of the `=` in a depenedency declaration under +/// `[dependencies]` within a forc manifest. +/// +/// The name of a dependency may differ from the package name in the case that the dependency's +/// `package` field is specified. +/// +/// For example, in the following, `foo` is assumed to be both the package name and the dependency +/// name: +/// +/// ```toml +/// foo = { git = "https://github.com/owner/repo", branch = "master" } +/// ``` +/// +/// In the following case however, `foo` is the package name, but the dependency name is `foo-alt`: +/// +/// ```toml +/// foo-alt = { git = "https://github.com/owner/repo", branch = "master", package = "foo" } +/// ``` +pub type DependencyName = String; + impl BuildPlan { /// Create a new build plan for the project by fetching and pinning dependenies. pub fn new(manifest_dir: &Path, offline: bool) -> Result { @@ -189,7 +209,11 @@ impl BuildPlan { let plan_dep_pkgs: BTreeSet<_> = self .graph .edges_directed(proj_node, Direction::Outgoing) - .map(|e| self.graph[e.target()].unpinned(&self.path_map)) + .map(|e| { + let dep_name = e.weight(); + let dep_pkg = self.graph[e.target()].unpinned(&self.path_map); + (dep_name, dep_pkg) + }) .collect(); // Collect dependency `Source`s from manifest. @@ -200,22 +224,23 @@ impl BuildPlan { .as_ref() .into_iter() .flat_map(|deps| deps.iter()) - .map(|(name, dep)| { + .map(|(dep_name, dep)| { // NOTE: Temporarily warn about `version` until we have support for registries. if let Dependency::Detailed(det) = dep { if det.version.is_some() { println_yellow_err(&format!( " WARNING! Dependency \"{}\" specifies the unused `version` field: \ consider using `branch` or `tag` instead", - name + dep_name )) .unwrap(); } } - let name = name.clone(); + let name = dep.package().unwrap_or(dep_name).to_string(); let source = dep_to_source(proj_path, dep)?; - Ok(Pkg { name, source }) + let dep_pkg = Pkg { name, source }; + Ok((dep_name, dep_pkg)) }) .collect::>>()?; @@ -224,6 +249,21 @@ impl BuildPlan { bail!("Manifest dependencies do not match"); } + // Ensure the pkg names of all nodes match their associated manifests. + for node in self.graph.node_indices() { + let pkg = &self.graph[node]; + let id = pkg.id(); + let path = &self.path_map[&id]; + let manifest = Manifest::from_dir(path)?; + if pkg.name != manifest.project.name { + bail!( + "package name {:?} does not match the associated manifest project name {:?}", + pkg.name, + manifest.project.name, + ); + } + } + Ok(()) } @@ -448,10 +488,12 @@ pub(crate) fn fetch_deps( // TODO: Convert this recursion to use loop & stack to ensure deps can't cause stack overflow. let fetch_ts = std::time::Instant::now(); let fetch_id = fetch_id(&path_map[&pkg_id], fetch_ts); + let manifest = Manifest::from_dir(&path_map[&pkg_id])?; fetch_children( fetch_id, offline_mode, root, + &manifest, &mut graph, &mut path_map, &mut visited, @@ -475,34 +517,49 @@ fn fetch_children( fetch_id: u64, offline_mode: bool, node: NodeIx, + manifest: &Manifest, graph: &mut Graph, path_map: &mut PathMap, visited: &mut HashMap, ) -> Result<()> { let parent = &graph[node]; let parent_path = path_map[&parent.id()].clone(); - let manifest = Manifest::from_dir(&parent_path)?; - let deps = match &manifest.dependencies { - None => return Ok(()), - Some(deps) => deps, - }; - for (name, dep) in deps { - let name = name.clone(); + for (dep_name, dep) in manifest.deps() { + let name = dep.package().unwrap_or(dep_name).to_string(); let source = dep_to_source(&parent_path, dep)?; if offline_mode && !matches!(source, Source::Path(_)) { bail!("Unable to fetch pkg {:?} in offline mode", source); } let pkg = Pkg { name, source }; let pinned = pin_pkg(fetch_id, &pkg, path_map)?; + let pkg_id = pinned.id(); + let manifest = Manifest::from_dir(&path_map[&pkg_id])?; + if pinned.name != manifest.project.name { + bail!( + "dependency name {:?} must match the manifest project name {:?} \ + unless `package = {:?}` is specified in the dependency declaration", + pinned.name, + manifest.project.name, + manifest.project.name, + ); + } let dep_node = if let hash_map::Entry::Vacant(entry) = visited.entry(pinned.clone()) { let node = graph.add_node(pinned); entry.insert(node); - fetch_children(fetch_id, offline_mode, node, graph, path_map, visited)?; + fetch_children( + fetch_id, + offline_mode, + node, + &manifest, + graph, + path_map, + visited, + )?; node } else { visited[&pinned] }; - graph.add_edge(node, dep_node, ()); + graph.add_edge(node, dep_node, dep_name.to_string()); } Ok(()) } @@ -764,11 +821,20 @@ pub fn dependency_namespace( // In order of compilation, accumulate dependency namespace refs. let namespace = sway_core::create_module(); - for dep_node in compilation_order.iter().filter(|n| deps.contains(n)) { - if *dep_node == node { + for &dep_node in compilation_order.iter().filter(|n| deps.contains(n)) { + if dep_node == node { break; } - namespace.insert_module_ref(graph[*dep_node].name.clone(), namespace_map[dep_node]); + // Add the namespace once for each of its names. + let namespace_ref = namespace_map[&dep_node]; + let dep_names: BTreeSet<_> = graph + .edges_directed(dep_node, Direction::Incoming) + .map(|e| e.weight()) + .collect(); + for dep_name in dep_names { + let dep_name = kebab_to_snake_case(dep_name); + namespace.insert_module_ref(dep_name.to_string(), namespace_ref); + } } namespace diff --git a/forc-util/src/lib.rs b/forc-util/src/lib.rs index e65dd71bdc0..8c1d47e4371 100644 --- a/forc-util/src/lib.rs +++ b/forc-util/src/lib.rs @@ -106,6 +106,11 @@ pub fn validate_name(name: &str, use_case: &str) -> Result<()> { Ok(()) } +/// Simple function to convert kebab-case to snake_case. +pub fn kebab_to_snake_case(s: &str) -> String { + s.replace('-', "_") +} + pub fn default_output_directory(manifest_dir: &Path) -> PathBuf { manifest_dir.join(DEFAULT_OUTPUT_DIRECTORY) } diff --git a/test/src/e2e_vm_tests/mod.rs b/test/src/e2e_vm_tests/mod.rs index c77fa78b193..0f03a3cf5dd 100644 --- a/test/src/e2e_vm_tests/mod.rs +++ b/test/src/e2e_vm_tests/mod.rs @@ -12,6 +12,10 @@ pub fn run(filter_regex: Option) { // programs that should successfully compile and terminate // with some known state let positive_project_names = vec![ + ( + "should_pass/forc/dependency_package_field", + ProgramState::Return(0), + ), ( "should_pass/language/asm_expr_basic", ProgramState::Return(6), diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/match_expressions_non_exhaustive/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_fail/match_expressions_non_exhaustive/Forc.lock index 828e67200ab..1b32483eed8 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/match_expressions_non_exhaustive/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_fail/match_expressions_non_exhaustive/Forc.lock @@ -1,16 +1,16 @@ [[package]] name = 'core' -source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' +source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44' dependencies = [] [[package]] name = 'match_expressions_non_exhaustive' dependencies = [ - 'core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573', - 'std git+http://github.com/FuelLabs/sway-lib-std?reference=master#7081d2e1ac2401f22a0de0673e8a01535180ba3a', + 'core git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44', + 'std git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549', ] [[package]] name = 'std' -source = 'git+http://github.com/FuelLabs/sway-lib-std?reference=master#7081d2e1ac2401f22a0de0673e8a01535180ba3a' -dependencies = ['core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] +source = 'git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549' +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44'] diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/match_expressions_non_exhaustive/Forc.toml b/test/src/e2e_vm_tests/test_programs/should_fail/match_expressions_non_exhaustive/Forc.toml index d9d339f33f3..ea1a0a5bab3 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/match_expressions_non_exhaustive/Forc.toml +++ b/test/src/e2e_vm_tests/test_programs/should_fail/match_expressions_non_exhaustive/Forc.toml @@ -5,5 +5,5 @@ name = "match_expressions_non_exhaustive" entry = "main.sw" [dependencies] -std = { git = "http://github.com/FuelLabs/sway-lib-std", branch = "master" } -core = { git = "http://github.com/FuelLabs/sway-lib-core", branch = "master" } +std = { git = "https://github.com/FuelLabs/sway-lib-std", branch = "master" } +core = { git = "https://github.com/FuelLabs/sway-lib-core", branch = "master" } diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/forc/dependency_package_field/.gitignore b/test/src/e2e_vm_tests/test_programs/should_pass/forc/dependency_package_field/.gitignore new file mode 100644 index 00000000000..77d3844f58c --- /dev/null +++ b/test/src/e2e_vm_tests/test_programs/should_pass/forc/dependency_package_field/.gitignore @@ -0,0 +1,2 @@ +out +target diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/forc/dependency_package_field/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_pass/forc/dependency_package_field/Forc.lock new file mode 100644 index 00000000000..bf4e47f2db1 --- /dev/null +++ b/test/src/e2e_vm_tests/test_programs/should_pass/forc/dependency_package_field/Forc.lock @@ -0,0 +1,13 @@ +[[package]] +name = 'core' +source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44' +dependencies = [] + +[[package]] +name = 'dependency_package_field' +dependencies = ['(std-alt) std git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549'] + +[[package]] +name = 'std' +source = 'git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549' +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44'] diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/forc/dependency_package_field/Forc.toml b/test/src/e2e_vm_tests/test_programs/should_pass/forc/dependency_package_field/Forc.toml new file mode 100644 index 00000000000..63bfe09b89b --- /dev/null +++ b/test/src/e2e_vm_tests/test_programs/should_pass/forc/dependency_package_field/Forc.toml @@ -0,0 +1,9 @@ +[project] +authors = ["Fuel Labs "] +entry = "main.sw" +license = "Apache-2.0" +name = "dependency_package_field" + +[dependencies] +# Use `std` package as `std_alt` to test `package` field. +std-alt = { git = "https://github.com/FuelLabs/sway-lib-std", branch = "master", package = "std" } diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/forc/dependency_package_field/json_abi_oracle.json b/test/src/e2e_vm_tests/test_programs/should_pass/forc/dependency_package_field/json_abi_oracle.json new file mode 100644 index 00000000000..0637a088a01 --- /dev/null +++ b/test/src/e2e_vm_tests/test_programs/should_pass/forc/dependency_package_field/json_abi_oracle.json @@ -0,0 +1 @@ +[] \ No newline at end of file diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/forc/dependency_package_field/src/main.sw b/test/src/e2e_vm_tests/test_programs/should_pass/forc/dependency_package_field/src/main.sw new file mode 100644 index 00000000000..1976be935b7 --- /dev/null +++ b/test/src/e2e_vm_tests/test_programs/should_pass/forc/dependency_package_field/src/main.sw @@ -0,0 +1,9 @@ +script; + +// Check that code uses declared dependency name `std_alt` not package name `std`. +use std_alt::chain::assert; + +fn main() -> u64 { + assert(true); + 0 +} diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/aliased_imports/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_pass/language/aliased_imports/Forc.lock index cce7e71c408..87ab94c8f4f 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/aliased_imports/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/aliased_imports/Forc.lock @@ -1,13 +1,13 @@ [[package]] name = 'aliased_imports' -dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?reference=master#247270e7d8911e754a989b2fe280c462605ae2f6'] +dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549'] [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' +source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44' dependencies = [] [[package]] name = 'std' -source = 'git+https://github.com/FuelLabs/sway-lib-std?reference=master#247270e7d8911e754a989b2fe280c462605ae2f6' -dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] +source = 'git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549' +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44'] diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/asm_expr_basic/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_pass/language/asm_expr_basic/Forc.lock index 428682793d2..7ee2f338001 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/asm_expr_basic/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/asm_expr_basic/Forc.lock @@ -1,13 +1,13 @@ [[package]] name = 'asm_expr_basic' -dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?reference=master#247270e7d8911e754a989b2fe280c462605ae2f6'] +dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549'] [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' +source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44' dependencies = [] [[package]] name = 'std' -source = 'git+https://github.com/FuelLabs/sway-lib-std?reference=master#247270e7d8911e754a989b2fe280c462605ae2f6' -dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] +source = 'git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549' +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44'] diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/b256_ops/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_pass/language/b256_ops/Forc.lock index e8c3a33e2d7..fa409414aff 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/b256_ops/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/b256_ops/Forc.lock @@ -1,13 +1,13 @@ [[package]] name = 'b256_ops' -dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?reference=master#247270e7d8911e754a989b2fe280c462605ae2f6'] +dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549'] [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' +source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44' dependencies = [] [[package]] name = 'std' -source = 'git+https://github.com/FuelLabs/sway-lib-std?reference=master#247270e7d8911e754a989b2fe280c462605ae2f6' -dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] +source = 'git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549' +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44'] diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/empty_method_initializer/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_pass/language/empty_method_initializer/Forc.lock index a1909659a49..a8f06686b16 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/empty_method_initializer/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/empty_method_initializer/Forc.lock @@ -1,13 +1,13 @@ [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' +source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44' dependencies = [] [[package]] name = 'empty_method_initializer' -dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?reference=master#afb030ee9a5f7125a1b1a477acb5bf74bb99c1fd'] +dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549'] [[package]] name = 'std' -source = 'git+https://github.com/FuelLabs/sway-lib-std?reference=master#afb030ee9a5f7125a1b1a477acb5bf74bb99c1fd' -dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] +source = 'git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549' +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44'] diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_in_fn_decl/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_in_fn_decl/Forc.lock index ff5545524f4..09004297d5e 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_in_fn_decl/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_in_fn_decl/Forc.lock @@ -1,13 +1,13 @@ [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' +source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44' dependencies = [] [[package]] name = 'enum_in_fn_decl' -dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?reference=master#247270e7d8911e754a989b2fe280c462605ae2f6'] +dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549'] [[package]] name = 'std' -source = 'git+https://github.com/FuelLabs/sway-lib-std?reference=master#247270e7d8911e754a989b2fe280c462605ae2f6' -dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] +source = 'git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549' +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44'] diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/inline_if_expr_const/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_pass/language/inline_if_expr_const/Forc.lock index cb3a9b2bce3..d919b558f00 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/inline_if_expr_const/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/inline_if_expr_const/Forc.lock @@ -1,13 +1,13 @@ [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' +source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44' dependencies = [] [[package]] name = 'inline_if_expr_const' -dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?reference=master#247270e7d8911e754a989b2fe280c462605ae2f6'] +dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549'] [[package]] name = 'std' -source = 'git+https://github.com/FuelLabs/sway-lib-std?reference=master#247270e7d8911e754a989b2fe280c462605ae2f6' -dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] +source = 'git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549' +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44'] diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/modulo_uint_test/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_pass/language/modulo_uint_test/Forc.lock index a546446d808..e9ef6aae4cd 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/modulo_uint_test/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/modulo_uint_test/Forc.lock @@ -1,13 +1,13 @@ [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' +source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44' dependencies = [] [[package]] name = 'modulo_uint_test' -dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?reference=master#afb030ee9a5f7125a1b1a477acb5bf74bb99c1fd'] +dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549'] [[package]] name = 'std' -source = 'git+https://github.com/FuelLabs/sway-lib-std?reference=master#afb030ee9a5f7125a1b1a477acb5bf74bb99c1fd' -dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] +source = 'git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549' +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44'] diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/nested_structs/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_pass/language/nested_structs/Forc.lock index 454127c72bd..56d3c305f19 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/nested_structs/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/nested_structs/Forc.lock @@ -1,13 +1,13 @@ [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' +source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44' dependencies = [] [[package]] name = 'nested_structs' -dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?reference=master#7081d2e1ac2401f22a0de0673e8a01535180ba3a'] +dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549'] [[package]] name = 'std' -source = 'git+https://github.com/FuelLabs/sway-lib-std?reference=master#7081d2e1ac2401f22a0de0673e8a01535180ba3a' -dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] +source = 'git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549' +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44'] diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/new_allocator_test/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_pass/language/new_allocator_test/Forc.lock index d5e6b04c703..65ef2d53664 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/new_allocator_test/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/new_allocator_test/Forc.lock @@ -1,18 +1,13 @@ [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' -dependencies = [] - -[[package]] -name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=v0.0.1#45c54ab37abde32a10e20964264cf7362dd73caa' +source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44' dependencies = [] [[package]] name = 'new_alloc' -dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?reference=master#afb030ee9a5f7125a1b1a477acb5bf74bb99c1fd'] +dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549'] [[package]] name = 'std' -source = 'git+https://github.com/FuelLabs/sway-lib-std?reference=master#afb030ee9a5f7125a1b1a477acb5bf74bb99c1fd' -dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] +source = 'git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549' +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44'] diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/size_of/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_pass/language/size_of/Forc.lock index 9c6229637e1..26e0a5d5a48 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/size_of/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/size_of/Forc.lock @@ -1,13 +1,13 @@ [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' +source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44' dependencies = [] [[package]] name = 'size_of' -dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?reference=master#afb030ee9a5f7125a1b1a477acb5bf74bb99c1fd'] +dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549'] [[package]] name = 'std' -source = 'git+https://github.com/FuelLabs/sway-lib-std?reference=master#afb030ee9a5f7125a1b1a477acb5bf74bb99c1fd' -dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] +source = 'git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549' +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44'] diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/supertraits/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_pass/language/supertraits/Forc.lock index 66aa069c8fe..b80913be0a0 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/supertraits/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/supertraits/Forc.lock @@ -1,13 +1,13 @@ [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' +source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44' dependencies = [] [[package]] name = 'std' -source = 'git+https://github.com/FuelLabs/sway-lib-std?reference=master#afb030ee9a5f7125a1b1a477acb5bf74bb99c1fd' -dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] +source = 'git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549' +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44'] [[package]] name = 'supertraits' -dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?reference=master#afb030ee9a5f7125a1b1a477acb5bf74bb99c1fd'] +dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549'] diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_in_struct/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_in_struct/Forc.lock index 13e9440464c..657c753e63c 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_in_struct/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_in_struct/Forc.lock @@ -1,13 +1,13 @@ [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' +source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44' dependencies = [] [[package]] name = 'std' -source = 'git+https://github.com/FuelLabs/sway-lib-std?reference=master#7081d2e1ac2401f22a0de0673e8a01535180ba3a' -dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] +source = 'git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549' +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44'] [[package]] name = 'tuple_in_struct' -dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?reference=master#7081d2e1ac2401f22a0de0673e8a01535180ba3a'] +dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549'] diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/unary_not_basic/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_pass/language/unary_not_basic/Forc.lock index 9483031537b..abe20eecee4 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/unary_not_basic/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/unary_not_basic/Forc.lock @@ -1,13 +1,13 @@ [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' +source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44' dependencies = [] [[package]] name = 'std' -source = 'git+https://github.com/FuelLabs/sway-lib-std?reference=master#afb030ee9a5f7125a1b1a477acb5bf74bb99c1fd' -dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] +source = 'git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549' +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44'] [[package]] name = 'unary_not_basic' -dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?reference=master#afb030ee9a5f7125a1b1a477acb5bf74bb99c1fd'] +dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549'] diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/unary_not_basic_2/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_pass/language/unary_not_basic_2/Forc.lock index 427fbe7d09a..164affbf9f3 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/unary_not_basic_2/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/unary_not_basic_2/Forc.lock @@ -1,13 +1,13 @@ [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' +source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44' dependencies = [] [[package]] name = 'std' -source = 'git+https://github.com/FuelLabs/sway-lib-std?reference=master#afb030ee9a5f7125a1b1a477acb5bf74bb99c1fd' -dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] +source = 'git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549' +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44'] [[package]] name = 'unary_not_basic_2' -dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?reference=master#afb030ee9a5f7125a1b1a477acb5bf74bb99c1fd'] +dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549'] diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/bal_opcode/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/bal_opcode/Forc.lock index 07414aa6d31..715018ef112 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/bal_opcode/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/bal_opcode/Forc.lock @@ -2,7 +2,7 @@ name = 'bal_opcode' dependencies = [ 'balance_test_abi', - 'std git+https://github.com/FuelLabs/sway-lib-std?reference=master#247270e7d8911e754a989b2fe280c462605ae2f6', + 'std git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549', ] [[package]] @@ -11,10 +11,10 @@ dependencies = [] [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' +source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44' dependencies = [] [[package]] name = 'std' -source = 'git+https://github.com/FuelLabs/sway-lib-std?reference=master#247270e7d8911e754a989b2fe280c462605ae2f6' -dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] +source = 'git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549' +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44'] diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/bal_opcode/src/main.sw b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/bal_opcode/src/main.sw index 2eddf8ae8d4..cd6dae704c9 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/bal_opcode/src/main.sw +++ b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/bal_opcode/src/main.sw @@ -1,6 +1,6 @@ script; -use std::{chain::assert, constants::ETH_ID, contract_id::ContractId}; +use std::{chain::assert, constants::NATIVE_ASSET_ID, contract_id::ContractId}; use balance_test_abi::BalanceTest; fn main() -> bool { @@ -13,7 +13,7 @@ fn main() -> bool { } (); - let balance = asm(token_bal, token: ETH_ID, id: balance_test_contract_id) { + let balance = asm(token_bal, token: NATIVE_ASSET_ID, id: balance_test_contract_id) { bal token_bal token id; token_bal: u64 }; diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_basic_storage/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_basic_storage/Forc.lock index 3cb94761145..1841e8d80e3 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_basic_storage/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_basic_storage/Forc.lock @@ -6,15 +6,15 @@ dependencies = [] name = 'call_basic_storage' dependencies = [ 'basic_storage_abi', - 'std git+https://github.com/FuelLabs/sway-lib-std?reference=master#7081d2e1ac2401f22a0de0673e8a01535180ba3a', + 'std git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549', ] [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' +source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44' dependencies = [] [[package]] name = 'std' -source = 'git+https://github.com/FuelLabs/sway-lib-std?reference=master#7081d2e1ac2401f22a0de0673e8a01535180ba3a' -dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] +source = 'git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549' +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44'] diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/caller_auth_test/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/caller_auth_test/Forc.lock index df47e09651d..fccbeb31619 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/caller_auth_test/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/caller_auth_test/Forc.lock @@ -6,15 +6,15 @@ dependencies = [] name = 'caller_auth_test' dependencies = [ 'auth_testing_abi', - 'std git+https://github.com/FuelLabs/sway-lib-std?reference=master#247270e7d8911e754a989b2fe280c462605ae2f6', + 'std git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549', ] [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' +source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44' dependencies = [] [[package]] name = 'std' -source = 'git+https://github.com/FuelLabs/sway-lib-std?reference=master#247270e7d8911e754a989b2fe280c462605ae2f6' -dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] +source = 'git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549' +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44'] diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/caller_auth_test/src/main.sw b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/caller_auth_test/src/main.sw index 349104a65c7..94f9a91720a 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/caller_auth_test/src/main.sw +++ b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/caller_auth_test/src/main.sw @@ -1,5 +1,5 @@ script; -use std::{chain::auth::caller_is_external, constants::ETH_ID}; +use std::{chain::auth::caller_is_external, constants::NATIVE_ASSET_ID}; use auth_testing_abi::AuthTesting; // should be false in the case of a script diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/caller_context_test/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/caller_context_test/Forc.lock index e5ff902fa68..977cd9acaaa 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/caller_context_test/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/caller_context_test/Forc.lock @@ -2,19 +2,19 @@ name = 'caller_context_test' dependencies = [ 'context_testing_abi', - 'std git+https://github.com/FuelLabs/sway-lib-std?reference=master#afb030ee9a5f7125a1b1a477acb5bf74bb99c1fd', + 'std git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549', ] [[package]] name = 'context_testing_abi' -dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?reference=master#afb030ee9a5f7125a1b1a477acb5bf74bb99c1fd'] +dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549'] [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' +source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44' dependencies = [] [[package]] name = 'std' -source = 'git+https://github.com/FuelLabs/sway-lib-std?reference=master#afb030ee9a5f7125a1b1a477acb5bf74bb99c1fd' -dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] +source = 'git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549' +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44'] diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/caller_context_test/src/main.sw b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/caller_context_test/src/main.sw index 50374a6ba5e..4103b9a1ab6 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/caller_context_test/src/main.sw +++ b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/caller_context_test/src/main.sw @@ -1,11 +1,12 @@ script; -use std::{chain::assert, constants::{ETH_ID, ZERO}, contract_id::ContractId}; +use std::{chain::assert, constants::{NATIVE_ASSET_ID, ZERO}, contract_id::ContractId}; use context_testing_abi::*; fn main() -> bool { let gas: u64 = 1000; let amount: u64 = 11; let other_contract_id = ~ContractId::from(0x285dafd64feb42477cfb3da8193ceb28b5f5277c17591d7c10000661cacdd0c9); + let native_asset_id = ~ContractId::from(NATIVE_ASSET_ID); // contract ID for sway/test/src/e2e_vm_tests/test_programs/balance_test_contract let deployed_contract_id = 0xa835193dabf3fe80c0cb62e2ecc424f5ac03bc7f5c896ecc4bd2fd06cc434322; @@ -14,7 +15,7 @@ fn main() -> bool { // test Context::contract_id(): let returned_contract_id = test_contract.get_id { - gas: gas, coins: 0, asset_id: ETH_ID + gas: gas, coins: 0, asset_id: NATIVE_ASSET_ID } (); assert(returned_contract_id.into() == deployed_contract_id); @@ -22,36 +23,36 @@ fn main() -> bool { // @todo set up a test contract to mint some tokens for testing balances. // test Context::this_balance(): let returned_this_balance = test_contract.get_this_balance { - gas: gas, coins: 0, asset_id: ETH_ID + gas: gas, coins: 0, asset_id: NATIVE_ASSET_ID } - (ETH_ID); + (native_asset_id); assert(returned_this_balance == 0); // test Context::balance_of_contract(): let returned_contract_balance = test_contract.get_balance_of_contract { - gas: gas, coins: 0, asset_id: ETH_ID + gas: gas, coins: 0, asset_id: NATIVE_ASSET_ID } - (ETH_ID, other_contract_id); + (native_asset_id, other_contract_id); assert(returned_contract_balance == 0); // test Context::msg_value(): let returned_amount = test_contract.get_amount { - gas: gas, coins: amount, asset_id: ETH_ID + gas: gas, coins: amount, asset_id: NATIVE_ASSET_ID } (); assert(returned_amount == amount); // test Context::msg_asset_id(): let returned_asset_id = test_contract.get_asset_id { - gas: gas, coins: amount, asset_id: ETH_ID + gas: gas, coins: amount, asset_id: NATIVE_ASSET_ID } (); - assert(returned_asset_id.into() == ETH_ID); + assert(returned_asset_id.into() == NATIVE_ASSET_ID); // test Context::msg_gas(): // @todo expect the correct gas here... this should fail using `1000` let gas = test_contract.get_gas { - gas: gas, coins: amount, asset_id: ETH_ID + gas: gas, coins: amount, asset_id: NATIVE_ASSET_ID } (); assert(gas == 1000); @@ -59,7 +60,7 @@ fn main() -> bool { // test Context::global_gas(): // @todo expect the correct gas here... this should fail using `1000` let global_gas = test_contract.get_global_gas { - gas: gas, coins: amount, asset_id: ETH_ID + gas: gas, coins: amount, asset_id: NATIVE_ASSET_ID } (); assert(global_gas == 1000); diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/token_ops_test/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/token_ops_test/Forc.lock index 47e34dc383a..baefe35fd81 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/token_ops_test/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/token_ops_test/Forc.lock @@ -1,20 +1,20 @@ [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' +source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44' dependencies = [] [[package]] name = 'std' -source = 'git+https://github.com/FuelLabs/sway-lib-std?reference=master#afb030ee9a5f7125a1b1a477acb5bf74bb99c1fd' -dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] +source = 'git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549' +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44'] [[package]] name = 'test_fuel_coin_abi' -dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?reference=master#afb030ee9a5f7125a1b1a477acb5bf74bb99c1fd'] +dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549'] [[package]] name = 'token_ops_test' dependencies = [ - 'std git+https://github.com/FuelLabs/sway-lib-std?reference=master#afb030ee9a5f7125a1b1a477acb5bf74bb99c1fd', + 'std git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549', 'test_fuel_coin_abi', ] diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/token_ops_test/src/main.sw b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/token_ops_test/src/main.sw index c638756dfe0..9365b6e062c 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/token_ops_test/src/main.sw +++ b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/token_ops_test/src/main.sw @@ -26,7 +26,7 @@ fn main() -> bool { // todo: use correct type ContractId let fuel_coin = abi(TestFuelCoin, 0xff95564b8f788b6a2a884813eadfff2dbfe008a881008e7b298ce14208a73864); - let mut fuelcoin_balance = balance_of_contract(fuelcoin_id.value, fuelcoin_id); + let mut fuelcoin_balance = balance_of_contract(fuelcoin_id, fuelcoin_id); assert(fuelcoin_balance == 0); fuel_coin.mint { @@ -35,7 +35,7 @@ fn main() -> bool { (11); // check that the mint was successful - fuelcoin_balance = balance_of_contract(fuelcoin_id.value, fuelcoin_id); + fuelcoin_balance = balance_of_contract(fuelcoin_id, fuelcoin_id); assert(fuelcoin_balance == 11); fuel_coin.burn { @@ -44,7 +44,7 @@ fn main() -> bool { (7); // check that the burn was successful - fuelcoin_balance = balance_of_contract(fuelcoin_id.value, fuelcoin_id); + fuelcoin_balance = balance_of_contract(fuelcoin_id, fuelcoin_id); assert(fuelcoin_balance == 4); // force transfer coins @@ -54,8 +54,8 @@ fn main() -> bool { (3, fuelcoin_id, balance_test_id); // check that the transfer was successful - fuelcoin_balance = balance_of_contract(fuelcoin_id.value, fuelcoin_id); - let balance_test_contract_balance = balance_of_contract(fuelcoin_id.value, balance_test_id); + fuelcoin_balance = balance_of_contract(fuelcoin_id, fuelcoin_id); + let balance_test_contract_balance = balance_of_contract(fuelcoin_id, balance_test_id); assert(fuelcoin_balance == 1); assert(balance_test_contract_balance == 3); diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/address_test/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/address_test/Forc.lock index f628c1b6db0..8b33ed5dbd7 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/address_test/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/address_test/Forc.lock @@ -1,13 +1,13 @@ [[package]] name = 'address_test' -dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?reference=master#247270e7d8911e754a989b2fe280c462605ae2f6'] +dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549'] [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' +source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44' dependencies = [] [[package]] name = 'std' -source = 'git+https://github.com/FuelLabs/sway-lib-std?reference=master#247270e7d8911e754a989b2fe280c462605ae2f6' -dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] +source = 'git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549' +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44'] diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/assert_test/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/assert_test/Forc.lock index cc0d3747403..8f7502bc017 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/assert_test/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/assert_test/Forc.lock @@ -1,13 +1,13 @@ [[package]] name = 'assert_test' -dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?reference=master#247270e7d8911e754a989b2fe280c462605ae2f6'] +dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549'] [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' +source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44' dependencies = [] [[package]] name = 'std' -source = 'git+https://github.com/FuelLabs/sway-lib-std?reference=master#247270e7d8911e754a989b2fe280c462605ae2f6' -dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] +source = 'git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549' +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44'] diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/b512_struct_alignment/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/b512_struct_alignment/Forc.lock index 2510ff734e7..4a730b1af40 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/b512_struct_alignment/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/b512_struct_alignment/Forc.lock @@ -1,13 +1,13 @@ [[package]] name = 'b512_panic_test' -dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?reference=master#afb030ee9a5f7125a1b1a477acb5bf74bb99c1fd'] +dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549'] [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' +source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44' dependencies = [] [[package]] name = 'std' -source = 'git+https://github.com/FuelLabs/sway-lib-std?reference=master#afb030ee9a5f7125a1b1a477acb5bf74bb99c1fd' -dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] +source = 'git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549' +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44'] diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/b512_test/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/b512_test/Forc.lock index 78a497f362e..593c2d460ac 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/b512_test/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/b512_test/Forc.lock @@ -1,13 +1,13 @@ [[package]] name = 'b512_test' -dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?reference=master#afb030ee9a5f7125a1b1a477acb5bf74bb99c1fd'] +dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549'] [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' +source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44' dependencies = [] [[package]] name = 'std' -source = 'git+https://github.com/FuelLabs/sway-lib-std?reference=master#afb030ee9a5f7125a1b1a477acb5bf74bb99c1fd' -dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] +source = 'git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549' +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44'] diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/block_height/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/block_height/Forc.lock index 61ef8d33dc6..78765181df5 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/block_height/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/block_height/Forc.lock @@ -1,13 +1,13 @@ [[package]] name = 'block_height' -dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?reference=master#247270e7d8911e754a989b2fe280c462605ae2f6'] +dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549'] [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' +source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44' dependencies = [] [[package]] name = 'std' -source = 'git+https://github.com/FuelLabs/sway-lib-std?reference=master#247270e7d8911e754a989b2fe280c462605ae2f6' -dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] +source = 'git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549' +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44'] diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/ec_recover_test/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/ec_recover_test/Forc.lock index ab7b68d9dd8..2226dddff27 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/ec_recover_test/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_pass/stdlib/ec_recover_test/Forc.lock @@ -1,13 +1,13 @@ [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' +source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44' dependencies = [] [[package]] name = 'ec_recover_test' -dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?reference=master#247270e7d8911e754a989b2fe280c462605ae2f6'] +dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549'] [[package]] name = 'std' -source = 'git+https://github.com/FuelLabs/sway-lib-std?reference=master#247270e7d8911e754a989b2fe280c462605ae2f6' -dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] +source = 'git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549' +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44'] diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/test_abis/context_testing_abi/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_pass/test_abis/context_testing_abi/Forc.lock index 12a17eb8c84..c34eaad838b 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/test_abis/context_testing_abi/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_pass/test_abis/context_testing_abi/Forc.lock @@ -1,13 +1,13 @@ [[package]] name = 'context_testing_abi' -dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?reference=master#247270e7d8911e754a989b2fe280c462605ae2f6'] +dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549'] [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' +source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44' dependencies = [] [[package]] name = 'std' -source = 'git+https://github.com/FuelLabs/sway-lib-std?reference=master#247270e7d8911e754a989b2fe280c462605ae2f6' -dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] +source = 'git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549' +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44'] diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/test_abis/context_testing_abi/src/main.sw b/test/src/e2e_vm_tests/test_programs/should_pass/test_abis/context_testing_abi/src/main.sw index 060e8a8a8ca..6d519194f80 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/test_abis/context_testing_abi/src/main.sw +++ b/test/src/e2e_vm_tests/test_programs/should_pass/test_abis/context_testing_abi/src/main.sw @@ -3,8 +3,8 @@ use std::contract_id::ContractId; abi ContextTesting { fn get_id() -> ContractId; - fn get_this_balance(asset_id: b256) -> u64; - fn get_balance_of_contract(asset_id: b256, contract_id: ContractId) -> u64; + fn get_this_balance(asset_id: ContractId) -> u64; + fn get_balance_of_contract(asset_id: ContractId, contract_id: ContractId) -> u64; fn get_amount() -> u64; fn get_asset_id() -> ContractId; fn get_gas() -> u64; diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/test_abis/test_fuel_coin_abi/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_pass/test_abis/test_fuel_coin_abi/Forc.lock index 60b3b91e3dd..b47cdef25c1 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/test_abis/test_fuel_coin_abi/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_pass/test_abis/test_fuel_coin_abi/Forc.lock @@ -1,13 +1,13 @@ [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' +source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44' dependencies = [] [[package]] name = 'std' -source = 'git+https://github.com/FuelLabs/sway-lib-std?reference=master#afb030ee9a5f7125a1b1a477acb5bf74bb99c1fd' -dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] +source = 'git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549' +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44'] [[package]] name = 'test_fuel_coin_abi' -dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?reference=master#afb030ee9a5f7125a1b1a477acb5bf74bb99c1fd'] +dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549'] diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/auth_testing_contract/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/auth_testing_contract/Forc.lock index c936cbe1b73..366643f5ced 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/auth_testing_contract/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/auth_testing_contract/Forc.lock @@ -6,15 +6,15 @@ dependencies = [] name = 'auth_testing_contract' dependencies = [ 'auth_testing_abi', - 'std git+https://github.com/FuelLabs/sway-lib-std?reference=master#247270e7d8911e754a989b2fe280c462605ae2f6', + 'std git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549', ] [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' +source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44' dependencies = [] [[package]] name = 'std' -source = 'git+https://github.com/FuelLabs/sway-lib-std?reference=master#247270e7d8911e754a989b2fe280c462605ae2f6' -dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] +source = 'git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549' +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44'] diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/balance_test_contract/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/balance_test_contract/Forc.lock index cfd3dded0f9..0cea475923c 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/balance_test_contract/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/balance_test_contract/Forc.lock @@ -6,15 +6,15 @@ dependencies = [] name = 'balance_test_contract' dependencies = [ 'balance_test_abi', - 'std git+https://github.com/FuelLabs/sway-lib-std?reference=master#247270e7d8911e754a989b2fe280c462605ae2f6', + 'std git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549', ] [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' +source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44' dependencies = [] [[package]] name = 'std' -source = 'git+https://github.com/FuelLabs/sway-lib-std?reference=master#247270e7d8911e754a989b2fe280c462605ae2f6' -dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] +source = 'git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549' +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44'] diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/basic_storage/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/basic_storage/Forc.lock index 51d160d82b6..ca4d91b09c5 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/basic_storage/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/basic_storage/Forc.lock @@ -2,7 +2,7 @@ name = 'basic_storage' dependencies = [ 'basic_storage_abi', - 'std git+https://github.com/FuelLabs/sway-lib-std?reference=master#247270e7d8911e754a989b2fe280c462605ae2f6', + 'std git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549', ] [[package]] @@ -11,10 +11,10 @@ dependencies = [] [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' +source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44' dependencies = [] [[package]] name = 'std' -source = 'git+https://github.com/FuelLabs/sway-lib-std?reference=master#247270e7d8911e754a989b2fe280c462605ae2f6' -dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] +source = 'git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549' +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44'] diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/context_testing_contract/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/context_testing_contract/Forc.lock index 1bb9b8dc72a..a94b81fda3c 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/context_testing_contract/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/context_testing_contract/Forc.lock @@ -1,20 +1,20 @@ [[package]] name = 'context_testing_abi' -dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?reference=master#247270e7d8911e754a989b2fe280c462605ae2f6'] +dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549'] [[package]] name = 'context_testing_contract' dependencies = [ 'context_testing_abi', - 'std git+https://github.com/FuelLabs/sway-lib-std?reference=master#247270e7d8911e754a989b2fe280c462605ae2f6', + 'std git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549', ] [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' +source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44' dependencies = [] [[package]] name = 'std' -source = 'git+https://github.com/FuelLabs/sway-lib-std?reference=master#247270e7d8911e754a989b2fe280c462605ae2f6' -dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] +source = 'git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549' +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44'] diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/context_testing_contract/src/main.sw b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/context_testing_contract/src/main.sw index 3ecd92d6abd..4d3a74ab035 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/context_testing_contract/src/main.sw +++ b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/context_testing_contract/src/main.sw @@ -1,6 +1,6 @@ contract; -use std::{context::*, contract_id::ContractId}; +use std::{context::{*, call_frames::*}, contract_id::ContractId}; use context_testing_abi::*; impl ContextTesting for Contract { @@ -8,11 +8,11 @@ impl ContextTesting for Contract { contract_id() } - fn get_this_balance(asset_id: b256) -> u64 { + fn get_this_balance(asset_id: ContractId) -> u64 { this_balance(asset_id) } - fn get_balance_of_contract(asset_id: b256, cid: ContractId) -> u64 { + fn get_balance_of_contract(asset_id: ContractId, cid: ContractId) -> u64 { balance_of_contract(asset_id, cid) } diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/test_fuel_coin_contract/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/test_fuel_coin_contract/Forc.lock index 3a6d2fb5480..41dd8768f3f 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/test_fuel_coin_contract/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/test_fuel_coin_contract/Forc.lock @@ -1,20 +1,20 @@ [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' +source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44' dependencies = [] [[package]] name = 'std' -source = 'git+https://github.com/FuelLabs/sway-lib-std?reference=master#afb030ee9a5f7125a1b1a477acb5bf74bb99c1fd' -dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] +source = 'git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549' +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44'] [[package]] name = 'test_fuel_coin_abi' -dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?reference=master#afb030ee9a5f7125a1b1a477acb5bf74bb99c1fd'] +dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549'] [[package]] name = 'test_fuel_coin_contract' dependencies = [ - 'std git+https://github.com/FuelLabs/sway-lib-std?reference=master#afb030ee9a5f7125a1b1a477acb5bf74bb99c1fd', + 'std git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549', 'test_fuel_coin_abi', ]