From fb5333b4c7000aa8685f9c2dc08007cdf808c7ac Mon Sep 17 00:00:00 2001
From: Nicko Guyer <nicko.guyer@kaleido.io>
Date: Wed, 1 Jun 2022 16:04:21 -0400
Subject: [PATCH] Add JSON function to WalletFile for serialization

Signed-off-by: Nicko Guyer <nicko.guyer@kaleido.io>
---
 pkg/keystorev3/wallet_test.go | 39 +++++++++++++++++++++++++++++++++++
 pkg/keystorev3/walletfile.go  | 12 +++++++++++
 2 files changed, 51 insertions(+)

diff --git a/pkg/keystorev3/wallet_test.go b/pkg/keystorev3/wallet_test.go
index 5966c1e0..9fe2ceb2 100644
--- a/pkg/keystorev3/wallet_test.go
+++ b/pkg/keystorev3/wallet_test.go
@@ -49,6 +49,27 @@ const sampleWallet = `{
 	"version": 3
   }`
 
+const sampleWalletPbkdf2 = `{
+    "address": "08327c2085530f3a90db40174beff14f1fc96b22",
+    "id": "174d997a-d737-4cf4-b8ff-d26eaf1b9201",
+    "version": 3,
+    "crypto": {
+        "cipher": "es-128-ctr",
+        "ciphertext": "ff36c3ad1dfda68ef4f65f62b6101638b6ed8fcb61954ae058a690d4ed8c4563",
+        "cipherparams": {
+            "iv": "169c176944db19d27b2e297c4e3f0f1c"
+        },
+        "kdf": "pbkdf2",
+        "mac": "5b403923bc4945264dad3043da1a90adef979f97c2c353f1ba8cdb0123831fd0",
+        "kdfparams": {
+            "dklen": 32,
+            "c": 4096,
+            "prf": "hmac-sha256",
+            "salt": "3f395aa93f6dc374081d19931dc3d98b61f935d2e8dd54df60f27685716dd1f9"
+        }
+    }
+}`
+
 func TestLoadSampleWallet(t *testing.T) {
 	w, err := ReadWalletFile([]byte(sampleWallet), []byte("correcthorsebatterystaple"))
 	assert.NoError(t, err)
@@ -84,3 +105,21 @@ func TestReadWalletFileBadKDF(t *testing.T) {
 	}}`), []byte(""))
 	assert.Regexp(t, "unsupported kdf", err)
 }
+
+func TestWalletFileScryptJSON(t *testing.T) {
+	w, err := ReadWalletFile([]byte(sampleWallet), []byte("correcthorsebatterystaple"))
+	assert.NoError(t, err)
+	j := w.JSON()
+	w2, err := ReadWalletFile(j, []byte("correcthorsebatterystaple"))
+	assert.NoError(t, err)
+	assert.Equal(t, w, w2)
+}
+
+func TestWalletFilePbkdf2JSON(t *testing.T) {
+	w, err := ReadWalletFile([]byte(sampleWalletPbkdf2), []byte("myPrecious"))
+	assert.NoError(t, err)
+	j := w.JSON()
+	w2, err := ReadWalletFile(j, []byte("myPrecious"))
+	assert.NoError(t, err)
+	assert.Equal(t, w, w2)
+}
diff --git a/pkg/keystorev3/walletfile.go b/pkg/keystorev3/walletfile.go
index 35fca2ab..299d7d7e 100644
--- a/pkg/keystorev3/walletfile.go
+++ b/pkg/keystorev3/walletfile.go
@@ -18,6 +18,7 @@ package keystorev3
 
 import (
 	"bytes"
+	"encoding/json"
 	"fmt"
 
 	"github.com/hyperledger/firefly-common/pkg/fftypes"
@@ -34,6 +35,7 @@ const (
 
 type WalletFile interface {
 	KeyPair() *secp256k1.KeyPair
+	JSON() []byte
 }
 
 type kdfParamsScrypt struct {
@@ -100,6 +102,16 @@ func (w *walletFileBase) KeyPair() *secp256k1.KeyPair {
 	return w.keypair
 }
 
+func (w *walletFilePbkdf2) JSON() []byte {
+	b, _ := json.Marshal(w)
+	return b
+}
+
+func (w *walletFileScrypt) JSON() []byte {
+	b, _ := json.Marshal(w)
+	return b
+}
+
 func (c *cryptoCommon) decryptCommon(derivedKey []byte) ([]byte, error) {
 	if len(derivedKey) != 32 {
 		return nil, fmt.Errorf("invalid scrypt keystore: derived key length %d != 32", len(derivedKey))