Skip to content

Commit

Permalink
Merge pull request #250 from sacherjj/charlie-2-files
Browse files Browse the repository at this point in the history
NOTICK - Prep for Charlie 2
  • Loading branch information
sacherjj authored Sep 21, 2020
2 parents 4ffb611 + e0163be commit 46f9187
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 18 deletions.
4 changes: 2 additions & 2 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion client/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "casper-client"
version = "0.1.0"
version = "0.1.1"
authors = ["Marc Brinkmann <[email protected]>", "Fraser Hutchison <[email protected]>"]
edition = "2018"
description = "A client for interacting with the Casper network"
Expand Down
4 changes: 1 addition & 3 deletions packaging/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,4 @@
rm -f ./share/*.deb
docker-compose up
docker-compose rm -y
docker rm packaging_deb_1804_1
docker rm packaging_deb_2004_1
docker rm packaging_builddeb_1

1 change: 1 addition & 0 deletions packaging/share/build_deb.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
cd ..
git clone https://github.com/CasperLabs/casper-node.git ./casper-node
cd casper-node
git checkout charlie-testnet

make deb

Expand Down
18 changes: 9 additions & 9 deletions resources/charlie/accounts.csv
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
48bc7fdb0375d480fbd03e77f74ffedc30b9f3954455fe04da15843a0a6af0c7,ed25519,100000000000000000,0
89f0413ecb256525d17bd8e4f194cdf063501b959716410de2216c1c24e1f0ce,ed25519,1000000000000000,400000000000000
a89e3f551efa337053592a0beb5fe50be58e12fc56f3c0eabf9344956a44a290,ed25519,1000000000000000,370000000000000
6af0262f67aa93a225d9d57451023416e62aaa8391be8e1c09b8adbdef9ac19d,ed25519,1000000000000000,410000000000000
7e2eafb31dac86a806f4da908151ffd2b4d552eced51731c241c94997ac310df,ed25519,1000000000000000,320000000000001
1117189c666f81c5160cd610ee383dc9b2d0361f004934754d39752eedc64957,ed25519,1000000000000000,340000000000001
ae2af99944b0b9f92fccf425aa51894ebbad0f4e8e42c66a71dcb999a3bd94ed,ed25519,1000000000000000,390000000000001
bdda22721033ae556e92ccf1034f8d14f24c3794fa7befaa831bcae98f9f1e9b,ed25519,1000000000000000,350000000000001
5ff157d012383e99a3ae93bed0586a23383eed41b0058e63f48ed7b82b067c34,ed25519,1000000000000000,330000000000001
3f5fca6455006aab23860a5eedc966b56f28d934ff03a57db2405ad829343b63,ed25519,1000000000000000,360000000000001
89f0413ecb256525d17bd8e4f194cdf063501b959716410de2216c1c24e1f0ce,ed25519,1000000000000000,100000000000000000
a89e3f551efa337053592a0beb5fe50be58e12fc56f3c0eabf9344956a44a290,ed25519,1000000000000000,100000000000000000
6af0262f67aa93a225d9d57451023416e62aaa8391be8e1c09b8adbdef9ac19d,ed25519,1000000000000000,100000000000000000
7e2eafb31dac86a806f4da908151ffd2b4d552eced51731c241c94997ac310df,ed25519,1000000000000000,100000000000000000
1117189c666f81c5160cd610ee383dc9b2d0361f004934754d39752eedc64957,ed25519,1000000000000000,100000000000000000
ae2af99944b0b9f92fccf425aa51894ebbad0f4e8e42c66a71dcb999a3bd94ed,ed25519,1000000000000000,100000000000000000
bdda22721033ae556e92ccf1034f8d14f24c3794fa7befaa831bcae98f9f1e9b,ed25519,1000000000000000,100000000000000000
5ff157d012383e99a3ae93bed0586a23383eed41b0058e63f48ed7b82b067c34,ed25519,1000000000000000,100000000000000000
3f5fca6455006aab23860a5eedc966b56f28d934ff03a57db2405ad829343b63,ed25519,1000000000000000,100000000000000000
6 changes: 3 additions & 3 deletions resources/charlie/chainspec.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
# Human readable name for convenience; the genesis_hash is the true identifier. The name influences the genesis hash by
# contributing to the seeding of the pseudo-random number generator used in contract-runtime for computing genesis
# post-state hash.
name = 'casper-charlie-testnet'
name = 'casper-charlie-testnet-2'
# Timestamp for the genesis block, also used in seeding the pseudo-random number generator used in contract-runtime for
# computing genesis post-state hash.
timestamp = 1600452000000
timestamp = 1600794000000
# Protocol version at genesis.
protocol_version = '1.0.0'
# Path (absolute, or relative to this chainspec.toml) to the file containing wasm bytecode for installing the mint
Expand All @@ -30,7 +30,7 @@ accounts_path = '/etc/casper/accounts.csv'
# make key blocks for the upcoming eras. If the era is over by the time we start the nodes, they'll not be able to
# produce blocks in it, and there won't be a new era build either. That means when a completely new network is started,
# the genesis era start time has to be adjusted to be active at the time.
genesis_era_start_timestamp = 0
genesis_era_start_timestamp = 1600794000000
# Era duration defined as a fixed number of milliseconds. 1800000 ms = 30 minutes
era_duration_millis = 1800000
# Minimum number of blocks per era. An era will take longer than `era_duration_millis` ms if that is necessary to reach the minimum height.
Expand Down
3 changes: 3 additions & 0 deletions resources/maintainer_scripts/casper_node/casper-node.service
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ After=network-online.target
Type=simple
ExecStart=/usr/bin/casper-node validator /etc/casper/config.toml
Environment=RUST_LOG=info
StandardOutput=file:/var/log/casper-node.log
StandardError=file:/var/log/casper-node.err
Restart=no

[Install]
WantedBy=multi-user.target

0 comments on commit 46f9187

Please sign in to comment.