feat: more cleanup

Author: benluelo

Cargo.lock

@@ -452,7 +452,7 @@ alloy-primitives         = { version = "1.1.2", default-features = false }
 alloy-sol-types          = { version = "1.1.2", default-features = true }
 anyhow                   = { version = "1" }
 axum                     = { version = "0.8", default-features = false }
-base64                   = { version = "0.21", default-features = false }
+base64                   = { version = "0.22", default-features = false }
 bcs                      = { version = "0.1.6", default-features = false }
 bincode                  = { version = "2.0.1", default-features = false, features = ["std"] }       # std is used by all dependants
 bip32                    = { version = "0.5.3", default-features = false }
@@ -507,11 +507,11 @@ sha2                     = { version = "0.10.9", default-features = false }
 sha3                     = { version = "0.10.8", default-features = false }
 sqlx                     = { version = "0.7.4", default-features = false }
 static_assertions        = { git = "https://github.com/nvzqz/static-assertions" }                    # https://github.com/nvzqz/static-assertions/pull/28
-strum                    = { version = "0.26.3", default-features = false }
+strum                    = { version = "0.27", default-features = false }
 subtle-encoding          = { version = "0.5.1", default-features = false }
 syn                      = { version = "2", default-features = false }
 thiserror                = { version = "2.0.12", default-features = false }
-time                     = { version = "0.3.41", default-features = false }                          # Pinning to 0.3.36 here since they introduced a new trait in the minor version of semver..
+time                     = { version = "0.3.41", default-features = false }
 tokio                    = { version = "1.45.1", default-features = false }
 tokio-util               = { version = "0.7.15", default-features = false }
 toml                     = { version = "0.8.22", default-features = false }

Cargo.toml

@@ -36,12 +36,12 @@ static_assertions        = { workspace = true }
 thiserror                = { workspace = true }
 typenum                  = { workspace = true, features = ["const-generics", "no_std"] }
 
-base64               = { workspace = true }
-bcs                  = { workspace = true }
-bincode              = { workspace = true, features = ["alloc", "derive"], optional = true }
-borsh                = { workspace = true, features = ["borsh-derive"], optional = true }
-bs58                 = { workspace = true }
-near-primitives-core = { version = "0.21", optional = true }
+base64  = { workspace = true }
+bcs     = { workspace = true }
+bincode = { workspace = true, features = ["alloc", "derive"], optional = true }
+borsh   = { workspace = true, features = ["borsh-derive"], optional = true }
+bs58    = { workspace = true }
+# near-primitives-core = { version = "0.21", optional = true }
 near-sdk             = { workspace = true, optional = true }
 schemars             = { workspace = true, features = ["derive"], optional = true }
 serde_bytes          = "0.11.17"
@@ -63,7 +63,7 @@ ethabi = [
   "unionlabs-primitives/alloy-sol-types-compat",
   "unionlabs-encoding/ethabi",
 ]
-near = ["borsh", "near-sdk", "near-primitives-core"]
+# near = ["borsh", "near-sdk", "near-primitives-core"]
 std = ["sha2/std", "unionlabs-encoding/std"]
 
 fuzzing    = []

lib/unionlabs/Cargo.toml

@@ -34,8 +34,8 @@ pub use unionlabs_primitives as primitives;
 /// Wrapper types around protos defined in <https://github.com/cosmos/gogoproto/tree/main/protobuf/google/protobuf>, matching the proto module structure.
 pub mod google;
 
-#[cfg(feature = "near")]
-pub mod near;
+// #[cfg(feature = "near")]
+// pub mod near;
 
 /// Defines types that wrap the IBC specification, matching the proto module structure. This also includes `union` extensions to ibc (i.e. types defined in `union.ibc`).
 pub mod ibc;

lib/unionlabs/src/lib.rs

@@ -13,7 +13,7 @@ workspace = true
 
 [dependencies]
 anyhow                  = { workspace = true }
-axum                    = { workspace = true, features = ["macros", "tokio", "json"] }
+axum                    = { workspace = true, features = ["macros", "tokio", "json", "http2"] }
 derive_builder          = "0.20.2"
 futures                 = { workspace = true }
 indexmap                = "2.9.0"

lib/voyager-core/Cargo.toml

@@ -124,7 +124,7 @@ impl<Q: Queue<VoyagerMessage>> Engine<Q> {
 
     #[allow(clippy::too_many_lines)]
     pub fn run(&self) -> impl Future<Output = ()> + use<'_, Q> {
-        let queue_rx = api::run(self.rest_laddr.clone());
+        let queue_rx = api::run(self.rest_laddr);
 
         let mut tasks = FuturesUnordered::<BoxFuture<Result<Result<(), BoxDynError>, _>>>::new();
 

lib/voyager-core/src/lib.rs

@@ -19,14 +19,13 @@ cosmos-client                  = { workspace = true }
 cosmos-sdk-event               = { workspace = true }
 cosmwasm-std                   = { workspace = true }
 cw20                           = { workspace = true }
-ethers                         = { version = "1.0.2", default-features = true, features = ["ethers-solc"] }
 hex-literal                    = { workspace = true }
 ibc-solidity                   = { workspace = true, features = ["serde", "rpc"] }
 ibc-union-msg                  = { workspace = true }
 ibc-union-spec                 = { workspace = true }
 jsonrpsee                      = { workspace = true, features = ["tracing", "ws-client", "http-client"] }
 protos                         = { workspace = true }
-rand                           = { workspace = true }
+rand                           = { workspace = true, features = ["default"] }
 regex                          = "1"
 serde                          = { workspace = true }
 serde-utils                    = { workspace = true }

tools/union-test/Cargo.toml

@@ -2,23 +2,20 @@ use std::{marker::PhantomData, panic::AssertUnwindSafe, str::FromStr, time::Dura
 
 use alloy::{
     contract::{Error, RawCallBuilder, Result},
+    hex,
     network::{AnyNetwork, EthereumWallet},
-    primitives::Bytes,
+    primitives::{Address, Bytes},
     providers::{
         fillers::RecommendedFillers, DynProvider, PendingTransactionError, Provider,
         ProviderBuilder,
     },
     rpc::types::Filter,
     signers::local::LocalSigner,
-    sol_types::SolEventInterface,
+    sol_types::{SolEventInterface, SolValue},
     transports::{RpcError, TransportError},
 };
 use bip32::secp256k1::ecdsa::{self, SigningKey};
 use concurrent_keyring::{ConcurrentKeyring, KeyringConfig, KeyringEntry};
-use ethers::{
-    abi::{self, Token},
-    utils::hex as ethers_hex,
-};
 use ibc_solidity::Ibc::IbcEvents;
 use ibc_union_spec::{datagram::Datagram, ChannelId};
 use jsonrpsee::{core::RpcResult, types::ErrorObjectOwned};
@@ -688,12 +685,11 @@ impl<'a> Module<'a> {
         spender: H160,
         provider: DynProvider<AnyNetwork>,
     ) -> anyhow::Result<H160> {
-        const BYTECODE: &str = "0x608060405234801561000f575f5ffd5b50604051610b91380380610b9183398101604081905261002e916102f0565b6040518060400160405280600481526020016311dbdb1960e21b8152506040518060400160405280600381526020016211d31160ea1b815250816003908161007691906103c1565b50600461008382826103c1565b50505061009633836100a860201b60201c565b6100a13382846100e5565b50506104a0565b6001600160a01b0382166100d65760405163ec442f0560e01b81525f60048201526024015b60405180910390fd5b6100e15f83836100f7565b5050565b6100f2838383600161021d565b505050565b6001600160a01b038316610121578060025f828254610116919061047b565b909155506101919050565b6001600160a01b0383165f90815260208190526040902054818110156101735760405163391434e360e21b81526001600160a01b038516600482015260248101829052604481018390526064016100cd565b6001600160a01b0384165f9081526020819052604090209082900390555b6001600160a01b0382166101ad576002805482900390556101cb565b6001600160a01b0382165f9081526020819052604090208054820190555b816001600160a01b0316836001600160a01b03167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef8360405161021091815260200190565b60405180910390a3505050565b6001600160a01b0384166102465760405163e602df0560e01b81525f60048201526024016100cd565b6001600160a01b03831661026f57604051634a1406b160e11b81525f60048201526024016100cd565b6001600160a01b038085165f90815260016020908152604080832093871683529290522082905580156102ea57826001600160a01b0316846001600160a01b03167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925846040516102e191815260200190565b60405180910390a35b50505050565b5f5f60408385031215610301575f5ffd5b825160208401519092506001600160a01b038116811461031f575f5ffd5b809150509250929050565b634e487b7160e01b5f52604160045260245ffd5b600181811c9082168061035257607f821691505b60208210810361037057634e487b7160e01b5f52602260045260245ffd5b50919050565b601f8211156100f257805f5260205f20601f840160051c8101602085101561039b5750805b601f840160051c820191505b818110156103ba575f81556001016103a7565b5050505050565b81516001600160401b038111156103da576103da61032a565b6103ee816103e8845461033e565b84610376565b6020601f821160018114610420575f83156104095750848201515b5f19600385901b1c1916600184901b1784556103ba565b5f84815260208120601f198516915b8281101561044f578785015182556020948501946001909201910161042f565b508482101561046c57868401515f19600387901b60f8161c191681555b50505050600190811b01905550565b8082018082111561049a57634e487b7160e01b5f52601160045260245ffd5b92915050565b6106e4806104ad5f395ff3fe608060405234801561000f575f5ffd5b5060043610610090575f3560e01c8063313ce56711610063578063313ce567146100fa57806370a082311461010957806395d89b4114610131578063a9059cbb14610139578063dd62ed3e1461014c575f5ffd5b806306fdde0314610094578063095ea7b3146100b257806318160ddd146100d557806323b872dd146100e7575b5f5ffd5b61009c610184565b6040516100a99190610554565b60405180910390f35b6100c56100c03660046105a4565b610214565b60405190151581526020016100a9565b6002545b6040519081526020016100a9565b6100c56100f53660046105cc565b61022d565b604051601281526020016100a9565b6100d9610117366004610606565b6001600160a01b03165f9081526020819052604090205490565b61009c610250565b6100c56101473660046105a4565b61025f565b6100d961015a366004610626565b6001600160a01b039182165f90815260016020908152604080832093909416825291909152205490565b60606003805461019390610657565b80601f01602080910402602001604051908101604052809291908181526020018280546101bf90610657565b801561020a5780601f106101e15761010080835404028352916020019161020a565b820191905f5260205f20905b8154815290600101906020018083116101ed57829003601f168201915b5050505050905090565b5f3361022181858561026c565b60019150505b92915050565b5f3361023a85828561027e565b6102458585856102ff565b506001949350505050565b60606004805461019390610657565b5f336102218185856102ff565b610279838383600161035c565b505050565b6001600160a01b038381165f908152600160209081526040808320938616835292905220545f198110156102f957818110156102eb57604051637dc7a0d960e11b81526001600160a01b038416600482015260248101829052604481018390526064015b60405180910390fd5b6102f984848484035f61035c565b50505050565b6001600160a01b03831661032857604051634b637e8f60e11b81525f60048201526024016102e2565b6001600160a01b0382166103515760405163ec442f0560e01b81525f60048201526024016102e2565b61027983838361042e565b6001600160a01b0384166103855760405163e602df0560e01b81525f60048201526024016102e2565b6001600160a01b0383166103ae57604051634a1406b160e11b81525f60048201526024016102e2565b6001600160a01b038085165f90815260016020908152604080832093871683529290522082905580156102f957826001600160a01b0316846001600160a01b03167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9258460405161042091815260200190565b60405180910390a350505050565b6001600160a01b038316610458578060025f82825461044d919061068f565b909155506104c89050565b6001600160a01b0383165f90815260208190526040902054818110156104aa5760405163391434e360e21b81526001600160a01b038516600482015260248101829052604481018390526064016102e2565b6001600160a01b0384165f9081526020819052604090209082900390555b6001600160a01b0382166104e457600280548290039055610502565b6001600160a01b0382165f9081526020819052604090208054820190555b816001600160a01b0316836001600160a01b03167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef8360405161054791815260200190565b60405180910390a3505050565b602081525f82518060208401528060208501604085015e5f604082850101526040601f19601f83011684010191505092915050565b80356001600160a01b038116811461059f575f5ffd5b919050565b5f5f604083850312156105b5575f5ffd5b6105be83610589565b946020939093013593505050565b5f5f5f606084860312156105de575f5ffd5b6105e784610589565b92506105f560208501610589565b929592945050506040919091013590565b5f60208284031215610616575f5ffd5b61061f82610589565b9392505050565b5f5f60408385031215610637575f5ffd5b61064083610589565b915061064e60208401610589565b90509250929050565b600181811c9082168061066b57607f821691505b60208210810361068957634e487b7160e01b5f52602260045260245ffd5b50919050565b8082018082111561022757634e487b7160e01b5f52601160045260245ffdfea26469706673582212207cfaf374f2b49d6608fed1bc9f4e741950ec2c77f36bb3d89258c5218167ab4764736f6c634300081e0033";
-        let mut code = ethers_hex::decode(BYTECODE.trim_start_matches("0x"))?;
-        #[allow(clippy::disallowed_types)]
-        let initial_supply = ethers::types::U256::from_dec_str("1000000000000000000")?;
-        let spender = ethers::types::Address::from_str(&spender.to_string())?;
-        let encoded = abi::encode(&[Token::Uint(initial_supply), Token::Address(spender)]);
+        let mut code = hex!("0x608060405234801561000f575f5ffd5b50604051610b91380380610b9183398101604081905261002e916102f0565b6040518060400160405280600481526020016311dbdb1960e21b8152506040518060400160405280600381526020016211d31160ea1b815250816003908161007691906103c1565b50600461008382826103c1565b50505061009633836100a860201b60201c565b6100a13382846100e5565b50506104a0565b6001600160a01b0382166100d65760405163ec442f0560e01b81525f60048201526024015b60405180910390fd5b6100e15f83836100f7565b5050565b6100f2838383600161021d565b505050565b6001600160a01b038316610121578060025f828254610116919061047b565b909155506101919050565b6001600160a01b0383165f90815260208190526040902054818110156101735760405163391434e360e21b81526001600160a01b038516600482015260248101829052604481018390526064016100cd565b6001600160a01b0384165f9081526020819052604090209082900390555b6001600160a01b0382166101ad576002805482900390556101cb565b6001600160a01b0382165f9081526020819052604090208054820190555b816001600160a01b0316836001600160a01b03167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef8360405161021091815260200190565b60405180910390a3505050565b6001600160a01b0384166102465760405163e602df0560e01b81525f60048201526024016100cd565b6001600160a01b03831661026f57604051634a1406b160e11b81525f60048201526024016100cd565b6001600160a01b038085165f90815260016020908152604080832093871683529290522082905580156102ea57826001600160a01b0316846001600160a01b03167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925846040516102e191815260200190565b60405180910390a35b50505050565b5f5f60408385031215610301575f5ffd5b825160208401519092506001600160a01b038116811461031f575f5ffd5b809150509250929050565b634e487b7160e01b5f52604160045260245ffd5b600181811c9082168061035257607f821691505b60208210810361037057634e487b7160e01b5f52602260045260245ffd5b50919050565b601f8211156100f257805f5260205f20601f840160051c8101602085101561039b5750805b601f840160051c820191505b818110156103ba575f81556001016103a7565b5050505050565b81516001600160401b038111156103da576103da61032a565b6103ee816103e8845461033e565b84610376565b6020601f821160018114610420575f83156104095750848201515b5f19600385901b1c1916600184901b1784556103ba565b5f84815260208120601f198516915b8281101561044f578785015182556020948501946001909201910161042f565b508482101561046c57868401515f19600387901b60f8161c191681555b50505050600190811b01905550565b8082018082111561049a57634e487b7160e01b5f52601160045260245ffd5b92915050565b6106e4806104ad5f395ff3fe608060405234801561000f575f5ffd5b5060043610610090575f3560e01c8063313ce56711610063578063313ce567146100fa57806370a082311461010957806395d89b4114610131578063a9059cbb14610139578063dd62ed3e1461014c575f5ffd5b806306fdde0314610094578063095ea7b3146100b257806318160ddd146100d557806323b872dd146100e7575b5f5ffd5b61009c610184565b6040516100a99190610554565b60405180910390f35b6100c56100c03660046105a4565b610214565b60405190151581526020016100a9565b6002545b6040519081526020016100a9565b6100c56100f53660046105cc565b61022d565b604051601281526020016100a9565b6100d9610117366004610606565b6001600160a01b03165f9081526020819052604090205490565b61009c610250565b6100c56101473660046105a4565b61025f565b6100d961015a366004610626565b6001600160a01b039182165f90815260016020908152604080832093909416825291909152205490565b60606003805461019390610657565b80601f01602080910402602001604051908101604052809291908181526020018280546101bf90610657565b801561020a5780601f106101e15761010080835404028352916020019161020a565b820191905f5260205f20905b8154815290600101906020018083116101ed57829003601f168201915b5050505050905090565b5f3361022181858561026c565b60019150505b92915050565b5f3361023a85828561027e565b6102458585856102ff565b506001949350505050565b60606004805461019390610657565b5f336102218185856102ff565b610279838383600161035c565b505050565b6001600160a01b038381165f908152600160209081526040808320938616835292905220545f198110156102f957818110156102eb57604051637dc7a0d960e11b81526001600160a01b038416600482015260248101829052604481018390526064015b60405180910390fd5b6102f984848484035f61035c565b50505050565b6001600160a01b03831661032857604051634b637e8f60e11b81525f60048201526024016102e2565b6001600160a01b0382166103515760405163ec442f0560e01b81525f60048201526024016102e2565b61027983838361042e565b6001600160a01b0384166103855760405163e602df0560e01b81525f60048201526024016102e2565b6001600160a01b0383166103ae57604051634a1406b160e11b81525f60048201526024016102e2565b6001600160a01b038085165f90815260016020908152604080832093871683529290522082905580156102f957826001600160a01b0316846001600160a01b03167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b9258460405161042091815260200190565b60405180910390a350505050565b6001600160a01b038316610458578060025f82825461044d919061068f565b909155506104c89050565b6001600160a01b0383165f90815260208190526040902054818110156104aa5760405163391434e360e21b81526001600160a01b038516600482015260248101829052604481018390526064016102e2565b6001600160a01b0384165f9081526020819052604090209082900390555b6001600160a01b0382166104e457600280548290039055610502565b6001600160a01b0382165f9081526020819052604090208054820190555b816001600160a01b0316836001600160a01b03167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef8360405161054791815260200190565b60405180910390a3505050565b602081525f82518060208401528060208501604085015e5f604082850101526040601f19601f83011684010191505092915050565b80356001600160a01b038116811461059f575f5ffd5b919050565b5f5f604083850312156105b5575f5ffd5b6105be83610589565b946020939093013593505050565b5f5f5f606084860312156105de575f5ffd5b6105e784610589565b92506105f560208501610589565b929592945050506040919091013590565b5f60208284031215610616575f5ffd5b61061f82610589565b9392505050565b5f5f60408385031215610637575f5ffd5b61064083610589565b915061064e60208401610589565b90509250929050565b600181811c9082168061066b57607f821691505b60208210810361068957634e487b7160e01b5f52602260045260245ffd5b50919050565b8082018082111561022757634e487b7160e01b5f52601160045260245ffdfea26469706673582212207cfaf374f2b49d6608fed1bc9f4e741950ec2c77f36bb3d89258c5218167ab4764736f6c634300081e0033").to_vec();
+
+        let initial_supply = "1000000000000000000".parse::<alloy::primitives::U256>()?;
+        let spender = Address::from_str(&spender.to_string())?;
+        let encoded = (initial_supply, spender).abi_encode_params();
 
         code.extend(&encoded);