feat: add instantiate2_address_inj

InjectiveLabs · Aug 13, 2024 · ed42161 · ed42161
1 parent 9fd9867
commit ed42161
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 15 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -20,7 +20,7 @@ cw-utils             = { version = "2.0.0" }
 cw2                  = { version = "2.0.0" }
 ethereum-types       = { version = "0.5.2" }
 hex                  = { version = "0.4.3", features = [ "serde" ] }
-injective-cosmwasm   = { version = "0.3.0" }
+injective-cosmwasm   = { version = "0.3.1" }
 injective-math       = { version = "0.3.0" }
 injective-std        = { version = "1.13.0" }
 injective-std-derive = { version = "1.13.0" }

diff --git a/packages/injective-cosmwasm/Cargo.toml b/packages/injective-cosmwasm/Cargo.toml
@@ -6,7 +6,7 @@ license     = "Apache-2.0"
 name        = "injective-cosmwasm"
 readme      = "README.md"
 repository  = "https://github.com/InjectiveLabs/cw-injective/tree/dev/packages/injective-cosmwasm"
-version     = "0.3.0"
+version     = "0.3.1"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]

diff --git a/packages/injective-cosmwasm/src/lib.rs b/packages/injective-cosmwasm/src/lib.rs
@@ -61,6 +61,7 @@ pub mod querier;
 pub mod query;
 pub mod route;
 pub mod tokenfactory;
+pub mod utils;
 pub mod wasmx;
 
 #[cfg(not(target_arch = "wasm32"))]

diff --git a/packages/injective-cosmwasm/src/utils.rs b/packages/injective-cosmwasm/src/utils.rs
@@ -0,0 +1,7 @@
+use cosmwasm_std::{instantiate2_address, CanonicalAddr, Instantiate2AddressError};
+
+pub const INJECTIVE_ADDRESS_LENGTH: usize = 20;
+
+pub fn instantiate2_address_inj(checksum: &[u8], creator: &CanonicalAddr, salt: &[u8]) -> Result<CanonicalAddr, Instantiate2AddressError> {
+    Ok(instantiate2_address(checksum, creator, salt)?[..INJECTIVE_ADDRESS_LENGTH].into())
+}
diff --git a/packages/injective-testing/src/address_generator.rs b/packages/injective-testing/src/address_generator.rs
@@ -1,6 +1,7 @@
 use cosmwasm_std::{Addr, Storage};
 use cw_multi_test::AddressGenerator;
 use injective_cosmwasm::addr_to_bech32;
+use injective_cosmwasm::utils::instantiate2_address_inj;
 use rand::OsRng;
 use secp256k1::Secp256k1;
 use std::fmt::Write;
@@ -29,7 +30,7 @@ impl AddressGenerator for InjectiveAddressGenerator {
         creator: &cosmwasm_std::CanonicalAddr,
         salt: &[u8],
     ) -> anyhow::Result<Addr> {
-        let canonical_addr = cosmwasm_std::instantiate2_address(checksum, creator, salt)?;
+        let canonical_addr = instantiate2_address_inj(checksum, creator, salt)?;
         Ok(api.addr_humanize(&canonical_addr)?)
     }
 }