fix(target_chains/fuel): upgrade to fuel testnet from beta-5 (#1625)

* upgrade libs and deps to latest

* fix more errors

* fix test

* fix test

Author: cctdaniel

target_chains/fuel/contracts/Cargo.lock

@@ -9,7 +9,7 @@ license = "Apache-2.0"
 [dependencies]
 rand = "0.8.5"
 base64 = "0.22"
-fuels = { version = "0.55", features = ["fuel-core-lib"] }
+fuels = { version = "0.62.0", features = ["fuel-core-lib"] }
 tokio = { version = "1.12", features = ["rt", "macros"] }
 hex = "0.4.3"
 reqwest = "0.11.27"

target_chains/fuel/contracts/Cargo.toml

@@ -1,44 +1,44 @@
 [[package]]
 name = "core"
-source = "path+from-root-566CA1D5F8BEAFBF"
-
-[[package]]
-name = "ownership"
-source = "git+https://github.com/FuelLabs/sway-libs?tag=v0.18.0#8d196e9379463d4596ac582a20a84ed52ff58c69"
-dependencies = [
-    "src_5",
-    "std",
-]
+source = "path+from-root-E19CE48B3E858B72"
 
 [[package]]
 name = "pyth-contract"
 source = "member"
 dependencies = [
-    "ownership",
     "pyth_interface",
-    "src5",
+    "standards git+https://github.com/FuelLabs/sway-standards?tag=v0.4.4#a001d3c248595112aae67e5633a06ef9bc0536ae",
     "std",
+    "sway_libs",
 ]
 
 [[package]]
 name = "pyth_interface"
 source = "path+from-root-555D3D27A908977B"
 dependencies = [
-    "src5",
+    "standards git+https://github.com/FuelLabs/sway-standards?tag=v0.4.4#a001d3c248595112aae67e5633a06ef9bc0536ae",
     "std",
 ]
 
 [[package]]
-name = "src5"
-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.3#6f63eb7dff2458a7d976184e565b5cbf26f61da2"
 dependencies = ["std"]
 
 [[package]]
-name = "src_5"
-source = "git+https://github.com/FuelLabs/sway-standards?tag=v0.2.2#6989cf8224b0d8aabea62f3d3c648fc754948705"
+name = "standards"
+source = "git+https://github.com/FuelLabs/sway-standards?tag=v0.4.4#a001d3c248595112aae67e5633a06ef9bc0536ae"
 dependencies = ["std"]
 
 [[package]]
 name = "std"
-source = "git+https://github.com/fuellabs/sway?tag=v0.49.3#0dc6570377ee9c4a6359ade597fa27351e02a728"
+source = "git+https://github.com/fuellabs/sway?tag=v0.60.0#2f0392ee35a1e4dd80bd8034962d5b4083dfb8b6"
 dependencies = ["core"]
+
+[[package]]
+name = "sway_libs"
+source = "git+https://github.com/FuelLabs/sway-libs?tag=v0.21.0#6a227ed34c86fe1ebd334dbdfeccf66c43e3915b"
+dependencies = [
+    "standards git+https://github.com/FuelLabs/sway-standards?tag=v0.4.3#6f63eb7dff2458a7d976184e565b5cbf26f61da2",
+    "std",
+]

target_chains/fuel/contracts/Forc.lock

@@ -1,6 +1,6 @@
 [toolchain]
-channel = "beta-5"
+channel = "latest-aarch64-apple-darwin"
 
 [components]
-forc = "0.49.3"
-fuel-core = "0.22.4"
+forc = "0.60.0"
+fuel-core = "0.26.0"

target_chains/fuel/contracts/fuel-toolchain.toml

@@ -5,6 +5,6 @@ license = "Apache-2.0"
 name = "pyth-contract"
 
 [dependencies]
-ownership = { git = "https://github.com/FuelLabs/sway-libs", tag = "v0.18.0" }
+sway_libs = { git = "https://github.com/FuelLabs/sway-libs", tag = "v0.21.0" }
 pyth_interface = { path = "../pyth-interface" }
-src5 = { git = "https://github.com/FuelLabs/sway-standards", tag = "v0.3.3" }
+standards = { git = "https://github.com/FuelLabs/sway-standards", tag = "v0.4.4" }

target_chains/fuel/contracts/pyth-contract/Forc.toml

@@ -39,7 +39,7 @@ impl AccumulatorUpdate {
         require(trailing_header_size.is_some(), PythError::InvalidHeaderSize);
         // skip trailing headers and update type
         let offset = 8 + trailing_header_size.unwrap().as_u64();
-        require(self.data.len >= offset, PythError::InvalidUpdateDataLength);
+        require(self.data.len()  >= offset, PythError::InvalidUpdateDataLength);
         offset
     }
 }
@@ -53,7 +53,7 @@ impl AccumulatorUpdate {
 ) -> (u64, Bytes, u64, Bytes) {
         let encoded_offset = self.verify();
         let (_, slice) = self.data.split_at(encoded_offset);
-        let (encoded_slice, _) = slice.split_at(self.data.len - encoded_offset);
+        let (encoded_slice, _) = slice.split_at(self.data.len()  - encoded_offset);
         let mut offset = 0;
         let wormhole_proof_size = u16::from_be_bytes([encoded_slice.get(offset).unwrap(), encoded_slice.get(offset + 1).unwrap()]).as_u64();
         offset += 2;
@@ -80,7 +80,7 @@ impl AccumulatorUpdate {
         payload_offset += 20;
         require(
             payload_offset <= encoded_payload
-                .len,
+                .len(),
             PythError::InvalidPayloadLength,
         );
         let number_of_updates = encoded_slice.get(offset);
@@ -125,7 +125,7 @@ impl AccumulatorUpdate {
         }
         require(
             offset == encoded_data
-                .len,
+                .len(),
             PythError::InvalidUpdateDataLength,
         );
         (number_of_updates, updated_ids)

target_chains/fuel/contracts/pyth-contract/src/data_structures/accumulator_update.sw

@@ -8,7 +8,7 @@ use std::{bytes::Bytes, hash::Hash};
 const BATCH_MAGIC: u32 = 0x50325748;
 
 pub struct BatchAttestationUpdate {
-    data: Bytes,
+    pub data: Bytes,
 }
 impl BatchAttestationUpdate {
     pub fn new(data: Bytes) -> Self {
@@ -87,7 +87,7 @@ pub fn parse_and_verify_batch_attestation_header(encoded_payload: Bytes) -> (u64
     index += 2;
     require(
         encoded_payload
-            .len == index + (attestation_size * number_of_attestations)
+            .len()  == index + (attestation_size * number_of_attestations)
             .as_u64(),
         PythError::InvalidPayloadLength,
     );

target_chains/fuel/contracts/pyth-contract/src/data_structures/batch_attestation_update.sw

@@ -28,7 +28,7 @@ impl Price {
 impl PriceFeedId {
     pub fn is_target(self, target_price_feed_ids: Vec<PriceFeedId>) -> bool {
         let mut i = 0;
-        while i < target_price_feed_ids.len {
+        while i < target_price_feed_ids.len()  {
             if target_price_feed_ids.get(i).unwrap() == self {
                 return true;
             }
@@ -38,7 +38,7 @@ impl PriceFeedId {
     }
     pub fn is_contained_within(self, output_price_feeds: Vec<PriceFeed>) -> bool {
         let mut i = 0;
-        while i < output_price_feeds.len {
+        while i < output_price_feeds.len()  {
             if output_price_feeds.get(i).unwrap().id == self {
                 return true;
             }
@@ -133,7 +133,7 @@ impl PriceFeed {
         offset += 8;
         require(
             offset <= encoded_price_feed
-                .len,
+                .len(),
             PythError::InvalidPriceFeedDataLength,
         );
         //convert publish_time from UNIX to TAI64

target_chains/fuel/contracts/pyth-contract/src/data_structures/price.sw

@@ -16,7 +16,7 @@ pub enum UpdateType {
 impl UpdateType {
     pub fn determine_type(data: Bytes) -> Self {
         let (magic, _) = data.split_at(4); //TODO: Convert to u32 for comparison with const ACCUMULATOR_MAGIC. Use raw_ptr.read::<u32>()? Remove accumulator_magic_bytes()
-        if data.len > 4 && magic == accumulator_magic_bytes() {
+        if data.len()  > 4 && magic == accumulator_magic_bytes() {
             UpdateType::Accumulator(AccumulatorUpdate::new(data))
         } else {
             UpdateType::BatchAttestation((BatchAttestationUpdate::new(data)))

target_chains/fuel/contracts/pyth-contract/src/data_structures/update_type.sw

@@ -40,8 +40,8 @@ impl GuardianSet {
 }
 
 pub struct StorageGuardianSet {
-    expiration_time: u64,
-    keys: StorageKey<StorageVec<b256>>,
+    pub expiration_time: u64,
+    pub keys: StorageKey<StorageVec<b256>>,
 }
 
 impl StorageGuardianSet {
@@ -54,11 +54,11 @@ impl StorageGuardianSet {
 }
 
 pub struct GuardianSetUpgrade {
-    action: u8,
-    chain: u16,
-    module: b256,
-    new_guardian_set: StorageGuardianSet,
-    new_guardian_set_index: u32,
+    pub action: u8,
+    pub chain: u16,
+    pub module: b256,
+    pub new_guardian_set: StorageGuardianSet,
+    pub new_guardian_set_index: u32,
 }
 
 impl GuardianSetUpgrade {
@@ -106,13 +106,9 @@ impl GuardianSetUpgrade {
         index += 4;
         let guardian_length = encoded_upgrade.get(index).unwrap();
         index += 1;
-        let mut new_guardian_set = StorageGuardianSet::new(
+        let mut new_guardian_set: StorageGuardianSet = StorageGuardianSet::new(
             0,
-            StorageKey {
-                slot: sha256(("guardian_set_keys", new_guardian_set_index)),
-                offset: 0,
-                field_id: ZERO_B256,
-            },
+            StorageKey::<StorageVec<b256>>::new(sha256(("guardian_set_keys", new_guardian_set_index)), 0, ZERO_B256),
         );
         let mut i: u8 = 0;
         while i < guardian_length {
@@ -131,7 +127,7 @@ impl GuardianSetUpgrade {
         );
         require(
             encoded_upgrade
-                .len == index,
+                .len()  == index,
             WormholeError::InvalidGuardianSetUpgradeLength,
         );
         GuardianSetUpgrade::new(
@@ -222,25 +218,24 @@ impl GuardianSignature {
         require(
             recovered_signer
                 .is_ok() && recovered_signer
-                .unwrap()
-                .value == guardian_set_key,
+                .unwrap().bits() == guardian_set_key,
             WormholeError::SignatureInvalid,
         );
     }
 }
 
 pub struct WormholeVM {
-    version: u8,
-    guardian_set_index: u32,
-    governance_action_hash: b256,
+    pub version: u8,
+    pub guardian_set_index: u32,
+    pub governance_action_hash: b256,
     // signatures: Vec<GuardianSignature>, // Shown here to represent data layout of VM, but not needed
-    timestamp: u32,
-    nonce: u32,
-    emitter_chain_id: u16,
-    emitter_address: b256,
-    sequence: u64,
-    consistency_level: u8,
-    payload: Bytes,
+    pub timestamp: u32,
+    pub nonce: u32,
+    pub emitter_chain_id: u16,
+    pub emitter_address: b256,
+    pub sequence: u64,
+    pub consistency_level: u8,
+    pub payload: Bytes,
 }
 
 impl WormholeVM {
@@ -339,7 +334,7 @@ impl WormholeVM {
         let hash_index = index + (signers_length * 66);
         require(
             hash_index < encoded_vm
-                .len,
+                .len(),
             WormholeError::InvalidSignatureLength,
         );
         let (_, slice) = encoded_vm.split_at(hash_index);
@@ -435,7 +430,7 @@ impl WormholeVM {
             WormholeError::ConsistencyLevelIrretrievable,
         );
         index += 1;
-        require(index <= encoded_vm.len, WormholeError::InvalidPayloadLength);
+        require(index <= encoded_vm.len(), WormholeError::InvalidPayloadLength);
         let (_, payload) = encoded_vm.split_at(index);
         WormholeVM::new(
             version
@@ -485,7 +480,7 @@ impl WormholeVM {
         let hash_index = index + (signers_length * 66);
         require(
             hash_index < encoded_vm
-                .len,
+                .len(),
             WormholeError::InvalidSignatureLength,
         );
         let (_, slice) = encoded_vm.split_at(hash_index);
@@ -538,7 +533,7 @@ impl WormholeVM {
             WormholeError::ConsistencyLevelIrretrievable,
         );
         index += 1;
-        require(index <= encoded_vm.len, WormholeError::InvalidPayloadLength);
+        require(index <= encoded_vm.len(), WormholeError::InvalidPayloadLength);
         let (_, payload) = encoded_vm.split_at(index);
         WormholeVM::new(
             version