Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into refactor/event-name…
Browse files Browse the repository at this point in the history
…d-field

* origin/master:
  Fix mandala-runtime with dev mode (#1718)
  mandala deployment (#1713)
  bump version (#1714)
  Remove parachain-id and update launch (#1711)
  • Loading branch information
Roy Yang committed Dec 21, 2021
2 parents ef44568 + ffa217b commit 8b57eae
Show file tree
Hide file tree
Showing 62 changed files with 132 additions and 136 deletions.
100 changes: 50 additions & 50 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.1.0"
version = "2.1.1"
authors = ["Acala Developers"]
edition = "2021"

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.1.0"
version = "2.1.1"
authors = ["Acala Developers"]
edition = "2021"

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.1.0"
version = "2.1.1"
authors = ["Acala Developers"]
edition = "2021"

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.1.0"
version = "2.1.1"
authors = ["Acala Developers"]
edition = "2021"

Expand Down
4 changes: 2 additions & 2 deletions launch/config.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
relaychain:
image: parity/polkadot:v0.9.10-1
image: parity/polkadot:v0.9.13
chain: rococo-local
runtimeGenesisConfig:
configuration:
Expand All @@ -19,7 +19,7 @@ relaychain:
- name: charlie

parachains:
- image: acala/karura-node:1.4.1
- image: acala/karura-node:2.1.0
chain:
base: karura-dev
collators:
Expand Down
2 changes: 1 addition & 1 deletion launch/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
"start": "node_modules/@open-web3/parachain-launch/bin/parachain-launch"
},
"dependencies": {
"@open-web3/parachain-launch": "^1.0.4"
"@open-web3/parachain-launch": "^1.0.6"
}
}
8 changes: 4 additions & 4 deletions launch/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
dependencies:
regenerator-runtime "^0.13.4"

"@open-web3/parachain-launch@^1.0.4":
version "1.0.4"
resolved "https://registry.yarnpkg.com/@open-web3/parachain-launch/-/parachain-launch-1.0.4.tgz#de468ce96fb92d7aaf556604e51b9e0bb703acd6"
integrity sha512-Ck1AcjfxO7SkxjJfoseb/8oiTFcysUtHuEG5McZznKlWd/raaSStEd4U0XQCKhg1MzChF1U5kh4Gn4AP5HfkBg==
"@open-web3/parachain-launch@^1.0.6":
version "1.0.6"
resolved "https://registry.yarnpkg.com/@open-web3/parachain-launch/-/parachain-launch-1.0.6.tgz#e8660fb408570165bd6ff578b0744c7f2961c039"
integrity sha512-sZ+HB+v7cPpWpyKj3d83r9yT2yPr5Luz1J8ftVXp6t8kuPbldYWgOHYlMeOqK0vgYI7sPZkOPNrCb9j4rrgC5A==
dependencies:
"@polkadot/api" "^5.6.1"
"@polkadot/keyring" "^7.2.1"
Expand Down
2 changes: 1 addition & 1 deletion modules/asset-registry/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "module-asset-registry"
version = "2.1.0"
version = "2.1.1"
authors = ["Acala Developers"]
edition = "2021"

Expand Down
2 changes: 1 addition & 1 deletion modules/auction-manager/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "module-auction-manager"
version = "2.1.0"
version = "2.1.1"
authors = ["Acala Developers"]
edition = "2021"

Expand Down
2 changes: 1 addition & 1 deletion modules/cdp-engine/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "module-cdp-engine"
version = "2.1.0"
version = "2.1.1"
authors = ["Acala Developers"]
edition = "2021"

Expand Down
2 changes: 1 addition & 1 deletion modules/cdp-treasury/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "module-cdp-treasury"
version = "2.1.0"
version = "2.1.1"
authors = ["Acala Developers"]
edition = "2021"

Expand Down
2 changes: 1 addition & 1 deletion modules/collator-selection/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = 'module-collator-selection'
version = "2.1.0"
version = "2.1.1"
authors = ["Acala Developers"]
edition = "2021"

Expand Down
2 changes: 1 addition & 1 deletion modules/currencies/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "module-currencies"
version = "2.1.0"
version = "2.1.1"
authors = ["Acala Developers"]
edition = "2021"

Expand Down
2 changes: 1 addition & 1 deletion modules/dex/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "module-dex"
version = "2.1.0"
version = "2.1.1"
authors = ["Acala Developers"]
edition = "2021"

Expand Down
2 changes: 1 addition & 1 deletion modules/emergency-shutdown/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "module-emergency-shutdown"
version = "2.1.0"
version = "2.1.1"
authors = ["Acala Developers"]
edition = "2021"

Expand Down
2 changes: 1 addition & 1 deletion modules/evm-accounts/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "module-evm-accounts"
version = "2.1.0"
version = "2.1.1"
authors = ["Acala Developers"]
edition = "2021"

Expand Down
2 changes: 1 addition & 1 deletion modules/evm-bridge/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "module-evm-bridge"
version = "2.1.0"
version = "2.1.1"
authors = ["Acala Developers"]
edition = "2021"

Expand Down
2 changes: 1 addition & 1 deletion modules/evm-utiltity/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "module-evm-utiltity"
version = "2.1.0"
version = "2.1.1"
authors = ["Acala Developers"]
edition = "2021"

Expand Down
2 changes: 1 addition & 1 deletion modules/evm-utiltity/macro/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "module-evm-utiltity-macro"
version = "2.1.0"
version = "2.1.1"
authors = ["Acala Developers"]
edition = "2021"

Expand Down
2 changes: 1 addition & 1 deletion modules/evm/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "module-evm"
version = "2.1.0"
version = "2.1.1"
authors = ["Acala Developers"]
edition = "2021"

Expand Down
2 changes: 1 addition & 1 deletion modules/evm/rpc/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "evm-rpc"
version = "2.1.0"
version = "2.1.1"
authors = ["Acala Developers"]
edition = "2021"

Expand Down
2 changes: 1 addition & 1 deletion modules/evm/rpc/runtime_api/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "module-evm-rpc-runtime-api"
version = "2.1.0"
version = "2.1.1"
authors = ["Acala Developers"]
edition = "2021"

Expand Down
2 changes: 1 addition & 1 deletion modules/example/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "module-example"
version = "2.1.0"
version = "2.1.1"
authors = ["Acala Developers"]
edition = "2021"

Expand Down
2 changes: 1 addition & 1 deletion modules/homa-lite/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "module-homa-lite"
version = "2.1.0"
version = "2.1.1"
authors = ["Acala Developers"]
edition = "2021"

Expand Down
2 changes: 1 addition & 1 deletion modules/homa-validator-list/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "module-homa-validator-list"
version = "2.1.0"
version = "2.1.1"
authors = ["Acala Developers"]
edition = "2021"

Expand Down
2 changes: 1 addition & 1 deletion modules/homa/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "module-homa"
version = "2.1.0"
version = "2.1.1"
authors = ["Acala Developers"]
edition = "2021"

Expand Down
2 changes: 1 addition & 1 deletion modules/honzon/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "module-honzon"
version = "2.1.0"
version = "2.1.1"
authors = ["Acala Developers"]
edition = "2021"

Expand Down
2 changes: 1 addition & 1 deletion modules/idle-scheduler/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "module-idle-scheduler"
version = "2.1.0"
version = "2.1.1"
authors = ["Acala Developers"]
edition = "2021"

Expand Down
2 changes: 1 addition & 1 deletion modules/incentives/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "module-incentives"
version = "2.1.0"
version = "2.1.1"
authors = ["Acala Developers"]
edition = "2021"

Expand Down
2 changes: 1 addition & 1 deletion modules/loans/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "module-loans"
version = "2.1.0"
version = "2.1.1"
authors = ["Acala Developers"]
edition = "2021"

Expand Down
2 changes: 1 addition & 1 deletion modules/nft/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "module-nft"
version = "2.1.0"
version = "2.1.1"
authors = ["Acala Developers"]
edition = "2021"

Expand Down
2 changes: 1 addition & 1 deletion modules/nominees-election/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "module-nominees-election"
version = "2.1.0"
version = "2.1.1"
authors = ["Acala Developers"]
edition = "2021"

Expand Down
2 changes: 1 addition & 1 deletion modules/polkadot-bridge/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "module-polkadot-bridge"
version = "2.1.0"
version = "2.1.1"
authors = ["Acala Developers"]
edition = "2021"

Expand Down
2 changes: 1 addition & 1 deletion modules/prices/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "module-prices"
version = "2.1.0"
version = "2.1.1"
authors = ["Acala Developers"]
edition = "2021"

Expand Down
2 changes: 1 addition & 1 deletion modules/relaychain/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "module-relaychain"
version = "2.1.0"
version = "2.1.1"
authors = ["Acala Developers"]
edition = "2021"

Expand Down
2 changes: 1 addition & 1 deletion modules/session-manager/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "module-session-manager"
version = "2.1.0"
version = "2.1.1"
authors = ["Acala Developers"]
edition = "2021"

Expand Down
2 changes: 1 addition & 1 deletion modules/staking-pool/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "module-staking-pool"
version = "2.1.0"
version = "2.1.1"
authors = ["Acala Developers"]
edition = "2021"

Expand Down
2 changes: 1 addition & 1 deletion modules/staking-pool/rpc/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "module-staking-pool-rpc"
version = "2.1.0"
version = "2.1.1"
authors = ["Acala Developers"]
edition = "2021"

Expand Down
2 changes: 1 addition & 1 deletion modules/staking-pool/rpc/runtime-api/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "module-staking-pool-rpc-runtime-api"
version = "2.1.0"
version = "2.1.1"
authors = ["Acala Developers"]
edition = "2021"

Expand Down
2 changes: 1 addition & 1 deletion modules/support/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "module-support"
version = "2.1.0"
version = "2.1.1"
authors = ["Acala Developers"]
edition = "2021"

Expand Down
2 changes: 1 addition & 1 deletion modules/transaction-pause/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "module-transaction-pause"
version = "2.1.0"
version = "2.1.1"
authors = ["Acala Developers"]
edition = "2021"

Expand Down
2 changes: 1 addition & 1 deletion modules/transaction-payment/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "module-transaction-payment"
version = "2.1.0"
version = "2.1.1"
authors = ["Acala Developers"]
edition = "2021"

Expand Down
2 changes: 1 addition & 1 deletion node/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "acala"
version = "2.1.0"
version = "2.1.1"
authors = ["Acala Developers"]
edition = "2021"
default-run = "acala"
Expand Down
2 changes: 1 addition & 1 deletion node/cli/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "acala-cli"
version = "2.1.0"
version = "2.1.1"
authors = ["Acala Developers"]
edition = "2021"

Expand Down
4 changes: 0 additions & 4 deletions node/cli/src/cli.rs
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,6 @@ pub struct ExportGenesisStateCommand {
#[structopt(parse(from_os_str))]
pub output: Option<PathBuf>,

/// Id of the parachain this state is for.
#[structopt(long, default_value = "2000")]
pub parachain_id: u32,

/// Write output in binary. Default is to write in hex.
#[structopt(short, long)]
pub raw: bool,
Expand Down
2 changes: 1 addition & 1 deletion node/e2e-tests/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "e2e-tests"
version = "2.1.0"
version = "2.1.1"
authors = ["Acala Developers"]
edition = "2021"

Expand Down
2 changes: 1 addition & 1 deletion node/e2e-tests/test-runner/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "test-runner"
version = "2.1.0"
version = "2.1.1"
authors = ["Acala Developers"]
edition = "2021"

Expand Down
Loading

0 comments on commit 8b57eae

Please sign in to comment.