Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[euler] Launch euler testnet #148

Merged
merged 1 commit into from
Jan 3, 2019
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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# cyberd. Knowledge consensus computer
![banner](logo.png)

[![testnet](https://img.shields.io/badge/testnet-euler--dev3-green.svg?style=flat-square)](https://github.com/cybercongress/cyberd/blob/master/docs/run_validator.md)
[![testnet](https://img.shields.io/badge/testnet-euler-green.svg?style=flat-square)](https://github.com/cybercongress/cyberd/blob/master/docs/run_validator.md)
[![version](https://img.shields.io/github/release/cybercongress/cyberd.svg?style=flat-square)](https://github.com/cosmos/cosmos-sdk/releases/latest)
[![CircleCI](https://img.shields.io/circleci/project/github/cybercongress/cyberd.svg?style=flat-square)](https://circleci.com/gh/cybercongress/cyberd/tree/master)
[![license](https://img.shields.io/github/license/cybercongress/cyb.svg?style=flat-square)](https://github.com/cybercongress/cyberd)
Expand Down
2 changes: 1 addition & 1 deletion app/genesis/genesis.go
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ func validateGenesisStateAccounts(accs []GenesisAccount) (err error) {
acc := accs[i]
strAddr := string(acc.Address)
if _, ok := addrMap[strAddr]; ok {
return fmt.Errorf("duplicate account in genesis state: Address %v", acc.Address)
return fmt.Errorf("duplicate account in genesis state: Address %v", acc.Address.String())
}
addrMap[strAddr] = true
}
Expand Down
147 changes: 147 additions & 0 deletions daemon/genesis/generate_genesis_file.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,147 @@
package genesis

import (
"bufio"
"encoding/csv"
"github.com/cosmos/cosmos-sdk/codec"
"github.com/cosmos/cosmos-sdk/server"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cybercongress/cyberd/app/genesis"
"github.com/cybercongress/cyberd/x/mint"
"github.com/spf13/cobra"
"github.com/tendermint/tendermint/types"
"io"
"log"
"os"
"strconv"
"time"
)

var (
bitcoinHeightZeroTime = time.Unix(1231006505, 0).UTC() // 2009-01-03 18:15:05 +0000 UTC
chainId = "euler"
genesisSupply = mint.GenesisSupply
pocPercentage = 0.7
)

func GenerateEulerGenesisFile(ctx *server.Context, cdc *codec.Codec) *cobra.Command {
cmd := &cobra.Command{
Use: "generate-euler-genesis-block",
Short: "Generate genesis file for euler testnet.",
RunE: func(_ *cobra.Command, args []string) error {

// proof of use accs
pouAccs, err := readPouAccounts()
if err != nil {
return err
}

appState := genesis.NewDefaultGenesisState()
appState.Accounts = append(appState.Accounts, getGenesisAccs()...)
appState.Accounts = append(appState.Accounts, pouAccs...)

// deduplicate
addrMap := make(map[string]int64, len(appState.Accounts))
for _, acc := range appState.Accounts {
strAddr := acc.Address.String()
if _, ok := addrMap[strAddr]; ok {
log.Printf("duplicate account in genesis state: Address %v", acc.Address.String())
}
addrMap[strAddr] += acc.Amount
}

addrAsArray := make([]genesis.GenesisAccount, 0)
for k, v := range addrMap {
addrAsArray = append(addrAsArray, genesis.GenesisAccount{Address: addr(k), Amount: v})
}
appState.Accounts = addrAsArray

appState.StakeData.Pool.LooseTokens = sdk.NewDec(genesisSupply)
stateAsJson, err := codec.MarshalJSONIndent(cdc, appState)
if err != nil {
return err
}

genDoc := types.GenesisDoc{
ChainID: chainId,
Validators: make([]types.GenesisValidator, 0),
AppState: stateAsJson,
GenesisTime: bitcoinHeightZeroTime.AddDate(10, 0, 0),
}

err = genDoc.SaveAs(ctx.Config.GenesisFile())
return err
},
}
return cmd
}

func readPouAccounts() ([]genesis.GenesisAccount, error) {

accs := make([]genesis.GenesisAccount, 0)
pocFile, err := os.Open("/home/hlb/.cyberd/proof-of-code")
if err != nil {
return nil, err
}

reader := csv.NewReader(bufio.NewReader(pocFile))
reader.Comma = ' '

for {

line, err := reader.Read()
if err == io.EOF {
break
} else if err != nil {
return nil, err
}

accAddress, err := sdk.AccAddressFromBech32(line[0])
if err != nil {
return nil, err
}

accAmtPercent, err := strconv.ParseFloat(line[1], 64)
if err != nil {
return nil, err
}

accs = append(accs, genesis.GenesisAccount{
Address: accAddress,
Amount: amt(accAmtPercent),
})
}

return accs, nil
}

// Returns all, except genesis poc accs
func getGenesisAccs() []genesis.GenesisAccount {
accs := []genesis.GenesisAccount{
{Address: addr("cbd1f9yjqmxh6prsmgpcaqj8lmjnxg644n50qjl4vw"), Amount: amt(8.288000001)},
{Address: addr("cbd1hlu0kqwvxmhjjsezr00jdrvs2k537mqhrv02ja"), Amount: amt(3.045611111)},
{Address: addr("cbd1myeyqp96pz3tayjdctflrxpwf45dq3xyj56yk0"), Amount: amt(2.1153)},
{Address: addr("cbd1gannk6qt3s5mnm5smx6xjqqvecu08666hpazlz"), Amount: amt(1.5328)},
{Address: addr("cbd1sjedcfmqupxcnxudq9w0rxrf87r3c6tvep5fnj"), Amount: amt(1.428)},
{Address: addr("cbd1ch4dpd8jxkl7w4wnzdx02utmw4j0xatfks6ulv"), Amount: amt(1)},
{Address: addr("cbd1s3748ghvcwvrws3kxsdc8xnan3qhv77740gnnl"), Amount: amt(0.568211111)},
{Address: addr("cbd14d92r4svhl4qa3g6q48tjekarw2kt67njlaeht"), Amount: amt(0.083811111)},
{Address: addr("cbd1up7dk03v4d898vqgmc2y32y7duuylgx8ra7jjj"), Amount: amt(0.043511111)},
{Address: addr("cbd1rqudjcrdwqedffxufmqgsleuguhm7pka6snns3"), Amount: amt(0.028)},
{Address: addr("cbd1hmkqhy8ygl6tnl5g8tc503rwrmmrkjcqtqrsx6"), Amount: amt(0.023311111)},
{Address: addr("cbd1gs92s58t6rkallnml8ufdzrz3038dcylal0nlc"), Amount: amt(0.023311111)},
{Address: addr("cbd1h7u5zvduvc3dqrfq9hejm35ktfxh3ha7fra64a"), Amount: amt(0.013911111)},
{Address: addr("cbd1rl3xnsrkpjfwejqfy7v4kntu64hzxy8dgafh6j"), Amount: amt(0.003111111)},
{Address: addr("cbd1xege0g92p6exmzjv58u7vh3s5zkz75v48mlnev"), Amount: amt(0.003111111)},
}
return accs
}

func addr(hex string) sdk.AccAddress {
accAddress, _ := sdk.AccAddressFromBech32(hex)
return accAddress
}

func amt(pct float64) int64 {
return int64(pct / 100 * pocPercentage * float64(genesisSupply))
}
9 changes: 5 additions & 4 deletions daemon/init/gentx.go
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ following delegation and commission default parameters:
cmd.Flags().String(flagClientHome, app.DefaultCLIHome, "client's home directory")
cmd.Flags().String(client.FlagName, "", "name of private key with which to sign the gentx")
cmd.Flags().String(client.FlagChainID, "euler-dev", "current chain-id")
cmd.Flags().String(cli.FlagMoniker, "anonymous", "validator display name")
cmd.Flags().AddFlagSet(cli.FsCommissionCreate)
cmd.Flags().AddFlagSet(cli.FsAmount)
cmd.Flags().AddFlagSet(cli.FsPk)
Expand All @@ -122,13 +123,13 @@ func prepareFlagsForTxCreateValidator(config *cfg.Config, nodeID, ip, chainID st
viper.Set(cli.FlagIP, ip) // --ip
viper.Set(cli.FlagPubKey, sdk.MustBech32ifyConsPub(valPubKey)) // --pubkey
viper.Set(cli.FlagGenesisFormat, true) // --genesis-format
viper.Set(cli.FlagMoniker, config.Moniker) // --moniker
if config.Moniker == "" {
viper.Set(cli.FlagMoniker, viper.GetString(client.FlagName))
}

if viper.GetString(cli.FlagAmount) == "" {
viper.Set(cli.FlagAmount, defaultAmount)
}
if viper.GetString(cli.FlagMoniker) == "" {
viper.Set(cli.FlagMoniker, viper.GetString(client.FlagName))
}
if viper.GetString(cli.FlagCommissionRate) == "" {
viper.Set(cli.FlagCommissionRate, defaultCommissionRate)
}
Expand Down
2 changes: 2 additions & 0 deletions daemon/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"github.com/cosmos/cosmos-sdk/baseapp"
"github.com/cosmos/cosmos-sdk/server"
"github.com/cybercongress/cyberd/app"
"github.com/cybercongress/cyberd/daemon/genesis"
initCyberd "github.com/cybercongress/cyberd/daemon/init"
"github.com/cybercongress/cyberd/daemon/rpc"
"github.com/cybercongress/cyberd/x/rank"
Expand Down Expand Up @@ -45,6 +46,7 @@ func main() {
rootCmd.AddCommand(initCyberd.TestnetFilesCmd(ctx, cdc))
rootCmd.AddCommand(initCyberd.GenTxCmd(ctx, cdc))
rootCmd.AddCommand(initCyberd.AddGenesisAccountCmd(ctx, cdc))
rootCmd.AddCommand(genesis.GenerateEulerGenesisFile(ctx, cdc))
server.AddCommands(ctx, cdc, rootCmd, newApp, exportAppStateAndTMValidators)

for _, c := range rootCmd.Commands() {
Expand Down
2 changes: 1 addition & 1 deletion docs/run_validator.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Join Cyberd Network As Validator

**Note**. Currently active dev testnet is `euler-dev3` (substitute <testnet_chain_id> with that value).
**Note**. Currently active dev testnet is `euler` (substitute <testnet_chain_id> with that value).

## Prepare your server

Expand Down
4 changes: 2 additions & 2 deletions testnet/checklist.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
```bash
# Generate genesis validator tx
docker run --rm -v /cyberdata/cyberd:/root/.cyberd cyberd/cyberd:euler-dev1 cyberd tendermint show-validator
./cyberd gentx --amount=100000CBD \
./cyberd gentx --amount=100CBD \
--pubkey=cbdvalconspub1zcjduepqsvzxlunur5cl644ypm4tv8lt22aaedeh6uma2ev7ux7y7tdlnhnqd5f0q3 \
--name=euler-dev_earth --chain-id=euler-dev2
--name=euler-hlb --chain-id=euler --moniker=hlb
```

```bash
Expand Down
4 changes: 2 additions & 2 deletions testnet/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -168,13 +168,13 @@ cache_size = 10000

wal_file = "data/cs.wal/wal"

timeout_propose = "3s"
timeout_propose = "500ms"
timeout_propose_delta = "500ms"
timeout_prevote = "1s"
timeout_prevote_delta = "500ms"
timeout_precommit = "1s"
timeout_precommit_delta = "500ms"
timeout_commit = "5s"
timeout_commit = "1s"

# Make progress as soon as we have all the precommits (as if TimeoutCommit = 0)
skip_timeout_commit = false
Expand Down
2 changes: 1 addition & 1 deletion x/mint/minter.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ func NewMinter(fck auth.FeeCollectionKeeper, stakeKeeper keeper.Keeper) Minter {
return Minter{
fck: fck,
stakeKeeper: stakeKeeper,
blockReward: blockReward,
blockReward: uint64(blockReward),
}
}

Expand Down
4 changes: 2 additions & 2 deletions x/mint/params.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const (
// assuming 1 second block times
BlocksPerYear = 60 * 60 * 24 * 365
// todo hardcoded
GenesisSupply = uint64(13)*1000*1000*1000 + uint64(10)*1000*1000
GenesisSupply = int64(10 * 1000 * 1000 * 1000 * 1000 * 1000) // 1*10^15
// percentage value 0....1, 1 means 100% year inflation
InflationRatePerYear = 1
InflationRatePerYear = 2
)