Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1,023 changes: 504 additions & 519 deletions Cargo.lock

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ members = [
"dilithium-crypto/verify",
"dilithium-crypto/sign",
"pallets/balances",
"pallets/vesting",
"pallets/reversible-transfers",
"external-miner",
"resonance-miner-api",
Expand All @@ -42,7 +41,6 @@ pallet-faucet = {path = "./pallets/faucet", default-features = false}
pallet-qpow = { path = "./pallets/qpow", default-features = false}
pallet-mining-rewards = { path = "./pallets/mining-rewards", default-features = false}
pallet-wormhole = { path="./pallets/wormhole", default-features = false }
pallet-vesting = { path = "./pallets/vesting", default-features = false }
pallet-balances = { path="./pallets/balances", default-features = false }
pallet-reversible-transfers = { path="./pallets/reversible-transfers", default-features = false }
pallet-conviction-voting = { version = "39.1.0", default-features = false }
Expand All @@ -52,6 +50,7 @@ pallet-referenda = { version = "39.1.0", default-features = false }
pallet-scheduler = { version = "40.1.0", default-features = false }
pallet-utility = { version = "39.1.0", default-features = false }
parking_lot = { version = "0.12.1", default-features = false }
pallet-vesting = { version = "39.1.0", default-features = false }
clap = { version = "4.5.13" }
frame-benchmarking-cli = { version = "46.1.0", default-features = false }
frame-metadata-hash-extension = { version = "0.7.0", default-features = false }
Expand Down
3 changes: 2 additions & 1 deletion pallets/merkle-airdrop/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ binary-merkle-tree = { version = "16.0.0", default-features = false }
poseidon-resonance = { workspace = true, default-features = false }

[dev-dependencies]
pallet-vesting = { default-features = true, workspace = true }
sp-core = { default-features = true, workspace = true }
sp-io = { default-features = true, workspace = true }
sp-runtime = { default-features = true, workspace = true }
Expand Down Expand Up @@ -56,4 +57,4 @@ runtime-benchmarks = [
try-runtime = [
"frame-support/try-runtime",
"frame-system/try-runtime",
]
]
2 changes: 1 addition & 1 deletion pallets/merkle-airdrop/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Merkle Airdrop Pallet

A Substrate pallet for distributing tokens via Merkle proofs.
A Substrate pallet for distributing tokens via Merkle proofs with optional vesting of the airdropped tokens.

## Testing & Usage

Expand Down
Loading