@cashscript/utils 0.11.0-next.4 → 0.11.0

package/dist/artifact.js

@@ -8,9 +8,10 @@ export function formatArtifact(artifact, format) {
 }
 const indent = (level) => '  '.repeat(level);
 function stringifyAsTs(obj, indentationLevel = 1) {
-    // For strings, we use JSON.stringify, but we convert double quotes to single quotes
+    // For strings we use JSON.stringify to handle escaping, but we want to use single quotes instead of double quotes
+    // around string values inside objects, to match regular TS style
     if (typeof obj === 'string') {
-        return JSON.stringify(obj).replace(/'/g, "\\'").replace(/"/g, "'");
+        return `'${JSON.stringify(obj).replace(/'/g, "\\'").replace(/\\"/g, '"').slice(1, -1)}'`;
     }
     // Numbers and booleans are just converted to strings
     if (typeof obj === 'number' || typeof obj === 'boolean') {

package/dist/optimisations.js

@@ -119,6 +119,6 @@ const unprovableOptimisations = [
     ['OP_DUP OP_OR', ''],
 ];
 // Note: we moved these optimisations into a single file, but kept the exact same order as before,
-// because the order in which oprimisations are applied can impact the output.
+// because the order in which optimisations are applied can impact the output.
 export const optimisationReplacements = [...provableOptimisations, ...unprovableOptimisations];
 //# sourceMappingURL=optimisations.js.map

package/dist/script.js

@@ -180,15 +180,18 @@ function replaceOps(script, locationData, logs, requires, constructorParamLength
             const scriptIndex = processedAsm === '' ? 0 : [...processedAsm.matchAll(/\s+/g)].length + 1;
             const patternLength = [...pattern.matchAll(/\s+/g)].length + 1;
             const replacementLength = replacement === '' ? 0 : [...replacement.matchAll(/\s+/g)].length + 1;
-            // We get the locationdata entries for every opcode in the pattern
+            // We get the locationData entries for every opcode in the pattern
             const patternLocations = newLocationData.slice(scriptIndex, scriptIndex + patternLength);
             // We get the lowest start location and highest end location of the pattern
             const lowestStart = getLowestStartLocation(patternLocations);
             const highestEnd = getHighestEndLocation(patternLocations);
-            // If any of the pattern locations have a position hint of END, we use that as the position hint
-            const positionHint = patternLocations.some((location) => location.positionHint === PositionHint.END)
-                ? PositionHint.END
-                : PositionHint.START;
+            // Initially we set the position hint to END if any of the pattern locations have a position hint of END
+            // It turned out that this was not the correct approach in the case of OP_NOT OP_IF => OP_NOTIF,
+            // because OP_IF and OP_NOTIF are START opcodes, and OP_NOT is an END opcode.
+            // After reviewing the entire list of optimisations, we set the position hint to the last location's position hint
+            // which we believe to be the correct approach, but it is hard to reason about.
+            // We've also consulted with AI (o3-max) to help us reason about this, and it seems to be the correct approach.
+            const positionHint = patternLocations.at(-1)?.positionHint ?? PositionHint.START;
             // We merge the lowest start and highest end locations into a single location data entry
             const mergedLocation = {
                 location: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cashscript/utils",
-  "version": "0.11.0-next.4",
+  "version": "0.11.0",
   "description": "CashScript utilities and types",
   "keywords": [
     "bitcoin cash",
@@ -52,5 +52,5 @@
     "jest": "^29.7.0",
     "typescript": "^5.7.3"
   },
-  "gitHead": "68cdf30db455e3eef448a4feacfff0f5f26a36a7"
+  "gitHead": "47a9dbc781e009eea4704735a256ba05ae03f719"
 }