Merge pull request #46 from erisprotocol/integrate-eris-amplifier

Integrate ERIS Amplifier
terra-money · May 28, 2024 · e27916e · e27916e
2 parents 9f726de + 9598d4c
commit e27916e
Show file tree

Hide file tree

Showing 41 changed files with 3,009 additions and 356 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+  "rust-analyzer.checkOnSave.command": "clippy"
+}
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -8,7 +8,7 @@ members = [
 [workspace.package]
 description   = "Alliance NFT Collection dropped to the Game of Alliance players"
 authors       = ["Terra Money <[email protected]>"]
-version       = "1.0.1"
+version       = "1.1.0"
 edition       = "2021"
 license       = "Apache-2.0"
 repository    = "https://github.com/terra-money/alliance-nft-collection"
@@ -20,11 +20,13 @@ rust-version  = "1.73"
 cosmwasm-std                = { version = "1.4.1", features = ["stargate"] }
 cosmwasm-schema             = "1.4.1"
 cw2                         = "1.1.0"
+cw20                        = "1.1.0"
 cw721                       = { version = "0.18.0" }
 cw721-base                  = { version = "0.18.0", features = ["library"] }
 schemars                    = "0.8.15"
 cw-storage-plus             = "1.1.0"
 cw-utils                    = "1.0.2"
+cw-asset                    = "3.1.1"
 serde                       = { version = "1.0.190", default-features = false, features = ["derive"] }
 thiserror                   = "1.0.50"
 terra-proto-rs              = { version = "4.0.2", default-features = false }

diff --git a/contracts/alliance-nft-collection/.cargo/config b/contracts/alliance-nft-collection/.cargo/config
@@ -2,4 +2,4 @@
 wasm = "build --release --target wasm32-unknown-unknown"
 wasm-debug = "build --target wasm32-unknown-unknown"
 unit-test = "test --lib"
-schema = "run --example schema"
+schema = "run --example schema_collection"
diff --git a/contracts/alliance-nft-collection/Cargo.toml b/contracts/alliance-nft-collection/Cargo.toml
@@ -25,7 +25,11 @@ cw721-base              = { workspace = true }
 schemars                = { workspace = true }
 cw-storage-plus         = { workspace = true }
 cw-utils                = { workspace = true }
+cw-asset                = { workspace = true }
 serde                   = { workspace = true }
 thiserror               = { workspace = true }
 terra-proto-rs          = { workspace = true }
-alliance-nft-packages   = { workspace = true }
+alliance-nft-packages   = { workspace = true }
+
+[dev-dependencies]
+cw20                    = { workspace = true }