Skip to content

Commit

Permalink
Merge branch 'main' into salman/shared-re-stake
Browse files Browse the repository at this point in the history
  • Loading branch information
drewstone authored Dec 11, 2023
2 parents a44392c + c2be29f commit 47ba3b0
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 15 deletions.
10 changes: 3 additions & 7 deletions node/src/distributions/mainnet.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,21 +29,17 @@ fn read_contents_to_substrate_accounts(path_str: &str) -> BTreeMap<AccountId, f6
}

fn get_edgeware_genesis_list() -> Vec<H160> {
read_contents_to_evm_accounts(
"standalone/node/src/distributions/data/edgeware_genesis_participants.json",
)
read_contents_to_evm_accounts("node/src/distributions/data/edgeware_genesis_participants.json")
}

fn get_edgeware_snapshot_list() -> BTreeMap<AccountId32, f64> {
read_contents_to_substrate_accounts(
"standalone/node/src/distributions/data/edgeware_snapshot_distribution.json",
"node/src/distributions/data/edgeware_snapshot_distribution.json",
)
}

fn get_discord_list() -> Vec<H160> {
read_contents_to_evm_accounts(
"standalone/node/src/distributions/data/discord_evm_addresses.json",
)
read_contents_to_evm_accounts("node/src/distributions/data/discord_evm_addresses.json")
}

pub fn get_edgeware_genesis_balance_distribution() -> Vec<(H160, GenesisAccount)> {
Expand Down
10 changes: 3 additions & 7 deletions node/src/distributions/testnet.rs
Original file line number Diff line number Diff line change
Expand Up @@ -59,21 +59,17 @@ fn read_contents_to_substrate_accounts(path_str: &str) -> Vec<AccountId> {
}

fn get_edgeware_genesis_list() -> Vec<H160> {
read_contents_to_evm_accounts(
"standalone/node/src/distributions/data/edgeware_genesis_participants.json",
)
read_contents_to_evm_accounts("node/src/distributions/data/edgeware_genesis_participants.json")
}

fn get_edgeware_snapshot_list() -> Vec<AccountId> {
read_contents_to_substrate_accounts(
"standalone/node/src/distributions/data/edgeware_snapshot_participants.json",
"node/src/distributions/data/edgeware_snapshot_participants.json",
)
}

fn get_discord_list() -> Vec<H160> {
read_contents_to_evm_accounts(
"standalone/node/src/distributions/data/discord_evm_addresses.json",
)
read_contents_to_evm_accounts("node/src/distributions/data/discord_evm_addresses.json")
}

pub fn get_evm_balance_distribution() -> Vec<(H160, GenesisAccount)> {
Expand Down
2 changes: 1 addition & 1 deletion scripts/run-standalone-local.sh
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ mkdir -p ./tmp
PROJECT_ROOT=$(git rev-parse --show-toplevel)
cd "$PROJECT_ROOT"

echo "*** Start Webb DKG Node ***"
echo "*** Start Tangle Testnet ***"
# Alice
./target/release/tangle-standalone --tmp --chain local --validator -lerror --alice \
--rpc-cors all --rpc-methods=unsafe --rpc-external \
Expand Down

0 comments on commit 47ba3b0

Please sign in to comment.