diff --git a/contracts/blockSignerReader.go b/contracts/blockSignerReader.go new file mode 100644 index 0000000000..46b72e889a --- /dev/null +++ b/contracts/blockSignerReader.go @@ -0,0 +1,33 @@ +package contracts + +import ( + "github.com/ethereum/go-ethereum/common" + "github.com/ethereum/go-ethereum/core/state" + "github.com/ethereum/go-ethereum/core/types" +) + +var ( + slotBlockSignerMapping = map[string]uint64{ + "blockSigners": 0, + "blocks": 1, + } +) + +func GetSigners(statedb *state.StateDB, block *types.Block) []common.Address { + slot := slotBlockSignerMapping["blockSigners"] + keys := []common.Hash{} + keyArrSlot := getLocMappingAtKey(block.Hash(), slot) + arrSlot := statedb.GetState(common.HexToAddress(common.BlockSigners), common.BigToHash(keyArrSlot)) + arrLength := arrSlot.Big().Uint64() + for i := uint64(0); i < arrLength; i++ { + key := getLocDynamicArrAtElement(common.BigToHash(keyArrSlot), i, 1) + keys = append(keys, key) + } + rets := []common.Address{} + for _, key := range keys { + ret := statedb.GetState(common.HexToAddress(common.BlockSigners), key) + rets = append(rets, common.HexToAddress(ret.Hex())) + } + + return rets +} diff --git a/contracts/multisigwallet/contract/multisigwallet.go b/contracts/multisigwallet/contract/multisigwallet.go index fd5401f632..8cd1109197 100644 --- a/contracts/multisigwallet/contract/multisigwallet.go +++ b/contracts/multisigwallet/contract/multisigwallet.go @@ -436,7 +436,7 @@ func (_MultiSigWallet *MultiSigWalletCallerSession) Owners(arg0 *big.Int) (commo return _MultiSigWallet.Contract.Owners(&_MultiSigWallet.CallOpts, arg0) } -// Required is a free data retrieval call binding the contract method 0XDC8452cd. +// Required is a free data retrieval call binding the contract method 0xdc8452cd. // // Solidity: function required() constant returns(uint256) func (_MultiSigWallet *MultiSigWalletCaller) Required(opts *bind.CallOpts) (*big.Int, error) { @@ -448,14 +448,14 @@ func (_MultiSigWallet *MultiSigWalletCaller) Required(opts *bind.CallOpts) (*big return *ret0, err } -// Required is a free data retrieval call binding the contract method 0XDC8452cd. +// Required is a free data retrieval call binding the contract method 0xdc8452cd. // // Solidity: function required() constant returns(uint256) func (_MultiSigWallet *MultiSigWalletSession) Required() (*big.Int, error) { return _MultiSigWallet.Contract.Required(&_MultiSigWallet.CallOpts) } -// Required is a free data retrieval call binding the contract method 0XDC8452cd. +// Required is a free data retrieval call binding the contract method 0xdc8452cd. // // Solidity: function required() constant returns(uint256) func (_MultiSigWallet *MultiSigWalletCallerSession) Required() (*big.Int, error) { diff --git a/contracts/randomizeReader.go b/contracts/randomizeReader.go new file mode 100644 index 0000000000..173e82afbb --- /dev/null +++ b/contracts/randomizeReader.go @@ -0,0 +1,37 @@ +package contracts + +import ( + "github.com/ethereum/go-ethereum/common" + "github.com/ethereum/go-ethereum/core/state" +) + +var ( + slotRandomizeMapping = map[string]uint64{ + "randomSecret": 0, + "randomOpening": 1, + } +) + +func GetSecret(statedb *state.StateDB, address common.Address) [][32]byte { + slot := slotRandomizeMapping["randomSecret"] + locSecret := getLocMappingAtKey(address.Hash(), slot) + arrLength := statedb.GetState(common.HexToAddress(common.RandomizeSMC), common.BigToHash(locSecret)) + keys := []common.Hash{} + for i := uint64(0); i < arrLength.Big().Uint64(); i++ { + key := getLocDynamicArrAtElement(common.BigToHash(locSecret), i, 1) + keys = append(keys, key) + } + rets := [][32]byte{} + for _, key := range keys { + ret := statedb.GetState(common.HexToAddress(common.RandomizeSMC), key) + rets = append(rets, ret) + } + return rets +} + +func GetOpening(statedb *state.StateDB, address common.Address) [32]byte { + slot := slotRandomizeMapping["randomOpening"] + locOpening := getLocMappingAtKey(address.Hash(), slot) + ret := statedb.GetState(common.HexToAddress(common.RandomizeSMC), common.BigToHash(locOpening)) + return ret +} diff --git a/contracts/smcUtils.go b/contracts/smcUtils.go new file mode 100644 index 0000000000..8c71c78164 --- /dev/null +++ b/contracts/smcUtils.go @@ -0,0 +1,34 @@ +package contracts + +import ( + "math/big" + + "github.com/ethereum/go-ethereum/common" + "github.com/ethereum/go-ethereum/crypto" +) + +func getLocSimpleVariable(slot uint64) common.Hash { + slotHash := common.BigToHash(new(big.Int).SetUint64(slot)) + return slotHash +} + +func getLocMappingAtKey(key common.Hash, slot uint64) *big.Int { + slotHash := common.BigToHash(new(big.Int).SetUint64(slot)) + retByte := crypto.Keccak256(key.Bytes(), slotHash.Bytes()) + ret := new(big.Int) + ret.SetBytes(retByte) + return ret +} + +func getLocDynamicArrAtElement(slotHash common.Hash, index uint64, elementSize uint64) common.Hash { + slotKecBig := crypto.Keccak256Hash(slotHash.Bytes()).Big() + //arrBig = slotKecBig + index * elementSize + arrBig := slotKecBig.Add(slotKecBig, new(big.Int).SetUint64(index*elementSize)) + return common.BigToHash(arrBig) +} + +func getLocFixedArrAtElement(slot uint64, index uint64, elementSize uint64) common.Hash { + slotBig := new(big.Int).SetUint64(slot) + arrBig := slotBig.Add(slotBig, new(big.Int).SetUint64(index*elementSize)) + return common.BigToHash(arrBig) +} diff --git a/contracts/test.go b/contracts/test.go new file mode 100644 index 0000000000..5a7a99b209 --- /dev/null +++ b/contracts/test.go @@ -0,0 +1,282 @@ +package contracts + +// +//import ( +// "fmt" +// "math/big" +// "time" +// +// "github.com/ethereum/go-ethereum/common" +// "github.com/ethereum/go-ethereum/core" +// "github.com/ethereum/go-ethereum/core/state" +// "github.com/ethereum/go-ethereum/crypto" +// "github.com/ethereum/go-ethereum/ethdb" +// "github.com/ethereum/go-ethereum/core/types" +//) +// +//var ( +// slotValidatorMapping = map[string]uint64{ +// "withdrawsState": 0, +// "validatorsState": 1, +// "voters": 2, +// "candidates": 3, +// "candidateCount": 4, +// "minCandidateCap": 5, +// "minVoterCap": 6, +// "maxValidatorNumber": 7, +// "candidateWithdrawDelay": 8, +// "voterWithdrawDelay": 9, +// } +// slotBlockSignerMapping = map[string]uint64{ +// "blockSigners": 0, +// "blocks": 1, +// } +// slotRandomizeMapping = map[string]uint64{ +// "randomSecret": 0, +// "randomOpening": 1, +// } +// datadir = "/mnt/sgp1_tuna_chaindata3/data/XDC/chaindata" +// candidate = "0xd6fa3e7a89bf8c84f0ccd204a15c0d259daf2091" +//) +// +//func main() { +// //Init +// chaindb, err := ethdb.NewLDBDatabase(datadir, 0, 0) +// if err != nil || chaindb == nil { +// fmt.Printf("Can't get chaindb: %v", err) +// return +// } +// headHash := core.GetHeadBlockHash(chaindb) +// blockNumber := core.GetBlockNumber(chaindb, headHash) +// block := core.GetBlock(chaindb, headHash, blockNumber) +// if block == nil { +// fmt.Println("Can't get head block") +// return +// } +// database := state.NewDatabase(chaindb) +// headerRootHash := block.Header().Root +// headHeaderHash := core.GetHeadHeaderHash(chaindb) +// statedb, _ := state.New(headHeaderHash, database) +// if statedb == nil { +// headHeaderHash = headerRootHash +// } +// candidateAddress := common.HexToAddress(candidate) +// fmt.Printf("Block head :%d, header root:%v\n", blockNumber, headerRootHash.Hex()) +// statedb, _ = state.New(headHeaderHash, database) +// if statedb == nil { +// fmt.Println("Can't get state db") +// return +// } +// +// //GetCandidates +// _ = GetCandidates(statedb) +// +// //GetCandidateOwner +// _ = GetCandidateOwner(statedb, candidateAddress) +// +// //GetCandidateCap +// _ = GetCandidateCap(statedb, candidateAddress) +// +// //GetVoters +// voters := GetVoters(statedb, candidateAddress) +// +// start := time.Now() +// fmt.Printf("--------GetVoterCap---------\n") +// for _, voter := range voters { +// //GetVoterCap +// _ = GetVoterCap(statedb, candidateAddress, voter) +// } +// elapsed := time.Since(start) +// fmt.Printf("Execution time: %s\n", elapsed) +// +// //GetSigners +// blockInput := core.GetBlock(chaindb, common.HexToHash("0x632f2403ea19697082d794900275632eb3373f7a9943b1407461995bbbc2816a"), uint64(1800)) +// _ = GetSigners(statedb, blockInput) +// +// //GetOpening +// _ = GetOpening(statedb, candidateAddress) +// //GetSecret +// _ = GetSecret(statedb, candidateAddress) +//} +// +//func GetCandidates(statedb *state.StateDB) []common.Address { +// start := time.Now() +// fmt.Printf("--------GetCandidates---------\n") +// +// slot := slotValidatorMapping["candidates"] +// slotHash := common.BigToHash(new(big.Int).SetUint64(slot)) +// arrLength := statedb.GetState(common.HexToAddress(common.MasternodeVotingSMC), slotHash) +// fmt.Printf("Candidates length: %v\n", arrLength.Hex()) +// keys := []common.Hash{} +// for i := uint64(0); i < arrLength.Big().Uint64(); i++ { +// key := getLocDynamicArrAtElement(slotHash, i, 1) +// keys = append(keys, key) +// } +// rets := []common.Address{} +// for _, key := range keys { +// ret := statedb.GetState(common.HexToAddress(common.MasternodeVotingSMC), key) +// rets = append(rets, common.HexToAddress(ret.Hex())) +// fmt.Printf("%v\n", common.HexToAddress(ret.Hex()).Hex()) +// } +// elapsed := time.Since(start) +// fmt.Printf("Execution time: %s\n", elapsed) +// return rets +//} +// +//func GetCandidateOwner(statedb *state.StateDB, candidate common.Address) common.Address { +// start := time.Now() +// fmt.Printf("--------GetCandidateOwner---------\n") +// +// slot := slotValidatorMapping["validatorsState"] +// // validatorsState[_candidate].owner; +// locValidatorsState := getLocMappingAtKey(candidate.Hash(), slot) +// locCandidateOwner := locValidatorsState.Add(locValidatorsState, new(big.Int).SetUint64(uint64(0))) +// ret := statedb.GetState(common.HexToAddress(common.MasternodeVotingSMC), common.BigToHash(locCandidateOwner)) +// fmt.Printf("ret: %v\n", common.HexToAddress(ret.Hex()).Hex()) +// +// elapsed := time.Since(start) +// fmt.Printf("Execution time: %s\n", elapsed) +// return common.HexToAddress(ret.Hex()) +//} +// +//func GetCandidateCap(statedb *state.StateDB, candidate common.Address) string { +// start := time.Now() +// fmt.Printf("--------GetCandidateCap---------\n") +// +// slot := slotValidatorMapping["validatorsState"] +// // validatorsState[_candidate].cap; +// locValidatorsState := getLocMappingAtKey(candidate.Hash(), slot) +// locCandidateCap := locValidatorsState.Add(locValidatorsState, new(big.Int).SetUint64(uint64(1))) +// ret := statedb.GetState(common.HexToAddress(common.MasternodeVotingSMC), common.BigToHash(locCandidateCap)) +// fmt.Printf("cap: %v\n", ret.Big().String()) +// +// elapsed := time.Since(start) +// fmt.Printf("Execution time: %s\n", elapsed) +// return ret.Hex() +//} +// +//func GetVoterCap(state *state.StateDB, candidate, voter common.Address) *big.Int { +// //validatorsState[_candidate].voters[_voter] +// slot := slotValidatorMapping["validatorsState"] +// locValidatorsState := getLocMappingAtKey(candidate.Hash(), slot) +// locCandidateVoters := locValidatorsState.Add(locValidatorsState, new(big.Int).SetUint64(uint64(2))) +// retByte := crypto.Keccak256(voter.Hash().Bytes(), common.BigToHash(locCandidateVoters).Bytes()) +// ret := state.GetState(common.HexToAddress(common.MasternodeVotingSMC), common.BytesToHash(retByte)) +// fmt.Printf("voter: %v - cap: %v\n", voter.Hex(), ret.Big().String()) +// return ret.Big() +//} +// +//func GetVoters(statedb *state.StateDB, candidate common.Address) []common.Address { +// start := time.Now() +// fmt.Printf("--------GetVoters---------\n") +// +// //mapping(address => address[]) voters; +// slot := slotValidatorMapping["voters"] +// locVoters := getLocMappingAtKey(candidate.Hash(), slot) +// arrLength := statedb.GetState(common.HexToAddress(common.MasternodeVotingSMC), common.BigToHash(locVoters)) +// fmt.Printf("Voters length: %v\n", arrLength.Hex()) +// keys := []common.Hash{} +// for i := uint64(0); i < arrLength.Big().Uint64(); i++ { +// key := getLocDynamicArrAtElement(common.BigToHash(locVoters), i, 1) +// keys = append(keys, key) +// } +// rets := []common.Address{} +// for _, key := range keys { +// ret := statedb.GetState(common.HexToAddress(common.MasternodeVotingSMC), key) +// rets = append(rets, common.HexToAddress(ret.Hex())) +// fmt.Printf("%v\n", common.HexToAddress(ret.Hex()).Hex()) +// } +// +// elapsed := time.Since(start) +// fmt.Printf("Execution time: %s\n", elapsed) +// return rets +//} +// +//func GetSigners(statedb *state.StateDB, block *types.Block) []common.Address { +// methodName := "getSigners" +// fmt.Printf("---%s---\n", methodName) +// start := time.Now() +// slot := slotBlockSignerMapping["blockSigners"] +// keys := []common.Hash{} +// keyArrSlot := getLocMappingAtKey(block.Hash(), slot) +// arrSlot := statedb.GetState(common.HexToAddress(common.BlockSigners), common.BigToHash(keyArrSlot)) +// arrLength := arrSlot.Big().Uint64() +// for i := uint64(0); i < arrLength; i++ { +// key := getLocDynamicArrAtElement(common.BigToHash(keyArrSlot), i, 1) +// keys = append(keys, key) +// } +// rets := []common.Address{} +// for _, key := range keys { +// ret := statedb.GetState(common.HexToAddress(common.BlockSigners), key) +// rets = append(rets, common.HexToAddress(ret.Hex())) +// fmt.Printf("%v\n", common.HexToAddress(ret.Hex()).Hex()) +// } +// +// elapsed := time.Since(start) +// fmt.Printf("Execution time: %s\n", elapsed) +// return rets +//} +// +//func GetSecret(statedb *state.StateDB, address common.Address) [][32]byte { +// start := time.Now() +// fmt.Printf("--------GetSecret---------\n") +// +// slot := slotRandomizeMapping["randomSecret"] +// locSecret := getLocMappingAtKey(address.Hash(), slot) +// arrLength := statedb.GetState(common.HexToAddress(common.RandomizeSMC), common.BigToHash(locSecret)) +// fmt.Printf("Secret length: %v\n", arrLength.Hex()) +// keys := []common.Hash{} +// for i := uint64(0); i < arrLength.Big().Uint64(); i++ { +// key := getLocDynamicArrAtElement(common.BigToHash(locSecret), i, 1) +// keys = append(keys, key) +// } +// rets := [][32]byte{} +// for _, key := range keys { +// ret := statedb.GetState(common.HexToAddress(common.RandomizeSMC), key) +// rets = append(rets, ret) +// fmt.Printf("ret hex: %v - ret byte: %v\n", ret.Hex(), ret.Bytes()) +// } +// elapsed := time.Since(start) +// +// fmt.Printf("Execution time: %s\n", elapsed) +// return rets +//} +// +//func GetOpening(statedb *state.StateDB, address common.Address) [32]byte { +// start := time.Now() +// fmt.Printf("--------GetOpening---------\n") +// +// slot := slotRandomizeMapping["randomOpening"] +// locOpening := getLocMappingAtKey(address.Hash(), slot) +// ret := statedb.GetState(common.HexToAddress(common.RandomizeSMC), common.BigToHash(locOpening)) +// fmt.Printf("ret hex: %v - ret byte: %v\n", ret.Hex(), ret.Bytes()) +// elapsed := time.Since(start) +// fmt.Printf("Execution time: %s\n", elapsed) +// return ret +//} +// +// +////////////////////////////////////// +///////////// Common lib ///////////// +////////////////////////////////////// +// +//func getLocMappingAtKey(key common.Hash, slot uint64) *big.Int { +// slotHash := common.BigToHash(new(big.Int).SetUint64(slot)) +// retByte := crypto.Keccak256(key.Bytes(), slotHash.Bytes()) +// ret := new(big.Int) +// ret.SetBytes(retByte) +// return ret +//} +// +//func getLocDynamicArrAtElement(slotHash common.Hash, index uint64, elementSize uint64) common.Hash { +// slotKecBig := crypto.Keccak256Hash(slotHash.Bytes()).Big() +// //arrBig = slotKecBig + index * elementSize +// arrBig := slotKecBig.Add(slotKecBig, new(big.Int).SetUint64(index*elementSize)) +// return common.BigToHash(arrBig) +//} +// +//func getLocFixedArrAtElement(slot uint64, index uint64, elementSize uint64) common.Hash { +// slotBig := new(big.Int).SetUint64(slot) +// arrBig := slotBig.Add(slotBig, new(big.Int).SetUint64(index*elementSize)) +// return common.BigToHash(arrBig) +//} diff --git a/contracts/utils.go b/contracts/utils.go index 21dd0f799c..7b9b9638dd 100644 --- a/contracts/utils.go +++ b/contracts/utils.go @@ -38,7 +38,6 @@ import ( "github.com/ethereum/go-ethereum/consensus/XDPoS" "github.com/ethereum/go-ethereum/contracts/blocksigner/contract" randomizeContract "github.com/ethereum/go-ethereum/contracts/randomize/contract" - contractValidator "github.com/ethereum/go-ethereum/contracts/validator/contract" "github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/core/state" "github.com/ethereum/go-ethereum/core/types" @@ -85,7 +84,8 @@ func CreateTransactionSign(chainConfig *params.ChainConfig, pool *core.TxPool, m // Add tx signed to local tx pool. err = pool.AddLocal(txSigned) if err != nil { - log.Warn("Fail to add tx sign to local pool.", "error", err, "number", block.NumberU64(), "hash", block.Hash().Hex(), "from", account.Address, "nonce", nonce) + log.Error("Fail to add tx sign to local pool.", "error", err, "number", block.NumberU64(), "hash", block.Hash().Hex(), "from", account.Address, "nonce", nonce) + return err } // Create secret tx. @@ -114,6 +114,7 @@ func CreateTransactionSign(chainConfig *params.ChainConfig, pool *core.TxPool, m err = pool.AddLocal(txSigned) if err != nil { log.Error("Fail to add tx secret to local pool.", "error", err, "number", block.NumberU64(), "hash", block.Hash().Hex(), "from", account.Address, "nonce", nonce) + return err } // Put randomize key into chainDb. @@ -125,6 +126,7 @@ func CreateTransactionSign(chainConfig *params.ChainConfig, pool *core.TxPool, m randomizeKeyValue, err := chainDb.Get(randomizeKeyName) if err != nil { log.Error("Fail to get randomize key from state db.", "error", err) + return err } tx, err := BuildTxOpeningRandomize(nonce+1, common.HexToAddress(common.RandomizeSMC), randomizeKeyValue) @@ -141,6 +143,7 @@ func CreateTransactionSign(chainConfig *params.ChainConfig, pool *core.TxPool, m err = pool.AddLocal(txSigned) if err != nil { log.Error("Fail to add tx opening to local pool.", "error", err, "number", block.NumberU64(), "hash", block.Hash().Hex(), "from", account.Address, "nonce", nonce) + return err } // Clear randomize key in state db. @@ -195,7 +198,12 @@ func BuildTxOpeningRandomize(nonce uint64, randomizeAddr common.Address, randomi } // Get signers signed for blockNumber from blockSigner contract. -func GetSignersFromContract(addrBlockSigner common.Address, client bind.ContractBackend, blockHash common.Hash) ([]common.Address, error) { +func GetSignersFromContract(state *state.StateDB, block *types.Block) ([]common.Address, error) { + return GetSigners(state, block), nil +} + +// Get signers signed for blockNumber from blockSigner contract. +func GetSignersByExecutingEVM(addrBlockSigner common.Address, client bind.ContractBackend, blockHash common.Hash) ([]common.Address, error) { blockSigner, err := contract.NewBlockSigner(addrBlockSigner, client) if err != nil { log.Error("Fail get instance of blockSigner", "error", err) @@ -207,7 +215,6 @@ func GetSignersFromContract(addrBlockSigner common.Address, client bind.Contract log.Error("Fail get block signers", "error", err) return nil, err } - return addrs, nil } @@ -289,6 +296,7 @@ func DecryptRandomizeFromSecretsAndOpening(secrets [][32]byte, opening [32]byte) intNumber, err := strconv.Atoi(decryptSecret) if err != nil { log.Error("Can not convert string to integer", "error", err) + return -1, err } random = int64(intNumber) } @@ -299,23 +307,44 @@ func DecryptRandomizeFromSecretsAndOpening(secrets [][32]byte, opening [32]byte) } // Calculate reward for reward checkpoint. -func GetRewardForCheckpoint(chain consensus.ChainReader, blockSignerAddr common.Address, number uint64, rCheckpoint uint64, client bind.ContractBackend, totalSigner *uint64) (map[common.Address]*rewardLog, error) { +func GetRewardForCheckpoint(c *XDPoS.XDPoS, chain consensus.ChainReader, header *types.Header, rCheckpoint uint64, totalSigner *uint64) (map[common.Address]*rewardLog, error) { // Not reward for singer of genesis block and only calculate reward at checkpoint block. + number := header.Number.Uint64() prevCheckpoint := number - (rCheckpoint * 2) startBlockNumber := prevCheckpoint + 1 endBlockNumber := startBlockNumber + rCheckpoint - 1 signers := make(map[common.Address]*rewardLog) - prevHeaderCheckpoint := chain.GetHeaderByNumber(prevCheckpoint) - masternodes := XDPoS.GetMasternodesFromCheckpointHeader(prevHeaderCheckpoint) + mapBlkHash := map[uint64]common.Hash{} - if len(masternodes) > 0 { - for i := startBlockNumber; i <= endBlockNumber; i++ { - block := chain.GetHeaderByNumber(i) - addrs, err := GetSignersFromContract(blockSignerAddr, client, block.Hash()) - if err != nil { - log.Error("Fail to get signers from smartcontract.", "error", err, "blockNumber", i) - return nil, err + data := make(map[common.Hash][]common.Address) + for i := prevCheckpoint + (rCheckpoint * 2) - 1; i >= startBlockNumber; i-- { + header = chain.GetHeader(header.ParentHash, i) + mapBlkHash[i] = header.Hash() + signData, ok := c.BlockSigners.Get(header.Hash()) + if !ok { + log.Debug("Failed get from cached", "hash", header.Hash().String(), "number", i) + block := chain.GetBlock(header.Hash(), i) + txs := block.Transactions() + if !chain.Config().IsTIPSigning(header.Number) { + receipts := core.GetBlockReceipts(c.GetDb(), header.Hash(), i) + signData = c.CacheData(header, txs, receipts) + } else { + signData = c.CacheSigner(header.Hash(), txs) } + } + txs := signData.([]*types.Transaction) + for _, tx := range txs { + blkHash := common.BytesToHash(tx.Data()[len(tx.Data())-32:]) + from := *tx.From() + data[blkHash] = append(data[blkHash], from) + } + } + header = chain.GetHeader(header.ParentHash, prevCheckpoint) + masternodes := XDPoS.GetMasternodesFromCheckpointHeader(header) + + for i := startBlockNumber; i <= endBlockNumber; i++ { + if i%common.MergeSignRange == 0 || !chain.Config().IsTIP2019(big.NewInt(int64(i))) { + addrs := data[mapBlkHash[i]] // Filter duplicate address. if len(addrs) > 0 { addrSigners := make(map[common.Address]bool) @@ -374,46 +403,27 @@ func CalculateRewardForSigner(chainReward *big.Int, signers map[common.Address]* } // Get candidate owner by address. -func GetCandidatesOwnerBySigner(validator *contractValidator.XDCValidator, signerAddr common.Address) common.Address { - owner := signerAddr - opts := new(bind.CallOpts) - owner, err := validator.GetCandidateOwner(opts, signerAddr) - if err != nil { - log.Error("Fail get candidate owner", "error", err) - return owner - } - +func GetCandidatesOwnerBySigner(state *state.StateDB, signerAddr common.Address) common.Address { + owner := GetCandidateOwner(state, signerAddr) return owner } -// Calculate reward for holders. -func CalculateRewardForHolders(foudationWalletAddr common.Address, validator *contractValidator.XDCValidator, state *state.StateDB, signer common.Address, calcReward *big.Int) (error, map[common.Address]*big.Int) { - rewards, err := GetRewardBalancesRate(foudationWalletAddr, signer, calcReward, validator) +func CalculateRewardForHolders(foundationWalletAddr common.Address, state *state.StateDB, signer common.Address, calcReward *big.Int, blockNumber uint64) (error, map[common.Address]*big.Int) { + rewards, err := GetRewardBalancesRate(foundationWalletAddr, state, signer, calcReward, blockNumber) if err != nil { return err, nil } - if len(rewards) > 0 { - for holder, reward := range rewards { - state.AddBalance(holder, reward) - } - } return nil, rewards } -// Get reward balance rates for master node, founder and holders. -func GetRewardBalancesRate(foudationWalletAddr common.Address, masterAddr common.Address, totalReward *big.Int, validator *contractValidator.XDCValidator) (map[common.Address]*big.Int, error) { - owner := GetCandidatesOwnerBySigner(validator, masterAddr) +func GetRewardBalancesRate(foundationWalletAddr common.Address, state *state.StateDB, masterAddr common.Address, totalReward *big.Int, blockNumber uint64) (map[common.Address]*big.Int, error) { + owner := GetCandidatesOwnerBySigner(state, masterAddr) balances := make(map[common.Address]*big.Int) rewardMaster := new(big.Int).Mul(totalReward, new(big.Int).SetInt64(common.RewardMasterPercent)) rewardMaster = new(big.Int).Div(rewardMaster, new(big.Int).SetInt64(100)) balances[owner] = rewardMaster // Get voters for masternode. - opts := new(bind.CallOpts) - voters, err := validator.GetVoters(opts, masterAddr) - if err != nil { - log.Error("Fail to get voters", "error", err) - return nil, err - } + voters := GetVoters(state, masterAddr) if len(voters) > 0 { totalVoterReward := new(big.Int).Mul(totalReward, new(big.Int).SetUint64(common.RewardVoterPercent)) @@ -422,12 +432,10 @@ func GetRewardBalancesRate(foudationWalletAddr common.Address, masterAddr common // Get voters capacities. voterCaps := make(map[common.Address]*big.Int) for _, voteAddr := range voters { - voterCap, err := validator.GetVoterCap(opts, masterAddr, voteAddr) - if err != nil { - log.Error("Fail to get vote capacity", "error", err) - return nil, err + if _, ok := voterCaps[voteAddr]; ok && common.TIP2019Block.Uint64() <= blockNumber { + continue } - + voterCap := GetVoterCap(state, masterAddr, voteAddr) totalCap.Add(totalCap, voterCap) voterCaps[voteAddr] = voterCap } @@ -447,9 +455,9 @@ func GetRewardBalancesRate(foudationWalletAddr common.Address, masterAddr common } } - foudationReward := new(big.Int).Mul(totalReward, new(big.Int).SetInt64(common.RewardFoundationPercent)) - foudationReward = new(big.Int).Div(foudationReward, new(big.Int).SetInt64(100)) - balances[foudationWalletAddr] = foudationReward + foundationReward := new(big.Int).Mul(totalReward, new(big.Int).SetInt64(common.RewardFoundationPercent)) + foundationReward = new(big.Int).Div(foundationReward, new(big.Int).SetInt64(100)) + balances[foundationWalletAddr] = foundationReward jsonHolders, err := json.Marshal(balances) if err != nil { diff --git a/contracts/validator/contract/XDCValidator.abi b/contracts/validator/contract/XDCValidator.abi deleted file mode 100644 index 5684b9a075..0000000000 --- a/contracts/validator/contract/XDCValidator.abi +++ /dev/null @@ -1,656 +0,0 @@ -[ - { - "constant": false, - "inputs": [ - { - "name": "_candidate", - "type": "address" - } - ], - "name": "propose", - "outputs": [], - "payable": true, - "stateMutability": "payable", - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "_candidate", - "type": "address" - } - ], - "name": "resign", - "outputs": [], - "payable": false, - "stateMutability": "nonpayable", - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "_candidate", - "type": "address" - }, - { - "name": "_cap", - "type": "uint256" - } - ], - "name": "unvote", - "outputs": [], - "payable": false, - "stateMutability": "nonpayable", - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "kychash", - "type": "string" - } - ], - "name": "uploadKYC", - "outputs": [], - "payable": false, - "stateMutability": "nonpayable", - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "_candidate", - "type": "address" - } - ], - "name": "vote", - "outputs": [], - "payable": true, - "stateMutability": "payable", - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "_invalidCandidate", - "type": "address" - } - ], - "name": "voteInvalidKYC", - "outputs": [], - "payable": false, - "stateMutability": "nonpayable", - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "_blockNumber", - "type": "uint256" - }, - { - "name": "_index", - "type": "uint256" - } - ], - "name": "withdraw", - "outputs": [], - "payable": false, - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [ - { - "name": "_candidates", - "type": "address[]" - }, - { - "name": "_caps", - "type": "uint256[]" - }, - { - "name": "_firstOwner", - "type": "address" - }, - { - "name": "_minCandidateCap", - "type": "uint256" - }, - { - "name": "_minVoterCap", - "type": "uint256" - }, - { - "name": "_maxValidatorNumber", - "type": "uint256" - }, - { - "name": "_candidateWithdrawDelay", - "type": "uint256" - }, - { - "name": "_voterWithdrawDelay", - "type": "uint256" - } - ], - "payable": false, - "stateMutability": "nonpayable", - "type": "constructor" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": false, - "name": "_voter", - "type": "address" - }, - { - "indexed": false, - "name": "_candidate", - "type": "address" - }, - { - "indexed": false, - "name": "_cap", - "type": "uint256" - } - ], - "name": "Vote", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": false, - "name": "_voter", - "type": "address" - }, - { - "indexed": false, - "name": "_candidate", - "type": "address" - }, - { - "indexed": false, - "name": "_cap", - "type": "uint256" - } - ], - "name": "Unvote", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": false, - "name": "_owner", - "type": "address" - }, - { - "indexed": false, - "name": "_candidate", - "type": "address" - }, - { - "indexed": false, - "name": "_cap", - "type": "uint256" - } - ], - "name": "Propose", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": false, - "name": "_owner", - "type": "address" - }, - { - "indexed": false, - "name": "_candidate", - "type": "address" - } - ], - "name": "Resign", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": false, - "name": "_owner", - "type": "address" - }, - { - "indexed": false, - "name": "_blockNumber", - "type": "uint256" - }, - { - "indexed": false, - "name": "_cap", - "type": "uint256" - } - ], - "name": "Withdraw", - "type": "event" - }, - { - "constant": true, - "inputs": [], - "name": "candidateCount", - "outputs": [ - { - "name": "", - "type": "uint256" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": true, - "inputs": [ - { - "name": "", - "type": "uint256" - } - ], - "name": "candidates", - "outputs": [ - { - "name": "", - "type": "address" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "candidateWithdrawDelay", - "outputs": [ - { - "name": "", - "type": "uint256" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": true, - "inputs": [ - { - "name": "_candidate", - "type": "address" - } - ], - "name": "getCandidateCap", - "outputs": [ - { - "name": "", - "type": "uint256" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": true, - "inputs": [ - { - "name": "_candidate", - "type": "address" - } - ], - "name": "getCandidateOwner", - "outputs": [ - { - "name": "", - "type": "address" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "getCandidates", - "outputs": [ - { - "name": "", - "type": "address[]" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": true, - "inputs": [ - { - "name": "_address", - "type": "address" - } - ], - "name": "getKYC", - "outputs": [ - { - "name": "", - "type": "string" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "getOwnerCount", - "outputs": [ - { - "name": "", - "type": "uint256" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": true, - "inputs": [ - { - "name": "_candidate", - "type": "address" - }, - { - "name": "_voter", - "type": "address" - } - ], - "name": "getVoterCap", - "outputs": [ - { - "name": "", - "type": "uint256" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": true, - "inputs": [ - { - "name": "_candidate", - "type": "address" - } - ], - "name": "getVoters", - "outputs": [ - { - "name": "", - "type": "address[]" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "getWithdrawBlockNumbers", - "outputs": [ - { - "name": "", - "type": "uint256[]" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": true, - "inputs": [ - { - "name": "_blockNumber", - "type": "uint256" - } - ], - "name": "getWithdrawCap", - "outputs": [ - { - "name": "", - "type": "uint256" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": true, - "inputs": [ - { - "name": "", - "type": "address" - }, - { - "name": "", - "type": "address" - } - ], - "name": "hasVotedInvalid", - "outputs": [ - { - "name": "", - "type": "bool" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": true, - "inputs": [ - { - "name": "", - "type": "address" - } - ], - "name": "invalidKYCCount", - "outputs": [ - { - "name": "", - "type": "uint256" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": true, - "inputs": [ - { - "name": "_invalidCandidate", - "type": "address" - } - ], - "name": "invalidPercent", - "outputs": [ - { - "name": "", - "type": "uint256" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": true, - "inputs": [ - { - "name": "_candidate", - "type": "address" - } - ], - "name": "isCandidate", - "outputs": [ - { - "name": "", - "type": "bool" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": true, - "inputs": [ - { - "name": "", - "type": "address" - } - ], - "name": "KYCString", - "outputs": [ - { - "name": "", - "type": "string" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "maxValidatorNumber", - "outputs": [ - { - "name": "", - "type": "uint256" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "minCandidateCap", - "outputs": [ - { - "name": "", - "type": "uint256" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "minVoterCap", - "outputs": [ - { - "name": "", - "type": "uint256" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": true, - "inputs": [ - { - "name": "", - "type": "uint256" - } - ], - "name": "owners", - "outputs": [ - { - "name": "", - "type": "address" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": true, - "inputs": [ - { - "name": "", - "type": "address" - }, - { - "name": "", - "type": "uint256" - } - ], - "name": "ownerToCandidate", - "outputs": [ - { - "name": "", - "type": "address" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "voterWithdrawDelay", - "outputs": [ - { - "name": "", - "type": "uint256" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - } -] \ No newline at end of file diff --git a/contracts/validator/contract/XDCValidator.bin b/contracts/validator/contract/XDCValidator.bin deleted file mode 100644 index 4c3c64e1dc..0000000000 --- a/contracts/validator/contract/XDCValidator.bin +++ /dev/null @@ -1 +0,0 @@ -6060604052600060095534156200001557600080fd5b60405162003faf38038062003faf83398101604052808051820191906020018051820191906020018051906020019091908051906020019091908051906020019091908051906020019091908051906020019091908051906020019091905050600085600a8190555084600b8190555083600c8190555082600d8190555081600e81905550885160098190555060078054806001018281620000b89190620004da565b9160005260206000209001600089909190916101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050600090505b8851811015620004cb57600880548060010182816200012c9190620004da565b916000526020600020900160008b848151811015156200014857fe5b90602001906020020151909190916101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550506060604051908101604052808873ffffffffffffffffffffffffffffffffffffffff1681526020016001151581526020018983815181101515620001d357fe5b90602001906020020151815250600160008b84815181101515620001f357fe5b9060200190602002015173ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008201518160000160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555060208201518160000160146101000a81548160ff02191690831515021790555060408201518160010155905050600260008a83815181101515620002be57fe5b9060200190602002015173ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000208054806001018281620003169190620004da565b9160005260206000209001600089909190916101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050600660008873ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000208054806001018281620003b89190620004da565b916000526020600020900160008b84815181101515620003d457fe5b90602001906020020151909190916101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050600a54600160008b848151811015156200043557fe5b9060200190602002015173ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060020160008973ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000208190555080806001019150506200010c565b50505050505050505062000531565b815481835581811511620005045781836000526020600020918201910162000503919062000509565b5b505050565b6200052e91905b808211156200052a57600081600090555060010162000510565b5090565b90565b613a6e80620005416000396000f300606060405260043610610180576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680630126795114610185578063025e7c27146101b357806302aa9be21461021657806306a49fce146102585780630e3e4fb8146102c257806315febd68146103325780632a3640b1146103695780632d15cc04146103eb5780632f9c4bba14610479578063302b6872146104e35780633477ee2e1461054f578063441a3e70146105b25780634d1a687d146105de5780634ff78d561461069057806358e7525f146107425780635b860d271461078f5780636dd7d8ea146107dc57806372e44a381461080a578063a9a981a314610857578063a9ff959e14610880578063ae6e43f5146108a9578063b642facd146108e2578063d09f1ab41461095b578063d161c76714610984578063d51b9e93146109ad578063d55b7dff146109fe578063ef18374a14610a27578063f2ee3c7d14610a50578063f5c9512514610a89578063f8ac9dd514610ab7575b600080fd5b6101b1600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610ae0565b005b34156101be57600080fd5b6101d46004808035906020019091905050611724565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b341561022157600080fd5b610256600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091908035906020019091905050611763565b005b341561026357600080fd5b61026b611cbe565b6040518080602001828103825283818151815260200191508051906020019060200280838360005b838110156102ae578082015181840152602081019050610293565b505050509050019250505060405180910390f35b34156102cd57600080fd5b610318600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611d52565b604051808215151515815260200191505060405180910390f35b341561033d57600080fd5b6103536004808035906020019091905050611d81565b6040518082815260200191505060405180910390f35b341561037457600080fd5b6103a9600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091908035906020019091905050611ddd565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34156103f657600080fd5b610422600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611e2b565b6040518080602001828103825283818151815260200191508051906020019060200280838360005b8381101561046557808201518184015260208101905061044a565b505050509050019250505060405180910390f35b341561048457600080fd5b61048c611efe565b6040518080602001828103825283818151815260200191508051906020019060200280838360005b838110156104cf5780820151818401526020810190506104b4565b505050509050019250505060405180910390f35b34156104ee57600080fd5b610539600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611f9b565b6040518082815260200191505060405180910390f35b341561055a57600080fd5b6105706004808035906020019091905050612025565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34156105bd57600080fd5b6105dc6004808035906020019091908035906020019091905050612064565b005b34156105e957600080fd5b610615600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050612310565b6040518080602001828103825283818151815260200191508051906020019080838360005b8381101561065557808201518184015260208101905061063a565b50505050905090810190601f1680156106825780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561069b57600080fd5b6106c7600480803573ffffffffffffffffffffffffffffffffffffffff169060200190919050506124ed565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156107075780820151818401526020810190506106ec565b50505050905090810190601f1680156107345780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561074d57600080fd5b610779600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190505061259d565b6040518082815260200191505060405180910390f35b341561079a57600080fd5b6107c6600480803573ffffffffffffffffffffffffffffffffffffffff169060200190919050506125e9565b6040518082815260200191505060405180910390f35b610808600480803573ffffffffffffffffffffffffffffffffffffffff169060200190919050506126b1565b005b341561081557600080fd5b610841600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050612a9a565b6040518082815260200191505060405180910390f35b341561086257600080fd5b61086a612ab2565b6040518082815260200191505060405180910390f35b341561088b57600080fd5b610893612ab8565b6040518082815260200191505060405180910390f35b34156108b457600080fd5b6108e0600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050612abe565b005b34156108ed57600080fd5b610919600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190505061307d565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b341561096657600080fd5b61096e6130e9565b6040518082815260200191505060405180910390f35b341561098f57600080fd5b6109976130ef565b6040518082815260200191505060405180910390f35b34156109b857600080fd5b6109e4600480803573ffffffffffffffffffffffffffffffffffffffff169060200190919050506130f5565b604051808215151515815260200191505060405180910390f35b3415610a0957600080fd5b610a1161314e565b6040518082815260200191505060405180910390f35b3415610a3257600080fd5b610a3a613154565b6040518082815260200191505060405180910390f35b3415610a5b57600080fd5b610a87600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050613161565b005b3415610a9457600080fd5b610ab560048080359060200190820180359060200191909192905050613782565b005b3415610ac257600080fd5b610aca613837565b6040518082815260200191505060405180910390f35b6000600a543410151515610af357600080fd5b6000600360003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000208054600181600116156101000203166002900490501415156111145781600160008273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060000160149054906101000a900460ff16151515610bad57600080fd5b610c0234600160008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206001015461383d90919063ffffffff16565b915060088054806001018281610c189190613874565b9160005260206000209001600085909190916101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550506060604051908101604052803373ffffffffffffffffffffffffffffffffffffffff16815260200160011515815260200183815250600160008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008201518160000160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555060208201518160000160146101000a81548160ff02191690831515021790555060408201518160010155905050610de134600160008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060020160003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205461383d90919063ffffffff16565b600160008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060020160003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610e7a600160095461383d90919063ffffffff16565b6009819055506000600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020805490501415610f2f5760078054806001018281610edf9190613874565b9160005260206000209001600033909190916101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550505b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000208054806001018281610f809190613874565b9160005260206000209001600085909190916101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050600260008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002080548060010182816110209190613874565b9160005260206000209001600033909190916101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550507f7635f1d87b47fba9f2b09e56eb4be75cca030e0cb179c1602ac9261d39a8f5c1338434604051808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001828152602001935050505060405180910390a150611720565b6000600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002080549050111561171f5781600160008273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060000160149054906101000a900460ff161515156111bc57600080fd5b61121134600160008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206001015461383d90919063ffffffff16565b9150600880548060010182816112279190613874565b9160005260206000209001600085909190916101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550506060604051908101604052803373ffffffffffffffffffffffffffffffffffffffff16815260200160011515815260200183815250600160008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008201518160000160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555060208201518160000160146101000a81548160ff021916908315150217905550604082015181600101559050506113f034600160008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060020160003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205461383d90919063ffffffff16565b600160008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060020160003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550611489600160095461383d90919063ffffffff16565b6009819055506000600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002080549050141561153e57600780548060010182816114ee9190613874565b9160005260206000209001600033909190916101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550505b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020805480600101828161158f9190613874565b9160005260206000209001600085909190916101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050600260008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020805480600101828161162f9190613874565b9160005260206000209001600033909190916101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550507f7635f1d87b47fba9f2b09e56eb4be75cca030e0cb179c1602ac9261d39a8f5c1338434604051808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001828152602001935050505060405180910390a1505b5b5050565b60078181548110151561173357fe5b90600052602060002090016000915054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b6000828280600160008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060020160003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101515156117f557600080fd5b3373ffffffffffffffffffffffffffffffffffffffff16600160008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060000160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16141561192e57600a5461192082600160008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060020160003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205461385b90919063ffffffff16565b1015151561192d57600080fd5b5b61198384600160008873ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206001015461385b90919063ffffffff16565b600160008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060010181905550611a5b84600160008873ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060020160003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205461385b90919063ffffffff16565b600160008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060020160003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550611af343600e5461383d90919063ffffffff16565b9250611b5a846000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060000160008681526020019081526020016000205461383d90919063ffffffff16565b6000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206000016000858152602001908152602001600020819055506000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206001018054806001018281611c0391906138a0565b9160005260206000209001600085909190915055507faa0e554f781c3c3b2be110a0557f260f11af9a8aa2c64bc1e7a31dbb21e32fa2338686604051808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001828152602001935050505060405180910390a15050505050565b611cc66138cc565b6008805480602002602001604051908101604052809291908181526020018280548015611d4857602002820191906000526020600020905b8160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019060010190808311611cfe575b5050505050905090565b60056020528160005260406000206020528060005260406000206000915091509054906101000a900460ff1681565b60008060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206000016000838152602001908152602001600020549050919050565b600660205281600052604060002081815481101515611df857fe5b90600052602060002090016000915091509054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b611e336138cc565b600260008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020805480602002602001604051908101604052809291908181526020018280548015611ef257602002820191906000526020600020905b8160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019060010190808311611ea8575b50505050509050919050565b611f066138e0565b6000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600101805480602002602001604051908101604052809291908181526020018280548015611f9157602002820191906000526020600020905b815481526020019060010190808311611f7d575b5050505050905090565b6000600160008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060020160008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054905092915050565b60088181548110151561203457fe5b90600052602060002090016000915054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b6000828260008211151561207757600080fd5b81431015151561208657600080fd5b60008060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206000016000848152602001908152602001600020541115156120e757600080fd5b816000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206001018281548110151561213657fe5b90600052602060002090015414151561214e57600080fd5b6000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060000160008681526020019081526020016000205492506000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206000016000868152602001908152602001600020600090556000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206001018481548110151561224757fe5b9060005260206000209001600090553373ffffffffffffffffffffffffffffffffffffffff166108fc849081150290604051600060405180830381858888f19350505050151561229657600080fd5b7ff279e6a1f5e320cca91135676d9cb6e44ca8a08c0b88342bcdb1144f6511b568338685604051808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001838152602001828152602001935050505060405180910390a15050505050565b6123186138f4565b612321826130f5565b1561240d57600360006123338461307d565b73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000208054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156124015780601f106123d657610100808354040283529160200191612401565b820191906000526020600020905b8154815290600101906020018083116123e457829003601f168201915b505050505090506124e8565b600360008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000208054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156124e05780601f106124b5576101008083540402835291602001916124e0565b820191906000526020600020905b8154815290600101906020018083116124c357829003601f168201915b505050505090505b919050565b60036020528060005260406000206000915090508054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156125955780601f1061256a57610100808354040283529160200191612595565b820191906000526020600020905b81548152906001019060200180831161257857829003601f168201915b505050505081565b6000600160008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600101549050919050565b60008082600160008273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060000160149054906101000a900460ff16151561264857600080fd5b6126518461307d565b915061265b613154565b6064600460008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054028115156126a757fe5b0492505050919050565b600b5434101515156126c257600080fd5b80600160008273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060000160149054906101000a900460ff16151561271e57600080fd5b61277334600160008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206001015461383d90919063ffffffff16565b600160008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600101819055506000600160008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060020160003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205414156128e257600260008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002080548060010182816128929190613874565b9160005260206000209001600033909190916101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550505b61297434600160008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060020160003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205461383d90919063ffffffff16565b600160008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060020160003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055507f66a9138482c99e9baf08860110ef332cc0c23b4a199a53593d8db0fc8f96fbfc338334604051808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001828152602001935050505060405180910390a15050565b60046020528060005260406000206000915090505481565b60095481565b600e5481565b6000806000833373ffffffffffffffffffffffffffffffffffffffff16600160008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060000160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16141515612b6057600080fd5b84600160008273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060000160149054906101000a900460ff161515612bbc57600080fd5b6000600160008873ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060000160146101000a81548160ff021916908315150217905550612c2d600160095461385b90919063ffffffff16565b600981905550600094505b600880549050851015612d02578573ffffffffffffffffffffffffffffffffffffffff16600886815481101515612c6b57fe5b906000526020600020900160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff161415612cf557600885815481101515612cc257fe5b906000526020600020900160006101000a81549073ffffffffffffffffffffffffffffffffffffffff0219169055612d02565b8480600101955050612c38565b600160008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060020160003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020549350612dd984600160008973ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206001015461385b90919063ffffffff16565b600160008873ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600101819055506000600160008873ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060020160003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550612eb943600d5461383d90919063ffffffff16565b9250612f20846000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060000160008681526020019081526020016000205461383d90919063ffffffff16565b6000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206000016000858152602001908152602001600020819055506000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206001018054806001018281612fc991906138a0565b9160005260206000209001600085909190915055507f4edf3e325d0063213a39f9085522994a1c44bea5f39e7d63ef61260a1e58c6d33387604051808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019250505060405180910390a1505050505050565b6000600160008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060000160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff169050919050565b600c5481565b600d5481565b6000600160008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060000160149054906101000a900460ff169050919050565b600a5481565b6000600780549050905090565b60008060008033600160008273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060000160149054906101000a900460ff1615156131c357600080fd5b85600160008273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060000160149054906101000a900460ff16151561321f57600080fd5b6132283361307d565b95506132338761307d565b9450600560008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff161515156132cb57600080fd5b6001600560008873ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff0219169083151502179055506001600460008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008282540192505081905550604b6133b8613154565b6064600460008973ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540281151561340457fe5b0410151561377957600093505b600880549050841015613778578473ffffffffffffffffffffffffffffffffffffffff1661347860088681548110151561344757fe5b906000526020600020900160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1661307d565b73ffffffffffffffffffffffffffffffffffffffff16141561376b576134aa600160095461385b90919063ffffffff16565b6009819055506008848154811015156134bf57fe5b906000526020600020900160006101000a81549073ffffffffffffffffffffffffffffffffffffffff02191690556001600060088681548110151561350057fe5b906000526020600020900160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600080820160006101000a81549073ffffffffffffffffffffffffffffffffffffffff02191690556000820160146101000a81549060ff021916905560018201600090555050600360008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006135f79190613908565b600660008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006136429190613950565b600460008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009055600092505b60078054905083101561376a578473ffffffffffffffffffffffffffffffffffffffff166007848154811015156136bd57fe5b906000526020600020900160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16141561375d5760078381548110151561371457fe5b906000526020600020900160006101000a81549073ffffffffffffffffffffffffffffffffffffffff021916905560078054809190600190036137579190613971565b5061376a565b828060010193505061368a565b5b8380600101945050613411565b5b50505050505050565b6000600360003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000208054600181600116156101000203166002900490501415156137e457600080fd5b8181600360003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020919061383292919061399d565b505050565b600b5481565b600080828401905083811015151561385157fe5b8091505092915050565b600082821115151561386957fe5b818303905092915050565b81548183558181151161389b5781836000526020600020918201910161389a9190613a1d565b5b505050565b8154818355818115116138c7578183600052602060002091820191016138c69190613a1d565b5b505050565b602060405190810160405280600081525090565b602060405190810160405280600081525090565b602060405190810160405280600081525090565b50805460018160011615610100020316600290046000825580601f1061392e575061394d565b601f01602090049060005260206000209081019061394c9190613a1d565b5b50565b508054600082559060005260206000209081019061396e9190613a1d565b50565b815481835581811511613998578183600052602060002091820191016139979190613a1d565b5b505050565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f106139de57803560ff1916838001178555613a0c565b82800160010185558215613a0c579182015b82811115613a0b5782358255916020019190600101906139f0565b5b509050613a199190613a1d565b5090565b613a3f91905b80821115613a3b576000816000905550600101613a23565b5090565b905600a165627a7a72305820a3d30674c84b59fda761ae8645ee6607b3ddb68bd16d65427495d94bd5b2ffa70029 \ No newline at end of file diff --git a/contracts/validator/contract/XDCValidator.sol b/contracts/validator/contract/XDCValidator.sol index e35159507a..73a8dea5d9 100644 --- a/contracts/validator/contract/XDCValidator.sol +++ b/contracts/validator/contract/XDCValidator.sol @@ -1,54 +1,8 @@ pragma solidity ^0.4.21; -// This contract is under development. -// Refer to readme for further details. +import "./libs/SafeMath.sol"; - -library SafeMath { - - /** - * @dev Multiplies two numbers, throws on overflow. - */ - function mul(uint256 a, uint256 b) internal pure returns (uint256) { - if (a == 0) { - return 0; - } - uint256 c = a * b; - assert(c / a == b); - return c; - } - - /** - * @dev Integer division of two numbers, truncating the quotient. - */ - function div(uint256 a, uint256 b) internal pure returns (uint256) { - // assert(b > 0); // Solidity automatically throws when dividing by 0 - // uint256 c = a / b; - // assert(a == b * c + a % b); // There is no case in which this doesn't hold - return a / b; - } - - /** - * @dev Subtracts two numbers, throws on overflow (i.e. if subtrahend is greater than minuend). - */ - function sub(uint256 a, uint256 b) internal pure returns (uint256) { - assert(b <= a); - return a - b; - } - - /** - * @dev Adds two numbers, throws on overflow. - */ - function add(uint256 a, uint256 b) internal pure returns (uint256) { - uint256 c = a + b; - assert(c >= a); - return c; - } -} - - - -contract XDCValidator { +contract XDCalidator { using SafeMath for uint256; event Vote(address _voter, address _candidate, uint256 _cap); @@ -73,14 +27,6 @@ contract XDCValidator { mapping(address => ValidatorState) validatorsState; mapping(address => address[]) voters; - - // Mapping structures added for KYC feature. - mapping(address => string) public KYCString; - mapping(address => uint) public invalidKYCCount; - mapping(address => mapping(address => bool)) public hasVotedInvalid; - mapping(address => address[]) public ownerToCandidate; - address[] public owners; - address[] public candidates; uint256 public candidateCount = 0; @@ -91,26 +37,16 @@ contract XDCValidator { uint256 public voterWithdrawDelay; modifier onlyValidCandidateCap { - // anyone can deposit X XDC to become a candidate + // anyone can deposit X XDCto become a candidate require(msg.value >= minCandidateCap); _; } modifier onlyValidVoterCap { - require(msg.value >= minVoterCap); _; } - modifier onlyKYCWhitelisted { - if(bytes(KYCString[msg.sender]).length != 0) - {_;} - else{ - if (ownerToCandidate[msg.sender].length > 0) - {_;} - } - } - modifier onlyOwner(address _candidate) { require(validatorsState[_candidate].owner == msg.sender); _; @@ -147,7 +83,7 @@ contract XDCValidator { _; } - function XDCValidator ( + function XDCalidator ( address[] _candidates, uint256[] _caps, address _firstOwner, @@ -163,7 +99,7 @@ contract XDCValidator { candidateWithdrawDelay = _candidateWithdrawDelay; voterWithdrawDelay = _voterWithdrawDelay; candidateCount = _candidates.length; - owners.push(_firstOwner); + for (uint256 i = 0; i < _candidates.length; i++) { candidates.push(_candidates[i]); validatorsState[_candidates[i]] = ValidatorState({ @@ -172,20 +108,11 @@ contract XDCValidator { cap: _caps[i] }); voters[_candidates[i]].push(_firstOwner); - ownerToCandidate[_firstOwner].push(_candidates[i]); validatorsState[_candidates[i]].voters[_firstOwner] = minCandidateCap; } } - - // uploadKYC : anyone can upload a KYC; its not equivalent to becoming an owner. - function uploadKYC(string kychash) external { - require(bytes(KYCString[msg.sender]).length==0); - KYCString[msg.sender]=kychash; - } - - // propose : any non-candidate who has uploaded its KYC can become an owner by proposing a candidate. - function propose(address _candidate) external payable onlyValidCandidateCap onlyKYCWhitelisted onlyNotCandidate(_candidate) { + function propose(address _candidate) external payable onlyValidCandidateCap onlyNotCandidate(_candidate) { uint256 cap = validatorsState[_candidate].cap.add(msg.value); candidates.push(_candidate); validatorsState[_candidate] = ValidatorState({ @@ -195,11 +122,6 @@ contract XDCValidator { }); validatorsState[_candidate].voters[msg.sender] = validatorsState[_candidate].voters[msg.sender].add(msg.value); candidateCount = candidateCount.add(1); - if (ownerToCandidate[msg.sender].length ==0){ - owners.push(msg.sender); - - } - ownerToCandidate[msg.sender].push(_candidate); voters[_candidate].push(msg.sender); emit Propose(msg.sender, _candidate, msg.value); } @@ -276,59 +198,6 @@ contract XDCValidator { emit Resign(msg.sender, _candidate); } - // voteInvalidKYC : any candidate can vote for invalid KYC i.e. a particular candidate's owner has uploaded a bad KYC. - // On securing 75% votes against an owner ( not candidate ), owner & all its candidates will lose their funds. - function voteInvalidKYC(address _invalidCandidate) onlyValidCandidate(msg.sender) onlyValidCandidate(_invalidCandidate) public { - address candidateOwner = getCandidateOwner(msg.sender); - address _invalidMasternode = getCandidateOwner(_invalidCandidate); - require(!hasVotedInvalid[candidateOwner][_invalidMasternode]); - hasVotedInvalid[candidateOwner][_invalidMasternode] = true; - invalidKYCCount[_invalidMasternode] += 1; - if( invalidKYCCount[_invalidMasternode]*100/getOwnerCount() >= 75 ){ - // 75% owners say that the KYC is invalid - for (uint i=0;i 0 { + totalVoterReward := new(big.Int).Mul(totalReward, new(big.Int).SetUint64(common.RewardVoterPercent)) + totalVoterReward = new(big.Int).Div(totalVoterReward, new(big.Int).SetUint64(100)) + totalCap := new(big.Int) + // Get voters capacities. + voterCaps := make(map[common.Address]*big.Int) + for _, voteAddr := range voters { + var voterCap *big.Int + + voterCap, err = validator.GetVoterCap(opts, masterAddr, voteAddr) + if err != nil { + log.Crit("Fail to get vote capacity", "error", err) + } + + totalCap.Add(totalCap, voterCap) + voterCaps[voteAddr] = voterCap + } + if totalCap.Cmp(new(big.Int).SetInt64(0)) > 0 { + for addr, voteCap := range voterCaps { + // Only valid voter has cap > 0. + if voteCap.Cmp(new(big.Int).SetInt64(0)) > 0 { + rcap := new(big.Int).Mul(totalVoterReward, voteCap) + rcap = new(big.Int).Div(rcap, totalCap) + if balances[addr] != nil { + balances[addr].Add(balances[addr], rcap) + } else { + balances[addr] = rcap + } + } + } + } + } + + foudationReward := new(big.Int).Mul(totalReward, new(big.Int).SetInt64(common.RewardFoundationPercent)) + foudationReward = new(big.Int).Div(foudationReward, new(big.Int).SetInt64(100)) + balances[foudationWalletAddr] = foudationReward + + jsonHolders, err := json.Marshal(balances) + if err != nil { + log.Error("Fail to parse json holders", "error", err) + return nil, err + } + log.Info("Holders reward", "holders", string(jsonHolders), "master node", masterAddr.String()) + + return balances, nil +} + +func GetCandidatesOwnerBySigner(validator *contractValidator.XDCValidator, signerAddr common.Address) common.Address { + owner := signerAddr + opts := new(bind.CallOpts) + owner, err := validator.GetCandidateOwner(opts, signerAddr) + if err != nil { + log.Error("Fail get candidate owner", "error", err) + return owner + } + + return owner +} diff --git a/contracts/validatorReader.go b/contracts/validatorReader.go new file mode 100644 index 0000000000..517103019d --- /dev/null +++ b/contracts/validatorReader.go @@ -0,0 +1,88 @@ +package contracts + +import ( + "math/big" + + "github.com/ethereum/go-ethereum/accounts/abi" + "github.com/ethereum/go-ethereum/common" + "github.com/ethereum/go-ethereum/core/state" + "github.com/ethereum/go-ethereum/crypto" +) + +var ( + slotValidatorMapping = map[string]uint64{ + "withdrawsState": 0, + "validatorsState": 1, + "voters": 2, + "candidates": 3, + "candidateCount": 4, + "minCandidateCap": 5, + "minVoterCap": 6, + "maxValidatorNumber": 7, + "candidateWithdrawDelay": 8, + "voterWithdrawDelay": 9, + } +) + +func GetCandidates(statedb *state.StateDB) []common.Address { + slot := slotValidatorMapping["candidates"] + slotHash := common.BigToHash(new(big.Int).SetUint64(slot)) + arrLength := statedb.GetState(common.HexToAddress(common.MasternodeVotingSMC), slotHash) + keys := []common.Hash{} + for i := uint64(0); i < arrLength.Big().Uint64(); i++ { + key := getLocDynamicArrAtElement(slotHash, i, 1) + keys = append(keys, key) + } + rets := []common.Address{} + for _, key := range keys { + ret := statedb.GetState(common.HexToAddress(common.MasternodeVotingSMC), key) + rets = append(rets, common.HexToAddress(ret.Hex())) + } + return rets +} + +func GetCandidateOwner(statedb *state.StateDB, candidate common.Address) common.Address { + slot := slotValidatorMapping["validatorsState"] + // validatorsState[_candidate].owner; + locValidatorsState := getLocMappingAtKey(candidate.Hash(), slot) + locCandidateOwner := locValidatorsState.Add(locValidatorsState, new(big.Int).SetUint64(uint64(0))) + ret := statedb.GetState(common.HexToAddress(common.MasternodeVotingSMC), common.BigToHash(locCandidateOwner)) + return common.HexToAddress(ret.Hex()) +} + +func GetCandidateCap(statedb *state.StateDB, parsed abi.ABI, candidate common.Address) string { + slot := slotValidatorMapping["validatorsState"] + // validatorsState[_candidate].cap; + locValidatorsState := getLocMappingAtKey(candidate.Hash(), slot) + locCandidateCap := locValidatorsState.Add(locValidatorsState, new(big.Int).SetUint64(uint64(1))) + ret := statedb.GetState(common.HexToAddress(common.MasternodeVotingSMC), common.BigToHash(locCandidateCap)) + return ret.Hex() +} + +func GetVoters(statedb *state.StateDB, candidate common.Address) []common.Address { + //mapping(address => address[]) voters; + slot := slotValidatorMapping["voters"] + locVoters := getLocMappingAtKey(candidate.Hash(), slot) + arrLength := statedb.GetState(common.HexToAddress(common.MasternodeVotingSMC), common.BigToHash(locVoters)) + keys := []common.Hash{} + for i := uint64(0); i < arrLength.Big().Uint64(); i++ { + key := getLocDynamicArrAtElement(common.BigToHash(locVoters), i, 1) + keys = append(keys, key) + } + rets := []common.Address{} + for _, key := range keys { + ret := statedb.GetState(common.HexToAddress(common.MasternodeVotingSMC), key) + rets = append(rets, common.HexToAddress(ret.Hex())) + } + + return rets +} + +func GetVoterCap(state *state.StateDB, candidate, voter common.Address) *big.Int { + slot := slotValidatorMapping["validatorsState"] + locValidatorsState := getLocMappingAtKey(candidate.Hash(), slot) + locCandidateVoters := locValidatorsState.Add(locValidatorsState, new(big.Int).SetUint64(uint64(2))) + retByte := crypto.Keccak256(voter.Hash().Bytes(), common.BigToHash(locCandidateVoters).Bytes()) + ret := state.GetState(common.HexToAddress(common.MasternodeVotingSMC), common.BytesToHash(retByte)) + return ret.Big() +}