Fix P2PK payment lint
This commit is contained in:
parent
4054f3ae87
commit
8d5d78431c
4 changed files with 20 additions and 18 deletions
|
@ -1,8 +1,8 @@
|
|||
"use strict";
|
||||
Object.defineProperty(exports, "__esModule", { value: true });
|
||||
const networks_1 = require("../networks");
|
||||
const bscript = require("../script");
|
||||
const lazy = require("./lazy");
|
||||
const networks_1 = require("../networks");
|
||||
const typef = require('typeforce');
|
||||
const OPS = bscript.OPS;
|
||||
const ecc = require('tiny-secp256k1');
|
||||
|
@ -19,32 +19,32 @@ function p2pk(a, opts) {
|
|||
signature: typef.maybe(bscript.isCanonicalScriptSignature),
|
||||
input: typef.maybe(typef.Buffer),
|
||||
}, a);
|
||||
const _chunks = lazy.value(function () {
|
||||
const _chunks = lazy.value(() => {
|
||||
return bscript.decompile(a.input);
|
||||
});
|
||||
const network = a.network || networks_1.bitcoin;
|
||||
const o = { network };
|
||||
lazy.prop(o, 'output', function () {
|
||||
lazy.prop(o, 'output', () => {
|
||||
if (!a.pubkey)
|
||||
return;
|
||||
return bscript.compile([a.pubkey, OPS.OP_CHECKSIG]);
|
||||
});
|
||||
lazy.prop(o, 'pubkey', function () {
|
||||
lazy.prop(o, 'pubkey', () => {
|
||||
if (!a.output)
|
||||
return;
|
||||
return a.output.slice(1, -1);
|
||||
});
|
||||
lazy.prop(o, 'signature', function () {
|
||||
lazy.prop(o, 'signature', () => {
|
||||
if (!a.input)
|
||||
return;
|
||||
return _chunks()[0];
|
||||
});
|
||||
lazy.prop(o, 'input', function () {
|
||||
lazy.prop(o, 'input', () => {
|
||||
if (!a.signature)
|
||||
return;
|
||||
return bscript.compile([a.signature]);
|
||||
});
|
||||
lazy.prop(o, 'witness', function () {
|
||||
lazy.prop(o, 'witness', () => {
|
||||
if (!o.input)
|
||||
return;
|
||||
return [];
|
||||
|
|
|
@ -31,6 +31,7 @@ export interface PaymentOpts {
|
|||
|
||||
export type StackElement = Buffer | number;
|
||||
export type Stack = StackElement[];
|
||||
export type StackFunction = () => Stack;
|
||||
|
||||
export { embed, p2ms, p2pk, p2pkh, p2sh, p2wpkh, p2wsh };
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
import { Payment, PaymentOpts } from './index';
|
||||
import * as bscript from '../script';
|
||||
import * as lazy from './lazy';
|
||||
import { bitcoin as BITCOIN_NETWORK } from '../networks';
|
||||
import * as bscript from '../script';
|
||||
import { Payment, PaymentOpts, StackFunction } from './index';
|
||||
import * as lazy from './lazy';
|
||||
const typef = require('typeforce');
|
||||
const OPS = bscript.OPS;
|
||||
const ecc = require('tiny-secp256k1');
|
||||
|
@ -25,30 +25,30 @@ export function p2pk(a: Payment, opts?: PaymentOpts): Payment {
|
|||
a,
|
||||
);
|
||||
|
||||
const _chunks = <() => Array<Buffer | number>>lazy.value(function() {
|
||||
const _chunks = lazy.value(() => {
|
||||
return bscript.decompile(a.input!);
|
||||
});
|
||||
}) as StackFunction;
|
||||
|
||||
const network = a.network || BITCOIN_NETWORK;
|
||||
const o: Payment = { network };
|
||||
|
||||
lazy.prop(o, 'output', function() {
|
||||
lazy.prop(o, 'output', () => {
|
||||
if (!a.pubkey) return;
|
||||
return bscript.compile([a.pubkey, OPS.OP_CHECKSIG]);
|
||||
});
|
||||
lazy.prop(o, 'pubkey', function() {
|
||||
lazy.prop(o, 'pubkey', () => {
|
||||
if (!a.output) return;
|
||||
return a.output.slice(1, -1);
|
||||
});
|
||||
lazy.prop(o, 'signature', function() {
|
||||
lazy.prop(o, 'signature', () => {
|
||||
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;
|
||||
return bscript.compile([a.signature]);
|
||||
});
|
||||
lazy.prop(o, 'witness', function() {
|
||||
lazy.prop(o, 'witness', () => {
|
||||
if (!o.input) return;
|
||||
return [];
|
||||
});
|
||||
|
|
1
types/payments/index.d.ts
vendored
1
types/payments/index.d.ts
vendored
|
@ -29,4 +29,5 @@ export interface PaymentOpts {
|
|||
}
|
||||
export declare type StackElement = Buffer | number;
|
||||
export declare type Stack = StackElement[];
|
||||
export declare type StackFunction = () => Stack;
|
||||
export { embed, p2ms, p2pk, p2pkh, p2sh, p2wpkh, p2wsh };
|
||||
|
|
Loading…
Add table
Reference in a new issue