Skip to content

Commit

Permalink
Merge pull request #62 from availproject/marko/remove-patch
Browse files Browse the repository at this point in the history 
Removed all patch directives
  • Loading branch information
@markopoloparadox
markopoloparadox authored Nov 27, 2023
2 parents 8ec83d7 + 095aacf commit 8f58e5f
Show file tree
Hide file tree
Showing 8 changed files with 43 additions and 66 deletions.
23 changes: 0 additions & 23 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,29 +9,6 @@ members = [
"nomad/base",
"nomad/merkle",
]
[patch.crates-io]
# Substrate (polkadot-v1.0.0).
sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
sp-core-hashing = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
sp-io = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
sp-api = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
sp-std = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
sp-application-crypto = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
sp-storage = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
sp-debug-derive = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
sp-arithmetic = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
sp-trie = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
sp-runtime-interface = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
sp-weights = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
frame-support = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
sp-externalities = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
sp-inherents = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
sp-staking = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
sp-state-machine = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
sp-tracing = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
sp-version = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
sp-wasm-interface = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }

[profile.dev.package]
nalgebra = { opt-level = 3 }
Expand Down
28 changes: 14 additions & 14 deletions core/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,28 +12,28 @@ hash256-std-hasher = { version = "0.15.2", default-features = false }
hex = { version = "0.4", optional = true, default-features = false, features = ["alloc", "serde"] }
log = { version = "0.4.8", default-features = false }
serde = { version = "1.0.163", default-features = false, features = ["derive", "alloc"], optional = true }
static_assertions = "1.1.0"
thiserror-no-std = "2.0.2"
static_assertions = { version = "1.1.0" }
thiserror-no-std = { version = "2.0.2" }

# Substrate
binary-merkle-tree = { git = "https://github.com/paritytech/substrate.git/", branch = "polkadot-v1.0.0", default-features = false, optional = true }
binary-merkle-tree = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0", default-features = false, optional = true }
codec = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive", "max-encoded-len"] }
scale-info = { version = "2", default-features = false, features = ["derive"] }
sp-arithmetic = { version = "*", default-features = false }
sp-core = { version = "*", default-features = false }
sp-io = { version = "*", default-features = false }
sp-std = { version = "*", default-features = false }
sp-trie = { version = "*", default-features = false }
sp-arithmetic = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0", default-features = false }
sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0", default-features = false }
sp-io = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0", default-features = false }
sp-std = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0", default-features = false }
sp-trie = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0", default-features = false }

# Substrate Runtime
frame-support = { version = "4.0.0-dev", default-features = false, optional = true }
sp-runtime = { version = "24", default-features = false, optional = true }
sp-runtime-interface = { version = "17", default-features = false, optional = true }
frame-support = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0", default-features = false, optional = true }
sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0", default-features = false, optional = true }
sp-runtime-interface = {git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0", default-features = false, optional = true }

[dev-dependencies]
hex-literal = "0.3.4"
serde_json = "1"
test-case = "1.2.3"
hex-literal = { version = "0.3.4" }
serde_json = { version = "1" }
test-case = { version = "1.2.3" }

[features]
default = [ "std" ]
Expand Down
14 changes: 7 additions & 7 deletions kate/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ dusk-plonk = { git = "https://github.com/availproject/plonk.git", tag = "v0.12.0

# Parity & Substrate
codec = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] }
sp-arithmetic = { version = "*", default-features = false }
sp-core = { version = "*", default-features = false }
sp-arithmetic = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0", default-features = false }
sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0", default-features = false }

# 3rd-party
derive_more = { version = "0.99.17", default-features = false, features = ["constructor"] }
static_assertions = "1.1.0"
thiserror-no-std = "2.0.2"
static_assertions = { version = "1.1.0" }
thiserror-no-std = { version = "2.0.2" }

dusk-bytes = { version = "0.1.6", default-features = false, optional = true }
hex = { version = "0.4", optional = true, default-features = false, features = ["alloc", "serde"] }
Expand All @@ -41,9 +41,9 @@ serde_json = { version = "1", optional = true }

[dev-dependencies]
criterion = { version = "0.5.1", default-features = false }
proptest = "1"
serde_json = "1"
test-case = "1.2.3"
proptest = { version = "1" }
serde_json = { version = "1" }
test-case = { version = "1.2.3" }

[features]
default = [ "std" ]
Expand Down
10 changes: 5 additions & 5 deletions kate/recovery/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ dusk-plonk = { git = "https://github.com/availproject/plonk.git", tag = "v0.12.0

# Substrate
codec = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] }
sp-arithmetic = { version = "*", default-features = false }
sp-std = { version = "*", default-features = false }
sp-arithmetic = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0", default-features = false }
sp-std = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0", default-features = false }

# 3rd-parties
derive_more = "0.99.17"
static_assertions = "1.1.0"
thiserror-no-std = "2.0.2"
derive_more = { version = "0.99.17" }
static_assertions = { version = "1.1.0" }
thiserror-no-std = { version = "2.0.2" }

dusk-bytes = { version = "0.1.6", default-features = false, optional = true }
once_cell = { version = "1.9.0", optional = true }
Expand Down
4 changes: 2 additions & 2 deletions nomad/base/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ nomad-signature = { path = "../signature", default-features = false }
# Substrate
codec = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] }
scale-info = { version = "2", default-features = false, features = ["derive"] }
sp-core = { version = "*", default-features = false }
sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0", default-features = false }

# Substrate runtime
sp-runtime = { version = "24", default-features = false, optional = true }
sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0", default-features = false, optional = true }

# Eth
ethers-signers = { version = "1", optional = true }
Expand Down
8 changes: 4 additions & 4 deletions nomad/core/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ nomad-signature = { path = "../signature", default-features = false }
codec = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] }
primitive-types = { version = "0.12", default-features = false, features = ["scale-info", "codec"] }
scale-info = { version = "2", default-features = false, features = ["derive"] }
sp-core = { version = "*", default-features = false }
sp-std = { version = "*", default-features = false }
sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0", default-features = false }
sp-std = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0", default-features = false }

sp-runtime = { version = "24", default-features = false, optional = true }
sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0", default-features = false, optional = true }

# Eth
ethers-core = { version = "1", optional = true }
Expand All @@ -26,7 +26,7 @@ serde = { version = "1.0.188", default-features = false, features = ["derive"],
tiny-keccak = { version = "2.0.2", default-features = false, features = ["keccak"] }

[dev-dependencies]
async-trait = "0.1.42"
async-trait = { version = "0.1.42" }

[features]
default = [ "std" ]
Expand Down
12 changes: 6 additions & 6 deletions nomad/merkle/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,18 @@ nomad-core = { path = "../core", default-features = false }
# Substrate
codec = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] }
scale-info = { version = "2", default-features = false, features = ["derive"] }
sp-core = { version = "*", default-features = false }
sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0", default-features = false }

frame-support = { version = "4.0.0-dev", default-features = false, optional = true }
frame-support = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0", default-features = false, optional = true }

# 3rd-party
hex-literal = "0.3.4"
static_assertions = "1.1.0"
thiserror-no-std = "2.0.2"
hex-literal = { version = "0.3.4" }
static_assertions = { version = "1.1.0" }
thiserror-no-std = { version = "2.0.2" }
tiny-keccak = { version = "2.0.2", default-features = false, features = ["keccak"] }

[dev-dependencies]
ethers-core = "1"
ethers-core = { version = "1" }
serde = { version = "1.0", features = ["derive"] }
serde_json = { version = "1.0" }

Expand Down
10 changes: 5 additions & 5 deletions nomad/signature/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ targets = ["x86_64-unknown-linux-gnu"]
# Substrate & Parity
codec = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] }
scale-info = { version = "2", default-features = false, features = ["derive"] }
sp-core = { version = "*", default-features = false }
sp-core = {git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0", default-features = false }

frame-support = { version = "4.0.0-dev", default-features = false }
sp-runtime = { version = "24", default-features = false }
frame-support = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0", default-features = false }
sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0", default-features = false }

# Eth
ethers-core = { version = "1", default-features = false, optional = true }
Expand All @@ -33,11 +33,11 @@ generic-array = { version = "0.14", default-features = false }
hex = { version = "0.4.3", default-features = false }
k256 = { version = "0.11.5", default-features = false, features = ["keccak256", "ecdsa"] }
serde = { version = "1.0.188", default-features = false, optional = true, features = ["derive"] }
thiserror-no-std = "2.0.2"
thiserror-no-std = { version = "2.0.2" }
tiny-keccak = { version = "2.0.2", default-features = false, features = ["keccak"] }

[dev-dependencies]
byte-slice-cast = "1.2.1"
byte-slice-cast = { version = "1.2.1" }

[features]
default = [ "std" ]
Expand Down

0 comments on commit 8f58e5f

Please sign in to comment.