@cashscript/utils 0.7.0-next.0 → 0.7.2

package/dist/main/data.js

@@ -20,24 +20,24 @@ function decodeBool(encodedBool) {
 }
 exports.decodeBool = decodeBool;
 function encodeInt(int) {
-    return libauth_1.bigIntToScriptNumber(BigInt(int));
+    return (0, libauth_1.bigIntToScriptNumber)(BigInt(int));
 }
 exports.encodeInt = encodeInt;
-function decodeInt(encodedInt, maxLength) {
+function decodeInt(encodedInt, maxLength = 8) {
     const options = { maximumScriptNumberByteLength: maxLength };
-    const result = libauth_1.parseBytesAsScriptNumber(encodedInt, options);
-    if (libauth_1.isScriptNumberError(result)) {
+    const result = (0, libauth_1.parseBytesAsScriptNumber)(encodedInt, options);
+    if ((0, libauth_1.isScriptNumberError)(result)) {
         throw new Error(result);
     }
     return Number(result);
 }
 exports.decodeInt = decodeInt;
 function encodeString(str) {
-    return libauth_1.utf8ToBin(str);
+    return (0, libauth_1.utf8ToBin)(str);
 }
 exports.encodeString = encodeString;
 function decodeString(encodedString) {
-    return libauth_1.binToUtf8(encodedString);
+    return (0, libauth_1.binToUtf8)(encodedString);
 }
 exports.decodeString = decodeString;
 function placeholder(size) {

package/dist/main/index.d.ts

@@ -1,5 +1,5 @@
-export * from './artifact';
-export * from './data';
-export * from './hash';
-export * from './script';
-export * from './types';
+export * from './artifact.js';
+export * from './data.js';
+export * from './hash.js';
+export * from './script.js';
+export * from './types.js';

package/dist/main/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -10,9 +14,9 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./artifact"), exports);
-__exportStar(require("./data"), exports);
-__exportStar(require("./hash"), exports);
-__exportStar(require("./script"), exports);
-__exportStar(require("./types"), exports);
+__exportStar(require("./artifact.js"), exports);
+__exportStar(require("./data.js"), exports);
+__exportStar(require("./hash.js"), exports);
+__exportStar(require("./script.js"), exports);
+__exportStar(require("./types.js"), exports);
 //# sourceMappingURL=index.js.map

package/dist/main/script.d.ts

@@ -1,4 +1,8 @@
 import { OpcodesBCH } from '@bitauth/libauth';
+export declare const Op: typeof OpcodesBCH;
+export declare type Op = number;
+export declare type OpOrData = Op | Uint8Array;
+export declare type Script = OpOrData[];
 export declare enum IntrospectionOp {
     OP_INPUTINDEX = 192,
     OP_ACTIVEBYTECODE = 193,
@@ -15,10 +19,8 @@ export declare enum IntrospectionOp {
     OP_OUTPUTVALUE = 204,
     OP_OUTPUTBYTECODE = 205
 }
-export declare const Op: typeof OpcodesBCH;
-export declare type Op = number;
-export declare type OpOrData = Op | Uint8Array;
-export declare type Script = OpOrData[];
+export declare const introspectionOpMapping: any;
+export declare const reverseIntrospectionOpMapping: any;
 export declare function scriptToAsm(script: Script): string;
 export declare function asmToScript(asm: string): Script;
 export declare function scriptToBytecode(script: Script): Uint8Array;

package/dist/main/script.js

@@ -3,10 +3,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.optimiseBytecode = exports.generateRedeemScript = exports.replaceBytecodeNop = exports.encodeNullDataScript = exports.calculateBytesize = exports.countOpcodes = exports.bytecodeToAsm = exports.asmToBytecode = exports.bytecodeToScript = exports.scriptToBytecode = exports.asmToScript = exports.scriptToAsm = exports.Op = exports.IntrospectionOp = void 0;
+exports.optimiseBytecode = exports.generateRedeemScript = exports.replaceBytecodeNop = exports.encodeNullDataScript = exports.calculateBytesize = exports.countOpcodes = exports.bytecodeToAsm = exports.asmToBytecode = exports.bytecodeToScript = exports.scriptToBytecode = exports.asmToScript = exports.scriptToAsm = exports.reverseIntrospectionOpMapping = exports.introspectionOpMapping = exports.IntrospectionOp = exports.Op = void 0;
 const libauth_1 = require("@bitauth/libauth");
-const data_1 = require("./data");
-const cashproof_optimisations_1 = __importDefault(require("./cashproof-optimisations"));
+const data_js_1 = require("./data.js");
+const cashproof_optimisations_js_1 = __importDefault(require("./cashproof-optimisations.js"));
+exports.Op = libauth_1.OpcodesBCH;
 // TODO: Replace this when these opcodes are in Libauth
 var IntrospectionOp;
 (function (IntrospectionOp) {
@@ -25,7 +26,23 @@ var IntrospectionOp;
     IntrospectionOp[IntrospectionOp["OP_OUTPUTVALUE"] = 204] = "OP_OUTPUTVALUE";
     IntrospectionOp[IntrospectionOp["OP_OUTPUTBYTECODE"] = 205] = "OP_OUTPUTBYTECODE";
 })(IntrospectionOp = exports.IntrospectionOp || (exports.IntrospectionOp = {}));
-exports.Op = libauth_1.OpcodesBCH;
+exports.introspectionOpMapping = {
+    OP_INPUTINDEX: 'OP_UNKNOWN192',
+    OP_ACTIVEBYTECODE: 'OP_UNKNOWN193',
+    OP_TXVERSION: 'OP_UNKNOWN194',
+    OP_TXINPUTCOUNT: 'OP_UNKNOWN195',
+    OP_TXOUTPUTCOUNT: 'OP_UNKNOWN196',
+    OP_TXLOCKTIME: 'OP_UNKNOWN197',
+    OP_UTXOVALUE: 'OP_UNKNOWN198',
+    OP_UTXOBYTECODE: 'OP_UNKNOWN199',
+    OP_OUTPOINTTXHASH: 'OP_UNKNOWN200',
+    OP_OUTPOINTINDEX: 'OP_UNKNOWN201',
+    OP_INPUTBYTECODE: 'OP_UNKNOWN202',
+    OP_INPUTSEQUENCENUMBER: 'OP_UNKNOWN203',
+    OP_OUTPUTVALUE: 'OP_UNKNOWN204',
+    OP_OUTPUTBYTECODE: 'OP_UNKNOWN205',
+};
+exports.reverseIntrospectionOpMapping = Object.fromEntries(Object.entries(exports.introspectionOpMapping).map(([k, v]) => ([v, k])));
 function scriptToAsm(script) {
     return bytecodeToAsm(scriptToBytecode(script));
 }
@@ -40,15 +57,15 @@ function scriptToBytecode(script) {
         if (typeof opOrData === 'number') {
             return { opcode: opOrData };
         }
-        return libauth_1.parseBytecode(libauth_1.encodeDataPush(opOrData))[0];
+        return (0, libauth_1.parseBytecode)((0, libauth_1.encodeDataPush)(opOrData))[0];
     });
     // Convert the AuthenticationInstructions to bytecode
-    return libauth_1.serializeAuthenticationInstructions(instructions);
+    return (0, libauth_1.serializeAuthenticationInstructions)(instructions);
 }
 exports.scriptToBytecode = scriptToBytecode;
 function bytecodeToScript(bytecode) {
     // Convert the bytecode to AuthenticationInstructions
-    const instructions = libauth_1.parseBytecode(bytecode);
+    const instructions = (0, libauth_1.parseBytecode)(bytecode);
     // Convert the AuthenticationInstructions to script elements
     const script = instructions.map((instruction) => ('data' in instruction ? instruction.data : instruction.opcode));
     return script;
@@ -57,24 +74,28 @@ exports.bytecodeToScript = bytecodeToScript;
 function asmToBytecode(asm) {
     // Remove any duplicate whitespace
     asm = asm.replace(/\s+/g, ' ').trim();
+    // Replace introspection ops with OP_UNKNOWN... so Libauth gets it
+    asm = asm.split(' ').map((token) => { var _a; return (_a = exports.introspectionOpMapping[token]) !== null && _a !== void 0 ? _a : token; }).join(' ');
     // Convert the ASM tokens to AuthenticationInstructions
     const instructions = asm.split(' ').map((token) => {
         if (token.startsWith('OP_')) {
             return { opcode: exports.Op[token] };
         }
-        return libauth_1.parseBytecode(libauth_1.encodeDataPush(libauth_1.hexToBin(token)))[0];
+        return (0, libauth_1.parseBytecode)((0, libauth_1.encodeDataPush)((0, libauth_1.hexToBin)(token)))[0];
     });
     // Convert the AuthenticationInstructions to bytecode
-    return libauth_1.serializeAuthenticationInstructions(instructions);
+    return (0, libauth_1.serializeAuthenticationInstructions)(instructions);
 }
 exports.asmToBytecode = asmToBytecode;
 function bytecodeToAsm(bytecode) {
     // Convert the bytecode to libauth's ASM format
-    let asm = libauth_1.disassembleBytecodeBCH(bytecode);
+    let asm = (0, libauth_1.disassembleBytecodeBCH)(bytecode);
     // COnvert libauth's ASM format to BITBOX's
     asm = asm.replace(/OP_PUSHBYTES_[^\s]+/g, '');
     asm = asm.replace(/OP_PUSHDATA[^\s]+ [^\s]+/g, '');
     asm = asm.replace(/(^|\s)0x/g, ' ');
+    // Replace OP_UNKNOWN... with the correct ops
+    asm = asm.split(' ').map((token) => { var _a; return (_a = exports.reverseIntrospectionOpMapping[token]) !== null && _a !== void 0 ? _a : token; }).join(' ');
     // Remove any duplicate whitespace
     asm = asm.replace(/\s+/g, ' ').trim();
     return asm;
@@ -93,7 +114,7 @@ function calculateBytesize(script) {
 exports.calculateBytesize = calculateBytesize;
 // For encoding OP_RETURN data (doesn't require BIP62.3 / MINIMALDATA)
 function encodeNullDataScript(chunks) {
-    return libauth_1.flattenBinArray(chunks.map((chunk) => {
+    return (0, libauth_1.flattenBinArray)(chunks.map((chunk) => {
         if (typeof chunk === 'number') {
             return new Uint8Array([chunk]);
         }
@@ -132,7 +153,7 @@ function replaceBytecodeNop(script) {
     // Retrieve size of current OP_SPLIT
     let oldCut = script[index];
     if (oldCut instanceof Uint8Array) {
-        oldCut = data_1.decodeInt(oldCut);
+        oldCut = (0, data_js_1.decodeInt)(oldCut);
     }
     else if (oldCut === exports.Op.OP_0) {
         oldCut = 0;
@@ -144,10 +165,10 @@ function replaceBytecodeNop(script) {
         return script;
     }
     // Update the old OP_SPLIT by adding either 1 or 3 to it
-    script[index] = data_1.encodeInt(oldCut + 1);
+    script[index] = (0, data_js_1.encodeInt)(oldCut + 1);
     const bytecodeSize = calculateBytesize(script);
     if (bytecodeSize > 252) {
-        script[index] = data_1.encodeInt(oldCut + 3);
+        script[index] = (0, data_js_1.encodeInt)(oldCut + 3);
     }
     // Minimally encode
     return asmToScript(scriptToAsm(script));
@@ -158,7 +179,7 @@ function generateRedeemScript(baseScript, encodedArgs) {
 }
 exports.generateRedeemScript = generateRedeemScript;
 function optimiseBytecode(script, runs = 1000) {
-    const optimisations = cashproof_optimisations_1.default
+    const optimisations = cashproof_optimisations_js_1.default
         // Split by line and filter all line comments (#)
         .split('\n')
         .map((equiv) => equiv.trim())

package/dist/main/types.d.ts

@@ -12,8 +12,8 @@ export declare class BytesType {
     toString(): string;
 }
 export declare class TupleType {
-    elementType?: PrimitiveType | ArrayType | TupleType | BytesType | undefined;
-    constructor(elementType?: PrimitiveType | ArrayType | TupleType | BytesType | undefined);
+    elementType?: Type | undefined;
+    constructor(elementType?: Type | undefined);
     toString(): string;
 }
 export declare enum PrimitiveType {

package/dist/module/data.js

@@ -17,7 +17,7 @@ export function decodeBool(encodedBool) {
 export function encodeInt(int) {
     return bigIntToScriptNumber(BigInt(int));
 }
-export function decodeInt(encodedInt, maxLength) {
+export function decodeInt(encodedInt, maxLength = 8) {
     const options = { maximumScriptNumberByteLength: maxLength };
     const result = parseBytesAsScriptNumber(encodedInt, options);
     if (isScriptNumberError(result)) {

package/dist/module/index.d.ts

@@ -1,5 +1,5 @@
-export * from './artifact';
-export * from './data';
-export * from './hash';
-export * from './script';
-export * from './types';
+export * from './artifact.js';
+export * from './data.js';
+export * from './hash.js';
+export * from './script.js';
+export * from './types.js';

package/dist/module/index.js

@@ -1,6 +1,6 @@
-export * from './artifact';
-export * from './data';
-export * from './hash';
-export * from './script';
-export * from './types';
+export * from './artifact.js';
+export * from './data.js';
+export * from './hash.js';
+export * from './script.js';
+export * from './types.js';
 //# sourceMappingURL=index.js.map

package/dist/module/script.d.ts

@@ -1,4 +1,8 @@
 import { OpcodesBCH } from '@bitauth/libauth';
+export declare const Op: typeof OpcodesBCH;
+export declare type Op = number;
+export declare type OpOrData = Op | Uint8Array;
+export declare type Script = OpOrData[];
 export declare enum IntrospectionOp {
     OP_INPUTINDEX = 192,
     OP_ACTIVEBYTECODE = 193,
@@ -15,10 +19,8 @@ export declare enum IntrospectionOp {
     OP_OUTPUTVALUE = 204,
     OP_OUTPUTBYTECODE = 205
 }
-export declare const Op: typeof OpcodesBCH;
-export declare type Op = number;
-export declare type OpOrData = Op | Uint8Array;
-export declare type Script = OpOrData[];
+export declare const introspectionOpMapping: any;
+export declare const reverseIntrospectionOpMapping: any;
 export declare function scriptToAsm(script: Script): string;
 export declare function asmToScript(asm: string): Script;
 export declare function scriptToBytecode(script: Script): Uint8Array;

package/dist/module/script.js

@@ -1,6 +1,7 @@
 import { OpcodesBCH, encodeDataPush, parseBytecode, serializeAuthenticationInstructions, hexToBin, disassembleBytecodeBCH, flattenBinArray, } from '@bitauth/libauth';
-import { decodeInt, encodeInt } from './data';
-import OptimisationsEquivFile from './cashproof-optimisations';
+import { decodeInt, encodeInt } from './data.js';
+import OptimisationsEquivFile from './cashproof-optimisations.js';
+export const Op = OpcodesBCH;
 // TODO: Replace this when these opcodes are in Libauth
 export var IntrospectionOp;
 (function (IntrospectionOp) {
@@ -19,7 +20,23 @@ export var IntrospectionOp;
     IntrospectionOp[IntrospectionOp["OP_OUTPUTVALUE"] = 204] = "OP_OUTPUTVALUE";
     IntrospectionOp[IntrospectionOp["OP_OUTPUTBYTECODE"] = 205] = "OP_OUTPUTBYTECODE";
 })(IntrospectionOp || (IntrospectionOp = {}));
-export const Op = OpcodesBCH;
+export const introspectionOpMapping = {
+    OP_INPUTINDEX: 'OP_UNKNOWN192',
+    OP_ACTIVEBYTECODE: 'OP_UNKNOWN193',
+    OP_TXVERSION: 'OP_UNKNOWN194',
+    OP_TXINPUTCOUNT: 'OP_UNKNOWN195',
+    OP_TXOUTPUTCOUNT: 'OP_UNKNOWN196',
+    OP_TXLOCKTIME: 'OP_UNKNOWN197',
+    OP_UTXOVALUE: 'OP_UNKNOWN198',
+    OP_UTXOBYTECODE: 'OP_UNKNOWN199',
+    OP_OUTPOINTTXHASH: 'OP_UNKNOWN200',
+    OP_OUTPOINTINDEX: 'OP_UNKNOWN201',
+    OP_INPUTBYTECODE: 'OP_UNKNOWN202',
+    OP_INPUTSEQUENCENUMBER: 'OP_UNKNOWN203',
+    OP_OUTPUTVALUE: 'OP_UNKNOWN204',
+    OP_OUTPUTBYTECODE: 'OP_UNKNOWN205',
+};
+export const reverseIntrospectionOpMapping = Object.fromEntries(Object.entries(introspectionOpMapping).map(([k, v]) => ([v, k])));
 export function scriptToAsm(script) {
     return bytecodeToAsm(scriptToBytecode(script));
 }
@@ -47,6 +64,8 @@ export function bytecodeToScript(bytecode) {
 export function asmToBytecode(asm) {
     // Remove any duplicate whitespace
     asm = asm.replace(/\s+/g, ' ').trim();
+    // Replace introspection ops with OP_UNKNOWN... so Libauth gets it
+    asm = asm.split(' ').map((token) => { var _a; return (_a = introspectionOpMapping[token]) !== null && _a !== void 0 ? _a : token; }).join(' ');
     // Convert the ASM tokens to AuthenticationInstructions
     const instructions = asm.split(' ').map((token) => {
         if (token.startsWith('OP_')) {
@@ -64,6 +83,8 @@ export function bytecodeToAsm(bytecode) {
     asm = asm.replace(/OP_PUSHBYTES_[^\s]+/g, '');
     asm = asm.replace(/OP_PUSHDATA[^\s]+ [^\s]+/g, '');
     asm = asm.replace(/(^|\s)0x/g, ' ');
+    // Replace OP_UNKNOWN... with the correct ops
+    asm = asm.split(' ').map((token) => { var _a; return (_a = reverseIntrospectionOpMapping[token]) !== null && _a !== void 0 ? _a : token; }).join(' ');
     // Remove any duplicate whitespace
     asm = asm.replace(/\s+/g, ' ').trim();
     return asm;

package/dist/module/types.d.ts

@@ -12,8 +12,8 @@ export declare class BytesType {
     toString(): string;
 }
 export declare class TupleType {
-    elementType?: PrimitiveType | ArrayType | TupleType | BytesType | undefined;
-    constructor(elementType?: PrimitiveType | ArrayType | TupleType | BytesType | undefined);
+    elementType?: Type | undefined;
+    constructor(elementType?: Type | undefined);
     toString(): string;
 }
 export declare enum PrimitiveType {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cashscript/utils",
-  "version": "0.7.0-next.0",
+  "version": "0.7.2",
   "description": "CashScript utilities and types",
   "keywords": [
     "bitcoin cash",
@@ -46,5 +46,6 @@
     "jest": "^26.6.3",
     "ts-jest": "^26.5.1",
     "typescript": "^4.1.5"
-  }
+  },
+  "gitHead": "0ec0bd1447e2f89e396c3b7e2c027a121e11f4e1"
 }