Merge branch 'release/v1.0.4'

Author: AdamSLevy

go.mod

@@ -7,7 +7,7 @@ require (
 	github.com/AdamSLevy/jsonrpc2/v13 v13.0.1
 	github.com/AdamSLevy/sqlbuilder v0.0.0-20191126201320-5b1948d48973
 	github.com/AdamSLevy/sqlitechangeset v0.0.0-20191210201651-f95453d87aff
-	github.com/Factom-Asset-Tokens/factom v0.0.0-20191121210333-481aa2c19345
+	github.com/Factom-Asset-Tokens/factom v0.0.0-20191221001609-371aa1859711
 	github.com/goji/httpauth v0.0.0-20160601135302-2da839ab0f4d
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/nightlyone/lockfile v0.0.0-20180618180623-0ad87eef1443

go.sum

@@ -12,6 +12,7 @@ github.com/AdamSLevy/jsonrpc2/v13 v13.0.1 h1:hQ5rfCFBQrXQNtvP+2mtH6EmsUAEN61ZF1n
 github.com/AdamSLevy/jsonrpc2/v13 v13.0.1/go.mod h1:8QsYqGKdPEim+n/j9KFTYB2tIj250f044Vxh2XRKhP4=
 github.com/AdamSLevy/pflag v1.0.6-0.20191204180553-73c85c9446e1 h1:dbXTugbutFTRIIj3R5pS6B4l7bmMNzNze9jinhlcGOs=
 github.com/AdamSLevy/pflag v1.0.6-0.20191204180553-73c85c9446e1/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/AdamSLevy/retry v0.0.0-20191017184328-cce921f261f4/go.mod h1:tnApKAJirDWmLW23fTAC3dX91ozZxd2yiyKO1xl4bkc=
 github.com/AdamSLevy/sqlbuilder v0.0.0-20191126201320-5b1948d48973 h1:KjfVykzEEMk3oFZKpImENWPXEcffRUO4mEDHRh0RUiY=
 github.com/AdamSLevy/sqlbuilder v0.0.0-20191126201320-5b1948d48973/go.mod h1:LbOIU3wIapyAARdNLVV8i/Dc/BMD9dcNtJ1F39vuO9Q=
 github.com/AdamSLevy/sqlitechangeset v0.0.0-20191210201651-f95453d87aff h1:1y662ty5r75/4WO0VH5yfmslsIOxGnxQa0Jw9wicGu4=
@@ -20,8 +21,9 @@ github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/Factom-Asset-Tokens/base58 v0.0.0-20181227014902-61655c4dd885 h1:rfy2fwMrOZPqQgjsH7VCreGMSPzcvqQrfjeSs8nf+sY=
 github.com/Factom-Asset-Tokens/base58 v0.0.0-20181227014902-61655c4dd885/go.mod h1:RVXsRSp6VzXw5l1uiGazuf3qo23Qk0h1HzMcQk+X4LE=
-github.com/Factom-Asset-Tokens/factom v0.0.0-20191121210333-481aa2c19345 h1:cj5VO1AkJMzHjAp0lDG966c7TQ35ygzJ/NK4XZvnacM=
-github.com/Factom-Asset-Tokens/factom v0.0.0-20191121210333-481aa2c19345/go.mod h1:QwTTrmYvbvsDC7+ZzonzR0jmoT9BgPzaM0XsMJqCJFs=
+github.com/Factom-Asset-Tokens/factom v0.0.0-20191221001609-371aa1859711 h1:bfqHT44euL2jK3J55jui8pcGf+nKezJiOWlklQ1Vs/0=
+github.com/Factom-Asset-Tokens/factom v0.0.0-20191221001609-371aa1859711/go.mod h1:kQvWyBV4e5uc3R8kyJeV5nWYGesmioOT8jDgnjdi4xI=
+github.com/JohnCGriffin/overflow v0.0.0-20170615021017-4d914c927216/go.mod h1:X0CRv0ky0k6m906ixxpzmDRLvX58TFUKS2eePweuyxk=
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
 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=
@@ -172,6 +174,7 @@ golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAG
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33 h1:I6FyU15t786LL7oL/hn43zqTuEGr4PN7F4XJ1p4E3Y8=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33 h1:I6FyU15t786LL7oL/hn43zqTuEGr4PN7F4XJ1p4E3Y8=

internal/engine/chain.go

@@ -146,7 +146,7 @@ func OpenNewByChainID(ctx context.Context,
 func (chain *Chain) Sync(ctx context.Context, c *factom.Client) error {
 	chain.Log.Infof("Syncing chain...")
 	eblocks, err := factom.EBlock{ChainID: chain.ID}.
-		GetPrevUpTo(ctx, c, *chain.Head.KeyMR)
+		GetPrevUpTo(ctx, c, chain.Head.KeyMR)
 	if err != nil {
 		return fmt.Errorf("factom.EBlock.GetPrevUpTo(): %w", err)
 	}