update staking list

node/contract.go

@@ -4,7 +4,6 @@ import (
 	"crypto/ecdsa"
 	"encoding/hex"
 	"math/big"
-	"strconv"
 	"strings"
 
 	"github.com/ethereum/go-ethereum/common"
@@ -13,6 +12,7 @@ import (
 	"github.com/ethereum/go-ethereum/params"
 	"github.com/harmony-one/harmony/core/types"
 	"github.com/harmony-one/harmony/internal/utils/contract"
+	"golang.org/x/crypto/sha3"
 )
 
 // Constants related to smart contract.
@@ -41,7 +41,7 @@ func (node *Node) AddStakingContractToPendingTransactions() {
 }
 
 //CreateStakingWithdrawTransaction creates a new withdraw stake transaction
-func (node *Node) CreateStakingWithdrawTransaction(stake int) (*types.Transaction, error) {
+func (node *Node) CreateStakingWithdrawTransaction(stake string) (*types.Transaction, error) {
 	//These should be read from somewhere.
 	DepositContractPriKey, _ := ecdsa.GenerateKey(crypto.S256(), strings.NewReader("Deposit Smart Contract Key")) //DepositContractPriKey is pk for contract
 	DepositContractAddress := crypto.PubkeyToAddress(DepositContractPriKey.PublicKey)                             //DepositContractAddress is the address for the contract
@@ -50,9 +50,21 @@ func (node *Node) CreateStakingWithdrawTransaction(stake int) (*types.Transactio
 		log.Error("Failed to get chain state", "Error", err)
 	}
 	nonce := state.GetNonce(crypto.PubkeyToAddress(DepositContractPriKey.PublicKey))
-	callingFunction := "0x2e1a7d4d"
+	//callingFunction := "0x2e1a7d4d"
-	contractData := callingFunction + hex.EncodeToString([]byte(strconv.Itoa(stake)))
+
-	dataEnc := common.FromHex(contractData)
+	//Following: https://github.com/miguelmota/ethereum-development-with-go-book/blob/master/code/transfer_tokens.go
+	withdrawFnSignature := []byte("withdraw(uint)")
+	hash := sha3.NewLegacyKeccak256()
+	hash.Write(withdrawFnSignature)
+	methodID := hash.Sum(nil)[:4]
+
+	amount := new(big.Int)
+	amount.SetString(stake, 10)
+	paddedAmount := common.LeftPadBytes(amount.Bytes(), 32)
+
+	var dataEnc []byte
+	dataEnc = append(dataEnc, methodID...)
+	dataEnc = append(dataEnc, paddedAmount...)
 	tx, err := types.SignTx(types.NewTransaction(nonce, DepositContractAddress, node.Consensus.ShardID, big.NewInt(0), params.TxGasContractCreation*10, nil, dataEnc), types.HomesteadSigner{}, node.AccountKey)
 	return tx, err
 }

node/node.go

@@ -159,6 +159,11 @@ type Node struct {
 	// Service manager.
 	serviceManager *service_manager.Manager
 
+	//Staked Accounts and Contract
+	CurrentStakes        map[common.Address]int64
+	StakeContractAddress common.Address
+	WithdrawStakeFunc    []byte
+
 	//Node Account
 	AccountKey *ecdsa.PrivateKey
 	Address    common.Address
@@ -570,44 +575,51 @@ func (node *Node) RemovePeersHandler() {
 	}
 }
 
-
+//UpdateStakingList updates the stakes of every node.
-// This function will be used by the beaconLeader
+func (node *Node) UpdateStakingList(block *types.Block) error {
-// GetNewStakedNodes gives a list of all nodes that have deposited transaction
+	signerType := types.HomesteadSigner{}
-func (node *Node) GetNewStakedNodes()  ([]common.Address) {
+	txns := block.Transactions()
-	BlocksPerEpoch := 5 //Hardcoded, will take value from core.Blockchain later.
+	for i := range txns {
-	currentHeight := node.blockchain.CurrentBlock().NumberU64()
+		txn := txns[i]
-	if currentHeight > BlocksPerEpoch {
+		value := txn.Value().Int64()
-		prevBlock := currentHeight - BlocksPerEpoch
+		currentSender, _ := types.Sender(signerType, txn)
-	} else {
+		_, isPresent := node.CurrentStakes[currentSender]
-		prevBlock := 0
+		toAddress := txn.To()
-	}
+		if *toAddress != node.StakeContractAddress { //Not a address aimed at the staking contract.
-	return node.getNewStakedNodesFromBlockNumToBlockNum(prevBlock,currentHeight)
+			continue
-}
+		}
-
+		if value > int64(0) { //If value >0 means its a staking deposit transaction
-// This function will be used by the beaconLeader
+			if isPresent {
-//GetNewStakedNodesFromBlockNumToBlockNum gives a list of all nodes that have deposited transaction
+				//This means this node has increaserd its stake
-func (node *Node) getNewStakedNodesFromBlockNumToBlockNum (prevBlockNum, toCurrentBlock uint64)  ([]common.Address) {
+				node.CurrentStakes[currentSender] += value
-	Blockchain := node.Blockchain()
+			} else {
-	signerType  := types.HomesteadSigner{}
+				node.CurrentStakes[currentSender] = value
-	newNodesMap = make(map[common.Address]int)
+			}
-	var newNodes []common.Address
+		} else { //This means node has withdrawn stake.
-	for i := prevBlockNum,; i < toCurrentBlock + 1; i++ {
+			getData := txn.Data()
-		block = Blockchain.GetBlockByNumber(from)
+			value := decodeStakeCall(getData) //Value being withdrawn
-		txns = block.Transactions(),
+			if isPresent {
-		for txn := range txns {
+				//This means this node has increaserd its stake
-			if txn.Value() > 0 {  //If value >0 means its a staking deposit transaction
+				if node.CurrentStakes[currentSender] > value {
-				newSender := types.Sender(signerType,txn)
+					node.CurrentStakes[currentSender] -= value
-				_, isPresent := newNodesMap[newSender]
+				} else if node.CurrentStakes[currentSender] == value {
-				if !isPresent {
+					delete(node.CurrentStakes, currentSender)
-					newNodesMap[newSender] = 1
+				} else {
-					newNodes := append(newNodes, newSender)
+					continue //Overdraft protection.
 				}
+			} else {
+				node.CurrentStakes[currentSender] = value
 			}
- 		}
+		}
 	}
-	return newNodes
+	return nil
 }
 
+func decodeStakeCall(getData []byte) int64 {
+	value := new(big.Int)
+	value.SetBytes(getData[4:])
+	return value.Int64()
+}
 func (node *Node) setupForShardLeader() {
 	// Register explorer service.
 	node.serviceManager.RegisterService(service_manager.SupportExplorer, explorer.New(&node.SelfPeer))

node/node_handler.go

@@ -214,10 +214,12 @@ func (node *Node) VerifyNewBlock(newBlock *types.Block) bool {
 // 1. add the new block to blockchain
 // 2. [leader] send new block to the client
 func (node *Node) PostConsensusProcessing(newBlock *types.Block) {
+	if node.Role == BeaconLeader || node.Role == BeaconValidator {
+		node.UpdateStakingList(newBlock)
+	}
 	if node.Consensus.IsLeader {
 		node.BroadcastNewBlock(newBlock)
 	}
-
 	node.AddNewBlock(newBlock)
 }