Add an account builder [#3587]

cmd/accumulated/cmd_init_network.go

@@ -207,17 +207,17 @@ func initNetworkLocalFS(cmd *cobra.Command, netInit *accumulated.NetworkInit) {
 
 func buildGenesis(network *accumulated.NetworkInit) map[string][]byte {
 	var factomAddresses func() (io.Reader, error)
-	var snapshots []func() (ioutil2.SectionReader, error)
+	var snapshots []func(*core.GlobalValues) (ioutil2.SectionReader, error)
 	if flagInit.FactomAddresses != "" {
 		factomAddresses = func() (io.Reader, error) { return os.Open(flagInit.FactomAddresses) }
 	}
 	for _, filename := range flagInit.Snapshots {
 		filename := filename // See docs/developer/rangevarref.md
-		snapshots = append(snapshots, func() (ioutil2.SectionReader, error) { return os.Open(filename) })
+		snapshots = append(snapshots, func(*core.GlobalValues) (ioutil2.SectionReader, error) { return os.Open(filename) })
 	}
 	if flagInit.FaucetSeed != "" {
 		b := createFaucet(strings.Split(flagInit.FaucetSeed, " "))
-		snapshots = append(snapshots, func() (ioutil2.SectionReader, error) {
+		snapshots = append(snapshots, func(*core.GlobalValues) (ioutil2.SectionReader, error) {
 			return ioutil2.NewBuffer(b), nil
 		})
 	}

cmd/accumulated/run/devnet.go

@@ -23,6 +23,7 @@ import (
 	"github.com/multiformats/go-multiaddr"
 	"gitlab.com/accumulatenetwork/accumulate/exp/faucet"
 	"gitlab.com/accumulatenetwork/accumulate/exp/ioutil"
+	"gitlab.com/accumulatenetwork/accumulate/internal/core"
 	"gitlab.com/accumulatenetwork/accumulate/internal/logging"
 	"gitlab.com/accumulatenetwork/accumulate/internal/node/genesis"
 	"gitlab.com/accumulatenetwork/accumulate/pkg/errors"
@@ -262,8 +263,8 @@ func (d *DevnetConfiguration) buildGenesis(inst *Instance, cfg *Config, nodes []
 			GenesisGlobals:  v,
 			OperatorKeys:    [][]byte{mainPubKey},
 			ConsensusParams: tmtypes.DefaultConsensusParams(),
-			Snapshots: []func() (ioutil.SectionReader, error){
-				func() (ioutil.SectionReader, error) { return ioutil.NewBuffer(faucetSnapshot), nil },
+			Snapshots: []func(*core.GlobalValues) (ioutil.SectionReader, error){
+				func(*core.GlobalValues) (ioutil.SectionReader, error) { return ioutil.NewBuffer(faucetSnapshot), nil },
 			},
 		})
 		if err != nil {

internal/core/execute/multi/multi_test.go

@@ -36,7 +36,7 @@ func TestVersionSwitch(t *testing.T) {
 	sim := NewSim(t,
 		simulator.SimpleNetwork(t.Name(), 3, 1), // TODO Change to 3 after fixing anchor healing
 		simulator.GenesisWith(GenesisTime, g),
-		simulator.SkipProposalCheck, // FIXME should not be necessary
+		simulator.SkipProposalCheck(), // FIXME should not be necessary
 	)
 
 	alice := AccountUrl("alice")

internal/core/execute/v1/simulator/simulator.go

@@ -50,7 +50,6 @@ type SimulatorOptions struct {
 	LogLevels       string
 	OpenDB          func(partition string, nodeIndex int, logger log.Logger) *database.Database
 	FactomAddresses func() (io.Reader, error)
-	Snapshots       []func() (ioutil2.SectionReader, error)
 }
 
 type Simulator struct {
@@ -316,7 +315,7 @@ func (s *Simulator) InitFromGenesisWith(values *core.GlobalValues) {
 	// The simulator only runs one DNN so set the threshold low
 	values.Globals.ValidatorAcceptThreshold.Set(1, 1000)
 
-	genDocs, err := accumulated.BuildGenesisDocs(s.netInit, values, GenesisTime, s.Logger, s.opts.FactomAddresses, s.opts.Snapshots)
+	genDocs, err := accumulated.BuildGenesisDocs(s.netInit, values, GenesisTime, s.Logger, s.opts.FactomAddresses, nil)
 	require.NoError(s, err)
 
 	// Execute bootstrap after the entire network is known

internal/node/daemon/init.go

@@ -196,7 +196,7 @@ func ConfigureNodePorts(node *NodeInit, cfg *config.Config, part protocol.Partit
 	cfg.Accumulate.API.ListenAddress = node.Listen().Scheme("http").PartitionType(part).AccumulateAPI().String()
 }
 
-func BuildGenesisDocs(network *NetworkInit, globals *core.GlobalValues, time time.Time, logger log.Logger, factomAddresses func() (io.Reader, error), snapshots []func() (ioutil2.SectionReader, error)) (map[string][]byte, error) {
+func BuildGenesisDocs(network *NetworkInit, globals *core.GlobalValues, time time.Time, logger log.Logger, factomAddresses func() (io.Reader, error), snapshots []func(*core.GlobalValues) (ioutil2.SectionReader, error)) (map[string][]byte, error) {
 	docs := map[string][]byte{}
 	var operators [][]byte
 	netinfo := new(protocol.NetworkDefinition)

internal/node/genesis/bootstrap.go

@@ -55,7 +55,7 @@ type InitOpts struct {
 
 	// Preloaded data
 	FactomAddresses func() (io.Reader, error)
-	Snapshots       []func() (ioutil2.SectionReader, error)
+	Snapshots       []func(*core.GlobalValues) (ioutil2.SectionReader, error)
 
 	// Flags
 	IncludeHistoryFromSnapshots bool
@@ -64,6 +64,7 @@ type InitOpts struct {
 func Init(snapshotWriter io.WriteSeeker, opts InitOpts) error {
 	// Initialize globals
 	gg := core.NewGlobals(opts.GenesisGlobals)
+	opts.GenesisGlobals = gg
 
 	// Build the routing table
 	var bvns []string
@@ -460,7 +461,7 @@ func (b *bootstrap) unpackSnapshots() error {
 	var accounts []*url.URL
 	seen := map[[32]byte]bool{}
 	for _, open := range b.Snapshots {
-		file, err := open()
+		file, err := open(b.GenesisGlobals)
 		if err != nil {
 			return errors.UnknownError.Wrap(err)
 		}
@@ -485,6 +486,11 @@ func (b *bootstrap) unpackSnapshots() error {
 						return false, nil
 					}
 
+					// Skip system accounts
+					if _, ok := protocol.ParsePartitionUrl(u); ok {
+						return false, nil
+					}
+
 					// Track ACME issued
 					if e.Key.Len() == 3 && e.Key.Get(2) == "Main" {
 						acct, _ := protocol.UnmarshalAccount(e.Value)
@@ -565,7 +571,7 @@ func (b *bootstrap) unpackSnapshots() error {
 
 	// Restore messages
 	for _, open := range b.Snapshots {
-		file, err := open()
+		file, err := open(b.GenesisGlobals)
 		if err != nil {
 			return errors.UnknownError.Wrap(err)
 		}