feat: cleanup, fmt, aptos-types, bump alloy (#5225)

Author: benluelo

Cargo.lock

@@ -29,7 +29,6 @@ members = [
   "lib/gnark-key-parser",
   "lib/gnark-mimc",
   # "lib/ibc-vm-rs",
-  "cosmwasm/ics08-light-clients/interface",
   "lib/ics23",
   "lib/linea-verifier",
   "lib/linea-zktrie",
@@ -290,6 +289,7 @@ members = [
   "lib/access-manager-types",
   "e2e/access-manager-tests",
   "e2e/access-managed-example",
+  "lib/aptos-types",
 ]
 
 [workspace.package]
@@ -321,6 +321,7 @@ opt-level = 3
 access-managed                            = { path = "cosmwasm/access-managed", default-features = false }
 access-managed-example                    = { path = "e2e/access-managed-example", default-features = false }
 access-manager-types                      = { path = "lib/access-manager-types", default-features = false }
+aptos-types                               = { path = "lib/aptos-types", default-features = false }
 arbitrum-client                           = { path = "lib/arbitrum-client", default-features = false }
 arbitrum-light-client-types               = { path = "lib/arbitrum-light-client-types", default-features = false }
 arbitrum-types                            = { path = "lib/arbitrum-types", default-features = false }
@@ -390,9 +391,7 @@ parlia-verifier                           = { path = "lib/parlia-verifier", defa
 pg-queue                                  = { path = "lib/pg-queue", default-features = false }
 protos                                    = { path = "generated/rust/protos", default-features = false }
 reconnecting-jsonrpc-ws-client            = { path = "lib/reconnecting-jsonrpc-ws-client", default-features = false }
-scroll-codec                              = { path = "lib/scroll-codec", default-features = false }
 scroll-light-client-types                 = { path = "lib/scroll-light-client-types", default-features = false }
-scroll-types                              = { path = "lib/scroll-types", default-features = false }
 serde-utils                               = { path = "lib/serde-utils", default-features = false }
 solidity-slot                             = { path = "lib/solidity-slot", default-features = false }
 ssz                                       = { path = "lib/ssz", default-features = false }
@@ -430,7 +429,6 @@ voyager-plugin-transaction-batch          = { path = "voyager/plugins/transactio
 voyager-primitives                        = { path = "lib/voyager-primitives", default-features = false }
 voyager-rpc                               = { path = "lib/voyager-rpc", default-features = false }
 voyager-sdk                               = { path = "lib/voyager-sdk", default-features = false }
-voyager-sui-ibc-app-plugin                = { path = "voyager/plugins/sui-ibc-app", default-features = false }
 voyager-transaction-plugin-sui            = { path = "voyager/plugins/transaction/sui", default-features = false }
 voyager-types                             = { path = "lib/voyager-types", default-features = false }
 voyager-vm                                = { path = "lib/voyager-vm", default-features = false }
@@ -447,9 +445,9 @@ wasm-client-type                          = { path = "lib/wasm-client-type", def
 # external dependencies
 # =====================
 
-alloy                    = { version = "1.0.9", default-features = false }
-alloy-primitives         = { version = "1.1.2", default-features = false }
-alloy-sol-types          = { version = "1.1.2", default-features = true }
+alloy                    = { version = "1.0", default-features = false }
+alloy-primitives         = { version = "1.1", default-features = false }
+alloy-sol-types          = { version = "1.1", default-features = true }
 anyhow                   = { version = "1" }
 axum                     = { version = "0.8", default-features = false }
 base64                   = { version = "0.22", default-features = false }

Cargo.toml

@@ -1,6 +1,6 @@
 use access_manager_types::{
-    managed::{error::AccessManagedError, event::AuthorityUpdated, msg::QueryMsg},
     Selector,
+    managed::{error::AccessManagedError, event::AuthorityUpdated, msg::QueryMsg},
 };
 use cosmwasm_std::{Addr, Deps, DepsMut, Event, MessageInfo};
 use depolama::StorageExt;

cosmwasm/access-managed/src/contract.rs

@@ -27,7 +27,7 @@
 
 use access_manager_types::managed::msg::{ExecuteMsg, InitMsg, MigrateMsg, QueryMsg};
 use cosmwasm_std::{
-    to_json_binary, Binary, Deps, DepsMut, Env, MessageInfo, Reply, Response, StdError,
+    Binary, Deps, DepsMut, Env, MessageInfo, Reply, Response, StdError, to_json_binary,
 };
 use depolama::StorageExt;
 use frissitheto::UpgradeMsg;
@@ -44,7 +44,7 @@ mod restricted;
 pub mod state;
 
 pub use restricted::{
-    EnsureCanCallResult, Restricted, ACCESS_MANAGED_CONSUME_SCHEDULED_OP_REPLY_ID,
+    ACCESS_MANAGED_CONSUME_SCHEDULED_OP_REPLY_ID, EnsureCanCallResult, Restricted,
 };
 
 /// Initializes the contract connected to an initial authority.

cosmwasm/access-managed/src/lib.rs

@@ -1,7 +1,7 @@
-use access_manager_types::{managed::error::AccessManagedError, CanCall, Selector};
-use cosmwasm_std::{to_json_binary, Addr, DepsMut, Env, MessageInfo, SubMsg, WasmMsg};
+use access_manager_types::{CanCall, Selector, managed::error::AccessManagedError};
+use cosmwasm_std::{Addr, DepsMut, Env, MessageInfo, SubMsg, WasmMsg, to_json_binary};
 use depolama::{StorageExt, Store};
-use serde::{de::DeserializeOwned, Deserialize, Deserializer, Serialize};
+use serde::{Deserialize, Deserializer, Serialize, de::DeserializeOwned};
 
 use crate::{error::ContractError, state::ConsumingSchedule};
 

cosmwasm/access-managed/src/restricted.rs

@@ -1,5 +1,5 @@
 use cosmwasm_std::Addr;
-use depolama::{value::ValueCodecViaEncoding, Prefix, RawAddrEncoding, Store};
+use depolama::{Prefix, RawAddrEncoding, Store, value::ValueCodecViaEncoding};
 use unionlabs_encoding::Bincode;
 
 /// ```solidity

cosmwasm/access-managed/src/state.rs

@@ -87,11 +87,11 @@
 use std::num::NonZero;
 
 use access_manager_types::{
-    manager::msg::{ExecuteMsg, InitMsg, MigrateMsg, QueryMsg},
     RoleId,
+    manager::msg::{ExecuteMsg, InitMsg, MigrateMsg, QueryMsg},
 };
 use cosmwasm_std::{
-    to_json_binary, Binary, Deps, DepsMut, Env, MessageInfo, Reply, Response, StdError, SubMsg,
+    Binary, Deps, DepsMut, Env, MessageInfo, Reply, Response, StdError, SubMsg, to_json_binary,
 };
 use depolama::StorageExt;
 use frissitheto::UpgradeMsg;

cosmwasm/access-manager/src/lib.rs

@@ -1,8 +1,8 @@
 use access_manager_types::{Access, Role, RoleId, Schedule, Selector, TargetConfig};
 use cosmwasm_std::{Addr, StdError, StdResult};
 use depolama::{
-    key::KeyCodecViaEncoding, value::ValueCodecViaEncoding, Bytes, KeyCodec, Prefix,
-    RawAddrEncoding, Store,
+    Bytes, KeyCodec, Prefix, RawAddrEncoding, Store, key::KeyCodecViaEncoding,
+    value::ValueCodecViaEncoding,
 };
 use unionlabs_encoding::{Bincode, DecodeAs, EncodeAs};
 use unionlabs_primitives::H256;

cosmwasm/access-manager/src/state.rs

@@ -1,4 +1,5 @@
 use access_manager_types::{
+    CanCall, HasRole, RoleId, Selector,
     manager::{
         error::AccessManagerError,
         event::{
@@ -7,16 +8,15 @@ use access_manager_types::{
         },
         msg::{ExecuteMsg, QueryMsg},
     },
-    CanCall, HasRole, RoleId, Selector,
 };
-use cosmwasm_std::{testing::message_info, Addr, Response};
+use cosmwasm_std::{Addr, Response, testing::message_info};
 use hex_literal::hex;
 use unionlabs_primitives::H256;
 
 use crate::{
     error::ContractError,
     execute, min_setback, query,
-    tests::utils::{assert_query_result, setup, ACCOUNT_1, ACCOUNT_2, ADMIN, TARGET_1, TARGET_2},
+    tests::utils::{ACCOUNT_1, ACCOUNT_2, ADMIN, TARGET_1, TARGET_2, assert_query_result, setup},
 };
 
 pub mod utils;

cosmwasm/access-manager/src/tests.rs

@@ -1,17 +1,16 @@
 use std::{fmt::Debug, sync::LazyLock};
 
 use access_manager_types::{
+    Access, RoleId,
     manager::{
         event::RoleGranted,
         msg::{InitMsg, QueryMsg},
     },
     time::Delay,
-    Access, RoleId,
 };
 use cosmwasm_std::{
-    from_json,
-    testing::{mock_dependencies, mock_env, MockApi, MockQuerier, MockStorage},
-    Addr, Deps, Env, OwnedDeps, Response,
+    Addr, Deps, Env, OwnedDeps, Response, from_json,
+    testing::{MockApi, MockQuerier, MockStorage, mock_dependencies, mock_env},
 };
 use depolama::StorageExt;
 use frissitheto::UpgradeMsg;