Skip to content

Switch from free_balance to reducible_balance #699

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
crystalin merged 3 commits into from
Aug 18, 2021
Merged

Switch from free_balance to reducible_balance #699

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
630c58a
switch frontier dependency
JoshOrndorff Aug 17, 2021
6df0895
better branch name
JoshOrndorff Aug 17, 2021
062924c
Add reducible test balance
girazoki Aug 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions Cargo.lock
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion client/rpc-core/txpool/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ jsonrpc-derive = "14.0.3"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"

fc-rpc-core = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-pre" }
fc-rpc-core = { git = "https://github.com/purestake/frontier", branch = "moonriver-phase-four" }
8 changes: 4 additions & 4 deletions client/rpc/debug/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ sp-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot

moonbeam-rpc-core-debug = { path = "../../rpc-core/debug" }
moonbeam-rpc-primitives-debug = { path = "../../../primitives/rpc/debug" }
fc-consensus = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-pre" }
fc-db = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-pre" }
fc-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-pre", features = ["rpc_binary_search_estimate"] }
fp-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-pre" }
fc-consensus = { git = "https://github.com/purestake/frontier", branch = "moonriver-phase-four" }
fc-db = { git = "https://github.com/purestake/frontier", branch = "moonriver-phase-four" }
fc-rpc = { git = "https://github.com/purestake/frontier", branch = "moonriver-phase-four", features = ["rpc_binary_search_estimate"] }
fp-rpc = { git = "https://github.com/purestake/frontier", branch = "moonriver-phase-four" }
8 changes: 4 additions & 4 deletions client/rpc/trace/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@ sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.8" }
sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.8" }
sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.8" }
fp-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-pre" }
fp-rpc = { git = "https://github.com/purestake/frontier", branch = "moonriver-phase-four" }
moonbeam-rpc-primitives-debug = { path = "../../../primitives/rpc/debug" }

# Client and RPC
jsonrpc-core = "15.0.0"
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.8" }
sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.8" }
sc-transaction-graph = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.8" }
fc-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-pre", features = ["rpc_binary_search_estimate"] }
fc-consensus = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-pre" }
fc-rpc-core = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-pre" }
fc-rpc = { git = "https://github.com/purestake/frontier", branch = "moonriver-phase-four", features = ["rpc_binary_search_estimate"] }
fc-consensus = { git = "https://github.com/purestake/frontier", branch = "moonriver-phase-four" }
fc-rpc-core = { git = "https://github.com/purestake/frontier", branch = "moonriver-phase-four" }
moonbeam-rpc-core-trace = { path = "../../rpc-core/trace" }
2 changes: 1 addition & 1 deletion client/rpc/txpool/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ frame-system = { git = "https://github.com/paritytech/substrate", branch = "polk
serde = { version = "1.0", features = ["derive"] }

moonbeam-rpc-primitives-txpool = { path = "../../../primitives/rpc/txpool" }
fc-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-pre", features = ["rpc_binary_search_estimate"] }
fc-rpc = { git = "https://github.com/purestake/frontier", branch = "moonriver-phase-four", features = ["rpc_binary_search_estimate"] }
18 changes: 9 additions & 9 deletions node/service/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,17 +81,17 @@ sc-consensus-manual-seal = { git = "https://github.com/paritytech/substrate", br
frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.8" }
pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.8" }

evm = { package = "pallet-evm", git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-pre" }
ethereum = { package = "pallet-ethereum", git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-pre" }
evm = { package = "pallet-evm", git = "https://github.com/purestake/frontier", branch = "moonriver-phase-four" }
ethereum = { package = "pallet-ethereum", git = "https://github.com/purestake/frontier", branch = "moonriver-phase-four" }
ethereum-primitives = { package = "ethereum", version = "0.7.1", default-features = false, features = ["with-codec"] }

fc-consensus = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-pre" }
fp-consensus = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-pre" }
fc-rpc-core = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-pre" }
fc-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-pre", features = ["rpc_binary_search_estimate"] }
fp-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-pre" }
fc-db = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-pre" }
fc-mapping-sync = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-pre" }
fc-consensus = { git = "https://github.com/purestake/frontier", branch = "moonriver-phase-four" }
fp-consensus = { git = "https://github.com/purestake/frontier", branch = "moonriver-phase-four" }
fc-rpc-core = { git = "https://github.com/purestake/frontier", branch = "moonriver-phase-four" }
fc-rpc = { git = "https://github.com/purestake/frontier", branch = "moonriver-phase-four", features = ["rpc_binary_search_estimate"] }
fp-rpc = { git = "https://github.com/purestake/frontier", branch = "moonriver-phase-four" }
fc-db = { git = "https://github.com/purestake/frontier", branch = "moonriver-phase-four" }
fc-mapping-sync = { git = "https://github.com/purestake/frontier", branch = "moonriver-phase-four" }

# Cumulus dependencies
cumulus-client-cli = { git = "https://github.com/purestake/cumulus", branch = "joshy-np098" }
Expand Down
2 changes: 1 addition & 1 deletion precompiles/crowdloan-rewards/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ frame-support = { git = "https://github.com/paritytech/substrate", branch = "pol
evm = { version = "0.27.0", default-features = false, features = ["with-codec"] }
sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.8" }
sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.8" }
pallet-evm = { git = "https://github.com/purestake/frontier", default-features = false, branch = "moonbeam-polkadot-pre" }
pallet-evm = { git = "https://github.com/purestake/frontier", default-features = false, branch = "moonriver-phase-four" }
pallet-crowdloan-rewards = { git = "https://github.com/purestake/crowdloan-rewards", default-features = false, branch = "main" }
frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.8" }
precompile-utils = { path = "../utils", default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion precompiles/parachain-staking/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ evm = { version = "0.27.0", default-features = false, features = ["with-codec"]
sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.8" }
sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.8" }
sp-io = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.8" }
pallet-evm = { git = "https://github.com/purestake/frontier", default-features = false, branch = "moonbeam-polkadot-pre" }
pallet-evm = { git = "https://github.com/purestake/frontier", default-features = false, branch = "moonriver-phase-four" }
parachain-staking = { path = "../../pallets/parachain-staking", default-features = false }
frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.8" }
precompile-utils = { path = "../utils", default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion precompiles/utils/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ codec = { package = "parity-scale-codec", version = "2.0.0", default-features =
frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.8" }
frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.8" }

pallet-evm = { git = "https://github.com/purestake/frontier", default-features = false, branch = "moonbeam-polkadot-pre" }
pallet-evm = { git = "https://github.com/purestake/frontier", default-features = false, branch = "moonriver-phase-four" }
evm = { version = "0.27.0", default-features = false, features = ["with-codec"] }

precompile-utils-macro = { path = "macro" }
Expand Down
4 changes: 2 additions & 2 deletions runtime/evm_tracer/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ repository = 'https://github.com/PureStake/moonbeam/'

[dependencies]
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
fp-evm = { git = "https://github.com/purestake/frontier", default-features = false, branch = "moonbeam-polkadot-pre" }
pallet-evm = { git = "https://github.com/purestake/frontier", default-features = false, branch = "moonbeam-polkadot-pre" }
fp-evm = { git = "https://github.com/purestake/frontier", default-features = false, branch = "moonriver-phase-four" }
pallet-evm = { git = "https://github.com/purestake/frontier", default-features = false, branch = "moonriver-phase-four" }
evm = { version = "0.27.0", default-features = false, features = ["with-codec", "tracing"] }
evm-runtime = { version = "0.27.0", default-features = false, features = ["tracing"] }
evm-gasometer = { version = "0.27.0", default-features = false, features = ["tracing"] }
Expand Down
16 changes: 8 additions & 8 deletions runtime/moonbase/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ nimbus-primitives = { git = "https://github.com/purestake/cumulus", branch = "jo
pallet-author-mapping = { path = "../../pallets/author-mapping", default-features = false }
evm = { version = "0.27.0", default-features = false, features = ["with-codec"] }
precompile-utils = { path = "../../precompiles/utils", default-features = false }
pallet-evm-precompile-bn128 = { git = "https://github.com/purestake/frontier", default-features = false, branch = "moonbeam-polkadot-pre" }
pallet-evm-precompile-dispatch = { git = "https://github.com/purestake/frontier", default-features = false, branch = "moonbeam-polkadot-pre" }
pallet-evm-precompile-modexp = { git = "https://github.com/purestake/frontier", default-features = false, branch = "moonbeam-polkadot-pre" }
pallet-evm-precompile-simple = { git = "https://github.com/purestake/frontier", default-features = false, branch = "moonbeam-polkadot-pre" }
pallet-evm-precompile-sha3fips = { git = "https://github.com/purestake/frontier", default-features = false, branch = "moonbeam-polkadot-pre" }
pallet-evm-precompile-bn128 = { git = "https://github.com/purestake/frontier", default-features = false, branch = "moonriver-phase-four" }
pallet-evm-precompile-dispatch = { git = "https://github.com/purestake/frontier", default-features = false, branch = "moonriver-phase-four" }
pallet-evm-precompile-modexp = { git = "https://github.com/purestake/frontier", default-features = false, branch = "moonriver-phase-four" }
pallet-evm-precompile-simple = { git = "https://github.com/purestake/frontier", default-features = false, branch = "moonriver-phase-four" }
pallet-evm-precompile-sha3fips = { git = "https://github.com/purestake/frontier", default-features = false, branch = "moonriver-phase-four" }


# Substrate dependencies
Expand Down Expand Up @@ -58,11 +58,11 @@ pallet-transaction-payment = { git = "https://github.com/paritytech/substrate",

frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.8" }
pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.8" }
pallet-evm = { git = "https://github.com/purestake/frontier", default-features = false, branch = "moonbeam-polkadot-pre" }
pallet-evm = { git = "https://github.com/purestake/frontier", default-features = false, branch = "moonriver-phase-four" }
pallet-utility = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.8" }

pallet-ethereum = { default-features = false, git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-pre" }
fp-rpc = { default-features = false, git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-pre" }
pallet-ethereum = { default-features = false, git = "https://github.com/purestake/frontier", branch = "moonriver-phase-four" }
fp-rpc = { default-features = false, git = "https://github.com/purestake/frontier", branch = "moonriver-phase-four" }

pallet-democracy = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.8" }
pallet-scheduler = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.8" }
Expand Down
Loading