Skip to content

Commit

Permalink
Remove local copy of pallet-staking (#751)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Serial-ATA
Serial-ATA authored Sep 2, 2024
1 parent 7f6ffd9 commit 6c70faf
Show file tree
Hide file tree
Showing 63 changed files with 965 additions and 20,626 deletions.
1,841 changes: 872 additions & 969 deletions Cargo.lock
View file

Large diffs are not rendered by default.

79 changes: 40 additions & 39 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,61 +47,62 @@ members = [
resolver = "2"

[workspace.dependencies]
smallvec = "1.6.1"
smallvec = "1.13.2"
substrate-wasm-builder = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.0", default-features = false }
substrate-build-script-utils = "3.0.0"
subtle = { version = "2.2", default-features = false }
substrate-build-script-utils = "11.0.0"
subtle = { version = "2.6", default-features = false }
hex-literal = "0.4.1"
itertools = { version = "0.12.1", default-features = false }
log = { version = "0.4.20", default-features = false }
scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
serde = { version = "1.0.197", default-features = false, features = ["derive"] }
serde_json = { version = "1.0.85", default-features = false }
serde_with = { version = "3.6", default-features = false }
itertools = { version = "0.13.0", default-features = false }
log = { version = "0.4.22", default-features = false }
scale-info = { version = "2.11.3", default-features = false, features = ["derive"] }
serde = { version = "1.0.209", default-features = false, features = ["derive"] }
serde_json = { version = "1.0.127", default-features = false }
serde_with = { version = "3.9", default-features = false }
serdect = { version = "0.2.0", default-features = false }
static_assertions = "1.1.0"
clap = { version = "4.4.2", features = ["derive"] }
parity-scale-codec = { version = "3.6.4", default-features = false, features = ["derive", "max-encoded-len"] }
clap = { version = "4.5.16", features = ["derive"] }
parity-scale-codec = { version = "3.6.12", default-features = false, features = ["derive", "max-encoded-len"] }
rlp = { version = "0.5", default-features = false }
tracing = "0.1.34"
tokio = { version = "1.13" }
futures = { version = "0.3.16" }
tracing = "0.1.40"
tokio = { version = "1.39" }
futures = { version = "0.3.30" }
rand_core = { version = "0.6", default-features = false }
rand_chacha = { version = "0.3", default-features = false }
rand = { version = "0.7.2", default-features = false }
async-trait = "0.1.59"
libsecp256k1 = { version = "0.7.0", default-features = false }
rand = { version = "0.8.5", default-features = false }
async-trait = "0.1.81"
libsecp256k1 = { version = "0.7.1", default-features = false }
rustc-hex = { version = "2.1.0", default-features = false }
num_enum = { version = "0.5.3", default-features = false }
derive_more = "0.99"
num_enum = { version = "0.7.3", default-features = false }
derive_more = "1.0.0"
affix = "0.1.2"
environmental = { version = "1.1.4", default-features = false }
assert_matches = "1.3.0"
assert_matches = "1.5.0"
impl-trait-for-tuples = "0.2.2"
sha2 = { version = "0.10.2", default-features = false }
sha3 = { version = "0.10.1", default-features = false }
digest = { version = "0.10.1", default-features = false }
similar-asserts = { version = "1.1.0" }
sha2 = { version = "0.10.8", default-features = false }
sha3 = { version = "0.10.8", default-features = false }
digest = { version = "0.10.7", default-features = false }
similar-asserts = { version = "1.5.0" }
proc-macro2 = "1.0"
quote = "1.0"
syn = { version = "1.0" }
syn = { version = "2.0.76" }
hex = { version = "0.4.3", default-features = false }
paste = "1.0.6"
paste = "1.0.15"
slices = "0.2.0"
byteorder = { version = "1", default-features = false }
schnorrkel = { version = "0.11.4", default-features = false }
snowbridge-milagro-bls = { git = "https://github.com/Snowfork/milagro_bls", default-features = false, rev = "43a5d480ed6e3b83de4cf54888680d51604199e6" }
primitive-types = { version = "0.12.2", default-features = false, features = ["scale-info", "serde_no_std"] }
fixed = { version = "1.23.0", default-features = false }
fixed = { version = "1.28.0", default-features = false }
educe = { version = "0.6.0", default-features = false }

tangle-testnet-runtime = { package = "tangle-testnet-runtime", path = "runtime/testnet" }
tangle-runtime = { package = "tangle-runtime", path = "runtime/mainnet" }

# Arkworks
ark-ec = { version = "^0.4.0", default-features = false }
ark-ff = { version = "^0.4.0", default-features = false }
ark-ec = { version = "^0.4.2", default-features = false }
ark-ff = { version = "^0.4.2", default-features = false }
ark-relations = { version = "^0.4.0", default-features = false }
ark-serialize = { version = "^0.4.0", default-features = false, features = ["derive"] }
ark-serialize = { version = "^0.4.2", default-features = false, features = ["derive"] }
ark-std = { version = "^0.4.0", default-features = false }
ark-groth16 = { version = "0.4.0", default-features = false }

Expand All @@ -111,7 +112,7 @@ ark-bn254 = { version = "^0.4.0", default-features = false, features = ["curve"]

ark-crypto-primitives = { version = "^0.4.0", default-features = false }

ethabi = { version = "15.0.0", default-features = false }
ethabi = { version = "18.0.0", default-features = false }

# Tangle Dependencies
pallet-airdrop-claims = { path = "pallets/claims", default-features = false }
Expand All @@ -121,10 +122,10 @@ pallet-services-rpc = { path = "pallets/services/rpc" }
pallet-multi-asset-delegation = { path = "pallets/multi-asset-delegation", default-features = false }


k256 = { version = "0.13.0", default-features = false }
p256 = { version = "0.13.0", default-features = false }
k256 = { version = "0.13.3", default-features = false }
p256 = { version = "0.13.2", default-features = false }
ecdsa-core = { package = "ecdsa", version = "0.16.9", default-features = false }
starknet-crypto = { version = "0.6.1", default-features = false, features = ["signature-display", "alloc"] }
starknet-crypto = { version = "0.7.1", default-features = false, features = ["signature-display", "alloc"] }
frost-core = { path = "frost", default-features = false }
frost-ed25519 = { path = "frost/frost-ed25519", default-features = false }
frost-ed448 = { path = "frost/frost-ed448", default-features = false }
Expand Down Expand Up @@ -315,29 +316,29 @@ pallet-evm-precompile-verify-bls381-signature = { path = "precompiles/verify-bls

# Precompiles utils
postcard = { version = "1", default-features = false }
generic-ec = { version = "0.2", default-features = false }
generic-ec = { version = "0.4.1", default-features = false }
signature = { version = "2.2", default-features = false }

# EVM & Ethereum
# (wasm)
evm = { version = "0.41.0", default-features = false }
evm = { version = "0.41.1", default-features = false }
ethereum-types = { version = "0.14.1", default-features = false }
ethereum = { version = "0.15.0", default-features = false }

evm-gasometer = { version = "0.41.0", default-features = false }
evm-runtime = { version = "0.41.0", default-features = false }

# RPC related dependencies
jsonrpsee = { version = "0.20.3", features = ["server"] }
jsonrpsee = { version = "0.20.4", features = ["server"] }
pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.0" }
sc-transaction-pool-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.0" }
sc-consensus-manual-seal = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.0" }

# Tangle dependencies
tangle-primitives = { path = "primitives", default-features = false }
tangle-crypto-primitives = { path = "primitives/crypto", default-features = false }
pallet-staking = { path = "pallets/staking", default-features = false }
pallet-staking-reward-curve = { path = "pallets/staking/reward-curve", default-features = false }
pallet-staking = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.0", default-features = false }
pallet-staking-reward-curve = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.0", default-features = false }
pallet-tangle-lst = { path = "pallets/tangle-lst", default-features = false }
primitives-ext = { path = "primitives/ext", default-features = false }
evm-tracing-events = { path = "primitives/rpc/evm-tracing-events", default-features = false }
Expand Down
4 changes: 2 additions & 2 deletions frost/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ license = { workspace = true }
repository = { workspace = true }

[dependencies]
zeroize = { version = "1.5.4", default-features = false, features = ["derive"] }
zeroize = { version = "1.8.1", default-features = false, features = ["derive"] }
byteorder = { workspace = true }
parity-scale-codec = { workspace = true }
serde = { workspace = true }
serdect = { workspace = true, features = ["alloc"] }
sp-std = { workspace = true }
subtle = { workspace = true }
postcard = { version = "1.0.0", default-features = false, features = ["alloc"] }
postcard = { version = "1.0.10", default-features = false, features = ["alloc"] }
hex = { workspace = true, features = ["alloc"] }
rand_core = { workspace = true, optional = true }
debugless-unwrap = "0.0.4"
Expand Down
4 changes: 2 additions & 2 deletions frost/frost-ed25519/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ description = "A Schnorr signature scheme over Ed25519 that supports FROST."

[dependencies]
parity-scale-codec = { workspace = true }
curve25519-dalek = { version = "4.1.2", default-features = false }
curve25519-dalek = { version = "4.1.3", default-features = false }
frost-core = { workspace = true }
rand_core = { workspace = true, optional = true }
sha2 = { workspace = true }
Expand All @@ -31,4 +31,4 @@ std = [
"parity-scale-codec/std",
"rand_core/std",
"curve25519-dalek/rand_core",
]
]
4 changes: 2 additions & 2 deletions frost/frost-ristretto255/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ description = "A Schnorr signature scheme over Ed25519 that supports FROST."

[dependencies]
parity-scale-codec = { workspace = true }
curve25519-dalek = { version = "4.1.2", default-features = false }
curve25519-dalek = { version = "4.1.3", default-features = false }
frost-core = { workspace = true }
rand_core = { workspace = true, optional = true }
sha2 = { workspace = true }
Expand All @@ -31,4 +31,4 @@ std = [
"parity-scale-codec/std",
"rand_core/std",
"curve25519-dalek/rand_core",
]
]
2 changes: 1 addition & 1 deletion frost/frost-secp256k1/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ rustdoc-args = ["--cfg", "docsrs"]

[dependencies]
parity-scale-codec = { workspace = true }
k256 = { workspace = true, features = ["arithmetic", "expose-field", "hash2curve", "alloc"] }
k256 = { workspace = true, features = ["arithmetic", "expose-field", "hash2curve", "alloc", "pkcs8"] }
frost-core = { workspace = true }
rand_core = { workspace = true, optional = true }
sha2 = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion frost/frost-taproot/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ rustdoc-args = ["--cfg", "docsrs"]

[dependencies]
parity-scale-codec = { workspace = true }
k256 = { workspace = true, default-features = false, features = ["arithmetic", "schnorr", "expose-field", "hash2curve", "alloc"] }
k256 = { workspace = true, default-features = false, features = ["arithmetic", "schnorr", "expose-field", "hash2curve", "alloc", "pkcs8"] }
frost-core = { workspace = true }
rand_core = { workspace = true, optional = true }
sha2 = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion node/src/rpc/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ use tangle_runtime::BlockNumber;

// Runtime
#[cfg(not(feature = "testnet"))]
use tangle_runtime::{AccountId, Balance, Hash, Index, PalletServicesConstraints};
use tangle_runtime::{AccountId, Balance, Hash, Index};
#[cfg(feature = "testnet")]
use tangle_testnet_runtime::{AccountId, Balance, Hash, Index, PalletServicesConstraints};

Expand Down
2 changes: 1 addition & 1 deletion pallets/services/rpc/runtime-api/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ repository = { workspace = true }
targets = ["x86_64-unknown-linux-gnu"]

[dependencies]
parity-scale-codec = { version = "3.6.1", default-features = false, features = ["derive"] }
parity-scale-codec = { version = "3.6.12", default-features = false, features = ["derive"] }
sp-api = { workspace = true }
sp-runtime = { workspace = true }
sp-std = { workspace = true }
Expand Down
8 changes: 4 additions & 4 deletions pallets/services/src/functions.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ impl<T: Config> Pallet<T> {
},
],
outputs: Default::default(),
constant: false,
constant: None,
state_mutability: ethabi::StateMutability::Payable,
};
let args = prefrences
Expand Down Expand Up @@ -105,7 +105,7 @@ impl<T: Config> Pallet<T> {
},
],
outputs: Default::default(),
constant: false,
constant: None,
state_mutability: ethabi::StateMutability::Payable,
};
let service_id = Token::Uint(ethabi::Uint::from(service_id));
Expand Down Expand Up @@ -163,7 +163,7 @@ impl<T: Config> Pallet<T> {
},
],
outputs: Default::default(),
constant: false,
constant: None,
state_mutability: ethabi::StateMutability::Payable,
};
let service_id = Token::Uint(ethabi::Uint::from(service_id));
Expand Down Expand Up @@ -231,7 +231,7 @@ impl<T: Config> Pallet<T> {
},
],
outputs: Default::default(),
constant: false,
constant: None,
state_mutability: ethabi::StateMutability::NonPayable,
};
let service_id = Token::Uint(ethabi::Uint::from(service_id));
Expand Down
2 changes: 1 addition & 1 deletion pallets/services/src/rpc.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ impl<T: Config> Pallet<T> {
.services
.into_iter()
.flat_map(Self::services)
.group_by(|service| service.blueprint);
.chunk_by(|service| service.blueprint);

let blueprints = profile
.blueprints
Expand Down
27 changes: 0 additions & 27 deletions pallets/staking/CHANGELOG.md
View file

This file was deleted.

Loading

0 comments on commit 6c70faf

Please sign in to comment.