graphenejs-lib
Advanced tools
Comparing version 0.3.0 to 0.3.1
@@ -11,4 +11,3 @@ "use strict"; | ||
hash: require("./src/hash"), | ||
key: require("./src/KeyUtils"), | ||
ecc_config: require("./config") | ||
key: require("./src/KeyUtils") | ||
}; |
@@ -13,3 +13,7 @@ 'use strict'; | ||
var hash = require('./hash'); | ||
var config = require('../config'); | ||
var _require = require('graphenejs-ws'); | ||
var ChainConfig = _require.ChainConfig; | ||
var assert = require('assert'); | ||
@@ -60,3 +64,3 @@ | ||
value: function toString() { | ||
var address_prefix = arguments.length <= 0 || arguments[0] === undefined ? config.address_prefix : arguments[0]; | ||
var address_prefix = arguments.length <= 0 || arguments[0] === undefined ? ChainConfig.address_prefix : arguments[0]; | ||
@@ -67,3 +71,3 @@ return this.toPublicKeyString(address_prefix); | ||
/** | ||
Full public key | ||
Full public key | ||
{return} string | ||
@@ -75,3 +79,3 @@ */ | ||
value: function toPublicKeyString() { | ||
var address_prefix = arguments.length <= 0 || arguments[0] === undefined ? config.address_prefix : arguments[0]; | ||
var address_prefix = arguments.length <= 0 || arguments[0] === undefined ? ChainConfig.address_prefix : arguments[0]; | ||
@@ -93,3 +97,3 @@ var pub_buf = this.toBuffer(); | ||
value: function toAddressString() { | ||
var address_prefix = arguments.length <= 0 || arguments[0] === undefined ? config.address_prefix : arguments[0]; | ||
var address_prefix = arguments.length <= 0 || arguments[0] === undefined ? ChainConfig.address_prefix : arguments[0]; | ||
@@ -171,3 +175,3 @@ var pub_buf = this.toBuffer(); | ||
value: function fromPublicKeyString(public_key) { | ||
var address_prefix = arguments.length <= 1 || arguments[1] === undefined ? config.address_prefix : arguments[1]; | ||
var address_prefix = arguments.length <= 1 || arguments[1] === undefined ? ChainConfig.address_prefix : arguments[1]; | ||
@@ -191,3 +195,3 @@ try { | ||
value: function fromStringOrThrow(public_key) { | ||
var address_prefix = arguments.length <= 1 || arguments[1] === undefined ? config.address_prefix : arguments[1]; | ||
var address_prefix = arguments.length <= 1 || arguments[1] === undefined ? ChainConfig.address_prefix : arguments[1]; | ||
@@ -194,0 +198,0 @@ var prefix = public_key.slice(0, address_prefix.length); |
@@ -21,5 +21,8 @@ 'use strict'; | ||
var Address = _require.Address; | ||
var ecc_config = _require.ecc_config; | ||
var _require2 = require("graphenejs-ws"); | ||
var ChainConfig = _require2.ChainConfig; | ||
var Types = {}; | ||
@@ -841,3 +844,3 @@ module.exports = Types; | ||
if (debug.use_default && object === undefined) { | ||
return ecc_config.address_prefix + "859gxfnXyUriMgUeThh1fWv3oqcpLFyHa3TfFYC4PK2HqhToVM"; | ||
return ChainConfig.address_prefix + "859gxfnXyUriMgUeThh1fWv3oqcpLFyHa3TfFYC4PK2HqhToVM"; | ||
} | ||
@@ -874,3 +877,3 @@ v.required(object); | ||
if (debug.use_default && object === undefined) { | ||
return ecc_config.address_prefix + "664KmHxSuQyDsfwo4WEJvWpzg1QKdg67S"; | ||
return ChainConfig.address_prefix + "664KmHxSuQyDsfwo4WEJvWpzg1QKdg67S"; | ||
} | ||
@@ -877,0 +880,0 @@ return Types.address._to_address(object).toString(); |
{ | ||
"name": "graphenejs-lib", | ||
"version": "0.3.0", | ||
"version": "0.3.1", | ||
"description": "Pure JavaScript Bitshares/Graphene library for node.js and browsers.", | ||
@@ -5,0 +5,0 @@ "browser": { |
@@ -64,11 +64,11 @@ var Convert = require('../../lib/serializer/src/convert'); | ||
let map = mapType.fromObject([//not sorted | ||
["GPH6FHYdi17RhcUXJZr5fxZm1wvVCpXPekiHeAEwRHSEBmiR3yceK",0], | ||
["GPH5YdgWfAejDdSuq55xfguqFTtbRKLi2Jcz1YtTsCzYgdUYXs92c",0], | ||
["GPH7AGnzGCAGVfFnyvPziN67mfuHx9rx89r2zVoRGW1Aawim1f3Qt",0], | ||
["TEST6FHYdi17RhcUXJZr5fxZm1wvVCpXPekiHeAEwRHSEBmiR3yceK",0], | ||
["TEST5YdgWfAejDdSuq55xfguqFTtbRKLi2Jcz1YtTsCzYgdUYXs92c",0], | ||
["TEST7AGnzGCAGVfFnyvPziN67mfuHx9rx89r2zVoRGW1Aawim1f3Qt",0], | ||
]) | ||
let mapObject = mapType.toObject(map) | ||
assert.deepEqual(mapObject, [ // sorted (witness_node sorts assending by "address" (not pubkey)) | ||
["GPH7AGnzGCAGVfFnyvPziN67mfuHx9rx89r2zVoRGW1Aawim1f3Qt",0], | ||
["GPH5YdgWfAejDdSuq55xfguqFTtbRKLi2Jcz1YtTsCzYgdUYXs92c",0], | ||
["GPH6FHYdi17RhcUXJZr5fxZm1wvVCpXPekiHeAEwRHSEBmiR3yceK",0], | ||
["TEST7AGnzGCAGVfFnyvPziN67mfuHx9rx89r2zVoRGW1Aawim1f3Qt",0], | ||
["TEST5YdgWfAejDdSuq55xfguqFTtbRKLi2Jcz1YtTsCzYgdUYXs92c",0], | ||
["TEST6FHYdi17RhcUXJZr5fxZm1wvVCpXPekiHeAEwRHSEBmiR3yceK",0], | ||
]) | ||
@@ -75,0 +75,0 @@ }) |
630554
50
7484