Skip to content

Commit

Permalink
Merge branch 'master' into update-stable2407
Browse files Browse the repository at this point in the history
  • Loading branch information
xlc committed Aug 2, 2024
2 parents fe3a6e5 + c224c18 commit cf64ece
Show file tree
Hide file tree
Showing 53 changed files with 4,168 additions and 1,357 deletions.
11 changes: 10 additions & 1 deletion Cargo.lock

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

3 changes: 3 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,7 @@ module-evm-bridge = { path = "modules/evm-bridge", default-features = false }
module-evm-rpc-runtime-api = { path = "modules/evm/rpc/runtime-api", default-features = false }
module-evm-utility = { path = "modules/evm-utility", default-features = false }
module-homa = { path = "modules/homa", default-features = false }
module-homa-validator-list = { path = "modules/homa-validator-list", default-features = false }
module-honzon = { path = "modules/honzon", default-features = false }
module-honzon-bridge = { path = "modules/honzon-bridge", default-features = false }
module-idle-scheduler = { path = "modules/idle-scheduler", default-features = false }
Expand Down Expand Up @@ -263,6 +264,7 @@ pallet-recovery = { version = "37.0.0", default-features = false }
pallet-root-testing = { version = "13.0.0", default-features = false }
pallet-scheduler = { version = "38.0.0", default-features = false }
pallet-session = { version = "37.0.0", default-features = false }
pallet-state-trie-migration = { version = "39.0.0", default-features = false }
pallet-sudo = { version = "37.0.0", default-features = false }
pallet-timestamp = { version = "36.0.0", default-features = false }
pallet-tips = { version = "36.0.0", default-features = false }
Expand All @@ -271,6 +273,7 @@ pallet-transaction-payment-rpc-runtime-api = { version = "37.0.0", default-featu
pallet-treasury = { version = "36.0.0", default-features = false }
pallet-utility = { version = "37.0.0", default-features = false }
pallet-xcm = { version = "16.0.0", default-features = false }
pallet-xcm-benchmarks = { version = "16.0.0", default-features = false }
parachain-info = { version = "0.16.0", package = "staging-parachain-info", default-features = false }
parachains-common = { version = "17.0.0", default-features = false }
polkadot-core-primitives = { version = "15.0.0", default-features = false }
Expand Down
6 changes: 3 additions & 3 deletions launch/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -739,9 +739,9 @@ wrappy@1:
integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=

ws@^8.14.2, ws@^8.8.1:
version "8.15.1"
resolved "https://registry.yarnpkg.com/ws/-/ws-8.15.1.tgz#271ba33a45ca0cc477940f7f200cd7fba7ee1997"
integrity sha512-W5OZiCjXEmk0yZ66ZN82beM5Sz7l7coYxpRkzS+p9PP+ToQry8szKh+61eNktr7EA9DOwvFGhfC605jDHbP6QQ==
version "8.17.1"
resolved "https://registry.yarnpkg.com/ws/-/ws-8.17.1.tgz#9293da530bb548febc95371d90f9c878727d919b"
integrity sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==

y18n@^5.0.5:
version "5.0.8"
Expand Down
Loading

0 comments on commit cf64ece

Please sign in to comment.