chore(zkgm): staking extension fixes

Author: hussein-aitlahcen

cosmwasm/cosmwasm.nix

@@ -110,14 +110,16 @@ _: {
           apps = {
             ucs03 = ucs03-configs.cw20 // {
               rate_limit_disabled = true;
+              # 2 minutes
+              unbonding_period = 2 * 60;
             };
           };
           # lightclients = pkgs.lib.lists.remove "cometbls" (builtins.attrNames all-lightclients);
           lightclients = [
             # "ethereum"
-            # "trusted-mpt"
+            "trusted-mpt"
             # "bob"
-            "ethermint"
+            # "ethermint"
           ];
         }
         {
@@ -158,7 +160,10 @@ _: {
             gas_multiplier = 1.4;
           };
           apps = {
-            ucs03 = ucs03-configs.cw20;
+            ucs03 = ucs03-configs.cw20 // {
+              # 27 days unbonding period
+              unbonding_period = 27 * 24 * 60 * 60;
+            };
           };
           bech32_prefix = "union";
           lightclients = [
@@ -448,21 +453,25 @@ _: {
       ucs03-configs = {
         cw20 = {
           path = "${ucs03-zkgm.release}";
+          cw_account_path = "${cw-account.release}";
           token_minter_path = "${cw20-token-minter.release}";
           token_minter_config = {
             cw20 = {
               cw20_base = "${cw20-base.release}";
             };
           };
           rate_limit_disabled = false;
+          unbonding_period = 0;
         };
         osmosis_tokenfactory = {
           rate_limit_disabled = false;
           path = "${ucs03-zkgm.release}";
+          cw_account_path = "${cw-account.release}";
           token_minter_path = "${osmosis-tokenfactory-token-minter.release}";
           token_minter_config = {
             osmosis_tokenfactory = { };
           };
+          unbonding_period = 0;
         };
       };
 
@@ -708,6 +717,17 @@ _: {
 
                   echo "token minter code id: $(cat token-minter-code-id.txt)"
 
+                  PRIVATE_KEY=${private_key} \
+                  RUST_LOG=info \
+                    cosmwasm-deployer \
+                    store-code \
+                    --rpc-url ${rpc_url} \
+                    --bytecode ${apps.ucs03.cw_account_path} \
+                    --output cw-account-code-id.txt \
+                    ${mk-gas-args gas_config}
+
+                  echo "cw-account code id: $(cat cw-account-code-id.txt)"
+
                   DEPLOYER=$(
                     PRIVATE_KEY=${private_key} \
                       cosmwasm-deployer \
@@ -727,7 +747,7 @@ _: {
                     --address "$(echo "$ADDRESSES" | jq '.app."${app}"' -r)" \
                     --message "{\"token_minter_migration\":{\"new_code_id\":$(cat token-minter-code-id.txt),\"msg\":\"$(echo '{}' | base64)\"}, \"rate_limit_disabled\":${
                       if apps.ucs03.rate_limit_disabled then "true" else "false"
-                    }}" \
+                    }, \"cw_account_code_id\": $(cat cw-account-code-id.txt)}" \
                     --force \
                     --new-bytecode ${(mk-app full-app.name).release} \
                     ${mk-gas-args gas_config}
@@ -813,6 +833,8 @@ _: {
 
       ucs03-zkgm = crane.buildWasmContract "cosmwasm/ibc-union/app/ucs03-zkgm" { };
 
+      cw-account = crane.buildWasmContract "cosmwasm/cw-account" { };
+
       cw20-base = crane.buildWasmContract "cosmwasm/cw20-base" { };
 
       ibc-union = crane.buildWasmContract "cosmwasm/ibc-union/core" { };
@@ -1012,6 +1034,7 @@ _: {
             osmosis-tokenfactory-token-minter
             ibc-union
             multicall
+            cw-account
             ;
           cosmwasm-scripts =
             {

cosmwasm/cw-account/Cargo.toml

@@ -13,7 +13,7 @@ crate-type = ["cdylib", "rlib"]
 
 [dependencies]
 cosmwasm-schema = { workspace = true }
-cosmwasm-std    = { workspace = true, features = ["cosmwasm_1_3"] }
+cosmwasm-std    = { workspace = true, features = ["cosmwasm_1_3", "staking"] }
 cw-storage-plus = { workspace = true }
 embed-commit    = { workspace = true }
 frissitheto     = { workspace = true }

cosmwasm/deployer/src/main.rs

@@ -338,8 +338,10 @@ struct AppPaths {
 pub struct Ucs03Config {
     path: PathBuf,
     token_minter_path: PathBuf,
+    cw_account_path: PathBuf,
     token_minter_config: TokenMinterConfig,
     rate_limit_disabled: bool,
+    unbonding_period: u64,
 }
 
 #[derive(Debug, Serialize, Deserialize)]
@@ -684,6 +686,47 @@ async fn do_main() -> Result<()> {
                         }
                     };
 
+                    let (tx_hash, response) = ctx
+                        .tx(
+                            MsgStoreCode {
+                                sender: ctx.wallet().address().map_data(Into::into),
+                                wasm_byte_code: std::fs::read(ucs03_config.cw_account_path)?.into(),
+                                instantiate_permission: None,
+                            },
+                            "",
+                            gas_config.simulate,
+                        )
+                        .await
+                        .context("store minter code")?;
+
+                    let cw_account_code_id = response.code_id;
+
+                    info!(%tx_hash, cw_account_code_id, "cw_account stored");
+
+                    // on permissioned cosmwasm, we must specify that this code can be instantiated by the ucs03 contract
+                    if permissioned {
+                        let (tx_hash, _) = ctx
+                            .tx(
+                                MsgUpdateInstantiateConfig {
+                                    sender: ctx.wallet().address().map_data(Into::into),
+                                    code_id: cw_account_code_id,
+                                    new_instantiate_permission: Some(
+                                        AccessConfig::AnyOfAddresses {
+                                            addresses: vec![ucs03_address
+                                                .clone()
+                                                .map_data(Into::into)],
+                                        },
+                                    ),
+                                },
+                                "",
+                                gas_config.simulate,
+                            )
+                            .await
+                            .context("update instantiate perms of cw-account")?;
+
+                        info!(%tx_hash, "cw-account instantiate permissions updated");
+                    }
+
                     ctx.deploy_and_initiate(
                         std::fs::read(ucs03_config.path)?,
                         bytecode_base_code_id,
@@ -699,6 +742,9 @@ async fn do_main() -> Result<()> {
                                     ctx.wallet().address().to_string(),
                                 )],
                                 rate_limit_disabled: ucs03_config.rate_limit_disabled,
+                                dummy_code_id: bytecode_base_code_id.get(),
+                                cw_account_code_id: cw_account_code_id.get(),
+                                unbonding_period: ucs03_config.unbonding_period,
                             },
                             minter_init_params,
                         },