Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: created workspace cargo #237

Merged
merged 1 commit into from
Aug 12, 2024
Merged

feat: created workspace cargo #237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
395 changes: 51 additions & 344 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

40 changes: 40 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,46 @@ resolver = "2"
codegen-units = 1
incremental = false

[workspace.dependencies]
anyhow = { version = "1.0.66" }
base64 = { version = "0.13.1" }
chrono = { version = "0.4.27", default-features = false }
cosmos-sdk-proto = { version = "0.20.0", default-features = false }
cosmwasm-schema = { version = "1.5.0" }
cosmwasm-std = { version = "2.1.0", features = [ "abort", "cosmwasm_1_2", "cosmwasm_1_3", "cosmwasm_1_4", "cosmwasm_2_0", "iterator", "stargate" ] }
cosmwasm-storage = { version = "1.5.2", features = [ "iterator" ] }
cw-multi-test = { version = "2.1.0" }
cw-storage-plus = { version = "2.0.0" }
cw-utils = { version = "2.0.0" }
cw2 = { version = "2.0.0" }
ethereum-types = { version = "0.5.2" }
hex = { version = "0.4.3", features = [ "serde" ] }
injective-cosmwasm = { version = "0.3.0" }
injective-math = { version = "0.3.0" }
injective-std = { version = "1.13.0" }
injective-std-derive = { version = "1.13.0" }
injective-test-tube = { version = "=1.13.0-1" }
injective-testing = { version = "0.2.1" }
itertools = "0.10.3"
primitive-types = { version = "0.12.2", default-features = false }
proc-macro2 = "1.0.40"
prost = { version = "0.12.6" }
prost-types = { version = "0.12.6", default-features = false }
quote = "1.0.20"
rand = { version = "0.4.6" }
schemars = { version = "0.8.16" }
secp256k1 = { version = "0.6.2" }
serde = { version = "1.0.196", default-features = false, features = [ "derive" ] }
serde-cw-value = { version = "0.7.0" }
serde-json-wasm = { version = "1.0.0" }
serde_repr = "0.1.17"
serde_test = { version = "1.0.176" }
subtle-encoding = { version = "0.5.1", features = [ "bech32-preview" ] }
syn = "1.0.98"
thiserror = { version = "1.0.56" }
tiny-keccak = { version = "1.2.1" }
trybuild = { version = "1.0.63", features = [ "diff" ] }

[profile.release]
codegen-units = 1
debug = false
Expand Down
28 changes: 14 additions & 14 deletions contracts/atomic-order-example/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,19 +27,19 @@ optimize = """docker run --rm -v "$(pwd)":/code \
"""

[dependencies]
cosmwasm-std = { version = "2.1.0", features = [ "abort", "cosmwasm_1_2", "cosmwasm_1_3", "cosmwasm_1_4", "cosmwasm_2_0", "iterator", "stargate" ] }
cosmwasm-storage = { version = "1.5.2", features = [ "iterator" ] }
cw-storage-plus = { version = "2.0.0" }
cw-utils = { version = "2.0.0" }
cw2 = { version = "2.0.0" }
injective-cosmwasm = { version = "0.3.0" }
injective-math = { version = "0.3.0" }
injective-std = { version = "1.13.0" }
prost = { version = "0.12.6" }
schemars = { version = "0.8.8", features = [ "enumset" ] }
serde = { version = "1.0.137", default-features = false, features = [ "derive" ] }
thiserror = { version = "1.0.31" }
cosmwasm-std = { workspace = true }
cosmwasm-storage = { workspace = true }
cw-storage-plus = { workspace = true }
cw-utils = { workspace = true }
cw2 = { workspace = true }
injective-cosmwasm = { workspace = true }
injective-math = { workspace = true }
injective-std = { workspace = true }
prost = { workspace = true }
schemars = { workspace = true }
serde = { workspace = true }
thiserror = { workspace = true }

[dev-dependencies]
cosmwasm-schema = { version = "1.5.0" }
cw-multi-test = { version = "0.16.2" }
cosmwasm-schema = { workspace = true }
cw-multi-test = { workspace = true }
14 changes: 7 additions & 7 deletions contracts/dummy/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ optimize = """docker run --rm -v "$(pwd)":/code \
"""

[dependencies]
cosmwasm-std = { version = "2.1.0", features = [ "abort", "cosmwasm_1_2", "cosmwasm_1_3", "cosmwasm_1_4", "cosmwasm_2_0", "iterator", "stargate" ] }
cw-storage-plus = { version = "2.0.0" }
cw2 = { version = "2.0.0" }
injective-cosmwasm = { version = "0.3.0" }
schemars = "0.8.8"
serde = { version = "1.0.136", default-features = false, features = [ "derive" ] }
thiserror = { version = "1.0.30" }
cosmwasm-std = { workspace = true }
cw-storage-plus = { workspace = true }
cw2 = { workspace = true }
injective-cosmwasm = { workspace = true }
schemars = { workspace = true }
serde = { workspace = true }
thiserror = { workspace = true }
28 changes: 14 additions & 14 deletions contracts/injective-cosmwasm-mock/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,19 @@ integration = [ ]
library = [ ]

[dependencies]
cosmos-sdk-proto = { version = "0.20.0", default-features = false }
cosmwasm-schema = { version = "1.5.0" }
cosmwasm-std = { version = "2.1.0", features = [ "abort", "cosmwasm_1_2", "cosmwasm_1_3", "cosmwasm_1_4", "cosmwasm_2_0", "iterator", "stargate" ] }
cw-storage-plus = { version = "2.0.0" }
cw2 = { version = "2.0.0" }
injective-cosmwasm = { version = "0.3.0" }
injective-math = { version = "0.3.0" }
injective-std = { version = "1.13.0" }
prost = { version = "0.12.6" }
schemars = { version = "0.8.16" }
serde = { version = "1.0.196", default-features = false, features = [ "derive" ] }
thiserror = { version = "1.0.56" }
cosmos-sdk-proto = { workspace = true }
cosmwasm-schema = { workspace = true }
cosmwasm-std = { workspace = true }
cw-storage-plus = { workspace = true }
cw2 = { workspace = true }
injective-cosmwasm = { workspace = true }
injective-math = { workspace = true }
injective-std = { workspace = true }
prost = { workspace = true }
schemars = { workspace = true }
serde = { workspace = true }
thiserror = { workspace = true }

[dev-dependencies]
injective-test-tube = { version = "=1.13.0-1" }
injective-testing = { version = "0.2.1" }
injective-test-tube = { workspace = true }
injective-testing = { workspace = true }
26 changes: 13 additions & 13 deletions packages/injective-cosmwasm/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,18 @@ version = "0.3.0"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
cosmwasm-std = { version = "2.1.0", features = [ "abort", "cosmwasm_1_2", "cosmwasm_1_3", "cosmwasm_1_4", "cosmwasm_2_0", "iterator", "stargate" ] }
cw-storage-plus = { version = "2.0.0" }
ethereum-types = { version = "0.5.2" }
hex = { version = "0.4.3", features = [ "serde" ] }
injective-math = { version = "0.3.0" }
schemars = "0.8.16"
serde = { version = "1.0.193", default-features = false, features = [ "derive" ] }
serde_repr = "0.1.17"
subtle-encoding = { version = "0.5.1", features = [ "bech32-preview" ] }
tiny-keccak = "1.2.1"
cosmwasm-std = { workspace = true }
cw-storage-plus = { workspace = true }
ethereum-types = { workspace = true }
hex = { workspace = true }
injective-math = { workspace = true }
schemars = { workspace = true }
serde = { workspace = true }
serde_repr = { workspace = true }
subtle-encoding = { workspace = true }
tiny-keccak = { workspace = true }

[dev-dependencies]
cosmwasm-schema = { version = "1.5.0" }
serde-json-wasm = { version = "1.0.0" }
serde_test = { version = "1.0.176" }
cosmwasm-schema = { workspace = true }
serde-json-wasm = { workspace = true }
serde_test = { workspace = true }
8 changes: 0 additions & 8 deletions packages/injective-cosmwasm/src/exchange/subaccount.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,6 @@ pub fn subaccount_id_to_ethereum_address(subaccount_id: &SubaccountId) -> String
pub fn subaccount_id_to_injective_address(subaccount_id: &SubaccountId, deps: &Deps<InjectiveQueryWrapper>) -> StdResult<Addr> {
let ethereum_address = subaccount_id_to_ethereum_address(subaccount_id);

println!("ethereum_address: {:?}", ethereum_address);
println!("ethereum_address: {:?}", addr_to_bech32(ethereum_address.clone()).as_str());

println!("ethereum_address: {:?}", deps.api.addr_validate(""));
println!(
"ethereum_address: {:?}",
deps.api.addr_validate("inj1khsfhyavadcvzug67pufytaz2cq36ljkrsr0nv")
);
deps.api.addr_validate(addr_to_bech32(ethereum_address).as_str())
}

Expand Down
14 changes: 7 additions & 7 deletions packages/injective-math/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ version = "0.3.0"
[features]

[dependencies]
cosmwasm-std = { version = "2.1.0", features = [ "abort", "cosmwasm_1_2", "cosmwasm_1_3", "cosmwasm_1_4", "cosmwasm_2_0", "iterator", "stargate" ] }
ethereum-types = { version = "0.5.2" }
primitive-types = { version = "0.12.2", default-features = false }
schemars = "0.8.8"
serde = { version = "1.0.193", default-features = false, features = [ "derive" ] }
subtle-encoding = { version = "0.5.1", features = [ "bech32-preview" ] }
cosmwasm-std = { workspace = true }
ethereum-types = { workspace = true }
primitive-types = { workspace = true }
schemars = { workspace = true }
serde = { workspace = true }
subtle-encoding = { workspace = true }

[dev-dependencies]
cosmwasm-schema = { version = "1.5.0" }
cosmwasm-schema = { workspace = true }
18 changes: 9 additions & 9 deletions packages/injective-std-derive/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ version = "1.13.0"
proc-macro = true

[dependencies]
cosmwasm-std = { version = "2.1.0", features = [ "stargate" ] }
itertools = "0.10.3"
proc-macro2 = "1.0.40"
quote = "1.0.20"
syn = "1.0.98"
cosmwasm-std = { workspace = true }
itertools = { workspace = true }
proc-macro2 = { workspace = true }
quote = { workspace = true }
syn = { workspace = true }

[dev-dependencies]
cosmwasm-std = { version = "2.1.0", features = [ "stargate" ] }
prost = "0.12.4"
serde = "1.0.142"
trybuild = { version = "1.0.63", features = [ "diff" ] }
cosmwasm-std = { workspace = true }
prost = { workspace = true }
serde = { workspace = true }
trybuild = { workspace = true }
16 changes: 8 additions & 8 deletions packages/injective-std/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ version = "1.13.0"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
chrono = { version = "0.4.27", default-features = false }
cosmwasm-std = { version = "2.1.0", features = [ "abort", "cosmwasm_1_2", "cosmwasm_1_3", "cosmwasm_1_4", "cosmwasm_2_0", "iterator", "stargate" ] }
injective-std-derive = { version = "1.13.0" }
prost = { version = "0.12.4", features = [ "prost-derive" ] }
prost-types = { version = "0.12.4", default-features = false }
schemars = "0.8.8"
serde = { version = "1.0", default-features = false, features = [ "derive" ] }
serde-cw-value = { version = "0.7.0" }
chrono = { workspace = true }
cosmwasm-std = { workspace = true }
injective-std-derive = { workspace = true }
prost = { workspace = true }
prost-types = { workspace = true }
schemars = { workspace = true }
serde = { workspace = true }
serde-cw-value = { workspace = true }
20 changes: 10 additions & 10 deletions packages/injective-testing/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ repository = "https://github.com/InjectiveLabs/cw-injective/tree/dev/packages/i
version = "0.2.1"

[dependencies]
anyhow = { version = "1.0.66" }
base64 = { version = "0.13.1" }
cosmwasm-std = { version = "2.1.0", features = [ "abort", "cosmwasm_1_1", "cosmwasm_1_2", "cosmwasm_1_3", "cosmwasm_1_4", "cosmwasm_2_0", "iterator", "stargate" ] }
cw-multi-test = { version = "2.1.0" }
injective-cosmwasm = { version = "0.3.0" }
injective-math = { version = "0.3.0" }
rand = { version = "0.4.6" }
secp256k1 = { version = "0.6.2" }
serde = { version = "1.0.137", default-features = false, features = [ "derive" ] }
tiny-keccak = { version = "1.2.1" }
anyhow = { workspace = true }
base64 = { workspace = true }
cosmwasm-std = { workspace = true }
cw-multi-test = { workspace = true }
injective-cosmwasm = { workspace = true }
injective-math = { workspace = true }
rand = { workspace = true }
secp256k1 = { workspace = true }
serde = { workspace = true }
tiny-keccak = { workspace = true }
Loading