feat: implement sway standards (#240)

Closes #92 Closes #230 --------- Co-authored-by: Cameron Carstens <[email protected]> Co-authored-by: K1-R1 <[email protected]>
FuelLabs · Aug 29, 2024 · c234e48 · c234e48
1 parent 4e2eaa5
commit c234e48
Show file tree

Hide file tree

Showing 27 changed files with 589 additions and 395 deletions.
diff --git a/.changeset/six-wolves-sit.md b/.changeset/six-wolves-sit.md
@@ -0,0 +1,7 @@
+---
+'@fuel-bridge/message-predicates': minor
+'@fuel-bridge/fungible-token': minor
+'@fuel-bridge/test-utils': minor
+---
+
+Implement SRC-7 and SRC-20
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Forc.lock b/Forc.lock
@@ -2,7 +2,7 @@
 name = "base-asset-contract"
 source = "member"
 dependencies = [
-    "standards git+https://github.com/FuelLabs/sway-standards?tag=v0.5.0#348f7175df4c012b23c86cdb18aab79025ca1f18",
+    "standards git+https://github.com/FuelLabs/sway-standards?tag=v0.6.0#65e09f95ea8b9476b171a66c8a47108f352fa32c",
     "std",
 ]
 
@@ -12,7 +12,7 @@ source = "member"
 dependencies = [
     "contract_message_receiver",
     "interface",
-    "standards git+https://github.com/FuelLabs/sway-standards?tag=v0.5.0#348f7175df4c012b23c86cdb18aab79025ca1f18",
+    "standards git+https://github.com/FuelLabs/sway-standards?tag=v0.6.0#65e09f95ea8b9476b171a66c8a47108f352fa32c",
     "std",
     "sway_libs",
 ]
@@ -45,7 +45,7 @@ source = "member"
 dependencies = [
     "contract_message_receiver",
     "interface",
-    "standards git+https://github.com/FuelLabs/sway-standards?tag=v0.5.0#348f7175df4c012b23c86cdb18aab79025ca1f18",
+    "standards git+https://github.com/FuelLabs/sway-standards?tag=v0.6.0#65e09f95ea8b9476b171a66c8a47108f352fa32c",
     "std",
 ]
 
@@ -54,18 +54,18 @@ name = "reentrancy-attacker"
 source = "member"
 dependencies = [
     "contract_message_receiver",
-    "standards git+https://github.com/FuelLabs/sway-standards?tag=v0.5.0#348f7175df4c012b23c86cdb18aab79025ca1f18",
+    "standards git+https://github.com/FuelLabs/sway-standards?tag=v0.6.0#65e09f95ea8b9476b171a66c8a47108f352fa32c",
     "std",
 ]
 
 [[package]]
 name = "standards"
-source = "git+https://github.com/FuelLabs/sway-standards?tag=v0.4.3#6f63eb7dff2458a7d976184e565b5cbf26f61da2"
+source = "git+https://github.com/FuelLabs/sway-standards?tag=v0.5.2#270350e69bd7455b7e99f0aae2e29a94d42324bd"
 dependencies = ["std"]
 
 [[package]]
 name = "standards"
-source = "git+https://github.com/FuelLabs/sway-standards?tag=v0.5.0#348f7175df4c012b23c86cdb18aab79025ca1f18"
+source = "git+https://github.com/FuelLabs/sway-standards?tag=v0.6.0#65e09f95ea8b9476b171a66c8a47108f352fa32c"
 dependencies = ["std"]
 
 [[package]]
@@ -75,9 +75,9 @@ dependencies = ["core"]
 
 [[package]]
 name = "sway_libs"
-source = "git+https://github.com/FuelLabs/sway-libs?tag=v0.21.0#6a227ed34c86fe1ebd334dbdfeccf66c43e3915b"
+source = "git+https://github.com/FuelLabs/sway-libs?tag=v0.23.1#50be622109e3c584efc29edac5390c96f1ccc43a"
 dependencies = [
-    "standards git+https://github.com/FuelLabs/sway-standards?tag=v0.4.3#6f63eb7dff2458a7d976184e565b5cbf26f61da2",
+    "standards git+https://github.com/FuelLabs/sway-standards?tag=v0.5.2#270350e69bd7455b7e99f0aae2e29a94d42324bd",
     "std",
 ]
 

diff --git a/package.json b/package.json
@@ -32,8 +32,8 @@
     "@fuels/eslint-plugin": "0.20.0",
     "@fuels/prettier-config": "0.0.10",
     "@fuels/ts-config": "0.0.10",
+    "fuels": "0.94.1",
     "eslint": "^8.49.0",
-    "fuels": "0.94.0",
     "prettier": "^2.7.1",
     "tsup": "^7.2.0",
     "tsx": "^3.12.7",

diff --git a/packages/fungible-token/bridge-fungible-token/Cargo.toml b/packages/fungible-token/bridge-fungible-token/Cargo.toml
@@ -12,6 +12,8 @@ publish = false
 [dependencies]
 anyhow = "1.0.86"
 ethers = {version = "=2.0.14"}
+test-case = "3.1.0"
+
 # Dependencies from fuel-core repository:
 fuel-core-types = { workspace = true }
 # Dependencies from fuels-rs repository:

diff --git a/packages/fungible-token/bridge-fungible-token/implementation/Forc.toml b/packages/fungible-token/bridge-fungible-token/implementation/Forc.toml
@@ -7,5 +7,5 @@ name = "bridge_fungible_token"
 [dependencies]
 contract_message_receiver = { path = "../../../message-predicates/contract-message-receiver" }
 interface = { path = "../interface" }
-standards = { git = "https://github.com/FuelLabs/sway-standards", tag = "v0.5.0" }
-sway_libs = { git = "https://github.com/FuelLabs/sway-libs", tag = "v0.21.0" }
+standards = { git = "https://github.com/FuelLabs/sway-standards", tag = "v0.6.0" }
+sway_libs = { git = "https://github.com/FuelLabs/sway-libs", tag = "v0.23.1" }
diff --git a/...s/fungible-token/bridge-fungible-token/implementation/src/data_structures/message_data.sw b/...s/fungible-token/bridge-fungible-token/implementation/src/data_structures/message_data.sw
@@ -10,7 +10,7 @@ use ::data_structures::{
     deposit_message::DepositMessage,
     metadata_message::MetadataMessage,
 };
-use std::{constants::ZERO_B256, inputs::input_message_data};
+use std::inputs::input_message_data;
 
 pub enum MessageData {
     Deposit: DepositMessage,

diff --git a/...ngible-token/bridge-fungible-token/implementation/src/data_structures/metadata_message.sw b/...ngible-token/bridge-fungible-token/implementation/src/data_structures/metadata_message.sw
@@ -3,7 +3,6 @@ library;
 use std::{
     alloc::alloc_bytes,
     bytes::*,
-    constants::ZERO_B256,
     inputs::input_message_data,
     primitive_conversions::u64::*,
     string::String,

diff --git a/packages/fungible-token/bridge-fungible-token/implementation/src/errors.sw b/packages/fungible-token/bridge-fungible-token/implementation/src/errors.sw
@@ -9,4 +9,5 @@ pub enum BridgeFungibleTokenError {
     UnderflowError: (),
     AssetNotFound: (),
     InvalidAmount: (),
+    WithdrawalToZeroAddress: (),
 }
diff --git a/packages/fungible-token/bridge-fungible-token/implementation/src/events.sw b/packages/fungible-token/bridge-fungible-token/implementation/src/events.sw
@@ -27,10 +27,3 @@ pub struct ClaimRefundEvent {
     pub token_address: b256,
     pub token_id: b256,
 }
-
-pub struct MetadataEvent {
-    pub token_address: b256,
-    // TODO: SDK does not support decoding these types
-    // pub symbol: String,
-    // pub name: String
-}