interesting
/
go-ethereum
mirror of https://github.com/ethereum/go-ethereum.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Changed R & S to *big.Int

This commit is contained in:
obscuren 2015-04-04 21:32:24 +02:00
parent 59597d23a5
commit eb8f0b85f7
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/types/transaction.go
View File

@ -24,7 +24,7 @@ type Transaction struct {
Amount *big.Int Amount *big.Int
Payload []byte Payload []byte
V byte V byte
R, S []byte R, S *big.Int
} }
func NewContractCreationTx(amount, gasLimit, gasPrice *big.Int, data []byte) *Transaction { func NewContractCreationTx(amount, gasLimit, gasPrice *big.Int, data []byte) *Transaction {
@ -94,8 +94,8 @@ func (tx *Transaction) To() *common.Address {
func (tx *Transaction) Curve() (v byte, r []byte, s []byte) { func (tx *Transaction) Curve() (v byte, r []byte, s []byte) {
v = byte(tx.V) v = byte(tx.V)
r = common.LeftPadBytes(tx.R, 32) r = common.LeftPadBytes(tx.R.Bytes(), 32)
s = common.LeftPadBytes(tx.S, 32) s = common.LeftPadBytes(tx.S.Bytes(), 32)
return return
} }
@ -118,8 +118,8 @@ func (tx *Transaction) PublicKey() []byte {
} }
func (tx *Transaction) SetSignatureValues(sig []byte) error { func (tx *Transaction) SetSignatureValues(sig []byte) error {
tx.R = sig[:32] tx.R = common.Bytes2Big(sig[:32])
tx.S = sig[32:64] tx.S = common.Bytes2Big(sig[32:64])
tx.V = sig[64] + 27 tx.V = sig[64] + 27
return nil return nil
} }
@ -137,7 +137,7 @@ func (tx *Transaction) SignECDSA(prv *ecdsa.PrivateKey) error {
// TODO: remove // TODO: remove
func (tx *Transaction) RlpData() interface{} { func (tx *Transaction) RlpData() interface{} {
data := []interface{}{tx.AccountNonce, tx.Price, tx.GasLimit, tx.Recipient, tx.Amount, tx.Payload} data := []interface{}{tx.AccountNonce, tx.Price, tx.GasLimit, tx.Recipient, tx.Amount, tx.Payload}
return append(data, tx.V, new(big.Int).SetBytes(tx.R).Bytes(), new(big.Int).SetBytes(tx.S).Bytes()) return append(data, tx.V, tx.R.Bytes(), tx.S.Bytes())
} }
func (tx *Transaction) String() string { func (tx *Transaction) String() string {