Upgrade to forc 0.38 & fuels-rs 0.41, including new storage API & some quality of life changes

Cargo.toml

@@ -30,7 +30,7 @@ authors = ["Abacus Works"]
 
 [workspace.dependencies]
 ethers = { git = "https://github.com/hyperlane-xyz/ethers-rs", tag = "2023-02-10-01" }
-fuels = { git = "https://github.com/FuelLabs/fuels-rs", rev = "f5d08d6" }
+fuels = { git = "https://github.com/FuelLabs/fuels-rs", tag = "v0.41.0" }
 hyperlane-core = { git = "https://github.com/hyperlane-xyz/hyperlane-monorepo", rev = "930cded" }
 hyperlane-ethereum = { git = "https://github.com/hyperlane-xyz/hyperlane-monorepo", rev = "930cded" }
 tokio = { version = "1.12" }

Forc.lock

@@ -1,6 +1,6 @@
 [[package]]
 name = 'core'
-source = 'path+from-root-91563E0DA237BDEC'
+source = 'path+from-root-1AA1C8235B783A81'
 
 [[package]]
 name = 'hyperlane-ism-test'
@@ -18,7 +18,7 @@ dependencies = [
     'hyperlane_interfaces',
     'hyperlane_message',
     'merkle',
-    'ownership git+https://github.com/fuellabs/sway-libs?tag=v0.8.0#f6bb5c234e020d556e1bc688e0f1f368dc9b0f9a',
+    'ownership',
     'pause',
     'reentrancy',
     'std',
@@ -48,7 +48,7 @@ name = 'hyperlane_interfaces'
 source = 'member'
 dependencies = [
     'hyperlane_message',
-    'ownership git+https://github.com/fuellabs/sway-libs?rev#f6bb5c234e020d556e1bc688e0f1f368dc9b0f9a',
+    'ownership',
     'std',
 ]
 
@@ -65,7 +65,7 @@ name = 'interchain-gas-paymaster'
 source = 'member'
 dependencies = [
     'hyperlane_interfaces',
-    'ownership git+https://github.com/fuellabs/sway-libs?tag=v0.8.0#f6bb5c234e020d556e1bc688e0f1f368dc9b0f9a',
+    'ownership',
     'std',
     'std_lib_extended',
 ]
@@ -107,10 +107,9 @@ dependencies = [
     'hyperlane_message',
     'merkle',
     'multisig_ism_metadata',
-    'ownership git+https://github.com/fuellabs/sway-libs?rev#f6bb5c234e020d556e1bc688e0f1f368dc9b0f9a',
+    'ownership',
     'std',
     'std_lib_extended',
-    'storagemapvec',
 ]
 
 [[package]]
@@ -126,18 +125,13 @@ name = 'overhead-igp'
 source = 'member'
 dependencies = [
     'hyperlane_interfaces',
-    'ownership git+https://github.com/fuellabs/sway-libs?tag=v0.8.0#f6bb5c234e020d556e1bc688e0f1f368dc9b0f9a',
+    'ownership',
     'std',
 ]
 
 [[package]]
 name = 'ownership'
-source = 'git+https://github.com/fuellabs/sway-libs?rev#f6bb5c234e020d556e1bc688e0f1f368dc9b0f9a'
-dependencies = ['std']
-
-[[package]]
-name = 'ownership'
-source = 'git+https://github.com/fuellabs/sway-libs?tag=v0.8.0#f6bb5c234e020d556e1bc688e0f1f368dc9b0f9a'
+source = 'git+https://github.com/fuellabs/sway-libs?tag=v0.9.0#01cb23bfc13be2a95c81dec17933f84991337ac9'
 dependencies = ['std']
 
 [[package]]
@@ -155,12 +149,12 @@ dependencies = [
 
 [[package]]
 name = 'reentrancy'
-source = 'git+https://github.com/FuelLabs/sway-libs?tag=v0.8.0#f6bb5c234e020d556e1bc688e0f1f368dc9b0f9a'
+source = 'git+https://github.com/fuellabs/sway-libs?tag=v0.9.0#01cb23bfc13be2a95c81dec17933f84991337ac9'
 dependencies = ['std']
 
 [[package]]
 name = 'std'
-source = 'git+https://github.com/fuellabs/sway?tag=v0.37.1#83e5479462ed2883591669a42552606ac25f0a04'
+source = 'git+https://github.com/fuellabs/sway?tag=v0.38.0#2d16d70ab9d5ab0de0255941048f811b6d07c6b1'
 dependencies = ['core']
 
 [[package]]
@@ -173,20 +167,14 @@ name = 'storage-gas-oracle'
 source = 'member'
 dependencies = [
     'hyperlane_interfaces',
-    'ownership git+https://github.com/fuellabs/sway-libs?tag=v0.8.0#f6bb5c234e020d556e1bc688e0f1f368dc9b0f9a',
+    'ownership',
     'std',
 ]
 
-[[package]]
-name = 'storagemapvec'
-source = 'git+https://github.com/FuelLabs/sway-libs?tag=v0.8.0#f6bb5c234e020d556e1bc688e0f1f368dc9b0f9a'
-dependencies = ['std']
-
 [[package]]
 name = 'validator-announce'
 source = 'member'
 dependencies = [
     'std',
     'std_lib_extended',
-    'storagemapvec',
 ]

Forc.toml

@@ -23,4 +23,4 @@ members = [
 ]
 
 [dependencies]
-ownership = { git = "https://github.com/fuellabs/sway-libs", tag = "v0.8.0" }
+ownership = { git = "https://github.com/fuellabs/sway-libs", tag = "v0.9.0" }

contracts/hyperlane-interfaces/Forc.toml

@@ -6,4 +6,4 @@ name = "hyperlane_interfaces"
 
 [dependencies]
 hyperlane_message = { path = "../hyperlane-message" }
-ownership = { git = "https://github.com/fuellabs/sway-libs", rev = "v0.8.0" }
+ownership = { git = "https://github.com/fuellabs/sway-libs", tag = "v0.9.0" }

contracts/hyperlane-ism-test/src/main.sw

@@ -16,17 +16,17 @@ abi TestISM {
 impl TestISM for Contract {
     #[storage(write)]
     fn set_accept(accept: bool) {
-        storage.accept = accept;
+        storage.accept.write(accept);
     }
 }
 
 impl InterchainSecurityModule for Contract {
     #[storage(read, write)]
     fn verify(metadata: Bytes, message: Bytes) -> bool {
         // To ignore a compiler warning that no storage writes are made.
-        storage.accept = storage.accept;
+        storage.accept.write(storage.accept.read());
 
-        return storage.accept;
+        return storage.accept.read();
     }
 
     #[storage(read)]

contracts/hyperlane-mailbox/Forc.toml

@@ -8,7 +8,7 @@ name = "hyperlane-mailbox"
 hyperlane_interfaces = { path = "../hyperlane-interfaces" }
 hyperlane_message = { path = "../hyperlane-message" }
 merkle = { path = "../merkle" }
-ownership = { git = "https://github.com/fuellabs/sway-libs", tag = "v0.8.0" }
+ownership = { git = "https://github.com/fuellabs/sway-libs", tag = "v0.9.0" }
 pause = { path = "../pause" }
-reentrancy = { git = "https://github.com/FuelLabs/sway-libs", tag = "v0.8.0" }
+reentrancy = { git = "https://github.com/fuellabs/sway-libs", tag = "v0.9.0" }
 std_lib_extended = { path = "../std-lib-extended" }

contracts/hyperlane-mailbox/src/main.sw

@@ -4,8 +4,8 @@ use std::{auth::msg_sender, bytes::Bytes, call_frames::contract_id, logging::log
 
 use std_lib_extended::bytes::*;
 
-use merkle::StorageMerkleTree;
-use ownership::{data_structures::State, only_owner, owner, set_ownership, transfer_ownership};
+use merkle::*;
+use ownership::{*, data_structures::State};
 use pause::{interface::Pausable, is_paused, pause, require_unpaused, unpause};
 use reentrancy::reentrancy_guard;
 
@@ -38,6 +38,7 @@ configurable {
 }
 
 storage {
+    ownership: Ownership = Ownership::uninitialized(),
     /// A merkle tree that includes outbound message IDs as leaves.
     merkle_tree: StorageMerkleTree = StorageMerkleTree {},
     delivered: StorageMap<b256, bool> = StorageMap {},
@@ -80,15 +81,15 @@ impl Mailbox for Contract {
 
     #[storage(read, write)]
     fn set_default_ism(module: ContractId) {
-        only_owner();
-        storage.default_ism = module;
+        storage.ownership.only_owner();
+        storage.default_ism.write(module);
 
         log(DefaultIsmSetEvent { module });
     }
 
     #[storage(read)]
     fn get_default_ism() -> ContractId {
-        storage.default_ism
+        storage.default_ism.read()
     }
 
     #[storage(read)]
@@ -119,7 +120,7 @@ impl Mailbox for Contract {
         let msg_recipient = abi(MessageRecipient, recipient);
         let mut ism_id = msg_recipient.interchain_security_module();
         if (ism_id == ZERO_ID) {
-            ism_id = storage.default_ism;
+            ism_id = storage.default_ism.read();
         }
 
         let ism = abi(InterchainSecurityModule, ism_id.into());
@@ -164,21 +165,21 @@ impl Ownable for Contract {
     /// Gets the current owner.
     #[storage(read)]
     fn owner() -> State {
-        owner()
+        storage.ownership.owner()
     }
 
     /// Transfers ownership to `new_owner`.
     /// Reverts if the msg_sender is not the current owner.
     #[storage(read, write)]
     fn transfer_ownership(new_owner: Identity) {
-        transfer_ownership(new_owner);
+        storage.ownership.transfer_ownership(new_owner);
     }
 
     /// Initializes ownership to `new_owner`.
     /// Reverts if owner already initialized.
     #[storage(read, write)]
     fn set_ownership(new_owner: Identity) {
-        set_ownership(new_owner);
+        storage.ownership.set_ownership(new_owner);
     }
 }
 
@@ -193,15 +194,15 @@ impl Pausable for Contract {
     /// Reverts if the msg_sender is not the current owner.
     #[storage(read, write)]
     fn pause() {
-        only_owner();
+        storage.ownership.only_owner();
         pause()
     }
 
     /// Unpauses the contract if it is paused.
     /// Reverts if the msg_sender is not the current owner.
     #[storage(read, write)]
     fn unpause() {
-        only_owner();
+        storage.ownership.only_owner();
         unpause()
     }
 }
@@ -222,7 +223,7 @@ fn root() -> b256 {
 
 #[storage(read)]
 fn delivered(message_id: b256) -> bool {
-    storage.delivered.get(message_id).unwrap_or(false)
+    storage.delivered.get(message_id).try_read().unwrap_or(false)
 }
 
 /// Gets the b256 representation of the msg_sender.