Move to our own published crate instead of Git repo for ethabi crate. (…

…FuelLabs#3811)
archens7126 · Jan 18, 2023 · acd4c1e · acd4c1e
1 parent f18197f
commit acd4c1e
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 18 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/sway-core/Cargo.toml b/sway-core/Cargo.toml
@@ -13,9 +13,9 @@ clap = { version = "3.1", features = ["derive"] }
 derivative = "2.2.0"
 dirs = "3.0"
 either = "1.6"
-ethabi = { git = "https://github.com/FuelLabs/ethabi.git", rev = "00a8fdb133d51b99eabbf9db7b7d55bad75becd7" }
 etk-asm = { version = "0.2.1", features = ["backtraces"] }
 fuel-abi-types = "0.1" 
+fuel-ethabi = { version = "18.0.0" }
 fuel-vm = { version = "0.22", features = ["serde"] }
 hashbrown = "0.13.1"
 hex = { version = "0.4", optional = true }

diff --git a/sway-core/src/asm_generation/evm/evm_asm_builder.rs b/sway-core/src/asm_generation/evm/evm_asm_builder.rs
@@ -18,6 +18,10 @@ use sway_types::Span;
 
 use etk_asm::{asm::Assembler, ops::*};
 
+mod ethabi {
+    pub use fuel_ethabi::*;
+}
+
 /// A smart contract is created by sending a transaction with an empty "to" field.
 /// When this is done, the Ethereum virtual machine (EVM) runs the bytecode which is
 /// set in the init byte array which is a field that can contain EVM bytecode

diff --git a/sway-core/src/asm_generation/programs.rs b/sway-core/src/asm_generation/programs.rs
@@ -12,6 +12,10 @@ use crate::{
     decl_engine::DeclId,
 };
 
+mod ethabi {
+    pub use fuel_ethabi::*;
+}
+
 type SelectorOpt = Option<[u8; 4]>;
 type FnName = String;
 type ImmOffset = u64;