add logic for initial curve factor (#1184)

Author: libotony

api/rewards/rewards_test.go

@@ -42,7 +42,7 @@ func initRewardsServer(t *testing.T) *httptest.Server {
 	params := thorChain.Contract(builtin.Params.Address, builtin.Params.ABI, genesis.DevAccounts()[0])
 	err = params.MintTransaction("set", big.NewInt(0), thor.KeyMaxBlockProposers, big.NewInt(1))
 	assert.NoError(t, err)
-	err = params.MintTransaction("set", big.NewInt(0), thor.KeyCurveFactor, thor.CurveFactor)
+	err = params.MintTransaction("set", big.NewInt(0), thor.KeyCurveFactor, thor.InitialCurveFactor)
 	assert.NoError(t, err)
 
 	require.NoError(t, thorChain.MintBlock(genesis.DevAccounts()[0]))

builtin/energy/energy.go

@@ -335,6 +335,10 @@ func (e *Energy) CalculateRewards(staker staker) (*big.Int, error) {
 	if err != nil {
 		return nil, err
 	}
+	if curveFactor.Uint64() == 0 {
+		curveFactor = thor.InitialCurveFactor
+	}
+
 	// reward = 1 * curveFactor * sqrt(totalStaked / 1e18) / blocksPerYear
 	reward := big.NewInt(1)
 	reward.Mul(reward, curveFactor)

builtin/energy/energy_test.go

@@ -246,7 +246,7 @@ func (m *mockStaker) IncreaseReward(master thor.Address, reward big.Int) error {
 
 func TestCalculateRewards(t *testing.T) {
 	st := state.New(muxdb.NewMem(), trie.Root{})
-	st.SetStorage(thor.BytesToAddress([]byte("par")), thor.KeyCurveFactor, thor.BytesToBytes32(thor.CurveFactor.Bytes()))
+	st.SetStorage(thor.BytesToAddress([]byte("par")), thor.KeyCurveFactor, thor.BytesToBytes32(thor.InitialCurveFactor.Bytes()))
 
 	p := params.New(thor.BytesToAddress([]byte("par")), st)
 	eng := New(thor.BytesToAddress([]byte("eng")), st, 1, p)

builtin/native_calls_test.go

@@ -760,7 +760,7 @@ func TestEnergyNative(t *testing.T) {
 	summary := thorChain.Repo().BestBlockSummary()
 	firstPOS := summary.Header.Number() + 1
 	st := thorChain.Stater().NewState(summary.Root())
-	err = builtin.Params.Native(st).Set(thor.KeyCurveFactor, thor.CurveFactor)
+	err = builtin.Params.Native(st).Set(thor.KeyCurveFactor, thor.InitialCurveFactor)
 	assert.NoError(t, err)
 
 	energyAtBlock, err := builtin.Energy.Native(st, summary.Header.Timestamp()).Get(summary.Header.Beneficiary())

runtime/runtime.go

@@ -141,13 +141,6 @@ func New(
 		if err := state.SetCode(builtin.Staker.Address, builtin.Staker.RuntimeBytecodes()); err != nil {
 			panic(err)
 		}
-
-		if err := builtin.Params.Native(state).Set(thor.KeyCurveFactor, thor.CurveFactor); err != nil {
-			panic(err)
-		}
-		if err := builtin.Params.Native(state).Set(thor.KeyRewardRatio, thor.InitialRewardRatio); err != nil {
-			panic(err)
-		}
 	}
 
 	rt := Runtime{

thor/params.go

@@ -9,7 +9,6 @@ import (
 	"math/big"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/params"
 )
 
@@ -58,16 +57,13 @@ var (
 	KeyProposerEndorsement     = BytesToBytes32([]byte("proposer-endorsement"))
 	KeyMaxBlockProposers       = BytesToBytes32([]byte("max-block-proposers"))
 	KeyStargateContractAddress = BytesToBytes32([]byte("stargate-contract-address"))
-	KeyCurveFactor             = BytesToBytes32([]byte("curve-factor"))
+	KeyCurveFactor             = BytesToBytes32([]byte("curve-factor")) // curve factor to define VTHO issuance after PoS
 
 	InitialRewardRatio         = big.NewInt(3e17) // 30%
 	InitialBaseGasPrice        = big.NewInt(1e15)
 	InitialProposerEndorsement = new(big.Int).Mul(big.NewInt(1e18), big.NewInt(25000000))
-	InitialStargateAddress     = common.Address{}.Big()
+	InitialCurveFactor         = big.NewInt(76800)
 
-	EnergyGrowthRate = big.NewInt(5000000000) // WEI THOR per token(VET) per second. about 0.000432 THOR per token per day.
-
-	CurveFactor = big.NewInt(76800)
-
-	NumberOfBlocksPerYear = big.NewInt(3153600) // number of blocks per year, non leap
+	EnergyGrowthRate      = big.NewInt(5000000000) // WEI THOR per token(VET) per second. about 0.000432 THOR per token per day.
+	NumberOfBlocksPerYear = big.NewInt(3153600)    // number of blocks per year, non leap
 )