Split into bot and app

AbstractSDK · Jan 16, 2024 · cab5783 · cab5783
1 parent b17c6f3
commit cab5783
Show file tree

Hide file tree

Showing 56 changed files with 78 additions and 62 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,62 +1,4 @@
-[package]
-name = "app"
-version = "0.0.1"
-authors = [
-  "CyberHoward <[email protected]>",
-  "Adair <[email protected]>",
-  "Abstract Money <[email protected]>",
-]
-edition = "2021"
-homepage = ""
-documentation = ""
-repository = ""
-license = "GPL-3.0-or-later"
-keywords = ["cosmos", "cosmwasm", "abstractsdk"]
+[workspace]
+members = ["contracts/*", "savings-bot"]
 resolver = "2"
-
-exclude = ["contract.wasm", "hash.txt"]
-
-[lib]
-crate-type = ["cdylib", "rlib"]
-
-[[example]]
-name = "schema"
-required-features = ["schema"]
-
-[features]
-default = ["export"]
-export = []
-# enable node-backed tests (ensure Docker is running)
-# run with `cargo test --jobs 1 --features node-tests`
-node-tests = ["interface"]
-interface = ["export", "dep:abstract-interface", "dep:cw-orch"]
-schema = ["abstract-app/schema"]
-
-[dependencies]
-cosmwasm-std = { version = "1.2" }
-cosmwasm-schema = { version = "1.2" }
-cw-controllers = { version = "1.0.1" }
-cw-storage-plus = "1.1.0"
-thiserror = { version = "1.0.50" }
-schemars = "0.8"
-cw-asset = { version = "3.0" }
-
-abstract-core = { version = "0.19.2" }
-abstract-app = { version = "0.19.2" }
-abstract-sdk = { version = "0.19.2" }
-
-# Dependencies for interface
-abstract-interface = { version = "0.19.2", optional = true }
-cw-orch = { version = "0.16.4", optional = true }
-
-[dev-dependencies]
-app = { path = ".", features = ["interface"] }
-abstract-interface = { version = "0.19.2", features = ["daemon"] }
-abstract-testing = { version = "0.19.2" }
-abstract-sdk = { version = "0.19.2", features = ["test-utils"] }
-speculoos = "0.11.0"
-semver = "1.0"
-dotenv = "0.15.0"
-env_logger = "0.10.0"
-cw-orch = { version = "0.16.3", features = ["daemon"] }
-clap = { version = "4.3.7", features = ["derive"] }
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
diff --git a/contracts/savings-app/Cargo.toml b/contracts/savings-app/Cargo.toml
@@ -0,0 +1,62 @@
+[package]
+name = "app"
+version = "0.0.1"
+authors = [
+  "CyberHoward <[email protected]>",
+  "Adair <[email protected]>",
+  "Abstract Money <[email protected]>",
+]
+edition = "2021"
+homepage = ""
+documentation = ""
+repository = ""
+license = "GPL-3.0-or-later"
+keywords = ["cosmos", "cosmwasm", "abstractsdk"]
+resolver = "2"
+
+exclude = ["contract.wasm", "hash.txt"]
+
+[lib]
+crate-type = ["cdylib", "rlib"]
+
+[[example]]
+name = "schema"
+required-features = ["schema"]
+
+[features]
+default = ["export"]
+export = []
+# enable node-backed tests (ensure Docker is running)
+# run with `cargo test --jobs 1 --features node-tests`
+node-tests = ["interface"]
+interface = ["export", "dep:abstract-interface", "dep:cw-orch"]
+schema = ["abstract-app/schema"]
+
+[dependencies]
+cosmwasm-std = { version = "1.2" }
+cosmwasm-schema = { version = "1.2" }
+cw-controllers = { version = "1.0.1" }
+cw-storage-plus = "1.1.0"
+thiserror = { version = "1.0.50" }
+schemars = "0.8"
+cw-asset = { version = "3.0" }
+
+abstract-core = { version = "0.19.2" }
+abstract-app = { version = "0.19.2" }
+abstract-sdk = { version = "0.19.2" }
+
+# Dependencies for interface
+abstract-interface = { version = "0.19.2", optional = true }
+cw-orch = { version = "0.16.4", optional = true }
+
+[dev-dependencies]
+app = { path = ".", features = ["interface"] }
+abstract-interface = { version = "0.19.2", features = ["daemon"] }
+abstract-testing = { version = "0.19.2" }
+abstract-sdk = { version = "0.19.2", features = ["test-utils"] }
+speculoos = "0.11.0"
+semver = "1.0"
+dotenv = "0.15.0"
+env_logger = "0.10.0"
+cw-orch = { version = "0.16.3", features = ["daemon"] }
+clap = { version = "4.3.7", features = ["derive"] }
diff --git a/artifacts/app.wasm → contracts/savings-app/artifacts/app.wasm b/artifacts/app.wasm → contracts/savings-app/artifacts/app.wasm
diff --git a/artifacts/checksums.txt → ...racts/savings-app/artifacts/checksums.txt b/artifacts/checksums.txt → ...racts/savings-app/artifacts/checksums.txt
diff --git a/artifacts/checksums_intermediate.txt → ...-app/artifacts/checksums_intermediate.txt b/artifacts/checksums_intermediate.txt → ...-app/artifacts/checksums_intermediate.txt
diff --git a/example.env → contracts/savings-app/example.env b/example.env → contracts/savings-app/example.env
diff --git a/examples/deploy.rs → contracts/savings-app/examples/deploy.rs b/examples/deploy.rs → contracts/savings-app/examples/deploy.rs
diff --git a/examples/schema.rs → contracts/savings-app/examples/schema.rs b/examples/schema.rs → contracts/savings-app/examples/schema.rs
diff --git a/examples/test-local.rs → contracts/savings-app/examples/test-local.rs b/examples/test-local.rs → contracts/savings-app/examples/test-local.rs
diff --git a/metadata.json → contracts/savings-app/metadata.json b/metadata.json → contracts/savings-app/metadata.json
diff --git a/packages/typescript/.gitattributes → ...gs-app/packages/typescript/.gitattributes b/packages/typescript/.gitattributes → ...gs-app/packages/typescript/.gitattributes
diff --git a/packages/typescript/.gitignore → ...avings-app/packages/typescript/.gitignore b/packages/typescript/.gitignore → ...avings-app/packages/typescript/.gitignore
diff --git a/packages/typescript/LICENSE → ...s/savings-app/packages/typescript/LICENSE b/packages/typescript/LICENSE → ...s/savings-app/packages/typescript/LICENSE
diff --git a/packages/typescript/README.md → ...savings-app/packages/typescript/README.md b/packages/typescript/README.md → ...savings-app/packages/typescript/README.md
diff --git a/packages/typescript/jest.config.js → ...gs-app/packages/typescript/jest.config.js b/packages/typescript/jest.config.js → ...gs-app/packages/typescript/jest.config.js
diff --git a/packages/typescript/package-lock.json → ...app/packages/typescript/package-lock.json b/packages/typescript/package-lock.json → ...app/packages/typescript/package-lock.json
diff --git a/packages/typescript/package.json → ...ings-app/packages/typescript/package.json b/packages/typescript/package.json → ...ings-app/packages/typescript/package.json
diff --git a/packages/typescript/rollup.config.js → ...-app/packages/typescript/rollup.config.js b/packages/typescript/rollup.config.js → ...-app/packages/typescript/rollup.config.js
diff --git a/packages/typescript/scripts/codegen.js → ...pp/packages/typescript/scripts/codegen.js b/packages/typescript/scripts/codegen.js → ...pp/packages/typescript/scripts/codegen.js
diff --git a/...pescript/src/contracts/Template.client.ts → ...pescript/src/contracts/Template.client.ts b/...pescript/src/contracts/Template.client.ts → ...pescript/src/contracts/Template.client.ts
diff --git a/...rc/contracts/Template.message-composer.ts → ...rc/contracts/Template.message-composer.ts b/...rc/contracts/Template.message-composer.ts → ...rc/contracts/Template.message-composer.ts
diff --git a/...ipt/src/contracts/Template.msg-builder.ts → ...ipt/src/contracts/Template.msg-builder.ts b/...ipt/src/contracts/Template.msg-builder.ts → ...ipt/src/contracts/Template.msg-builder.ts
diff --git a/...ypescript/src/contracts/Template.types.ts → ...ypescript/src/contracts/Template.types.ts b/...ypescript/src/contracts/Template.types.ts → ...ypescript/src/contracts/Template.types.ts
diff --git a/packages/typescript/src/contracts/index.ts → ...ackages/typescript/src/contracts/index.ts b/packages/typescript/src/contracts/index.ts → ...ackages/typescript/src/contracts/index.ts
diff --git a/packages/typescript/tsconfig.bundle.json → .../packages/typescript/tsconfig.bundle.json b/packages/typescript/tsconfig.bundle.json → .../packages/typescript/tsconfig.bundle.json
diff --git a/packages/typescript/tsconfig.json → ...ngs-app/packages/typescript/tsconfig.json b/packages/typescript/tsconfig.json → ...ngs-app/packages/typescript/tsconfig.json
diff --git a/packages/typescript/typedoc.json → ...ings-app/packages/typescript/typedoc.json b/packages/typescript/typedoc.json → ...ings-app/packages/typescript/typedoc.json
diff --git a/schema/execute_msg.json → ...racts/savings-app/schema/execute_msg.json b/schema/execute_msg.json → ...racts/savings-app/schema/execute_msg.json
diff --git a/schema/instantiate_msg.json → ...s/savings-app/schema/instantiate_msg.json b/schema/instantiate_msg.json → ...s/savings-app/schema/instantiate_msg.json
diff --git a/schema/migrate_msg.json → ...racts/savings-app/schema/migrate_msg.json b/schema/migrate_msg.json → ...racts/savings-app/schema/migrate_msg.json
diff --git a/schema/module-schema.json → ...cts/savings-app/schema/module-schema.json b/schema/module-schema.json → ...cts/savings-app/schema/module-schema.json
diff --git a/schema/query_msg.json → contracts/savings-app/schema/query_msg.json b/schema/query_msg.json → contracts/savings-app/schema/query_msg.json
diff --git a/schema/raw/execute.json → ...racts/savings-app/schema/raw/execute.json b/schema/raw/execute.json → ...racts/savings-app/schema/raw/execute.json
diff --git a/schema/raw/instantiate.json → ...s/savings-app/schema/raw/instantiate.json b/schema/raw/instantiate.json → ...s/savings-app/schema/raw/instantiate.json
diff --git a/schema/raw/migrate.json → ...racts/savings-app/schema/raw/migrate.json b/schema/raw/migrate.json → ...racts/savings-app/schema/raw/migrate.json
diff --git a/schema/raw/query.json → contracts/savings-app/schema/raw/query.json b/schema/raw/query.json → contracts/savings-app/schema/raw/query.json
diff --git a/schema/raw/response_to_base_admin.json → ...pp/schema/raw/response_to_base_admin.json b/schema/raw/response_to_base_admin.json → ...pp/schema/raw/response_to_base_admin.json
diff --git a/schema/raw/response_to_base_config.json → ...p/schema/raw/response_to_base_config.json b/schema/raw/response_to_base_config.json → ...p/schema/raw/response_to_base_config.json
diff --git a/schema/raw/response_to_config.json → ...gs-app/schema/raw/response_to_config.json b/schema/raw/response_to_config.json → ...gs-app/schema/raw/response_to_config.json
diff --git a/schema/raw/response_to_module_data.json → ...p/schema/raw/response_to_module_data.json b/schema/raw/response_to_module_data.json → ...p/schema/raw/response_to_module_data.json
diff --git a/src/contract.rs → contracts/savings-app/src/contract.rs b/src/contract.rs → contracts/savings-app/src/contract.rs
diff --git a/src/error.rs → contracts/savings-app/src/error.rs b/src/error.rs → contracts/savings-app/src/error.rs
diff --git a/src/handlers/execute.rs → ...racts/savings-app/src/handlers/execute.rs b/src/handlers/execute.rs → ...racts/savings-app/src/handlers/execute.rs
diff --git a/src/handlers/instantiate.rs → ...s/savings-app/src/handlers/instantiate.rs b/src/handlers/instantiate.rs → ...s/savings-app/src/handlers/instantiate.rs
diff --git a/src/handlers/migrate.rs → ...racts/savings-app/src/handlers/migrate.rs b/src/handlers/migrate.rs → ...racts/savings-app/src/handlers/migrate.rs
diff --git a/src/handlers/mod.rs → contracts/savings-app/src/handlers/mod.rs b/src/handlers/mod.rs → contracts/savings-app/src/handlers/mod.rs
diff --git a/src/handlers/query.rs → contracts/savings-app/src/handlers/query.rs b/src/handlers/query.rs → contracts/savings-app/src/handlers/query.rs
diff --git a/src/lib.rs → contracts/savings-app/src/lib.rs b/src/lib.rs → contracts/savings-app/src/lib.rs
diff --git a/src/msg.rs → contracts/savings-app/src/msg.rs b/src/msg.rs → contracts/savings-app/src/msg.rs
diff --git a/src/replies/instantiate.rs → ...ts/savings-app/src/replies/instantiate.rs b/src/replies/instantiate.rs → ...ts/savings-app/src/replies/instantiate.rs
diff --git a/src/replies/mod.rs → contracts/savings-app/src/replies/mod.rs b/src/replies/mod.rs → contracts/savings-app/src/replies/mod.rs
diff --git a/src/state.rs → contracts/savings-app/src/state.rs b/src/state.rs → contracts/savings-app/src/state.rs
diff --git a/tests/integration.rs → contracts/savings-app/tests/integration.rs b/tests/integration.rs → contracts/savings-app/tests/integration.rs
@@ -76,7 +76,7 @@ fn successful_reset() -> anyhow::Result<()> {
 
     app.call_as(&account.manager.address()?).reset(42)?;
     let count: CountResponse = app.count()?;
-    assert_eq!(count.count, 6);
+    assert_eq!(count.count, 42);
     Ok(())
 }
 

diff --git a/tests/wasm.rs → contracts/savings-app/tests/wasm.rs b/tests/wasm.rs → contracts/savings-app/tests/wasm.rs
diff --git a/savings-bot/Cargo.toml b/savings-bot/Cargo.toml
@@ -0,0 +1,9 @@
+[package]
+name = "savings-bot"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+cw-orch = { version = "0.19" }
diff --git a/savings-bot/src/main.rs b/savings-bot/src/main.rs
@@ -0,0 +1,3 @@
+fn main() {
+    println!("Hello, world!");
+}