chore: added deployable interfaces to all ADOs (#620)

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
andromedaprotocol · Nov 18, 2024 · e8d7176 · e8d7176
1 parent c7b020b
commit e8d7176
Show file tree

Hide file tree

Showing 75 changed files with 546 additions and 25 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -31,7 +31,7 @@ jobs:
           sudo make version-map
           make build
       - name: Upload Artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: contracts
           path: ./artifacts/
@@ -44,7 +44,7 @@ jobs:
       - name: Build Deploy Script
         run: cargo build -p andromeda-deploy --release
       - name: Upload Artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: deploy
           path: ./target/release/andromeda-deploy
@@ -83,7 +83,7 @@ jobs:
           chmod +x ./andromeda-deploy
           ./andromeda-deploy
       - name: Upload Deployment Report
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: deployment-report
           path: ./deployment-reports/

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -75,7 +75,7 @@ jobs:
           chmod +x "${GITHUB_WORKSPACE}/.github/file-size.sh"
           "${GITHUB_WORKSPACE}/.github/file-size.sh"
       - name: Upload Artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: contracts
           path: ./artifacts/
@@ -111,7 +111,7 @@ jobs:
           chmod +x "${GITHUB_WORKSPACE}/scripts/build_schema.sh"
           "${GITHUB_WORKSPACE}/scripts/build_schema.sh"
       - name: Upload Artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: schema
           path: ./schemas/

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Added Kernel ICS20 Transfer with Optional ExecuteMsg [(#577)](https://github.com/andromedaprotocol/andromeda-core/pull/577)
 - Added IBC Denom Wrap/Unwrap [(#579)](https://github.com/andromedaprotocol/andromeda-core/pull/579)
 - Added deployment script/CI workflow for OS [(#616)](https://github.com/andromedaprotocol/andromeda-core/pull/616)
+- Added deployable interfaces to all ADOs [(#620)](https://github.com/andromedaprotocol/andromeda-core/pull/620)
 
 ### Changed
 

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/contracts/app/andromeda-app-contract/Cargo.toml b/contracts/app/andromeda-app-contract/Cargo.toml
@@ -20,6 +20,7 @@ enum-repr = { workspace = true }
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 cw-multi-test = { workspace = true, optional = true }
 andromeda-testing = { workspace = true, optional = true }
+cw-orch = { workspace = true }
 
 
 [features]

diff --git a/contracts/app/andromeda-app-contract/src/interface.rs b/contracts/app/andromeda-app-contract/src/interface.rs
@@ -0,0 +1,6 @@
+use andromeda_app::app::{ExecuteMsg, InstantiateMsg, QueryMsg};
+use andromeda_std::{ado_base::MigrateMsg, contract_interface, deploy::ADOMetadata};
+
+pub const CONTRACT_ID: &str = "app-contract";
+
+contract_interface!(AppContract, CONTRACT_ID, "andromeda_app_contract.wasm");
diff --git a/contracts/app/andromeda-app-contract/src/lib.rs b/contracts/app/andromeda-app-contract/src/lib.rs
@@ -10,3 +10,8 @@ pub mod testing;
 mod execute;
 mod query;
 mod reply;
+
+#[cfg(not(target_arch = "wasm32"))]
+mod interface;
+#[cfg(not(target_arch = "wasm32"))]
+pub use crate::interface::AppContract;
diff --git a/contracts/data-storage/andromeda-boolean/Cargo.toml b/contracts/data-storage/andromeda-boolean/Cargo.toml
@@ -38,3 +38,4 @@ andromeda-data-storage = { workspace = true }
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 cw-multi-test = { workspace = true, optional = true }
 andromeda-testing = { workspace = true, optional = true }
+cw-orch = { workspace = true }
diff --git a/contracts/data-storage/andromeda-boolean/src/contract.rs b/contracts/data-storage/andromeda-boolean/src/contract.rs
@@ -1,6 +1,6 @@
 #[cfg(not(feature = "library"))]
 use cosmwasm_std::entry_point;
-use cosmwasm_std::{Addr, Binary, Deps, DepsMut, Env, MessageInfo, Response};
+use cosmwasm_std::{Addr, Binary, Deps, DepsMut, Env, MessageInfo, Reply, Response, StdError};
 
 use crate::{
     execute::handle_execute,
@@ -92,3 +92,14 @@ pub fn query(deps: Deps, env: Env, msg: QueryMsg) -> Result<Binary, ContractErro
 pub fn migrate(deps: DepsMut, _env: Env, _msg: MigrateMsg) -> Result<Response, ContractError> {
     ADOContract::default().migrate(deps, CONTRACT_NAME, CONTRACT_VERSION)
 }
+
+#[cfg_attr(not(feature = "library"), entry_point)]
+pub fn reply(_deps: DepsMut, _env: Env, msg: Reply) -> Result<Response, ContractError> {
+    if msg.result.is_err() {
+        return Err(ContractError::Std(StdError::generic_err(
+            msg.result.unwrap_err(),
+        )));
+    }
+
+    Ok(Response::default())
+}
diff --git a/contracts/data-storage/andromeda-boolean/src/interface.rs b/contracts/data-storage/andromeda-boolean/src/interface.rs
@@ -0,0 +1,6 @@
+use andromeda_data_storage::boolean::{ExecuteMsg, InstantiateMsg, QueryMsg};
+use andromeda_std::{ado_base::MigrateMsg, contract_interface, deploy::ADOMetadata};
+
+pub const CONTRACT_ID: &str = "boolean";
+
+contract_interface!(BooleanContract, CONTRACT_ID, "andromeda_boolean.wasm");
diff --git a/contracts/data-storage/andromeda-boolean/src/lib.rs b/contracts/data-storage/andromeda-boolean/src/lib.rs
@@ -7,3 +7,8 @@ mod state;
 
 #[cfg(test)]
 mod testing;
+
+#[cfg(not(target_arch = "wasm32"))]
+mod interface;
+#[cfg(not(target_arch = "wasm32"))]
+pub use crate::interface::BooleanContract;
diff --git a/contracts/data-storage/andromeda-string-storage/Cargo.toml b/contracts/data-storage/andromeda-string-storage/Cargo.toml
@@ -38,3 +38,4 @@ andromeda-data-storage = { workspace = true }
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 cw-multi-test = { workspace = true, optional = true }
 andromeda-testing = { workspace = true, optional = true }
+cw-orch = { workspace = true }
diff --git a/contracts/data-storage/andromeda-string-storage/src/contract.rs b/contracts/data-storage/andromeda-string-storage/src/contract.rs
@@ -1,6 +1,6 @@
 #[cfg(not(feature = "library"))]
 use cosmwasm_std::entry_point;
-use cosmwasm_std::{Binary, Deps, DepsMut, Env, MessageInfo, Response};
+use cosmwasm_std::{Binary, Deps, DepsMut, Env, MessageInfo, Reply, Response, StdError};
 
 use crate::{
     execute::handle_execute,
@@ -72,3 +72,14 @@ pub fn query(deps: Deps, env: Env, msg: QueryMsg) -> Result<Binary, ContractErro
 pub fn migrate(deps: DepsMut, _env: Env, _msg: MigrateMsg) -> Result<Response, ContractError> {
     ADOContract::default().migrate(deps, CONTRACT_NAME, CONTRACT_VERSION)
 }
+
+#[cfg_attr(not(feature = "library"), entry_point)]
+pub fn reply(_deps: DepsMut, _env: Env, msg: Reply) -> Result<Response, ContractError> {
+    if msg.result.is_err() {
+        return Err(ContractError::Std(StdError::generic_err(
+            msg.result.unwrap_err(),
+        )));
+    }
+
+    Ok(Response::default())
+}
diff --git a/contracts/data-storage/andromeda-string-storage/src/interface.rs b/contracts/data-storage/andromeda-string-storage/src/interface.rs
@@ -0,0 +1,10 @@
+use andromeda_data_storage::string_storage::{ExecuteMsg, InstantiateMsg, QueryMsg};
+use andromeda_std::{ado_base::MigrateMsg, contract_interface, deploy::ADOMetadata};
+
+pub const CONTRACT_ID: &str = "string-storage";
+
+contract_interface!(
+    StringStorageContract,
+    CONTRACT_ID,
+    "andromeda_string_storage.wasm"
+);
diff --git a/contracts/data-storage/andromeda-string-storage/src/lib.rs b/contracts/data-storage/andromeda-string-storage/src/lib.rs
@@ -7,3 +7,8 @@ mod state;
 
 #[cfg(test)]
 mod testing;
+
+#[cfg(not(target_arch = "wasm32"))]
+mod interface;
+#[cfg(not(target_arch = "wasm32"))]
+pub use crate::interface::StringStorageContract;
diff --git a/contracts/finance/andromeda-conditional-splitter/Cargo.toml b/contracts/finance/andromeda-conditional-splitter/Cargo.toml
@@ -27,6 +27,7 @@ andromeda-finance = { workspace = true }
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 cw-multi-test = { workspace = true, optional = true }
 andromeda-testing = { workspace = true, optional = true }
+cw-orch = { workspace = true }
 
 [dev-dependencies]
 andromeda-app = { workspace = true }
diff --git a/contracts/finance/andromeda-conditional-splitter/src/interface.rs b/contracts/finance/andromeda-conditional-splitter/src/interface.rs
@@ -0,0 +1,10 @@
+use andromeda_finance::conditional_splitter::{ExecuteMsg, InstantiateMsg, QueryMsg};
+use andromeda_std::{ado_base::MigrateMsg, contract_interface, deploy::ADOMetadata};
+
+pub const CONTRACT_ID: &str = "conditional-splitter";
+
+contract_interface!(
+    ConditionalSplitterContract,
+    CONTRACT_ID,
+    "andromeda_conditional_splitter.wasm"
+);
diff --git a/contracts/finance/andromeda-conditional-splitter/src/lib.rs b/contracts/finance/andromeda-conditional-splitter/src/lib.rs
@@ -6,3 +6,8 @@ pub mod mock;
 
 #[cfg(test)]
 mod testing;
+
+#[cfg(not(target_arch = "wasm32"))]
+mod interface;
+#[cfg(not(target_arch = "wasm32"))]
+pub use crate::interface::ConditionalSplitterContract;
diff --git a/contracts/finance/andromeda-rate-limiting-withdrawals/Cargo.toml b/contracts/finance/andromeda-rate-limiting-withdrawals/Cargo.toml
@@ -29,6 +29,7 @@ andromeda-finance = { workspace = true }
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 cw-multi-test = { workspace = true, optional = true }
 andromeda-testing = { workspace = true, optional = true }
+cw-orch = { workspace = true }
 
 [dev-dependencies]
 andromeda-app = { workspace = true }