From 59a6f193b099afc2847aee7f48fb52d78d3e02c7 Mon Sep 17 00:00:00 2001 From: Alex Gessner Date: Thu, 28 Mar 2019 16:40:51 -0400 Subject: [PATCH] add bech32 to BaseX --- lib/basex.js | 4 +++- package-lock.json | 2 +- package.json | 2 +- src/basex.iced | 1 + test/files/basex.iced | 6 +++++- 5 files changed, 11 insertions(+), 4 deletions(-) diff --git a/lib/basex.js b/lib/basex.js index 39b9b8fc..24670e22 100644 --- a/lib/basex.js +++ b/lib/basex.js @@ -1,6 +1,6 @@ // Generated by IcedCoffeeScript 108.0.11 (function() { - var BaseX, BigInteger, base32, base58, buffer_to_ui8a, nbi, nbs, nbv, _ref; + var BaseX, BigInteger, base32, base58, bech32, buffer_to_ui8a, nbi, nbs, nbv, _ref; _ref = require('bn'), nbv = _ref.nbv, nbi = _ref.nbi, BigInteger = _ref.BigInteger; @@ -89,6 +89,8 @@ exports.base32 = base32 = new BaseX('abcdefghijkmnpqrstuvwxyz23456789'); + exports.bech32 = bech32 = new BaseX('qpzry9x8gf2tvdw0s3jn54khce6mua7l'); + exports.base91 = new BaseX("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789`~!@#$%^&*()-_=+{}[]|;:,<>./?"); }).call(this); diff --git a/package-lock.json b/package-lock.json index f7ce3f44..311962ff 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "kbpgp", - "version": "2.0.83", + "version": "2.1.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 3b70d95a..f8b09eb9 100644 --- a/package.json +++ b/package.json @@ -45,4 +45,4 @@ "scripts": { "test": "make test" } -} \ No newline at end of file +} diff --git a/src/basex.iced b/src/basex.iced index 937cc9cf..6221c788 100644 --- a/src/basex.iced +++ b/src/basex.iced @@ -46,6 +46,7 @@ class BaseX exports.base58 = base58 = new BaseX '123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz' exports.base32 = base32 = new BaseX 'abcdefghijkmnpqrstuvwxyz23456789' +exports.bech32 = bech32 = new BaseX 'qpzry9x8gf2tvdw0s3jn54khce6mua7l' exports.base91 = new BaseX("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789`~!@#$%^&*()-_=+{}[]|;:,<>./?") #===================================================================== diff --git a/test/files/basex.iced b/test/files/basex.iced index cc05aa3c..4c77ae8a 100644 --- a/test/files/basex.iced +++ b/test/files/basex.iced @@ -106,7 +106,7 @@ strings = [ test_base = (T, klass, what) -> for padlen in [0...29] by 7 pad = Buffer.from (0 for i in [0...padlen]) - for s,i in strings + for s,i in strings buf = Buffer.concat [ pad, Buffer.from s, 'base64' ] s = buf.toString 'base64' e = klass.encode buf @@ -121,3 +121,7 @@ exports.test_base58 = (T, cb) -> exports.test_base32 = (T, cb) -> test_base T, basex.base32, 'base32' cb() + +exports.test_bech32 = (T, cb) -> + test_base T, basex.bech32, 'bech32' + cb()