From 0316f949077f1481ccff5b71c0aeeec69fecaafb Mon Sep 17 00:00:00 2001
From: yenda <eric@status.im>
Date: Wed, 15 Jan 2020 21:33:15 +0100
Subject: [PATCH] addresses are stored as byte array not sting (#1801)

---
 VERSION                            |  2 +-
 multiaccounts/accounts/database.go | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index c02e508ca..adbb8d452 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.39.4
+0.39.5
diff --git a/multiaccounts/accounts/database.go b/multiaccounts/accounts/database.go
index ddfa11ab0..48739607e 100644
--- a/multiaccounts/accounts/database.go
+++ b/multiaccounts/accounts/database.go
@@ -165,8 +165,20 @@ func (db *Database) SaveSetting(setting string, value interface{}) error {
 		value = &sqlite.JSONBlob{value}
 		update, err = db.db.Prepare("UPDATE settings SET custom_bootnodes_enabled = ? WHERE synthetic_id = 'id'")
 	case "dapps-address":
+		str, ok := value.(string)
+		if ok {
+			value = types.HexToAddress(str)
+		} else {
+			return ErrInvalidConfig
+		}
 		update, err = db.db.Prepare("UPDATE settings SET dapps_address = ? WHERE synthetic_id = 'id'")
 	case "eip1581-address":
+		str, ok := value.(string)
+		if ok {
+			value = types.HexToAddress(str)
+		} else {
+			return ErrInvalidConfig
+		}
 		update, err = db.db.Prepare("UPDATE settings SET eip1581_address = ? WHERE synthetic_id = 'id'")
 	case "fleet":
 		update, err = db.db.Prepare("UPDATE settings SET fleet = ? WHERE synthetic_id = 'id'")