wip: remove REVERSE_OPS and add check if the chunk is a valid opcode string in OPS

Author: decentraldev1

src/cjs/ops.cjs

@@ -1,6 +1,6 @@
 'use strict';
 Object.defineProperty(exports, '__esModule', { value: true });
-exports.REVERSE_OPS = exports.OPS = void 0;
+exports.OPS = void 0;
 // Define OPS enum
 var OPS;
 (function (OPS) {
@@ -123,4 +123,4 @@ var OPS;
   OPS[(OPS['OP_PUBKEYHASH'] = 253)] = 'OP_PUBKEYHASH';
   OPS[(OPS['OP_PUBKEY'] = 254)] = 'OP_PUBKEY';
   OPS[(OPS['OP_INVALIDOPCODE'] = 255)] = 'OP_INVALIDOPCODE';
-})(OPS || (exports.REVERSE_OPS = exports.OPS = OPS = {}));
+})(OPS || (exports.OPS = OPS = {}));

src/cjs/ops.d.ts

@@ -119,4 +119,4 @@ declare enum OPS {
     OP_PUBKEY = 254,
     OP_INVALIDOPCODE = 255
 }
-export { OPS, OPS as REVERSE_OPS };
+export { OPS };

src/cjs/script.cjs

@@ -209,7 +209,7 @@ function toASM(chunks) {
         chunk = op;
       }
       // opcode!
-      return ops_js_1.REVERSE_OPS[chunk];
+      return ops_js_1.OPS[chunk];
     })
     .join(' ');
 }
@@ -224,7 +224,7 @@ function fromASM(asm) {
   return compile(
     asm.split(' ').map(chunk => {
       // Check if the chunk is an opcode
-      if (chunk in ops_js_1.OPS) {
+      if (isNaN(Number(chunk)) && chunk in ops_js_1.OPS) {
         return ops_js_1.OPS[chunk];
       }
       // Validate if the chunk is a hexadecimal string

src/esm/ops.js

@@ -122,4 +122,4 @@ var OPS;
   OPS[(OPS['OP_INVALIDOPCODE'] = 255)] = 'OP_INVALIDOPCODE';
 })(OPS || (OPS = {}));
 // Export modules
-export { OPS, OPS as REVERSE_OPS };
+export { OPS };

src/esm/script.js

@@ -3,7 +3,7 @@
  * @packageDocumentation
  */
 import * as bip66 from './bip66.js';
-import { OPS, REVERSE_OPS } from './ops.js';
+import { OPS } from './ops.js';
 import * as pushdata from './push_data.js';
 import * as scriptNumber from './script_number.js';
 import * as scriptSignature from './script_signature.js';
@@ -147,7 +147,7 @@ export function toASM(chunks) {
         chunk = op;
       }
       // opcode!
-      return REVERSE_OPS[chunk];
+      return OPS[chunk];
     })
     .join(' ');
 }
@@ -162,7 +162,7 @@ export function fromASM(asm) {
   return compile(
     asm.split(' ').map(chunk => {
       // Check if the chunk is an opcode
-      if (chunk in OPS) {
+      if (isNaN(Number(chunk)) && chunk in OPS) {
         return OPS[chunk];
       }
       // Validate if the chunk is a hexadecimal string

ts_src/ops.ts

@@ -136,4 +136,4 @@ enum OPS {
 }
 
 // Export modules
-export { OPS, OPS as REVERSE_OPS };
+export { OPS };

ts_src/script.ts

@@ -3,7 +3,7 @@
  * @packageDocumentation
  */
 import * as bip66 from './bip66.js';
-import { OPS, REVERSE_OPS } from './ops.js';
+import { OPS } from './ops.js';
 import { Stack } from './payments/index.js';
 import * as pushdata from './push_data.js';
 import * as scriptNumber from './script_number.js';
@@ -187,7 +187,7 @@ export function toASM(chunks: Uint8Array | Array<number | Uint8Array>): string {
       }
 
       // opcode!
-      return REVERSE_OPS[chunk];
+      return OPS[chunk];
     })
     .join(' ');
 }
@@ -204,7 +204,7 @@ export function fromASM(asm: string): Uint8Array {
   return compile(
     asm.split(' ').map((chunk: string): number | Uint8Array => {
       // Check if the chunk is an opcode
-      if (chunk in OPS) {
+      if (isNaN(Number(chunk)) && chunk in OPS) {
         return OPS[chunk as keyof typeof OPS];
       }