1
0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-03-28 22:15:42 +00:00

upgrade bitcoinjs-lib, rename params

This commit is contained in:
Jan Pochyla 2015-11-06 14:52:25 +01:00 committed by Pavol Rusnak
parent 3c0176a304
commit 07200a30e6
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
3 changed files with 20 additions and 16 deletions

View File

@ -3,6 +3,6 @@
"version": "1.0.0", "version": "1.0.0",
"description": "", "description": "",
"dependencies": { "dependencies": {
"bitcoinjs-lib": "^1.5.7" "bitcoinjs-lib": "^2.1.1"
} }
} }

View File

@ -28,7 +28,7 @@ var _address = _malloc(ADDRESS_SIZE);
*/ */
/** /**
* @param {HDNode} node HDNode struct, see the definition above * @param {HDNode} node HDNode struct, see the definition above
* @return {Uint8Array} * @return {Uint8Array}
*/ */
function serializeNode(node) { function serializeNode(node) {
@ -47,9 +47,9 @@ function serializeNode(node) {
} }
/** /**
* @param {Uint8Array} sn serialized node, see `serializeNode` * @param {Uint8Array} sn serialized node, see `serializeNode`
* @param {Number} index BIP32 index of the address * @param {Number} index BIP32 index of the address
* @param {Number} version address version byte * @param {Number} version address version byte
* @return {String} * @return {String}
*/ */
function deriveAddress(sn, index, version) { function deriveAddress(sn, index, version) {
@ -60,17 +60,17 @@ function deriveAddress(sn, index, version) {
} }
/** /**
* @param {HDNode} node HDNode struct, see the definition above * @param {HDNode} node HDNode struct, see the definition above
* @param {Number} from index of the first address * @param {Number} firstIndex index of the first address
* @param {Number} to index of the last address * @param {Number} lastIndex index of the last address
* @param {Number} version address version byte * @param {Number} version address version byte
* @return {Array<String>} * @return {Array<String>}
*/ */
function deriveAddressRange(node, from, to, version) { function deriveAddressRange(node, firstIndex, lastIndex, version) {
var addresses = []; var addresses = [];
var sn = serializeNode(node); var sn = serializeNode(node);
var i; var i;
for (i = from; i <= to; i++) { for (i = firstIndex; i <= lastIndex; i++) {
addresses.push(deriveAddress(sn, i, version)); addresses.push(deriveAddress(sn, i, version));
} }
return addresses; return addresses;
@ -94,13 +94,17 @@ function processMessage(event) {
switch (type) { switch (type) {
case 'deriveAddressRange': case 'deriveAddressRange':
var response = deriveAddressRange( var addresses = deriveAddressRange(
data['node'], data['node'],
data['from'], data['firstIndex'],
data['to'], data['lastIndex'],
data['version'] data['version']
); );
postMessage(response); postMessage({
'addresses': addresses,
'firstIndex': data['firstIndex'],
'lastIndex': data['lastIndex']
});
break; break;
default: default:

View File

@ -11,7 +11,7 @@ var nodeStruct = {
child_num: node.index, child_num: node.index,
fingerprint: node.parentFingerprint, fingerprint: node.parentFingerprint,
chain_code: node.chainCode, chain_code: node.chainCode,
public_key: node.pubKey.toBuffer() public_key: node.keyPair.getPublicKeyBuffer().toString('hex')
}; };
var nodeSerialized = crypto.serializeNode(nodeStruct); var nodeSerialized = crypto.serializeNode(nodeStruct);