forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-19 10:22:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 471b46d8c0 into cc2b39bbd1

Browse source
This commit is contained in:
Jared Wasinger 2018-09-03 15:01:47 +00:00 committed by GitHub
commit 8772fd0c5b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
core/gen_genesis_account.go
View file

@ -5,6 +5,8 @@ package core
import ( import (
"encoding/json" "encoding/json"
"errors" "errors"
"fmt"
"io/ioutil"
"math/big" "math/big"
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
@ -39,6 +41,7 @@ func (g GenesisAccount) MarshalJSON() ([]byte, error) {
func (g *GenesisAccount) UnmarshalJSON(input []byte) error { func (g *GenesisAccount) UnmarshalJSON(input []byte) error {
type GenesisAccount struct { type GenesisAccount struct {
Code *hexutil.Bytes `json:"code,omitempty"` Code *hexutil.Bytes `json:"code,omitempty"`
CodeFilePath *string `json:"codeFilePath,omitempty"`
Storage map[storageJSON]storageJSON `json:"storage,omitempty"` Storage map[storageJSON]storageJSON `json:"storage,omitempty"`
Balance *math.HexOrDecimal256 `json:"balance" gencodec:"required"` Balance *math.HexOrDecimal256 `json:"balance" gencodec:"required"`
Nonce *math.HexOrDecimal64 `json:"nonce,omitempty"` Nonce *math.HexOrDecimal64 `json:"nonce,omitempty"`
@ -50,6 +53,15 @@ func (g *GenesisAccount) UnmarshalJSON(input []byte) error {
} }
if dec.Code != nil { if dec.Code != nil {
g.Code = *dec.Code g.Code = *dec.Code
} else if dec.CodeFilePath != nil {
// Check that the file exists
// create an io.Reader with the content of the file and get it as []byte
code, err := ioutil.ReadFile(*dec.CodeFilePath)
if err != nil {
panic(fmt.Sprintf("Could not open file: %v", err))
}
g.Code = code
} }
if dec.Storage != nil { if dec.Storage != nil {
g.Storage = make(map[common.Hash]common.Hash, len(dec.Storage)) g.Storage = make(map[common.Hash]common.Hash, len(dec.Storage))