chore: updates for ipc#574 (#238)

Changes for recallnet/ipc#574

Signed-off-by: Sander Pick <[email protected]>

Author: sanderpick

Cargo.lock

@@ -71,18 +71,18 @@ tendermint-rpc = { version = "0.31.1", features = [
 fvm_shared = "4.4.0"
 fvm_ipld_encoding = "0.4.0"
 
-fendermint_actor_blobs_shared = { git = "https://github.com/recallnet/ipc.git", rev = "963ec53b1f45e6ddda135d66b3358f3713c8f6cd" }
-fendermint_actor_bucket = { git = "https://github.com/recallnet/ipc.git", rev = "963ec53b1f45e6ddda135d66b3358f3713c8f6cd" }
-fendermint_actor_recall_config_shared = { git = "https://github.com/recallnet/ipc.git", rev = "963ec53b1f45e6ddda135d66b3358f3713c8f6cd" }
-fendermint_actor_machine = { git = "https://github.com/recallnet/ipc.git", rev = "963ec53b1f45e6ddda135d66b3358f3713c8f6cd" }
-fendermint_actor_timehub = { git = "https://github.com/recallnet/ipc.git", rev = "963ec53b1f45e6ddda135d66b3358f3713c8f6cd" }
-fendermint_crypto = { git = "https://github.com/recallnet/ipc.git", rev = "963ec53b1f45e6ddda135d66b3358f3713c8f6cd" }
-fendermint_eth_api = { git = "https://github.com/recallnet/ipc.git", rev = "963ec53b1f45e6ddda135d66b3358f3713c8f6cd" }
-fendermint_vm_actor_interface = { git = "https://github.com/recallnet/ipc.git", rev = "963ec53b1f45e6ddda135d66b3358f3713c8f6cd" }
-fendermint_vm_message = { git = "https://github.com/recallnet/ipc.git", rev = "963ec53b1f45e6ddda135d66b3358f3713c8f6cd" }
+fendermint_actor_blobs_shared = { git = "https://github.com/recallnet/ipc.git", rev = "aab81e6d14bd7be712293ffbe3631c3cb633d189" }
+fendermint_actor_bucket = { git = "https://github.com/recallnet/ipc.git", rev = "aab81e6d14bd7be712293ffbe3631c3cb633d189" }
+fendermint_actor_recall_config_shared = { git = "https://github.com/recallnet/ipc.git", rev = "aab81e6d14bd7be712293ffbe3631c3cb633d189" }
+fendermint_actor_machine = { git = "https://github.com/recallnet/ipc.git", rev = "aab81e6d14bd7be712293ffbe3631c3cb633d189" }
+fendermint_actor_timehub = { git = "https://github.com/recallnet/ipc.git", rev = "aab81e6d14bd7be712293ffbe3631c3cb633d189" }
+fendermint_crypto = { git = "https://github.com/recallnet/ipc.git", rev = "aab81e6d14bd7be712293ffbe3631c3cb633d189" }
+fendermint_eth_api = { git = "https://github.com/recallnet/ipc.git", rev = "aab81e6d14bd7be712293ffbe3631c3cb633d189" }
+fendermint_vm_actor_interface = { git = "https://github.com/recallnet/ipc.git", rev = "aab81e6d14bd7be712293ffbe3631c3cb633d189" }
+fendermint_vm_message = { git = "https://github.com/recallnet/ipc.git", rev = "aab81e6d14bd7be712293ffbe3631c3cb633d189" }
 
-ipc_actors_abis = { git = "https://github.com/recallnet/ipc.git", rev = "963ec53b1f45e6ddda135d66b3358f3713c8f6cd" }
-ipc-api = { git = "https://github.com/recallnet/ipc.git", rev = "963ec53b1f45e6ddda135d66b3358f3713c8f6cd" }
+ipc_actors_abis = { git = "https://github.com/recallnet/ipc.git", rev = "aab81e6d14bd7be712293ffbe3631c3cb633d189" }
+ipc-api = { git = "https://github.com/recallnet/ipc.git", rev = "aab81e6d14bd7be712293ffbe3631c3cb633d189" }
 
 # Use below when working locally on ipc and this repo simultaneously.
 # Assumes the ipc checkout is in a sibling directory with the same name.

Cargo.toml

@@ -473,6 +473,7 @@ fn object_state_to_json(object: &ObjectState) -> Value {
     let mut val = json!({
         "hash": object.hash.to_string(),
         "size": object.size,
+        "expiry": object.expiry,
     });
     let obj = val.as_object_mut().unwrap();
     if !object.metadata.is_empty() {

cli/src/machine/bucket.rs

@@ -21,7 +21,7 @@ use recall_provider::{
     query::{FvmQueryHeight, QueryProvider},
     response::{decode_bytes, decode_empty},
     tx::{BroadcastMode, DeliverTx, TxResult},
-    util::{get_eth_address, parse_address},
+    util::get_eth_address,
     {Client, Provider},
 };
 use recall_signer::Signer;
@@ -122,17 +122,15 @@ impl From<fendermint_actor_blobs_shared::state::AccountInfo> for Balance {
                 .approvals_to
                 .into_iter()
                 .map(|(k, v)| {
-                    let a = parse_address(&k).expect("failed to parse address from string");
-                    let a = get_eth_address(a).expect("failed to get ethereum address");
+                    let a = get_eth_address(k).expect("failed to get ethereum address");
                     (a.encode_hex_with_prefix(), v.into())
                 })
                 .collect(),
             approvals_from: v
                 .approvals_from
                 .into_iter()
                 .map(|(k, v)| {
-                    let a = parse_address(&k).expect("failed to parse address from string");
-                    let a = get_eth_address(a).expect("failed to get ethereum address");
+                    let a = get_eth_address(k).expect("failed to get ethereum address");
                     (a.encode_hex_with_prefix(), v.into())
                 })
                 .collect(),