From 3b14168cae9e3aa1509664098189b01188f79312 Mon Sep 17 00:00:00 2001 From: hard-nett Date: Tue, 23 Jul 2024 23:06:45 +0000 Subject: [PATCH] bump --- Cargo.lock | 37 +--------- .../cw-orch/src/external/btsg_ft_factory.rs | 4 +- scripts/Cargo.toml | 2 +- scripts/src/tests/deploy/external.rs | 69 +++++++++---------- 4 files changed, 38 insertions(+), 74 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 00018937b..4f3d4a8df 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -704,26 +704,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "btsg-ft-factory" -version = "2.5.0" -source = "git+https://github.com/hard-nett/dao-contracts?rev=1b1849e1aa41d8cb6a2b6b05db6dae032719b9bb#1b1849e1aa41d8cb6a2b6b05db6dae032719b9bb" -dependencies = [ - "cosmwasm-schema", - "cosmwasm-std", - "cw-orch 0.24.1", - "cw-storage-plus 1.2.0", - "cw2 1.1.2", - "dao-interface 2.5.0 (git+https://github.com/hard-nett/dao-contracts?rev=1b1849e1aa41d8cb6a2b6b05db6dae032719b9bb)", - "osmosis-std-derive", - "prost 0.12.3", - "prost-derive 0.12.3", - "prost-types 0.12.3", - "schemars", - "serde", - "thiserror", -] - [[package]] name = "bumpalo" version = "3.16.0" @@ -3060,21 +3040,6 @@ dependencies = [ "osmosis-std", ] -[[package]] -name = "dao-interface" -version = "2.5.0" -source = "git+https://github.com/hard-nett/dao-contracts?rev=1b1849e1aa41d8cb6a2b6b05db6dae032719b9bb#1b1849e1aa41d8cb6a2b6b05db6dae032719b9bb" -dependencies = [ - "cosmwasm-schema", - "cosmwasm-std", - "cw-orch 0.24.1", - "cw-utils 1.0.3", - "cw2 1.1.2", - "cw20 1.1.2", - "cw721 0.18.0", - "osmosis-std", -] - [[package]] name = "dao-migrator" version = "2.5.0" @@ -6360,7 +6325,7 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" name = "scripts" version = "2.5.0" dependencies = [ - "btsg-ft-factory 2.5.0 (git+https://github.com/hard-nett/dao-contracts?rev=1b1849e1aa41d8cb6a2b6b05db6dae032719b9bb)", + "btsg-ft-factory 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)", "cw-admin-factory 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)", "cw-orch 0.24.1", "cw-payroll-factory 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)", diff --git a/packages/cw-orch/src/external/btsg_ft_factory.rs b/packages/cw-orch/src/external/btsg_ft_factory.rs index 22b6aba3e..d3c29c6b9 100644 --- a/packages/cw-orch/src/external/btsg_ft_factory.rs +++ b/packages/cw-orch/src/external/btsg_ft_factory.rs @@ -1,7 +1,7 @@ use cw_orch::{interface, prelude::*}; -use cw_payroll_factory::contract::{execute, instantiate, query, reply}; -use cw_payroll_factory::msg::{ExecuteMsg, InstantiateMsg, QueryMsg}; +use btsg_ft_factory::contract::{execute, instantiate, query, reply}; +use btsg_ft_factory::msg::{ExecuteMsg, InstantiateMsg, QueryMsg}; #[interface(InstantiateMsg, ExecuteMsg, QueryMsg, Empty)] pub struct DaoExternalFantokenFactory; diff --git a/scripts/Cargo.toml b/scripts/Cargo.toml index 19b5d05d8..5266c6025 100644 --- a/scripts/Cargo.toml +++ b/scripts/Cargo.toml @@ -32,4 +32,4 @@ cw-tokenfactory-issuer = { git = "https://github.com/hard-nett/dao-contracts", cw-vesting = { git = "https://github.com/hard-nett/dao-contracts", branch = "feat/external-cw-orch" } cw721-roles = { git = "https://github.com/hard-nett/dao-contracts", branch = "feat/external-cw-orch" } dao-migrator = { git = "https://github.com/hard-nett/dao-contracts", branch = "feat/external-cw-orch" } -btsg-ft-factory = { git = "https://github.com/hard-nett/dao-contracts", rev = "1b1849e1aa41d8cb6a2b6b05db6dae032719b9bb" } \ No newline at end of file +btsg-ft-factory = { git = "https://github.com/hard-nett/dao-contracts", branch = "feat/external-cw-orch" } \ No newline at end of file diff --git a/scripts/src/tests/deploy/external.rs b/scripts/src/tests/deploy/external.rs index 78bbe9f5b..3300cd86b 100644 --- a/scripts/src/tests/deploy/external.rs +++ b/scripts/src/tests/deploy/external.rs @@ -1,4 +1,5 @@ use crate::external::*; +use btsg_ft_factory::msg::InstantiateMsg; use cw_orch::prelude::*; use cw_tokenfactory_issuer::msg::InstantiateMsg as TokenfactoryIssuerInit; @@ -252,38 +253,36 @@ impl cw_orch::contract::Deploy for DaoMigrationSuite } // bitsong fantoken factory -impl cw_orch::contract::Deploy for FantokenFactorySuite { - // We don't have a custom error type - type Error = CwOrchError; - type DeployData = Addr; - - fn store_on(chain: Chain) -> Result { - let factory = FantokenFactorySuite::new(chain.clone()); - factory.upload()?; - Ok(factory) - } - - fn deployed_state_file_path() -> Option { - None - } - - fn get_contracts_mut(&mut self) -> Vec>> { - vec![Box::new(&mut self.factory)] - } - - fn load_from(chain: Chain) -> Result { - let factory = Self::new(chain.clone()); - Ok(factory) - } - - fn deploy_on(chain: Chain, _data: Self::DeployData) -> Result { - // ########### Upload ############## - let suite: FantokenFactorySuite = - FantokenFactorySuite::store_on(chain.clone()).unwrap(); - // ########### Instantiate ############## - suite - .factory - .instantiate(&btsg_ft_factory::msg::InstantiateMsg {}, None, None); - Ok(suite) - } -} +// impl cw_orch::contract::Deploy for FantokenFactorySuite { +// // We don't have a custom error type +// type Error = CwOrchError; +// type DeployData = Addr; + +// fn store_on(chain: Chain) -> Result { +// let factory = FantokenFactorySuite::new(chain.clone()); +// factory.upload()?; +// Ok(factory) +// } + +// fn deployed_state_file_path() -> Option { +// None +// } + +// fn get_contracts_mut(&mut self) -> Vec>> { +// vec![Box::new(&mut self.factory)] +// } + +// fn load_from(chain: Chain) -> Result { +// let factory = Self::new(chain.clone()); +// Ok(factory) +// } + +// fn deploy_on(chain: Chain, _data: Self::DeployData) -> Result { +// // ########### Upload ############## +// let suite: FantokenFactorySuite = +// FantokenFactorySuite::store_on(chain.clone()).unwrap(); +// // ########### Instantiate ############## +// suite.factory.instantiate(&InstantiateMsg {}, None, None); +// Ok(suite) +// } +// }