Merge branch 'master' into master

FuelLabs · Apr 22, 2024 · 539a02a · 539a02a
2 parents 23eec21 + 379ceb7
commit 539a02a
Show file tree

Hide file tree

Showing 54 changed files with 12,546 additions and 410 deletions.
diff --git a/NFT/Cargo.lock b/NFT/Cargo.lock
diff --git a/NFT/Forc.lock b/NFT/Forc.lock
@@ -2,41 +2,29 @@
 name = "NFT-contract"
 source = "member"
 dependencies = [
-    "asset",
-    "src20",
-    "src3",
-    "src7",
-    "std",
-]
-
-[[package]]
-name = "asset"
-source = "git+https://github.com/FuelLabs/sway-libs?tag=v0.18.0#8d196e9379463d4596ac582a20a84ed52ff58c69"
-dependencies = [
-    "src7",
+    "standards",
     "std",
+    "sway_libs",
 ]
 
 [[package]]
 name = "core"
-source = "path+from-root-C3992B43B72ADB8C"
-
-[[package]]
-name = "src20"
-source = "git+https://github.com/FuelLabs/sway-standards?tag=v0.3.3#4198b4b07449ad16104cc8a0501f3013670fdcfd"
-dependencies = ["std"]
+source = "path+from-root-9889F771D40C5D34"
 
 [[package]]
-name = "src3"
-source = "git+https://github.com/FuelLabs/sway-standards?tag=v0.3.3#4198b4b07449ad16104cc8a0501f3013670fdcfd"
-dependencies = ["std"]
-
-[[package]]
-name = "src7"
-source = "git+https://github.com/FuelLabs/sway-standards?tag=v0.3.3#4198b4b07449ad16104cc8a0501f3013670fdcfd"
+name = "standards"
+source = "git+https://github.com/FuelLabs/sway-standards?tag=v0.4.1#0a6f3ba0bce036a0ce61f15ed4480c71af32d3aa"
 dependencies = ["std"]
 
 [[package]]
 name = "std"
-source = "git+https://github.com/fuellabs/sway?tag=v0.49.1#2ac7030570f22510b0ac2a7b5ddf7baa20bdc0e1"
+source = "git+https://github.com/fuellabs/sway?tag=v0.53.0#b30f0e83d3f3d336007e3dfce45a48a87e731345"
 dependencies = ["core"]
+
+[[package]]
+name = "sway_libs"
+source = "git+https://github.com/FuelLabs/sway-libs?tag=v0.20.1#34a2d5a0f118a72c972153ca44140c0f5f78a680"
+dependencies = [
+    "standards",
+    "std",
+]
diff --git a/NFT/NFT-contract/Cargo.toml b/NFT/NFT-contract/Cargo.toml
@@ -6,6 +6,9 @@ edition = "2021"
 license = "Apache-2.0"
 
 [dependencies]
+fuels = { version = "0.54.0", features = ["fuel-core-lib"] }
+sha2 = { version = "0.10.7" }
+tokio = { version = "1.12", features = ["rt", "macros"] }
 
 [[test]]
 harness = true

diff --git a/NFT/NFT-contract/Forc.toml b/NFT/NFT-contract/Forc.toml
@@ -5,7 +5,5 @@ license = "Apache-2.0"
 name = "NFT-contract"
 
 [dependencies]
-asset = { git = "https://github.com/FuelLabs/sway-libs", tag = "v0.18.0" }
-src20 = { git = "https://github.com/FuelLabs/sway-standards", tag = "v0.3.3" }
-src3 = { git = "https://github.com/FuelLabs/sway-standards", tag = "v0.3.3" }
-src7 = { git = "https://github.com/FuelLabs/sway-standards", tag = "v0.3.3" }
+standards = { git = "https://github.com/FuelLabs/sway-standards", tag = "v0.4.1" }
+sway_libs = { git = "https://github.com/FuelLabs/sway-libs", tag = "v0.20.1" }
diff --git a/NFT/NFT-contract/src/interface.sw b/NFT/NFT-contract/src/interface.sw
@@ -0,0 +1,6 @@
+library;
+
+abi Constructor {
+    #[storage(read, write)]
+    fn constructor(owner: Identity);
+}