Fixed many tests - fails on app, cosmos, golem

Author: ethanfrey

Cargo.lock

@@ -63,7 +63,7 @@ tokio-stream = { version = "0.1.15", default-features = false }
 futures = { version = "0.3.30", default-features = false }
 
 cosmrs = { version = "0.13.0", default-features = false, features = ["cosmwasm"] }
-cosmos-sdk-proto = { version = "0.18.0", default-features = false }
+cosmos-sdk-proto = { version = "0.18.0", default-features = false, features = ["cosmwasm"] }
 cw-orch-core = { version = "1"}
 abstract-cw-multi-test = { version = "1", default-features = false }
 

Cargo.toml

@@ -510,6 +510,7 @@ mod tests {
     // run finalize_block
     // query account + balances for update
     fn transaction_workflow<T: PersistentStorage + 'static>(storage: T) {
+        // TODO: convert bech32 to 0x checksummed (make script)
         let sender = must_id("slay3r1pkptre7fdkl6gfrzlesjjvhxhlc3r4gmvk3r3j");
         let recipient = must_id("slay3r1y5hl7x8hxl72dc9gu920eaz6l7vhl0luu6s70h");
         let denom: &str = "uslay";

packages/app/src/app.rs

@@ -4,7 +4,7 @@ use sha2::{
 };
 use thiserror::Error;
 
-use layer_std::AccountId;
+use layer_std::{AccountId, VALID_ADDR_LENGTH};
 
 use crate::PulsarError;
 
@@ -23,7 +23,7 @@ pub fn build_instantiate_address(
     prehash.extend(code_id.to_be_bytes());
     prehash.extend(counter.to_be_bytes());
     let raw = Sha256::digest(prehash);
-    Ok(AccountId::new(&raw)?)
+    Ok(AccountId::new(&raw[..VALID_ADDR_LENGTH])?)
 }
 
 /// We should match the reference wasmd/Go implementation for compatibility with cosmos-sdk:
@@ -58,7 +58,7 @@ pub fn build_instantiate_2_address(
     key.extend_from_slice(&(msg.len() as u64).to_be_bytes());
     key.extend_from_slice(msg);
     let address_data = hash("module", &key);
-    Ok(AccountId::new(&address_data)?)
+    Ok(AccountId::new(&address_data[..VALID_ADDR_LENGTH])?)
 }
 
 /// This must be compatible with the wasmd calls, and thus map to address.Module in Cosmos SDK.
@@ -108,41 +108,31 @@ mod tests {
         let msg2: &[u8] = b"{}";
         let msg3: &[u8] = b"{\"some\":123,\"structure\":{\"nested\":[\"ok\",true]}}";
 
+        // TODO: reduce all expected to 40 chars, not 64 chars
+
         // No msg
-        let expected = AccountId::new(&hex!(
-            "5e865d3e45ad3e961f77fd77d46543417ced44d924dc3e079b5415ff6775f847"
-        ))
-        .unwrap();
+        let expected = AccountId::new(&hex!("5e865d3e45ad3e961f77fd77d46543417ced44d9")).unwrap();
         assert_eq!(
             build_instantiate_2_address(&checksum1, &creator1, &salt1, msg1).unwrap(),
             expected
         );
 
         // With msg
-        let expected = AccountId::new(&hex!(
-            "0995499608947a5281e2c7ebd71bdb26a1ad981946dad57f6c4d3ee35de77835"
-        ))
-        .unwrap();
+        let expected = AccountId::new(&hex!("0995499608947a5281e2c7ebd71bdb26a1ad9819")).unwrap();
         assert_eq!(
             build_instantiate_2_address(&checksum1, &creator1, &salt1, msg2).unwrap(),
             expected
         );
 
         // Long msg
-        let expected = AccountId::new(&hex!(
-            "83326e554723b15bac664ceabc8a5887e27003abe9fbd992af8c7bcea4745167"
-        ))
-        .unwrap();
+        let expected = AccountId::new(&hex!("83326e554723b15bac664ceabc8a5887e27003ab")).unwrap();
         assert_eq!(
             build_instantiate_2_address(&checksum1, &creator1, &salt1, msg3).unwrap(),
             expected
         );
 
         // Long salt
-        let expected = AccountId::new(&hex!(
-            "9384c6248c0bb171e306fd7da0993ec1e20eba006452a3a9e078883eb3594564"
-        ))
-        .unwrap();
+        let expected = AccountId::new(&hex!("9384c6248c0bb171e306fd7da0993ec1e20eba00")).unwrap();
         assert_eq!(
             build_instantiate_2_address(&checksum1, &creator1, &salt2, b"").unwrap(),
             expected

packages/app/src/wasm/utils.rs

@@ -464,7 +464,7 @@ mod tests {
         assert_eq!(res.messages.len(), 0);
         assert_eq!(res.events.len(), 0);
         assert_eq!(res.attributes.len(), 0);
-        assert_eq!(gas_used, 57);
+        assert_eq!(gas_used, 56);
 
         // query the state was written - token_info and total supply
         let num = writer
@@ -662,7 +662,7 @@ mod tests {
         let cw20::AllAccountsResponse { accounts } = from_json(res).unwrap();
         assert_eq!(
             accounts,
-            vec![two.to_string(), one.to_string(), three.to_string()]
+            vec![one.to_string(), two.to_string(), three.to_string()]
         );
     }
 

packages/app/src/wasm/vm/cache.rs

@@ -185,7 +185,9 @@ mod test {
         Coin,
     };
 
-    use layer_std::{AccountId, BankMsg, PubKey, DEFAULT_BECH32_PREFIX};
+    use layer_std::{AccountId, BankMsg, PubKey};
+
+    const DEFAULT_BECH32_PREFIX: &str = "slay3r";
 
     #[test]
     fn happy_path_tx_parsing() {

packages/cosmos/src/tx.rs

@@ -19,7 +19,6 @@ ripemd = { workspace = true }
 tracing = { workspace = true }
 bytes = { workspace = true }
 hex = { workspace = true }
-bech32 = { version = "0.9.1", default-features = false }
 chrono = { version = "0.4.19", default-features = false, features = ["std"] }
 derivative = "2.2.0"
 

packages/std/Cargo.toml

@@ -2,23 +2,14 @@ use std::fmt::{Debug, Display, Formatter};
 use std::ops::Deref;
 
 use ::cosmwasm_schema::serde;
-// use bech32::{self, Error as Bech32Error, FromBase32, ToBase32, Variant};
 use alloy_primitives::{Address, AddressError};
 
 use cosmwasm_std::{Addr, StdResult};
 use cw_storage_plus::{Key, KeyDeserialize, Prefixer, PrimaryKey};
 use thiserror::Error;
 
-// pub const ENV_BECH32_PREFIX: Option<&'static str> = std::option_env!("SLAY_BECH32");
-// pub const DEFAULT_BECH32_PREFIX: &str = "slay3r";
-
 /// Valid lengths of decoded addresses
-pub const VALID_ADDR_LENGTH: [usize; 1] = [20usize];
-// pub const VALID_ADDR_LENGTH: [usize; 2] = [20usize, 32usize];
-
-// fn bech32_prefix() -> &'static str {
-//     ENV_BECH32_PREFIX.unwrap_or(DEFAULT_BECH32_PREFIX)
-// }
+pub const VALID_ADDR_LENGTH: usize = 20;
 
 // Note: this is expanded cw_serde macro minus the Debug implementation, as we want to use Display there
 #[derive(::std::clone::Clone, ::std::cmp::PartialEq, ::cosmwasm_schema::schemars::JsonSchema)]
@@ -117,7 +108,7 @@ pub fn must_id(str: &str) -> AccountId {
 impl AccountId {
     /// This takes
     pub fn new(raw: &[u8]) -> Result<Self, AccountIdError> {
-        if !VALID_ADDR_LENGTH.contains(&raw.len()) {
+        if raw.len() != VALID_ADDR_LENGTH {
             Err(AccountIdError::InvalidLength(raw.len()))
         } else {
             Ok(AccountId(raw.to_vec()))
@@ -134,7 +125,7 @@ impl AccountId {
     pub fn unchecked(name: &str) -> Self {
         // pad to valid length
         let mut v = name.as_bytes().to_vec();
-        v.resize(VALID_ADDR_LENGTH[0], 0u8);
+        v.resize(VALID_ADDR_LENGTH, 0u8);
         AccountId(v)
     }
 

packages/std/src/account_id.rs

@@ -9,7 +9,7 @@ mod time;
 mod tx;
 mod utils;
 
-pub use account_id::{must_id, AccountId, AccountIdError};
+pub use account_id::{must_id, AccountId, AccountIdError, VALID_ADDR_LENGTH};
 use cosmwasm_std::Binary;
 pub use encode::{CoinEncode, HexEncode};
 pub use gas::{GasError, GasMeter, GasResult};