Skip to content

Commit

Permalink
add toolchain
Browse files Browse the repository at this point in the history
  • Loading branch information
tubackkhoa committed Jun 25, 2024
1 parent 0a33b5a commit b66a998
Show file tree
Hide file tree
Showing 7 changed files with 69 additions and 52 deletions.
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,7 @@ libwasmvm_muslc.a
tests/test-data.json
**/artifacts/*
!**/artifacts/*.wasm
.env
.env

.scannerwork/
clippy-report.json
65 changes: 32 additions & 33 deletions Cargo.lock

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

12 changes: 11 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,17 @@ resolver = "2"

[workspace.dependencies]
cosmwasm-testing-util = { git = "https://github.com/oraichain/cosmwasm-testing-util.git", rev = "24c138c" }
oraiswap = { git = "https://github.com/oraichain/oraiswap.git", rev = "03f4955b" }
oraiswap = { git = "https://github.com/oraichain/oraiswap.git", rev = "29decac" }
cw2 = { version = "1.0.1" }
cw20 = { version = "1.0.1" }
cw20-base = { version = "1.0.1" }
cw-storage-plus = { version = "1.0.1" }
cw-controllers = { version = "1.0.1" }
cw-utils = "0.16.0"
cw20-ics20-msg = { path = "./packages/cw20-ics20-msg" }
cosmwasm-schema = { version = "1.2.8" }
cosmwasm-std = { version = "1.2.8", default-features = false }
cosmwasm-vm = { version = "1.2.8" }
# osmosis-test-tube = { git = "https://github.com/oraichain/test-tube.git", rev = "354d580" }

[profile.release]
Expand Down
19 changes: 9 additions & 10 deletions contracts/cw-ics20-latest/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,20 @@ backtraces = ["cosmwasm-std/backtraces"]
library = []

[dependencies]
cosmwasm-schema = "=1.2"
cw-utils = "0.16.0"
cw2 = "1.0.1"
cw20 = "1.0.1"
cw20-ics20-msg = { path = "../../packages/cw20-ics20-msg" }
cosmwasm-schema = { workspace = true }
cw-utils = { workspace = true }
cw2 = { workspace = true }
cw20 = { workspace = true }
cw20-ics20-msg = { workspace = true }
oraiswap = { workspace = true }
cosmwasm-std = { version = "=1.2", features = ["ibc3"] }
cw-storage-plus = "1.0.1"
cw-controllers = "1.0.1"
cosmwasm-std = { workspace = true, features = ["ibc3"] }
cw-storage-plus = { workspace = true }
cw-controllers = { workspace = true }
thiserror = { version = "1.0.23" }
sha256 = "=1.1.0"

[dev-dependencies]
cosmwasm-vm = { version = "=1.2" }
cosmwasm-vm = { workspace = true }
# osmosis-test-tube = { workspace = true }
cosmwasm-testing-util = { workspace = true }
anybuf = "0.3.0"
cw-multi-test = "0.16.0"
13 changes: 6 additions & 7 deletions packages/cw20-ics20-msg/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,14 @@ documentation = "https://docs.orai.io"
readme = "README.md"

[dependencies]
cosmwasm-schema = "=1.2"
cosmwasm-std = { version = "=1.2", default-features = false }
cw-storage-plus = "1.0.1"
cw20 = "1.0.1"
bech32 = "0.8.1"
cosmwasm-schema = { workspace = true }
cosmwasm-std = { workspace = true }
cw-storage-plus = { workspace = true }
cw20 = { workspace = true }
oraiswap = { workspace = true }
bech32 = "0.8.1"
anybuf = "0.3.0"

[dev-dependencies]
cw-multi-test = "0.16.0"
cosmwasm-testing-util = { workspace = true }
cosmwasm-vm = { version = "=1.2" }
cosmwasm-vm = { workspace = true }
2 changes: 2 additions & 0 deletions packages/cw20-ics20-msg/src/converter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,7 @@ mod tests {
SystemResult::Ok(ContractResult::Ok(
to_binary(&ConvertInfoResponse {
token_ratio: TokenRatio {
is_mint_burn: false,
info: AssetInfo::Token {
contract_addr: Addr::unchecked("orai123"),
},
Expand Down Expand Up @@ -252,6 +253,7 @@ mod tests {
res,
Some(ConvertInfoResponse {
token_ratio: TokenRatio {
is_mint_burn: false,
info: AssetInfo::Token {
contract_addr: Addr::unchecked("orai123"),
},
Expand Down
5 changes: 5 additions & 0 deletions rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[toolchain]
channel = "1.76"
components = ["rustfmt", "rust-src", "clippy"]
targets = ["wasm32-unknown-unknown"]
profile = "minimal"

0 comments on commit b66a998

Please sign in to comment.