Skip to content

Commit

Permalink
Merge pull request #65 from confio/64-replace-cw4-with-tg4
Browse files Browse the repository at this point in the history
Replace cw4 and cw4-group contracts with tg4 and tg4-group
  • Loading branch information
ueco-jb authored Feb 17, 2022
2 parents dcb639c + 4d4d2f5 commit eed9455
Show file tree
Hide file tree
Showing 13 changed files with 183 additions and 157 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ jobs:
- run:
name: Install check_contract
# Uses --debug for compilation speed
command: cargo install --debug --version 1.0.0-beta4 --features iterator --example check_contract -- cosmwasm-vm
command: cargo install --debug --version 1.0.0-beta5 --features iterator --example check_contract -- cosmwasm-vm
- save_cache:
paths:
- /usr/local/cargo/registry
Expand All @@ -241,7 +241,7 @@ jobs:
for W in ./target/wasm32-unknown-unknown/release/*.wasm
do
echo -n "Checking `basename $W`... "
check_contract $W
check_contract --supported-features iterator,staking,tgrade $W
done
# This job roughly follows the instructions from https://circleci.com/blog/publishing-to-github-releases-via-circleci/
Expand Down
142 changes: 84 additions & 58 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 10 additions & 11 deletions contracts/tfi-factory/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,24 +24,23 @@ backtraces = ["cosmwasm-std/backtraces"]

[dependencies]
tfi = { path = "../../packages/tfi", default-features = false, version = "0.2.2"}
cosmwasm-std = "=1.0.0-beta"
cw2 = "=0.10"
cw-storage-plus = "=0.10"
cosmwasm-std = "1.0.0-beta5"
cw2 = "0.11.1"
cw-storage-plus = "0.11.1"
schemars = "0.8.1"
serde = { version = "1.0.103", default-features = false, features = ["derive"] }
protobuf = { version = "2", features = ["with-bytes"] }
thiserror = "1"

[dev-dependencies]
cosmwasm-schema = "=1.0.0-beta"
cosmwasm-storage = "=1.0.0-beta"
cosmwasm-schema = "1.0.0-beta5"
cosmwasm-storage = "1.0.0-beta5"
anyhow = { version = "1", features = ["backtrace"] }
cw-multi-test = "=0.10"
cw-multi-test = "0.11.1"
tfi-pair = { path = "../tfi-pair", version = "0.2.2" }
trusted-token = { path = "../trusted-token", version = "0.2.2" }
derivative = "2"
cw4-group = { version = "=0.10", features = ["library"] }
cw4 = "=0.10"
cw20 = "=0.10"
cw20-base = { version = "=0.10", features = ["library"] }

tg4 = "0.6.2"
tg4-group = { version = "0.6.2", features = ["library"] }
cw20 = "0.11.1"
cw20-base = { version = "0.11.1", features = ["library"] }
Loading

0 comments on commit eed9455

Please sign in to comment.