Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: gob: type elliptic.p256Curve has no exported fields. #95

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 45 additions & 9 deletions wallets.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{}
Expand Down Expand Up @@ -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
}
Expand All @@ -65,15 +75,29 @@ func (ws *Wallets) LoadFromFile(nodeID string) error {
log.Panic(err)
}

var wallets Wallets
gob.Register(elliptic.P256())
var wallets map[string]SerializableWallet
//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 = wallets.Wallets
ws.Wallets = make(map[string]*Wallet)
//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
}
Expand All @@ -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)

gob.Register(elliptic.P256())
//fmt.Println(walletFile)

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)
}

}