Merge pull request #1 from blockpane/release/v1.0.1

Release/v1.0.1

account-form.go

@@ -49,9 +49,9 @@ func NewAccountSearchTab(box chan fyne.Container, account *fio.Account) {
 		return widget.NewVBox(
 			fyne.NewContainerWithLayout(layout.NewFixedGridLayout(fyne.NewSize(RWidth(), 40)),
 				widget.NewHBox(
-					accountSelect,
+					fyne.NewContainerWithLayout(layout.NewFixedGridLayout(accountSelect.MinSize()), accountSelect),
 					accountInput,
-					accountSubmit,
+					fyne.NewContainerWithLayout(layout.NewFixedGridLayout(accountSubmit.MinSize()), accountSubmit),
 				),
 			),
 			layout.NewSpacer(),
@@ -66,9 +66,9 @@ func NewAccountSearchTab(box chan fyne.Container, account *fio.Account) {
 		return widget.NewVBox(
 			fyne.NewContainerWithLayout(layout.NewFixedGridLayout(fyne.NewSize(RWidth(), 40)),
 				widget.NewHBox(
-					accountSelect,
+					fyne.NewContainerWithLayout(layout.NewFixedGridLayout(accountSelect.MinSize()), accountSelect),
 					accountInput,
-					accountSubmit,
+					fyne.NewContainerWithLayout(layout.NewFixedGridLayout(accountSubmit.MinSize()), accountSubmit),
 				),
 			),
 			fyne.NewContainerWithLayout(layout.NewVBoxLayout(),

action-form.go

@@ -22,23 +22,27 @@ var (
 	FormState    = NewAbi(0)
 	bombsAway    = &widget.Button{}
 	txWindowOpts = &txResultOpts{
-		window: App.NewWindow("Tx Results"),
 		gone:   true,
 	}
 )
 
 func ResetTxResult() {
-	if txWindowOpts.window != nil && !txWindowOpts.gone {
+	if txWindowOpts.window != nil {
+		txWindowOpts.window.Hide()
 		txWindowOpts.window.Close()
 	}
-	txWindowOpts.window = nil
 	txWindowOpts.window = App.NewWindow("Tx Results")
 	txWindowOpts.gone = true
 	txWindowOpts.window.SetContent(layout.NewSpacer())
 	txWindowOpts.window.Show()
 	go func() {
-		time.Sleep(time.Second)
-		txWindowOpts.window.Hide()
+		for {
+			time.Sleep(10 * time.Millisecond)
+			if txWindowOpts.window.Content().Visible() {
+				txWindowOpts.window.Hide()
+				return
+			}
+		}
 	}()
 }
 
@@ -247,8 +251,6 @@ func GetAbiForm(action string, account *fio.Account, api *fio.API, opts *fio.TxO
 	apiEndpoint.SetSelected("/v1/chain/push_transaction")
 	apiEndpoint.Refresh()
 
-	txWindowOpts.window.Resize(fyne.NewSize(txW, txH))
-
 	// multisig options:
 	randProposal := func() string {
 		var s string

cmd/cryptonym-wallet/main.go

@@ -64,7 +64,7 @@ var (
 	uriContent    = uriInput(true)
 	uriContainer  = &fyne.Container{}
 	ready         = false
-	connectedChan = make(chan bool, 1)
+	connectedChan = make(chan bool)
 	p             = message.NewPrinter(language.English)
 	keyBox        = &widget.Box{}
 	serverInfoCh  = make(chan explorer.ServerInfo)
@@ -382,7 +382,7 @@ func refreshInfo(deadline time.Duration) (string, bool) {
 	d := time.Now().Add(deadline)
 	ctx, cancel := context.WithDeadline(context.Background(), d)
 	defer cancel()
-	resultChan := make(chan string, 1)
+	resultChan := make(chan string)
 	go func() {
 		clientMux.Lock()
 		defer clientMux.Unlock()
@@ -445,7 +445,6 @@ func reconnect(account *fio.Account) (result bool) {
 		time.Sleep(2 * time.Second)
 		explorer.BalanceChan <- true
 	}()
-	explorer.ResetTxResult()
 	result = true
 	return
 }
@@ -1023,7 +1022,11 @@ func keyBoxContent() *widget.Box {
 					actor,
 					myFioAddress,
 				),
-				widget.NewHBox(balanceLabel, balanceButton, loadButton),
+				widget.NewHBox(
+					balanceLabel,
+					fyne.NewContainerWithLayout(layout.NewFixedGridLayout(balanceButton.MinSize()), balanceButton),
+					fyne.NewContainerWithLayout(layout.NewFixedGridLayout(loadButton.MinSize()), loadButton),
+				),
 			),
 		),
 	)

fuzzer/simple.go

@@ -8,9 +8,9 @@ import (
 	"encoding/base64"
 	"encoding/hex"
 	"fmt"
+	errs "github.com/blockpane/cryptonym/errLog"
 	"github.com/btcsuite/btcd/chaincfg"
 	"github.com/btcsuite/btcutil"
-	errs "github.com/blockpane/cryptonym/errLog"
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/fioprotocol/fio-go"
 	"github.com/fioprotocol/fio-go/eos"

go.sum

@@ -17,11 +17,13 @@ github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6L
 github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk=
 github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/Kodeworks/golang-image-ico v0.0.0-20141118225523-73f0f4cfade9 h1:1ltqoej5GtaWF8jaiA49HwsZD459jqm9YFz9ZtMFpQA=
 github.com/Kodeworks/golang-image-ico v0.0.0-20141118225523-73f0f4cfade9/go.mod h1:7uhhqiBaR4CpN0k9rMjOtjpcfGd6DG2m04zQxKnWQ0I=
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
 github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg=
 github.com/VictoriaMetrics/fastcache v1.5.7/go.mod h1:ptDBkNMQI4RtmVo8VS/XwRY6RoTu1dAWCbrk+6WsEM8=
 github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII=
+github.com/akavel/rsrc v0.8.0 h1:zjWn7ukO9Kc5Q62DOJCcxGpXC18RawVtYAGdz2aLlfw=
 github.com/akavel/rsrc v0.8.0/go.mod h1:uLoCtb9J+EyAqh+26kdrTgmzRBFPGOolLWKpdxkKq+c=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
@@ -102,11 +104,13 @@ github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpO
 github.com/huin/goupnp v1.0.0/go.mod h1:n9v9KO1tAxYH82qOn+UTIFQDmx5n1Zxd/ClZDMX7Bnc=
 github.com/huin/goutil v0.0.0-20170803182201-1ca381bf3150/go.mod h1:PpLOETDnJ0o3iZrZfqZzyLl6l7F3c6L1oWn7OICBi6o=
 github.com/influxdata/influxdb v1.2.3-0.20180221223340-01288bdb0883/go.mod h1:qZna6X/4elxqT3yI9iZYdZrWWdeFOOprn86kgg4+IzY=
+github.com/jackmordaunt/icns v0.0.0-20181231085925-4f16af745526 h1:NfuKjkj/Xc2z1xZIj+EmNCm5p1nKJPyw3F4E20usXvg=
 github.com/jackmordaunt/icns v0.0.0-20181231085925-4f16af745526/go.mod h1:UQkeMHVoNcyXYq9otUupF7/h/2tmHlhrS2zw7ZVvUqc=
 github.com/jackpal/go-nat-pmp v1.0.2-0.20160603034137-1fa385a6f458/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc=
 github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
 github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
 github.com/josephspurrier/goversioninfo v0.0.0-20190124120936-8611f5a5ff3f/go.mod h1:eJTEwMjXb7kZ633hO3Ln9mBUCOjX2+FlTljvpl9SYdE=
+github.com/josephspurrier/goversioninfo v0.0.0-20200309025242-14b0ab84c6ca h1:ozPUX9TKQZVek4lZWYRsQo7uS8vJ+q4OOHvRhHiCLfU=
 github.com/josephspurrier/goversioninfo v0.0.0-20200309025242-14b0ab84c6ca/go.mod h1:eJTEwMjXb7kZ633hO3Ln9mBUCOjX2+FlTljvpl9SYdE=
 github.com/jrick/logrotate v1.0.0/go.mod h1:LNinyqDIJnpAur+b8yyulnQw/wDuN1+BYKlTRt3OuAQ=
 github.com/julienschmidt/httprouter v1.1.1-0.20170430222011-975b5c4c7c21/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
@@ -120,6 +124,7 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
+github.com/lucor/goinfo v0.0.0-20200401173949-526b5363a13a h1:4djPngMU3ttoFCf6DOgPNQYmxyNmRRmpLg4/uz2TTEg=
 github.com/lucor/goinfo v0.0.0-20200401173949-526b5363a13a/go.mod h1:ORP3/rB5IsulLEBwQZCJyyV6niqmI7P4EWSmkug+1Ng=
 github.com/mattn/go-colorable v0.1.0/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-ieproxy v0.0.0-20190610004146-91bb50d98149/go.mod h1:31jz6HNzdxOmlERGGEc4v/dMssOfmp2p5bT/okiKFFc=

init.go

@@ -35,7 +35,7 @@ var (
 	actionEndPointActive    = "/v1/chain/push_transaction"
 	apiEndPointActive       = "/v1/chain/get_info"
 	p                       = message.NewPrinter(language.English)
-	RepaintChan             = make(chan bool, 1)
+	RepaintChan             = make(chan bool)
 	PasswordVisible         bool
 	SettingsLoaded          = make(chan *FioSettings)
 	Settings                = DefaultSettings()

key-generator.go

@@ -35,7 +35,7 @@ var imageSize = func() (size int) {
 	return
 }()
 
-var RefreshQr = make(chan bool, 1)
+var RefreshQr = make(chan bool)
 
 func KeyGenTab() *widget.Box {
 
@@ -46,7 +46,7 @@ func KeyGenTab() *widget.Box {
 	var showingPriv bool
 	var err error
 
-	vanityQuit := make(chan bool, 1)
+	vanityQuit := make(chan bool)
 	vanityOpt := &vanityOptions{}
 	vanityOpt.threads = runtime.NumCPU()
 	vanitySearch := widget.NewSelect([]string{"Actor", "Pubkey", "Either"}, func(s string) {

msig-requests.go

@@ -247,17 +247,20 @@ func requestBox(proposer string, requests []*fio.MsigApprovalsInfo, index int, p
 		// actor, fio address, has approved, is produce
 		//hasApproved := theme.CancelIcon()
 		hasApproved := theme.CheckButtonIcon()
+		asterisk := ""
 		if approvers[k] {
 			//hasApproved = theme.ConfirmIcon()
 			hasApproved = theme.CheckButtonCheckedIcon()
 			checked += 1
 			for _, p := range producers.Active.Producers {
 				if p.AccountName == eos.AccountName(k) {
 					top21Count += 1
+					asterisk = "*"
 					break
 				}
 			}
 		}
+		top21Label := widget.NewLabel(asterisk)
 		var firstName string
 		n, ok, _ := api.GetFioNamesForActor(k)
 		if ok && len(n.FioAddresses) > 0 {
@@ -272,6 +275,7 @@ func requestBox(proposer string, requests []*fio.MsigApprovalsInfo, index int, p
 			fyne.NewContainerWithLayout(layout.NewGridLayout(2),
 				widget.NewHBox(
 					layout.NewSpacer(),
+					top21Label,
 					fyne.NewContainerWithLayout(layout.NewFixedGridLayout(fyne.NewSize(32, 32)),
 						canvas.NewImageFromResource(hasApproved),
 					)),