Merge branch 'release/hayabusa' into darren/release/hayabusa-new

Author: Darren Kelly

api/blocks_types.go

@@ -47,7 +47,7 @@ type JSONCollapsedBlock struct {
 type JSONBlockReward struct {
 	Reward      *math.HexOrDecimal256 `json:"reward"`
 	Master      *thor.Address         `json:"master"`
-	ValidatorID *thor.Bytes32         `json:"validatorId"`
+	ValidatorID *thor.Address         `json:"validatorId"`
 }
 
 type JSONClause struct {

api/rewards/rewards.go

@@ -77,7 +77,7 @@ func (r *Rewards) handleGetBlockRewards(w http.ResponseWriter, req *http.Request
 	}
 
 	staker := builtin.Staker.Native(st)
-	_, validationID, err := staker.LookupNode(signer)
+	_, err = staker.Get(signer)
 	if err != nil {
 		if r.repo.IsNotFound(err) {
 			return restutil.BadRequest(errors.WithMessage(err, "validator"))
@@ -136,7 +136,7 @@ func (r *Rewards) handleGetBlockRewards(w http.ResponseWriter, req *http.Request
 	return restutil.WriteJSON(w, &api.JSONBlockReward{
 		Reward:      &hexOrDecimalReward,
 		Master:      &signer,
-		ValidatorID: &validationID,
+		ValidatorID: &signer,
 	})
 }
 

api/rewards/rewards_test.go

@@ -143,6 +143,6 @@ func TestRewardResponseFormat(t *testing.T) {
 
 		assert.Equal(t, 20, len(*blockReward.Master), "master address should be 20 bytes")
 
-		assert.Equal(t, 32, len(*blockReward.ValidatorID), "validator ID should be 32 bytes")
+		assert.Equal(t, 20, len(*blockReward.ValidatorID), "validator ID should be 20 bytes")
 	})
 }

builtin/gen/compiled/Staker.abi

@@ -1 +1 @@
-[{"anonymous":false,"inputs":[{"indexed":true,"internalType":"bytes32","name":"validationID","type":"bytes32"},{"indexed":true,"internalType":"bytes32","name":"delegationID","type":"bytes32"},{"indexed":false,"internalType":"uint256","name":"stake","type":"uint256"},{"indexed":false,"internalType":"bool","name":"autoRenew","type":"bool"},{"indexed":false,"internalType":"uint8","name":"multiplier","type":"uint8"}],"name":"DelegationAdded","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"bytes32","name":"delegationID","type":"bytes32"},{"indexed":false,"internalType":"bool","name":"autoRenew","type":"bool"}],"name":"DelegationUpdatedAutoRenew","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"bytes32","name":"delegationID","type":"bytes32"},{"indexed":false,"internalType":"uint256","name":"stake","type":"uint256"}],"name":"DelegationWithdrawn","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"endorsor","type":"address"},{"indexed":true,"internalType":"bytes32","name":"validationID","type":"bytes32"},{"indexed":false,"internalType":"uint256","name":"removed","type":"uint256"}],"name":"StakeDecreased","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"endorsor","type":"address"},{"indexed":true,"internalType":"bytes32","name":"validationID","type":"bytes32"},{"indexed":false,"internalType":"uint256","name":"added","type":"uint256"}],"name":"StakeIncreased","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"endorsor","type":"address"},{"indexed":true,"internalType":"address","name":"node","type":"address"},{"indexed":true,"internalType":"bytes32","name":"validationID","type":"bytes32"},{"indexed":false,"internalType":"uint32","name":"period","type":"uint32"},{"indexed":false,"internalType":"uint256","name":"stake","type":"uint256"}],"name":"ValidatorQueued","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"endorsor","type":"address"},{"indexed":true,"internalType":"bytes32","name":"validationID","type":"bytes32"}],"name":"ValidatorSignaledExit","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"endorsor","type":"address"},{"indexed":true,"internalType":"bytes32","name":"validationID","type":"bytes32"},{"indexed":false,"internalType":"uint256","name":"stake","type":"uint256"}],"name":"ValidatorWithdrawn","type":"event"},{"stateMutability":"nonpayable","type":"fallback"},{"inputs":[{"internalType":"bytes32","name":"validationID","type":"bytes32"},{"internalType":"bool","name":"autoRenew","type":"bool"},{"internalType":"uint8","name":"multiplier","type":"uint8"}],"name":"addDelegation","outputs":[{"internalType":"bytes32","name":"","type":"bytes32"}],"stateMutability":"payable","type":"function"},{"inputs":[{"internalType":"address","name":"node","type":"address"},{"internalType":"uint32","name":"period","type":"uint32"}],"name":"addValidator","outputs":[],"stateMutability":"payable","type":"function"},{"inputs":[{"internalType":"bytes32","name":"id","type":"bytes32"},{"internalType":"uint256","name":"amount","type":"uint256"}],"name":"decreaseStake","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"firstActive","outputs":[{"internalType":"bytes32","name":"","type":"bytes32"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"firstQueued","outputs":[{"internalType":"bytes32","name":"","type":"bytes32"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes32","name":"id","type":"bytes32"}],"name":"get","outputs":[{"internalType":"address","name":"","type":"address"},{"internalType":"address","name":"","type":"address"},{"internalType":"uint256","name":"","type":"uint256"},{"internalType":"uint256","name":"","type":"uint256"},{"internalType":"uint8","name":"","type":"uint8"},{"internalType":"bool","name":"","type":"bool"},{"internalType":"uint32","name":"","type":"uint32"},{"internalType":"uint32","name":"","type":"uint32"},{"internalType":"uint32","name":"","type":"uint32"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes32","name":"validationID","type":"bytes32"}],"name":"getCompletedPeriods","outputs":[{"internalType":"uint32","name":"","type":"uint32"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes32","name":"delegationID","type":"bytes32"}],"name":"getDelegation","outputs":[{"internalType":"bytes32","name":"","type":"bytes32"},{"internalType":"uint256","name":"","type":"uint256"},{"internalType":"uint32","name":"","type":"uint32"},{"internalType":"uint32","name":"","type":"uint32"},{"internalType":"uint8","name":"","type":"uint8"},{"internalType":"bool","name":"","type":"bool"},{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes32","name":"validationID","type":"bytes32"},{"internalType":"uint32","name":"stakingPeriod","type":"uint32"}],"name":"getRewards","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes32","name":"validationID","type":"bytes32"}],"name":"getValidatorTotals","outputs":[{"internalType":"uint256","name":"","type":"uint256"},{"internalType":"uint256","name":"","type":"uint256"},{"internalType":"uint256","name":"","type":"uint256"},{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes32","name":"id","type":"bytes32"}],"name":"getWithdrawable","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes32","name":"validationID","type":"bytes32"}],"name":"increaseStake","outputs":[],"stateMutability":"payable","type":"function"},{"inputs":[{"internalType":"address","name":"node","type":"address"}],"name":"lookupNode","outputs":[{"internalType":"bytes32","name":"","type":"bytes32"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes32","name":"prev","type":"bytes32"}],"name":"next","outputs":[{"internalType":"bytes32","name":"","type":"bytes32"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"queuedStake","outputs":[{"internalType":"uint256","name":"","type":"uint256"},{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes32","name":"id","type":"bytes32"}],"name":"signalExit","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"totalStake","outputs":[{"internalType":"uint256","name":"","type":"uint256"},{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes32","name":"delegationID","type":"bytes32"},{"internalType":"bool","name":"active","type":"bool"}],"name":"updateDelegationAutoRenew","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"bytes32","name":"delegationID","type":"bytes32"}],"name":"withdrawDelegation","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"bytes32","name":"id","type":"bytes32"}],"name":"withdrawStake","outputs":[],"stateMutability":"nonpayable","type":"function"},{"stateMutability":"payable","type":"receive"}]
+[{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"validationID","type":"address"},{"indexed":true,"internalType":"bytes32","name":"delegationID","type":"bytes32"},{"indexed":false,"internalType":"uint256","name":"stake","type":"uint256"},{"indexed":false,"internalType":"bool","name":"autoRenew","type":"bool"},{"indexed":false,"internalType":"uint8","name":"multiplier","type":"uint8"}],"name":"DelegationAdded","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"bytes32","name":"delegationID","type":"bytes32"},{"indexed":false,"internalType":"bool","name":"autoRenew","type":"bool"}],"name":"DelegationUpdatedAutoRenew","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"bytes32","name":"delegationID","type":"bytes32"},{"indexed":false,"internalType":"uint256","name":"stake","type":"uint256"}],"name":"DelegationWithdrawn","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"endorsor","type":"address"},{"indexed":true,"internalType":"address","name":"validationID","type":"address"},{"indexed":false,"internalType":"uint256","name":"removed","type":"uint256"}],"name":"StakeDecreased","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"endorsor","type":"address"},{"indexed":true,"internalType":"address","name":"validationID","type":"address"},{"indexed":false,"internalType":"uint256","name":"added","type":"uint256"}],"name":"StakeIncreased","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"endorsor","type":"address"},{"indexed":true,"internalType":"address","name":"validationID","type":"address"},{"indexed":false,"internalType":"uint32","name":"period","type":"uint32"},{"indexed":false,"internalType":"uint256","name":"stake","type":"uint256"}],"name":"ValidatorQueued","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"endorsor","type":"address"},{"indexed":true,"internalType":"address","name":"validationID","type":"address"}],"name":"ValidatorSignaledExit","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"endorsor","type":"address"},{"indexed":true,"internalType":"address","name":"validationID","type":"address"},{"indexed":false,"internalType":"uint256","name":"stake","type":"uint256"}],"name":"ValidatorWithdrawn","type":"event"},{"stateMutability":"nonpayable","type":"fallback"},{"inputs":[{"internalType":"address","name":"validationID","type":"address"},{"internalType":"bool","name":"autoRenew","type":"bool"},{"internalType":"uint8","name":"multiplier","type":"uint8"}],"name":"addDelegation","outputs":[{"internalType":"bytes32","name":"","type":"bytes32"}],"stateMutability":"payable","type":"function"},{"inputs":[{"internalType":"address","name":"node","type":"address"},{"internalType":"uint32","name":"period","type":"uint32"}],"name":"addValidator","outputs":[],"stateMutability":"payable","type":"function"},{"inputs":[{"internalType":"address","name":"id","type":"address"},{"internalType":"uint256","name":"amount","type":"uint256"}],"name":"decreaseStake","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"firstActive","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"firstQueued","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"id","type":"address"}],"name":"get","outputs":[{"internalType":"address","name":"","type":"address"},{"internalType":"address","name":"","type":"address"},{"internalType":"uint256","name":"","type":"uint256"},{"internalType":"uint256","name":"","type":"uint256"},{"internalType":"uint8","name":"","type":"uint8"},{"internalType":"bool","name":"","type":"bool"},{"internalType":"uint32","name":"","type":"uint32"},{"internalType":"uint32","name":"","type":"uint32"},{"internalType":"uint32","name":"","type":"uint32"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"validationID","type":"address"}],"name":"getCompletedPeriods","outputs":[{"internalType":"uint32","name":"","type":"uint32"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes32","name":"delegationID","type":"bytes32"}],"name":"getDelegation","outputs":[{"internalType":"address","name":"","type":"address"},{"internalType":"uint256","name":"","type":"uint256"},{"internalType":"uint32","name":"","type":"uint32"},{"internalType":"uint32","name":"","type":"uint32"},{"internalType":"uint8","name":"","type":"uint8"},{"internalType":"bool","name":"","type":"bool"},{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"validationID","type":"address"},{"internalType":"uint32","name":"stakingPeriod","type":"uint32"}],"name":"getRewards","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"validationID","type":"address"}],"name":"getValidatorTotals","outputs":[{"internalType":"uint256","name":"","type":"uint256"},{"internalType":"uint256","name":"","type":"uint256"},{"internalType":"uint256","name":"","type":"uint256"},{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"id","type":"address"}],"name":"getWithdrawable","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"validationID","type":"address"}],"name":"increaseStake","outputs":[],"stateMutability":"payable","type":"function"},{"inputs":[{"internalType":"address","name":"node","type":"address"}],"name":"lookupNode","outputs":[{"internalType":"bytes32","name":"","type":"bytes32"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"prev","type":"address"}],"name":"next","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"queuedStake","outputs":[{"internalType":"uint256","name":"","type":"uint256"},{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"id","type":"address"}],"name":"signalExit","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"totalStake","outputs":[{"internalType":"uint256","name":"","type":"uint256"},{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes32","name":"delegationID","type":"bytes32"},{"internalType":"bool","name":"active","type":"bool"}],"name":"updateDelegationAutoRenew","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"bytes32","name":"delegationID","type":"bytes32"}],"name":"withdrawDelegation","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"id","type":"address"}],"name":"withdrawStake","outputs":[],"stateMutability":"nonpayable","type":"function"},{"stateMutability":"payable","type":"receive"}]