Browse Source

Fix P2PK payment lint

fixTypes
junderw 6 years ago
parent
commit
8d5d78431c
No known key found for this signature in database GPG Key ID: B256185D3A971908
  1. 14
      src/payments/p2pk.js
  2. 1
      ts_src/payments/index.ts
  3. 20
      ts_src/payments/p2pk.ts
  4. 1
      types/payments/index.d.ts

14
src/payments/p2pk.js

@ -1,8 +1,8 @@
"use strict"; "use strict";
Object.defineProperty(exports, "__esModule", { value: true }); Object.defineProperty(exports, "__esModule", { value: true });
const networks_1 = require("../networks");
const bscript = require("../script"); const bscript = require("../script");
const lazy = require("./lazy"); const lazy = require("./lazy");
const networks_1 = require("../networks");
const typef = require('typeforce'); const typef = require('typeforce');
const OPS = bscript.OPS; const OPS = bscript.OPS;
const ecc = require('tiny-secp256k1'); const ecc = require('tiny-secp256k1');
@ -19,32 +19,32 @@ function p2pk(a, opts) {
signature: typef.maybe(bscript.isCanonicalScriptSignature), signature: typef.maybe(bscript.isCanonicalScriptSignature),
input: typef.maybe(typef.Buffer), input: typef.maybe(typef.Buffer),
}, a); }, a);
const _chunks = lazy.value(function () { const _chunks = lazy.value(() => {
return bscript.decompile(a.input); return bscript.decompile(a.input);
}); });
const network = a.network || networks_1.bitcoin; const network = a.network || networks_1.bitcoin;
const o = { network }; const o = { network };
lazy.prop(o, 'output', function () { lazy.prop(o, 'output', () => {
if (!a.pubkey) if (!a.pubkey)
return; return;
return bscript.compile([a.pubkey, OPS.OP_CHECKSIG]); return bscript.compile([a.pubkey, OPS.OP_CHECKSIG]);
}); });
lazy.prop(o, 'pubkey', function () { lazy.prop(o, 'pubkey', () => {
if (!a.output) if (!a.output)
return; return;
return a.output.slice(1, -1); return a.output.slice(1, -1);
}); });
lazy.prop(o, 'signature', function () { lazy.prop(o, 'signature', () => {
if (!a.input) if (!a.input)
return; return;
return _chunks()[0]; return _chunks()[0];
}); });
lazy.prop(o, 'input', function () { lazy.prop(o, 'input', () => {
if (!a.signature) if (!a.signature)
return; return;
return bscript.compile([a.signature]); return bscript.compile([a.signature]);
}); });
lazy.prop(o, 'witness', function () { lazy.prop(o, 'witness', () => {
if (!o.input) if (!o.input)
return; return;
return []; return [];

1
ts_src/payments/index.ts

@ -31,6 +31,7 @@ export interface PaymentOpts {
export type StackElement = Buffer | number; export type StackElement = Buffer | number;
export type Stack = StackElement[]; export type Stack = StackElement[];
export type StackFunction = () => Stack;
export { embed, p2ms, p2pk, p2pkh, p2sh, p2wpkh, p2wsh }; export { embed, p2ms, p2pk, p2pkh, p2sh, p2wpkh, p2wsh };

20
ts_src/payments/p2pk.ts

@ -1,7 +1,7 @@
import { Payment, PaymentOpts } from './index'; import { bitcoin as BITCOIN_NETWORK } from '../networks';
import * as bscript from '../script'; import * as bscript from '../script';
import { Payment, PaymentOpts, StackFunction } from './index';
import * as lazy from './lazy'; import * as lazy from './lazy';
import { bitcoin as BITCOIN_NETWORK } from '../networks';
const typef = require('typeforce'); const typef = require('typeforce');
const OPS = bscript.OPS; const OPS = bscript.OPS;
const ecc = require('tiny-secp256k1'); const ecc = require('tiny-secp256k1');
@ -25,30 +25,30 @@ export function p2pk(a: Payment, opts?: PaymentOpts): Payment {
a, a,
); );
const _chunks = <() => Array<Buffer | number>>lazy.value(function() { const _chunks = lazy.value(() => {
return bscript.decompile(a.input!); return bscript.decompile(a.input!);
}); }) as StackFunction;
const network = a.network || BITCOIN_NETWORK; const network = a.network || BITCOIN_NETWORK;
const o: Payment = { network }; const o: Payment = { network };
lazy.prop(o, 'output', function() { lazy.prop(o, 'output', () => {
if (!a.pubkey) return; if (!a.pubkey) return;
return bscript.compile([a.pubkey, OPS.OP_CHECKSIG]); return bscript.compile([a.pubkey, OPS.OP_CHECKSIG]);
}); });
lazy.prop(o, 'pubkey', function() { lazy.prop(o, 'pubkey', () => {
if (!a.output) return; if (!a.output) return;
return a.output.slice(1, -1); return a.output.slice(1, -1);
}); });
lazy.prop(o, 'signature', function() { lazy.prop(o, 'signature', () => {
if (!a.input) return; if (!a.input) return;
return <Buffer>_chunks()[0]; return _chunks()[0] as Buffer;
}); });
lazy.prop(o, 'input', function() { lazy.prop(o, 'input', () => {
if (!a.signature) return; if (!a.signature) return;
return bscript.compile([a.signature]); return bscript.compile([a.signature]);
}); });
lazy.prop(o, 'witness', function() { lazy.prop(o, 'witness', () => {
if (!o.input) return; if (!o.input) return;
return []; return [];
}); });

1
types/payments/index.d.ts

@ -29,4 +29,5 @@ export interface PaymentOpts {
} }
export declare type StackElement = Buffer | number; export declare type StackElement = Buffer | number;
export declare type Stack = StackElement[]; export declare type Stack = StackElement[];
export declare type StackFunction = () => Stack;
export { embed, p2ms, p2pk, p2pkh, p2sh, p2wpkh, p2wsh }; export { embed, p2ms, p2pk, p2pkh, p2sh, p2wpkh, p2wsh };

Loading…
Cancel
Save