v1.7.1804 Inflation-Based Staking (#11)

* Removed hash-based validator config mechanism, made staking parameters mutable over time depending on inflation * Updated validator deployment test * Added offset to new staked validators being activated * getCurrentInflationSettings() updated * Updated version * getCurrentInflationSettings() updated * getCurrentInflationSettings() updated * getCurrentInflationSettings() updated
flare-foundation · May 23, 2023 · 4c99e8f · 4c99e8f
1 parent 49bc247
commit 4c99e8f
Show file tree

Hide file tree

Showing 10 changed files with 106 additions and 342 deletions.
diff --git a/avalanchego/scripts/test_deploy_validators.sh b/avalanchego/scripts/test_deploy_validators.sh
@@ -49,8 +49,8 @@ sleep 5
 printf "\nCreating new validator: NodeID-MFrZFVCXPv5iCn6M9K6XduxGTYp891xXZ "
 
 CURR_TIME=$(date +%s)
-START_TIME=$(($CURR_TIME+300))
-END_TIME=$(($START_TIME+86400))
+START_TIME=$(($CURR_TIME+1123200))
+END_TIME=$(($START_TIME+1209600))
 
 curl -s --location --request POST 'http://localhost:9650/ext/bc/P' \
 --header 'Content-Type: application/json' \
@@ -63,7 +63,7 @@ curl -s --location --request POST 'http://localhost:9650/ext/bc/P' \
         "endTime":'$END_TIME',
         "stakeAmount": 10000000000000,
         "rewardAddress": "P-localflare1pz6dhzxvfmztknw35ukl8fav6gzjt9xwmkngua",
-        "delegationFeeRate":10,
+        "delegationFeeRate":0,
         "username": "user1234",
         "password": "b39d642078d2ca0517cafe008ddc9326fa1c4d71248078c67bf0d508993720e4"
     },
@@ -85,7 +85,7 @@ curl -s --location --request POST 'http://localhost:9650/ext/bc/P' \
         "endTime":'$END_TIME',
         "stakeAmount": 10000000000000,
         "rewardAddress": "P-localflare1pz6dhzxvfmztknw35ukl8fav6gzjt9xwmkngua",
-        "delegationFeeRate":10,
+        "delegationFeeRate":0,
         "username": "user1234",
         "password": "b39d642078d2ca0517cafe008ddc9326fa1c4d71248078c67bf0d508993720e4"
     },
@@ -107,7 +107,7 @@ curl -s --location --request POST 'http://localhost:9650/ext/bc/P' \
         "endTime":'$END_TIME',
         "stakeAmount": 10000000000000,
         "rewardAddress": "P-localflare1pz6dhzxvfmztknw35ukl8fav6gzjt9xwmkngua",
-        "delegationFeeRate":10,
+        "delegationFeeRate":0,
         "username": "user1234",
         "password": "b39d642078d2ca0517cafe008ddc9326fa1c4d71248078c67bf0d508993720e4"
     },
@@ -129,7 +129,7 @@ curl -s --location --request POST 'http://localhost:9650/ext/bc/P' \
         "endTime":'$END_TIME',
         "stakeAmount": 10000000000000,
         "rewardAddress": "P-localflare1pz6dhzxvfmztknw35ukl8fav6gzjt9xwmkngua",
-        "delegationFeeRate":10,
+        "delegationFeeRate":0,
         "username": "user1234",
         "password": "b39d642078d2ca0517cafe008ddc9326fa1c4d71248078c67bf0d508993720e4"
     },
@@ -138,36 +138,19 @@ curl -s --location --request POST 'http://localhost:9650/ext/bc/P' \
 
 sleep 5
 
-printf "\nGet pending validators:\n"
+printf "\nAdding new delegator "
 
 curl -s --location --request POST 'http://localhost:9650/ext/bc/P' \
 --header 'Content-Type: application/json' \
 --data-raw '{
     "jsonrpc": "2.0",
-    "method": "platform.getPendingValidators",
+    "method": "platform.addDelegator",
     "params": {
-        "subnetID": null,
-        "nodeIDs": []
-    },
-    "id": 1
-}' | jq .
-
-sleep 5
-printf "\nTesting validator creation with non-permitted NodeID's:"
-printf "\nAttempting to create invalid validator : NodeID-4XZ7a7fGCzw6xqMFNQHy46JjUXnnq51Y1 "
-
-curl -s --location --request POST 'http://localhost:9650/ext/bc/P' \
---header 'Content-Type: application/json' \
---data-raw '{
-    "jsonrpc": "2.0",
-    "method": "platform.addValidator",
-    "params": {
-        "nodeID":"NodeID-4XZ7a7fGCzw6xqMFNQHy46JjUXnnq51Y1",
+        "nodeId":"NodeID-MFrZFVCXPv5iCn6M9K6XduxGTYp891xXZ",
         "startTime":'$START_TIME',
         "endTime":'$END_TIME',
-        "stakeAmount": 10000000000000,
+        "stakeAmount":1000000000000,
         "rewardAddress": "P-localflare1pz6dhzxvfmztknw35ukl8fav6gzjt9xwmkngua",
-        "delegationFeeRate":10,
         "username": "user1234",
         "password": "b39d642078d2ca0517cafe008ddc9326fa1c4d71248078c67bf0d508993720e4"
     },
@@ -176,70 +159,6 @@ curl -s --location --request POST 'http://localhost:9650/ext/bc/P' \
 
 sleep 5
 
-printf "\nAttempting to create invalid validator : NodeID-DMAS3hKKWMydmWGmGd265EYCoV7zFWEHK "
-
-curl -s --location --request POST 'http://localhost:9650/ext/bc/P' \
---header 'Content-Type: application/json' \
---data-raw '{
-    "jsonrpc": "2.0",
-    "method": "platform.addValidator",
-    "params": {
-        "nodeID":"NodeID-DMAS3hKKWMydmWGmGd265EYCoV7zFWEHK",
-        "startTime":'$START_TIME',
-        "endTime":'$END_TIME',
-        "stakeAmount": 10000000000000,
-        "rewardAddress": "P-localflare1pz6dhzxvfmztknw35ukl8fav6gzjt9xwmkngua",
-        "delegationFeeRate":10,
-        "username": "user1234",
-        "password": "b39d642078d2ca0517cafe008ddc9326fa1c4d71248078c67bf0d508993720e4"
-    },
-    "id": 1
-}' | jq .
-
-sleep 5
-
-printf "\nAttempting to create invalid validator : NodeID-Lx7BqRD3LQuqZbpJzkc5UDTZb66cpez95 "
-
-curl -s --location --request POST 'http://localhost:9650/ext/bc/P' \
---header 'Content-Type: application/json' \
---data-raw '{
-    "jsonrpc": "2.0",
-    "method": "platform.addValidator",
-    "params": {
-        "nodeID":"NodeID-Lx7BqRD3LQuqZbpJzkc5UDTZb66cpez95",
-        "startTime":'$START_TIME',
-        "endTime":'$END_TIME',
-        "stakeAmount": 10000000000000,
-        "rewardAddress": "P-localflare1pz6dhzxvfmztknw35ukl8fav6gzjt9xwmkngua",
-        "delegationFeeRate":10,
-        "username": "user1234",
-        "password": "b39d642078d2ca0517cafe008ddc9326fa1c4d71248078c67bf0d508993720e4"
-    },
-    "id": 1
-}' | jq .
-
-sleep 5
-
-printf "\nAttempting to create invalid validator : NodeID-2oZa4x84qqpdNqxKSL3PW28iex3VS1NQT "
-
-curl -s --location --request POST 'http://localhost:9650/ext/bc/P' \
---header 'Content-Type: application/json' \
---data-raw '{
-    "jsonrpc": "2.0",
-    "method": "platform.addValidator",
-    "params": {
-        "nodeID":"NodeID-2oZa4x84qqpdNqxKSL3PW28iex3VS1NQT",
-        "startTime":'$START_TIME',
-        "endTime":'$END_TIME',
-        "stakeAmount": 10000000000000,
-        "rewardAddress": "P-localflare1pz6dhzxvfmztknw35ukl8fav6gzjt9xwmkngua",
-        "delegationFeeRate":10,
-        "username": "user1234",
-        "password": "b39d642078d2ca0517cafe008ddc9326fa1c4d71248078c67bf0d508993720e4"
-    },
-    "id": 1
-}' | jq .
-
 printf "\nGet pending validators:\n"
 
 curl -s --location --request POST 'http://localhost:9650/ext/bc/P' \
@@ -252,6 +171,6 @@ curl -s --location --request POST 'http://localhost:9650/ext/bc/P' \
         "nodeIDs": []
     },
     "id": 1
-}' | jq .result
+}' | jq .
 
 printf "\nNew validators will start in $(($START_TIME-$(date +%s))) seconds\n"
diff --git a/avalanchego/utils/constants/validator_config.go b/avalanchego/utils/constants/validator_config.go
diff --git a/avalanchego/utils/hashing/hashing.go b/avalanchego/utils/hashing/hashing.go
@@ -5,7 +5,6 @@ package hashing
 
 import (
 	"crypto/sha256"
-	"encoding/hex"
 	"fmt"
 	"io"
 
@@ -102,13 +101,3 @@ func ToHash160(bytes []byte) (Hash160, error) {
 func PubkeyBytesToAddress(key []byte) []byte {
 	return ComputeHash160(ComputeHash256(key))
 }
-
-func ToValidatorConfigHash(networkID string, pChainPublicKey string, nodeID string, weight string, duration string) string {
-	salt := "flare" + networkID + "-"
-	pChainPublicKeyHash := sha256.Sum256([]byte(salt + pChainPublicKey))
-	nodeIDHash := sha256.Sum256([]byte(salt + nodeID))
-	nodeWeightHash := sha256.Sum256([]byte(salt + weight))
-	nodeDurationHash := sha256.Sum256([]byte(salt + duration))
-	validatorConfigHash := sha256.Sum256(append(append(append(pChainPublicKeyHash[:], nodeIDHash[:]...)[:], nodeWeightHash[:]...)[:], nodeDurationHash[:]...))
-	return hex.EncodeToString(validatorConfigHash[:])
-}
diff --git a/avalanchego/utils/hashing/hashing_test.go b/avalanchego/utils/hashing/hashing_test.go
diff --git a/avalanchego/version/constants.go b/avalanchego/version/constants.go
@@ -14,7 +14,7 @@ var (
 	Current = &Semantic{
 		Major: 1,
 		Minor: 7,
-		Patch: 1803,
+		Patch: 1804,
 	}
 	CurrentApp = &Application{
 		Major: Current.Major,

diff --git a/avalanchego/vms/platformvm/fx/fx.go b/avalanchego/vms/platformvm/fx/fx.go
@@ -4,7 +4,6 @@
 package fx
 
 import (
-	"github.com/ava-labs/avalanchego/ids"
 	"github.com/ava-labs/avalanchego/snow"
 	"github.com/ava-labs/avalanchego/vms/components/verify"
 	"github.com/ava-labs/avalanchego/vms/secp256k1fx"
@@ -38,9 +37,6 @@ type Fx interface {
 	// CreateOutput creates a new output with the provided control group worth
 	// the specified amount
 	CreateOutput(amount uint64, controlGroup interface{}) (interface{}, error)
-
-	// Returns the public key that signed an AddValidatorTx
-	GetPublicKeyForValidatorFilter(tx, cred interface{}) (ids.ShortID, error)
 }
 
 type Owner interface {