fluencelabs/tendermint
1
0
Fork 0
mirror of https://github.com/fluencelabs/tendermint synced 2025-06-23 01:41:31 +00:00
Code Issues Projects Releases Wiki Activity

Set Pubkey on vm.Account.

Browse Source
This commit is contained in:
Jae Kwon
2015-03-21 11:08:05 -07:00
parent a040e6bc27
commit ab8ad30648
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
state/vm_app_state.go
View File

@ -20,13 +20,19 @@ func toVMAccount(acc *ac.Account) *vm.Account {
Code: acc.Code, // This is crazy. Code: acc.Code, // This is crazy.
Nonce: uint64(acc.Sequence), Nonce: uint64(acc.Sequence),
StorageRoot: vm.BytesToWord(acc.StorageRoot), StorageRoot: vm.BytesToWord(acc.StorageRoot),
Other: acc.PubKey,
} }
} }
// Converts vm.Account to state.Account struct. // Converts vm.Account to state.Account struct.
func toStateAccount(acc *vm.Account) *ac.Account { func toStateAccount(acc *vm.Account) *ac.Account {
pubKey, ok := acc.Other.(ac.PubKey)
if !ok {
pubKey = ac.PubKeyNil{}
}
return &ac.Account{ return &ac.Account{
Address: acc.Address.Address(), Address: acc.Address.Address(),
PubKey: pubKey,
Balance: acc.Balance, Balance: acc.Balance,
Code: acc.Code, Code: acc.Code,
Sequence: uint(acc.Nonce), Sequence: uint(acc.Nonce),

1
vm/types.go
View File

@ -33,6 +33,7 @@ type Account struct {
Code []byte Code []byte
Nonce uint64 Nonce uint64
StorageRoot Word StorageRoot Word
Other interface{} // For holding all other data.
} }
type Log struct { type Log struct {