From 6193f3b40f64d813d02638a652894d0530e41b32 Mon Sep 17 00:00:00 2001
From: Rikard Wissing <rikard@coinid.org>
Date: Tue, 22 Jan 2019 22:43:22 +0100
Subject: [PATCH 1/2] Update index.js
---
index.js | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/index.js b/index.js
index 3217e2b..b53b81d 100644
--- a/index.js
+++ b/index.js
@@ -1,6 +1,14 @@
var bs58check = require('bs58check')
+var bs58checkBase = require('bs58check/base')
var Buffer = require('safe-buffer').Buffer
+function getBs58check (network) {
+ if(network.hashFunctions.address) {
+ return bs58checkBase(network.hashFunctions.address);
+ }
+ return bs58check;
+}
+
function decodeRaw (buffer, version) {
// check version only if defined
if (version !== undefined && buffer[0] !== version) throw new Error('Invalid network version')
@@ -41,14 +49,14 @@ function encodeRaw (version, privateKey, compressed) {
return result
}
-function decode (string, version) {
- return decodeRaw(bs58check.decode(string), version)
+function decode (string, version, network) {
+ return decodeRaw(getBs58check(network).decode(string), version)
}
-function encode (version, privateKey, compressed) {
- if (typeof version === 'number') return bs58check.encode(encodeRaw(version, privateKey, compressed))
+function encode (version, privateKey, compressed, network) {
+ if (typeof version === 'number') return getBs58check(network).encode(encodeRaw(version, privateKey, compressed))
- return bs58check.encode(
+ return getBs58check(network).encode(
encodeRaw(
version.version,
version.privateKey,
From f35c072bc475dd0dc659986b8d70f9522c8d0e1c Mon Sep 17 00:00:00 2001
From: rikardwissing <rikard.wissing@teamtailor.com>
Date: Tue, 22 Jan 2019 23:51:33 +0100
Subject: [PATCH 2/2] Update index.js
---
index.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/index.js b/index.js
index b53b81d..6314116 100644
--- a/index.js
+++ b/index.js
@@ -3,7 +3,7 @@ var bs58checkBase = require('bs58check/base')
var Buffer = require('safe-buffer').Buffer
function getBs58check (network) {
- if(network.hashFunctions.address) {
+ if(network && network.hashFunctions && network.hashFunctions.address) {
return bs58checkBase(network.hashFunctions.address);
}
return bs58check;