From ade6077a83657498deb2f9bf46aa02ced03c3b01 Mon Sep 17 00:00:00 2001
From: IGI-111 <igi-111@protonmail.com>
Date: Mon, 22 Jul 2024 07:53:53 +0200
Subject: [PATCH] Use new namespace syntax for storage (#120)

---
 .github/workflows/ci.yaml                          |  2 +-
 CHANGELOG.md                                       |  1 +
 README.md                                          |  6 +++---
 docs/src/index.md                                  |  2 +-
 examples/src14-simple-proxy/minimal/src/minimal.sw |  4 +---
 examples/src14-simple-proxy/owned/src/owned.sw     | 14 +++++++-------
 6 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 08621d4..22316f8 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -16,7 +16,7 @@ env:
   CARGO_TERM_COLOR: always
   REGISTRY: ghcr.io
   RUST_VERSION: 1.77.0
-  FORC_VERSION: 0.60.0
+  FORC_VERSION: 0.61.0
   CORE_VERSION: 0.26.0
   PATH_TO_SCRIPTS: .github/scripts
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a3a1fc0..6e4bcea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -43,6 +43,7 @@ Description of the upcoming release here.
 
 - [#103](https://github.com/FuelLabs/sway-standards/pull/103) Removes standards in the `./SRC` folder in favor of `./docs`.
 - [#106](https://github.com/FuelLabs/sway-standards/pull/106) Updates links from the Sway Book to Docs Hub.
+- [#120](https://github.com/FuelLabs/sway-standards/pull/120) Updates repository to forc v0.61.0 and uses new namespace in SRC-14 example.
 
 ### Fixed v0.5.1
 
diff --git a/README.md b/README.md
index ff0a73b..73e4c5b 100644
--- a/README.md
+++ b/README.md
@@ -9,8 +9,8 @@
     <a href="https://github.com/FuelLabs/sway-standards/actions/workflows/ci.yml" alt="CI">
         <img src="https://github.com/FuelLabs/sway-standards/actions/workflows/ci.yml/badge.svg" />
     </a>
-    <a href="https://crates.io/crates/forc/0.60.0" alt="forc">
-        <img src="https://img.shields.io/badge/forc-v0.60.0-orange" />
+    <a href="https://crates.io/crates/forc/0.61.0" alt="forc">
+        <img src="https://img.shields.io/badge/forc-v0.61.0-orange" />
     </a>
     <a href="./LICENSE" alt="forc">
         <img src="https://img.shields.io/github/license/FuelLabs/sway-standards" />
@@ -162,7 +162,7 @@ Example of a minimal SRC-14 implementation with no access control.
 Example of a SRC-14 implementation that also implements [SRC-5](https://docs.fuel.network/docs/sway-standards/src-5-ownership/).
 
 > **Note**
-> All standards currently use `forc v0.60.0`.
+> All standards currently use `forc v0.61.0`.
 
 <!-- TODO:
 ## Contributing
diff --git a/docs/src/index.md b/docs/src/index.md
index ca8efad..9a61fbb 100644
--- a/docs/src/index.md
+++ b/docs/src/index.md
@@ -7,7 +7,7 @@ Standards in this repository may be in various stages of development. Use of dra
 If you don't find what you're looking for, feel free to create an issue and propose a new standard!
 
 > **Note**
-> All standards currently use `forc v0.60.0`.
+> All standards currently use `forc v0.61.0`.
 
 ## Using a standard
 
diff --git a/examples/src14-simple-proxy/minimal/src/minimal.sw b/examples/src14-simple-proxy/minimal/src/minimal.sw
index 939e60f..721dcac 100644
--- a/examples/src14-simple-proxy/minimal/src/minimal.sw
+++ b/examples/src14-simple-proxy/minimal/src/minimal.sw
@@ -1,10 +1,8 @@
 contract;
 
 use std::execution::run_external;
-use standards::src14::SRC14;
+use standards::src14::{SRC14, SRC14_TARGET_STORAGE};
 
-// use sha256("storage_SRC14") as base to avoid collisions
-#[namespace(SRC14)]
 storage {
     // target is at sha256("storage_SRC14_0")
     target: ContractId = ContractId::zero(),
diff --git a/examples/src14-simple-proxy/owned/src/owned.sw b/examples/src14-simple-proxy/owned/src/owned.sw
index 2d89e74..5e5ba6d 100644
--- a/examples/src14-simple-proxy/owned/src/owned.sw
+++ b/examples/src14-simple-proxy/owned/src/owned.sw
@@ -2,17 +2,17 @@ contract;
 
 use std::execution::run_external;
 use standards::src5::{AccessError, State};
-use standards::src14::{SRC14, SRC14Extension};
+use standards::src14::{SRC14, SRC14_TARGET_STORAGE, SRC14Extension};
 
 /// The owner of this contract at deployment.
 const INITIAL_OWNER: Identity = Identity::Address(Address::zero());
 
-// use sha256("storage_SRC14") as base to avoid collisions
-#[namespace(SRC14)]
 storage {
-    // target is at sha256("storage_SRC14_0")
+    proxy {
+        // target is at sha256("storage_SRC14_0")
+        owner: State = State::Initialized(INITIAL_OWNER),
+    },
     target: ContractId = ContractId::zero(),
-    owner: State = State::Initialized(INITIAL_OWNER),
 }
 
 impl SRC14 for Contract {
@@ -31,7 +31,7 @@ impl SRC14 for Contract {
 impl SRC14Extension for Contract {
     #[storage(read)]
     fn proxy_owner() -> State {
-        storage.owner.read()
+        storage::proxy.owner.read()
     }
 }
 
@@ -45,7 +45,7 @@ fn fallback() {
 #[storage(read)]
 fn only_owner() {
     require(
-        storage
+        storage::proxy
             .owner
             .read() == State::Initialized(msg_sender().unwrap()),
         AccessError::NotOwner,