Skip to content

Commit

Permalink
Update/local frame (paritytech#210)
Browse files Browse the repository at this point in the history
* use patch rather than path in cargo.toml for transaction-payment

* remove local balance and add local executive to provide log

* split transfer to transfer/transfer_with_memo in XAssets

* remove memo in assets and staking

* fix test compile error
  • Loading branch information
atenjin authored Aug 28, 2020
1 parent eb6bd7e commit ceb9bb9
Show file tree
Hide file tree
Showing 35 changed files with 1,615 additions and 3,716 deletions.
48 changes: 15 additions & 33 deletions Cargo.lock

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

10 changes: 4 additions & 6 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,13 @@ authors = ["ChainX community <https://www.chainx.org>"]
edition = "2018"
description = "Fully Decentralized Interchain Crypto Asset Management on Polkadot"

[patch.crates-io]
# jsonrpc-derive requires a new version after v14.2.
# Remove this once Substrate releases a new tag with this patch.
[patch.crates-io]
jsonrpc-derive = { git = "https://github.com/paritytech/jsonrpc", rev = "57575efe9c220c7e7c0addf3c90e9577e3296c80" }
# patch for substrate runtime module
frame-executive = { path = "./frame/executive" }
pallet-transaction-payment = { path = "./frame/transaction-payment" }

[dependencies]
cli = { package = "chainx-cli", path = "cli" }
Expand All @@ -25,11 +28,6 @@ members = [
"rpc",
"runtime",

"frame/balances",
"frame/transaction-payment",
"frame/transaction-payment/rpc",
"frame/transaction-payment/rpc/runtime-api",

"xpallets/assets",
"xpallets/assets-registrar",
"xpallets/assets/rpc",
Expand Down
1 change: 0 additions & 1 deletion cli/src/chain_spec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,6 @@ fn testnet_genesis(
xpallet_assets: Some(XAssetsConfig {
assets_restrictions,
endowed: assets_endowed,
memo_len: 128,
}),
xpallet_gateway_common: Some(XGatewayCommonConfig { trustees }),
xpallet_gateway_bitcoin: {
Expand Down
167 changes: 0 additions & 167 deletions frame/balances/src/benchmarking.rs

This file was deleted.

Loading

0 comments on commit ceb9bb9

Please sign in to comment.