Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into feature/homa-lite-r…
Browse files Browse the repository at this point in the history
…edeem-match

* origin/master:
  Add more test cases (#1620)
  bump (#1622)
  update protocolId and bootnode
  Fixed a redeem bug and added more Homa lite tests (#1619)
  Add module asset registry (#1598)
  MaxAuctions count to 50 (#1617)
  Cdp Treasury Bench update (#1609)
  Bump @openzeppelin/contracts from 4.3.2 to 4.3.3 in /ts-tests (#1612)

# Conflicts:
#	modules/homa-lite/src/lib.rs
#	modules/homa-lite/src/tests_no_fees.rs
  • Loading branch information
Roy Yang committed Nov 20, 2021
2 parents e8c4b9e + 7f67fb9 commit 1c4c68d
Show file tree
Hide file tree
Showing 124 changed files with 2,626 additions and 1,484 deletions.
156 changes: 77 additions & 79 deletions Cargo.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ecosystem-modules/compound-cash/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "ecosystem-compound-cash"
version = "2.0.0"
version = "2.0.1"
authors = ["Acala Developers"]
edition = "2018"

Expand Down
2 changes: 1 addition & 1 deletion ecosystem-modules/ren/renvm-bridge/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "ecosystem-renvm-bridge"
version = "2.0.0"
version = "2.0.1"
authors = ["Acala Developers"]
edition = "2018"

Expand Down
2 changes: 1 addition & 1 deletion ecosystem-modules/starport/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "ecosystem-starport"
version = "2.0.0"
version = "2.0.1"
authors = ["Acala Developers"]
edition = "2018"

Expand Down
2 changes: 1 addition & 1 deletion inspect/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "acala-inspect"
version = "2.0.0"
version = "2.0.1"
authors = ["Acala Developers"]
edition = "2018"

Expand Down
Original file line number Diff line number Diff line change
@@ -1,47 +1,45 @@
[package]
name = "module-evm-manager"
version = "2.0.0"
name = "module-asset-registry"
version = "2.0.1"
authors = ["Acala Developers"]
edition = "2018"

[dependencies]
serde = { version = "1.0.124", optional = true }
codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false }
scale-info = { version = "1.0", default-features = false, features = ["derive"] }

codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false }
sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false }
frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false }
frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false }
sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false }
sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false }

primitives = { package = "acala-primitives", path = "../../primitives", default-features = false }

xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.12", default-features = false }

module-support = { path = "../support", default-features = false }

[dev-dependencies]
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12" }
sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12" }
pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12" }
pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12" }
orml-currencies = { path = "../../orml/currencies" }
orml-tokens = { path = "../../orml/tokens" }
orml-traits = { path = "../../orml/traits" }
orml-utilities = { path = "../../orml/utilities" }

module-evm = { path = "../evm" }
module-evm-bridge = { path = "../evm-bridge" }
orml-utilities = { path = "../../orml/utilities" }

[features]
default = ["std"]
std = [
"serde",
"codec/std",
"scale-info/std",
"sp-core/std",
"sp-runtime/std",
"sp-io/std",
"sp-std/std",
"frame-support/std",
"frame-system/std",
"primitives/std",
"xcm/std",
"module-support/std",
]
try-runtime = ["frame-support/try-runtime"]
Loading

0 comments on commit 1c4c68d

Please sign in to comment.