Merge branch 'K1-R1/updates' into K1-R1-CI-warnings

FuelLabs · Sep 8, 2024 · a7fbfb3 · a7fbfb3
2 parents 6163f8e + 515e7a0
commit a7fbfb3
Show file tree

Hide file tree

Showing 27 changed files with 434 additions and 478 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -15,7 +15,7 @@ concurrency:
 env:
   CARGO_TERM_COLOR: always
   REGISTRY: ghcr.io
-  RUST_VERSION: 1.79.0
+  RUST_VERSION: 1.81.0
 
 jobs:
   build-projects:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,7 @@ Description of the upcoming release here.
 - [#1](https://github.com/FuelLabs/sway-standard-implementations/pull/1) Adds an implementation of SRC-14: Owned Proxy.
 - [#8](https://github.com/FuelLabs/sway-standard-implementations/pull/8) Adds SRC-14 owned proxy usage scripts and docs.
 - [#10](https://github.com/FuelLabs/sway-standard-implementations/pull/10) Sets owned_proxy sway-libs dependency to version v0.23.0.
+- [#17](https://github.com/FuelLabs/sway-standard-implementations/pull/17) Update Owned Proxy to support `forc`'s deploy proxy feature.
 - [#19](https://github.com/FuelLabs/sway-standard-implementations/pull/19) Adds CI checks for `forc` compiler warnings.
 
 ### Changed

diff --git a/README.md b/README.md
@@ -2,8 +2,8 @@
     <a href="https://github.com/FuelLabs/sway-standard-implementations/actions/workflows/ci.yml" alt="CI">
         <img src="https://github.com/FuelLabs/sway-standard-implementations/actions/workflows/ci.yml/badge.svg" />
     </a>
-    <a href="./LICENSE" alt="forc">
-        <img src="https://img.shields.io/github/license/FuelLabs/sway-libs" />
+    <a href="./LICENSE" alt="License">
+        <img src="https://img.shields.io/github/license/FuelLabs/sway-standard-implementations" />
     </a>
     <a href="https://discord.gg/xfpK4Pe">
         <img src="https://img.shields.io/discord/732892373507375164?color=6A7EC2&logo=discord&logoColor=ffffff&labelColor=6A7EC2&label=Discord" />
@@ -34,6 +34,3 @@ cd tests && forc test --release --locked && cargo test
 
 > **NOTE:**
 > This may take a while depending on your hardware, future improvements to Sway will decrease build times. After this has been run once, individual test projects may be built on their own to save time.
-
-> **NOTE:**
-> All projects currently use `forc v0.60.0`, `fuels-rs v0.63.0` and `fuel-core v0.27.0`. Versions are locked via `fuel-toolchain.toml` files.
diff --git a/src14/owned_proxy/README.md b/src14/owned_proxy/README.md
@@ -1,5 +1,11 @@
 # SRC-14: Owned Proxy Contract
 
+<p align="center">
+<a href="https://crates.io/crates/forc/0.63.5" alt="forc">
+        <img src="https://img.shields.io/badge/forc-v0.63.5-orange" />
+    </a>
+</p>
+
 - The [Owned Proxy Contract](./contract/src/main.sw) is an opinionated implementation of the [extended SRC-14 standard](https://docs.fuel.network/docs/sway-standards/src-14-simple-upgradeable-proxies/). It utilises the [Upgradability library from sway-libs](https://github.com/FuelLabs/sway-libs) and includes initialization functionality that allows for secure ownership upon deployment.
 
 ## Usage instructions

diff --git a/src14/owned_proxy/contract/Forc.lock b/src14/owned_proxy/contract/Forc.lock
@@ -1,35 +1,30 @@
 [[package]]
 name = "core"
-source = "path+from-root-E19CE48B3E858B72"
+source = "path+from-root-4BB20845430AF9CF"
 
 [[package]]
 name = "src14_owned_proxy"
 source = "member"
 dependencies = [
-    "standards git+https://github.com/FuelLabs/sway-standards?tag=v0.5.1#e2d5ac40a1d11a9e38e0a662d35141076515319f",
+    "standards",
     "std",
     "sway_libs",
 ]
 
 [[package]]
 name = "standards"
-source = "git+https://github.com/FuelLabs/sway-standards?tag=v0.5.0#348f7175df4c012b23c86cdb18aab79025ca1f18"
-dependencies = ["std"]
-
-[[package]]
-name = "standards"
-source = "git+https://github.com/FuelLabs/sway-standards?tag=v0.5.1#e2d5ac40a1d11a9e38e0a662d35141076515319f"
+source = "git+https://github.com/FuelLabs/sway-standards?tag=v0.6.0#65e09f95ea8b9476b171a66c8a47108f352fa32c"
 dependencies = ["std"]
 
 [[package]]
 name = "std"
-source = "git+https://github.com/fuellabs/sway?tag=v0.60.0#2f0392ee35a1e4dd80bd8034962d5b4083dfb8b6"
+source = "git+https://github.com/fuellabs/sway?tag=v0.63.5#31a1d6f98395f571cd3674b492d9bf4773c55f65"
 dependencies = ["core"]
 
 [[package]]
 name = "sway_libs"
-source = "git+https://github.com/FuelLabs/sway-libs?tag=v0.23.0#9987d8ae11b1d82d42524794829c216b607916c5"
+source = "git+https://github.com/FuelLabs/sway-libs?tag=v0.24.0#e19f96f85ae12426d20adc176b70aa38fd9a2a5b"
 dependencies = [
-    "standards git+https://github.com/FuelLabs/sway-standards?tag=v0.5.0#348f7175df4c012b23c86cdb18aab79025ca1f18",
+    "standards",
     "std",
 ]
diff --git a/src14/owned_proxy/contract/Forc.toml b/src14/owned_proxy/contract/Forc.toml
@@ -5,5 +5,5 @@ license = "Apache-2.0"
 name = "src14_owned_proxy"
 
 [dependencies]
-standards = { git = "https://github.com/FuelLabs/sway-standards", tag = "v0.5.1" }
-sway_libs = { git = "https://github.com/FuelLabs/sway-libs", tag = "v0.23.0" }
+standards = { git = "https://github.com/FuelLabs/sway-standards", tag = "v0.6.0" }
+sway_libs = { git = "https://github.com/FuelLabs/sway-libs", tag = "v0.24.0" }
diff --git a/src14/owned_proxy/contract/fuel-toolchain.toml b/src14/owned_proxy/contract/fuel-toolchain.toml
@@ -1,6 +1,6 @@
 [toolchain]
-channel = "testnet"
+channel = "testnet-2024-09-06"
 
 [components]
-fuel-core = "0.27.0"
-forc = "0.60.0"
+forc = "0.63.5"
+fuel-core = "0.35.0"