Merge cb538eade9 into ff408351a2

wallets.go

@@ -2,21 +2,29 @@ package main
 
 import (
 	"bytes"
+	"crypto/ecdsa"
 	"crypto/elliptic"
 	"encoding/gob"
 	"fmt"
 	"io/ioutil"
 	"log"
+	"math/big"
 	"os"
 )
 
 const walletFile = "wallet_%s.dat"
 
-// Wallets stores a collection of wallets
 type Wallets struct {
 	Wallets map[string]*Wallet
 }
 
+// SerializableWallet Solve gob: type elliptic.p256Curve has no exported fields
+type SerializableWallet struct {
+	D         *big.Int
+	X, Y      *big.Int
+	PublicKey []byte
+}
+
 // NewWallets creates Wallets and fills it from a file if it exists
 func NewWallets(nodeID string) (*Wallets, error) {
 	wallets := Wallets{}
@@ -55,7 +63,9 @@ func (ws Wallets) GetWallet(address string) Wallet {
 
 // LoadFromFile loads wallets from the file
 func (ws *Wallets) LoadFromFile(nodeID string) error {
+
 	walletFile := fmt.Sprintf(walletFile, nodeID)
+	//fmt.Println(walletFile)
 	if _, err := os.Stat(walletFile); os.IsNotExist(err) {
 		return err
 	}
@@ -65,15 +75,29 @@ func (ws *Wallets) LoadFromFile(nodeID string) error {
 		log.Panic(err)
 	}
 
-	var wallets Wallets
+	var wallets map[string]SerializableWallet
-	gob.Register(elliptic.P256())
+	//gob.Register(elliptic.P256())
+	gob.Register(SerializableWallet{})
 	decoder := gob.NewDecoder(bytes.NewReader(fileContent))
 	err = decoder.Decode(&wallets)
 	if err != nil {
 		log.Panic(err)
 	}
-
+	ws.Wallets = make(map[string]*Wallet)
-	ws.Wallets = wallets.Wallets
+	//ws.Wallets = wallets.Wallets
+	for k, v := range wallets {
+		ws.Wallets[k] = &Wallet{
+			PrivateKey: ecdsa.PrivateKey{
+				PublicKey: ecdsa.PublicKey{
+					Curve: elliptic.P256(),
+					X:     v.X,
+					Y:     v.Y,
+				},
+				D: v.D,
+			},
+			PublicKey: v.PublicKey,
+		}
+	}
 
 	return nil
 }
@@ -82,17 +106,29 @@ func (ws *Wallets) LoadFromFile(nodeID string) error {
 func (ws Wallets) SaveToFile(nodeID string) {
 	var content bytes.Buffer
 	walletFile := fmt.Sprintf(walletFile, nodeID)
+	//fmt.Println(walletFile)
 
-	gob.Register(elliptic.P256())
+	gob.Register(SerializableWallet{})
+
+	wallets := make(map[string]SerializableWallet)
+	for k, v := range ws.Wallets {
+		wallets[k] = SerializableWallet{
+			D:         v.PrivateKey.D,
+			X:         v.PrivateKey.PublicKey.X,
+			Y:         v.PrivateKey.PublicKey.Y,
+			PublicKey: v.PublicKey,
+		}
+	}
 
 	encoder := gob.NewEncoder(&content)
-	err := encoder.Encode(ws)
+	err := encoder.Encode(wallets)
 	if err != nil {
 		log.Panic(err)
 	}
 
-	err = ioutil.WriteFile(walletFile, content.Bytes(), 0644)
+	err = os.WriteFile(walletFile, content.Bytes(), 0644)
 	if err != nil {
 		log.Panic(err)
 	}
+
 }