Make work source configurable for atto program

Author: codesoap

cmd/atto/config.go

@@ -1,7 +1,7 @@
 package main
 
 var (
-	// The node needs to support the work_generate action. See
+	// The node that is used to interact with the nano network. See
 	// e.g. https://publicnodes.somenano.com to find public nodes
 	// or set up your own node.
 	node = "https://node.somenano.com/proxy"
@@ -10,4 +10,15 @@ var (
 	// opening an accout, but can be changed afterwards. See e.g.
 	// https://nanolooker.com/representatives to find representatives.
 	defaultRepresentative = "nano_1jtx5p8141zjtukz4msp1x93st7nh475f74odj8673qqm96xczmtcnanos1o"
+
+	// workSource specifies where the work for block submission shall
+	// come from. These options are available:
+	// - workSourceLocal: The work is generated on the CPU of the
+	//   current computer.
+	// - workSourceNode: The work is fetched from the node using the
+	//   work_generate action. Make sure that your node supports it.
+	// - workSourceLocalFallback: It is attempted to fetch the work
+	//   from the node, but if this fails, it will be generated on
+	//   the CPU of the current computer.
+	workSource = workSourceLocalFallback
 )

cmd/atto/main.go

@@ -50,6 +50,14 @@ Environment:
 	                          Authentication.
 `
 
+type workSourceType int
+
+const (
+	workSourceLocal workSourceType = iota
+	workSourceNode
+	workSourceLocalFallback
+)
+
 var accountIndexFlag uint
 var yFlag bool
 
@@ -191,7 +199,7 @@ func printBalance() error {
 		if err = block.Sign(privateKey); err != nil {
 			return err
 		}
-		if err = block.FetchWork(node); err != nil {
+		if err = fillWork(&block, node); err != nil {
 			return err
 		}
 		if err = block.Submit(node); err != nil {
@@ -255,7 +263,7 @@ func changeRepresentative() error {
 	if err = block.Sign(privateKey); err != nil {
 		return err
 	}
-	if err = block.FetchWork(node); err != nil {
+	if err = fillWork(&block, node); err != nil {
 		return err
 	}
 	if err = block.Submit(node); err != nil {
@@ -296,7 +304,7 @@ func sendFunds() error {
 	if err = block.Sign(privateKey); err != nil {
 		return err
 	}
-	if err = block.FetchWork(node); err != nil {
+	if err = fillWork(&block, node); err != nil {
 		return err
 	}
 	if err = block.Submit(node); err != nil {

cmd/atto/util.go

@@ -7,6 +7,8 @@ import (
 	"os"
 	"runtime"
 	"strings"
+
+	"github.com/codesoap/atto"
 )
 
 // getSeed returns the first line of the standard input.
@@ -61,3 +63,19 @@ func letUserVerifySend(amount, recipient string) (err error) {
 	}
 	return
 }
+
+func fillWork(block *atto.Block, node string) error {
+	switch workSource {
+	case workSourceLocal:
+		return block.GenerateWork()
+	case workSourceNode:
+		return block.FetchWork(node)
+	case workSourceLocalFallback:
+		if err := block.FetchWork(node); err != nil {
+			fmt.Fprintf(os.Stderr, "Could not fetch work from node (error: %v); generating it on CPU... ", err)
+			return block.GenerateWork()
+		}
+		return nil
+	}
+	return fmt.Errorf("unknown work source")
+}