lukechilds
/
bitcoinjs-lib
mirror of https://github.com/lukechilds/bitcoinjs-lib.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Fix lint payments p2wsh

fixTypes
junderw 6 years ago
parent
3ddb88168d
commit
f058140ea8
No known key found for this signature in database GPG Key ID: B256185D3A971908
2 changed files with 25 additions and 25 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      src/payments/p2wsh.js
  2. 30
      ts_src/payments/p2wsh.ts

20
src/payments/p2wsh.js
View File

@ -1,8 +1,8 @@
"use strict"; "use strict";
Object.defineProperty(exports, "__esModule", { value: true }); Object.defineProperty(exports, "__esModule", { value: true });
const bcrypto = require("../crypto");
const networks_1 = require("../networks"); const networks_1 = require("../networks");
const bscript = require("../script"); const bscript = require("../script");
const bcrypto = require("../crypto");
const lazy = require("./lazy"); const lazy = require("./lazy");
const typef = require('typeforce'); const typef = require('typeforce');
const OPS = bscript.OPS; const OPS = bscript.OPS;
@ -11,7 +11,7 @@ const EMPTY_BUFFER = Buffer.alloc(0);
function stacksEqual(a, b) { function stacksEqual(a, b) {
if (a.length !== b.length) if (a.length !== b.length)
return false; return false;
return a.every(function (x, i) { return a.every((x, i) => {
return x.equals(b[i]); return x.equals(b[i]);
}); });
} }
@ -36,7 +36,7 @@ function p2wsh(a, opts) {
input: typef.maybe(typef.BufferN(0)), input: typef.maybe(typef.BufferN(0)),
witness: typef.maybe(typef.arrayOf(typef.Buffer)), witness: typef.maybe(typef.arrayOf(typef.Buffer)),
}, a); }, a);
const _address = lazy.value(function () { const _address = lazy.value(() => {
const result = bech32.decode(a.address); const result = bech32.decode(a.address);
const version = result.words.shift(); const version = result.words.shift();
const data = bech32.fromWords(result.words); const data = bech32.fromWords(result.words);
@ -46,7 +46,7 @@ function p2wsh(a, opts) {
data: Buffer.from(data), data: Buffer.from(data),
}; };
}); });
const _rchunks = lazy.value(function () { const _rchunks = lazy.value(() => {
return bscript.decompile(a.redeem.input); return bscript.decompile(a.redeem.input);
}); });
let network = a.network; let network = a.network;
@ -54,14 +54,14 @@ function p2wsh(a, opts) {
network = (a.redeem && a.redeem.network) || networks_1.bitcoin; network = (a.redeem && a.redeem.network) || networks_1.bitcoin;
} }
const o = { network }; const o = { network };
lazy.prop(o, 'address', function () { lazy.prop(o, 'address', () => {
if (!o.hash) if (!o.hash)
return; return;
const words = bech32.toWords(o.hash); const words = bech32.toWords(o.hash);
words.unshift(0x00); words.unshift(0x00);
return bech32.encode(network.bech32, words); return bech32.encode(network.bech32, words);
}); });
lazy.prop(o, 'hash', function () { lazy.prop(o, 'hash', () => {
if (a.output) if (a.output)
return a.output.slice(2); return a.output.slice(2);
if (a.address) if (a.address)
@ -69,12 +69,12 @@ function p2wsh(a, opts) {
if (o.redeem && o.redeem.output) if (o.redeem && o.redeem.output)
return bcrypto.sha256(o.redeem.output); return bcrypto.sha256(o.redeem.output);
}); });
lazy.prop(o, 'output', function () { lazy.prop(o, 'output', () => {
if (!o.hash) if (!o.hash)
return; return;
return bscript.compile([OPS.OP_0, o.hash]); return bscript.compile([OPS.OP_0, o.hash]);
}); });
lazy.prop(o, 'redeem', function () { lazy.prop(o, 'redeem', () => {
if (!a.witness) if (!a.witness)
return; return;
return { return {
@ -83,12 +83,12 @@ function p2wsh(a, opts) {
witness: a.witness.slice(0, -1), witness: a.witness.slice(0, -1),
}; };
}); });
lazy.prop(o, 'input', function () { lazy.prop(o, 'input', () => {
if (!o.witness) if (!o.witness)
return; return;
return EMPTY_BUFFER; return EMPTY_BUFFER;
}); });
lazy.prop(o, 'witness', function () { lazy.prop(o, 'witness', () => {
// transform redeem input to witness stack? // transform redeem input to witness stack?
if (a.redeem && if (a.redeem &&
a.redeem.input && a.redeem.input &&

30
ts_src/payments/p2wsh.ts
View File

@ -1,7 +1,7 @@
import { Payment, PaymentOpts } from './index'; import * as bcrypto from '../crypto';
import { bitcoin as BITCOIN_NETWORK } from '../networks'; import { bitcoin as BITCOIN_NETWORK } from '../networks';
import * as bscript from '../script'; import * as bscript from '../script';
import * as bcrypto from '../crypto'; import { Payment, PaymentOpts, StackFunction } from './index';
import * as lazy from './lazy'; import * as lazy from './lazy';
const typef = require('typeforce'); const typef = require('typeforce');
const OPS = bscript.OPS; const OPS = bscript.OPS;
@ -10,10 +10,10 @@ const bech32 = require('bech32');
const EMPTY_BUFFER = Buffer.alloc(0); const EMPTY_BUFFER = Buffer.alloc(0);
function stacksEqual(a: Array<Buffer>, b: Array<Buffer>): boolean { function stacksEqual(a: Buffer[], b: Buffer[]): boolean {
if (a.length !== b.length) return false; if (a.length !== b.length) return false;
return a.every(function(x, i) { return a.every((x, i) => {
return x.equals(b[i]); return x.equals(b[i]);
}); });
} }
@ -46,7 +46,7 @@ export function p2wsh(a: Payment, opts?: PaymentOpts): Payment {
a, a,
); );
const _address = lazy.value(function() { const _address = lazy.value(() => {
const result = bech32.decode(a.address); const result = bech32.decode(a.address);
const version = result.words.shift(); const version = result.words.shift();
const data = bech32.fromWords(result.words); const data = bech32.fromWords(result.words);
@ -56,9 +56,9 @@ export function p2wsh(a: Payment, opts?: PaymentOpts): Payment {
data: Buffer.from(data), data: Buffer.from(data),
}; };
}); });
const _rchunks = <() => Array<Buffer | number>>lazy.value(function() { const _rchunks = lazy.value(() => {
return bscript.decompile(a.redeem!.input!); return bscript.decompile(a.redeem!.input!);
}); }) as StackFunction;
let network = a.network; let network = a.network;
if (!network) { if (!network) {
@ -67,22 +67,22 @@ export function p2wsh(a: Payment, opts?: PaymentOpts): Payment {
const o: Payment = { network }; const o: Payment = { network };
lazy.prop(o, 'address', function() { lazy.prop(o, 'address', () => {
if (!o.hash) return; if (!o.hash) return;
const words = bech32.toWords(o.hash); const words = bech32.toWords(o.hash);
words.unshift(0x00); words.unshift(0x00);
return bech32.encode(network!.bech32, words); return bech32.encode(network!.bech32, words);
}); });
lazy.prop(o, 'hash', function() { lazy.prop(o, 'hash', () => {
if (a.output) return a.output.slice(2); if (a.output) return a.output.slice(2);
if (a.address) return _address().data; if (a.address) return _address().data;
if (o.redeem && o.redeem.output) return bcrypto.sha256(o.redeem.output); if (o.redeem && o.redeem.output) return bcrypto.sha256(o.redeem.output);
}); });
lazy.prop(o, 'output', function() { lazy.prop(o, 'output', () => {
if (!o.hash) return; if (!o.hash) return;
return bscript.compile([OPS.OP_0, o.hash]); return bscript.compile([OPS.OP_0, o.hash]);
}); });
lazy.prop(o, 'redeem', function() { lazy.prop(o, 'redeem', () => {
if (!a.witness) return; if (!a.witness) return;
return { return {
output: a.witness[a.witness.length - 1], output: a.witness[a.witness.length - 1],
@ -90,11 +90,11 @@ export function p2wsh(a: Payment, opts?: PaymentOpts): Payment {
witness: a.witness.slice(0, -1), witness: a.witness.slice(0, -1),
}; };
}); });
lazy.prop(o, 'input', function() { lazy.prop(o, 'input', () => {
if (!o.witness) return; if (!o.witness) return;
return EMPTY_BUFFER; return EMPTY_BUFFER;
}); });
lazy.prop(o, 'witness', function() { lazy.prop(o, 'witness', () => {
// transform redeem input to witness stack? // transform redeem input to witness stack?
if ( if (
a.redeem && a.redeem &&
@ -108,13 +108,13 @@ export function p2wsh(a: Payment, opts?: PaymentOpts): Payment {
// assign, and blank the existing input // assign, and blank the existing input
o.redeem = Object.assign({ witness: stack }, a.redeem); o.redeem = Object.assign({ witness: stack }, a.redeem);
o.redeem.input = EMPTY_BUFFER; o.redeem.input = EMPTY_BUFFER;
return (<Array<Buffer>>[]).concat(stack, a.redeem.output); return ([] as Buffer[]).concat(stack, a.redeem.output);
} }
if (!a.redeem) return; if (!a.redeem) return;
if (!a.redeem.output) return; if (!a.redeem.output) return;
if (!a.redeem.witness) return; if (!a.redeem.witness) return;
return (<Array<Buffer>>[]).concat(a.redeem.witness, a.redeem.output); return ([] as Buffer[]).concat(a.redeem.witness, a.redeem.output);
}); });
// extended validation // extended validation

Write Preview
Loading…
Cancel
Save