Skip to content

Commit

Permalink
Merge branch 'main' into validator-online-management
Browse files Browse the repository at this point in the history
  • Loading branch information
clostao authored Sep 7, 2023
2 parents 884aa66 + bb6f2e7 commit e17ac95
Show file tree
Hide file tree
Showing 42 changed files with 2,657 additions and 486 deletions.
1,108 changes: 683 additions & 425 deletions Cargo.lock

Large diffs are not rendered by default.

7 changes: 6 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ members = [
'precompiles/upgrade-runtime-controller',
'primitives/tools',
'primitives/fee-compatible-api',
'primitives/zero-gas-transactions-api',
'primitives/stability-rpc-api',
'pallets/erc20-manager',
'pallets/dnt-fee-controller',
Expand Down Expand Up @@ -66,6 +67,7 @@ futures-timer = "3.0.1"
log = "0.4.17"
parking_lot = "0.12.1"
array-bytes = "4.1"
bytes = "1.0"
async-trait = "0.1.57"
cfg-if = "1.0"
memory-db = { version = "0.31.0", default-features = false }
Expand Down Expand Up @@ -190,6 +192,8 @@ precompile-validator-controller = { path = "./precompiles/validator-controller",
pallet-root-controller = { path = "./pallets/root-controller", default-features = false }
pallet-dnt-fee-controller = { path = "./pallets/dnt-fee-controller", default-features = false }
pallet-sponsored-transactions = { path = "./pallets/sponsored-transactions", default-features = false }
pallet-zero-gas-transactions = { path = "./pallets/zero-gas-transactions", default-features = false }
stbl-primitives-zero-gas-transactions-api = { path = "./primitives/zero-gas-transactions-api", default-features = false }
stbl-primitives-fee-compatible-api = { path = "./primitives/fee-compatible-api", default-features = false }
pallet-erc20-manager = { path = "./pallets/erc20-manager", default-features = false }
pallet-upgrade-runtime-proposal = { path = "./pallets/upgrade-runtime-proposal", default-features = false }
Expand Down Expand Up @@ -218,4 +222,5 @@ parity-scale-codec = { version = "3.0.0", default-features = false, features = [
sha3 = { version = "0.9", default-features = false }
stability-rpc = { path = "./stability-rpc", default-features = false }
stability-rpc-api = { path = "./primitives/stability-rpc-api", default-features = false }
stbl-transaction-validator = { path = "./primitives/transaction-validator", default-features = false }
stbl-transaction-validator = { path = "./primitives/transaction-validator", default-features = false }
reqwest = { version = "0.11", features = ["json"] }
7 changes: 7 additions & 0 deletions client/authorship/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,17 @@ sp-inherents = { workspace = true }
sp-keyring = { workspace = true }
sp-runtime = { workspace = true }
stbl-primitives-fee-compatible-api = { workspace = true, features = ["std"] }
stbl-primitives-zero-gas-transactions-api = { workspace = true, features = ["std"] }
stbl-tools = { workspace = true }
ethereum = { workspace = true }
sp-keystore = { workspace = true }
stability-runtime = { path = "./../../runtime", features = ["std"] }
sc-service = { workspace = true }
account = { workspace = true, features = ["std"] }
reqwest = { workspace = true, features = ["json"] }
serde = { workspace = true, features = ["derive"] }
bytes = { workspace = true }
hex = { workspace = true }

[dev-dependencies]
parking_lot = { workspace = true }
Expand Down
Loading

0 comments on commit e17ac95

Please sign in to comment.