v2.4.0

PaulBernier · PaulBernier · commit b7b379f03d5d · 2020-12-19T20:23:46.000-08:00
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.2.16
+2.4.0
diff --git a/database_test.go b/database_test.go
@@ -9,7 +9,7 @@ import (
 	"testing"
 
 	"github.com/FactomProject/factom"
-	"github.com/FactomProject/wallet"
+	"github.com/FactomProject/wallet/v2"
 )
 
 func TestNewWallet(t *testing.T) {
diff --git a/go.mod b/go.mod
@@ -1,12 +1,12 @@
-module github.com/FactomProject/wallet
+module github.com/FactomProject/wallet/v2
 
 go 1.15
 
 require (
 	github.com/FactomProject/btcutil v0.0.0-20200312214114-5fd3eaf71bd2
 	github.com/FactomProject/factoid v0.3.4
-	github.com/FactomProject/factom v0.3.6-0.20190712163801-e7717c4ab072
-	github.com/FactomProject/factomd v0.0.0-20201015012805-8378e47b26d2
+	github.com/FactomProject/factom v0.4.0
+	github.com/FactomProject/factomd v0.0.0-20201125033516-59a959e6c40f
 	github.com/FactomProject/go-bip32 v0.3.6-0.20161206200006-3b593af1c415
 	github.com/FactomProject/go-bip39 v0.3.6-0.20161217174232-d1007fb78d9a
 	github.com/FactomProject/goleveldb v0.2.2-0.20170418171130-e7800c6976c5
diff --git a/go.sum b/go.sum
diff --git a/importexport_test.go b/importexport_test.go
@@ -10,7 +10,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/FactomProject/wallet"
+	"github.com/FactomProject/wallet/v2"
 )
 
 func TestImportWithSpaces(t *testing.T) {
diff --git a/transaction_test.go b/transaction_test.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/FactomProject/factom"
 	"github.com/FactomProject/factomd/common/primitives"
-	"github.com/FactomProject/wallet"
+	"github.com/FactomProject/wallet/v2"
 )
 
 func TestNewTransaction(t *testing.T) {
diff --git a/txdatabase.go b/txdatabase.go
@@ -387,7 +387,7 @@ func fblockHead() (interfaces.IFBlock, error) {
 	if err != nil {
 		return nil, err
 	}
-	dblock, _, err := factom.GetDBlock(dbhead)
+	dblock, err := factom.GetDBlock(dbhead)
 	if err != nil {
 		return nil, err
 	}
@@ -406,25 +406,25 @@ func fblockHead() (interfaces.IFBlock, error) {
 }
 
 func getfblock(keymr string) (interfaces.IFBlock, error) {
-	_, raw, err := factom.GetFBlock(keymr)
+	raw, err := factom.GetRaw(keymr)
 	if err != nil {
 		return nil, err
 	}
 	return factoid.UnmarshalFBlock(raw)
 }
 
 func getfblockbyheight(height uint32) (interfaces.IFBlock, error) {
-	_, raw, err := factom.GetFBlockByHeight(int64(height))
+	raw, err := factom.GetBlockByHeightRaw("f", int64(height))
 	if err != nil {
 		return nil, err
 	}
-	return factoid.UnmarshalFBlock(raw)
+	return factoid.UnmarshalFBlock([]byte(raw.RawData))
 }
 
 func getdblockbyheight(height uint32) (interfaces.IDirectoryBlock, error) {
-	_, raw, err := factom.GetDBlockByHeight(int64(height))
+	raw, err := factom.GetBlockByHeightRaw("d", int64(height))
 	if err != nil {
 		return nil, err
 	}
-	return directoryBlock.UnmarshalDBlock(raw)
+	return directoryBlock.UnmarshalDBlock([]byte(raw.RawData))
 }
diff --git a/txdatabase_test.go b/txdatabase_test.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/FactomProject/factomd/common/interfaces"
 	"github.com/FactomProject/factomd/testHelper"
-	"github.com/FactomProject/wallet"
+	"github.com/FactomProject/wallet/v2"
 )
 
 func TestTXDatabaseOverlay(t *testing.T) {
diff --git a/util_test.go b/util_test.go
@@ -7,7 +7,7 @@ package wallet_test
 import (
 	"testing"
 
-	"github.com/FactomProject/wallet"
+	"github.com/FactomProject/wallet/v2"
 )
 
 func TestSeedString(t *testing.T) {
diff --git a/v1conversion_test.go b/v1conversion_test.go
@@ -8,7 +8,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/FactomProject/wallet"
+	"github.com/FactomProject/wallet/v2"
 )
 
 func TestImportV1Wallet(t *testing.T) {
diff --git a/walletDBO_test.go b/walletDBO_test.go
@@ -4,7 +4,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/FactomProject/wallet"
+	"github.com/FactomProject/wallet/v2"
 )
 
 func TestWalletDBO(t *testing.T) {
diff --git a/wsapi/wsapi.go b/wsapi/wsapi.go
@@ -28,7 +28,7 @@ import (
 	"github.com/FactomProject/factomd/common/interfaces"
 	"github.com/FactomProject/factomd/common/primitives"
 	"github.com/FactomProject/factomd/database/securedb"
-	"github.com/FactomProject/wallet"
+	"github.com/FactomProject/wallet/v2"
 	"github.com/FactomProject/web"
 )
 

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ import (`
`9`	`9`	`"testing"`
`10`	`10`
`11`	`11`	`"github.com/FactomProject/factom"`
`12`		`- "github.com/FactomProject/wallet"`
	`12`	`+ "github.com/FactomProject/wallet/v2"`
`13`	`13`	`)`
`14`	`14`
`15`	`15`	`func TestNewWallet(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ import (`
`10`	`10`	`"os"`
`11`	`11`	`"testing"`
`12`	`12`
`13`		`- "github.com/FactomProject/wallet"`
	`13`	`+ "github.com/FactomProject/wallet/v2"`
`14`	`14`	`)`
`15`	`15`
`16`	`16`	`func TestImportWithSpaces(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -387,7 +387,7 @@ func fblockHead() (interfaces.IFBlock, error) {`
`387`	`387`	`if err != nil {`
`388`	`388`	`return nil, err`
`389`	`389`	`}`
`390`		`- dblock, _, err := factom.GetDBlock(dbhead)`
	`390`	`+ dblock, err := factom.GetDBlock(dbhead)`
`391`	`391`	`if err != nil {`
`392`	`392`	`return nil, err`
`393`	`393`	`}`
`@@ -406,25 +406,25 @@ func fblockHead() (interfaces.IFBlock, error) {`
`406`	`406`	`}`
`407`	`407`
`408`	`408`	`func getfblock(keymr string) (interfaces.IFBlock, error) {`
`409`		`- _, raw, err := factom.GetFBlock(keymr)`
	`409`	`+ raw, err := factom.GetRaw(keymr)`
`410`	`410`	`if err != nil {`
`411`	`411`	`return nil, err`
`412`	`412`	`}`
`413`	`413`	`return factoid.UnmarshalFBlock(raw)`
`414`	`414`	`}`
`415`	`415`
`416`	`416`	`func getfblockbyheight(height uint32) (interfaces.IFBlock, error) {`
`417`		`- _, raw, err := factom.GetFBlockByHeight(int64(height))`
	`417`	`+ raw, err := factom.GetBlockByHeightRaw("f", int64(height))`
`418`	`418`	`if err != nil {`
`419`	`419`	`return nil, err`
`420`	`420`	`}`
`421`		`- return factoid.UnmarshalFBlock(raw)`
	`421`	`+ return factoid.UnmarshalFBlock([]byte(raw.RawData))`
`422`	`422`	`}`
`423`	`423`
`424`	`424`	`func getdblockbyheight(height uint32) (interfaces.IDirectoryBlock, error) {`
`425`		`- _, raw, err := factom.GetDBlockByHeight(int64(height))`
	`425`	`+ raw, err := factom.GetBlockByHeightRaw("d", int64(height))`
`426`	`426`	`if err != nil {`
`427`	`427`	`return nil, err`
`428`	`428`	`}`
`429`		`- return directoryBlock.UnmarshalDBlock(raw)`
	`429`	`+ return directoryBlock.UnmarshalDBlock([]byte(raw.RawData))`
`430`	`430`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ package wallet_test`
`7`	`7`	`import (`
`8`	`8`	`"testing"`
`9`	`9`
`10`		`- "github.com/FactomProject/wallet"`
	`10`	`+ "github.com/FactomProject/wallet/v2"`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`func TestSeedString(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import (`
`8`	`8`	`"os"`
`9`	`9`	`"testing"`
`10`	`10`
`11`		`- "github.com/FactomProject/wallet"`
	`11`	`+ "github.com/FactomProject/wallet/v2"`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`func TestImportV1Wallet(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import (`
`4`	`4`	`"strings"`
`5`	`5`	`"testing"`
`6`	`6`
`7`		`- "github.com/FactomProject/wallet"`
	`7`	`+ "github.com/FactomProject/wallet/v2"`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`func TestWalletDBO(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ import (`
`28`	`28`	`"github.com/FactomProject/factomd/common/interfaces"`
`29`	`29`	`"github.com/FactomProject/factomd/common/primitives"`
`30`	`30`	`"github.com/FactomProject/factomd/database/securedb"`
`31`		`- "github.com/FactomProject/wallet"`
	`31`	`+ "github.com/FactomProject/wallet/v2"`
`32`	`32`	`"github.com/FactomProject/web"`
`33`	`33`	`)`
`34`	`34`