Skip to content

Commit

Permalink
Fix compilation issue with mismatched versions of ink packages.
Browse files Browse the repository at this point in the history
  • Loading branch information
@deuszx
deuszx committed Aug 30, 2023
1 parent 8741f7b commit 73ae1b2
Show file tree
Hide file tree
Showing 10 changed files with 129 additions and 85 deletions.
80 changes: 44 additions & 36 deletions Cargo.lock
View file

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

2 changes: 1 addition & 1 deletion farm/contracts/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ authors = ["Cardinal Cryptography"]
edition = "2021"

[dependencies]
ink = { version = "=4.2.1", default-features = false }
ink = { version = "=4.3.0", default-features = false }

scale = { package = "parity-scale-codec", version = "3", default-features = false, features = [
"derive",
Expand Down
2 changes: 1 addition & 1 deletion farm/psp22-traits/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ authors = ["[email protected]"]
edition = "2021"

[dependencies]
ink = { version = "=4.2.1", default-features = false }
ink = { version = "=4.3.0", default-features = false }

scale = { package = "parity-scale-codec", version = "3", default-features = false, features = [
"derive",
Expand Down
14 changes: 10 additions & 4 deletions uniswap-v2/contracts/factory/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,18 @@ authors = ["Stake Technologies <[email protected]>"]
edition = "2021"

[dependencies]
ink = { version = "=4.2.1", default-features = false}
ink = { version = "=4.3.0", default-features = false }

scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] }
scale-info = { version = "2.3", default-features = false, features = ["derive"], optional = true }
scale = { package = "parity-scale-codec", version = "3", default-features = false, features = [
"derive",
] }
scale-info = { version = "2.3", default-features = false, features = [
"derive",
], optional = true }

pair_contract = { path = "../pair", default-features = false, features = ["ink-as-dependency"] }
pair_contract = { path = "../pair", default-features = false, features = [
"ink-as-dependency",
] }
openbrush = { git = "https://github.com/727-Ventures/openbrush-contracts", tag = "3.1.1", default-features = false }
uniswap_v2 = { path = "../../logics", default-features = false }

Expand Down
17 changes: 12 additions & 5 deletions uniswap-v2/contracts/pair/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,19 @@ authors = ["Stake Technologies <[email protected]>"]
edition = "2021"

[dependencies]
ink = { version = "=4.2.1", default-features = false}
ink = { version = "=4.3.0", default-features = false }

scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] }
scale-info = { version = "2.3", default-features = false, features = ["derive"], optional = true }
scale = { package = "parity-scale-codec", version = "3", default-features = false, features = [
"derive",
] }
scale-info = { version = "2.3", default-features = false, features = [
"derive",
], optional = true }

openbrush = { git = "https://github.com/727-Ventures/openbrush-contracts", tag = "3.1.1", default-features = false, features = ["psp22", "reentrancy_guard"] }
openbrush = { git = "https://github.com/727-Ventures/openbrush-contracts", tag = "3.1.1", default-features = false, features = [
"psp22",
"reentrancy_guard",
] }
uniswap_v2 = { path = "../../logics", default-features = false }

[lib]
Expand All @@ -25,7 +32,7 @@ std = [
"scale/std",
"scale-info/std",
"openbrush/std",
"uniswap_v2/std"
"uniswap_v2/std",
]
ink-as-dependency = []

Expand Down
21 changes: 11 additions & 10 deletions uniswap-v2/contracts/psp22/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,24 @@ authors = ["Supercolony <[email protected]>"]
edition = "2021"

[dependencies]
ink = { version = "=4.2.1", default-features = false}
ink = { version = "=4.3.0", default-features = false }

scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] }
scale-info = { version = "2.3", default-features = false, features = ["derive"], optional = true }
scale = { package = "parity-scale-codec", version = "3", default-features = false, features = [
"derive",
] }
scale-info = { version = "2.3", default-features = false, features = [
"derive",
], optional = true }

openbrush = { git = "https://github.com/727-Ventures/openbrush-contracts", tag = "3.1.1", default-features = false, features = ["psp22"] }
openbrush = { git = "https://github.com/727-Ventures/openbrush-contracts", tag = "3.1.1", default-features = false, features = [
"psp22",
] }

[lib]
name = "psp22_token"
path = "lib.rs"

[features]
default = ["std"]
std = [
"ink/std",
"scale/std",
"scale-info/std",
"openbrush/std",
]
std = ["ink/std", "scale/std", "scale-info/std", "openbrush/std"]
ink-as-dependency = []
20 changes: 14 additions & 6 deletions uniswap-v2/contracts/router/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,21 @@ authors = ["Stake Technologies <[email protected]>"]
edition = "2021"

[dependencies]
primitive-types = { version = "0.11.1", default-features = false, features = ["num-traits"] }
ink = { version = "=4.2.1", default-features = false}
primitive-types = { version = "0.11.1", default-features = false, features = [
"num-traits",
] }
ink = { version = "=4.3.0", default-features = false }

scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] }
scale-info = { version = "2.3", default-features = false, features = ["derive"], optional = true }
scale = { package = "parity-scale-codec", version = "3", default-features = false, features = [
"derive",
] }
scale-info = { version = "2.3", default-features = false, features = [
"derive",
], optional = true }

openbrush = { git = "https://github.com/727-Ventures/openbrush-contracts", tag = "3.1.1", default-features = false, features = ["psp22"] }
openbrush = { git = "https://github.com/727-Ventures/openbrush-contracts", tag = "3.1.1", default-features = false, features = [
"psp22",
] }
uniswap_v2 = { path = "../../logics", default-features = false }

[lib]
Expand All @@ -26,7 +34,7 @@ std = [
"scale-info",
"scale-info/std",
"openbrush/std",
"uniswap_v2/std"
"uniswap_v2/std",
]
ink-as-dependency = []

Expand Down
Loading

0 comments on commit 73ae1b2

Please sign in to comment.