forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-17 18:30:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

resolve conflicts

Browse source
This commit is contained in:
MestryOmkar 2018-12-04 10:09:52 +05:30
parent 7ca3b22aa8
commit 590bcb448e
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
common/types.go
View file

@ -30,11 +30,16 @@ import (
const ( const (
HashLength = 32 HashLength = 32
AddressLength = 20 AddressLength = 20
MasternodeVotingSMC = "0x0000000000000000000000000000000000000088"
BlockSigners = "0x0000000000000000000000000000000000000089" BlockSigners = "0x0000000000000000000000000000000000000089"
MasternodeVotingSMC = "0x0000000000000000000000000000000000000088"
RandomizeSMC = "0x0000000000000000000000000000000000000090" RandomizeSMC = "0x0000000000000000000000000000000000000090"
FoudationAddr = "0x0000000000000000000000000000000000000068" FoudationAddr = "0x0000000000000000000000000000000000000068"
TeamAddr = "0x0000000000000000000000000000000000000099" TeamAddr = "0x0000000000000000000000000000000000000099"
VoteMethod = "0x6dd7d8ea"
UnvoteMethod = "0x02aa9be2"
ProposeMethod = "0x01267951"
ResignMethod = "0xae6e43f5"
SignMethod = "0xe341eaa4"
) )
var ( var (
@ -45,6 +50,11 @@ var (
// Hash represents the 32 byte Keccak256 hash of arbitrary data. // Hash represents the 32 byte Keccak256 hash of arbitrary data.
type Hash [HashLength]byte type Hash [HashLength]byte
type Vote struct {
Masternode Address
Voter Address
}
func BytesToHash(b []byte) Hash { func BytesToHash(b []byte) Hash {
var h Hash var h Hash
h.SetBytes(b) h.SetBytes(b)
@ -281,4 +291,4 @@ func ExtractAddressFromBytes(bytePenalties []byte) []Address {
copy(penalties[i][:], bytePenalties[i*AddressLength:]) copy(penalties[i][:], bytePenalties[i*AddressLength:])
} }
return penalties return penalties
} }