#156 Add Missing euler tokens cmd

daemon/cmd/collect.go

@@ -100,7 +100,7 @@ func genAppStateFromConfig(
 	)
 
 	// process genesis transactions, else create default genesis.json
-	appGenTxs, persistentPeers, err = CollectStdTxs(cdc, config.Moniker, initCfg.GenTxsDir, genDoc)
+	appGenTxs, persistentPeers, err = collectStdTxs(cdc, config.Moniker, initCfg.GenTxsDir, genDoc)
 	if err != nil {
 		return
 	}

daemon/cmd/genesis.go

@@ -0,0 +1,123 @@
+package cmd
+
+import (
+	"fmt"
+	"github.com/cosmos/cosmos-sdk/codec"
+	"github.com/cosmos/cosmos-sdk/server"
+	cbd "github.com/cybercongress/cyberd/types"
+	"github.com/spf13/cobra"
+	"strconv"
+)
+
+func GenesisCmds(ctx *server.Context, cdc *codec.Codec) *cobra.Command {
+
+	rootCmd := &cobra.Command{
+		Use:   "genesis",
+		Short: "genesis commands",
+	}
+	rootCmd.AddCommand(AddEulerTokensCmd(ctx, cdc))
+	rootCmd.AddCommand(AddMissingEulerTokensCmd(ctx, cdc))
+	return rootCmd
+}
+
+// 0.1.0 Distribution
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// Proof Of Code & Proof Of Value Euler addresses.
+// Addresses taken from 0x136c1121f21c29415d8cd71f8bb140c7ff187033 Ethereum contract at a 'jan 3, 2019'
+// 1 'CBD' token equaling to 1% of genesis supply.
+// First address, with 70% allocation is 'Proof Of Use' one.
+// The rest is pocv, or 'Proof Of Code' & 'Proof Of Value'
+
+const pouFileCoefficient float64 = 0.7 // means 70%
+
+const tokensToBurnPercentage float64 = 11.8000 // 0x3b6ce0d5fd5f6de16fb6b687207efe86702a6e76
+const proofOfUsePercentage float64 = 70.0000   // 0xccf0e5a05bf5c0fb7c2d91737b176b4a2d2fd7f0
+
+var pocvAccs = map[string]float64{
+	"cbd1f9yjqmxh6prsmgpcaqj8lmjnxg644n50qjl4vw": 8.288000001,              // 0x9f4062f6153ff4dbf93f6a6f686ed3c906bf0684
+	"cbd1hlu0kqwvxmhjjsezr00jdrvs2k537mqhrv02ja": 3.045611111,              // 0x7c4401ae98f12ef6de39ae24cf9fc51f80eba16b
+	"cbd1myeyqp96pz3tayjdctflrxpwf45dq3xyj56yk0": 2.1153,                   // 0xf2cb7985a5c3fdd8d7742a73d5dc001bbd32caf8
+	"cbd1gannk6qt3s5mnm5smx6xjqqvecu08666hpazlz": 1.5328,                   // 0x002f9caf40a444f20813da783d152bdfaf42852f
+	"cbd1sjedcfmqupxcnxudq9w0rxrf87r3c6tvep5fnj": 1.428,                    // 0x00b8fe1a1a2b899418702e32a96e276ff56a4d05
+	"cbd1ch4dpd8jxkl7w4wnzdx02utmw4j0xatfks6ulv": 1,                        // 0x8b788b444ca3203bba0fdcae1c482110494e81f1
+	"cbd1s3748ghvcwvrws3kxsdc8xnan3qhv77740gnnl": 0.568211111,              // 0x00cff8cf7bff03a9a2a81c01920ffd8cfa7ae9d0
+	"cbd14d92r4svhl4qa3g6q48tjekarw2kt67njlaeht": 0.083811111,              // 0x63e65bc441334b27d2178f81f2d701e4e58c158a
+	"cbd1up7dk03v4d898vqgmc2y32y7duuylgx8ra7jjj": 0.043511111,              // 0x9d7d6e753f055e40d3767337300e722e934086c1
+	"cbd1rqudjcrdwqedffxufmqgsleuguhm7pka6snns3": 0.028,                    // 0x00725d89a2a2fb3b21fd1035b579cbcde4a0991b
+	"cbd1hmkqhy8ygl6tnl5g8tc503rwrmmrkjcqtqrsx6": 0.023311111,              // 0x00ca47db1be92c1072e973fd8dc4a082f7d70214
+	"cbd1gs92s58t6rkallnml8ufdzrz3038dcylal0nlc": 0.023311111,              // 0x4585c7eaa2cb96d4b59e868929efabeeb8e65b07
+	"cbd1h7u5zvduvc3dqrfq9hejm35ktfxh3ha7fra64a": 0.0132800000000000911111, // 0x002b9c5b537a1b6004ed720f32cc808fd6210f26
+	"cbd1rl3xnsrkpjfwejqfy7v4kntu64hzxy8dgafh6j": 0.003111111,              // 0x00d3c9033570b8adea9c18780325a45635c55805
+	"cbd1xege0g92p6exmzjv58u7vh3s5zkz75v48mlnev": 0.003111111,              // 0x5d01f31f6eda95489ca1e3c6357a9627fa2983de
+}
+
+// 0.1.0 Distribution
+func AddEulerTokensCmd(ctx *server.Context, cdc *codec.Codec) *cobra.Command {
+	cmd := &cobra.Command{
+		Use: "add-euler-tokens <pou-file-path>",
+		RunE: func(cmd *cobra.Command, args []string) error {
+			//todo refactor this, see #199
+			return GenerateEulerGenesisFileCmd(ctx, cdc).Execute()
+		},
+	}
+	return cmd
+}
+
+// 0.1.1 Distribution fix for 0.1.0
+// Our current distribution is 1% for proof of use, and 0.7% for others.
+// In 0.1.1 launch we should:
+//   - add rest 0.3% to others part. See issue #156.
+//   - send 11.8000% to dead address
+func AddMissingEulerTokensCmd(ctx *server.Context, cdc *codec.Codec) *cobra.Command {
+
+	cmd := &cobra.Command{
+		Use: "add-missing-euler-tokens",
+		RunE: func(cmd *cobra.Command, args []string) error {
+
+			doc, state, err := loadGenesisState(ctx, cdc)
+			if err != nil {
+				return err
+			}
+
+			addrWithMissingTokens := make(map[string]int64, len(state.Accounts))
+			for pocvAddr, percentage := range pocvAccs {
+				addrWithMissingTokens[pocvAddr] = percentageToAmt(percentage) - pouPercentageToAmt(percentage)
+			}
+			addrWithMissingTokens[cbd.GetBurnAddress().String()] = percentageToAmt(tokensToBurnPercentage)
+
+			fmt.Println("")
+			fmt.Println("Fixing euler 0.1.0 network genesis distribution")
+			for accIndex, acc := range state.Accounts {
+				tokensToAdd, ok := addrWithMissingTokens[acc.Address.String()]
+				if ok {
+					acc.Amount += tokensToAdd
+					fmt.Println(strconv.Itoa(int(tokensToAdd)) + " tokens added to " + acc.Address.String())
+					delete(addrWithMissingTokens, acc.Address.String())
+					state.Accounts[accIndex] = acc
+				}
+			}
+
+			if len(addrWithMissingTokens) != 0 {
+				fmt.Println("")
+				return fmt.Errorf("%v does not included in genesis.json file. Reverting", addrWithMissingTokens)
+			}
+			fmt.Println("Fixed!")
+			return saveGenesisState(ctx, cdc, doc, state)
+
+		},
+	}
+	return cmd
+}
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+// calculate proof of use(pou) tokens amount.
+// pou file contains pou percentage(-> sum of all addresses is 100%)
+// So to get overall network percentage multiply it on pouFileCoefficient (0.7)
+func pouPercentageToAmt(pouPercentage float64) int64 {
+	return int64(pouPercentage / 100 * pouFileCoefficient * float64(genesisSupply))
+}
+
+func percentageToAmt(percentage float64) int64 {
+	return int64(percentage / 100 * float64(genesisSupply))
+}

daemon/cmd/utils.go

@@ -7,6 +7,8 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/auth"
 	"github.com/cosmos/cosmos-sdk/x/staking"
 	"github.com/cybercongress/cyberd/app"
+	"github.com/spf13/viper"
+	"github.com/tendermint/tendermint/libs/cli"
 	"io/ioutil"
 	"os"
 	"path/filepath"
@@ -94,6 +96,41 @@ func InitializeNodeValidatorFiles(
 	return nodeID, valPubKey, nil
 }
 
+func loadGenesisState(
+	ctx *server.Context, cdc *codec.Codec,
+) (genDoc tmtypes.GenesisDoc, state app.GenesisState, err error) {
+
+	config := ctx.Config
+	config.SetRoot(viper.GetString(cli.HomeFlag))
+
+	genFile := config.GenesisFile()
+	if !common.FileExists(genFile) {
+		err = fmt.Errorf("%s does not exist, run `cyberd init` first", genFile)
+		return
+	}
+	genDoc, err = loadGenesisDoc(cdc, genFile)
+	if err != nil {
+		return
+	}
+
+	err = cdc.UnmarshalJSON(genDoc.AppState, &state)
+	return
+}
+
+func saveGenesisState(ctx *server.Context, cdc *codec.Codec, oldDoc tmtypes.GenesisDoc, state app.GenesisState) error {
+
+	config := ctx.Config
+	config.SetRoot(viper.GetString(cli.HomeFlag))
+	genFile := config.GenesisFile()
+
+	appStateJSON, err := cdc.MarshalJSON(state)
+	if err != nil {
+		return err
+	}
+
+	return ExportGenesisFile(genFile, oldDoc.ChainID, nil, appStateJSON)
+}
+
 func loadGenesisDoc(cdc *amino.Codec, genFile string) (genDoc tmtypes.GenesisDoc, err error) {
 	genContents, err := ioutil.ReadFile(genFile)
 	if err != nil {
@@ -120,7 +157,7 @@ func initializeEmptyGenesis(
 
 // CollectStdTxs processes and validates application's genesis StdTxs and returns
 // the list of appGenTxs, and persistent peers required to generate genesis.json.
-func CollectStdTxs(cdc *codec.Codec, moniker string, genTxsDir string, genDoc tmtypes.GenesisDoc) (
+func collectStdTxs(cdc *codec.Codec, moniker string, genTxsDir string, genDoc tmtypes.GenesisDoc) (
 	appGenTxs []auth.StdTx, persistentPeers string, err error) {
 
 	var fos []os.FileInfo

daemon/main.go

@@ -40,13 +40,12 @@ func main() {
 	}
 
 	rootCmd.AddCommand(initCyberd.InitCmd(ctx, cdc))
-	rootCmd.AddCommand(initCyberd.GenerateAccountCmd())
 	rootCmd.AddCommand(initCyberd.GenerateAccountsCmd(ctx, cdc))
 	rootCmd.AddCommand(initCyberd.CollectGenTxsCmd(ctx, cdc))
 	rootCmd.AddCommand(initCyberd.TestnetFilesCmd(ctx, cdc))
 	rootCmd.AddCommand(initCyberd.GenTxCmd(ctx, cdc))
 	rootCmd.AddCommand(initCyberd.AddGenesisAccountCmd(ctx, cdc))
-	rootCmd.AddCommand(initCyberd.GenerateEulerGenesisFileCmd(ctx, cdc))
+	rootCmd.AddCommand(initCyberd.GenesisCmds(ctx, cdc))
 	server.AddCommands(ctx, cdc, rootCmd, newApp, exportAppStateAndTMValidators)
 
 	for _, c := range rootCmd.Commands() {

types/acc.go

@@ -1,9 +1,18 @@
 package types
 
 import "github.com/cosmos/cosmos-sdk/x/auth"
+import sdk "github.com/cosmos/cosmos-sdk/types"
 
 type AccNumber uint64
 
 func NewCyberdAccount() auth.Account {
 	return &auth.BaseAccount{}
 }
+
+// cbd1qqqqqqqqqqqqqqqqqqqqqqqqqqqqph4dvtfakz    0.1.0
+// cyber1qqqqqqqqqqqqqqqqqqqqqqqqqqqqph4djv52fh  0.1.1
+func GetBurnAddress() (addr sdk.AccAddress) {
+	hex := "000000000000000000000000000000000000dead"
+	addr, _ = sdk.AccAddressFromHex(hex)
+	return
+}