Bump dependencies. (FuelLabs#886)

* Bump dependencies. * Bump fuel-core in CI to 0.4.1 * Bump deps for sway-core
ahocom55 · Mar 6, 2022 · 52929ec · 52929ec
1 parent 7ccd8be
commit 52929ec
Show file tree

Hide file tree

Showing 9 changed files with 67 additions and 29 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -94,7 +94,7 @@ jobs:
     runs-on: ubuntu-latest
     services:
       fuel-core:
-        image: ghcr.io/fuellabs/fuel-core:v0.3.1
+        image: ghcr.io/fuellabs/fuel-core:v0.4.1
         ports:
           - 4000:4000
     steps:

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/forc/Cargo.toml b/forc/Cargo.toml
@@ -15,10 +15,10 @@ anyhow = "1.0.41"
 clap = { version = "3.1.2", features = ["env", "derive"] }
 clap_complete = "3.1"
 dirs = "3.0.2"
-fuel-asm = "0.1"
-fuel-gql-client = { version = "0.3", default-features = false }
-fuel-tx = "0.5"
-fuel-vm = "0.4"
+fuel-asm = "0.2"
+fuel-gql-client = { version = "0.4", default-features = false }
+fuel-tx = "0.6"
+fuel-vm = "0.5"
 futures = "0.3"
 git2 = "0.14"
 hex = "0.4.3"

diff --git a/sway-core/Cargo.toml b/sway-core/Cargo.toml
@@ -16,8 +16,8 @@ clap = { version = "3.1.2", features = ["derive"], optional = true }
 derivative = "2.2.0"
 dirs = "3.0"
 either = "1.6"
-fuel-asm = "0.1"
-fuel-vm = "0.4"
+fuel-asm = "0.2"
+fuel-vm = "0.5"
 hex = { version = "0.4", optional = true }
 lazy_static = "1.4"
 nanoid = "0.4"

diff --git a/sway-types/Cargo.toml b/sway-types/Cargo.toml
@@ -9,8 +9,9 @@ repository = "https://github.com/FuelLabs/sway"
 description = "Sway core types."
 
 [dependencies]
-fuel-asm = "0.1"
-fuel-tx = "0.5"
+fuel-asm = "0.2"
+fuel-crypto = "0.3"
+fuel-tx = "0.6"
 pest = { version = "3.0.4", package = "fuel-pest" }
 pest_derive = { version = "3.0.4", package = "fuel-pest_derive" }
 serde = { version = "1.0", features = ["derive"] }
diff --git a/sway-types/src/lib.rs b/sway-types/src/lib.rs
@@ -1,5 +1,6 @@
 use fuel_asm::Word;
-use fuel_tx::{crypto, Bytes32, ContractId};
+use fuel_crypto::Hasher;
+use fuel_tx::{Bytes32, ContractId};
 use serde::{Deserialize, Serialize};
 use std::path::{Path, PathBuf};
 use std::{io, iter, slice};
@@ -298,7 +299,7 @@ impl Context {
     pub fn id_from_repr<'a>(bytes: impl Iterator<Item = &'a u8>) -> Id {
         let bytes: Vec<u8> = bytes.copied().collect();
 
-        *crypto::Hasher::hash(bytes.as_slice())
+        *Hasher::hash(bytes.as_slice())
     }
 
     pub const fn id(&self) -> &Id {

diff --git a/test-sig-gen-util/Cargo.toml b/test-sig-gen-util/Cargo.toml
@@ -6,7 +6,8 @@ publish = false
 
 [dependencies]
 anyhow = "1.0.39"
-fuel-tx = "0.5"
-fuel-vm = "0.4"
+fuel-crypto = "0.3"
+fuel-tx = "0.6"
+fuel-vm = "0.5"
 hex = "0.4"
 secp256k1 = { version = "0.20", features = ["recovery"] }
diff --git a/test-sig-gen-util/src/main.rs b/test-sig-gen-util/src/main.rs
@@ -1,7 +1,7 @@
 //! This utility generates data used for testing Sway's ec_recover function (stdlib/ecr.sw).
 //! NOT to be used for key-generation as this is NEITHER SECURE NOR RANDOM !!!
 
-use fuel_tx::crypto::Hasher;
+use fuel_crypto::Hasher;
 
 use fuel_vm::crypto;
 use fuel_vm::prelude::*;

diff --git a/test/Cargo.toml b/test/Cargo.toml
@@ -8,9 +8,9 @@ publish = false
 [dependencies]
 anyhow = "1.0.41"
 forc = { version = "0.5.0", path = "../forc", features = ["test"], default-features = false }
-fuel-asm = "0.1"
-fuel-tx = "0.5"
-fuel-vm = { version = "0.4", features = ["random"] }
+fuel-asm = "0.2"
+fuel-tx = "0.6"
+fuel-vm = { version = "0.5", features = ["random"] }
 rand = "0.8"
 regex = "1"
 tokio = "1.12"