diff --git a/examples/counter/Forc.lock b/examples/counter/Forc.lock index dd7c5210b34..5974af9d4b1 100644 --- a/examples/counter/Forc.lock +++ b/examples/counter/Forc.lock @@ -1,13 +1,13 @@ [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44' +source = 'git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f' dependencies = [] [[package]] name = 'counter' -dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?reference=master#aa36aea9362575c769781e7ab640d1d75dce13c8'] +dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3'] [[package]] name = 'std' -source = 'git+https://github.com/FuelLabs/sway-lib-std?reference=master#aa36aea9362575c769781e7ab640d1d75dce13c8' -dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44'] +source = 'git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3' +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f'] diff --git a/examples/fizzbuzz/Forc.lock b/examples/fizzbuzz/Forc.lock index f044511a9fb..7f1b6ac075c 100644 --- a/examples/fizzbuzz/Forc.lock +++ b/examples/fizzbuzz/Forc.lock @@ -1,13 +1,13 @@ [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44' +source = 'git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f' dependencies = [] [[package]] name = 'fizzbuzz' -dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?reference=master#aa36aea9362575c769781e7ab640d1d75dce13c8'] +dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3'] [[package]] name = 'std' -source = 'git+https://github.com/FuelLabs/sway-lib-std?reference=master#aa36aea9362575c769781e7ab640d1d75dce13c8' -dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44'] +source = 'git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3' +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f'] diff --git a/examples/hello_world/Forc.lock b/examples/hello_world/Forc.lock index 91d5af607dc..67f21087f47 100644 --- a/examples/hello_world/Forc.lock +++ b/examples/hello_world/Forc.lock @@ -1,13 +1,13 @@ [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44' +source = 'git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f' dependencies = [] [[package]] name = 'hello_world' -dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?reference=master#aa36aea9362575c769781e7ab640d1d75dce13c8'] +dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3'] [[package]] name = 'std' -source = 'git+https://github.com/FuelLabs/sway-lib-std?reference=master#aa36aea9362575c769781e7ab640d1d75dce13c8' -dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44'] +source = 'git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3' +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f'] diff --git a/examples/subcurrency/Forc.lock b/examples/subcurrency/Forc.lock index 5b87ebb0759..2a071b4dd4c 100644 --- a/examples/subcurrency/Forc.lock +++ b/examples/subcurrency/Forc.lock @@ -1,13 +1,13 @@ [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44' +source = 'git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f' dependencies = [] [[package]] name = 'std' -source = 'git+https://github.com/FuelLabs/sway-lib-std?reference=master#aa36aea9362575c769781e7ab640d1d75dce13c8' -dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44'] +source = 'git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3' +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f'] [[package]] name = 'subcurrency' -dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?reference=master#aa36aea9362575c769781e7ab640d1d75dce13c8'] +dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3'] diff --git a/examples/subcurrency/src/main.sw b/examples/subcurrency/src/main.sw index 16bb677f1a4..709bde2acf9 100644 --- a/examples/subcurrency/src/main.sw +++ b/examples/subcurrency/src/main.sw @@ -3,6 +3,7 @@ contract; use std::chain::*; use std::hash::*; +use std::panic::panic; use std::storage::*; use std::address::Address; diff --git a/examples/wallet_smart_contract/Forc.lock b/examples/wallet_smart_contract/Forc.lock index f72e6e89866..1fb4460fc3f 100644 --- a/examples/wallet_smart_contract/Forc.lock +++ b/examples/wallet_smart_contract/Forc.lock @@ -1,13 +1,13 @@ [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44' +source = 'git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f' dependencies = [] [[package]] name = 'std' -source = 'git+https://github.com/FuelLabs/sway-lib-std?reference=master#aa36aea9362575c769781e7ab640d1d75dce13c8' -dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44'] +source = 'git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3' +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f'] [[package]] name = 'wallet_smart_contract' -dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?reference=master#aa36aea9362575c769781e7ab640d1d75dce13c8'] +dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3'] diff --git a/forc-pkg/src/manifest.rs b/forc-pkg/src/manifest.rs index 5ceb3ee4a92..f9bd82055a3 100644 --- a/forc-pkg/src/manifest.rs +++ b/forc-pkg/src/manifest.rs @@ -55,6 +55,7 @@ pub struct DependencyDetails { pub(crate) branch: Option, pub(crate) tag: Option, pub(crate) package: Option, + pub(crate) rev: Option, } impl Dependency { diff --git a/forc-pkg/src/pkg.rs b/forc-pkg/src/pkg.rs index 5d610ce2bf3..ef2dcf6fa1e 100644 --- a/forc-pkg/src/pkg.rs +++ b/forc-pkg/src/pkg.rs @@ -2,7 +2,7 @@ use crate::{ lock::Lock, manifest::{Dependency, Manifest}, }; -use anyhow::{anyhow, bail, Result}; +use anyhow::{anyhow, bail, Context, Result}; use forc_util::{ find_file_name, git_checkouts_directory, kebab_to_snake_case, print_on_failure, print_on_success, print_on_success_library, println_yellow_err, @@ -80,7 +80,19 @@ pub struct SourceGit { /// The URL at which the repository is located. pub repo: Url, /// A git reference, e.g. a branch or tag. - pub reference: String, + pub reference: GitReference, +} + +/// Used to distinguish between types of git references. +/// +/// For the most part, `GitReference` is useful to refine the `refspecs` used to fetch remote +/// repositories. +#[derive(Clone, Debug, Eq, Hash, Ord, PartialEq, PartialOrd, Deserialize, Serialize)] +pub enum GitReference { + Branch(String), + Tag(String), + Rev(String), + DefaultBranch, } /// A package from the official registry. @@ -284,6 +296,56 @@ impl BuildPlan { } } +impl GitReference { + /// Resolves the parsed forc git reference to the associated git ID. + pub fn resolve(&self, repo: &git2::Repository) -> Result { + // Find the commit associated with this tag. + fn resolve_tag(repo: &git2::Repository, tag: &str) -> Result { + let refname = format!("refs/remotes/origin/tags/{}", tag); + let id = repo.refname_to_id(&refname)?; + let obj = repo.find_object(id, None)?; + let obj = obj.peel(git2::ObjectType::Commit)?; + Ok(obj.id()) + } + + // Resolve to the target for the given branch. + fn resolve_branch(repo: &git2::Repository, branch: &str) -> Result { + let name = format!("origin/{}", branch); + let b = repo + .find_branch(&name, git2::BranchType::Remote) + .with_context(|| format!("failed to find branch `{}`", branch))?; + b.get() + .target() + .ok_or_else(|| anyhow::format_err!("branch `{}` did not have a target", branch)) + } + + // Use the HEAD commit when default branch is specified. + fn resolve_default_branch(repo: &git2::Repository) -> Result { + let head_id = repo.refname_to_id("refs/remotes/origin/HEAD")?; + let head = repo.find_object(head_id, None)?; + Ok(head.peel(git2::ObjectType::Commit)?.id()) + } + + // Find the commit for the given revision. + fn resolve_rev(repo: &git2::Repository, rev: &str) -> Result { + let obj = repo.revparse_single(rev)?; + match obj.as_tag() { + Some(tag) => Ok(tag.target_id()), + None => Ok(obj.id()), + } + } + + match self { + GitReference::Tag(s) => { + resolve_tag(repo, s).with_context(|| format!("failed to find tag `{}`", s)) + } + GitReference::Branch(s) => resolve_branch(repo, s), + GitReference::DefaultBranch => resolve_default_branch(repo), + GitReference::Rev(s) => resolve_rev(repo, s), + } + } +} + impl Pinned { /// Retrieve the unique ID for the pinned package. /// @@ -317,18 +379,30 @@ impl PinnedId { impl ToString for SourceGitPinned { fn to_string(&self) -> String { - // git+?reference=# + // git+?=# + let reference = self.source.reference.to_string(); format!( - "git+{}?reference={}#{}", - self.source.repo, self.source.reference, self.commit_hash, + "git+{}?{}#{}", + self.source.repo, reference, self.commit_hash ) } } +impl ToString for GitReference { + fn to_string(&self) -> String { + match self { + GitReference::Branch(ref s) => format!("branch={}", s), + GitReference::Tag(ref s) => format!("tag={}", s), + GitReference::Rev(ref _s) => "rev".to_string(), + GitReference::DefaultBranch => "default-branch".to_string(), + } + } +} + impl FromStr for SourceGitPinned { type Err = SourceGitPinnedParseError; fn from_str(s: &str) -> Result { - // git+?reference=# + // git+?# let s = s.trim(); // Check for "git+" at the start. @@ -343,25 +417,33 @@ impl FromStr for SourceGitPinned { let repo = Url::parse(repo_str).map_err(|_| SourceGitPinnedParseError::Url)?; let s = &s[repo_str.len() + "?".len()..]; - // Parse the "reference=" string. - // TODO: This will need updating if we want to support omitting a git reference and allow - // for specifying commit hashes directly in `Forc.toml` git dependencies. - const REFERENCE: &str = "reference="; - if s.find(REFERENCE) != Some(0) { - return Err(SourceGitPinnedParseError::Reference); - } - let s = &s[REFERENCE.len()..]; - - // And now retrieve the `reference` and `commit_hash` values. + // Parse the git reference and commit hash. This can be any of either: + // - `branch=#` + // - `tag=#` + // - `rev#` + // - `default#` let mut s_iter = s.split('#'); - let reference = s_iter - .next() - .ok_or(SourceGitPinnedParseError::Reference)? - .to_string(); + let reference = s_iter.next().ok_or(SourceGitPinnedParseError::Reference)?; let commit_hash = s_iter .next() .ok_or(SourceGitPinnedParseError::CommitHash)? .to_string(); + validate_git_commit_hash(&commit_hash) + .map_err(|_| SourceGitPinnedParseError::CommitHash)?; + + const BRANCH: &str = "branch="; + const TAG: &str = "tag="; + let reference = if reference.find(BRANCH) == Some(0) { + GitReference::Branch(reference[BRANCH.len()..].to_string()) + } else if reference.find(TAG) == Some(0) { + GitReference::Tag(reference[TAG.len()..].to_string()) + } else if reference == "rev" { + GitReference::Rev(commit_hash.to_string()) + } else if reference == "default-branch" { + GitReference::DefaultBranch + } else { + return Err(SourceGitPinnedParseError::Reference); + }; let source = SourceGit { repo, reference }; Ok(Self { @@ -371,6 +453,27 @@ impl FromStr for SourceGitPinned { } } +fn validate_git_commit_hash(commit_hash: &str) -> Result<()> { + const LEN: usize = 40; + if commit_hash.len() != LEN { + bail!( + "invalid hash length: expected {}, found {}", + LEN, + commit_hash.len() + ); + } + if !commit_hash.chars().all(|c| c.is_ascii_alphanumeric()) { + bail!("hash contains one or more non-ascii-alphanumeric characters"); + } + Ok(()) +} + +impl Default for GitReference { + fn default() -> Self { + Self::DefaultBranch + } +} + /// The `pkg::Graph` is of *a -> b* where *a* depends on *b*. We can determine compilation order by /// performing a toposort of the graph with reversed weights. The resulting order ensures all /// dependencies are always compiled before their dependents. @@ -593,36 +696,70 @@ fn tmp_git_repo_dir(fetch_id: u64, name: &str, repo: &Url) -> PathBuf { git_checkouts_directory().join("tmp").join(repo_dir_name) } -/// Clones the package git repo into a temporary directory and applies the given function. -fn with_tmp_git_repo(fetch_id: u64, name: &str, source: &Url, f: F) -> Result +/// Given a git reference, build a list of `refspecs` required for the fetch opration. +/// +/// Also returns whether or not our reference implies we require fetching tags. +fn git_ref_to_refspecs(reference: &GitReference) -> (Vec, bool) { + let mut refspecs = vec![]; + let mut tags = false; + match reference { + GitReference::Branch(s) => { + refspecs.push(format!("+refs/heads/{0}:refs/remotes/origin/{0}", s)); + } + GitReference::Tag(s) => { + refspecs.push(format!("+refs/tags/{0}:refs/remotes/origin/tags/{0}", s)); + } + GitReference::Rev(s) => { + if s.starts_with("refs/") { + refspecs.push(format!("+{0}:{0}", s)); + } else { + // We can't fetch the commit directly, so we fetch all branches and tags in order + // to find it. + refspecs.push("+refs/heads/*:refs/remotes/origin/*".to_string()); + refspecs.push("+HEAD:refs/remotes/origin/HEAD".to_string()); + tags = true; + } + } + GitReference::DefaultBranch => { + refspecs.push("+HEAD:refs/remotes/origin/HEAD".to_string()); + } + } + (refspecs, tags) +} + +/// Initializes a temporary git repo for the package and fetches only the reference associated with +/// the given source. +fn with_tmp_git_repo(fetch_id: u64, name: &str, source: &SourceGit, f: F) -> Result where F: FnOnce(git2::Repository) -> Result, { // Clear existing temporary directory if it exists. - let repo_dir = tmp_git_repo_dir(fetch_id, name, source); + let repo_dir = tmp_git_repo_dir(fetch_id, name, &source.repo); if repo_dir.exists() { let _ = std::fs::remove_dir_all(&repo_dir); } - // Clone repo into temporary directory. - let repo_url_string = format!("{}", source); - let repo = git2::Repository::clone(&repo_url_string, &repo_dir).map_err(|e| { - anyhow!( - "failed to clone package '{}' from '{}': {}", - name, - source, - e - ) - })?; + // Initialise the repository. + let repo = git2::Repository::init(&repo_dir) + .map_err(|e| anyhow!("failed to init repo at \"{}\": {}", repo_dir.display(), e))?; - // Do something with the repo. - let output = f(repo)?; + // Fetch the necessary references. + let (refspecs, tags) = git_ref_to_refspecs(&source.reference); - // Clean up the temporary directory. - if repo_dir.exists() { - let _ = std::fs::remove_dir_all(&repo_dir); + // Fetch the refspecs. + let mut fetch_opts = git2::FetchOptions::new(); + if tags { + fetch_opts.download_tags(git2::AutotagOption::All); } + repo.remote_anonymous(source.repo.as_str())? + .fetch(&refspecs, Some(&mut fetch_opts), None) + .with_context(|| format!("failed to fetch `{}`", &source.repo))?; + // Call the user function. + let output = f(repo)?; + + // Clean up the temporary directory. + let _ = std::fs::remove_dir_all(&repo_dir); Ok(output) } @@ -631,29 +768,13 @@ where /// This clones the repository to a temporary directory in order to determine the commit at the /// HEAD of the given git reference. fn pin_git(fetch_id: u64, name: &str, source: SourceGit) -> Result { - let commit_hash = with_tmp_git_repo(fetch_id, name, &source.repo, |repo| { - // Find specified reference in repo. - let reference = repo - .resolve_reference_from_short_name(&source.reference) - .map_err(|e| { - anyhow!( - "failed to find git ref '{}' for package '{}': {}", - source.reference, - name, - e - ) - })?; - - // Follow the reference until we find the latest commit and retrieve its hash. - let commit = reference.peel_to_commit().map_err(|e| { - anyhow!( - "failed to obtain commit for ref '{}' of package '{}': {}", - source.reference, - name, - e - ) - })?; - Ok(format!("{}", commit.id())) + let commit_hash = with_tmp_git_repo(fetch_id, name, &source, |repo| { + // Resolve the reference to the commit ID. + let commit_id = source + .reference + .resolve(&repo) + .with_context(|| "failed to resolve reference".to_string())?; + Ok(format!("{}", commit_id)) })?; Ok(SourceGitPinned { source, @@ -726,7 +847,7 @@ fn fetch_git(fetch_id: u64, name: &str, pinned: &SourceGitPinned) -> Result Result { ver_str ) } - Dependency::Detailed(ref det) => { - match (&det.path, &det.version, &det.git, &det.branch, &det.tag) { - (Some(relative_path), _, _, _, _) => { - let path = pkg_path.join(relative_path); - Source::Path(path) - } - (_, _, Some(repo), branch, tag) => { - let reference = match (branch, tag) { - (Some(branch), None) => branch.clone(), - (None, Some(tag)) => tag.clone(), - // TODO: Consider "main" or having no default at all. - _ => "master".to_string(), - }; - let repo = Url::parse(repo)?; - let source = SourceGit { repo, reference }; - Source::Git(source) - } - _ => { - bail!("unsupported set of arguments for dependency: {:?}", dep); - } + Dependency::Detailed(ref det) => match (&det.path, &det.version, &det.git) { + (Some(relative_path), _, _) => { + let path = pkg_path.join(relative_path); + Source::Path(path) } - } + (_, _, Some(repo)) => { + let reference = match (&det.branch, &det.tag, &det.rev) { + (Some(branch), None, None) => GitReference::Branch(branch.clone()), + (None, Some(tag), None) => GitReference::Tag(tag.clone()), + (None, None, Some(rev)) => GitReference::Rev(rev.clone()), + (None, None, None) => GitReference::DefaultBranch, + _ => bail!( + "git dependencies support at most one reference: \ + either `branch`, `tag` or `rev`" + ), + }; + let repo = Url::parse(repo)?; + let source = SourceGit { repo, reference }; + Source::Git(source) + } + _ => { + bail!("unsupported set of fields for dependency: {:?}", dep); + } + }, }; Ok(source) } @@ -961,33 +1084,51 @@ fn generate_json_abi(ast: &TypedParseTree) -> JsonABI { #[test] fn test_source_git_pinned_parsing() { let strings = [ - "git+https://github.com/foo/bar?reference=baz#64092602dd6158f3e41d775ed889389440a2cd86", - "git+https://github.com/fuellabs/sway-lib-std?reference=v0.1.0#0000000000000000000000000000000000000000", - "git+https://github.com/fuellabs/sway-lib-core?reference=v0.0.1#0000000000000000000000000000000000000000", + "git+https://github.com/foo/bar?branch=baz#64092602dd6158f3e41d775ed889389440a2cd86", + "git+https://github.com/fuellabs/sway-lib-std?tag=v0.1.0#0000000000000000000000000000000000000000", + "git+https://github.com/fuellabs/sway-lib-core?tag=v0.0.1#0000000000000000000000000000000000000000", + "git+https://some-git-host.com/owner/repo?rev#FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF", + "git+https://some-git-host.com/owner/repo?default-branch#AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", ]; let expected = [ SourceGitPinned { source: SourceGit { repo: Url::parse("https://github.com/foo/bar").unwrap(), - reference: "baz".to_string(), + reference: GitReference::Branch("baz".to_string()), }, commit_hash: "64092602dd6158f3e41d775ed889389440a2cd86".to_string(), }, SourceGitPinned { source: SourceGit { repo: Url::parse("https://github.com/fuellabs/sway-lib-std").unwrap(), - reference: "v0.1.0".to_string(), + reference: GitReference::Tag("v0.1.0".to_string()), }, commit_hash: "0000000000000000000000000000000000000000".to_string(), }, SourceGitPinned { source: SourceGit { repo: Url::parse("https://github.com/fuellabs/sway-lib-core").unwrap(), - reference: "v0.0.1".to_string(), + reference: GitReference::Tag("v0.0.1".to_string()), }, commit_hash: "0000000000000000000000000000000000000000".to_string(), }, + SourceGitPinned { + source: SourceGit { + repo: Url::parse("https://some-git-host.com/owner/repo").unwrap(), + reference: GitReference::Rev( + "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF".to_string(), + ), + }, + commit_hash: "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF".to_string(), + }, + SourceGitPinned { + source: SourceGit { + repo: Url::parse("https://some-git-host.com/owner/repo").unwrap(), + reference: GitReference::DefaultBranch, + }, + commit_hash: "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA".to_string(), + }, ]; for (&string, expected) in strings.iter().zip(&expected) { diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/abort_control_flow/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_fail/abort_control_flow/Forc.lock index 3d0ecd9827c..56a7c587cc8 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/abort_control_flow/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_fail/abort_control_flow/Forc.lock @@ -1,13 +1,13 @@ [[package]] name = 'abort_control_flow' -dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?reference=master#aa36aea9362575c769781e7ab640d1d75dce13c8'] +dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3'] [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44' +source = 'git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f' dependencies = [] [[package]] name = 'std' -source = 'git+https://github.com/FuelLabs/sway-lib-std?reference=master#aa36aea9362575c769781e7ab640d1d75dce13c8' -dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44'] +source = 'git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3' +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f'] diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/enum_if_let_invalid_variable/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_fail/enum_if_let_invalid_variable/Forc.lock index febe03562ce..43d928c4d88 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/enum_if_let_invalid_variable/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_fail/enum_if_let_invalid_variable/Forc.lock @@ -1,8 +1,8 @@ [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' +source = 'git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f' dependencies = [] [[package]] name = 'enum_if_let_invalid_variable' -dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f'] diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/excess_fn_arguments/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_fail/excess_fn_arguments/Forc.lock index 966fcf3b8cf..e72c8eb69b4 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/excess_fn_arguments/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_fail/excess_fn_arguments/Forc.lock @@ -1,8 +1,8 @@ [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' +source = 'git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f' dependencies = [] [[package]] name = 'excess_fn_arguments' -dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f'] diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/match_expressions_enums/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_fail/match_expressions_enums/Forc.lock index d7d97c91c23..a41b13f6908 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/match_expressions_enums/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_fail/match_expressions_enums/Forc.lock @@ -1,8 +1,8 @@ [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' +source = 'git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f' dependencies = [] [[package]] name = 'match_expressions_enums' -dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f'] 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 affa9fb7712..f2d97690378 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,8 +1,8 @@ [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f' +source = 'git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f' dependencies = [] [[package]] name = 'match_expressions_non_exhaustive' -dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f'] +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f'] diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/match_expressions_wrong_struct/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_fail/match_expressions_wrong_struct/Forc.lock index e1ee61e3412..ae6c42ebadc 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/match_expressions_wrong_struct/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_fail/match_expressions_wrong_struct/Forc.lock @@ -1,8 +1,8 @@ [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' +source = 'git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f' dependencies = [] [[package]] name = 'match_expressions_wrong_struct' -dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f'] diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/missing_fn_arguments/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_fail/missing_fn_arguments/Forc.lock index cf7de9f47ed..690e03701fc 100644 --- a/test/src/e2e_vm_tests/test_programs/should_fail/missing_fn_arguments/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_fail/missing_fn_arguments/Forc.lock @@ -1,8 +1,8 @@ [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' +source = 'git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f' dependencies = [] [[package]] name = 'missing_fn_arguments' -dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f'] 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 index bf4e47f2db1..f90d1a247ab 100644 --- 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 @@ -1,13 +1,13 @@ [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44' +source = 'git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f' dependencies = [] [[package]] name = 'dependency_package_field' -dependencies = ['(std-alt) std git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549'] +dependencies = ['(std-alt) std git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3'] [[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'] +source = 'git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3' +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f'] diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/abort_control_flow/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_pass/language/abort_control_flow/Forc.lock index 3d0ecd9827c..56a7c587cc8 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/abort_control_flow/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/abort_control_flow/Forc.lock @@ -1,13 +1,13 @@ [[package]] name = 'abort_control_flow' -dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?reference=master#aa36aea9362575c769781e7ab640d1d75dce13c8'] +dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3'] [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44' +source = 'git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f' dependencies = [] [[package]] name = 'std' -source = 'git+https://github.com/FuelLabs/sway-lib-std?reference=master#aa36aea9362575c769781e7ab640d1d75dce13c8' -dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44'] +source = 'git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3' +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f'] diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/abort_control_flow/src/main.sw b/test/src/e2e_vm_tests/test_programs/should_pass/language/abort_control_flow/src/main.sw index 45f24e9f5ec..82dde0b98ab 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/abort_control_flow/src/main.sw +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/abort_control_flow/src/main.sw @@ -1,6 +1,8 @@ script; use std::chain::*; +use std::panic::panic; + enum Result { Ok: T, Err: E, 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 87ab94c8f4f..69c2e627dda 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#7b973a638d5220228be616f1f89a249846001549'] +dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3'] [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44' +source = 'git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f' dependencies = [] [[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'] +source = 'git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3' +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f'] diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/array_basics/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_pass/language/array_basics/Forc.lock index 96fb9620b66..13afe1bc0f6 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/array_basics/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/array_basics/Forc.lock @@ -1,8 +1,8 @@ [[package]] name = 'array_basics' -dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f'] [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' +source = 'git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f' dependencies = [] 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 7ee2f338001..6e3ec31e8d1 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#7b973a638d5220228be616f1f89a249846001549'] +dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3'] [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44' +source = 'git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f' dependencies = [] [[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'] +source = 'git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3' +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f'] diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/b256_bad_jumps/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_pass/language/b256_bad_jumps/Forc.lock index 93cff9857d2..59b5b171b20 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/b256_bad_jumps/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/b256_bad_jumps/Forc.lock @@ -1,8 +1,8 @@ [[package]] name = 'b256_bad_jumps' -dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f'] [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' +source = 'git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f' dependencies = [] 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 fa409414aff..3866c20083e 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#7b973a638d5220228be616f1f89a249846001549'] +dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3'] [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44' +source = 'git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f' dependencies = [] [[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'] +source = 'git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3' +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f'] diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/basic_func_decl/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_pass/language/basic_func_decl/Forc.lock index 83471a9f769..84245f96ea9 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/basic_func_decl/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/basic_func_decl/Forc.lock @@ -1,8 +1,8 @@ [[package]] name = 'basic_func_decl' -dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f'] [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' +source = 'git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f' dependencies = [] diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/const_decl/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_pass/language/const_decl/Forc.lock index 58d9e445c17..dd83a3866b7 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/const_decl/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/const_decl/Forc.lock @@ -1,8 +1,8 @@ [[package]] name = 'const_decl' -dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f'] [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' +source = 'git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f' dependencies = [] diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/const_decl_in_library/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_pass/language/const_decl_in_library/Forc.lock index d8bb946ac9c..f678e764166 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/const_decl_in_library/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/const_decl_in_library/Forc.lock @@ -1,8 +1,8 @@ [[package]] name = 'const_decl_in_library' -dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f'] [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' +source = 'git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f' dependencies = [] 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 a8f06686b16..c2e2ba07122 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#30274cf817c1848e28f984c2e8703eb25e7a3a44' +source = 'git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f' dependencies = [] [[package]] name = 'empty_method_initializer' -dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549'] +dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3'] [[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'] +source = 'git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3' +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f'] diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_destructuring/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_destructuring/Forc.lock index f6e7ba5f3a5..4e3a883e6d9 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_destructuring/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_destructuring/Forc.lock @@ -1,8 +1,8 @@ [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' +source = 'git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f' dependencies = [] [[package]] name = 'enum_destructuring' -dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f'] diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_if_let/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_if_let/Forc.lock index 31b6b8e41ce..707772ff164 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_if_let/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_if_let/Forc.lock @@ -1,8 +1,8 @@ [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' +source = 'git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f' dependencies = [] [[package]] name = 'enum_if_let' -dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f'] diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_if_let_large_type/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_if_let_large_type/Forc.lock index 90041b007e1..8cd02a495d7 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_if_let_large_type/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/enum_if_let_large_type/Forc.lock @@ -1,8 +1,8 @@ [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' +source = 'git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f' dependencies = [] [[package]] name = 'enum_if_let_large_type' -dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f'] 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 09004297d5e..b7e1881581b 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#30274cf817c1848e28f984c2e8703eb25e7a3a44' +source = 'git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f' dependencies = [] [[package]] name = 'enum_in_fn_decl' -dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549'] +dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3'] [[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'] +source = 'git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3' +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f'] diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/eq_4_test/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_pass/language/eq_4_test/Forc.lock index a2bcf809570..bd39cfe3ec5 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/eq_4_test/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/eq_4_test/Forc.lock @@ -1,8 +1,8 @@ [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' +source = 'git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f' dependencies = [] [[package]] name = 'eq_4_test' -dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f'] diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/fix_opcode_bug/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_pass/language/fix_opcode_bug/Forc.lock index 24d4e2bd759..bb66a952b8e 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/fix_opcode_bug/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/fix_opcode_bug/Forc.lock @@ -1,8 +1,8 @@ [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f' +source = 'git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f' dependencies = [] [[package]] name = 'fix_opcode_bug' -dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f'] +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f'] diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_enum/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_enum/Forc.lock index e9efa358aff..4a3c4986dbb 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_enum/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_enum/Forc.lock @@ -1,8 +1,8 @@ [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' +source = 'git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f' dependencies = [] [[package]] name = 'generic_enum' -dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f'] diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_impl_self/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_impl_self/Forc.lock index fada3efc6b5..f525c14f807 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_impl_self/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/generic_impl_self/Forc.lock @@ -1,8 +1,8 @@ [[package]] name = 'core' -source = 'git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' +source = 'git+http://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f' dependencies = [] [[package]] name = 'generic_impl_self' -dependencies = ['core git+http://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] +dependencies = ['core git+http://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f'] diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/if_elseif_enum/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_pass/language/if_elseif_enum/Forc.lock index 05d84d25d01..4804b480c86 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/if_elseif_enum/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/if_elseif_enum/Forc.lock @@ -1,8 +1,8 @@ [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' +source = 'git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f' dependencies = [] [[package]] name = 'if_elseif_enum' -dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f'] 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 d919b558f00..d6797c7b501 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#30274cf817c1848e28f984c2e8703eb25e7a3a44' +source = 'git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f' dependencies = [] [[package]] name = 'inline_if_expr_const' -dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549'] +dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3'] [[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'] +source = 'git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3' +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f'] diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/is_prime/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_pass/language/is_prime/Forc.lock index 7a5603311e1..442e101402d 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/is_prime/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/is_prime/Forc.lock @@ -1,13 +1,13 @@ [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f' +source = 'git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f' dependencies = [] [[package]] name = 'is_prime' -dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?reference=master#a1d77e1140d1b57ee18cc914d320dc7ffdff98fd'] +dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3'] [[package]] name = 'std' -source = 'git+https://github.com/FuelLabs/sway-lib-std?reference=master#a1d77e1140d1b57ee18cc914d320dc7ffdff98fd' -dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f'] +source = 'git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3' +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f'] diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/local_impl_for_ord/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_pass/language/local_impl_for_ord/Forc.lock index 4bd15e588df..96b6edf94de 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/local_impl_for_ord/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/local_impl_for_ord/Forc.lock @@ -1,8 +1,8 @@ [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' +source = 'git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f' dependencies = [] [[package]] name = 'local_impl_for_ord' -dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f'] diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions/Forc.lock index de59ab1a4df..1ced0c299af 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions/Forc.lock @@ -1,8 +1,8 @@ [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' +source = 'git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f' dependencies = [] [[package]] name = 'match_expressions' -dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f'] diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_structs/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_structs/Forc.lock index 7ada3785425..6bf824791e3 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_structs/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/match_expressions_structs/Forc.lock @@ -1,8 +1,8 @@ [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' +source = 'git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f' dependencies = [] [[package]] name = 'match_expressions_structs' -dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f'] 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 e9ef6aae4cd..ab76f1cfeb0 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#30274cf817c1848e28f984c2e8703eb25e7a3a44' +source = 'git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f' dependencies = [] [[package]] name = 'modulo_uint_test' -dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549'] +dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3'] [[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'] +source = 'git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3' +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f'] diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/neq_4_test/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_pass/language/neq_4_test/Forc.lock index a3c41ea32da..ff6c7208146 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/neq_4_test/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/neq_4_test/Forc.lock @@ -1,8 +1,8 @@ [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' +source = 'git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f' dependencies = [] [[package]] name = 'neq_4_test' -dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f'] 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 56d3c305f19..926437183e5 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#30274cf817c1848e28f984c2e8703eb25e7a3a44' +source = 'git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f' dependencies = [] [[package]] name = 'nested_structs' -dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549'] +dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3'] [[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'] +source = 'git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3' +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f'] 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 65ef2d53664..668cf1ec1d4 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,13 +1,13 @@ [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44' +source = 'git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f' dependencies = [] [[package]] name = 'new_alloc' -dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549'] +dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3'] [[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'] +source = 'git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3' +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f'] diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/op_precedence/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_pass/language/op_precedence/Forc.lock index 70ecac3fa68..093e8d7255e 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/op_precedence/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/op_precedence/Forc.lock @@ -1,8 +1,8 @@ [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' +source = 'git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f' dependencies = [] [[package]] name = 'unary_not_basic' -dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f'] 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 26e0a5d5a48..a3cdbdc55cc 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#30274cf817c1848e28f984c2e8703eb25e7a3a44' +source = 'git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f' dependencies = [] [[package]] name = 'size_of' -dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549'] +dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3'] [[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'] +source = 'git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3' +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f'] 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 b80913be0a0..66f090dd48a 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#30274cf817c1848e28f984c2e8703eb25e7a3a44' +source = 'git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f' dependencies = [] [[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'] +source = 'git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3' +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f'] [[package]] name = 'supertraits' -dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549'] +dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3'] diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/trait_override_bug/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_pass/language/trait_override_bug/Forc.lock index e044063ed3e..2987100a44f 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/trait_override_bug/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/trait_override_bug/Forc.lock @@ -1,8 +1,8 @@ [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' +source = 'git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f' dependencies = [] [[package]] name = 'trait_override_bug' -dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f'] diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_desugaring/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_desugaring/Forc.lock index 9fb8135a756..b9440d9a173 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_desugaring/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/tuple_desugaring/Forc.lock @@ -1,8 +1,8 @@ [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573' +source = 'git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f' dependencies = [] [[package]] name = 'tuple_desugaring' -dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#c331ed20ebc9d646acec6b8ee8f408627ce3b573'] +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f'] 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 657c753e63c..bdc4ca6de78 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#30274cf817c1848e28f984c2e8703eb25e7a3a44' +source = 'git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f' dependencies = [] [[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'] +source = 'git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3' +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f'] [[package]] name = 'tuple_in_struct' -dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549'] +dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3'] 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 abe20eecee4..72dcc5c4dc8 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#30274cf817c1848e28f984c2e8703eb25e7a3a44' +source = 'git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f' dependencies = [] [[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'] +source = 'git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3' +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f'] [[package]] name = 'unary_not_basic' -dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549'] +dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3'] 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 164affbf9f3..dd0106f1430 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#30274cf817c1848e28f984c2e8703eb25e7a3a44' +source = 'git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f' dependencies = [] [[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'] +source = 'git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3' +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f'] [[package]] name = 'unary_not_basic_2' -dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549'] +dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3'] diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/while_loops/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_pass/language/while_loops/Forc.lock index 1127bebda42..dab7f8078ba 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/language/while_loops/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/while_loops/Forc.lock @@ -1,13 +1,13 @@ [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44' +source = 'git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f' dependencies = [] [[package]] name = 'std' -source = 'git+https://github.com/FuelLabs/sway-lib-std?reference=master#aa36aea9362575c769781e7ab640d1d75dce13c8' -dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44'] +source = 'git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3' +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f'] [[package]] name = 'while_loops' -dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?reference=master#aa36aea9362575c769781e7ab640d1d75dce13c8'] +dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3'] 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 715018ef112..376bc000093 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#7b973a638d5220228be616f1f89a249846001549', + 'std git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3', ] [[package]] @@ -11,10 +11,10 @@ dependencies = [] [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44' +source = 'git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f' dependencies = [] [[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'] +source = 'git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3' +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f'] 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 1841e8d80e3..e36ab4dd1e1 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#7b973a638d5220228be616f1f89a249846001549', + 'std git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3', ] [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44' +source = 'git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f' dependencies = [] [[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'] +source = 'git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3' +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f'] diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_increment_contract/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_increment_contract/Forc.lock index b3fab31c1a2..d873d3b855c 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_increment_contract/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_increment_contract/Forc.lock @@ -2,12 +2,12 @@ name = 'call_increment_contract' dependencies = [ 'increment_abi', - 'std git+https://github.com/FuelLabs/sway-lib-std?reference=master#a1d77e1140d1b57ee18cc914d320dc7ffdff98fd', + 'std git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3', ] [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f' +source = 'git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f' dependencies = [] [[package]] @@ -16,5 +16,5 @@ dependencies = [] [[package]] name = 'std' -source = 'git+https://github.com/FuelLabs/sway-lib-std?reference=master#a1d77e1140d1b57ee18cc914d320dc7ffdff98fd' -dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f'] +source = 'git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3' +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f'] 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 fccbeb31619..a4db89e18fe 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#7b973a638d5220228be616f1f89a249846001549', + 'std git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3', ] [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44' +source = 'git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f' dependencies = [] [[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'] +source = 'git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3' +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f'] 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 977cd9acaaa..a0d162d887e 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#7b973a638d5220228be616f1f89a249846001549', + 'std git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3', ] [[package]] name = 'context_testing_abi' -dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549'] +dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3'] [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44' +source = 'git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f' dependencies = [] [[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'] +source = 'git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3' +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f'] 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 baefe35fd81..30066ec9f55 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#30274cf817c1848e28f984c2e8703eb25e7a3a44' +source = 'git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f' dependencies = [] [[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'] +source = 'git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3' +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f'] [[package]] name = 'test_fuel_coin_abi' -dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549'] +dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3'] [[package]] name = 'token_ops_test' dependencies = [ - 'std git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549', + 'std git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3', '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 9365b6e062c..a7e5c9e0fc4 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 @@ -1,7 +1,7 @@ script; // use std::constants::ETH_ID; -use std::context::balance_of_contract; +use std::context::balance_of; use std::chain::assert; use std::address::Address; use std::contract_id::ContractId; @@ -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, fuelcoin_id); + let mut fuelcoin_balance = balance_of(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, fuelcoin_id); + fuelcoin_balance = balance_of(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, fuelcoin_id); + fuelcoin_balance = balance_of(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, fuelcoin_id); - let balance_test_contract_balance = balance_of_contract(fuelcoin_id, balance_test_id); + fuelcoin_balance = balance_of(fuelcoin_id, fuelcoin_id); + let balance_test_contract_balance = balance_of(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 8b33ed5dbd7..38b0f5b52eb 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#7b973a638d5220228be616f1f89a249846001549'] +dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3'] [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44' +source = 'git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f' dependencies = [] [[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'] +source = 'git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3' +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f'] 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 8f7502bc017..ece908c2064 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#7b973a638d5220228be616f1f89a249846001549'] +dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3'] [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44' +source = 'git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f' dependencies = [] [[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'] +source = 'git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3' +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f'] 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 4a730b1af40..ae39c698c38 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#7b973a638d5220228be616f1f89a249846001549'] +dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3'] [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44' +source = 'git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f' dependencies = [] [[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'] +source = 'git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3' +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f'] 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 593c2d460ac..b95923edc63 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#7b973a638d5220228be616f1f89a249846001549'] +dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3'] [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44' +source = 'git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f' dependencies = [] [[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'] +source = 'git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3' +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f'] 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 78765181df5..12583b780cd 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#7b973a638d5220228be616f1f89a249846001549'] +dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3'] [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44' +source = 'git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f' dependencies = [] [[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'] +source = 'git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3' +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f'] 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 2226dddff27..386610409c5 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#30274cf817c1848e28f984c2e8703eb25e7a3a44' +source = 'git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f' dependencies = [] [[package]] name = 'ec_recover_test' -dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549'] +dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3'] [[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'] +source = 'git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3' +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f'] 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 366643f5ced..03a32eabfe6 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#7b973a638d5220228be616f1f89a249846001549', + 'std git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3', ] [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44' +source = 'git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f' dependencies = [] [[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'] +source = 'git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3' +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f'] 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 0cea475923c..d752ed0aa9b 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#7b973a638d5220228be616f1f89a249846001549', + 'std git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3', ] [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44' +source = 'git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f' dependencies = [] [[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'] +source = 'git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3' +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f'] 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 ca4d91b09c5..e2ce8826f86 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#7b973a638d5220228be616f1f89a249846001549', + 'std git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3', ] [[package]] @@ -11,10 +11,10 @@ dependencies = [] [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44' +source = 'git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f' dependencies = [] [[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'] +source = 'git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3' +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f'] 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 a94b81fda3c..35a111f97f2 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#7b973a638d5220228be616f1f89a249846001549'] +dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3'] [[package]] name = 'context_testing_contract' dependencies = [ 'context_testing_abi', - 'std git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549', + 'std git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3', ] [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#30274cf817c1848e28f984c2e8703eb25e7a3a44' +source = 'git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f' dependencies = [] [[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'] +source = 'git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3' +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f'] 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 4d3a74ab035..523a1c27051 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::{*, call_frames::*}, contract_id::ContractId}; +use std::{context::{*, call_frames::*, registers::global_gas}, contract_id::ContractId}; use context_testing_abi::*; impl ContextTesting for Contract { @@ -13,7 +13,7 @@ impl ContextTesting for Contract { } fn get_balance_of_contract(asset_id: ContractId, cid: ContractId) -> u64 { - balance_of_contract(asset_id, cid) + balance_of(asset_id, cid) } fn get_amount() -> u64 { diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/increment_contract/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/increment_contract/Forc.lock index 442118d2c0d..6f2cd31bbbb 100644 --- a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/increment_contract/Forc.lock +++ b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/increment_contract/Forc.lock @@ -1,6 +1,6 @@ [[package]] name = 'core' -source = 'git+https://github.com/FuelLabs/sway-lib-core?reference=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f' +source = 'git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f' dependencies = [] [[package]] @@ -11,10 +11,10 @@ dependencies = [] name = 'increment_contract' dependencies = [ 'increment_abi', - 'std git+https://github.com/FuelLabs/sway-lib-std?reference=master#a1d77e1140d1b57ee18cc914d320dc7ffdff98fd', + 'std git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3', ] [[package]] name = 'std' -source = 'git+https://github.com/FuelLabs/sway-lib-std?reference=master#a1d77e1140d1b57ee18cc914d320dc7ffdff98fd' -dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?reference=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f'] +source = 'git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3' +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f'] 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 41dd8768f3f..c68dc5175e6 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#30274cf817c1848e28f984c2e8703eb25e7a3a44' +source = 'git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f' dependencies = [] [[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'] +source = 'git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3' +dependencies = ['core git+https://github.com/FuelLabs/sway-lib-core?branch=master#082bc8eb0616586ac0000825bfe6e9d47b0c713f'] [[package]] name = 'test_fuel_coin_abi' -dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549'] +dependencies = ['std git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3'] [[package]] name = 'test_fuel_coin_contract' dependencies = [ - 'std git+https://github.com/FuelLabs/sway-lib-std?reference=master#7b973a638d5220228be616f1f89a249846001549', + 'std git+https://github.com/FuelLabs/sway-lib-std?branch=master#3884e9bbadb7c2567700dae847017366629241d3', 'test_fuel_coin_abi', ]