From 907eed5c0658b1ea4ddc4a65924eb6fec1d4a170 Mon Sep 17 00:00:00 2001
From: mainnet-pat <mainnet_pat@protonmail.com>
Date: Wed, 22 Nov 2023 13:10:07 +0000
Subject: [PATCH 001/171] Checkpoint after merge into upstream

---
 packages/cashc/jest.setup.js                  |   2 +
 packages/cashc/src/artifact/Artifact.ts       |  14 +-
 packages/cashc/src/ast/Location.ts            |  10 +-
 packages/cashc/src/compiler.ts                |   5 +-
 .../src/generation/GenerateTargetTraversal.ts | 177 +++---
 packages/cashscript/package.json              |   4 +-
 packages/cashscript/src/Contract.ts           |   6 +-
 packages/cashscript/src/LibauthTemplate.ts    | 547 ++++++++++++++++++
 .../cashscript/test/LibauthTemplate.test.ts   |  54 ++
 .../test/fixture/transfer_with_timeout.json   |  10 +-
 packages/utils/src/artifact.ts                |  11 +
 packages/utils/src/index.ts                   |   2 +
 packages/utils/src/libauth.ts                 |  47 ++
 packages/utils/src/sourceMap.ts               | 114 ++++
 packages/utils/test/libauth.test.ts           |  48 ++
 packages/utils/test/sourceMap.test.ts         |  84 +++
 yarn.lock                                     |  10 +
 17 files changed, 1054 insertions(+), 91 deletions(-)
 create mode 100644 packages/cashscript/src/LibauthTemplate.ts
 create mode 100644 packages/cashscript/test/LibauthTemplate.test.ts
 create mode 100644 packages/utils/src/libauth.ts
 create mode 100644 packages/utils/src/sourceMap.ts
 create mode 100644 packages/utils/test/libauth.test.ts
 create mode 100644 packages/utils/test/sourceMap.test.ts

diff --git a/packages/cashc/jest.setup.js b/packages/cashc/jest.setup.js
index e69de29b..0327c5de 100644
--- a/packages/cashc/jest.setup.js
+++ b/packages/cashc/jest.setup.js
@@ -0,0 +1,2 @@
+import { inspect } from 'util';
+inspect.defaultOptions.depth = 10;
diff --git a/packages/cashc/src/artifact/Artifact.ts b/packages/cashc/src/artifact/Artifact.ts
index e830b60f..5a4c88fe 100644
--- a/packages/cashc/src/artifact/Artifact.ts
+++ b/packages/cashc/src/artifact/Artifact.ts
@@ -2,7 +2,13 @@ import { Artifact, Script, scriptToAsm } from '@cashscript/utils';
 import { version } from '../index.js';
 import { Ast } from '../ast/AST.js';
 
-export function generateArtifact(ast: Ast, script: Script, source: string): Artifact {
+export function generateArtifact(
+    ast: Ast,
+    script: Script,
+    source: string,
+    debugScript: Script,
+    sourceMap: string
+  ): Artifact {
   const { contract } = ast;
 
   const constructorInputs = contract.parameters
@@ -17,6 +23,7 @@ export function generateArtifact(ast: Ast, script: Script, source: string): Arti
   }));
 
   const bytecode = scriptToAsm(script);
+  const debugBytecode = scriptToAsm(debugScript);
 
   return {
     contractName: contract.name,
@@ -24,6 +31,11 @@ export function generateArtifact(ast: Ast, script: Script, source: string): Arti
     abi,
     bytecode,
     source,
+    debug: {
+      bytecode: debugBytecode,
+      sourceMap: sourceMap,
+      logs: [],
+    },
     compiler: {
       name: 'cashc',
       version,
diff --git a/packages/cashc/src/ast/Location.ts b/packages/cashc/src/ast/Location.ts
index 93109ea0..1ef15714 100644
--- a/packages/cashc/src/ast/Location.ts
+++ b/packages/cashc/src/ast/Location.ts
@@ -1,7 +1,8 @@
 import type { ParserRuleContext } from 'antlr4ts/ParserRuleContext.js';
 import type { Token } from 'antlr4ts';
+import { LocationI } from '@cashscript/utils';
 
-export class Location {
+export class Location implements LocationI {
   constructor(public start: Point, public end: Point) {}
 
   static fromCtx(ctx: ParserRuleContext): Location | undefined {
@@ -23,6 +24,13 @@ export class Location {
     return new Location(start, end);
   }
 
+  static fromObject(object: LocationI): Location {
+    const start = new Point(object.start.line, object.start.column);
+    const end = new Point(object.end.line, object.end.column);
+
+    return new Location(start, end);
+  }
+
   text(code: string): string {
     return code.slice(this.start.offset(code), this.end.offset(code));
   }
diff --git a/packages/cashc/src/compiler.ts b/packages/cashc/src/compiler.ts
index e5779275..a38b5718 100644
--- a/packages/cashc/src/compiler.ts
+++ b/packages/cashc/src/compiler.ts
@@ -1,4 +1,4 @@
-import { Artifact, optimiseBytecode } from '@cashscript/utils';
+import { Artifact, generateSourceMap, optimiseBytecode } from '@cashscript/utils';
 import { ANTLRInputStream, CommonTokenStream } from 'antlr4ts';
 import fs, { PathLike } from 'fs';
 import { generateArtifact } from './artifact/Artifact.js';
@@ -28,8 +28,9 @@ export function compileString(code: string): Artifact {
 
   // Bytecode optimisation
   const optimisedBytecode = optimiseBytecode(bytecode);
+  const sourceMap = generateSourceMap(traversal.locationData);
 
-  return generateArtifact(ast, optimisedBytecode, code);
+  return generateArtifact(ast, optimisedBytecode, code, bytecode, sourceMap);
 }
 
 export function compileFile(codeFile: PathLike): Artifact {
diff --git a/packages/cashc/src/generation/GenerateTargetTraversal.ts b/packages/cashc/src/generation/GenerateTargetTraversal.ts
index 337510e0..e7bc46b2 100644
--- a/packages/cashc/src/generation/GenerateTargetTraversal.ts
+++ b/packages/cashc/src/generation/GenerateTargetTraversal.ts
@@ -10,6 +10,9 @@ import {
   resultingType,
   Script,
   scriptToAsm,
+  generateSourceMap,
+  LocationI,
+  LocationData
 } from '@cashscript/utils';
 import {
   ContractNode,
@@ -49,19 +52,24 @@ import {
   compileTimeOp,
   compileUnaryOp,
 } from './utils.js';
+import { Location } from '../ast/Location.js';
 
-export default class GenerateTargetTraversal extends AstTraversal {
+export default class GenerateTargetTraversalWithLocation extends AstTraversal {
+  locationData: LocationData = [];
   output: Script = [];
   stack: string[] = [];
+  souceMap: string;
 
   private scopeDepth = 0;
   private currentFunction: FunctionDefinitionNode;
 
-  private emit(op: OpOrData | OpOrData[]): void {
+  private emit(op: OpOrData | OpOrData[], location: LocationI, positionHint?: number): void {
     if (Array.isArray(op)) {
-      this.output.push(...op);
+      op.forEach(val => this.output.push(val as Op));
+      op.forEach(_ => this.locationData.push([location, positionHint]));
     } else {
       this.output.push(op);
+      this.locationData.push([location, positionHint]);
     }
   }
 
@@ -99,6 +107,8 @@ export default class GenerateTargetTraversal extends AstTraversal {
     // Minimally encode output by going Script -> ASM -> Script
     this.output = asmToScript(scriptToAsm(this.output));
 
+    this.souceMap = generateSourceMap(this.locationData);
+
     return node;
   }
 
@@ -111,35 +121,35 @@ export default class GenerateTargetTraversal extends AstTraversal {
       node.functions = node.functions.map((f, i) => {
         const stackCopy = [...this.stack];
         const selectorIndex = this.getStackIndex('$$');
-        this.emit(encodeInt(BigInt(selectorIndex)));
+        this.emit(encodeInt(BigInt(selectorIndex)), f.location!);
         if (i === node.functions.length - 1) {
-          this.emit(Op.OP_ROLL);
+          this.emit(Op.OP_ROLL, f.location!);
           this.removeFromStack(selectorIndex);
         } else {
-          this.emit(Op.OP_PICK);
+          this.emit(Op.OP_PICK, f.location!);
         }
 
         // All functions are if-else statements, except the final one which is
         // enforced with NUMEQUALVERIFY
-        this.emit(encodeInt(BigInt(i)));
-        this.emit(Op.OP_NUMEQUAL);
+        this.emit(encodeInt(BigInt(i)), f.location!);
+        this.emit(Op.OP_NUMEQUAL, f.location!);
         if (i < node.functions.length - 1) {
-          this.emit(Op.OP_IF);
+          this.emit(Op.OP_IF, f.location!);
         } else {
-          this.emit(Op.OP_VERIFY);
+          this.emit(Op.OP_VERIFY, f.location!);
         }
 
         f = this.visit(f) as FunctionDefinitionNode;
 
         if (i < node.functions.length - 1) {
-          this.emit(Op.OP_ELSE);
+          this.emit(Op.OP_ELSE, f.location!, 1);
         }
 
         this.stack = [...stackCopy];
         return f;
       });
       for (let i = 0; i < node.functions.length - 1; i += 1) {
-        this.emit(Op.OP_ENDIF);
+        this.emit(Op.OP_ENDIF, node.functions[i+1].location!, 1);
       }
     }
 
@@ -152,17 +162,18 @@ export default class GenerateTargetTraversal extends AstTraversal {
     node.parameters = this.visitList(node.parameters) as ParameterNode[];
     node.body = this.visit(node.body) as BlockNode;
 
-    this.removeFinalVerify();
-    this.cleanStack();
+    this.removeFinalVerify(node.body);
+    this.cleanStack(node.body);
 
     return node;
   }
 
-  removeFinalVerify(): void {
+  removeFinalVerify(node: Node): void {
     // After EnsureFinalRequireTraversal, we know that the final opcodes are either
     // "OP_VERIFY", "OP_CHECK{LOCKTIME|SEQUENCE}VERIFY OP_DROP" or "OP_ENDIF"
 
     const finalOp = this.output.pop() as Op;
+    const [location] = this.locationData.pop() as [Location, number?];
 
     // If the final op is OP_VERIFY and the stack size is less than 4 we remove it from the script
     // - We have the stack size check because it is more efficient to use 2DROP rather than NIP
@@ -172,22 +183,22 @@ export default class GenerateTargetTraversal extends AstTraversal {
       // we add it back to the stack
       this.pushToStack('(value)');
     } else {
-      this.emit(finalOp);
+      this.emit(finalOp, location!);
 
       // At this point there is no verification value left on the stack:
       //  - scoped stack is cleared inside branch ended by OP_ENDIF
       //  - OP_CHECK{LOCKTIME|SEQUENCE}VERIFY OP_DROP does not leave a verification value
       // so we add OP_1 to the script (indicating success)
-      this.emit(Op.OP_1);
+      this.emit(Op.OP_1, node.location!, 1);
       this.pushToStack('(value)');
     }
   }
 
-  cleanStack(): void {
+  cleanStack(node: Node): void {
     // Keep final verification value, OP_NIP the other stack values
     const stackSize = this.stack.length;
     for (let i = 0; i < stackSize - 1; i += 1) {
-      this.emit(Op.OP_NIP);
+      this.emit(Op.OP_NIP, node.location!, 1);
       this.nipFromStack();
     }
   }
@@ -215,7 +226,7 @@ export default class GenerateTargetTraversal extends AstTraversal {
   visitAssign(node: AssignNode): Node {
     node.expression = this.visit(node.expression);
     if (this.scopeDepth > 0) {
-      this.emitReplace(this.getStackIndex(node.identifier.name));
+      this.emitReplace(this.getStackIndex(node.identifier.name), node);
       this.popFromStack();
     } else {
       this.popFromStack();
@@ -226,24 +237,25 @@ export default class GenerateTargetTraversal extends AstTraversal {
 
   // This algorithm can be optimised for hardcoded depths
   // See thesis for explanation
-  emitReplace(index: number): void {
-    this.emit(encodeInt(BigInt(index)));
-    this.emit(Op.OP_ROLL);
-    this.emit(Op.OP_DROP);
+  emitReplace(index: number, node: Node): void {
+    console.log("replace", index, node)
+    this.emit(encodeInt(BigInt(index)), node.location!);
+    this.emit(Op.OP_ROLL, node.location!);
+    this.emit(Op.OP_DROP, node.location!);
     for (let i = 0; i < index - 1; i += 1) {
-      this.emit(Op.OP_SWAP);
+      this.emit(Op.OP_SWAP, node.location!);
       if (i < index - 2) {
-        this.emit(Op.OP_TOALTSTACK);
+        this.emit(Op.OP_TOALTSTACK, node.location!);
       }
     }
     for (let i = 0; i < index - 2; i += 1) {
-      this.emit(Op.OP_FROMALTSTACK);
+      this.emit(Op.OP_FROMALTSTACK, node.location!);
     }
   }
 
   visitTimeOp(node: TimeOpNode): Node {
     node.expression = this.visit(node.expression);
-    this.emit(compileTimeOp(node.timeOp));
+    this.emit(compileTimeOp(node.timeOp), node.location!);
     this.popFromStack();
     return node;
   }
@@ -251,7 +263,7 @@ export default class GenerateTargetTraversal extends AstTraversal {
   visitRequire(node: RequireNode): Node {
     node.expression = this.visit(node.expression);
 
-    this.emit(Op.OP_VERIFY);
+    this.emit(Op.OP_VERIFY, node.location!);
     this.popFromStack();
     return node;
   }
@@ -261,29 +273,30 @@ export default class GenerateTargetTraversal extends AstTraversal {
     this.popFromStack();
 
     this.scopeDepth += 1;
-    this.emit(Op.OP_IF);
+    this.emit(Op.OP_IF, node.ifBlock.location!);
 
     let stackDepth = this.stack.length;
     node.ifBlock = this.visit(node.ifBlock);
-    this.removeScopedVariables(stackDepth);
+    this.removeScopedVariables(stackDepth, node);
 
     if (node.elseBlock) {
-      this.emit(Op.OP_ELSE);
+      this.emit(Op.OP_ELSE, node.elseBlock.location!, 1);
       stackDepth = this.stack.length;
       node.elseBlock = this.visit(node.elseBlock);
-      this.removeScopedVariables(stackDepth);
+      this.removeScopedVariables(stackDepth, node);
     }
 
-    this.emit(Op.OP_ENDIF);
+    this.emit(Op.OP_ENDIF, node.elseBlock ? node.elseBlock.location! : node.ifBlock.location!, 1);
     this.scopeDepth -= 1;
 
     return node;
   }
 
-  removeScopedVariables(depthBeforeScope: number): void {
+  removeScopedVariables(depthBeforeScope: number, node: Node): void {
     const dropCount = this.stack.length - depthBeforeScope;
+    console.warn(dropCount)
     for (let i = 0; i < dropCount; i += 1) {
-      this.emit(Op.OP_DROP);
+      this.emit(Op.OP_DROP, node.location!);
       this.popFromStack();
     }
   }
@@ -294,11 +307,11 @@ export default class GenerateTargetTraversal extends AstTraversal {
     // Special case for sized bytes cast, since it has another node to traverse
     if (node.size) {
       node.size = this.visit(node.size);
-      this.emit(Op.OP_NUM2BIN);
+      this.emit(Op.OP_NUM2BIN, node.location!);
       this.popFromStack();
     }
 
-    this.emit(compileCast(node.expression.type as PrimitiveType, node.type));
+    this.emit(compileCast(node.expression.type as PrimitiveType, node.type), node.location!);
     this.popFromStack();
     this.pushToStack('(value)');
     return node;
@@ -311,7 +324,7 @@ export default class GenerateTargetTraversal extends AstTraversal {
 
     node.parameters = this.visitList(node.parameters);
 
-    this.emit(compileGlobalFunction(node.identifier.name as GlobalFunction));
+    this.emit(compileGlobalFunction(node.identifier.name as GlobalFunction), node.location!);
     this.popFromStack(node.parameters.length);
     this.pushToStack('(value)');
 
@@ -319,10 +332,10 @@ export default class GenerateTargetTraversal extends AstTraversal {
   }
 
   visitMultiSig(node: FunctionCallNode): Node {
-    this.emit(encodeBool(false));
+    this.emit(encodeBool(false), node.location!);
     this.pushToStack('(value)');
     node.parameters = this.visitList(node.parameters);
-    this.emit(Op.OP_CHECKMULTISIG);
+    this.emit(Op.OP_CHECKMULTISIG, node.location!);
     const sigs = node.parameters[0] as ArrayNode;
     const pks = node.parameters[1] as ArrayNode;
     this.popFromStack(sigs.elements.length + pks.elements.length + 3);
@@ -334,70 +347,70 @@ export default class GenerateTargetTraversal extends AstTraversal {
   visitInstantiation(node: InstantiationNode): Node {
     if (node.identifier.name === Class.LOCKING_BYTECODE_P2PKH) {
       // OP_DUP OP_HASH160 OP_PUSH<20>
-      this.emit(hexToBin('76a914'));
+      this.emit(hexToBin('76a914'), node.location!);
       this.pushToStack('(value)');
       // <pkh>
       this.visit(node.parameters[0]);
-      this.emit(Op.OP_CAT);
+      this.emit(Op.OP_CAT, node.location!);
       // OP_EQUAL OP_CHECKSIG
-      this.emit(hexToBin('88ac'));
-      this.emit(Op.OP_CAT);
+      this.emit(hexToBin('88ac'), node.location!);
+      this.emit(Op.OP_CAT, node.location!);
       this.popFromStack(2);
     } else if (node.identifier.name === Class.LOCKING_BYTECODE_P2SH20) {
       // OP_HASH160 OP_PUSH<20>
-      this.emit(hexToBin('a914'));
+      this.emit(hexToBin('a914'), node.location!);
       this.pushToStack('(value)');
       // <script hash>
       this.visit(node.parameters[0]);
-      this.emit(Op.OP_CAT);
+      this.emit(Op.OP_CAT, node.location!);
       // OP_EQUAL
-      this.emit(hexToBin('87'));
-      this.emit(Op.OP_CAT);
+      this.emit(hexToBin('87'), node.location!);
+      this.emit(Op.OP_CAT, node.location!);
       this.popFromStack(2);
     } else if (node.identifier.name === Class.LOCKING_BYTECODE_P2SH32) {
       // OP_HASH256 OP_PUSH<32>
-      this.emit(hexToBin('aa20'));
+      this.emit(hexToBin('aa20'), node.location!);
       this.pushToStack('(value)');
       // <script hash>
       this.visit(node.parameters[0]);
-      this.emit(Op.OP_CAT);
+      this.emit(Op.OP_CAT, node.location!);
       // OP_EQUAL
-      this.emit(hexToBin('87'));
-      this.emit(Op.OP_CAT);
+      this.emit(hexToBin('87'), node.location!);
+      this.emit(Op.OP_CAT, node.location!);
       this.popFromStack(2);
     } else if (node.identifier.name === Class.LOCKING_BYTECODE_NULLDATA) {
       // Total script = OP_RETURN (<VarInt> <chunk>)+
       // OP_RETURN
-      this.emit(hexToBin('6a'));
+      this.emit(hexToBin('6a'), node.location!);
       this.pushToStack('(value)');
       const { elements } = node.parameters[0] as ArrayNode;
       // <VarInt data chunk size (dynamic)>
       elements.forEach((el) => {
         this.visit(el);
         // Push the element's size (and calculate VarInt)
-        this.emit(Op.OP_SIZE);
+        this.emit(Op.OP_SIZE, el.location!);
         if (el instanceof HexLiteralNode) {
           // If the argument is a literal, we know its size
           if (el.value.byteLength > 75) {
-            this.emit(hexToBin('4c'));
-            this.emit(Op.OP_SWAP);
-            this.emit(Op.OP_CAT);
+            this.emit(hexToBin('4c'), el.location!);
+            this.emit(Op.OP_SWAP, el.location!);
+            this.emit(Op.OP_CAT, el.location!);
           }
         } else {
           // If the argument is not a literal, the script needs to check size
-          this.emit(Op.OP_DUP);
-          this.emit(encodeInt(75n));
-          this.emit(Op.OP_GREATERTHAN);
-          this.emit(Op.OP_IF);
-          this.emit(hexToBin('4c'));
-          this.emit(Op.OP_SWAP);
-          this.emit(Op.OP_CAT);
-          this.emit(Op.OP_ENDIF);
+          this.emit(Op.OP_DUP, el.location!);
+          this.emit(encodeInt(75n), el.location!);
+          this.emit(Op.OP_GREATERTHAN, el.location!);
+          this.emit(Op.OP_IF, el.location!);
+          this.emit(hexToBin('4c'), el.location!);
+          this.emit(Op.OP_SWAP, el.location!);
+          this.emit(Op.OP_CAT, el.location!);
+          this.emit(Op.OP_ENDIF, el.location!);
         }
         // Concat size and arguments
-        this.emit(Op.OP_SWAP);
-        this.emit(Op.OP_CAT);
-        this.emit(Op.OP_CAT);
+        this.emit(Op.OP_SWAP, el.location!);
+        this.emit(Op.OP_CAT, el.location!);
+        this.emit(Op.OP_CAT, el.location!);
         this.popFromStack();
       });
       this.popFromStack();
@@ -414,10 +427,10 @@ export default class GenerateTargetTraversal extends AstTraversal {
     node.tuple = this.visit(node.tuple);
 
     if (node.index === 0) {
-      this.emit(Op.OP_DROP);
+      this.emit(Op.OP_DROP, node.location!);
       this.popFromStack();
     } else if (node.index === 1) {
-      this.emit(Op.OP_NIP);
+      this.emit(Op.OP_NIP, node.location!);
       this.nipFromStack();
     }
 
@@ -428,7 +441,7 @@ export default class GenerateTargetTraversal extends AstTraversal {
     node.left = this.visit(node.left);
     node.right = this.visit(node.right);
     const isNumeric = resultingType(node.left.type, node.right.type) === PrimitiveType.INT;
-    this.emit(compileBinaryOp(node.operator, isNumeric));
+    this.emit(compileBinaryOp(node.operator, isNumeric), node.location!);
     this.popFromStack(2);
     this.pushToStack('(value)');
     if (node.operator === BinaryOperator.SPLIT) this.pushToStack('(value)');
@@ -437,36 +450,36 @@ export default class GenerateTargetTraversal extends AstTraversal {
 
   visitUnaryOp(node: UnaryOpNode): Node {
     node.expression = this.visit(node.expression);
-    this.emit(compileUnaryOp(node.operator));
+    this.emit(compileUnaryOp(node.operator), node.location!);
     this.popFromStack();
     this.pushToStack('(value)');
     return node;
   }
 
   visitNullaryOp(node: NullaryOpNode): Node {
-    this.emit(compileNullaryOp(node.operator));
+    this.emit(compileNullaryOp(node.operator), node.location!);
     this.pushToStack('(value)');
     return node;
   }
 
   visitArray(node: ArrayNode): Node {
     node.elements = this.visitList(node.elements);
-    this.emit(encodeInt(BigInt(node.elements.length)));
+    this.emit(encodeInt(BigInt(node.elements.length)), node.location!);
     this.pushToStack('(value)');
     return node;
   }
 
   visitIdentifier(node: IdentifierNode): Node {
     const stackIndex = this.getStackIndex(node.name);
-    this.emit(encodeInt(BigInt(stackIndex)));
+    this.emit(encodeInt(BigInt(stackIndex)), node.location!);
 
     // If the final use is inside an if-statement, we still OP_PICK it
     // We do this so that there's no difference in stack depths between execution paths
     if (this.isOpRoll(node)) {
-      this.emit(Op.OP_ROLL);
+      this.emit(Op.OP_ROLL, node.location!);
       this.removeFromStack(stackIndex);
     } else {
-      this.emit(Op.OP_PICK);
+      this.emit(Op.OP_PICK, node.location!);
     }
 
     this.pushToStack('(value)');
@@ -478,25 +491,25 @@ export default class GenerateTargetTraversal extends AstTraversal {
   }
 
   visitBoolLiteral(node: BoolLiteralNode): Node {
-    this.emit(encodeBool(node.value));
+    this.emit(encodeBool(node.value), node.location!);
     this.pushToStack('(value)');
     return node;
   }
 
   visitIntLiteral(node: IntLiteralNode): Node {
-    this.emit(encodeInt(node.value));
+    this.emit(encodeInt(node.value), node.location!);
     this.pushToStack('(value)');
     return node;
   }
 
   visitStringLiteral(node: StringLiteralNode): Node {
-    this.emit(encodeString(node.value));
+    this.emit(encodeString(node.value), node.location!);
     this.pushToStack('(value)');
     return node;
   }
 
   visitHexLiteral(node: HexLiteralNode): Node {
-    this.emit(node.value);
+    this.emit(node.value, node.location!);
     this.pushToStack('(value)');
     return node;
   }
diff --git a/packages/cashscript/package.json b/packages/cashscript/package.json
index 3e5caa7a..a744d7bd 100644
--- a/packages/cashscript/package.json
+++ b/packages/cashscript/package.json
@@ -49,11 +49,13 @@
     "bitcoin-rpc-promise-retry": "^1.3.0",
     "delay": "^5.0.0",
     "electrum-cash": "^2.0.10",
-    "fast-deep-equal": "^3.1.3"
+    "fast-deep-equal": "^3.1.3",
+    "pako": "^2.1.0"
   },
   "devDependencies": {
     "@jest/globals": "^29.4.1",
     "@psf/bch-js": "^4.15.0",
+    "@types/pako": "^2.0.3",
     "bip39": "^3.0.4",
     "eslint": "^7.20.0",
     "jest": "^29.4.1",
diff --git a/packages/cashscript/src/Contract.ts b/packages/cashscript/src/Contract.ts
index 1a013bfb..56311bc7 100644
--- a/packages/cashscript/src/Contract.ts
+++ b/packages/cashscript/src/Contract.ts
@@ -34,12 +34,12 @@ export class Contract {
   unlock: Record<string, ContractUnlocker>;
 
   redeemScript: Script;
-  provider: NetworkProvider;
+  public provider: NetworkProvider;
   private addressType: 'p2sh20' | 'p2sh32';
 
   constructor(
-    private artifact: Artifact,
-    constructorArgs: Argument[],
+    public artifact: Artifact,
+    public constructorArgs: Argument[],
     private options?: ContractOptions,
   ) {
     this.provider = this.options?.provider ?? new ElectrumNetworkProvider();
diff --git a/packages/cashscript/src/LibauthTemplate.ts b/packages/cashscript/src/LibauthTemplate.ts
new file mode 100644
index 00000000..d9c9be94
--- /dev/null
+++ b/packages/cashscript/src/LibauthTemplate.ts
@@ -0,0 +1,547 @@
+import { Contract } from "./Contract.js";
+import { AbiFunction, Artifact, PrimitiveType, asmToScript, decodeBool, decodeInt, decodeString, formatLibauthScript } from "@cashscript/utils";
+import {
+  hash160,
+  hexToBin,
+  AuthenticationTemplateScenarioBytecode,
+  AuthenticationTemplateScenarioTransactionOutput,
+  AuthenticationTemplateScenario,
+  AuthenticationTemplateScenarioSourceOutput,
+  decodeTransaction,
+  binToHex,
+  AuthenticationTemplate,
+  AuthenticationTemplateScenarioInput,
+  TransactionBCH,
+  authenticationTemplateToCompilerConfiguration,
+  createCompiler,
+  createVirtualMachineBCHCHIPs,
+} from "@bitauth/libauth";
+import { deflate } from "pako";
+import {
+  UtxoP2PKH,
+  LibauthOutput,
+  Output,
+  Network,
+  Utxo,
+  isUtxoP2PKH,
+} from "../src/interfaces.js";
+import { Argument, encodeArgument as csEncodeArgument } from "./Argument.js";
+import SignatureTemplate from "./SignatureTemplate.js";
+import { Transaction } from "./Transaction.js";
+
+function snake_case(str: string) {
+  return (
+    str &&
+    str
+      .match(
+        /[A-Z]{2,}(?=[A-Z][a-z]+[0-9]*|\b)|[A-Z]?[a-z]+[0-9]*|[A-Z]|[0-9]+/g
+      )!
+      .map((s) => s.toLowerCase())
+      .join("_")
+  );
+}
+const merge = (array: any) =>
+  array.reduce(
+    (prev: any, cur: any) => ({
+      ...prev,
+      ...{ [Object.keys(cur)[0]]: cur[Object.keys(cur)[0]] },
+    }),
+    {}
+  );
+
+const encodeArgument = (
+  argument: Argument,
+  typeStr: string
+): Uint8Array | SignatureTemplate => {
+  if (typeStr === PrimitiveType.INT && argument === 0n) {
+    return Uint8Array.from([0]);
+  }
+  return csEncodeArgument(argument, typeStr);
+};
+
+export const stringify = (any: any, spaces?: number) =>
+  JSON.stringify(
+    any,
+    (_, v) => {
+      if (typeof v === "bigint") {
+        return `${v.toString()}`;
+      }
+      if (v instanceof Uint8Array) {
+        return `${binToHex(v)}`;
+      }
+      return v;
+    },
+    spaces
+  );
+
+export const getBitauthUri = (template: AuthenticationTemplate) => {
+  const base64toBase64Url = (base64: string) =>
+    base64.replace(/\+/g, "-").replace(/\//g, "_");
+  const payload = base64toBase64Url(
+    binToBase64(deflate(utf8ToBin(stringify(template))))
+  );
+  return `https://ide.bitauth.com/import-template/${payload}`;
+};
+
+export const buildTemplate = async ({
+  contract,
+  transaction,
+  manglePrivateKeys,
+  includeSource = false,
+}: {
+  contract: Contract;
+  transaction: Transaction;
+  manglePrivateKeys?: boolean;
+  includeSource?: boolean;
+}): Promise<AuthenticationTemplate> => {
+  if (manglePrivateKeys === undefined && contract.provider.network !== Network.REGTEST) {
+    manglePrivateKeys = true;
+  } else {
+    manglePrivateKeys = false;
+  }
+
+  const txHex = await transaction.build();
+
+  const libauthTransaction = decodeTransaction(hexToBin(txHex));
+  if (typeof libauthTransaction === "string") {
+    throw libauthTransaction;
+  }
+
+  const constructorInputs = contract.artifact.constructorInputs
+    .slice()
+    .reverse();
+  const contractParameters = contract.constructorArgs.slice().reverse();
+
+  const abiFunction = (transaction as any).abiFunction as AbiFunction;
+  const funcName = abiFunction.name;
+  const functionIndex = contract.artifact.abi.findIndex(
+    (val) => val.name === funcName
+  )!;
+  const func: AbiFunction = contract.artifact.abi[functionIndex];
+  const functionInputs = func.inputs.slice().reverse();
+  const args = ((transaction as any).args as (Uint8Array | SignatureTemplate)[])
+    .slice()
+    .reverse();
+
+  const hasSignatureTemplates = ((transaction as any).inputs as Utxo[]).filter(
+    (val) => isUtxoP2PKH(val)
+  ).length;
+
+  const zip = (a: any[], b: any[]) =>
+    Array.from(Array(Math.max(b.length, a.length)), (_, i) => [a[i], b[i]]);
+
+  const formattedBytecode = 
+    contract.artifact.debug ?
+      formatLibauthScript(asmToScript(contract.artifact.debug.bytecode), contract.artifact.debug?.sourceMap!, contract.artifact.source).split("\n") :
+      contract.artifact.bytecode.split(" ").map((val) => {
+        try {
+          return `<0x${BigInt("0x" + val).toString(16)}>`;
+        } catch {
+          return val;
+        }
+      });
+
+  return {
+    $schema: "https://ide.bitauth.com/authentication-template-v0.schema.json",
+    description: `Imported from cashscript${
+      includeSource ? contract.artifact.source : ""
+    }`,
+    name: contract.artifact.contractName,
+    entities: {
+      parameters: {
+        description: "Contract creation and function parameters",
+        name: "parameters",
+        scripts: [
+          "lock",
+          "unlock_lock",
+          ...(hasSignatureTemplates
+            ? ["p2pkh_placeholder_lock", "p2pkh_placeholder_unlock"]
+            : []),
+        ],
+        variables: merge([
+          ...(hasSignatureTemplates
+            ? [
+                {
+                  placeholder_key: {
+                    description: "placeholder_key",
+                    name: "placeholder_key",
+                    type: "Key",
+                  },
+                },
+              ]
+            : []),
+          {
+            function_index: {
+              description: "Script function index to execute",
+              name: "function_index",
+              type: "WalletData",
+            },
+          },
+          ...constructorInputs.map((input) => ({
+            [snake_case(input.name)]: {
+              description: `"${input.name}" parameter of this contract`,
+              name: input.name,
+              type: "WalletData",
+            },
+          })),
+          ...functionInputs.map((input) => ({
+            [snake_case(input.name)]: {
+              description: `"${input.name}" parameter of function "${func.name}"`,
+              name: input.name,
+              type: input.type === PrimitiveType.SIG ? "Key" : "WalletData",
+            },
+          })),
+        ]),
+      },
+    },
+    scenarios: {
+      evaluate_function: {
+        data: {
+          bytecode: merge([
+            ...zip(functionInputs, args)
+              .filter(([input]) => input.type !== PrimitiveType.SIG)
+              .map(([input, arg]) => {
+                const hex = binToHex(arg as Uint8Array);
+                const result = hex.length ? `0x${hex}` : hex;
+                return {
+                  [snake_case(input.name)]: result,
+                };
+              }),
+            { function_index: functionIndex.toString() },
+            ...constructorInputs.map((input, index) => {
+              const hex = binToHex(
+                encodeArgument(
+                  contractParameters[index],
+                  constructorInputs[index].type
+                ) as Uint8Array
+              );
+              const result = hex.length ? `0x${hex}` : hex;
+              return {
+                [snake_case(input.name)]: result,
+              };
+            }),
+          ]),
+          currentBlockHeight: 2,
+          currentBlockTime: Math.round(+new Date() / 1000),
+          keys: {
+            privateKeys: merge([
+              ...(hasSignatureTemplates
+                ? [
+                    {
+                      placeholder_key:
+                        "<Uint8Array: 0x0000000000000000000000000000000000000000000000000000000000000000>",
+                    },
+                  ]
+                : []),
+              ...zip(functionInputs, args)
+                .filter(([input]) => input.type === PrimitiveType.SIG)
+                .map(([input, arg]) => {
+                  return {
+                    [snake_case(input.name)]: binToHex(
+                      manglePrivateKeys
+                        ? (arg as SignatureTemplate)
+                            .getPublicKey()
+                            .slice(0, 32)
+                            .slice(0, 32)
+                        : (arg as SignatureTemplate | any).privateKey
+                    ),
+                  };
+                }),
+            ]),
+          },
+        },
+        transaction: [libauthTransaction].map((val: TransactionBCH) => {
+          const result = {} as AuthenticationTemplateScenario["transaction"];
+          let inputSlotInserted = false;
+          result!.inputs = val!.inputs!.map((input, index) => {
+            const csInput = (transaction as any).inputs[index] as Utxo;
+            const signable = isUtxoP2PKH(csInput);
+            let unlockingBytecode = {};
+            if (signable) {
+              unlockingBytecode = {
+                script: "p2pkh_placeholder_unlock",
+                overrides: {
+                  keys: {
+                    privateKeys: {
+                      placeholder_key: binToHex(
+                        manglePrivateKeys
+                          ? (csInput as UtxoP2PKH).template
+                              .getPublicKey()
+                              .slice(0, 32)
+                          : ((csInput as UtxoP2PKH).template as any)
+                              .privateKey
+                      ),
+                    },
+                  },
+                },
+              };
+            } else {
+              // assume it is our contract's input
+              if (!inputSlotInserted) {
+                unlockingBytecode = ["slot"];
+                inputSlotInserted = true;
+              }
+            }
+            return {
+              outpointIndex: input.outpointIndex,
+              outpointTransactionHash:
+                input.outpointTransactionHash instanceof Uint8Array
+                  ? binToHex(input.outpointTransactionHash)
+                  : input.outpointTransactionHash,
+              sequenceNumber: input.sequenceNumber,
+              unlockingBytecode: unlockingBytecode,
+            } as AuthenticationTemplateScenarioInput;
+          });
+          result!.locktime = val?.locktime;
+
+          result!.outputs = val?.outputs?.map(
+            (output: LibauthOutput, index) => {
+              const csOutput = (transaction as any).outputs[index] as Output;
+              let lockingBytecode: any = output.lockingBytecode;
+              if (typeof csOutput.to === "string") {
+                if (
+                  [
+                    contract.address,
+                    contract.tokenAddress,
+                  ].includes(csOutput.to)
+                ) {
+                  lockingBytecode = {};
+                } else {
+                  for (const csInput of (transaction as any).inputs as Utxo[]) {
+                    if (isUtxoP2PKH(csInput)) {
+                      const inputPkh = hash160(csInput.template.getPublicKey());
+                      if (
+                        binToHex(output.lockingBytecode).slice(6, 46) ===
+                        binToHex(inputPkh)
+                      ) {
+                        lockingBytecode = {
+                          script: "p2pkh_placeholder_lock",
+                          overrides: {
+                            keys: {
+                              privateKeys: {
+                                placeholder_key: binToHex(
+                                  manglePrivateKeys
+                                    ? csInput.template
+                                        .getPublicKey()
+                                        .slice(0, 32)
+                                    : (csInput.template as any).privateKey
+                                ),
+                              },
+                            },
+                          },
+                        };
+                      }
+                    }
+                  }
+                }
+              }
+              return {
+                lockingBytecode:
+                  lockingBytecode instanceof Uint8Array
+                    ? binToHex(lockingBytecode)
+                    : lockingBytecode,
+                token: output.token,
+                valueSatoshis: Number(output.valueSatoshis),
+              } as AuthenticationTemplateScenarioTransactionOutput;
+            }
+          );
+          result!.version = libauthTransaction.version;
+          return result;
+        })[0] as AuthenticationTemplateScenario["transaction"],
+        sourceOutputs: [transaction].map((val: Transaction) => {
+          let inputSlotInserted = false;
+          return ((val as any).inputs as Utxo[]).map(
+          (_, index) => {
+            const result = {} as
+              | AuthenticationTemplateScenarioSourceOutput
+              | any;
+            const csInput = (transaction as any).inputs[index] as Utxo;
+            const signable = isUtxoP2PKH(csInput);
+            let unlockingBytecode = {};
+            if (signable) {
+              unlockingBytecode = {
+                script: "p2pkh_placeholder_lock",
+                overrides: {
+                  keys: {
+                    privateKeys: {
+                      placeholder_key: binToHex(
+                        manglePrivateKeys
+                          ? csInput.template.getPublicKey().slice(0, 32)
+                          : (csInput.template as any).privateKey
+                      ),
+                    },
+                  },
+                },
+              } as AuthenticationTemplateScenarioBytecode;
+            } else {
+              // assume it is our contract's input
+              if (!inputSlotInserted) {
+                unlockingBytecode = ["slot"];
+                inputSlotInserted = true;
+              }
+            }
+
+            result.lockingBytecode = unlockingBytecode;
+            result.valueSatoshis = Number(csInput.satoshis);
+            result.token = csInput.token;
+            return result;
+          });
+        })[0],
+        description:
+          "An example evaluation where this script execution passes.",
+        name: "Evaluate",
+      },
+    },
+    scripts: {
+      unlock_lock: {
+        passes: ["evaluate_function"],
+        name: "unlock",
+        script: [
+          `// "${func.name}" function parameters`,
+          ...(functionInputs.length
+            ? zip(functionInputs, args).map(([input, arg]) =>
+                input.type === PrimitiveType.SIG
+                  ? `<${snake_case(
+                      input.name
+                    )}.schnorr_signature.all_outputs> // ${input.type}`
+                  : `<${snake_case(input.name)}> // ${input.type} = <${
+                      "0x" + binToHex(arg)
+                    }>`
+              )
+            : ["// none"]),
+          "",
+
+          ...(contract.artifact.abi.length > 1
+            ? [
+                "// function index in contract",
+                `<function_index> // int = <${functionIndex.toString()}>`,
+                "",
+              ]
+            : []),
+        ].join("\n"),
+        unlocks: "lock",
+      },
+      lock: {
+        lockingType: "p2sh20",
+        name: "lock",
+        script: [
+          `// "${contract.artifact.contractName}" contract constructor parameters`,
+          ...(constructorInputs.length
+            ? constructorInputs.map((input, index) => {
+                const encoded = encodeArgument(
+                  contractParameters[index],
+                  constructorInputs[index].type
+                ) as Uint8Array;
+                return `<${snake_case(input.name)}> // ${
+                  input.type === "bytes" ? "bytes" + encoded.length : input.type
+                } = <${"0x" + binToHex(encoded)}>`;
+              })
+            : ["// none"]),
+          "",
+          "// bytecode",
+          ...formattedBytecode,
+        ].join("\n"),
+      },
+      ...(hasSignatureTemplates
+        ? {
+            p2pkh_placeholder_unlock: {
+              name: "p2pkh_placeholder_unlock",
+              script:
+                "<placeholder_key.schnorr_signature.all_outputs>\n<placeholder_key.public_key>",
+              unlocks: "p2pkh_placeholder_lock",
+            },
+            p2pkh_placeholder_lock: {
+              lockingType: "standard",
+              name: "p2pkh_placeholder_lock",
+              script:
+                "OP_DUP\nOP_HASH160 <$(<placeholder_key.public_key> OP_HASH160\n)> OP_EQUALVERIFY\nOP_CHECKSIG",
+            },
+          }
+        : {}),
+    },
+    supported: ["BCH_SPEC"],
+    version: 0,
+  } as AuthenticationTemplate;
+};
+
+
+const createProgram = (template: AuthenticationTemplate) => {
+  const configuration = authenticationTemplateToCompilerConfiguration(template);
+  const vm = createVirtualMachineBCHCHIPs();
+  const compiler = createCompiler(configuration);
+
+  const scenarioGeneration = compiler.generateScenario({
+    debug: true,
+    lockingScriptId: undefined,
+    unlockingScriptId: "unlock_lock",
+    scenarioId: "evaluate_function",
+  });
+
+  if (
+    typeof scenarioGeneration === "string" ||
+    typeof scenarioGeneration.scenario === "string"
+  ) {
+    throw scenarioGeneration;
+  }
+
+  return { vm, program: scenarioGeneration.scenario.program };
+}
+
+export const evaluateTemplate = (template: AuthenticationTemplate) => {
+  const { vm, program } = createProgram(template);
+
+  const verifyResult = vm.verify(program);
+  if (typeof verifyResult === "string") {
+    throw verifyResult;
+  }
+
+  return verifyResult;
+};
+
+export const debugTemplate = (template: AuthenticationTemplate, artifact: Artifact) => {
+  const { vm, program } = createProgram(template);
+
+  const debugResult = vm.debug(program);
+
+  for (const log of artifact.debug?.logs ?? []) {
+    const state = debugResult[log.ip];
+
+    let line = `${artifact.contractName}.cash:${log.line}`
+    log.data.forEach(element => {
+      let value: any;
+      if (typeof element === "string") {
+        value = element;
+      } else {
+        const stackItem = state.stack[element.stackIndex];
+        switch (element.type) {
+          case PrimitiveType.BOOL:
+            value = decodeBool(stackItem);
+            break;
+          case PrimitiveType.INT:
+            value = decodeInt(stackItem);
+            break;
+          case PrimitiveType.STRING:
+            value = decodeString(stackItem);
+            break;
+          default:
+            value = `0x${binToHex(stackItem)}`;
+            break;
+        }
+      }
+
+      line += ` ${value}`;
+    });
+
+    console.log(line);
+  }
+
+  return debugResult;
+};
+function binToBase64(arg0: Uint8Array): string {
+  throw new Error("Function not implemented.");
+}
+
+function utf8ToBin(arg0: string): string | import("pako").Data {
+  throw new Error("Function not implemented.");
+}
+
diff --git a/packages/cashscript/test/LibauthTemplate.test.ts b/packages/cashscript/test/LibauthTemplate.test.ts
new file mode 100644
index 00000000..245fd4da
--- /dev/null
+++ b/packages/cashscript/test/LibauthTemplate.test.ts
@@ -0,0 +1,54 @@
+import { Contract, ElectrumNetworkProvider, Network, SignatureTemplate } from '../src/index.js';
+import artifact from './fixture/transfer_with_timeout.json' assert { type: "json" };
+import { alicePriv, alicePub, bobPriv, bobPub } from './fixture/vars.js';
+import { buildTemplate, debugTemplate, evaluateTemplate, stringify } from '../src/LibauthTemplate.js';
+
+describe(`Libauth template generation tests`, () => {
+  test("Test transfer with timeout template", async () => {
+    // {
+    //   const provider = new ElectrumNetworkProvider(Network.CHIPNET);
+    //   const contract = new Contract(artifact, [alicePub, bobPub, 100000n], { provider });
+
+    //   const transaction = contract.functions.transfer(new SignatureTemplate(bobPriv)).to(contract.address, 10000n);
+    //   const template = await buildTemplate({
+    //     contract,
+    //     transaction,
+    //     manglePrivateKeys: false
+    //   });
+
+    //   // console.log(stringify(template));
+
+    //   expect(evaluateTemplate(template)).toBe(true);
+    // }
+
+    {
+      const provider = new ElectrumNetworkProvider(Network.CHIPNET);
+      const contract = new Contract(artifact, [alicePub, bobPub, 2000000n], { provider });
+
+      const transaction = contract.functions.timeout(new SignatureTemplate(alicePriv)).to(contract.address, 10000n);
+      const template = await buildTemplate({
+        contract,
+        transaction,
+        manglePrivateKeys: false
+      });
+
+      debugTemplate(template, artifact);
+
+      // expect(debugTemplate(template)).toBe(false);
+    }
+
+    // const failingTemplate = (await contract.runFunctionFromStrings({
+    //   action: "buildTemplate",
+    //   function: "transfer",
+    //   arguments: [alice.getPublicKeyCompressed(), charlie.toString()],
+    //   to: {
+    //     to: charlie.getDepositAddress(),
+    //     amount: 7000n,
+    //   },
+    //   time: 215,
+    //   utxoIds: contractUtxos.map(toUtxoId),
+    // } as CashscriptTransactionI)) as AuthenticationTemplate;
+
+    // expect(() => evaluateTemplate(failingTemplate)).toThrow();
+  });
+});
\ No newline at end of file
diff --git a/packages/cashscript/test/fixture/transfer_with_timeout.json b/packages/cashscript/test/fixture/transfer_with_timeout.json
index 5ffb7dc9..cb1bf2b0 100644
--- a/packages/cashscript/test/fixture/transfer_with_timeout.json
+++ b/packages/cashscript/test/fixture/transfer_with_timeout.json
@@ -35,7 +35,15 @@
     }
   ],
   "bytecode": "OP_3 OP_PICK OP_0 OP_NUMEQUAL OP_IF OP_4 OP_ROLL OP_ROT OP_CHECKSIG OP_NIP OP_NIP OP_NIP OP_ELSE OP_3 OP_ROLL OP_1 OP_NUMEQUALVERIFY OP_3 OP_ROLL OP_SWAP OP_CHECKSIGVERIFY OP_SWAP OP_CHECKLOCKTIMEVERIFY OP_2DROP OP_1 OP_ENDIF",
-  "source": "contract TransferWithTimeout(\n    pubkey sender,\n    pubkey recipient,\n    int timeout\n) {\n    // Require recipient's signature to match\n    function transfer(sig recipientSig) {\n        require(checkSig(recipientSig, recipient));\n    }\n\n    // Require timeout time to be reached and sender's signature to match\n    function timeout(sig senderSig) {\n        require(checkSig(senderSig, sender));\n        require(tx.time >= timeout);\n    }\n}\n",
+  "source": "\npragma cashscript ^0.8.0;\n\ncontract TransferWithTimeout(\n  pubkey sender,\n  pubkey recipient,\n  int timeout\n) {\n  // Require recipient's signature to match\n  function transfer(sig recipientSig) {\n    require(checkSig(recipientSig, recipient));\n  }\n\n  // Require timeout time to be reached and sender's signature to match\n  function timeout(sig senderSig) {\n    require(checkSig(senderSig, sender));\n    require(tx.time >= timeout);\n  }\n}\n",
+  "debug": {
+    "bytecode": "OP_3 OP_PICK OP_0 OP_NUMEQUAL OP_IF OP_4 OP_ROLL OP_2 OP_ROLL OP_CHECKSIG OP_NIP OP_NIP OP_NIP OP_ELSE OP_3 OP_ROLL OP_1 OP_NUMEQUAL OP_VERIFY OP_3 OP_ROLL OP_1 OP_ROLL OP_CHECKSIG OP_VERIFY OP_1 OP_ROLL OP_CHECKLOCKTIMEVERIFY OP_DROP OP_1 OP_NIP OP_ENDIF",
+    "sourceMap": "10:2:12:3;;;;;11:21:11:33;;:35::44;;:12::45;10:2:12:3:1;;;;15::18::0;;;;;16:21:16:30;;:32::38;;:12::39;:4::41;17:23:17:30;;:4::32;;15:2:18:3:1;;",
+    "logs": [
+      { "ip": 18, "line": 14, "data": [{ "stackIndex": 3, "type": "sig" }, "lol"] },
+      { "ip": 18, "line": 14, "data": ["Lol"] }
+    ]
+  },
   "compiler": {
     "name": "cashc",
     "version": "0.8.0-next.0"
diff --git a/packages/utils/src/artifact.ts b/packages/utils/src/artifact.ts
index 8ddf15f1..146752ec 100644
--- a/packages/utils/src/artifact.ts
+++ b/packages/utils/src/artifact.ts
@@ -11,12 +11,23 @@ export interface AbiFunction {
   inputs: AbiInput[];
 }
 
+export interface LogEntry {
+  ip: number;
+  line: number;
+  data: Array<{ stackIndex: number, type: string } | string>;
+}
+
 export interface Artifact {
   contractName: string;
   constructorInputs: AbiInput[];
   abi: AbiFunction[];
   bytecode: string;
   source: string;
+  debug?: {
+    bytecode: string;
+    sourceMap: string;
+    logs?: LogEntry[];
+  };
   compiler: {
     name: string;
     version: string;
diff --git a/packages/utils/src/index.ts b/packages/utils/src/index.ts
index 4941cef9..63ade3dd 100644
--- a/packages/utils/src/index.ts
+++ b/packages/utils/src/index.ts
@@ -3,3 +3,5 @@ export * from './data.js';
 export * from './hash.js';
 export * from './script.js';
 export * from './types.js';
+export * from './sourceMap.js';
+export * from './libauth.js';
diff --git a/packages/utils/src/libauth.ts b/packages/utils/src/libauth.ts
new file mode 100644
index 00000000..ba94482a
--- /dev/null
+++ b/packages/utils/src/libauth.ts
@@ -0,0 +1,47 @@
+import { binToHex } from "@bitauth/libauth";
+import { Script, Op } from "./script.js";
+import { sourceMapToLocationData } from "./sourceMap.js";
+
+export function formatLibauthScript(bytecode: Script, souceMap: string, sourceCode: string): string {
+  const lineMap: {[line: string]: Script} = {} as any;
+
+  const locationData = sourceMapToLocationData(souceMap);
+
+  const map = locationData.map(([location, positionHint], index) => {
+    const op = bytecode[index];
+    return [op, Object.keys(Op)[Object.values(Op).indexOf(op as Op)], positionHint ? location?.end.line : op === Op.OP_ENDIF || op === Op.OP_ELSE || op === Op.OP_NIP || op === Op.OP_CHECKLOCKTIMEVERIFY ? location?.end.line : location?.start.line];
+  });
+
+  map.forEach(([op, _, line]) => {
+    if (!lineMap[line as string]) {
+      lineMap[line as string] = [];
+    }
+    lineMap[line as string].push(op as any);
+  });
+
+  const opCodeMap: {[key: string]: string} = {};
+  for (const [key, value] of Object.entries(lineMap)) {
+    opCodeMap[key] = value.map(val => {
+      if (val instanceof Uint8Array) {
+        if (val.length == 0) {
+          return "OP_0";
+        } else {
+          return `<0x${binToHex(val)}>`;
+        }
+      }
+      return Object.keys(Op)[Object.values(Op).indexOf(val)]
+    }).join(" ");
+  }
+
+  const split = sourceCode.split('\n');
+
+  const maxCodeLength = Math.max(...split.map(val => val.length));
+  const maxBytecodeLength = Math.max(...Object.values(opCodeMap).map(val => val.length));
+
+  const result = split.map((line, index) => {
+    const opCodes = opCodeMap[index + 1];
+    return `${(opCodes ? opCodes : "").padEnd(maxBytecodeLength)} /* ${line.padEnd(maxCodeLength)} */`;
+  }).join('\n');
+
+  return result;
+}
diff --git a/packages/utils/src/sourceMap.ts b/packages/utils/src/sourceMap.ts
new file mode 100644
index 00000000..4a6bb39d
--- /dev/null
+++ b/packages/utils/src/sourceMap.ts
@@ -0,0 +1,114 @@
+export interface LocationI {
+  start: {
+    line: number,
+    column: number
+  };
+  end: {
+    line: number,
+    column: number
+  };
+}
+
+export type LocationData = Array<[location: LocationI, positionHint?: number]>;
+
+/*
+ * The source mappings for the bytecode use the following notation (similar to Solidity):
+ *
+ * `sl:sc:el:ec:h`
+ *
+ * Where `sl` is the start line, `sc` - start column, `el` - end line, and `ec` - end column of the range in the source file.
+ * `h` is the position hint denoting where to place the instruction - at the beginning of the parent AST block or at the end.
+ * `h` is used with AST blocks, instructions of which surround children blocks, like function declarations and
+ * if-then-else blocks.
+ *
+ * Mappings are a list of `sl:sc:el:ec:h` separated by `;`. Each of these elements corresponds to an instruction.
+ *
+ * In order to compress these source mappings, the following rules are used:
+ *
+ * If a field is empty, the value of the preceding element is used.
+ * If a `:` is missing, all the following fields are considered empty.
+ * This means the following source mappings represent the same information:
+ *
+ * 14:20:14:29;14:20:14:29;14:12:14:30;14:34:14:43;14:34:14:43
+ *
+ * 14:20:14:29;;:12::30;:34::43;
+ *
+ */
+export function generateSourceMap(locationData: LocationData): string {
+  let prevStartLine = 0;
+  let prevStartColumn = 0;
+  let prevEndLine = 0;
+  let prevEndColumn = 0;
+  let prevHint = 0;
+
+  return locationData.map((row: any) => {
+    const prevStartLineString = prevStartLine === row[0].start.line ? '' : String(row[0].start.line);
+    prevStartLine = row[0].start.line;
+
+    const prevStartColumnString = prevStartColumn === row[0].start.column ? '' : String(row[0].start.column);
+    prevStartColumn = row[0].start.column;
+
+    const prevEndLineString = prevEndLine === row[0].end.line ? '' : String(row[0].end.line);
+    prevEndLine = row[0].end.line;
+
+    const prevEndColumnString = prevEndColumn === row[0].end.column ? '' : String(row[0].end.column);
+    prevEndColumn = row[0].end.column;
+
+    const hint = row[1] ?? 0;
+    const prevHintString = prevHint === hint ? '' : String(hint);
+    prevHint = hint;
+
+    let result = '';
+    if (prevStartLineString) {
+      result += prevStartLineString;
+    }
+
+    result += ":";
+    if (prevStartColumnString) {
+      result += prevStartColumnString;
+    }
+
+    result += ":";
+    if (prevEndLineString) {
+      result += prevEndLineString;
+    }
+
+    result += ":";
+    if (prevEndColumnString) {
+      result += prevEndColumnString;
+    }
+
+    result += ":";
+    if (prevHintString) {
+      result += prevHintString;
+    }
+
+    result = result.replace(/:*$/, '');
+    return result;
+  }).join(';');
+}
+
+export const sourceMapToLocationData = (sourceMap: string): LocationData => {
+  let prevStartLine = 0;
+  let prevStartColumn = 0;
+  let prevEndLine = 0;
+  let prevEndColumn = 0;
+  let prevHint: any = undefined;
+
+  return sourceMap.split(";").map((entry: string) => {
+    const val = entry.split(':');
+    const startLine = val[0] ? Number(val[0]) : prevStartLine; prevStartLine = startLine;
+    const startColumn = val[1] ? Number(val[1]) : prevStartColumn; prevStartColumn = startColumn;
+    const endLine = val[2] ? Number(val[2]) : prevEndLine; prevEndLine = endLine;
+    const endColumn = val[3] ? Number(val[3]) : prevEndColumn; prevEndColumn = endColumn;
+    const hint: number | undefined = val[4] ? Number(val[4]) : prevHint; prevHint = hint;
+
+    return [
+      {
+        start: { line: startLine, column: startColumn },
+        end: { line: endLine, column: endColumn }
+      },
+      ...(hint ? [hint] : [])
+    ] as any;
+  });
+}
\ No newline at end of file
diff --git a/packages/utils/test/libauth.test.ts b/packages/utils/test/libauth.test.ts
new file mode 100644
index 00000000..237c98a5
--- /dev/null
+++ b/packages/utils/test/libauth.test.ts
@@ -0,0 +1,48 @@
+import { asmToScript } from "../src/index.js";
+import { formatLibauthScript } from "../src/libauth.js";
+
+it(`test formatting libauth input`, () => {
+  const code = "OP_3 OP_PICK OP_0 OP_NUMEQUAL OP_IF OP_5 OP_ROLL OP_5 OP_PICK OP_CHECKSIG OP_VERIFY OP_4 OP_ROLL OP_HASH160 OP_2 OP_ROLL OP_EQUAL OP_NIP OP_NIP OP_NIP OP_ELSE OP_3 OP_ROLL OP_1 OP_NUMEQUAL OP_VERIFY OP_0 OP_PICK deadbeef OP_EQUAL OP_VERIFY OP_2 OP_PICK OP_3 OP_PICK OP_NUMEQUAL OP_VERIFY OP_4 OP_PICK OP_5 OP_PICK OP_EQUAL OP_VERIFY OP_3 OP_PICK OP_4 OP_PICK OP_EQUAL OP_VERIFY OP_4 OP_ROLL OP_4 OP_PICK OP_CHECKSIG OP_VERIFY OP_3 OP_ROLL OP_HASH160 OP_1 OP_ROLL OP_EQUAL OP_VERIFY OP_1 OP_ROLL OP_CHECKLOCKTIMEVERIFY OP_DROP OP_1 OP_NIP OP_ENDIF";
+  const bytecode = asmToScript(code);
+  const sourceMap = "3:2:6:3;;;;;4:21:4:22;;:24::33;;:12::34;:4::36;5:20:5:29;;:12::30;:34::46;;:12;3:2:6:3:1;;;;8::16::0;;;;;9:12:9:21;;:25::35;:12;:4::37;10:12:10:19;;:23::30;;:12;:4::32;11:12:11:13;;:17::18;;:12;:4::20;12:12:12:21;;:25::34;;:12;:4::36;13:21:13:22;;:24::33;;:12::34;:4::36;14:20:14:29;;:12::30;:34::43;;:12;:4::45;15:23:15:30;;:4::32;;8:2:16:3:1;;";
+  const sourceCode =`
+contract TransferWithTimeout(bytes20 senderPkh, bytes20 recipientPkh, int timeout) {
+  function transfer(pubkey signingPk, sig s) {
+    require(checkSig(s, signingPk));
+    require(hash160(signingPk) == recipientPkh);
+  }
+
+  function timeout(pubkey signingPk, sig s) {
+    require(senderPkh == 0xdeadbeef);
+    require(timeout == timeout);
+    require(s == s);
+    require(signingPk == signingPk);
+    require(checkSig(s, signingPk));
+    require(hash160(signingPk) == senderPkh);
+    require(tx.time >= timeout);
+  }
+}`;
+
+  const formatted = formatLibauthScript(bytecode, sourceMap, sourceCode);
+  const result =
+`
+                                                        /*                                                                                      */
+                                                        /* contract TransferWithTimeout(bytes20 senderPkh, bytes20 recipientPkh, int timeout) { */
+OP_3 OP_PICK OP_0 OP_NUMEQUAL OP_IF                     /*   function transfer(pubkey signingPk, sig s) {                                       */
+OP_5 OP_ROLL OP_5 OP_PICK OP_CHECKSIG OP_VERIFY         /*     require(checkSig(s, signingPk));                                                 */
+OP_4 OP_ROLL OP_HASH160 OP_2 OP_ROLL OP_EQUAL           /*     require(hash160(signingPk) == recipientPkh);                                     */
+OP_NIP OP_NIP OP_NIP OP_ELSE                            /*   }                                                                                  */
+                                                        /*                                                                                      */
+OP_3 OP_ROLL OP_1 OP_NUMEQUAL OP_VERIFY                 /*   function timeout(pubkey signingPk, sig s) {                                        */
+OP_0 OP_PICK <0xdeadbeef> OP_EQUAL OP_VERIFY            /*     require(senderPkh == 0xdeadbeef);                                                */
+OP_2 OP_PICK OP_3 OP_PICK OP_NUMEQUAL OP_VERIFY         /*     require(timeout == timeout);                                                     */
+OP_4 OP_PICK OP_5 OP_PICK OP_EQUAL OP_VERIFY            /*     require(s == s);                                                                 */
+OP_3 OP_PICK OP_4 OP_PICK OP_EQUAL OP_VERIFY            /*     require(signingPk == signingPk);                                                 */
+OP_4 OP_ROLL OP_4 OP_PICK OP_CHECKSIG OP_VERIFY         /*     require(checkSig(s, signingPk));                                                 */
+OP_3 OP_ROLL OP_HASH160 OP_1 OP_ROLL OP_EQUAL OP_VERIFY /*     require(hash160(signingPk) == senderPkh);                                        */
+OP_1 OP_ROLL OP_CHECKLOCKTIMEVERIFY OP_DROP             /*     require(tx.time >= timeout);                                                     */
+OP_1 OP_NIP OP_ENDIF                                    /*   }                                                                                  */
+                                                        /* }                                                                                    */
+`.replace(/^\n+/, '').replace(/\n+$/, '');
+  expect(formatted).toBe(result);
+});
diff --git a/packages/utils/test/sourceMap.test.ts b/packages/utils/test/sourceMap.test.ts
new file mode 100644
index 00000000..873178a2
--- /dev/null
+++ b/packages/utils/test/sourceMap.test.ts
@@ -0,0 +1,84 @@
+import { LocationData, generateSourceMap, sourceMapToLocationData } from "../src/index.js";
+
+it(`test sourcemap generation and decoding`, () => {
+  const locationData =
+  [
+    [ { start: { line: 3, column: 2 }, end: { line: 6, column: 3 } } ],
+    [ { start: { line: 3, column: 2 }, end: { line: 6, column: 3 } } ],
+    [ { start: { line: 3, column: 2 }, end: { line: 6, column: 3 } } ],
+    [ { start: { line: 3, column: 2 }, end: { line: 6, column: 3 } } ],
+    [ { start: { line: 3, column: 2 }, end: { line: 6, column: 3 } } ],
+    [ { start: { line: 4, column: 21 }, end: { line: 4, column: 22 } } ],
+    [ { start: { line: 4, column: 21 }, end: { line: 4, column: 22 } } ],
+    [ { start: { line: 4, column: 24 }, end: { line: 4, column: 33 } } ],
+    [ { start: { line: 4, column: 24 }, end: { line: 4, column: 33 } } ],
+    [ { start: { line: 4, column: 12 }, end: { line: 4, column: 34 } } ],
+    [ { start: { line: 4, column: 4 }, end: { line: 4, column: 36 } } ],
+    [ { start: { line: 5, column: 20 }, end: { line: 5, column: 29 } } ],
+    [ { start: { line: 5, column: 20 }, end: { line: 5, column: 29 } } ],
+    [ { start: { line: 5, column: 12 }, end: { line: 5, column: 30 } } ],
+    [ { start: { line: 5, column: 34 }, end: { line: 5, column: 46 } } ],
+    [ { start: { line: 5, column: 34 }, end: { line: 5, column: 46 } } ],
+    [ { start: { line: 5, column: 12 }, end: { line: 5, column: 46 } } ],
+    [ { start: { line: 3, column: 2 }, end: { line: 6, column: 3 } }, 1 ],
+    [ { start: { line: 3, column: 2 }, end: { line: 6, column: 3 } }, 1 ],
+    [ { start: { line: 3, column: 2 }, end: { line: 6, column: 3 } }, 1 ],
+    [ { start: { line: 3, column: 2 }, end: { line: 6, column: 3 } }, 1 ],
+    [ { start: { line: 8, column: 2 }, end: { line: 16, column: 3 } } ],
+    [ { start: { line: 8, column: 2 }, end: { line: 16, column: 3 } } ],
+    [ { start: { line: 8, column: 2 }, end: { line: 16, column: 3 } } ],
+    [ { start: { line: 8, column: 2 }, end: { line: 16, column: 3 } } ],
+    [ { start: { line: 8, column: 2 }, end: { line: 16, column: 3 } } ],
+    [ { start: { line: 9, column: 12 }, end: { line: 9, column: 21 } } ],
+    [ { start: { line: 9, column: 12 }, end: { line: 9, column: 21 } } ],
+    [ { start: { line: 9, column: 25 }, end: { line: 9, column: 34 } } ],
+    [ { start: { line: 9, column: 25 }, end: { line: 9, column: 34 } } ],
+    [ { start: { line: 9, column: 12 }, end: { line: 9, column: 34 } } ],
+    [ { start: { line: 9, column: 4 }, end: { line: 9, column: 36 } } ],
+    [ { start: { line: 10, column: 12 }, end: { line: 10, column: 19 } } ],
+    [ { start: { line: 10, column: 12 }, end: { line: 10, column: 19 } } ],
+    [ { start: { line: 10, column: 23 }, end: { line: 10, column: 30 } } ],
+    [ { start: { line: 10, column: 23 }, end: { line: 10, column: 30 } } ],
+    [ { start: { line: 10, column: 12 }, end: { line: 10, column: 30 } } ],
+    [ { start: { line: 10, column: 4 }, end: { line: 10, column: 32 } } ],
+    [ { start: { line: 11, column: 12 }, end: { line: 11, column: 13 } } ],
+    [ { start: { line: 11, column: 12 }, end: { line: 11, column: 13 } } ],
+    [ { start: { line: 11, column: 17 }, end: { line: 11, column: 18 } } ],
+    [ { start: { line: 11, column: 17 }, end: { line: 11, column: 18 } } ],
+    [ { start: { line: 11, column: 12 }, end: { line: 11, column: 18 } } ],
+    [ { start: { line: 11, column: 4 }, end: { line: 11, column: 20 } } ],
+    [ { start: { line: 12, column: 12 }, end: { line: 12, column: 21 } } ],
+    [ { start: { line: 12, column: 12 }, end: { line: 12, column: 21 } } ],
+    [ { start: { line: 12, column: 25 }, end: { line: 12, column: 34 } } ],
+    [ { start: { line: 12, column: 25 }, end: { line: 12, column: 34 } } ],
+    [ { start: { line: 12, column: 12 }, end: { line: 12, column: 34 } } ],
+    [ { start: { line: 12, column: 4 }, end: { line: 12, column: 36 } } ],
+    [ { start: { line: 13, column: 21 }, end: { line: 13, column: 22 } } ],
+    [ { start: { line: 13, column: 21 }, end: { line: 13, column: 22 } } ],
+    [ { start: { line: 13, column: 24 }, end: { line: 13, column: 33 } } ],
+    [ { start: { line: 13, column: 24 }, end: { line: 13, column: 33 } } ],
+    [ { start: { line: 13, column: 12 }, end: { line: 13, column: 34 } } ],
+    [ { start: { line: 13, column: 4 }, end: { line: 13, column: 36 } } ],
+    [ { start: { line: 14, column: 20 }, end: { line: 14, column: 29 } } ],
+    [ { start: { line: 14, column: 20 }, end: { line: 14, column: 29 } } ],
+    [ { start: { line: 14, column: 12 }, end: { line: 14, column: 30 } } ],
+    [ { start: { line: 14, column: 34 }, end: { line: 14, column: 43 } } ],
+    [ { start: { line: 14, column: 34 }, end: { line: 14, column: 43 } } ],
+    [ { start: { line: 14, column: 12 }, end: { line: 14, column: 43 } } ],
+    [ { start: { line: 14, column: 4 }, end: { line: 14, column: 45 } } ],
+    [ { start: { line: 15, column: 23 }, end: { line: 15, column: 30 } } ],
+    [ { start: { line: 15, column: 23 }, end: { line: 15, column: 30 } } ],
+    [ { start: { line: 15, column: 4 }, end: { line: 15, column: 32 } } ],
+    [ { start: { line: 15, column: 4 }, end: { line: 15, column: 32 } } ],
+    [ { start: { line: 15, column: 4 }, end: { line: 15, column: 32 } }, 1 ],
+    [ { start: { line: 8, column: 2 }, end: { line: 16, column: 3 } }, 1 ],
+    [ { start: { line: 8, column: 2 }, end: { line: 16, column: 3 } }, 1 ]
+  ] as LocationData;
+
+  const sourceMap = generateSourceMap(locationData);
+  const expected = "3:2:6:3;;;;;4:21:4:22;;:24::33;;:12::34;:4::36;5:20:5:29;;:12::30;:34::46;;:12;3:2:6:3:1;;;;8::16::0;;;;;9:12:9:21;;:25::35;:12;:4::37;10:12:10:19;;:23::30;;:12;:4::32;11:12:11:13;;:17::18;;:12;:4::20;12:12:12:21;;:25::34;;:12;:4::36;13:21:13:22;;:24::33;;:12::34;:4::36;14:20:14:29;;:12::30;:34::43;;:12;:4::45;15:23:15:30;;:4::32;;8:2:16:3:1;;";
+  expect(sourceMap).toBe(expected);
+
+  const full = sourceMapToLocationData(sourceMap);
+  expect(full).toEqual(locationData);
+});
diff --git a/yarn.lock b/yarn.lock
index 826b83c2..b77cd314 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2317,6 +2317,11 @@
   resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e"
   integrity sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==
 
+"@types/pako@^2.0.3":
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@types/pako/-/pako-2.0.3.tgz#b6993334f3af27c158f3fe0dfeeba987c578afb1"
+  integrity sha512-bq0hMV9opAcrmE0Byyo0fY3Ew4tgOevJmQ9grUhpXQhYfyLJ1Kqg3P33JT5fdbT2AjeAjR51zqqVjAL/HMkx7Q==
+
 "@types/parse-json@^4.0.0":
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0"
@@ -8788,6 +8793,11 @@ package-hash@^4.0.0:
     lodash.flattendeep "^4.4.0"
     release-zalgo "^1.0.0"
 
+pako@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/pako/-/pako-2.1.0.tgz#266cc37f98c7d883545d11335c00fbd4062c9a86"
+  integrity sha512-w+eufiZ1WuJYgPXbV/PO3NCMEc3xqylkKHzp8bxp1uW4qaSNQUkwmLLEc3kKsfz8lpV1F8Ht3U1Cm+9Srog2ug==
+
 parallel-transform@^1.1.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.2.0.tgz#9049ca37d6cb2182c3b1d2c720be94d14a5814fc"

From 0de45e86d3e18790f3c818ebe5cf2df753e9673a Mon Sep 17 00:00:00 2001
From: mainnet-pat <mainnet_pat@protonmail.com>
Date: Wed, 22 Nov 2023 17:39:50 +0000
Subject: [PATCH 002/171] Stash

---
 packages/cashc/src/ast/AST.ts                 |  26 +
 packages/cashc/src/ast/AstBuilder.ts          |  27 +
 packages/cashc/src/ast/AstTraversal.ts        |  11 +
 packages/cashc/src/ast/AstVisitor.ts          |   4 +
 .../src/generation/GenerateTargetTraversal.ts |  43 +-
 packages/cashc/src/grammar/CashScript.g4      |  14 +
 packages/cashc/src/grammar/CashScript.interp  |   8 +-
 packages/cashc/src/grammar/CashScript.tokens  | 102 +--
 .../cashc/src/grammar/CashScriptLexer.interp  |  11 +-
 .../cashc/src/grammar/CashScriptLexer.tokens  | 102 +--
 packages/cashc/src/grammar/CashScriptLexer.ts | 795 +++++++++---------
 .../cashc/src/grammar/CashScriptParser.ts     | 578 +++++++------
 .../cashc/src/grammar/CashScriptVisitor.ts    |   9 +
 packages/cashc/test/ast/Location.test.ts      |  29 +-
 14 files changed, 1001 insertions(+), 758 deletions(-)

diff --git a/packages/cashc/src/ast/AST.ts b/packages/cashc/src/ast/AST.ts
index 064a57b2..fe990d74 100644
--- a/packages/cashc/src/ast/AST.ts
+++ b/packages/cashc/src/ast/AST.ts
@@ -351,3 +351,29 @@ export class HexLiteralNode extends LiteralNode {
     return visitor.visitHexLiteral(this);
   }
 }
+
+export class ConsoleLogNode extends Node {
+  constructor(
+    public parameters: ConsoleLogParameterNode[],
+  ) {
+    super();
+  }
+
+  accept<T>(visitor: AstVisitor<T>): T {
+    return visitor.visitConsoleLog(this);
+  }
+}
+
+
+export class ConsoleLogParameterNode extends Node {
+  constructor(
+    public message?: StringLiteralNode,
+    public identifier?: IdentifierNode,
+  ) {
+    super();
+  }
+
+  accept<T>(visitor: AstVisitor<T>): T {
+    return visitor.visitConsoleLogParameter(this);
+  }
+}
diff --git a/packages/cashc/src/ast/AstBuilder.ts b/packages/cashc/src/ast/AstBuilder.ts
index dc435a0f..d04b8d72 100644
--- a/packages/cashc/src/ast/AstBuilder.ts
+++ b/packages/cashc/src/ast/AstBuilder.ts
@@ -33,6 +33,8 @@ import {
   InstantiationNode,
   TupleAssignmentNode,
   NullaryOpNode,
+  ConsoleLogNode,
+  ConsoleLogParameterNode,
 } from './AST.js';
 import { UnaryOperator, BinaryOperator, NullaryOperator } from './Operator.js';
 import type {
@@ -63,6 +65,9 @@ import type {
   InstantiationContext,
   NullaryOpContext,
   UnaryIntrospectionOpContext,
+  ConsoleLogContext,
+  ConsoleLogParameterContext,
+  ConsoleLogExpressionContext,
 } from '../grammar/CashScriptParser.js';
 import type { CashScriptVisitor } from '../grammar/CashScriptVisitor.js';
 import { Location } from './Location.js';
@@ -377,4 +382,26 @@ export default class AstBuilder
     hexLiteral.location = Location.fromCtx(ctx);
     return hexLiteral;
   }
+
+  visitConsoleLogExpression(ctx: ConsoleLogExpressionContext): ConsoleLogNode {
+    return this.visit(ctx.consoleLog()) as ConsoleLogNode;
+  }
+
+  visitConsoleLog(ctx: ConsoleLogContext): ConsoleLogNode {
+    const parameters = ctx.consoleParameterList().consoleLogParameter().map((p) => this.visit(p) as ConsoleLogParameterNode);
+
+    const node = new ConsoleLogNode(parameters);
+    node.location = Location.fromCtx(ctx);
+
+    return node;
+  }
+
+  visitConsoleLogParameter(ctx: ConsoleLogParameterContext): ConsoleLogParameterNode {
+    const stringLiteral = ctx.StringLiteral() ? this.createStringLiteral(ctx as any) : undefined;
+    const identifier = ctx.Identifier() as IdentifierNode | undefined;
+
+    const node = new ConsoleLogParameterNode(stringLiteral, identifier);
+    node.location = Location.fromCtx(ctx);
+    return node;
+  }
 }
diff --git a/packages/cashc/src/ast/AstTraversal.ts b/packages/cashc/src/ast/AstTraversal.ts
index 11fed2c4..04cfa96f 100644
--- a/packages/cashc/src/ast/AstTraversal.ts
+++ b/packages/cashc/src/ast/AstTraversal.ts
@@ -25,6 +25,8 @@ import {
   InstantiationNode,
   TupleAssignmentNode,
   NullaryOpNode,
+  ConsoleLogNode,
+  ConsoleLogParameterNode,
 } from './AST.js';
 import AstVisitor from './AstVisitor.js';
 
@@ -150,4 +152,13 @@ export default class AstTraversal extends AstVisitor<Node> {
   visitHexLiteral(node: HexLiteralNode): Node {
     return node;
   }
+
+  visitConsoleLog(node: ConsoleLogNode): Node {
+    node.parameters = this.visitList(node.parameters) as ConsoleLogParameterNode[];
+    return node;
+  }
+
+  visitConsoleLogParameter(node: ConsoleLogParameterNode): Node {
+    return node;
+  }
 }
diff --git a/packages/cashc/src/ast/AstVisitor.ts b/packages/cashc/src/ast/AstVisitor.ts
index d90261e1..1fbd43d5 100644
--- a/packages/cashc/src/ast/AstVisitor.ts
+++ b/packages/cashc/src/ast/AstVisitor.ts
@@ -24,6 +24,8 @@ import {
   InstantiationNode,
   TupleAssignmentNode,
   NullaryOpNode,
+  ConsoleLogNode,
+  ConsoleLogParameterNode,
 } from './AST.js';
 
 export default abstract class AstVisitor<T> {
@@ -51,6 +53,8 @@ export default abstract class AstVisitor<T> {
   abstract visitIntLiteral(node: IntLiteralNode): T;
   abstract visitStringLiteral(node: StringLiteralNode): T;
   abstract visitHexLiteral(node: HexLiteralNode): T;
+  abstract visitConsoleLog(node: ConsoleLogNode): T;
+  abstract visitConsoleLogParameter(node: ConsoleLogParameterNode): T;
 
   visit(node: Node): T {
     return node.accept(this);
diff --git a/packages/cashc/src/generation/GenerateTargetTraversal.ts b/packages/cashc/src/generation/GenerateTargetTraversal.ts
index e7bc46b2..950c082a 100644
--- a/packages/cashc/src/generation/GenerateTargetTraversal.ts
+++ b/packages/cashc/src/generation/GenerateTargetTraversal.ts
@@ -12,7 +12,8 @@ import {
   scriptToAsm,
   generateSourceMap,
   LocationI,
-  LocationData
+  LocationData,
+  LogEntry
 } from '@cashscript/utils';
 import {
   ContractNode,
@@ -40,9 +41,11 @@ import {
   InstantiationNode,
   TupleAssignmentNode,
   NullaryOpNode,
+  ConsoleLogNode,
+  ConsoleLogParameterNode,
 } from '../ast/AST.js';
 import AstTraversal from '../ast/AstTraversal.js';
-import { GlobalFunction, Class } from '../ast/Globals.js';
+import { GlobalFunction, Class, GLOBAL_SYMBOL_TABLE } from '../ast/Globals.js';
 import { BinaryOperator } from '../ast/Operator.js';
 import {
   compileBinaryOp,
@@ -53,12 +56,14 @@ import {
   compileUnaryOp,
 } from './utils.js';
 import { Location } from '../ast/Location.js';
+import { ParseError } from '../Errors.js';
 
 export default class GenerateTargetTraversalWithLocation extends AstTraversal {
   locationData: LocationData = [];
   output: Script = [];
   stack: string[] = [];
   souceMap: string;
+  consoleLogs: LogEntry[];
 
   private scopeDepth = 0;
   private currentFunction: FunctionDefinitionNode;
@@ -238,7 +243,6 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
   // This algorithm can be optimised for hardcoded depths
   // See thesis for explanation
   emitReplace(index: number, node: Node): void {
-    console.log("replace", index, node)
     this.emit(encodeInt(BigInt(index)), node.location!);
     this.emit(Op.OP_ROLL, node.location!);
     this.emit(Op.OP_DROP, node.location!);
@@ -294,7 +298,6 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
 
   removeScopedVariables(depthBeforeScope: number, node: Node): void {
     const dropCount = this.stack.length - depthBeforeScope;
-    console.warn(dropCount)
     for (let i = 0; i < dropCount; i += 1) {
       this.emit(Op.OP_DROP, node.location!);
       this.popFromStack();
@@ -513,4 +516,36 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
     this.pushToStack('(value)');
     return node;
   }
+
+  visitConsoleLog(node: ConsoleLogNode): Node {
+    const ip = this.output.length;
+    const line = node.location!.start.line;
+
+    let index = this.consoleLogs.findIndex((entry: LogEntry) => entry.ip === ip);
+    if (index === -1) {
+      index = this.consoleLogs.push({
+        ip,
+        line,
+        data: []
+      }) - 1;
+    };
+
+    node.parameters.forEach((parameter: ConsoleLogParameterNode) => {
+      if (parameter.identifier?.name) {
+        const symbol = GLOBAL_SYMBOL_TABLE.get(parameter.identifier.name);
+        if (!symbol) {
+          throw new ParseError(`Invalid symbol for console.log: ${symbol}`);
+        }
+        const stackIndex = this.getStackIndex(parameter.identifier.name);
+        this.consoleLogs[index].data.push({
+          stackIndex,
+          type: typeof symbol.type === "string" ? symbol.type : symbol.toString(),
+        })
+      } else if (parameter.message?.value) {
+        this.consoleLogs[index].data.push(parameter.message.value);
+      }
+    });
+
+    return node;
+  }
 }
diff --git a/packages/cashc/src/grammar/CashScript.g4 b/packages/cashc/src/grammar/CashScript.g4
index eabd99ed..455bea92 100644
--- a/packages/cashc/src/grammar/CashScript.g4
+++ b/packages/cashc/src/grammar/CashScript.g4
@@ -92,6 +92,7 @@ expression
     | functionCall # FunctionCallExpression
     | 'new' Identifier expressionList #Instantiation
     | expression '[' index=NumberLiteral ']' # TupleIndexOp
+    | scope='console.' op=('log' | 'warn') expressionList # ConsoleExpression
     | scope='tx.outputs' '[' expression ']' op=('.value' | '.lockingBytecode' | '.tokenCategory' | '.nftCommitment' | '.tokenAmount') # UnaryIntrospectionOp
     | scope='tx.inputs' '[' expression ']' op=('.value' | '.lockingBytecode' | '.outpointTransactionHash' | '.outpointIndex' | '.unlockingBytecode' | '.sequenceNumber' | '.tokenCategory' | '.nftCommitment' | '.tokenAmount') # UnaryIntrospectionOp
     | expression op=('.reverse()' | '.length') # UnaryOp
@@ -200,3 +201,16 @@ COMMENT
 LINE_COMMENT
     : '//' ~[\r\n]* -> channel(HIDDEN)
     ;
+
+// consoleLogParameter
+//     : Identifier
+//     | StringLiteral
+//     ;
+
+// consoleParameterList
+//     : '(' (consoleLogParameter (',' consoleLogParameter)* ','?)? ')'
+//     ;
+
+// consoleLog
+//     : 'consolelog' consoleParameterList
+//     ;
\ No newline at end of file
diff --git a/packages/cashc/src/grammar/CashScript.interp b/packages/cashc/src/grammar/CashScript.interp
index ae258f62..e663be56 100644
--- a/packages/cashc/src/grammar/CashScript.interp
+++ b/packages/cashc/src/grammar/CashScript.interp
@@ -23,6 +23,9 @@ null
 'new'
 '['
 ']'
+'console.'
+'log'
+'warn'
 'tx.outputs'
 '.value'
 '.lockingBytecode'
@@ -130,6 +133,9 @@ null
 null
 null
 null
+null
+null
+null
 VersionLiteral
 BooleanLiteral
 NumberUnit
@@ -175,4 +181,4 @@ typeName
 
 
 atn:
-[3, 51485, 51898, 1421, 44986, 20307, 1543, 60043, 49729, 3, 73, 324, 4, 2, 9, 2, 4, 3, 9, 3, 4, 4, 9, 4, 4, 5, 9, 5, 4, 6, 9, 6, 4, 7, 9, 7, 4, 8, 9, 8, 4, 9, 9, 9, 4, 10, 9, 10, 4, 11, 9, 11, 4, 12, 9, 12, 4, 13, 9, 13, 4, 14, 9, 14, 4, 15, 9, 15, 4, 16, 9, 16, 4, 17, 9, 17, 4, 18, 9, 18, 4, 19, 9, 19, 4, 20, 9, 20, 4, 21, 9, 21, 4, 22, 9, 22, 4, 23, 9, 23, 4, 24, 9, 24, 4, 25, 9, 25, 4, 26, 9, 26, 3, 2, 7, 2, 54, 10, 2, 12, 2, 14, 2, 57, 11, 2, 3, 2, 3, 2, 3, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 3, 4, 3, 5, 3, 5, 5, 5, 71, 10, 5, 3, 6, 5, 6, 74, 10, 6, 3, 6, 3, 6, 3, 7, 3, 7, 3, 8, 3, 8, 3, 8, 3, 8, 3, 8, 7, 8, 85, 10, 8, 12, 8, 14, 8, 88, 11, 8, 3, 8, 3, 8, 3, 9, 3, 9, 3, 9, 3, 9, 3, 9, 7, 9, 97, 10, 9, 12, 9, 14, 9, 100, 11, 9, 3, 9, 3, 9, 3, 10, 3, 10, 3, 10, 3, 10, 7, 10, 108, 10, 10, 12, 10, 14, 10, 111, 11, 10, 3, 10, 5, 10, 114, 10, 10, 5, 10, 116, 10, 10, 3, 10, 3, 10, 3, 11, 3, 11, 3, 11, 3, 12, 3, 12, 7, 12, 125, 10, 12, 12, 12, 14, 12, 128, 11, 12, 3, 12, 3, 12, 5, 12, 132, 10, 12, 3, 13, 3, 13, 3, 13, 3, 13, 3, 13, 3, 13, 5, 13, 140, 10, 13, 3, 14, 3, 14, 7, 14, 144, 10, 14, 12, 14, 14, 14, 147, 11, 14, 3, 14, 3, 14, 3, 14, 3, 14, 3, 14, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 3, 16, 3, 16, 3, 16, 3, 16, 3, 16, 3, 17, 3, 17, 3, 17, 3, 17, 3, 17, 3, 17, 3, 17, 3, 17, 3, 18, 3, 18, 3, 18, 3, 18, 3, 18, 3, 18, 3, 19, 3, 19, 3, 19, 3, 19, 3, 19, 3, 19, 3, 19, 5, 19, 189, 10, 19, 3, 20, 3, 20, 3, 20, 3, 21, 3, 21, 3, 21, 3, 21, 7, 21, 198, 10, 21, 12, 21, 14, 21, 201, 11, 21, 3, 21, 5, 21, 204, 10, 21, 5, 21, 206, 10, 21, 3, 21, 3, 21, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 5, 22, 220, 10, 22, 3, 22, 5, 22, 223, 10, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 7, 22, 249, 10, 22, 12, 22, 14, 22, 252, 11, 22, 3, 22, 5, 22, 255, 10, 22, 5, 22, 257, 10, 22, 3, 22, 3, 22, 3, 22, 3, 22, 5, 22, 263, 10, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 7, 22, 304, 10, 22, 12, 22, 14, 22, 307, 11, 22, 3, 23, 3, 23, 3, 24, 3, 24, 3, 24, 3, 24, 3, 24, 5, 24, 316, 10, 24, 3, 25, 3, 25, 5, 25, 320, 10, 25, 3, 26, 3, 26, 3, 26, 2, 2, 3, 42, 27, 2, 2, 4, 2, 6, 2, 8, 2, 10, 2, 12, 2, 14, 2, 16, 2, 18, 2, 20, 2, 22, 2, 24, 2, 26, 2, 28, 2, 30, 2, 32, 2, 34, 2, 36, 2, 38, 2, 40, 2, 42, 2, 44, 2, 46, 2, 48, 2, 50, 2, 2, 12, 3, 2, 6, 12, 3, 2, 27, 31, 4, 2, 27, 31, 33, 36, 3, 2, 40, 41, 3, 2, 42, 44, 4, 2, 41, 41, 45, 45, 3, 2, 8, 11, 3, 2, 46, 47, 3, 2, 37, 38, 4, 2, 53, 58, 63, 63, 2, 350, 2, 55, 3, 2, 2, 2, 4, 61, 3, 2, 2, 2, 6, 66, 3, 2, 2, 2, 8, 68, 3, 2, 2, 2, 10, 73, 3, 2, 2, 2, 12, 77, 3, 2, 2, 2, 14, 79, 3, 2, 2, 2, 16, 91, 3, 2, 2, 2, 18, 103, 3, 2, 2, 2, 20, 119, 3, 2, 2, 2, 22, 131, 3, 2, 2, 2, 24, 139, 3, 2, 2, 2, 26, 141, 3, 2, 2, 2, 28, 153, 3, 2, 2, 2, 30, 162, 3, 2, 2, 2, 32, 167, 3, 2, 2, 2, 34, 175, 3, 2, 2, 2, 36, 181, 3, 2, 2, 2, 38, 190, 3, 2, 2, 2, 40, 193, 3, 2, 2, 2, 42, 262, 3, 2, 2, 2, 44, 308, 3, 2, 2, 2, 46, 315, 3, 2, 2, 2, 48, 317, 3, 2, 2, 2, 50, 321, 3, 2, 2, 2, 52, 54, 5, 4, 3, 2, 53, 52, 3, 2, 2, 2, 54, 57, 3, 2, 2, 2, 55, 53, 3, 2, 2, 2, 55, 56, 3, 2, 2, 2, 56, 58, 3, 2, 2, 2, 57, 55, 3, 2, 2, 2, 58, 59, 5, 14, 8, 2, 59, 60, 7, 2, 2, 3, 60, 3, 3, 2, 2, 2, 61, 62, 7, 3, 2, 2, 62, 63, 5, 6, 4, 2, 63, 64, 5, 8, 5, 2, 64, 65, 7, 4, 2, 2, 65, 5, 3, 2, 2, 2, 66, 67, 7, 5, 2, 2, 67, 7, 3, 2, 2, 2, 68, 70, 5, 10, 6, 2, 69, 71, 5, 10, 6, 2, 70, 69, 3, 2, 2, 2, 70, 71, 3, 2, 2, 2, 71, 9, 3, 2, 2, 2, 72, 74, 5, 12, 7, 2, 73, 72, 3, 2, 2, 2, 73, 74, 3, 2, 2, 2, 74, 75, 3, 2, 2, 2, 75, 76, 7, 59, 2, 2, 76, 11, 3, 2, 2, 2, 77, 78, 9, 2, 2, 2, 78, 13, 3, 2, 2, 2, 79, 80, 7, 13, 2, 2, 80, 81, 7, 70, 2, 2, 81, 82, 5, 18, 10, 2, 82, 86, 7, 14, 2, 2, 83, 85, 5, 16, 9, 2, 84, 83, 3, 2, 2, 2, 85, 88, 3, 2, 2, 2, 86, 84, 3, 2, 2, 2, 86, 87, 3, 2, 2, 2, 87, 89, 3, 2, 2, 2, 88, 86, 3, 2, 2, 2, 89, 90, 7, 15, 2, 2, 90, 15, 3, 2, 2, 2, 91, 92, 7, 16, 2, 2, 92, 93, 7, 70, 2, 2, 93, 94, 5, 18, 10, 2, 94, 98, 7, 14, 2, 2, 95, 97, 5, 24, 13, 2, 96, 95, 3, 2, 2, 2, 97, 100, 3, 2, 2, 2, 98, 96, 3, 2, 2, 2, 98, 99, 3, 2, 2, 2, 99, 101, 3, 2, 2, 2, 100, 98, 3, 2, 2, 2, 101, 102, 7, 15, 2, 2, 102, 17, 3, 2, 2, 2, 103, 115, 7, 17, 2, 2, 104, 109, 5, 20, 11, 2, 105, 106, 7, 18, 2, 2, 106, 108, 5, 20, 11, 2, 107, 105, 3, 2, 2, 2, 108, 111, 3, 2, 2, 2, 109, 107, 3, 2, 2, 2, 109, 110, 3, 2, 2, 2, 110, 113, 3, 2, 2, 2, 111, 109, 3, 2, 2, 2, 112, 114, 7, 18, 2, 2, 113, 112, 3, 2, 2, 2, 113, 114, 3, 2, 2, 2, 114, 116, 3, 2, 2, 2, 115, 104, 3, 2, 2, 2, 115, 116, 3, 2, 2, 2, 116, 117, 3, 2, 2, 2, 117, 118, 7, 19, 2, 2, 118, 19, 3, 2, 2, 2, 119, 120, 5, 50, 26, 2, 120, 121, 7, 70, 2, 2, 121, 21, 3, 2, 2, 2, 122, 126, 7, 14, 2, 2, 123, 125, 5, 24, 13, 2, 124, 123, 3, 2, 2, 2, 125, 128, 3, 2, 2, 2, 126, 124, 3, 2, 2, 2, 126, 127, 3, 2, 2, 2, 127, 129, 3, 2, 2, 2, 128, 126, 3, 2, 2, 2, 129, 132, 7, 15, 2, 2, 130, 132, 5, 24, 13, 2, 131, 122, 3, 2, 2, 2, 131, 130, 3, 2, 2, 2, 132, 23, 3, 2, 2, 2, 133, 140, 5, 26, 14, 2, 134, 140, 5, 28, 15, 2, 135, 140, 5, 30, 16, 2, 136, 140, 5, 32, 17, 2, 137, 140, 5, 34, 18, 2, 138, 140, 5, 36, 19, 2, 139, 133, 3, 2, 2, 2, 139, 134, 3, 2, 2, 2, 139, 135, 3, 2, 2, 2, 139, 136, 3, 2, 2, 2, 139, 137, 3, 2, 2, 2, 139, 138, 3, 2, 2, 2, 140, 25, 3, 2, 2, 2, 141, 145, 5, 50, 26, 2, 142, 144, 5, 44, 23, 2, 143, 142, 3, 2, 2, 2, 144, 147, 3, 2, 2, 2, 145, 143, 3, 2, 2, 2, 145, 146, 3, 2, 2, 2, 146, 148, 3, 2, 2, 2, 147, 145, 3, 2, 2, 2, 148, 149, 7, 70, 2, 2, 149, 150, 7, 12, 2, 2, 150, 151, 5, 42, 22, 2, 151, 152, 7, 4, 2, 2, 152, 27, 3, 2, 2, 2, 153, 154, 5, 50, 26, 2, 154, 155, 7, 70, 2, 2, 155, 156, 7, 18, 2, 2, 156, 157, 5, 50, 26, 2, 157, 158, 7, 70, 2, 2, 158, 159, 7, 12, 2, 2, 159, 160, 5, 42, 22, 2, 160, 161, 7, 4, 2, 2, 161, 29, 3, 2, 2, 2, 162, 163, 7, 70, 2, 2, 163, 164, 7, 12, 2, 2, 164, 165, 5, 42, 22, 2, 165, 166, 7, 4, 2, 2, 166, 31, 3, 2, 2, 2, 167, 168, 7, 20, 2, 2, 168, 169, 7, 17, 2, 2, 169, 170, 7, 68, 2, 2, 170, 171, 7, 8, 2, 2, 171, 172, 5, 42, 22, 2, 172, 173, 7, 19, 2, 2, 173, 174, 7, 4, 2, 2, 174, 33, 3, 2, 2, 2, 175, 176, 7, 20, 2, 2, 176, 177, 7, 17, 2, 2, 177, 178, 5, 42, 22, 2, 178, 179, 7, 19, 2, 2, 179, 180, 7, 4, 2, 2, 180, 35, 3, 2, 2, 2, 181, 182, 7, 21, 2, 2, 182, 183, 7, 17, 2, 2, 183, 184, 5, 42, 22, 2, 184, 185, 7, 19, 2, 2, 185, 188, 5, 22, 12, 2, 186, 187, 7, 22, 2, 2, 187, 189, 5, 22, 12, 2, 188, 186, 3, 2, 2, 2, 188, 189, 3, 2, 2, 2, 189, 37, 3, 2, 2, 2, 190, 191, 7, 70, 2, 2, 191, 192, 5, 40, 21, 2, 192, 39, 3, 2, 2, 2, 193, 205, 7, 17, 2, 2, 194, 199, 5, 42, 22, 2, 195, 196, 7, 18, 2, 2, 196, 198, 5, 42, 22, 2, 197, 195, 3, 2, 2, 2, 198, 201, 3, 2, 2, 2, 199, 197, 3, 2, 2, 2, 199, 200, 3, 2, 2, 2, 200, 203, 3, 2, 2, 2, 201, 199, 3, 2, 2, 2, 202, 204, 7, 18, 2, 2, 203, 202, 3, 2, 2, 2, 203, 204, 3, 2, 2, 2, 204, 206, 3, 2, 2, 2, 205, 194, 3, 2, 2, 2, 205, 206, 3, 2, 2, 2, 206, 207, 3, 2, 2, 2, 207, 208, 7, 19, 2, 2, 208, 41, 3, 2, 2, 2, 209, 210, 8, 22, 1, 2, 210, 211, 7, 17, 2, 2, 211, 212, 5, 42, 22, 2, 212, 213, 7, 19, 2, 2, 213, 263, 3, 2, 2, 2, 214, 215, 5, 50, 26, 2, 215, 216, 7, 17, 2, 2, 216, 219, 5, 42, 22, 2, 217, 218, 7, 18, 2, 2, 218, 220, 5, 42, 22, 2, 219, 217, 3, 2, 2, 2, 219, 220, 3, 2, 2, 2, 220, 222, 3, 2, 2, 2, 221, 223, 7, 18, 2, 2, 222, 221, 3, 2, 2, 2, 222, 223, 3, 2, 2, 2, 223, 224, 3, 2, 2, 2, 224, 225, 7, 19, 2, 2, 225, 263, 3, 2, 2, 2, 226, 263, 5, 38, 20, 2, 227, 228, 7, 23, 2, 2, 228, 229, 7, 70, 2, 2, 229, 263, 5, 40, 21, 2, 230, 231, 7, 26, 2, 2, 231, 232, 7, 24, 2, 2, 232, 233, 5, 42, 22, 2, 233, 234, 7, 25, 2, 2, 234, 235, 9, 3, 2, 2, 235, 263, 3, 2, 2, 2, 236, 237, 7, 32, 2, 2, 237, 238, 7, 24, 2, 2, 238, 239, 5, 42, 22, 2, 239, 240, 7, 25, 2, 2, 240, 241, 9, 4, 2, 2, 241, 263, 3, 2, 2, 2, 242, 243, 9, 5, 2, 2, 243, 263, 5, 42, 22, 16, 244, 256, 7, 24, 2, 2, 245, 250, 5, 42, 22, 2, 246, 247, 7, 18, 2, 2, 247, 249, 5, 42, 22, 2, 248, 246, 3, 2, 2, 2, 249, 252, 3, 2, 2, 2, 250, 248, 3, 2, 2, 2, 250, 251, 3, 2, 2, 2, 251, 254, 3, 2, 2, 2, 252, 250, 3, 2, 2, 2, 253, 255, 7, 18, 2, 2, 254, 253, 3, 2, 2, 2, 254, 255, 3, 2, 2, 2, 255, 257, 3, 2, 2, 2, 256, 245, 3, 2, 2, 2, 256, 257, 3, 2, 2, 2, 257, 258, 3, 2, 2, 2, 258, 263, 7, 25, 2, 2, 259, 263, 7, 69, 2, 2, 260, 263, 7, 70, 2, 2, 261, 263, 5, 46, 24, 2, 262, 209, 3, 2, 2, 2, 262, 214, 3, 2, 2, 2, 262, 226, 3, 2, 2, 2, 262, 227, 3, 2, 2, 2, 262, 230, 3, 2, 2, 2, 262, 236, 3, 2, 2, 2, 262, 242, 3, 2, 2, 2, 262, 244, 3, 2, 2, 2, 262, 259, 3, 2, 2, 2, 262, 260, 3, 2, 2, 2, 262, 261, 3, 2, 2, 2, 263, 305, 3, 2, 2, 2, 264, 265, 12, 15, 2, 2, 265, 266, 9, 6, 2, 2, 266, 304, 5, 42, 22, 16, 267, 268, 12, 14, 2, 2, 268, 269, 9, 7, 2, 2, 269, 304, 5, 42, 22, 15, 270, 271, 12, 13, 2, 2, 271, 272, 9, 8, 2, 2, 272, 304, 5, 42, 22, 14, 273, 274, 12, 12, 2, 2, 274, 275, 9, 9, 2, 2, 275, 304, 5, 42, 22, 13, 276, 277, 12, 11, 2, 2, 277, 278, 7, 48, 2, 2, 278, 304, 5, 42, 22, 12, 279, 280, 12, 10, 2, 2, 280, 281, 7, 6, 2, 2, 281, 304, 5, 42, 22, 11, 282, 283, 12, 9, 2, 2, 283, 284, 7, 49, 2, 2, 284, 304, 5, 42, 22, 10, 285, 286, 12, 8, 2, 2, 286, 287, 7, 50, 2, 2, 287, 304, 5, 42, 22, 9, 288, 289, 12, 7, 2, 2, 289, 290, 7, 51, 2, 2, 290, 304, 5, 42, 22, 8, 291, 292, 12, 21, 2, 2, 292, 293, 7, 24, 2, 2, 293, 294, 7, 62, 2, 2, 294, 304, 7, 25, 2, 2, 295, 296, 12, 18, 2, 2, 296, 304, 9, 10, 2, 2, 297, 298, 12, 17, 2, 2, 298, 299, 7, 39, 2, 2, 299, 300, 7, 17, 2, 2, 300, 301, 5, 42, 22, 2, 301, 302, 7, 19, 2, 2, 302, 304, 3, 2, 2, 2, 303, 264, 3, 2, 2, 2, 303, 267, 3, 2, 2, 2, 303, 270, 3, 2, 2, 2, 303, 273, 3, 2, 2, 2, 303, 276, 3, 2, 2, 2, 303, 279, 3, 2, 2, 2, 303, 282, 3, 2, 2, 2, 303, 285, 3, 2, 2, 2, 303, 288, 3, 2, 2, 2, 303, 291, 3, 2, 2, 2, 303, 295, 3, 2, 2, 2, 303, 297, 3, 2, 2, 2, 304, 307, 3, 2, 2, 2, 305, 303, 3, 2, 2, 2, 305, 306, 3, 2, 2, 2, 306, 43, 3, 2, 2, 2, 307, 305, 3, 2, 2, 2, 308, 309, 7, 52, 2, 2, 309, 45, 3, 2, 2, 2, 310, 316, 7, 60, 2, 2, 311, 316, 5, 48, 25, 2, 312, 316, 7, 65, 2, 2, 313, 316, 7, 66, 2, 2, 314, 316, 7, 67, 2, 2, 315, 310, 3, 2, 2, 2, 315, 311, 3, 2, 2, 2, 315, 312, 3, 2, 2, 2, 315, 313, 3, 2, 2, 2, 315, 314, 3, 2, 2, 2, 316, 47, 3, 2, 2, 2, 317, 319, 7, 62, 2, 2, 318, 320, 7, 61, 2, 2, 319, 318, 3, 2, 2, 2, 319, 320, 3, 2, 2, 2, 320, 49, 3, 2, 2, 2, 321, 322, 9, 11, 2, 2, 322, 51, 3, 2, 2, 2, 28, 55, 70, 73, 86, 98, 109, 113, 115, 126, 131, 139, 145, 188, 199, 203, 205, 219, 222, 250, 254, 256, 262, 303, 305, 315, 319]
\ No newline at end of file
+[3, 51485, 51898, 1421, 44986, 20307, 1543, 60043, 49729, 3, 76, 327, 4, 2, 9, 2, 4, 3, 9, 3, 4, 4, 9, 4, 4, 5, 9, 5, 4, 6, 9, 6, 4, 7, 9, 7, 4, 8, 9, 8, 4, 9, 9, 9, 4, 10, 9, 10, 4, 11, 9, 11, 4, 12, 9, 12, 4, 13, 9, 13, 4, 14, 9, 14, 4, 15, 9, 15, 4, 16, 9, 16, 4, 17, 9, 17, 4, 18, 9, 18, 4, 19, 9, 19, 4, 20, 9, 20, 4, 21, 9, 21, 4, 22, 9, 22, 4, 23, 9, 23, 4, 24, 9, 24, 4, 25, 9, 25, 4, 26, 9, 26, 3, 2, 7, 2, 54, 10, 2, 12, 2, 14, 2, 57, 11, 2, 3, 2, 3, 2, 3, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 3, 4, 3, 5, 3, 5, 5, 5, 71, 10, 5, 3, 6, 5, 6, 74, 10, 6, 3, 6, 3, 6, 3, 7, 3, 7, 3, 8, 3, 8, 3, 8, 3, 8, 3, 8, 7, 8, 85, 10, 8, 12, 8, 14, 8, 88, 11, 8, 3, 8, 3, 8, 3, 9, 3, 9, 3, 9, 3, 9, 3, 9, 7, 9, 97, 10, 9, 12, 9, 14, 9, 100, 11, 9, 3, 9, 3, 9, 3, 10, 3, 10, 3, 10, 3, 10, 7, 10, 108, 10, 10, 12, 10, 14, 10, 111, 11, 10, 3, 10, 5, 10, 114, 10, 10, 5, 10, 116, 10, 10, 3, 10, 3, 10, 3, 11, 3, 11, 3, 11, 3, 12, 3, 12, 7, 12, 125, 10, 12, 12, 12, 14, 12, 128, 11, 12, 3, 12, 3, 12, 5, 12, 132, 10, 12, 3, 13, 3, 13, 3, 13, 3, 13, 3, 13, 3, 13, 5, 13, 140, 10, 13, 3, 14, 3, 14, 7, 14, 144, 10, 14, 12, 14, 14, 14, 147, 11, 14, 3, 14, 3, 14, 3, 14, 3, 14, 3, 14, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 3, 16, 3, 16, 3, 16, 3, 16, 3, 16, 3, 17, 3, 17, 3, 17, 3, 17, 3, 17, 3, 17, 3, 17, 3, 17, 3, 18, 3, 18, 3, 18, 3, 18, 3, 18, 3, 18, 3, 19, 3, 19, 3, 19, 3, 19, 3, 19, 3, 19, 3, 19, 5, 19, 189, 10, 19, 3, 20, 3, 20, 3, 20, 3, 21, 3, 21, 3, 21, 3, 21, 7, 21, 198, 10, 21, 12, 21, 14, 21, 201, 11, 21, 3, 21, 5, 21, 204, 10, 21, 5, 21, 206, 10, 21, 3, 21, 3, 21, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 5, 22, 220, 10, 22, 3, 22, 5, 22, 223, 10, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 7, 22, 252, 10, 22, 12, 22, 14, 22, 255, 11, 22, 3, 22, 5, 22, 258, 10, 22, 5, 22, 260, 10, 22, 3, 22, 3, 22, 3, 22, 3, 22, 5, 22, 266, 10, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 7, 22, 307, 10, 22, 12, 22, 14, 22, 310, 11, 22, 3, 23, 3, 23, 3, 24, 3, 24, 3, 24, 3, 24, 3, 24, 5, 24, 319, 10, 24, 3, 25, 3, 25, 5, 25, 323, 10, 25, 3, 26, 3, 26, 3, 26, 2, 2, 3, 42, 27, 2, 2, 4, 2, 6, 2, 8, 2, 10, 2, 12, 2, 14, 2, 16, 2, 18, 2, 20, 2, 22, 2, 24, 2, 26, 2, 28, 2, 30, 2, 32, 2, 34, 2, 36, 2, 38, 2, 40, 2, 42, 2, 44, 2, 46, 2, 48, 2, 50, 2, 2, 13, 3, 2, 6, 12, 3, 2, 27, 28, 3, 2, 30, 34, 4, 2, 30, 34, 36, 39, 3, 2, 43, 44, 3, 2, 45, 47, 4, 2, 44, 44, 48, 48, 3, 2, 8, 11, 3, 2, 49, 50, 3, 2, 40, 41, 4, 2, 56, 61, 66, 66, 2, 354, 2, 55, 3, 2, 2, 2, 4, 61, 3, 2, 2, 2, 6, 66, 3, 2, 2, 2, 8, 68, 3, 2, 2, 2, 10, 73, 3, 2, 2, 2, 12, 77, 3, 2, 2, 2, 14, 79, 3, 2, 2, 2, 16, 91, 3, 2, 2, 2, 18, 103, 3, 2, 2, 2, 20, 119, 3, 2, 2, 2, 22, 131, 3, 2, 2, 2, 24, 139, 3, 2, 2, 2, 26, 141, 3, 2, 2, 2, 28, 153, 3, 2, 2, 2, 30, 162, 3, 2, 2, 2, 32, 167, 3, 2, 2, 2, 34, 175, 3, 2, 2, 2, 36, 181, 3, 2, 2, 2, 38, 190, 3, 2, 2, 2, 40, 193, 3, 2, 2, 2, 42, 265, 3, 2, 2, 2, 44, 311, 3, 2, 2, 2, 46, 318, 3, 2, 2, 2, 48, 320, 3, 2, 2, 2, 50, 324, 3, 2, 2, 2, 52, 54, 5, 4, 3, 2, 53, 52, 3, 2, 2, 2, 54, 57, 3, 2, 2, 2, 55, 53, 3, 2, 2, 2, 55, 56, 3, 2, 2, 2, 56, 58, 3, 2, 2, 2, 57, 55, 3, 2, 2, 2, 58, 59, 5, 14, 8, 2, 59, 60, 7, 2, 2, 3, 60, 3, 3, 2, 2, 2, 61, 62, 7, 3, 2, 2, 62, 63, 5, 6, 4, 2, 63, 64, 5, 8, 5, 2, 64, 65, 7, 4, 2, 2, 65, 5, 3, 2, 2, 2, 66, 67, 7, 5, 2, 2, 67, 7, 3, 2, 2, 2, 68, 70, 5, 10, 6, 2, 69, 71, 5, 10, 6, 2, 70, 69, 3, 2, 2, 2, 70, 71, 3, 2, 2, 2, 71, 9, 3, 2, 2, 2, 72, 74, 5, 12, 7, 2, 73, 72, 3, 2, 2, 2, 73, 74, 3, 2, 2, 2, 74, 75, 3, 2, 2, 2, 75, 76, 7, 62, 2, 2, 76, 11, 3, 2, 2, 2, 77, 78, 9, 2, 2, 2, 78, 13, 3, 2, 2, 2, 79, 80, 7, 13, 2, 2, 80, 81, 7, 73, 2, 2, 81, 82, 5, 18, 10, 2, 82, 86, 7, 14, 2, 2, 83, 85, 5, 16, 9, 2, 84, 83, 3, 2, 2, 2, 85, 88, 3, 2, 2, 2, 86, 84, 3, 2, 2, 2, 86, 87, 3, 2, 2, 2, 87, 89, 3, 2, 2, 2, 88, 86, 3, 2, 2, 2, 89, 90, 7, 15, 2, 2, 90, 15, 3, 2, 2, 2, 91, 92, 7, 16, 2, 2, 92, 93, 7, 73, 2, 2, 93, 94, 5, 18, 10, 2, 94, 98, 7, 14, 2, 2, 95, 97, 5, 24, 13, 2, 96, 95, 3, 2, 2, 2, 97, 100, 3, 2, 2, 2, 98, 96, 3, 2, 2, 2, 98, 99, 3, 2, 2, 2, 99, 101, 3, 2, 2, 2, 100, 98, 3, 2, 2, 2, 101, 102, 7, 15, 2, 2, 102, 17, 3, 2, 2, 2, 103, 115, 7, 17, 2, 2, 104, 109, 5, 20, 11, 2, 105, 106, 7, 18, 2, 2, 106, 108, 5, 20, 11, 2, 107, 105, 3, 2, 2, 2, 108, 111, 3, 2, 2, 2, 109, 107, 3, 2, 2, 2, 109, 110, 3, 2, 2, 2, 110, 113, 3, 2, 2, 2, 111, 109, 3, 2, 2, 2, 112, 114, 7, 18, 2, 2, 113, 112, 3, 2, 2, 2, 113, 114, 3, 2, 2, 2, 114, 116, 3, 2, 2, 2, 115, 104, 3, 2, 2, 2, 115, 116, 3, 2, 2, 2, 116, 117, 3, 2, 2, 2, 117, 118, 7, 19, 2, 2, 118, 19, 3, 2, 2, 2, 119, 120, 5, 50, 26, 2, 120, 121, 7, 73, 2, 2, 121, 21, 3, 2, 2, 2, 122, 126, 7, 14, 2, 2, 123, 125, 5, 24, 13, 2, 124, 123, 3, 2, 2, 2, 125, 128, 3, 2, 2, 2, 126, 124, 3, 2, 2, 2, 126, 127, 3, 2, 2, 2, 127, 129, 3, 2, 2, 2, 128, 126, 3, 2, 2, 2, 129, 132, 7, 15, 2, 2, 130, 132, 5, 24, 13, 2, 131, 122, 3, 2, 2, 2, 131, 130, 3, 2, 2, 2, 132, 23, 3, 2, 2, 2, 133, 140, 5, 26, 14, 2, 134, 140, 5, 28, 15, 2, 135, 140, 5, 30, 16, 2, 136, 140, 5, 32, 17, 2, 137, 140, 5, 34, 18, 2, 138, 140, 5, 36, 19, 2, 139, 133, 3, 2, 2, 2, 139, 134, 3, 2, 2, 2, 139, 135, 3, 2, 2, 2, 139, 136, 3, 2, 2, 2, 139, 137, 3, 2, 2, 2, 139, 138, 3, 2, 2, 2, 140, 25, 3, 2, 2, 2, 141, 145, 5, 50, 26, 2, 142, 144, 5, 44, 23, 2, 143, 142, 3, 2, 2, 2, 144, 147, 3, 2, 2, 2, 145, 143, 3, 2, 2, 2, 145, 146, 3, 2, 2, 2, 146, 148, 3, 2, 2, 2, 147, 145, 3, 2, 2, 2, 148, 149, 7, 73, 2, 2, 149, 150, 7, 12, 2, 2, 150, 151, 5, 42, 22, 2, 151, 152, 7, 4, 2, 2, 152, 27, 3, 2, 2, 2, 153, 154, 5, 50, 26, 2, 154, 155, 7, 73, 2, 2, 155, 156, 7, 18, 2, 2, 156, 157, 5, 50, 26, 2, 157, 158, 7, 73, 2, 2, 158, 159, 7, 12, 2, 2, 159, 160, 5, 42, 22, 2, 160, 161, 7, 4, 2, 2, 161, 29, 3, 2, 2, 2, 162, 163, 7, 73, 2, 2, 163, 164, 7, 12, 2, 2, 164, 165, 5, 42, 22, 2, 165, 166, 7, 4, 2, 2, 166, 31, 3, 2, 2, 2, 167, 168, 7, 20, 2, 2, 168, 169, 7, 17, 2, 2, 169, 170, 7, 71, 2, 2, 170, 171, 7, 8, 2, 2, 171, 172, 5, 42, 22, 2, 172, 173, 7, 19, 2, 2, 173, 174, 7, 4, 2, 2, 174, 33, 3, 2, 2, 2, 175, 176, 7, 20, 2, 2, 176, 177, 7, 17, 2, 2, 177, 178, 5, 42, 22, 2, 178, 179, 7, 19, 2, 2, 179, 180, 7, 4, 2, 2, 180, 35, 3, 2, 2, 2, 181, 182, 7, 21, 2, 2, 182, 183, 7, 17, 2, 2, 183, 184, 5, 42, 22, 2, 184, 185, 7, 19, 2, 2, 185, 188, 5, 22, 12, 2, 186, 187, 7, 22, 2, 2, 187, 189, 5, 22, 12, 2, 188, 186, 3, 2, 2, 2, 188, 189, 3, 2, 2, 2, 189, 37, 3, 2, 2, 2, 190, 191, 7, 73, 2, 2, 191, 192, 5, 40, 21, 2, 192, 39, 3, 2, 2, 2, 193, 205, 7, 17, 2, 2, 194, 199, 5, 42, 22, 2, 195, 196, 7, 18, 2, 2, 196, 198, 5, 42, 22, 2, 197, 195, 3, 2, 2, 2, 198, 201, 3, 2, 2, 2, 199, 197, 3, 2, 2, 2, 199, 200, 3, 2, 2, 2, 200, 203, 3, 2, 2, 2, 201, 199, 3, 2, 2, 2, 202, 204, 7, 18, 2, 2, 203, 202, 3, 2, 2, 2, 203, 204, 3, 2, 2, 2, 204, 206, 3, 2, 2, 2, 205, 194, 3, 2, 2, 2, 205, 206, 3, 2, 2, 2, 206, 207, 3, 2, 2, 2, 207, 208, 7, 19, 2, 2, 208, 41, 3, 2, 2, 2, 209, 210, 8, 22, 1, 2, 210, 211, 7, 17, 2, 2, 211, 212, 5, 42, 22, 2, 212, 213, 7, 19, 2, 2, 213, 266, 3, 2, 2, 2, 214, 215, 5, 50, 26, 2, 215, 216, 7, 17, 2, 2, 216, 219, 5, 42, 22, 2, 217, 218, 7, 18, 2, 2, 218, 220, 5, 42, 22, 2, 219, 217, 3, 2, 2, 2, 219, 220, 3, 2, 2, 2, 220, 222, 3, 2, 2, 2, 221, 223, 7, 18, 2, 2, 222, 221, 3, 2, 2, 2, 222, 223, 3, 2, 2, 2, 223, 224, 3, 2, 2, 2, 224, 225, 7, 19, 2, 2, 225, 266, 3, 2, 2, 2, 226, 266, 5, 38, 20, 2, 227, 228, 7, 23, 2, 2, 228, 229, 7, 73, 2, 2, 229, 266, 5, 40, 21, 2, 230, 231, 7, 26, 2, 2, 231, 232, 9, 3, 2, 2, 232, 266, 5, 40, 21, 2, 233, 234, 7, 29, 2, 2, 234, 235, 7, 24, 2, 2, 235, 236, 5, 42, 22, 2, 236, 237, 7, 25, 2, 2, 237, 238, 9, 4, 2, 2, 238, 266, 3, 2, 2, 2, 239, 240, 7, 35, 2, 2, 240, 241, 7, 24, 2, 2, 241, 242, 5, 42, 22, 2, 242, 243, 7, 25, 2, 2, 243, 244, 9, 5, 2, 2, 244, 266, 3, 2, 2, 2, 245, 246, 9, 6, 2, 2, 246, 266, 5, 42, 22, 16, 247, 259, 7, 24, 2, 2, 248, 253, 5, 42, 22, 2, 249, 250, 7, 18, 2, 2, 250, 252, 5, 42, 22, 2, 251, 249, 3, 2, 2, 2, 252, 255, 3, 2, 2, 2, 253, 251, 3, 2, 2, 2, 253, 254, 3, 2, 2, 2, 254, 257, 3, 2, 2, 2, 255, 253, 3, 2, 2, 2, 256, 258, 7, 18, 2, 2, 257, 256, 3, 2, 2, 2, 257, 258, 3, 2, 2, 2, 258, 260, 3, 2, 2, 2, 259, 248, 3, 2, 2, 2, 259, 260, 3, 2, 2, 2, 260, 261, 3, 2, 2, 2, 261, 266, 7, 25, 2, 2, 262, 266, 7, 72, 2, 2, 263, 266, 7, 73, 2, 2, 264, 266, 5, 46, 24, 2, 265, 209, 3, 2, 2, 2, 265, 214, 3, 2, 2, 2, 265, 226, 3, 2, 2, 2, 265, 227, 3, 2, 2, 2, 265, 230, 3, 2, 2, 2, 265, 233, 3, 2, 2, 2, 265, 239, 3, 2, 2, 2, 265, 245, 3, 2, 2, 2, 265, 247, 3, 2, 2, 2, 265, 262, 3, 2, 2, 2, 265, 263, 3, 2, 2, 2, 265, 264, 3, 2, 2, 2, 266, 308, 3, 2, 2, 2, 267, 268, 12, 15, 2, 2, 268, 269, 9, 7, 2, 2, 269, 307, 5, 42, 22, 16, 270, 271, 12, 14, 2, 2, 271, 272, 9, 8, 2, 2, 272, 307, 5, 42, 22, 15, 273, 274, 12, 13, 2, 2, 274, 275, 9, 9, 2, 2, 275, 307, 5, 42, 22, 14, 276, 277, 12, 12, 2, 2, 277, 278, 9, 10, 2, 2, 278, 307, 5, 42, 22, 13, 279, 280, 12, 11, 2, 2, 280, 281, 7, 51, 2, 2, 281, 307, 5, 42, 22, 12, 282, 283, 12, 10, 2, 2, 283, 284, 7, 6, 2, 2, 284, 307, 5, 42, 22, 11, 285, 286, 12, 9, 2, 2, 286, 287, 7, 52, 2, 2, 287, 307, 5, 42, 22, 10, 288, 289, 12, 8, 2, 2, 289, 290, 7, 53, 2, 2, 290, 307, 5, 42, 22, 9, 291, 292, 12, 7, 2, 2, 292, 293, 7, 54, 2, 2, 293, 307, 5, 42, 22, 8, 294, 295, 12, 22, 2, 2, 295, 296, 7, 24, 2, 2, 296, 297, 7, 65, 2, 2, 297, 307, 7, 25, 2, 2, 298, 299, 12, 18, 2, 2, 299, 307, 9, 11, 2, 2, 300, 301, 12, 17, 2, 2, 301, 302, 7, 42, 2, 2, 302, 303, 7, 17, 2, 2, 303, 304, 5, 42, 22, 2, 304, 305, 7, 19, 2, 2, 305, 307, 3, 2, 2, 2, 306, 267, 3, 2, 2, 2, 306, 270, 3, 2, 2, 2, 306, 273, 3, 2, 2, 2, 306, 276, 3, 2, 2, 2, 306, 279, 3, 2, 2, 2, 306, 282, 3, 2, 2, 2, 306, 285, 3, 2, 2, 2, 306, 288, 3, 2, 2, 2, 306, 291, 3, 2, 2, 2, 306, 294, 3, 2, 2, 2, 306, 298, 3, 2, 2, 2, 306, 300, 3, 2, 2, 2, 307, 310, 3, 2, 2, 2, 308, 306, 3, 2, 2, 2, 308, 309, 3, 2, 2, 2, 309, 43, 3, 2, 2, 2, 310, 308, 3, 2, 2, 2, 311, 312, 7, 55, 2, 2, 312, 45, 3, 2, 2, 2, 313, 319, 7, 63, 2, 2, 314, 319, 5, 48, 25, 2, 315, 319, 7, 68, 2, 2, 316, 319, 7, 69, 2, 2, 317, 319, 7, 70, 2, 2, 318, 313, 3, 2, 2, 2, 318, 314, 3, 2, 2, 2, 318, 315, 3, 2, 2, 2, 318, 316, 3, 2, 2, 2, 318, 317, 3, 2, 2, 2, 319, 47, 3, 2, 2, 2, 320, 322, 7, 65, 2, 2, 321, 323, 7, 64, 2, 2, 322, 321, 3, 2, 2, 2, 322, 323, 3, 2, 2, 2, 323, 49, 3, 2, 2, 2, 324, 325, 9, 12, 2, 2, 325, 51, 3, 2, 2, 2, 28, 55, 70, 73, 86, 98, 109, 113, 115, 126, 131, 139, 145, 188, 199, 203, 205, 219, 222, 253, 257, 259, 265, 306, 308, 318, 322]
\ No newline at end of file
diff --git a/packages/cashc/src/grammar/CashScript.tokens b/packages/cashc/src/grammar/CashScript.tokens
index c9b63123..99983b17 100644
--- a/packages/cashc/src/grammar/CashScript.tokens
+++ b/packages/cashc/src/grammar/CashScript.tokens
@@ -54,21 +54,24 @@ T__52=53
 T__53=54
 T__54=55
 T__55=56
-VersionLiteral=57
-BooleanLiteral=58
-NumberUnit=59
-NumberLiteral=60
-Bytes=61
-Bound=62
-StringLiteral=63
-DateLiteral=64
-HexLiteral=65
-TxVar=66
-NullaryOp=67
-Identifier=68
-WHITESPACE=69
-COMMENT=70
-LINE_COMMENT=71
+T__56=57
+T__57=58
+T__58=59
+VersionLiteral=60
+BooleanLiteral=61
+NumberUnit=62
+NumberLiteral=63
+Bytes=64
+Bound=65
+StringLiteral=66
+DateLiteral=67
+HexLiteral=68
+TxVar=69
+NullaryOp=70
+Identifier=71
+WHITESPACE=72
+COMMENT=73
+LINE_COMMENT=74
 'pragma'=1
 ';'=2
 'cashscript'=3
@@ -92,36 +95,39 @@ LINE_COMMENT=71
 'new'=21
 '['=22
 ']'=23
-'tx.outputs'=24
-'.value'=25
-'.lockingBytecode'=26
-'.tokenCategory'=27
-'.nftCommitment'=28
-'.tokenAmount'=29
-'tx.inputs'=30
-'.outpointTransactionHash'=31
-'.outpointIndex'=32
-'.unlockingBytecode'=33
-'.sequenceNumber'=34
-'.reverse()'=35
-'.length'=36
-'.split'=37
-'!'=38
-'-'=39
-'*'=40
-'/'=41
-'%'=42
-'+'=43
-'=='=44
-'!='=45
-'&'=46
-'|'=47
-'&&'=48
-'||'=49
-'constant'=50
-'int'=51
-'bool'=52
-'string'=53
-'pubkey'=54
-'sig'=55
-'datasig'=56
+'console.'=24
+'log'=25
+'warn'=26
+'tx.outputs'=27
+'.value'=28
+'.lockingBytecode'=29
+'.tokenCategory'=30
+'.nftCommitment'=31
+'.tokenAmount'=32
+'tx.inputs'=33
+'.outpointTransactionHash'=34
+'.outpointIndex'=35
+'.unlockingBytecode'=36
+'.sequenceNumber'=37
+'.reverse()'=38
+'.length'=39
+'.split'=40
+'!'=41
+'-'=42
+'*'=43
+'/'=44
+'%'=45
+'+'=46
+'=='=47
+'!='=48
+'&'=49
+'|'=50
+'&&'=51
+'||'=52
+'constant'=53
+'int'=54
+'bool'=55
+'string'=56
+'pubkey'=57
+'sig'=58
+'datasig'=59
diff --git a/packages/cashc/src/grammar/CashScriptLexer.interp b/packages/cashc/src/grammar/CashScriptLexer.interp
index 65c158ce..5fd73423 100644
--- a/packages/cashc/src/grammar/CashScriptLexer.interp
+++ b/packages/cashc/src/grammar/CashScriptLexer.interp
@@ -23,6 +23,9 @@ null
 'new'
 '['
 ']'
+'console.'
+'log'
+'warn'
 'tx.outputs'
 '.value'
 '.lockingBytecode'
@@ -130,6 +133,9 @@ null
 null
 null
 null
+null
+null
+null
 VersionLiteral
 BooleanLiteral
 NumberUnit
@@ -203,6 +209,9 @@ T__52
 T__53
 T__54
 T__55
+T__56
+T__57
+T__58
 VersionLiteral
 BooleanLiteral
 NumberUnit
@@ -227,4 +236,4 @@ mode names:
 DEFAULT_MODE
 
 atn:
-[3, 51485, 51898, 1421, 44986, 20307, 1543, 60043, 49729, 2, 73, 808, 8, 1, 4, 2, 9, 2, 4, 3, 9, 3, 4, 4, 9, 4, 4, 5, 9, 5, 4, 6, 9, 6, 4, 7, 9, 7, 4, 8, 9, 8, 4, 9, 9, 9, 4, 10, 9, 10, 4, 11, 9, 11, 4, 12, 9, 12, 4, 13, 9, 13, 4, 14, 9, 14, 4, 15, 9, 15, 4, 16, 9, 16, 4, 17, 9, 17, 4, 18, 9, 18, 4, 19, 9, 19, 4, 20, 9, 20, 4, 21, 9, 21, 4, 22, 9, 22, 4, 23, 9, 23, 4, 24, 9, 24, 4, 25, 9, 25, 4, 26, 9, 26, 4, 27, 9, 27, 4, 28, 9, 28, 4, 29, 9, 29, 4, 30, 9, 30, 4, 31, 9, 31, 4, 32, 9, 32, 4, 33, 9, 33, 4, 34, 9, 34, 4, 35, 9, 35, 4, 36, 9, 36, 4, 37, 9, 37, 4, 38, 9, 38, 4, 39, 9, 39, 4, 40, 9, 40, 4, 41, 9, 41, 4, 42, 9, 42, 4, 43, 9, 43, 4, 44, 9, 44, 4, 45, 9, 45, 4, 46, 9, 46, 4, 47, 9, 47, 4, 48, 9, 48, 4, 49, 9, 49, 4, 50, 9, 50, 4, 51, 9, 51, 4, 52, 9, 52, 4, 53, 9, 53, 4, 54, 9, 54, 4, 55, 9, 55, 4, 56, 9, 56, 4, 57, 9, 57, 4, 58, 9, 58, 4, 59, 9, 59, 4, 60, 9, 60, 4, 61, 9, 61, 4, 62, 9, 62, 4, 63, 9, 63, 4, 64, 9, 64, 4, 65, 9, 65, 4, 66, 9, 66, 4, 67, 9, 67, 4, 68, 9, 68, 4, 69, 9, 69, 4, 70, 9, 70, 4, 71, 9, 71, 4, 72, 9, 72, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 3, 3, 3, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 5, 3, 5, 3, 6, 3, 6, 3, 7, 3, 7, 3, 7, 3, 8, 3, 8, 3, 9, 3, 9, 3, 10, 3, 10, 3, 10, 3, 11, 3, 11, 3, 12, 3, 12, 3, 12, 3, 12, 3, 12, 3, 12, 3, 12, 3, 12, 3, 12, 3, 13, 3, 13, 3, 14, 3, 14, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 3, 16, 3, 16, 3, 17, 3, 17, 3, 18, 3, 18, 3, 19, 3, 19, 3, 19, 3, 19, 3, 19, 3, 19, 3, 19, 3, 19, 3, 20, 3, 20, 3, 20, 3, 21, 3, 21, 3, 21, 3, 21, 3, 21, 3, 22, 3, 22, 3, 22, 3, 22, 3, 23, 3, 23, 3, 24, 3, 24, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 26, 3, 26, 3, 26, 3, 26, 3, 26, 3, 26, 3, 26, 3, 27, 3, 27, 3, 27, 3, 27, 3, 27, 3, 27, 3, 27, 3, 27, 3, 27, 3, 27, 3, 27, 3, 27, 3, 27, 3, 27, 3, 27, 3, 27, 3, 27, 3, 28, 3, 28, 3, 28, 3, 28, 3, 28, 3, 28, 3, 28, 3, 28, 3, 28, 3, 28, 3, 28, 3, 28, 3, 28, 3, 28, 3, 28, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 30, 3, 30, 3, 30, 3, 30, 3, 30, 3, 30, 3, 30, 3, 30, 3, 30, 3, 30, 3, 30, 3, 30, 3, 30, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 37, 3, 37, 3, 37, 3, 37, 3, 37, 3, 37, 3, 37, 3, 37, 3, 38, 3, 38, 3, 38, 3, 38, 3, 38, 3, 38, 3, 38, 3, 39, 3, 39, 3, 40, 3, 40, 3, 41, 3, 41, 3, 42, 3, 42, 3, 43, 3, 43, 3, 44, 3, 44, 3, 45, 3, 45, 3, 45, 3, 46, 3, 46, 3, 46, 3, 47, 3, 47, 3, 48, 3, 48, 3, 49, 3, 49, 3, 49, 3, 50, 3, 50, 3, 50, 3, 51, 3, 51, 3, 51, 3, 51, 3, 51, 3, 51, 3, 51, 3, 51, 3, 51, 3, 52, 3, 52, 3, 52, 3, 52, 3, 53, 3, 53, 3, 53, 3, 53, 3, 53, 3, 54, 3, 54, 3, 54, 3, 54, 3, 54, 3, 54, 3, 54, 3, 55, 3, 55, 3, 55, 3, 55, 3, 55, 3, 55, 3, 55, 3, 56, 3, 56, 3, 56, 3, 56, 3, 57, 3, 57, 3, 57, 3, 57, 3, 57, 3, 57, 3, 57, 3, 57, 3, 58, 6, 58, 496, 10, 58, 13, 58, 14, 58, 497, 3, 58, 3, 58, 6, 58, 502, 10, 58, 13, 58, 14, 58, 503, 3, 58, 3, 58, 6, 58, 508, 10, 58, 13, 58, 14, 58, 509, 3, 59, 3, 59, 3, 59, 3, 59, 3, 59, 3, 59, 3, 59, 3, 59, 3, 59, 5, 59, 521, 10, 59, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 5, 60, 580, 10, 60, 3, 61, 5, 61, 583, 10, 61, 3, 61, 6, 61, 586, 10, 61, 13, 61, 14, 61, 587, 3, 61, 3, 61, 6, 61, 592, 10, 61, 13, 61, 14, 61, 593, 5, 61, 596, 10, 61, 3, 62, 3, 62, 3, 62, 3, 62, 3, 62, 3, 62, 3, 62, 5, 62, 605, 10, 62, 3, 62, 3, 62, 3, 62, 3, 62, 5, 62, 611, 10, 62, 3, 63, 3, 63, 7, 63, 615, 10, 63, 12, 63, 14, 63, 618, 11, 63, 3, 64, 3, 64, 3, 64, 3, 64, 7, 64, 624, 10, 64, 12, 64, 14, 64, 627, 11, 64, 3, 64, 3, 64, 3, 64, 3, 64, 3, 64, 7, 64, 634, 10, 64, 12, 64, 14, 64, 637, 11, 64, 3, 64, 5, 64, 640, 10, 64, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 66, 3, 66, 3, 66, 7, 66, 654, 10, 66, 12, 66, 14, 66, 657, 11, 66, 3, 67, 3, 67, 3, 67, 3, 67, 3, 67, 3, 67, 3, 67, 3, 67, 3, 67, 3, 67, 3, 67, 3, 67, 3, 67, 5, 67, 672, 10, 67, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 5, 68, 768, 10, 68, 3, 69, 3, 69, 7, 69, 772, 10, 69, 12, 69, 14, 69, 775, 11, 69, 3, 70, 6, 70, 778, 10, 70, 13, 70, 14, 70, 779, 3, 70, 3, 70, 3, 71, 3, 71, 3, 71, 3, 71, 7, 71, 788, 10, 71, 12, 71, 14, 71, 791, 11, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 72, 3, 72, 3, 72, 3, 72, 7, 72, 802, 10, 72, 12, 72, 14, 72, 805, 11, 72, 3, 72, 3, 72, 5, 625, 635, 789, 2, 2, 73, 3, 2, 3, 5, 2, 4, 7, 2, 5, 9, 2, 6, 11, 2, 7, 13, 2, 8, 15, 2, 9, 17, 2, 10, 19, 2, 11, 21, 2, 12, 23, 2, 13, 25, 2, 14, 27, 2, 15, 29, 2, 16, 31, 2, 17, 33, 2, 18, 35, 2, 19, 37, 2, 20, 39, 2, 21, 41, 2, 22, 43, 2, 23, 45, 2, 24, 47, 2, 25, 49, 2, 26, 51, 2, 27, 53, 2, 28, 55, 2, 29, 57, 2, 30, 59, 2, 31, 61, 2, 32, 63, 2, 33, 65, 2, 34, 67, 2, 35, 69, 2, 36, 71, 2, 37, 73, 2, 38, 75, 2, 39, 77, 2, 40, 79, 2, 41, 81, 2, 42, 83, 2, 43, 85, 2, 44, 87, 2, 45, 89, 2, 46, 91, 2, 47, 93, 2, 48, 95, 2, 49, 97, 2, 50, 99, 2, 51, 101, 2, 52, 103, 2, 53, 105, 2, 54, 107, 2, 55, 109, 2, 56, 111, 2, 57, 113, 2, 58, 115, 2, 59, 117, 2, 60, 119, 2, 61, 121, 2, 62, 123, 2, 63, 125, 2, 64, 127, 2, 65, 129, 2, 66, 131, 2, 67, 133, 2, 68, 135, 2, 69, 137, 2, 70, 139, 2, 71, 141, 2, 72, 143, 2, 73, 3, 2, 14, 3, 2, 50, 59, 3, 2, 47, 47, 4, 2, 71, 71, 103, 103, 3, 2, 51, 59, 5, 2, 12, 12, 15, 15, 36, 36, 5, 2, 12, 12, 15, 15, 41, 41, 4, 2, 90, 90, 122, 122, 5, 2, 50, 59, 67, 72, 99, 104, 4, 2, 67, 92, 99, 124, 6, 2, 50, 59, 67, 92, 97, 97, 99, 124, 5, 2, 11, 12, 14, 15, 34, 34, 4, 2, 12, 12, 15, 15, 2, 843, 2, 3, 3, 2, 2, 2, 2, 5, 3, 2, 2, 2, 2, 7, 3, 2, 2, 2, 2, 9, 3, 2, 2, 2, 2, 11, 3, 2, 2, 2, 2, 13, 3, 2, 2, 2, 2, 15, 3, 2, 2, 2, 2, 17, 3, 2, 2, 2, 2, 19, 3, 2, 2, 2, 2, 21, 3, 2, 2, 2, 2, 23, 3, 2, 2, 2, 2, 25, 3, 2, 2, 2, 2, 27, 3, 2, 2, 2, 2, 29, 3, 2, 2, 2, 2, 31, 3, 2, 2, 2, 2, 33, 3, 2, 2, 2, 2, 35, 3, 2, 2, 2, 2, 37, 3, 2, 2, 2, 2, 39, 3, 2, 2, 2, 2, 41, 3, 2, 2, 2, 2, 43, 3, 2, 2, 2, 2, 45, 3, 2, 2, 2, 2, 47, 3, 2, 2, 2, 2, 49, 3, 2, 2, 2, 2, 51, 3, 2, 2, 2, 2, 53, 3, 2, 2, 2, 2, 55, 3, 2, 2, 2, 2, 57, 3, 2, 2, 2, 2, 59, 3, 2, 2, 2, 2, 61, 3, 2, 2, 2, 2, 63, 3, 2, 2, 2, 2, 65, 3, 2, 2, 2, 2, 67, 3, 2, 2, 2, 2, 69, 3, 2, 2, 2, 2, 71, 3, 2, 2, 2, 2, 73, 3, 2, 2, 2, 2, 75, 3, 2, 2, 2, 2, 77, 3, 2, 2, 2, 2, 79, 3, 2, 2, 2, 2, 81, 3, 2, 2, 2, 2, 83, 3, 2, 2, 2, 2, 85, 3, 2, 2, 2, 2, 87, 3, 2, 2, 2, 2, 89, 3, 2, 2, 2, 2, 91, 3, 2, 2, 2, 2, 93, 3, 2, 2, 2, 2, 95, 3, 2, 2, 2, 2, 97, 3, 2, 2, 2, 2, 99, 3, 2, 2, 2, 2, 101, 3, 2, 2, 2, 2, 103, 3, 2, 2, 2, 2, 105, 3, 2, 2, 2, 2, 107, 3, 2, 2, 2, 2, 109, 3, 2, 2, 2, 2, 111, 3, 2, 2, 2, 2, 113, 3, 2, 2, 2, 2, 115, 3, 2, 2, 2, 2, 117, 3, 2, 2, 2, 2, 119, 3, 2, 2, 2, 2, 121, 3, 2, 2, 2, 2, 123, 3, 2, 2, 2, 2, 125, 3, 2, 2, 2, 2, 127, 3, 2, 2, 2, 2, 129, 3, 2, 2, 2, 2, 131, 3, 2, 2, 2, 2, 133, 3, 2, 2, 2, 2, 135, 3, 2, 2, 2, 2, 137, 3, 2, 2, 2, 2, 139, 3, 2, 2, 2, 2, 141, 3, 2, 2, 2, 2, 143, 3, 2, 2, 2, 3, 145, 3, 2, 2, 2, 5, 152, 3, 2, 2, 2, 7, 154, 3, 2, 2, 2, 9, 165, 3, 2, 2, 2, 11, 167, 3, 2, 2, 2, 13, 169, 3, 2, 2, 2, 15, 172, 3, 2, 2, 2, 17, 174, 3, 2, 2, 2, 19, 176, 3, 2, 2, 2, 21, 179, 3, 2, 2, 2, 23, 181, 3, 2, 2, 2, 25, 190, 3, 2, 2, 2, 27, 192, 3, 2, 2, 2, 29, 194, 3, 2, 2, 2, 31, 203, 3, 2, 2, 2, 33, 205, 3, 2, 2, 2, 35, 207, 3, 2, 2, 2, 37, 209, 3, 2, 2, 2, 39, 217, 3, 2, 2, 2, 41, 220, 3, 2, 2, 2, 43, 225, 3, 2, 2, 2, 45, 229, 3, 2, 2, 2, 47, 231, 3, 2, 2, 2, 49, 233, 3, 2, 2, 2, 51, 244, 3, 2, 2, 2, 53, 251, 3, 2, 2, 2, 55, 268, 3, 2, 2, 2, 57, 283, 3, 2, 2, 2, 59, 298, 3, 2, 2, 2, 61, 311, 3, 2, 2, 2, 63, 321, 3, 2, 2, 2, 65, 346, 3, 2, 2, 2, 67, 361, 3, 2, 2, 2, 69, 380, 3, 2, 2, 2, 71, 396, 3, 2, 2, 2, 73, 407, 3, 2, 2, 2, 75, 415, 3, 2, 2, 2, 77, 422, 3, 2, 2, 2, 79, 424, 3, 2, 2, 2, 81, 426, 3, 2, 2, 2, 83, 428, 3, 2, 2, 2, 85, 430, 3, 2, 2, 2, 87, 432, 3, 2, 2, 2, 89, 434, 3, 2, 2, 2, 91, 437, 3, 2, 2, 2, 93, 440, 3, 2, 2, 2, 95, 442, 3, 2, 2, 2, 97, 444, 3, 2, 2, 2, 99, 447, 3, 2, 2, 2, 101, 450, 3, 2, 2, 2, 103, 459, 3, 2, 2, 2, 105, 463, 3, 2, 2, 2, 107, 468, 3, 2, 2, 2, 109, 475, 3, 2, 2, 2, 111, 482, 3, 2, 2, 2, 113, 486, 3, 2, 2, 2, 115, 495, 3, 2, 2, 2, 117, 520, 3, 2, 2, 2, 119, 579, 3, 2, 2, 2, 121, 582, 3, 2, 2, 2, 123, 610, 3, 2, 2, 2, 125, 612, 3, 2, 2, 2, 127, 639, 3, 2, 2, 2, 129, 641, 3, 2, 2, 2, 131, 650, 3, 2, 2, 2, 133, 671, 3, 2, 2, 2, 135, 767, 3, 2, 2, 2, 137, 769, 3, 2, 2, 2, 139, 777, 3, 2, 2, 2, 141, 783, 3, 2, 2, 2, 143, 797, 3, 2, 2, 2, 145, 146, 7, 114, 2, 2, 146, 147, 7, 116, 2, 2, 147, 148, 7, 99, 2, 2, 148, 149, 7, 105, 2, 2, 149, 150, 7, 111, 2, 2, 150, 151, 7, 99, 2, 2, 151, 4, 3, 2, 2, 2, 152, 153, 7, 61, 2, 2, 153, 6, 3, 2, 2, 2, 154, 155, 7, 101, 2, 2, 155, 156, 7, 99, 2, 2, 156, 157, 7, 117, 2, 2, 157, 158, 7, 106, 2, 2, 158, 159, 7, 117, 2, 2, 159, 160, 7, 101, 2, 2, 160, 161, 7, 116, 2, 2, 161, 162, 7, 107, 2, 2, 162, 163, 7, 114, 2, 2, 163, 164, 7, 118, 2, 2, 164, 8, 3, 2, 2, 2, 165, 166, 7, 96, 2, 2, 166, 10, 3, 2, 2, 2, 167, 168, 7, 128, 2, 2, 168, 12, 3, 2, 2, 2, 169, 170, 7, 64, 2, 2, 170, 171, 7, 63, 2, 2, 171, 14, 3, 2, 2, 2, 172, 173, 7, 64, 2, 2, 173, 16, 3, 2, 2, 2, 174, 175, 7, 62, 2, 2, 175, 18, 3, 2, 2, 2, 176, 177, 7, 62, 2, 2, 177, 178, 7, 63, 2, 2, 178, 20, 3, 2, 2, 2, 179, 180, 7, 63, 2, 2, 180, 22, 3, 2, 2, 2, 181, 182, 7, 101, 2, 2, 182, 183, 7, 113, 2, 2, 183, 184, 7, 112, 2, 2, 184, 185, 7, 118, 2, 2, 185, 186, 7, 116, 2, 2, 186, 187, 7, 99, 2, 2, 187, 188, 7, 101, 2, 2, 188, 189, 7, 118, 2, 2, 189, 24, 3, 2, 2, 2, 190, 191, 7, 125, 2, 2, 191, 26, 3, 2, 2, 2, 192, 193, 7, 127, 2, 2, 193, 28, 3, 2, 2, 2, 194, 195, 7, 104, 2, 2, 195, 196, 7, 119, 2, 2, 196, 197, 7, 112, 2, 2, 197, 198, 7, 101, 2, 2, 198, 199, 7, 118, 2, 2, 199, 200, 7, 107, 2, 2, 200, 201, 7, 113, 2, 2, 201, 202, 7, 112, 2, 2, 202, 30, 3, 2, 2, 2, 203, 204, 7, 42, 2, 2, 204, 32, 3, 2, 2, 2, 205, 206, 7, 46, 2, 2, 206, 34, 3, 2, 2, 2, 207, 208, 7, 43, 2, 2, 208, 36, 3, 2, 2, 2, 209, 210, 7, 116, 2, 2, 210, 211, 7, 103, 2, 2, 211, 212, 7, 115, 2, 2, 212, 213, 7, 119, 2, 2, 213, 214, 7, 107, 2, 2, 214, 215, 7, 116, 2, 2, 215, 216, 7, 103, 2, 2, 216, 38, 3, 2, 2, 2, 217, 218, 7, 107, 2, 2, 218, 219, 7, 104, 2, 2, 219, 40, 3, 2, 2, 2, 220, 221, 7, 103, 2, 2, 221, 222, 7, 110, 2, 2, 222, 223, 7, 117, 2, 2, 223, 224, 7, 103, 2, 2, 224, 42, 3, 2, 2, 2, 225, 226, 7, 112, 2, 2, 226, 227, 7, 103, 2, 2, 227, 228, 7, 121, 2, 2, 228, 44, 3, 2, 2, 2, 229, 230, 7, 93, 2, 2, 230, 46, 3, 2, 2, 2, 231, 232, 7, 95, 2, 2, 232, 48, 3, 2, 2, 2, 233, 234, 7, 118, 2, 2, 234, 235, 7, 122, 2, 2, 235, 236, 7, 48, 2, 2, 236, 237, 7, 113, 2, 2, 237, 238, 7, 119, 2, 2, 238, 239, 7, 118, 2, 2, 239, 240, 7, 114, 2, 2, 240, 241, 7, 119, 2, 2, 241, 242, 7, 118, 2, 2, 242, 243, 7, 117, 2, 2, 243, 50, 3, 2, 2, 2, 244, 245, 7, 48, 2, 2, 245, 246, 7, 120, 2, 2, 246, 247, 7, 99, 2, 2, 247, 248, 7, 110, 2, 2, 248, 249, 7, 119, 2, 2, 249, 250, 7, 103, 2, 2, 250, 52, 3, 2, 2, 2, 251, 252, 7, 48, 2, 2, 252, 253, 7, 110, 2, 2, 253, 254, 7, 113, 2, 2, 254, 255, 7, 101, 2, 2, 255, 256, 7, 109, 2, 2, 256, 257, 7, 107, 2, 2, 257, 258, 7, 112, 2, 2, 258, 259, 7, 105, 2, 2, 259, 260, 7, 68, 2, 2, 260, 261, 7, 123, 2, 2, 261, 262, 7, 118, 2, 2, 262, 263, 7, 103, 2, 2, 263, 264, 7, 101, 2, 2, 264, 265, 7, 113, 2, 2, 265, 266, 7, 102, 2, 2, 266, 267, 7, 103, 2, 2, 267, 54, 3, 2, 2, 2, 268, 269, 7, 48, 2, 2, 269, 270, 7, 118, 2, 2, 270, 271, 7, 113, 2, 2, 271, 272, 7, 109, 2, 2, 272, 273, 7, 103, 2, 2, 273, 274, 7, 112, 2, 2, 274, 275, 7, 69, 2, 2, 275, 276, 7, 99, 2, 2, 276, 277, 7, 118, 2, 2, 277, 278, 7, 103, 2, 2, 278, 279, 7, 105, 2, 2, 279, 280, 7, 113, 2, 2, 280, 281, 7, 116, 2, 2, 281, 282, 7, 123, 2, 2, 282, 56, 3, 2, 2, 2, 283, 284, 7, 48, 2, 2, 284, 285, 7, 112, 2, 2, 285, 286, 7, 104, 2, 2, 286, 287, 7, 118, 2, 2, 287, 288, 7, 69, 2, 2, 288, 289, 7, 113, 2, 2, 289, 290, 7, 111, 2, 2, 290, 291, 7, 111, 2, 2, 291, 292, 7, 107, 2, 2, 292, 293, 7, 118, 2, 2, 293, 294, 7, 111, 2, 2, 294, 295, 7, 103, 2, 2, 295, 296, 7, 112, 2, 2, 296, 297, 7, 118, 2, 2, 297, 58, 3, 2, 2, 2, 298, 299, 7, 48, 2, 2, 299, 300, 7, 118, 2, 2, 300, 301, 7, 113, 2, 2, 301, 302, 7, 109, 2, 2, 302, 303, 7, 103, 2, 2, 303, 304, 7, 112, 2, 2, 304, 305, 7, 67, 2, 2, 305, 306, 7, 111, 2, 2, 306, 307, 7, 113, 2, 2, 307, 308, 7, 119, 2, 2, 308, 309, 7, 112, 2, 2, 309, 310, 7, 118, 2, 2, 310, 60, 3, 2, 2, 2, 311, 312, 7, 118, 2, 2, 312, 313, 7, 122, 2, 2, 313, 314, 7, 48, 2, 2, 314, 315, 7, 107, 2, 2, 315, 316, 7, 112, 2, 2, 316, 317, 7, 114, 2, 2, 317, 318, 7, 119, 2, 2, 318, 319, 7, 118, 2, 2, 319, 320, 7, 117, 2, 2, 320, 62, 3, 2, 2, 2, 321, 322, 7, 48, 2, 2, 322, 323, 7, 113, 2, 2, 323, 324, 7, 119, 2, 2, 324, 325, 7, 118, 2, 2, 325, 326, 7, 114, 2, 2, 326, 327, 7, 113, 2, 2, 327, 328, 7, 107, 2, 2, 328, 329, 7, 112, 2, 2, 329, 330, 7, 118, 2, 2, 330, 331, 7, 86, 2, 2, 331, 332, 7, 116, 2, 2, 332, 333, 7, 99, 2, 2, 333, 334, 7, 112, 2, 2, 334, 335, 7, 117, 2, 2, 335, 336, 7, 99, 2, 2, 336, 337, 7, 101, 2, 2, 337, 338, 7, 118, 2, 2, 338, 339, 7, 107, 2, 2, 339, 340, 7, 113, 2, 2, 340, 341, 7, 112, 2, 2, 341, 342, 7, 74, 2, 2, 342, 343, 7, 99, 2, 2, 343, 344, 7, 117, 2, 2, 344, 345, 7, 106, 2, 2, 345, 64, 3, 2, 2, 2, 346, 347, 7, 48, 2, 2, 347, 348, 7, 113, 2, 2, 348, 349, 7, 119, 2, 2, 349, 350, 7, 118, 2, 2, 350, 351, 7, 114, 2, 2, 351, 352, 7, 113, 2, 2, 352, 353, 7, 107, 2, 2, 353, 354, 7, 112, 2, 2, 354, 355, 7, 118, 2, 2, 355, 356, 7, 75, 2, 2, 356, 357, 7, 112, 2, 2, 357, 358, 7, 102, 2, 2, 358, 359, 7, 103, 2, 2, 359, 360, 7, 122, 2, 2, 360, 66, 3, 2, 2, 2, 361, 362, 7, 48, 2, 2, 362, 363, 7, 119, 2, 2, 363, 364, 7, 112, 2, 2, 364, 365, 7, 110, 2, 2, 365, 366, 7, 113, 2, 2, 366, 367, 7, 101, 2, 2, 367, 368, 7, 109, 2, 2, 368, 369, 7, 107, 2, 2, 369, 370, 7, 112, 2, 2, 370, 371, 7, 105, 2, 2, 371, 372, 7, 68, 2, 2, 372, 373, 7, 123, 2, 2, 373, 374, 7, 118, 2, 2, 374, 375, 7, 103, 2, 2, 375, 376, 7, 101, 2, 2, 376, 377, 7, 113, 2, 2, 377, 378, 7, 102, 2, 2, 378, 379, 7, 103, 2, 2, 379, 68, 3, 2, 2, 2, 380, 381, 7, 48, 2, 2, 381, 382, 7, 117, 2, 2, 382, 383, 7, 103, 2, 2, 383, 384, 7, 115, 2, 2, 384, 385, 7, 119, 2, 2, 385, 386, 7, 103, 2, 2, 386, 387, 7, 112, 2, 2, 387, 388, 7, 101, 2, 2, 388, 389, 7, 103, 2, 2, 389, 390, 7, 80, 2, 2, 390, 391, 7, 119, 2, 2, 391, 392, 7, 111, 2, 2, 392, 393, 7, 100, 2, 2, 393, 394, 7, 103, 2, 2, 394, 395, 7, 116, 2, 2, 395, 70, 3, 2, 2, 2, 396, 397, 7, 48, 2, 2, 397, 398, 7, 116, 2, 2, 398, 399, 7, 103, 2, 2, 399, 400, 7, 120, 2, 2, 400, 401, 7, 103, 2, 2, 401, 402, 7, 116, 2, 2, 402, 403, 7, 117, 2, 2, 403, 404, 7, 103, 2, 2, 404, 405, 7, 42, 2, 2, 405, 406, 7, 43, 2, 2, 406, 72, 3, 2, 2, 2, 407, 408, 7, 48, 2, 2, 408, 409, 7, 110, 2, 2, 409, 410, 7, 103, 2, 2, 410, 411, 7, 112, 2, 2, 411, 412, 7, 105, 2, 2, 412, 413, 7, 118, 2, 2, 413, 414, 7, 106, 2, 2, 414, 74, 3, 2, 2, 2, 415, 416, 7, 48, 2, 2, 416, 417, 7, 117, 2, 2, 417, 418, 7, 114, 2, 2, 418, 419, 7, 110, 2, 2, 419, 420, 7, 107, 2, 2, 420, 421, 7, 118, 2, 2, 421, 76, 3, 2, 2, 2, 422, 423, 7, 35, 2, 2, 423, 78, 3, 2, 2, 2, 424, 425, 7, 47, 2, 2, 425, 80, 3, 2, 2, 2, 426, 427, 7, 44, 2, 2, 427, 82, 3, 2, 2, 2, 428, 429, 7, 49, 2, 2, 429, 84, 3, 2, 2, 2, 430, 431, 7, 39, 2, 2, 431, 86, 3, 2, 2, 2, 432, 433, 7, 45, 2, 2, 433, 88, 3, 2, 2, 2, 434, 435, 7, 63, 2, 2, 435, 436, 7, 63, 2, 2, 436, 90, 3, 2, 2, 2, 437, 438, 7, 35, 2, 2, 438, 439, 7, 63, 2, 2, 439, 92, 3, 2, 2, 2, 440, 441, 7, 40, 2, 2, 441, 94, 3, 2, 2, 2, 442, 443, 7, 126, 2, 2, 443, 96, 3, 2, 2, 2, 444, 445, 7, 40, 2, 2, 445, 446, 7, 40, 2, 2, 446, 98, 3, 2, 2, 2, 447, 448, 7, 126, 2, 2, 448, 449, 7, 126, 2, 2, 449, 100, 3, 2, 2, 2, 450, 451, 7, 101, 2, 2, 451, 452, 7, 113, 2, 2, 452, 453, 7, 112, 2, 2, 453, 454, 7, 117, 2, 2, 454, 455, 7, 118, 2, 2, 455, 456, 7, 99, 2, 2, 456, 457, 7, 112, 2, 2, 457, 458, 7, 118, 2, 2, 458, 102, 3, 2, 2, 2, 459, 460, 7, 107, 2, 2, 460, 461, 7, 112, 2, 2, 461, 462, 7, 118, 2, 2, 462, 104, 3, 2, 2, 2, 463, 464, 7, 100, 2, 2, 464, 465, 7, 113, 2, 2, 465, 466, 7, 113, 2, 2, 466, 467, 7, 110, 2, 2, 467, 106, 3, 2, 2, 2, 468, 469, 7, 117, 2, 2, 469, 470, 7, 118, 2, 2, 470, 471, 7, 116, 2, 2, 471, 472, 7, 107, 2, 2, 472, 473, 7, 112, 2, 2, 473, 474, 7, 105, 2, 2, 474, 108, 3, 2, 2, 2, 475, 476, 7, 114, 2, 2, 476, 477, 7, 119, 2, 2, 477, 478, 7, 100, 2, 2, 478, 479, 7, 109, 2, 2, 479, 480, 7, 103, 2, 2, 480, 481, 7, 123, 2, 2, 481, 110, 3, 2, 2, 2, 482, 483, 7, 117, 2, 2, 483, 484, 7, 107, 2, 2, 484, 485, 7, 105, 2, 2, 485, 112, 3, 2, 2, 2, 486, 487, 7, 102, 2, 2, 487, 488, 7, 99, 2, 2, 488, 489, 7, 118, 2, 2, 489, 490, 7, 99, 2, 2, 490, 491, 7, 117, 2, 2, 491, 492, 7, 107, 2, 2, 492, 493, 7, 105, 2, 2, 493, 114, 3, 2, 2, 2, 494, 496, 9, 2, 2, 2, 495, 494, 3, 2, 2, 2, 496, 497, 3, 2, 2, 2, 497, 495, 3, 2, 2, 2, 497, 498, 3, 2, 2, 2, 498, 499, 3, 2, 2, 2, 499, 501, 7, 48, 2, 2, 500, 502, 9, 2, 2, 2, 501, 500, 3, 2, 2, 2, 502, 503, 3, 2, 2, 2, 503, 501, 3, 2, 2, 2, 503, 504, 3, 2, 2, 2, 504, 505, 3, 2, 2, 2, 505, 507, 7, 48, 2, 2, 506, 508, 9, 2, 2, 2, 507, 506, 3, 2, 2, 2, 508, 509, 3, 2, 2, 2, 509, 507, 3, 2, 2, 2, 509, 510, 3, 2, 2, 2, 510, 116, 3, 2, 2, 2, 511, 512, 7, 118, 2, 2, 512, 513, 7, 116, 2, 2, 513, 514, 7, 119, 2, 2, 514, 521, 7, 103, 2, 2, 515, 516, 7, 104, 2, 2, 516, 517, 7, 99, 2, 2, 517, 518, 7, 110, 2, 2, 518, 519, 7, 117, 2, 2, 519, 521, 7, 103, 2, 2, 520, 511, 3, 2, 2, 2, 520, 515, 3, 2, 2, 2, 521, 118, 3, 2, 2, 2, 522, 523, 7, 117, 2, 2, 523, 524, 7, 99, 2, 2, 524, 525, 7, 118, 2, 2, 525, 526, 7, 113, 2, 2, 526, 527, 7, 117, 2, 2, 527, 528, 7, 106, 2, 2, 528, 529, 7, 107, 2, 2, 529, 580, 7, 117, 2, 2, 530, 531, 7, 117, 2, 2, 531, 532, 7, 99, 2, 2, 532, 533, 7, 118, 2, 2, 533, 580, 7, 117, 2, 2, 534, 535, 7, 104, 2, 2, 535, 536, 7, 107, 2, 2, 536, 537, 7, 112, 2, 2, 537, 538, 7, 112, 2, 2, 538, 539, 7, 103, 2, 2, 539, 580, 7, 123, 2, 2, 540, 541, 7, 100, 2, 2, 541, 542, 7, 107, 2, 2, 542, 543, 7, 118, 2, 2, 543, 580, 7, 117, 2, 2, 544, 545, 7, 100, 2, 2, 545, 546, 7, 107, 2, 2, 546, 547, 7, 118, 2, 2, 547, 548, 7, 101, 2, 2, 548, 549, 7, 113, 2, 2, 549, 550, 7, 107, 2, 2, 550, 580, 7, 112, 2, 2, 551, 552, 7, 117, 2, 2, 552, 553, 7, 103, 2, 2, 553, 554, 7, 101, 2, 2, 554, 555, 7, 113, 2, 2, 555, 556, 7, 112, 2, 2, 556, 557, 7, 102, 2, 2, 557, 580, 7, 117, 2, 2, 558, 559, 7, 111, 2, 2, 559, 560, 7, 107, 2, 2, 560, 561, 7, 112, 2, 2, 561, 562, 7, 119, 2, 2, 562, 563, 7, 118, 2, 2, 563, 564, 7, 103, 2, 2, 564, 580, 7, 117, 2, 2, 565, 566, 7, 106, 2, 2, 566, 567, 7, 113, 2, 2, 567, 568, 7, 119, 2, 2, 568, 569, 7, 116, 2, 2, 569, 580, 7, 117, 2, 2, 570, 571, 7, 102, 2, 2, 571, 572, 7, 99, 2, 2, 572, 573, 7, 123, 2, 2, 573, 580, 7, 117, 2, 2, 574, 575, 7, 121, 2, 2, 575, 576, 7, 103, 2, 2, 576, 577, 7, 103, 2, 2, 577, 578, 7, 109, 2, 2, 578, 580, 7, 117, 2, 2, 579, 522, 3, 2, 2, 2, 579, 530, 3, 2, 2, 2, 579, 534, 3, 2, 2, 2, 579, 540, 3, 2, 2, 2, 579, 544, 3, 2, 2, 2, 579, 551, 3, 2, 2, 2, 579, 558, 3, 2, 2, 2, 579, 565, 3, 2, 2, 2, 579, 570, 3, 2, 2, 2, 579, 574, 3, 2, 2, 2, 580, 120, 3, 2, 2, 2, 581, 583, 9, 3, 2, 2, 582, 581, 3, 2, 2, 2, 582, 583, 3, 2, 2, 2, 583, 585, 3, 2, 2, 2, 584, 586, 9, 2, 2, 2, 585, 584, 3, 2, 2, 2, 586, 587, 3, 2, 2, 2, 587, 585, 3, 2, 2, 2, 587, 588, 3, 2, 2, 2, 588, 595, 3, 2, 2, 2, 589, 591, 9, 4, 2, 2, 590, 592, 9, 2, 2, 2, 591, 590, 3, 2, 2, 2, 592, 593, 3, 2, 2, 2, 593, 591, 3, 2, 2, 2, 593, 594, 3, 2, 2, 2, 594, 596, 3, 2, 2, 2, 595, 589, 3, 2, 2, 2, 595, 596, 3, 2, 2, 2, 596, 122, 3, 2, 2, 2, 597, 598, 7, 100, 2, 2, 598, 599, 7, 123, 2, 2, 599, 600, 7, 118, 2, 2, 600, 601, 7, 103, 2, 2, 601, 602, 7, 117, 2, 2, 602, 604, 3, 2, 2, 2, 603, 605, 5, 125, 63, 2, 604, 603, 3, 2, 2, 2, 604, 605, 3, 2, 2, 2, 605, 611, 3, 2, 2, 2, 606, 607, 7, 100, 2, 2, 607, 608, 7, 123, 2, 2, 608, 609, 7, 118, 2, 2, 609, 611, 7, 103, 2, 2, 610, 597, 3, 2, 2, 2, 610, 606, 3, 2, 2, 2, 611, 124, 3, 2, 2, 2, 612, 616, 9, 5, 2, 2, 613, 615, 9, 2, 2, 2, 614, 613, 3, 2, 2, 2, 615, 618, 3, 2, 2, 2, 616, 614, 3, 2, 2, 2, 616, 617, 3, 2, 2, 2, 617, 126, 3, 2, 2, 2, 618, 616, 3, 2, 2, 2, 619, 625, 7, 36, 2, 2, 620, 621, 7, 94, 2, 2, 621, 624, 7, 36, 2, 2, 622, 624, 10, 6, 2, 2, 623, 620, 3, 2, 2, 2, 623, 622, 3, 2, 2, 2, 624, 627, 3, 2, 2, 2, 625, 626, 3, 2, 2, 2, 625, 623, 3, 2, 2, 2, 626, 628, 3, 2, 2, 2, 627, 625, 3, 2, 2, 2, 628, 640, 7, 36, 2, 2, 629, 635, 7, 41, 2, 2, 630, 631, 7, 94, 2, 2, 631, 634, 7, 41, 2, 2, 632, 634, 10, 7, 2, 2, 633, 630, 3, 2, 2, 2, 633, 632, 3, 2, 2, 2, 634, 637, 3, 2, 2, 2, 635, 636, 3, 2, 2, 2, 635, 633, 3, 2, 2, 2, 636, 638, 3, 2, 2, 2, 637, 635, 3, 2, 2, 2, 638, 640, 7, 41, 2, 2, 639, 619, 3, 2, 2, 2, 639, 629, 3, 2, 2, 2, 640, 128, 3, 2, 2, 2, 641, 642, 7, 102, 2, 2, 642, 643, 7, 99, 2, 2, 643, 644, 7, 118, 2, 2, 644, 645, 7, 103, 2, 2, 645, 646, 7, 42, 2, 2, 646, 647, 3, 2, 2, 2, 647, 648, 5, 127, 64, 2, 648, 649, 7, 43, 2, 2, 649, 130, 3, 2, 2, 2, 650, 651, 7, 50, 2, 2, 651, 655, 9, 8, 2, 2, 652, 654, 9, 9, 2, 2, 653, 652, 3, 2, 2, 2, 654, 657, 3, 2, 2, 2, 655, 653, 3, 2, 2, 2, 655, 656, 3, 2, 2, 2, 656, 132, 3, 2, 2, 2, 657, 655, 3, 2, 2, 2, 658, 659, 7, 118, 2, 2, 659, 660, 7, 122, 2, 2, 660, 661, 7, 48, 2, 2, 661, 662, 7, 99, 2, 2, 662, 663, 7, 105, 2, 2, 663, 672, 7, 103, 2, 2, 664, 665, 7, 118, 2, 2, 665, 666, 7, 122, 2, 2, 666, 667, 7, 48, 2, 2, 667, 668, 7, 118, 2, 2, 668, 669, 7, 107, 2, 2, 669, 670, 7, 111, 2, 2, 670, 672, 7, 103, 2, 2, 671, 658, 3, 2, 2, 2, 671, 664, 3, 2, 2, 2, 672, 134, 3, 2, 2, 2, 673, 674, 7, 118, 2, 2, 674, 675, 7, 106, 2, 2, 675, 676, 7, 107, 2, 2, 676, 677, 7, 117, 2, 2, 677, 678, 7, 48, 2, 2, 678, 679, 7, 99, 2, 2, 679, 680, 7, 101, 2, 2, 680, 681, 7, 118, 2, 2, 681, 682, 7, 107, 2, 2, 682, 683, 7, 120, 2, 2, 683, 684, 7, 103, 2, 2, 684, 685, 7, 75, 2, 2, 685, 686, 7, 112, 2, 2, 686, 687, 7, 114, 2, 2, 687, 688, 7, 119, 2, 2, 688, 689, 7, 118, 2, 2, 689, 690, 7, 75, 2, 2, 690, 691, 7, 112, 2, 2, 691, 692, 7, 102, 2, 2, 692, 693, 7, 103, 2, 2, 693, 768, 7, 122, 2, 2, 694, 695, 7, 118, 2, 2, 695, 696, 7, 106, 2, 2, 696, 697, 7, 107, 2, 2, 697, 698, 7, 117, 2, 2, 698, 699, 7, 48, 2, 2, 699, 700, 7, 99, 2, 2, 700, 701, 7, 101, 2, 2, 701, 702, 7, 118, 2, 2, 702, 703, 7, 107, 2, 2, 703, 704, 7, 120, 2, 2, 704, 705, 7, 103, 2, 2, 705, 706, 7, 68, 2, 2, 706, 707, 7, 123, 2, 2, 707, 708, 7, 118, 2, 2, 708, 709, 7, 103, 2, 2, 709, 710, 7, 101, 2, 2, 710, 711, 7, 113, 2, 2, 711, 712, 7, 102, 2, 2, 712, 768, 7, 103, 2, 2, 713, 714, 7, 118, 2, 2, 714, 715, 7, 122, 2, 2, 715, 716, 7, 48, 2, 2, 716, 717, 7, 107, 2, 2, 717, 718, 7, 112, 2, 2, 718, 719, 7, 114, 2, 2, 719, 720, 7, 119, 2, 2, 720, 721, 7, 118, 2, 2, 721, 722, 7, 117, 2, 2, 722, 723, 7, 48, 2, 2, 723, 724, 7, 110, 2, 2, 724, 725, 7, 103, 2, 2, 725, 726, 7, 112, 2, 2, 726, 727, 7, 105, 2, 2, 727, 728, 7, 118, 2, 2, 728, 768, 7, 106, 2, 2, 729, 730, 7, 118, 2, 2, 730, 731, 7, 122, 2, 2, 731, 732, 7, 48, 2, 2, 732, 733, 7, 113, 2, 2, 733, 734, 7, 119, 2, 2, 734, 735, 7, 118, 2, 2, 735, 736, 7, 114, 2, 2, 736, 737, 7, 119, 2, 2, 737, 738, 7, 118, 2, 2, 738, 739, 7, 117, 2, 2, 739, 740, 7, 48, 2, 2, 740, 741, 7, 110, 2, 2, 741, 742, 7, 103, 2, 2, 742, 743, 7, 112, 2, 2, 743, 744, 7, 105, 2, 2, 744, 745, 7, 118, 2, 2, 745, 768, 7, 106, 2, 2, 746, 747, 7, 118, 2, 2, 747, 748, 7, 122, 2, 2, 748, 749, 7, 48, 2, 2, 749, 750, 7, 120, 2, 2, 750, 751, 7, 103, 2, 2, 751, 752, 7, 116, 2, 2, 752, 753, 7, 117, 2, 2, 753, 754, 7, 107, 2, 2, 754, 755, 7, 113, 2, 2, 755, 768, 7, 112, 2, 2, 756, 757, 7, 118, 2, 2, 757, 758, 7, 122, 2, 2, 758, 759, 7, 48, 2, 2, 759, 760, 7, 110, 2, 2, 760, 761, 7, 113, 2, 2, 761, 762, 7, 101, 2, 2, 762, 763, 7, 109, 2, 2, 763, 764, 7, 118, 2, 2, 764, 765, 7, 107, 2, 2, 765, 766, 7, 111, 2, 2, 766, 768, 7, 103, 2, 2, 767, 673, 3, 2, 2, 2, 767, 694, 3, 2, 2, 2, 767, 713, 3, 2, 2, 2, 767, 729, 3, 2, 2, 2, 767, 746, 3, 2, 2, 2, 767, 756, 3, 2, 2, 2, 768, 136, 3, 2, 2, 2, 769, 773, 9, 10, 2, 2, 770, 772, 9, 11, 2, 2, 771, 770, 3, 2, 2, 2, 772, 775, 3, 2, 2, 2, 773, 771, 3, 2, 2, 2, 773, 774, 3, 2, 2, 2, 774, 138, 3, 2, 2, 2, 775, 773, 3, 2, 2, 2, 776, 778, 9, 12, 2, 2, 777, 776, 3, 2, 2, 2, 778, 779, 3, 2, 2, 2, 779, 777, 3, 2, 2, 2, 779, 780, 3, 2, 2, 2, 780, 781, 3, 2, 2, 2, 781, 782, 8, 70, 2, 2, 782, 140, 3, 2, 2, 2, 783, 784, 7, 49, 2, 2, 784, 785, 7, 44, 2, 2, 785, 789, 3, 2, 2, 2, 786, 788, 11, 2, 2, 2, 787, 786, 3, 2, 2, 2, 788, 791, 3, 2, 2, 2, 789, 790, 3, 2, 2, 2, 789, 787, 3, 2, 2, 2, 790, 792, 3, 2, 2, 2, 791, 789, 3, 2, 2, 2, 792, 793, 7, 44, 2, 2, 793, 794, 7, 49, 2, 2, 794, 795, 3, 2, 2, 2, 795, 796, 8, 71, 3, 2, 796, 142, 3, 2, 2, 2, 797, 798, 7, 49, 2, 2, 798, 799, 7, 49, 2, 2, 799, 803, 3, 2, 2, 2, 800, 802, 10, 13, 2, 2, 801, 800, 3, 2, 2, 2, 802, 805, 3, 2, 2, 2, 803, 801, 3, 2, 2, 2, 803, 804, 3, 2, 2, 2, 804, 806, 3, 2, 2, 2, 805, 803, 3, 2, 2, 2, 806, 807, 8, 72, 3, 2, 807, 144, 3, 2, 2, 2, 27, 2, 497, 503, 509, 520, 579, 582, 587, 593, 595, 604, 610, 616, 623, 625, 633, 635, 639, 655, 671, 767, 773, 779, 789, 803, 4, 8, 2, 2, 2, 3, 2]
\ No newline at end of file
+[3, 51485, 51898, 1421, 44986, 20307, 1543, 60043, 49729, 2, 76, 832, 8, 1, 4, 2, 9, 2, 4, 3, 9, 3, 4, 4, 9, 4, 4, 5, 9, 5, 4, 6, 9, 6, 4, 7, 9, 7, 4, 8, 9, 8, 4, 9, 9, 9, 4, 10, 9, 10, 4, 11, 9, 11, 4, 12, 9, 12, 4, 13, 9, 13, 4, 14, 9, 14, 4, 15, 9, 15, 4, 16, 9, 16, 4, 17, 9, 17, 4, 18, 9, 18, 4, 19, 9, 19, 4, 20, 9, 20, 4, 21, 9, 21, 4, 22, 9, 22, 4, 23, 9, 23, 4, 24, 9, 24, 4, 25, 9, 25, 4, 26, 9, 26, 4, 27, 9, 27, 4, 28, 9, 28, 4, 29, 9, 29, 4, 30, 9, 30, 4, 31, 9, 31, 4, 32, 9, 32, 4, 33, 9, 33, 4, 34, 9, 34, 4, 35, 9, 35, 4, 36, 9, 36, 4, 37, 9, 37, 4, 38, 9, 38, 4, 39, 9, 39, 4, 40, 9, 40, 4, 41, 9, 41, 4, 42, 9, 42, 4, 43, 9, 43, 4, 44, 9, 44, 4, 45, 9, 45, 4, 46, 9, 46, 4, 47, 9, 47, 4, 48, 9, 48, 4, 49, 9, 49, 4, 50, 9, 50, 4, 51, 9, 51, 4, 52, 9, 52, 4, 53, 9, 53, 4, 54, 9, 54, 4, 55, 9, 55, 4, 56, 9, 56, 4, 57, 9, 57, 4, 58, 9, 58, 4, 59, 9, 59, 4, 60, 9, 60, 4, 61, 9, 61, 4, 62, 9, 62, 4, 63, 9, 63, 4, 64, 9, 64, 4, 65, 9, 65, 4, 66, 9, 66, 4, 67, 9, 67, 4, 68, 9, 68, 4, 69, 9, 69, 4, 70, 9, 70, 4, 71, 9, 71, 4, 72, 9, 72, 4, 73, 9, 73, 4, 74, 9, 74, 4, 75, 9, 75, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 3, 3, 3, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 5, 3, 5, 3, 6, 3, 6, 3, 7, 3, 7, 3, 7, 3, 8, 3, 8, 3, 9, 3, 9, 3, 10, 3, 10, 3, 10, 3, 11, 3, 11, 3, 12, 3, 12, 3, 12, 3, 12, 3, 12, 3, 12, 3, 12, 3, 12, 3, 12, 3, 13, 3, 13, 3, 14, 3, 14, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 3, 16, 3, 16, 3, 17, 3, 17, 3, 18, 3, 18, 3, 19, 3, 19, 3, 19, 3, 19, 3, 19, 3, 19, 3, 19, 3, 19, 3, 20, 3, 20, 3, 20, 3, 21, 3, 21, 3, 21, 3, 21, 3, 21, 3, 22, 3, 22, 3, 22, 3, 22, 3, 23, 3, 23, 3, 24, 3, 24, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 26, 3, 26, 3, 26, 3, 26, 3, 27, 3, 27, 3, 27, 3, 27, 3, 27, 3, 28, 3, 28, 3, 28, 3, 28, 3, 28, 3, 28, 3, 28, 3, 28, 3, 28, 3, 28, 3, 28, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 30, 3, 30, 3, 30, 3, 30, 3, 30, 3, 30, 3, 30, 3, 30, 3, 30, 3, 30, 3, 30, 3, 30, 3, 30, 3, 30, 3, 30, 3, 30, 3, 30, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 37, 3, 37, 3, 37, 3, 37, 3, 37, 3, 37, 3, 37, 3, 37, 3, 37, 3, 37, 3, 37, 3, 37, 3, 37, 3, 37, 3, 37, 3, 37, 3, 37, 3, 37, 3, 37, 3, 38, 3, 38, 3, 38, 3, 38, 3, 38, 3, 38, 3, 38, 3, 38, 3, 38, 3, 38, 3, 38, 3, 38, 3, 38, 3, 38, 3, 38, 3, 38, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 42, 3, 42, 3, 43, 3, 43, 3, 44, 3, 44, 3, 45, 3, 45, 3, 46, 3, 46, 3, 47, 3, 47, 3, 48, 3, 48, 3, 48, 3, 49, 3, 49, 3, 49, 3, 50, 3, 50, 3, 51, 3, 51, 3, 52, 3, 52, 3, 52, 3, 53, 3, 53, 3, 53, 3, 54, 3, 54, 3, 54, 3, 54, 3, 54, 3, 54, 3, 54, 3, 54, 3, 54, 3, 55, 3, 55, 3, 55, 3, 55, 3, 56, 3, 56, 3, 56, 3, 56, 3, 56, 3, 57, 3, 57, 3, 57, 3, 57, 3, 57, 3, 57, 3, 57, 3, 58, 3, 58, 3, 58, 3, 58, 3, 58, 3, 58, 3, 58, 3, 59, 3, 59, 3, 59, 3, 59, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 61, 6, 61, 520, 10, 61, 13, 61, 14, 61, 521, 3, 61, 3, 61, 6, 61, 526, 10, 61, 13, 61, 14, 61, 527, 3, 61, 3, 61, 6, 61, 532, 10, 61, 13, 61, 14, 61, 533, 3, 62, 3, 62, 3, 62, 3, 62, 3, 62, 3, 62, 3, 62, 3, 62, 3, 62, 5, 62, 545, 10, 62, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 5, 63, 604, 10, 63, 3, 64, 5, 64, 607, 10, 64, 3, 64, 6, 64, 610, 10, 64, 13, 64, 14, 64, 611, 3, 64, 3, 64, 6, 64, 616, 10, 64, 13, 64, 14, 64, 617, 5, 64, 620, 10, 64, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 5, 65, 629, 10, 65, 3, 65, 3, 65, 3, 65, 3, 65, 5, 65, 635, 10, 65, 3, 66, 3, 66, 7, 66, 639, 10, 66, 12, 66, 14, 66, 642, 11, 66, 3, 67, 3, 67, 3, 67, 3, 67, 7, 67, 648, 10, 67, 12, 67, 14, 67, 651, 11, 67, 3, 67, 3, 67, 3, 67, 3, 67, 3, 67, 7, 67, 658, 10, 67, 12, 67, 14, 67, 661, 11, 67, 3, 67, 5, 67, 664, 10, 67, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 69, 3, 69, 3, 69, 7, 69, 678, 10, 69, 12, 69, 14, 69, 681, 11, 69, 3, 70, 3, 70, 3, 70, 3, 70, 3, 70, 3, 70, 3, 70, 3, 70, 3, 70, 3, 70, 3, 70, 3, 70, 3, 70, 5, 70, 696, 10, 70, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 5, 71, 792, 10, 71, 3, 72, 3, 72, 7, 72, 796, 10, 72, 12, 72, 14, 72, 799, 11, 72, 3, 73, 6, 73, 802, 10, 73, 13, 73, 14, 73, 803, 3, 73, 3, 73, 3, 74, 3, 74, 3, 74, 3, 74, 7, 74, 812, 10, 74, 12, 74, 14, 74, 815, 11, 74, 3, 74, 3, 74, 3, 74, 3, 74, 3, 74, 3, 75, 3, 75, 3, 75, 3, 75, 7, 75, 826, 10, 75, 12, 75, 14, 75, 829, 11, 75, 3, 75, 3, 75, 5, 649, 659, 813, 2, 2, 76, 3, 2, 3, 5, 2, 4, 7, 2, 5, 9, 2, 6, 11, 2, 7, 13, 2, 8, 15, 2, 9, 17, 2, 10, 19, 2, 11, 21, 2, 12, 23, 2, 13, 25, 2, 14, 27, 2, 15, 29, 2, 16, 31, 2, 17, 33, 2, 18, 35, 2, 19, 37, 2, 20, 39, 2, 21, 41, 2, 22, 43, 2, 23, 45, 2, 24, 47, 2, 25, 49, 2, 26, 51, 2, 27, 53, 2, 28, 55, 2, 29, 57, 2, 30, 59, 2, 31, 61, 2, 32, 63, 2, 33, 65, 2, 34, 67, 2, 35, 69, 2, 36, 71, 2, 37, 73, 2, 38, 75, 2, 39, 77, 2, 40, 79, 2, 41, 81, 2, 42, 83, 2, 43, 85, 2, 44, 87, 2, 45, 89, 2, 46, 91, 2, 47, 93, 2, 48, 95, 2, 49, 97, 2, 50, 99, 2, 51, 101, 2, 52, 103, 2, 53, 105, 2, 54, 107, 2, 55, 109, 2, 56, 111, 2, 57, 113, 2, 58, 115, 2, 59, 117, 2, 60, 119, 2, 61, 121, 2, 62, 123, 2, 63, 125, 2, 64, 127, 2, 65, 129, 2, 66, 131, 2, 67, 133, 2, 68, 135, 2, 69, 137, 2, 70, 139, 2, 71, 141, 2, 72, 143, 2, 73, 145, 2, 74, 147, 2, 75, 149, 2, 76, 3, 2, 14, 3, 2, 50, 59, 3, 2, 47, 47, 4, 2, 71, 71, 103, 103, 3, 2, 51, 59, 5, 2, 12, 12, 15, 15, 36, 36, 5, 2, 12, 12, 15, 15, 41, 41, 4, 2, 90, 90, 122, 122, 5, 2, 50, 59, 67, 72, 99, 104, 4, 2, 67, 92, 99, 124, 6, 2, 50, 59, 67, 92, 97, 97, 99, 124, 5, 2, 11, 12, 14, 15, 34, 34, 4, 2, 12, 12, 15, 15, 2, 867, 2, 3, 3, 2, 2, 2, 2, 5, 3, 2, 2, 2, 2, 7, 3, 2, 2, 2, 2, 9, 3, 2, 2, 2, 2, 11, 3, 2, 2, 2, 2, 13, 3, 2, 2, 2, 2, 15, 3, 2, 2, 2, 2, 17, 3, 2, 2, 2, 2, 19, 3, 2, 2, 2, 2, 21, 3, 2, 2, 2, 2, 23, 3, 2, 2, 2, 2, 25, 3, 2, 2, 2, 2, 27, 3, 2, 2, 2, 2, 29, 3, 2, 2, 2, 2, 31, 3, 2, 2, 2, 2, 33, 3, 2, 2, 2, 2, 35, 3, 2, 2, 2, 2, 37, 3, 2, 2, 2, 2, 39, 3, 2, 2, 2, 2, 41, 3, 2, 2, 2, 2, 43, 3, 2, 2, 2, 2, 45, 3, 2, 2, 2, 2, 47, 3, 2, 2, 2, 2, 49, 3, 2, 2, 2, 2, 51, 3, 2, 2, 2, 2, 53, 3, 2, 2, 2, 2, 55, 3, 2, 2, 2, 2, 57, 3, 2, 2, 2, 2, 59, 3, 2, 2, 2, 2, 61, 3, 2, 2, 2, 2, 63, 3, 2, 2, 2, 2, 65, 3, 2, 2, 2, 2, 67, 3, 2, 2, 2, 2, 69, 3, 2, 2, 2, 2, 71, 3, 2, 2, 2, 2, 73, 3, 2, 2, 2, 2, 75, 3, 2, 2, 2, 2, 77, 3, 2, 2, 2, 2, 79, 3, 2, 2, 2, 2, 81, 3, 2, 2, 2, 2, 83, 3, 2, 2, 2, 2, 85, 3, 2, 2, 2, 2, 87, 3, 2, 2, 2, 2, 89, 3, 2, 2, 2, 2, 91, 3, 2, 2, 2, 2, 93, 3, 2, 2, 2, 2, 95, 3, 2, 2, 2, 2, 97, 3, 2, 2, 2, 2, 99, 3, 2, 2, 2, 2, 101, 3, 2, 2, 2, 2, 103, 3, 2, 2, 2, 2, 105, 3, 2, 2, 2, 2, 107, 3, 2, 2, 2, 2, 109, 3, 2, 2, 2, 2, 111, 3, 2, 2, 2, 2, 113, 3, 2, 2, 2, 2, 115, 3, 2, 2, 2, 2, 117, 3, 2, 2, 2, 2, 119, 3, 2, 2, 2, 2, 121, 3, 2, 2, 2, 2, 123, 3, 2, 2, 2, 2, 125, 3, 2, 2, 2, 2, 127, 3, 2, 2, 2, 2, 129, 3, 2, 2, 2, 2, 131, 3, 2, 2, 2, 2, 133, 3, 2, 2, 2, 2, 135, 3, 2, 2, 2, 2, 137, 3, 2, 2, 2, 2, 139, 3, 2, 2, 2, 2, 141, 3, 2, 2, 2, 2, 143, 3, 2, 2, 2, 2, 145, 3, 2, 2, 2, 2, 147, 3, 2, 2, 2, 2, 149, 3, 2, 2, 2, 3, 151, 3, 2, 2, 2, 5, 158, 3, 2, 2, 2, 7, 160, 3, 2, 2, 2, 9, 171, 3, 2, 2, 2, 11, 173, 3, 2, 2, 2, 13, 175, 3, 2, 2, 2, 15, 178, 3, 2, 2, 2, 17, 180, 3, 2, 2, 2, 19, 182, 3, 2, 2, 2, 21, 185, 3, 2, 2, 2, 23, 187, 3, 2, 2, 2, 25, 196, 3, 2, 2, 2, 27, 198, 3, 2, 2, 2, 29, 200, 3, 2, 2, 2, 31, 209, 3, 2, 2, 2, 33, 211, 3, 2, 2, 2, 35, 213, 3, 2, 2, 2, 37, 215, 3, 2, 2, 2, 39, 223, 3, 2, 2, 2, 41, 226, 3, 2, 2, 2, 43, 231, 3, 2, 2, 2, 45, 235, 3, 2, 2, 2, 47, 237, 3, 2, 2, 2, 49, 239, 3, 2, 2, 2, 51, 248, 3, 2, 2, 2, 53, 252, 3, 2, 2, 2, 55, 257, 3, 2, 2, 2, 57, 268, 3, 2, 2, 2, 59, 275, 3, 2, 2, 2, 61, 292, 3, 2, 2, 2, 63, 307, 3, 2, 2, 2, 65, 322, 3, 2, 2, 2, 67, 335, 3, 2, 2, 2, 69, 345, 3, 2, 2, 2, 71, 370, 3, 2, 2, 2, 73, 385, 3, 2, 2, 2, 75, 404, 3, 2, 2, 2, 77, 420, 3, 2, 2, 2, 79, 431, 3, 2, 2, 2, 81, 439, 3, 2, 2, 2, 83, 446, 3, 2, 2, 2, 85, 448, 3, 2, 2, 2, 87, 450, 3, 2, 2, 2, 89, 452, 3, 2, 2, 2, 91, 454, 3, 2, 2, 2, 93, 456, 3, 2, 2, 2, 95, 458, 3, 2, 2, 2, 97, 461, 3, 2, 2, 2, 99, 464, 3, 2, 2, 2, 101, 466, 3, 2, 2, 2, 103, 468, 3, 2, 2, 2, 105, 471, 3, 2, 2, 2, 107, 474, 3, 2, 2, 2, 109, 483, 3, 2, 2, 2, 111, 487, 3, 2, 2, 2, 113, 492, 3, 2, 2, 2, 115, 499, 3, 2, 2, 2, 117, 506, 3, 2, 2, 2, 119, 510, 3, 2, 2, 2, 121, 519, 3, 2, 2, 2, 123, 544, 3, 2, 2, 2, 125, 603, 3, 2, 2, 2, 127, 606, 3, 2, 2, 2, 129, 634, 3, 2, 2, 2, 131, 636, 3, 2, 2, 2, 133, 663, 3, 2, 2, 2, 135, 665, 3, 2, 2, 2, 137, 674, 3, 2, 2, 2, 139, 695, 3, 2, 2, 2, 141, 791, 3, 2, 2, 2, 143, 793, 3, 2, 2, 2, 145, 801, 3, 2, 2, 2, 147, 807, 3, 2, 2, 2, 149, 821, 3, 2, 2, 2, 151, 152, 7, 114, 2, 2, 152, 153, 7, 116, 2, 2, 153, 154, 7, 99, 2, 2, 154, 155, 7, 105, 2, 2, 155, 156, 7, 111, 2, 2, 156, 157, 7, 99, 2, 2, 157, 4, 3, 2, 2, 2, 158, 159, 7, 61, 2, 2, 159, 6, 3, 2, 2, 2, 160, 161, 7, 101, 2, 2, 161, 162, 7, 99, 2, 2, 162, 163, 7, 117, 2, 2, 163, 164, 7, 106, 2, 2, 164, 165, 7, 117, 2, 2, 165, 166, 7, 101, 2, 2, 166, 167, 7, 116, 2, 2, 167, 168, 7, 107, 2, 2, 168, 169, 7, 114, 2, 2, 169, 170, 7, 118, 2, 2, 170, 8, 3, 2, 2, 2, 171, 172, 7, 96, 2, 2, 172, 10, 3, 2, 2, 2, 173, 174, 7, 128, 2, 2, 174, 12, 3, 2, 2, 2, 175, 176, 7, 64, 2, 2, 176, 177, 7, 63, 2, 2, 177, 14, 3, 2, 2, 2, 178, 179, 7, 64, 2, 2, 179, 16, 3, 2, 2, 2, 180, 181, 7, 62, 2, 2, 181, 18, 3, 2, 2, 2, 182, 183, 7, 62, 2, 2, 183, 184, 7, 63, 2, 2, 184, 20, 3, 2, 2, 2, 185, 186, 7, 63, 2, 2, 186, 22, 3, 2, 2, 2, 187, 188, 7, 101, 2, 2, 188, 189, 7, 113, 2, 2, 189, 190, 7, 112, 2, 2, 190, 191, 7, 118, 2, 2, 191, 192, 7, 116, 2, 2, 192, 193, 7, 99, 2, 2, 193, 194, 7, 101, 2, 2, 194, 195, 7, 118, 2, 2, 195, 24, 3, 2, 2, 2, 196, 197, 7, 125, 2, 2, 197, 26, 3, 2, 2, 2, 198, 199, 7, 127, 2, 2, 199, 28, 3, 2, 2, 2, 200, 201, 7, 104, 2, 2, 201, 202, 7, 119, 2, 2, 202, 203, 7, 112, 2, 2, 203, 204, 7, 101, 2, 2, 204, 205, 7, 118, 2, 2, 205, 206, 7, 107, 2, 2, 206, 207, 7, 113, 2, 2, 207, 208, 7, 112, 2, 2, 208, 30, 3, 2, 2, 2, 209, 210, 7, 42, 2, 2, 210, 32, 3, 2, 2, 2, 211, 212, 7, 46, 2, 2, 212, 34, 3, 2, 2, 2, 213, 214, 7, 43, 2, 2, 214, 36, 3, 2, 2, 2, 215, 216, 7, 116, 2, 2, 216, 217, 7, 103, 2, 2, 217, 218, 7, 115, 2, 2, 218, 219, 7, 119, 2, 2, 219, 220, 7, 107, 2, 2, 220, 221, 7, 116, 2, 2, 221, 222, 7, 103, 2, 2, 222, 38, 3, 2, 2, 2, 223, 224, 7, 107, 2, 2, 224, 225, 7, 104, 2, 2, 225, 40, 3, 2, 2, 2, 226, 227, 7, 103, 2, 2, 227, 228, 7, 110, 2, 2, 228, 229, 7, 117, 2, 2, 229, 230, 7, 103, 2, 2, 230, 42, 3, 2, 2, 2, 231, 232, 7, 112, 2, 2, 232, 233, 7, 103, 2, 2, 233, 234, 7, 121, 2, 2, 234, 44, 3, 2, 2, 2, 235, 236, 7, 93, 2, 2, 236, 46, 3, 2, 2, 2, 237, 238, 7, 95, 2, 2, 238, 48, 3, 2, 2, 2, 239, 240, 7, 101, 2, 2, 240, 241, 7, 113, 2, 2, 241, 242, 7, 112, 2, 2, 242, 243, 7, 117, 2, 2, 243, 244, 7, 113, 2, 2, 244, 245, 7, 110, 2, 2, 245, 246, 7, 103, 2, 2, 246, 247, 7, 48, 2, 2, 247, 50, 3, 2, 2, 2, 248, 249, 7, 110, 2, 2, 249, 250, 7, 113, 2, 2, 250, 251, 7, 105, 2, 2, 251, 52, 3, 2, 2, 2, 252, 253, 7, 121, 2, 2, 253, 254, 7, 99, 2, 2, 254, 255, 7, 116, 2, 2, 255, 256, 7, 112, 2, 2, 256, 54, 3, 2, 2, 2, 257, 258, 7, 118, 2, 2, 258, 259, 7, 122, 2, 2, 259, 260, 7, 48, 2, 2, 260, 261, 7, 113, 2, 2, 261, 262, 7, 119, 2, 2, 262, 263, 7, 118, 2, 2, 263, 264, 7, 114, 2, 2, 264, 265, 7, 119, 2, 2, 265, 266, 7, 118, 2, 2, 266, 267, 7, 117, 2, 2, 267, 56, 3, 2, 2, 2, 268, 269, 7, 48, 2, 2, 269, 270, 7, 120, 2, 2, 270, 271, 7, 99, 2, 2, 271, 272, 7, 110, 2, 2, 272, 273, 7, 119, 2, 2, 273, 274, 7, 103, 2, 2, 274, 58, 3, 2, 2, 2, 275, 276, 7, 48, 2, 2, 276, 277, 7, 110, 2, 2, 277, 278, 7, 113, 2, 2, 278, 279, 7, 101, 2, 2, 279, 280, 7, 109, 2, 2, 280, 281, 7, 107, 2, 2, 281, 282, 7, 112, 2, 2, 282, 283, 7, 105, 2, 2, 283, 284, 7, 68, 2, 2, 284, 285, 7, 123, 2, 2, 285, 286, 7, 118, 2, 2, 286, 287, 7, 103, 2, 2, 287, 288, 7, 101, 2, 2, 288, 289, 7, 113, 2, 2, 289, 290, 7, 102, 2, 2, 290, 291, 7, 103, 2, 2, 291, 60, 3, 2, 2, 2, 292, 293, 7, 48, 2, 2, 293, 294, 7, 118, 2, 2, 294, 295, 7, 113, 2, 2, 295, 296, 7, 109, 2, 2, 296, 297, 7, 103, 2, 2, 297, 298, 7, 112, 2, 2, 298, 299, 7, 69, 2, 2, 299, 300, 7, 99, 2, 2, 300, 301, 7, 118, 2, 2, 301, 302, 7, 103, 2, 2, 302, 303, 7, 105, 2, 2, 303, 304, 7, 113, 2, 2, 304, 305, 7, 116, 2, 2, 305, 306, 7, 123, 2, 2, 306, 62, 3, 2, 2, 2, 307, 308, 7, 48, 2, 2, 308, 309, 7, 112, 2, 2, 309, 310, 7, 104, 2, 2, 310, 311, 7, 118, 2, 2, 311, 312, 7, 69, 2, 2, 312, 313, 7, 113, 2, 2, 313, 314, 7, 111, 2, 2, 314, 315, 7, 111, 2, 2, 315, 316, 7, 107, 2, 2, 316, 317, 7, 118, 2, 2, 317, 318, 7, 111, 2, 2, 318, 319, 7, 103, 2, 2, 319, 320, 7, 112, 2, 2, 320, 321, 7, 118, 2, 2, 321, 64, 3, 2, 2, 2, 322, 323, 7, 48, 2, 2, 323, 324, 7, 118, 2, 2, 324, 325, 7, 113, 2, 2, 325, 326, 7, 109, 2, 2, 326, 327, 7, 103, 2, 2, 327, 328, 7, 112, 2, 2, 328, 329, 7, 67, 2, 2, 329, 330, 7, 111, 2, 2, 330, 331, 7, 113, 2, 2, 331, 332, 7, 119, 2, 2, 332, 333, 7, 112, 2, 2, 333, 334, 7, 118, 2, 2, 334, 66, 3, 2, 2, 2, 335, 336, 7, 118, 2, 2, 336, 337, 7, 122, 2, 2, 337, 338, 7, 48, 2, 2, 338, 339, 7, 107, 2, 2, 339, 340, 7, 112, 2, 2, 340, 341, 7, 114, 2, 2, 341, 342, 7, 119, 2, 2, 342, 343, 7, 118, 2, 2, 343, 344, 7, 117, 2, 2, 344, 68, 3, 2, 2, 2, 345, 346, 7, 48, 2, 2, 346, 347, 7, 113, 2, 2, 347, 348, 7, 119, 2, 2, 348, 349, 7, 118, 2, 2, 349, 350, 7, 114, 2, 2, 350, 351, 7, 113, 2, 2, 351, 352, 7, 107, 2, 2, 352, 353, 7, 112, 2, 2, 353, 354, 7, 118, 2, 2, 354, 355, 7, 86, 2, 2, 355, 356, 7, 116, 2, 2, 356, 357, 7, 99, 2, 2, 357, 358, 7, 112, 2, 2, 358, 359, 7, 117, 2, 2, 359, 360, 7, 99, 2, 2, 360, 361, 7, 101, 2, 2, 361, 362, 7, 118, 2, 2, 362, 363, 7, 107, 2, 2, 363, 364, 7, 113, 2, 2, 364, 365, 7, 112, 2, 2, 365, 366, 7, 74, 2, 2, 366, 367, 7, 99, 2, 2, 367, 368, 7, 117, 2, 2, 368, 369, 7, 106, 2, 2, 369, 70, 3, 2, 2, 2, 370, 371, 7, 48, 2, 2, 371, 372, 7, 113, 2, 2, 372, 373, 7, 119, 2, 2, 373, 374, 7, 118, 2, 2, 374, 375, 7, 114, 2, 2, 375, 376, 7, 113, 2, 2, 376, 377, 7, 107, 2, 2, 377, 378, 7, 112, 2, 2, 378, 379, 7, 118, 2, 2, 379, 380, 7, 75, 2, 2, 380, 381, 7, 112, 2, 2, 381, 382, 7, 102, 2, 2, 382, 383, 7, 103, 2, 2, 383, 384, 7, 122, 2, 2, 384, 72, 3, 2, 2, 2, 385, 386, 7, 48, 2, 2, 386, 387, 7, 119, 2, 2, 387, 388, 7, 112, 2, 2, 388, 389, 7, 110, 2, 2, 389, 390, 7, 113, 2, 2, 390, 391, 7, 101, 2, 2, 391, 392, 7, 109, 2, 2, 392, 393, 7, 107, 2, 2, 393, 394, 7, 112, 2, 2, 394, 395, 7, 105, 2, 2, 395, 396, 7, 68, 2, 2, 396, 397, 7, 123, 2, 2, 397, 398, 7, 118, 2, 2, 398, 399, 7, 103, 2, 2, 399, 400, 7, 101, 2, 2, 400, 401, 7, 113, 2, 2, 401, 402, 7, 102, 2, 2, 402, 403, 7, 103, 2, 2, 403, 74, 3, 2, 2, 2, 404, 405, 7, 48, 2, 2, 405, 406, 7, 117, 2, 2, 406, 407, 7, 103, 2, 2, 407, 408, 7, 115, 2, 2, 408, 409, 7, 119, 2, 2, 409, 410, 7, 103, 2, 2, 410, 411, 7, 112, 2, 2, 411, 412, 7, 101, 2, 2, 412, 413, 7, 103, 2, 2, 413, 414, 7, 80, 2, 2, 414, 415, 7, 119, 2, 2, 415, 416, 7, 111, 2, 2, 416, 417, 7, 100, 2, 2, 417, 418, 7, 103, 2, 2, 418, 419, 7, 116, 2, 2, 419, 76, 3, 2, 2, 2, 420, 421, 7, 48, 2, 2, 421, 422, 7, 116, 2, 2, 422, 423, 7, 103, 2, 2, 423, 424, 7, 120, 2, 2, 424, 425, 7, 103, 2, 2, 425, 426, 7, 116, 2, 2, 426, 427, 7, 117, 2, 2, 427, 428, 7, 103, 2, 2, 428, 429, 7, 42, 2, 2, 429, 430, 7, 43, 2, 2, 430, 78, 3, 2, 2, 2, 431, 432, 7, 48, 2, 2, 432, 433, 7, 110, 2, 2, 433, 434, 7, 103, 2, 2, 434, 435, 7, 112, 2, 2, 435, 436, 7, 105, 2, 2, 436, 437, 7, 118, 2, 2, 437, 438, 7, 106, 2, 2, 438, 80, 3, 2, 2, 2, 439, 440, 7, 48, 2, 2, 440, 441, 7, 117, 2, 2, 441, 442, 7, 114, 2, 2, 442, 443, 7, 110, 2, 2, 443, 444, 7, 107, 2, 2, 444, 445, 7, 118, 2, 2, 445, 82, 3, 2, 2, 2, 446, 447, 7, 35, 2, 2, 447, 84, 3, 2, 2, 2, 448, 449, 7, 47, 2, 2, 449, 86, 3, 2, 2, 2, 450, 451, 7, 44, 2, 2, 451, 88, 3, 2, 2, 2, 452, 453, 7, 49, 2, 2, 453, 90, 3, 2, 2, 2, 454, 455, 7, 39, 2, 2, 455, 92, 3, 2, 2, 2, 456, 457, 7, 45, 2, 2, 457, 94, 3, 2, 2, 2, 458, 459, 7, 63, 2, 2, 459, 460, 7, 63, 2, 2, 460, 96, 3, 2, 2, 2, 461, 462, 7, 35, 2, 2, 462, 463, 7, 63, 2, 2, 463, 98, 3, 2, 2, 2, 464, 465, 7, 40, 2, 2, 465, 100, 3, 2, 2, 2, 466, 467, 7, 126, 2, 2, 467, 102, 3, 2, 2, 2, 468, 469, 7, 40, 2, 2, 469, 470, 7, 40, 2, 2, 470, 104, 3, 2, 2, 2, 471, 472, 7, 126, 2, 2, 472, 473, 7, 126, 2, 2, 473, 106, 3, 2, 2, 2, 474, 475, 7, 101, 2, 2, 475, 476, 7, 113, 2, 2, 476, 477, 7, 112, 2, 2, 477, 478, 7, 117, 2, 2, 478, 479, 7, 118, 2, 2, 479, 480, 7, 99, 2, 2, 480, 481, 7, 112, 2, 2, 481, 482, 7, 118, 2, 2, 482, 108, 3, 2, 2, 2, 483, 484, 7, 107, 2, 2, 484, 485, 7, 112, 2, 2, 485, 486, 7, 118, 2, 2, 486, 110, 3, 2, 2, 2, 487, 488, 7, 100, 2, 2, 488, 489, 7, 113, 2, 2, 489, 490, 7, 113, 2, 2, 490, 491, 7, 110, 2, 2, 491, 112, 3, 2, 2, 2, 492, 493, 7, 117, 2, 2, 493, 494, 7, 118, 2, 2, 494, 495, 7, 116, 2, 2, 495, 496, 7, 107, 2, 2, 496, 497, 7, 112, 2, 2, 497, 498, 7, 105, 2, 2, 498, 114, 3, 2, 2, 2, 499, 500, 7, 114, 2, 2, 500, 501, 7, 119, 2, 2, 501, 502, 7, 100, 2, 2, 502, 503, 7, 109, 2, 2, 503, 504, 7, 103, 2, 2, 504, 505, 7, 123, 2, 2, 505, 116, 3, 2, 2, 2, 506, 507, 7, 117, 2, 2, 507, 508, 7, 107, 2, 2, 508, 509, 7, 105, 2, 2, 509, 118, 3, 2, 2, 2, 510, 511, 7, 102, 2, 2, 511, 512, 7, 99, 2, 2, 512, 513, 7, 118, 2, 2, 513, 514, 7, 99, 2, 2, 514, 515, 7, 117, 2, 2, 515, 516, 7, 107, 2, 2, 516, 517, 7, 105, 2, 2, 517, 120, 3, 2, 2, 2, 518, 520, 9, 2, 2, 2, 519, 518, 3, 2, 2, 2, 520, 521, 3, 2, 2, 2, 521, 519, 3, 2, 2, 2, 521, 522, 3, 2, 2, 2, 522, 523, 3, 2, 2, 2, 523, 525, 7, 48, 2, 2, 524, 526, 9, 2, 2, 2, 525, 524, 3, 2, 2, 2, 526, 527, 3, 2, 2, 2, 527, 525, 3, 2, 2, 2, 527, 528, 3, 2, 2, 2, 528, 529, 3, 2, 2, 2, 529, 531, 7, 48, 2, 2, 530, 532, 9, 2, 2, 2, 531, 530, 3, 2, 2, 2, 532, 533, 3, 2, 2, 2, 533, 531, 3, 2, 2, 2, 533, 534, 3, 2, 2, 2, 534, 122, 3, 2, 2, 2, 535, 536, 7, 118, 2, 2, 536, 537, 7, 116, 2, 2, 537, 538, 7, 119, 2, 2, 538, 545, 7, 103, 2, 2, 539, 540, 7, 104, 2, 2, 540, 541, 7, 99, 2, 2, 541, 542, 7, 110, 2, 2, 542, 543, 7, 117, 2, 2, 543, 545, 7, 103, 2, 2, 544, 535, 3, 2, 2, 2, 544, 539, 3, 2, 2, 2, 545, 124, 3, 2, 2, 2, 546, 547, 7, 117, 2, 2, 547, 548, 7, 99, 2, 2, 548, 549, 7, 118, 2, 2, 549, 550, 7, 113, 2, 2, 550, 551, 7, 117, 2, 2, 551, 552, 7, 106, 2, 2, 552, 553, 7, 107, 2, 2, 553, 604, 7, 117, 2, 2, 554, 555, 7, 117, 2, 2, 555, 556, 7, 99, 2, 2, 556, 557, 7, 118, 2, 2, 557, 604, 7, 117, 2, 2, 558, 559, 7, 104, 2, 2, 559, 560, 7, 107, 2, 2, 560, 561, 7, 112, 2, 2, 561, 562, 7, 112, 2, 2, 562, 563, 7, 103, 2, 2, 563, 604, 7, 123, 2, 2, 564, 565, 7, 100, 2, 2, 565, 566, 7, 107, 2, 2, 566, 567, 7, 118, 2, 2, 567, 604, 7, 117, 2, 2, 568, 569, 7, 100, 2, 2, 569, 570, 7, 107, 2, 2, 570, 571, 7, 118, 2, 2, 571, 572, 7, 101, 2, 2, 572, 573, 7, 113, 2, 2, 573, 574, 7, 107, 2, 2, 574, 604, 7, 112, 2, 2, 575, 576, 7, 117, 2, 2, 576, 577, 7, 103, 2, 2, 577, 578, 7, 101, 2, 2, 578, 579, 7, 113, 2, 2, 579, 580, 7, 112, 2, 2, 580, 581, 7, 102, 2, 2, 581, 604, 7, 117, 2, 2, 582, 583, 7, 111, 2, 2, 583, 584, 7, 107, 2, 2, 584, 585, 7, 112, 2, 2, 585, 586, 7, 119, 2, 2, 586, 587, 7, 118, 2, 2, 587, 588, 7, 103, 2, 2, 588, 604, 7, 117, 2, 2, 589, 590, 7, 106, 2, 2, 590, 591, 7, 113, 2, 2, 591, 592, 7, 119, 2, 2, 592, 593, 7, 116, 2, 2, 593, 604, 7, 117, 2, 2, 594, 595, 7, 102, 2, 2, 595, 596, 7, 99, 2, 2, 596, 597, 7, 123, 2, 2, 597, 604, 7, 117, 2, 2, 598, 599, 7, 121, 2, 2, 599, 600, 7, 103, 2, 2, 600, 601, 7, 103, 2, 2, 601, 602, 7, 109, 2, 2, 602, 604, 7, 117, 2, 2, 603, 546, 3, 2, 2, 2, 603, 554, 3, 2, 2, 2, 603, 558, 3, 2, 2, 2, 603, 564, 3, 2, 2, 2, 603, 568, 3, 2, 2, 2, 603, 575, 3, 2, 2, 2, 603, 582, 3, 2, 2, 2, 603, 589, 3, 2, 2, 2, 603, 594, 3, 2, 2, 2, 603, 598, 3, 2, 2, 2, 604, 126, 3, 2, 2, 2, 605, 607, 9, 3, 2, 2, 606, 605, 3, 2, 2, 2, 606, 607, 3, 2, 2, 2, 607, 609, 3, 2, 2, 2, 608, 610, 9, 2, 2, 2, 609, 608, 3, 2, 2, 2, 610, 611, 3, 2, 2, 2, 611, 609, 3, 2, 2, 2, 611, 612, 3, 2, 2, 2, 612, 619, 3, 2, 2, 2, 613, 615, 9, 4, 2, 2, 614, 616, 9, 2, 2, 2, 615, 614, 3, 2, 2, 2, 616, 617, 3, 2, 2, 2, 617, 615, 3, 2, 2, 2, 617, 618, 3, 2, 2, 2, 618, 620, 3, 2, 2, 2, 619, 613, 3, 2, 2, 2, 619, 620, 3, 2, 2, 2, 620, 128, 3, 2, 2, 2, 621, 622, 7, 100, 2, 2, 622, 623, 7, 123, 2, 2, 623, 624, 7, 118, 2, 2, 624, 625, 7, 103, 2, 2, 625, 626, 7, 117, 2, 2, 626, 628, 3, 2, 2, 2, 627, 629, 5, 131, 66, 2, 628, 627, 3, 2, 2, 2, 628, 629, 3, 2, 2, 2, 629, 635, 3, 2, 2, 2, 630, 631, 7, 100, 2, 2, 631, 632, 7, 123, 2, 2, 632, 633, 7, 118, 2, 2, 633, 635, 7, 103, 2, 2, 634, 621, 3, 2, 2, 2, 634, 630, 3, 2, 2, 2, 635, 130, 3, 2, 2, 2, 636, 640, 9, 5, 2, 2, 637, 639, 9, 2, 2, 2, 638, 637, 3, 2, 2, 2, 639, 642, 3, 2, 2, 2, 640, 638, 3, 2, 2, 2, 640, 641, 3, 2, 2, 2, 641, 132, 3, 2, 2, 2, 642, 640, 3, 2, 2, 2, 643, 649, 7, 36, 2, 2, 644, 645, 7, 94, 2, 2, 645, 648, 7, 36, 2, 2, 646, 648, 10, 6, 2, 2, 647, 644, 3, 2, 2, 2, 647, 646, 3, 2, 2, 2, 648, 651, 3, 2, 2, 2, 649, 650, 3, 2, 2, 2, 649, 647, 3, 2, 2, 2, 650, 652, 3, 2, 2, 2, 651, 649, 3, 2, 2, 2, 652, 664, 7, 36, 2, 2, 653, 659, 7, 41, 2, 2, 654, 655, 7, 94, 2, 2, 655, 658, 7, 41, 2, 2, 656, 658, 10, 7, 2, 2, 657, 654, 3, 2, 2, 2, 657, 656, 3, 2, 2, 2, 658, 661, 3, 2, 2, 2, 659, 660, 3, 2, 2, 2, 659, 657, 3, 2, 2, 2, 660, 662, 3, 2, 2, 2, 661, 659, 3, 2, 2, 2, 662, 664, 7, 41, 2, 2, 663, 643, 3, 2, 2, 2, 663, 653, 3, 2, 2, 2, 664, 134, 3, 2, 2, 2, 665, 666, 7, 102, 2, 2, 666, 667, 7, 99, 2, 2, 667, 668, 7, 118, 2, 2, 668, 669, 7, 103, 2, 2, 669, 670, 7, 42, 2, 2, 670, 671, 3, 2, 2, 2, 671, 672, 5, 133, 67, 2, 672, 673, 7, 43, 2, 2, 673, 136, 3, 2, 2, 2, 674, 675, 7, 50, 2, 2, 675, 679, 9, 8, 2, 2, 676, 678, 9, 9, 2, 2, 677, 676, 3, 2, 2, 2, 678, 681, 3, 2, 2, 2, 679, 677, 3, 2, 2, 2, 679, 680, 3, 2, 2, 2, 680, 138, 3, 2, 2, 2, 681, 679, 3, 2, 2, 2, 682, 683, 7, 118, 2, 2, 683, 684, 7, 122, 2, 2, 684, 685, 7, 48, 2, 2, 685, 686, 7, 99, 2, 2, 686, 687, 7, 105, 2, 2, 687, 696, 7, 103, 2, 2, 688, 689, 7, 118, 2, 2, 689, 690, 7, 122, 2, 2, 690, 691, 7, 48, 2, 2, 691, 692, 7, 118, 2, 2, 692, 693, 7, 107, 2, 2, 693, 694, 7, 111, 2, 2, 694, 696, 7, 103, 2, 2, 695, 682, 3, 2, 2, 2, 695, 688, 3, 2, 2, 2, 696, 140, 3, 2, 2, 2, 697, 698, 7, 118, 2, 2, 698, 699, 7, 106, 2, 2, 699, 700, 7, 107, 2, 2, 700, 701, 7, 117, 2, 2, 701, 702, 7, 48, 2, 2, 702, 703, 7, 99, 2, 2, 703, 704, 7, 101, 2, 2, 704, 705, 7, 118, 2, 2, 705, 706, 7, 107, 2, 2, 706, 707, 7, 120, 2, 2, 707, 708, 7, 103, 2, 2, 708, 709, 7, 75, 2, 2, 709, 710, 7, 112, 2, 2, 710, 711, 7, 114, 2, 2, 711, 712, 7, 119, 2, 2, 712, 713, 7, 118, 2, 2, 713, 714, 7, 75, 2, 2, 714, 715, 7, 112, 2, 2, 715, 716, 7, 102, 2, 2, 716, 717, 7, 103, 2, 2, 717, 792, 7, 122, 2, 2, 718, 719, 7, 118, 2, 2, 719, 720, 7, 106, 2, 2, 720, 721, 7, 107, 2, 2, 721, 722, 7, 117, 2, 2, 722, 723, 7, 48, 2, 2, 723, 724, 7, 99, 2, 2, 724, 725, 7, 101, 2, 2, 725, 726, 7, 118, 2, 2, 726, 727, 7, 107, 2, 2, 727, 728, 7, 120, 2, 2, 728, 729, 7, 103, 2, 2, 729, 730, 7, 68, 2, 2, 730, 731, 7, 123, 2, 2, 731, 732, 7, 118, 2, 2, 732, 733, 7, 103, 2, 2, 733, 734, 7, 101, 2, 2, 734, 735, 7, 113, 2, 2, 735, 736, 7, 102, 2, 2, 736, 792, 7, 103, 2, 2, 737, 738, 7, 118, 2, 2, 738, 739, 7, 122, 2, 2, 739, 740, 7, 48, 2, 2, 740, 741, 7, 107, 2, 2, 741, 742, 7, 112, 2, 2, 742, 743, 7, 114, 2, 2, 743, 744, 7, 119, 2, 2, 744, 745, 7, 118, 2, 2, 745, 746, 7, 117, 2, 2, 746, 747, 7, 48, 2, 2, 747, 748, 7, 110, 2, 2, 748, 749, 7, 103, 2, 2, 749, 750, 7, 112, 2, 2, 750, 751, 7, 105, 2, 2, 751, 752, 7, 118, 2, 2, 752, 792, 7, 106, 2, 2, 753, 754, 7, 118, 2, 2, 754, 755, 7, 122, 2, 2, 755, 756, 7, 48, 2, 2, 756, 757, 7, 113, 2, 2, 757, 758, 7, 119, 2, 2, 758, 759, 7, 118, 2, 2, 759, 760, 7, 114, 2, 2, 760, 761, 7, 119, 2, 2, 761, 762, 7, 118, 2, 2, 762, 763, 7, 117, 2, 2, 763, 764, 7, 48, 2, 2, 764, 765, 7, 110, 2, 2, 765, 766, 7, 103, 2, 2, 766, 767, 7, 112, 2, 2, 767, 768, 7, 105, 2, 2, 768, 769, 7, 118, 2, 2, 769, 792, 7, 106, 2, 2, 770, 771, 7, 118, 2, 2, 771, 772, 7, 122, 2, 2, 772, 773, 7, 48, 2, 2, 773, 774, 7, 120, 2, 2, 774, 775, 7, 103, 2, 2, 775, 776, 7, 116, 2, 2, 776, 777, 7, 117, 2, 2, 777, 778, 7, 107, 2, 2, 778, 779, 7, 113, 2, 2, 779, 792, 7, 112, 2, 2, 780, 781, 7, 118, 2, 2, 781, 782, 7, 122, 2, 2, 782, 783, 7, 48, 2, 2, 783, 784, 7, 110, 2, 2, 784, 785, 7, 113, 2, 2, 785, 786, 7, 101, 2, 2, 786, 787, 7, 109, 2, 2, 787, 788, 7, 118, 2, 2, 788, 789, 7, 107, 2, 2, 789, 790, 7, 111, 2, 2, 790, 792, 7, 103, 2, 2, 791, 697, 3, 2, 2, 2, 791, 718, 3, 2, 2, 2, 791, 737, 3, 2, 2, 2, 791, 753, 3, 2, 2, 2, 791, 770, 3, 2, 2, 2, 791, 780, 3, 2, 2, 2, 792, 142, 3, 2, 2, 2, 793, 797, 9, 10, 2, 2, 794, 796, 9, 11, 2, 2, 795, 794, 3, 2, 2, 2, 796, 799, 3, 2, 2, 2, 797, 795, 3, 2, 2, 2, 797, 798, 3, 2, 2, 2, 798, 144, 3, 2, 2, 2, 799, 797, 3, 2, 2, 2, 800, 802, 9, 12, 2, 2, 801, 800, 3, 2, 2, 2, 802, 803, 3, 2, 2, 2, 803, 801, 3, 2, 2, 2, 803, 804, 3, 2, 2, 2, 804, 805, 3, 2, 2, 2, 805, 806, 8, 73, 2, 2, 806, 146, 3, 2, 2, 2, 807, 808, 7, 49, 2, 2, 808, 809, 7, 44, 2, 2, 809, 813, 3, 2, 2, 2, 810, 812, 11, 2, 2, 2, 811, 810, 3, 2, 2, 2, 812, 815, 3, 2, 2, 2, 813, 814, 3, 2, 2, 2, 813, 811, 3, 2, 2, 2, 814, 816, 3, 2, 2, 2, 815, 813, 3, 2, 2, 2, 816, 817, 7, 44, 2, 2, 817, 818, 7, 49, 2, 2, 818, 819, 3, 2, 2, 2, 819, 820, 8, 74, 3, 2, 820, 148, 3, 2, 2, 2, 821, 822, 7, 49, 2, 2, 822, 823, 7, 49, 2, 2, 823, 827, 3, 2, 2, 2, 824, 826, 10, 13, 2, 2, 825, 824, 3, 2, 2, 2, 826, 829, 3, 2, 2, 2, 827, 825, 3, 2, 2, 2, 827, 828, 3, 2, 2, 2, 828, 830, 3, 2, 2, 2, 829, 827, 3, 2, 2, 2, 830, 831, 8, 75, 3, 2, 831, 150, 3, 2, 2, 2, 27, 2, 521, 527, 533, 544, 603, 606, 611, 617, 619, 628, 634, 640, 647, 649, 657, 659, 663, 679, 695, 791, 797, 803, 813, 827, 4, 8, 2, 2, 2, 3, 2]
\ No newline at end of file
diff --git a/packages/cashc/src/grammar/CashScriptLexer.tokens b/packages/cashc/src/grammar/CashScriptLexer.tokens
index c9b63123..99983b17 100644
--- a/packages/cashc/src/grammar/CashScriptLexer.tokens
+++ b/packages/cashc/src/grammar/CashScriptLexer.tokens
@@ -54,21 +54,24 @@ T__52=53
 T__53=54
 T__54=55
 T__55=56
-VersionLiteral=57
-BooleanLiteral=58
-NumberUnit=59
-NumberLiteral=60
-Bytes=61
-Bound=62
-StringLiteral=63
-DateLiteral=64
-HexLiteral=65
-TxVar=66
-NullaryOp=67
-Identifier=68
-WHITESPACE=69
-COMMENT=70
-LINE_COMMENT=71
+T__56=57
+T__57=58
+T__58=59
+VersionLiteral=60
+BooleanLiteral=61
+NumberUnit=62
+NumberLiteral=63
+Bytes=64
+Bound=65
+StringLiteral=66
+DateLiteral=67
+HexLiteral=68
+TxVar=69
+NullaryOp=70
+Identifier=71
+WHITESPACE=72
+COMMENT=73
+LINE_COMMENT=74
 'pragma'=1
 ';'=2
 'cashscript'=3
@@ -92,36 +95,39 @@ LINE_COMMENT=71
 'new'=21
 '['=22
 ']'=23
-'tx.outputs'=24
-'.value'=25
-'.lockingBytecode'=26
-'.tokenCategory'=27
-'.nftCommitment'=28
-'.tokenAmount'=29
-'tx.inputs'=30
-'.outpointTransactionHash'=31
-'.outpointIndex'=32
-'.unlockingBytecode'=33
-'.sequenceNumber'=34
-'.reverse()'=35
-'.length'=36
-'.split'=37
-'!'=38
-'-'=39
-'*'=40
-'/'=41
-'%'=42
-'+'=43
-'=='=44
-'!='=45
-'&'=46
-'|'=47
-'&&'=48
-'||'=49
-'constant'=50
-'int'=51
-'bool'=52
-'string'=53
-'pubkey'=54
-'sig'=55
-'datasig'=56
+'console.'=24
+'log'=25
+'warn'=26
+'tx.outputs'=27
+'.value'=28
+'.lockingBytecode'=29
+'.tokenCategory'=30
+'.nftCommitment'=31
+'.tokenAmount'=32
+'tx.inputs'=33
+'.outpointTransactionHash'=34
+'.outpointIndex'=35
+'.unlockingBytecode'=36
+'.sequenceNumber'=37
+'.reverse()'=38
+'.length'=39
+'.split'=40
+'!'=41
+'-'=42
+'*'=43
+'/'=44
+'%'=45
+'+'=46
+'=='=47
+'!='=48
+'&'=49
+'|'=50
+'&&'=51
+'||'=52
+'constant'=53
+'int'=54
+'bool'=55
+'string'=56
+'pubkey'=57
+'sig'=58
+'datasig'=59
diff --git a/packages/cashc/src/grammar/CashScriptLexer.ts b/packages/cashc/src/grammar/CashScriptLexer.ts
index 43c82253..0363a66f 100644
--- a/packages/cashc/src/grammar/CashScriptLexer.ts
+++ b/packages/cashc/src/grammar/CashScriptLexer.ts
@@ -72,21 +72,24 @@ export class CashScriptLexer extends Lexer {
 	public static readonly T__53 = 54;
 	public static readonly T__54 = 55;
 	public static readonly T__55 = 56;
-	public static readonly VersionLiteral = 57;
-	public static readonly BooleanLiteral = 58;
-	public static readonly NumberUnit = 59;
-	public static readonly NumberLiteral = 60;
-	public static readonly Bytes = 61;
-	public static readonly Bound = 62;
-	public static readonly StringLiteral = 63;
-	public static readonly DateLiteral = 64;
-	public static readonly HexLiteral = 65;
-	public static readonly TxVar = 66;
-	public static readonly NullaryOp = 67;
-	public static readonly Identifier = 68;
-	public static readonly WHITESPACE = 69;
-	public static readonly COMMENT = 70;
-	public static readonly LINE_COMMENT = 71;
+	public static readonly T__56 = 57;
+	public static readonly T__57 = 58;
+	public static readonly T__58 = 59;
+	public static readonly VersionLiteral = 60;
+	public static readonly BooleanLiteral = 61;
+	public static readonly NumberUnit = 62;
+	public static readonly NumberLiteral = 63;
+	public static readonly Bytes = 64;
+	public static readonly Bound = 65;
+	public static readonly StringLiteral = 66;
+	public static readonly DateLiteral = 67;
+	public static readonly HexLiteral = 68;
+	public static readonly TxVar = 69;
+	public static readonly NullaryOp = 70;
+	public static readonly Identifier = 71;
+	public static readonly WHITESPACE = 72;
+	public static readonly COMMENT = 73;
+	public static readonly LINE_COMMENT = 74;
 
 	// tslint:disable:no-trailing-whitespace
 	public static readonly channelNames: string[] = [
@@ -105,22 +108,22 @@ export class CashScriptLexer extends Lexer {
 		"T__25", "T__26", "T__27", "T__28", "T__29", "T__30", "T__31", "T__32", 
 		"T__33", "T__34", "T__35", "T__36", "T__37", "T__38", "T__39", "T__40", 
 		"T__41", "T__42", "T__43", "T__44", "T__45", "T__46", "T__47", "T__48", 
-		"T__49", "T__50", "T__51", "T__52", "T__53", "T__54", "T__55", "VersionLiteral", 
-		"BooleanLiteral", "NumberUnit", "NumberLiteral", "Bytes", "Bound", "StringLiteral", 
-		"DateLiteral", "HexLiteral", "TxVar", "NullaryOp", "Identifier", "WHITESPACE", 
-		"COMMENT", "LINE_COMMENT",
+		"T__49", "T__50", "T__51", "T__52", "T__53", "T__54", "T__55", "T__56", 
+		"T__57", "T__58", "VersionLiteral", "BooleanLiteral", "NumberUnit", "NumberLiteral", 
+		"Bytes", "Bound", "StringLiteral", "DateLiteral", "HexLiteral", "TxVar", 
+		"NullaryOp", "Identifier", "WHITESPACE", "COMMENT", "LINE_COMMENT",
 	];
 
 	private static readonly _LITERAL_NAMES: Array<string | undefined> = [
 		undefined, "'pragma'", "';'", "'cashscript'", "'^'", "'~'", "'>='", "'>'", 
 		"'<'", "'<='", "'='", "'contract'", "'{'", "'}'", "'function'", "'('", 
-		"','", "')'", "'require'", "'if'", "'else'", "'new'", "'['", "']'", "'tx.outputs'", 
-		"'.value'", "'.lockingBytecode'", "'.tokenCategory'", "'.nftCommitment'", 
-		"'.tokenAmount'", "'tx.inputs'", "'.outpointTransactionHash'", "'.outpointIndex'", 
-		"'.unlockingBytecode'", "'.sequenceNumber'", "'.reverse()'", "'.length'", 
-		"'.split'", "'!'", "'-'", "'*'", "'/'", "'%'", "'+'", "'=='", "'!='", 
-		"'&'", "'|'", "'&&'", "'||'", "'constant'", "'int'", "'bool'", "'string'", 
-		"'pubkey'", "'sig'", "'datasig'",
+		"','", "')'", "'require'", "'if'", "'else'", "'new'", "'['", "']'", "'console.'", 
+		"'log'", "'warn'", "'tx.outputs'", "'.value'", "'.lockingBytecode'", "'.tokenCategory'", 
+		"'.nftCommitment'", "'.tokenAmount'", "'tx.inputs'", "'.outpointTransactionHash'", 
+		"'.outpointIndex'", "'.unlockingBytecode'", "'.sequenceNumber'", "'.reverse()'", 
+		"'.length'", "'.split'", "'!'", "'-'", "'*'", "'/'", "'%'", "'+'", "'=='", 
+		"'!='", "'&'", "'|'", "'&&'", "'||'", "'constant'", "'int'", "'bool'", 
+		"'string'", "'pubkey'", "'sig'", "'datasig'",
 	];
 	private static readonly _SYMBOLIC_NAMES: Array<string | undefined> = [
 		undefined, undefined, undefined, undefined, undefined, undefined, undefined, 
@@ -131,9 +134,10 @@ export class CashScriptLexer extends Lexer {
 		undefined, undefined, undefined, undefined, undefined, undefined, undefined, 
 		undefined, undefined, undefined, undefined, undefined, undefined, undefined, 
 		undefined, undefined, undefined, undefined, undefined, undefined, undefined, 
-		undefined, "VersionLiteral", "BooleanLiteral", "NumberUnit", "NumberLiteral", 
-		"Bytes", "Bound", "StringLiteral", "DateLiteral", "HexLiteral", "TxVar", 
-		"NullaryOp", "Identifier", "WHITESPACE", "COMMENT", "LINE_COMMENT",
+		undefined, undefined, undefined, undefined, "VersionLiteral", "BooleanLiteral", 
+		"NumberUnit", "NumberLiteral", "Bytes", "Bound", "StringLiteral", "DateLiteral", 
+		"HexLiteral", "TxVar", "NullaryOp", "Identifier", "WHITESPACE", "COMMENT", 
+		"LINE_COMMENT",
 	];
 	public static readonly VOCABULARY: Vocabulary = new VocabularyImpl(CashScriptLexer._LITERAL_NAMES, CashScriptLexer._SYMBOLIC_NAMES, []);
 
@@ -167,7 +171,7 @@ export class CashScriptLexer extends Lexer {
 
 	private static readonly _serializedATNSegments: number = 2;
 	private static readonly _serializedATNSegment0: string =
-		"\x03\uC91D\uCABA\u058D\uAFBA\u4F53\u0607\uEA8B\uC241\x02I\u0328\b\x01" +
+		"\x03\uC91D\uCABA\u058D\uAFBA\u4F53\u0607\uEA8B\uC241\x02L\u0340\b\x01" +
 		"\x04\x02\t\x02\x04\x03\t\x03\x04\x04\t\x04\x04\x05\t\x05\x04\x06\t\x06" +
 		"\x04\x07\t\x07\x04\b\t\b\x04\t\t\t\x04\n\t\n\x04\v\t\v\x04\f\t\f\x04\r" +
 		"\t\r\x04\x0E\t\x0E\x04\x0F\t\x0F\x04\x10\t\x10\x04\x11\t\x11\x04\x12\t" +
@@ -178,370 +182,379 @@ export class CashScriptLexer extends Lexer {
 		"+\t+\x04,\t,\x04-\t-\x04.\t.\x04/\t/\x040\t0\x041\t1\x042\t2\x043\t3\x04" +
 		"4\t4\x045\t5\x046\t6\x047\t7\x048\t8\x049\t9\x04:\t:\x04;\t;\x04<\t<\x04" +
 		"=\t=\x04>\t>\x04?\t?\x04@\t@\x04A\tA\x04B\tB\x04C\tC\x04D\tD\x04E\tE\x04" +
-		"F\tF\x04G\tG\x04H\tH\x03\x02\x03\x02\x03\x02\x03\x02\x03\x02\x03\x02\x03" +
-		"\x02\x03\x03\x03\x03\x03\x04\x03\x04\x03\x04\x03\x04\x03\x04\x03\x04\x03" +
-		"\x04\x03\x04\x03\x04\x03\x04\x03\x04\x03\x05\x03\x05\x03\x06\x03\x06\x03" +
-		"\x07\x03\x07\x03\x07\x03\b\x03\b\x03\t\x03\t\x03\n\x03\n\x03\n\x03\v\x03" +
-		"\v\x03\f\x03\f\x03\f\x03\f\x03\f\x03\f\x03\f\x03\f\x03\f\x03\r\x03\r\x03" +
-		"\x0E\x03\x0E\x03\x0F\x03\x0F\x03\x0F\x03\x0F\x03\x0F\x03\x0F\x03\x0F\x03" +
-		"\x0F\x03\x0F\x03\x10\x03\x10\x03\x11\x03\x11\x03\x12\x03\x12\x03\x13\x03" +
-		"\x13\x03\x13\x03\x13\x03\x13\x03\x13\x03\x13\x03\x13\x03\x14\x03\x14\x03" +
-		"\x14\x03\x15\x03\x15\x03\x15\x03\x15\x03\x15\x03\x16\x03\x16\x03\x16\x03" +
-		"\x16\x03\x17\x03\x17\x03\x18\x03\x18\x03\x19\x03\x19\x03\x19\x03\x19\x03" +
-		"\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x1A\x03\x1A\x03" +
-		"\x1A\x03\x1A\x03\x1A\x03\x1A\x03\x1A\x03\x1B\x03\x1B\x03\x1B\x03\x1B\x03" +
-		"\x1B\x03\x1B\x03\x1B\x03\x1B\x03\x1B\x03\x1B\x03\x1B\x03\x1B\x03\x1B\x03" +
-		"\x1B\x03\x1B\x03\x1B\x03\x1B\x03\x1C\x03\x1C\x03\x1C\x03\x1C\x03\x1C\x03" +
+		"F\tF\x04G\tG\x04H\tH\x04I\tI\x04J\tJ\x04K\tK\x03\x02\x03\x02\x03\x02\x03" +
+		"\x02\x03\x02\x03\x02\x03\x02\x03\x03\x03\x03\x03\x04\x03\x04\x03\x04\x03" +
+		"\x04\x03\x04\x03\x04\x03\x04\x03\x04\x03\x04\x03\x04\x03\x04\x03\x05\x03" +
+		"\x05\x03\x06\x03\x06\x03\x07\x03\x07\x03\x07\x03\b\x03\b\x03\t\x03\t\x03" +
+		"\n\x03\n\x03\n\x03\v\x03\v\x03\f\x03\f\x03\f\x03\f\x03\f\x03\f\x03\f\x03" +
+		"\f\x03\f\x03\r\x03\r\x03\x0E\x03\x0E\x03\x0F\x03\x0F\x03\x0F\x03\x0F\x03" +
+		"\x0F\x03\x0F\x03\x0F\x03\x0F\x03\x0F\x03\x10\x03\x10\x03\x11\x03\x11\x03" +
+		"\x12\x03\x12\x03\x13\x03\x13\x03\x13\x03\x13\x03\x13\x03\x13\x03\x13\x03" +
+		"\x13\x03\x14\x03\x14\x03\x14\x03\x15\x03\x15\x03\x15\x03\x15\x03\x15\x03" +
+		"\x16\x03\x16\x03\x16\x03\x16\x03\x17\x03\x17\x03\x18\x03\x18\x03\x19\x03" +
+		"\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x1A\x03" +
+		"\x1A\x03\x1A\x03\x1A\x03\x1B\x03\x1B\x03\x1B\x03\x1B\x03\x1B\x03\x1C\x03" +
 		"\x1C\x03\x1C\x03\x1C\x03\x1C\x03\x1C\x03\x1C\x03\x1C\x03\x1C\x03\x1C\x03" +
-		"\x1C\x03\x1D\x03\x1D\x03\x1D\x03\x1D\x03\x1D\x03\x1D\x03\x1D\x03\x1D\x03" +
-		"\x1D\x03\x1D\x03\x1D\x03\x1D\x03\x1D\x03\x1D\x03\x1D\x03\x1E\x03\x1E\x03" +
+		"\x1C\x03\x1D\x03\x1D\x03\x1D\x03\x1D\x03\x1D\x03\x1D\x03\x1D\x03\x1E\x03" +
 		"\x1E\x03\x1E\x03\x1E\x03\x1E\x03\x1E\x03\x1E\x03\x1E\x03\x1E\x03\x1E\x03" +
-		"\x1E\x03\x1E\x03\x1F\x03\x1F\x03\x1F\x03\x1F\x03\x1F\x03\x1F\x03\x1F\x03" +
-		"\x1F\x03\x1F\x03\x1F\x03 \x03 \x03 \x03 \x03 \x03 \x03 \x03 \x03 \x03" +
-		" \x03 \x03 \x03 \x03 \x03 \x03 \x03 \x03 \x03 \x03 \x03 \x03 \x03 \x03" +
-		" \x03 \x03!\x03!\x03!\x03!\x03!\x03!\x03!\x03!\x03!\x03!\x03!\x03!\x03" +
-		"!\x03!\x03!\x03\"\x03\"\x03\"\x03\"\x03\"\x03\"\x03\"\x03\"\x03\"\x03" +
-		"\"\x03\"\x03\"\x03\"\x03\"\x03\"\x03\"\x03\"\x03\"\x03\"\x03#\x03#\x03" +
-		"#\x03#\x03#\x03#\x03#\x03#\x03#\x03#\x03#\x03#\x03#\x03#\x03#\x03#\x03" +
-		"$\x03$\x03$\x03$\x03$\x03$\x03$\x03$\x03$\x03$\x03$\x03%\x03%\x03%\x03" +
-		"%\x03%\x03%\x03%\x03%\x03&\x03&\x03&\x03&\x03&\x03&\x03&\x03\'\x03\'\x03" +
-		"(\x03(\x03)\x03)\x03*\x03*\x03+\x03+\x03,\x03,\x03-\x03-\x03-\x03.\x03" +
-		".\x03.\x03/\x03/\x030\x030\x031\x031\x031\x032\x032\x032\x033\x033\x03" +
-		"3\x033\x033\x033\x033\x033\x033\x034\x034\x034\x034\x035\x035\x035\x03" +
-		"5\x035\x036\x036\x036\x036\x036\x036\x036\x037\x037\x037\x037\x037\x03" +
-		"7\x037\x038\x038\x038\x038\x039\x039\x039\x039\x039\x039\x039\x039\x03" +
-		":\x06:\u01F0\n:\r:\x0E:\u01F1\x03:\x03:\x06:\u01F6\n:\r:\x0E:\u01F7\x03" +
-		":\x03:\x06:\u01FC\n:\r:\x0E:\u01FD\x03;\x03;\x03;\x03;\x03;\x03;\x03;" +
-		"\x03;\x03;\x05;\u0209\n;\x03<\x03<\x03<\x03<\x03<\x03<\x03<\x03<\x03<" +
-		"\x03<\x03<\x03<\x03<\x03<\x03<\x03<\x03<\x03<\x03<\x03<\x03<\x03<\x03" +
-		"<\x03<\x03<\x03<\x03<\x03<\x03<\x03<\x03<\x03<\x03<\x03<\x03<\x03<\x03" +
-		"<\x03<\x03<\x03<\x03<\x03<\x03<\x03<\x03<\x03<\x03<\x03<\x03<\x03<\x03" +
-		"<\x03<\x03<\x03<\x03<\x03<\x03<\x05<\u0244\n<\x03=\x05=\u0247\n=\x03=" +
-		"\x06=\u024A\n=\r=\x0E=\u024B\x03=\x03=\x06=\u0250\n=\r=\x0E=\u0251\x05" +
-		"=\u0254\n=\x03>\x03>\x03>\x03>\x03>\x03>\x03>\x05>\u025D\n>\x03>\x03>" +
-		"\x03>\x03>\x05>\u0263\n>\x03?\x03?\x07?\u0267\n?\f?\x0E?\u026A\v?\x03" +
-		"@\x03@\x03@\x03@\x07@\u0270\n@\f@\x0E@\u0273\v@\x03@\x03@\x03@\x03@\x03" +
-		"@\x07@\u027A\n@\f@\x0E@\u027D\v@\x03@\x05@\u0280\n@\x03A\x03A\x03A\x03" +
-		"A\x03A\x03A\x03A\x03A\x03A\x03B\x03B\x03B\x07B\u028E\nB\fB\x0EB\u0291" +
-		"\vB\x03C\x03C\x03C\x03C\x03C\x03C\x03C\x03C\x03C\x03C\x03C\x03C\x03C\x05" +
-		"C\u02A0\nC\x03D\x03D\x03D\x03D\x03D\x03D\x03D\x03D\x03D\x03D\x03D\x03" +
-		"D\x03D\x03D\x03D\x03D\x03D\x03D\x03D\x03D\x03D\x03D\x03D\x03D\x03D\x03" +
-		"D\x03D\x03D\x03D\x03D\x03D\x03D\x03D\x03D\x03D\x03D\x03D\x03D\x03D\x03" +
-		"D\x03D\x03D\x03D\x03D\x03D\x03D\x03D\x03D\x03D\x03D\x03D\x03D\x03D\x03" +
-		"D\x03D\x03D\x03D\x03D\x03D\x03D\x03D\x03D\x03D\x03D\x03D\x03D\x03D\x03" +
-		"D\x03D\x03D\x03D\x03D\x03D\x03D\x03D\x03D\x03D\x03D\x03D\x03D\x03D\x03" +
-		"D\x03D\x03D\x03D\x03D\x03D\x03D\x03D\x03D\x03D\x03D\x03D\x03D\x05D\u0300" +
-		"\nD\x03E\x03E\x07E\u0304\nE\fE\x0EE\u0307\vE\x03F\x06F\u030A\nF\rF\x0E" +
-		"F\u030B\x03F\x03F\x03G\x03G\x03G\x03G\x07G\u0314\nG\fG\x0EG\u0317\vG\x03" +
-		"G\x03G\x03G\x03G\x03G\x03H\x03H\x03H\x03H\x07H\u0322\nH\fH\x0EH\u0325" +
-		"\vH\x03H\x03H\x05\u0271\u027B\u0315\x02\x02I\x03\x02\x03\x05\x02\x04\x07" +
-		"\x02\x05\t\x02\x06\v\x02\x07\r\x02\b\x0F\x02\t\x11\x02\n\x13\x02\v\x15" +
-		"\x02\f\x17\x02\r\x19\x02\x0E\x1B\x02\x0F\x1D\x02\x10\x1F\x02\x11!\x02" +
-		"\x12#\x02\x13%\x02\x14\'\x02\x15)\x02\x16+\x02\x17-\x02\x18/\x02\x191" +
-		"\x02\x1A3\x02\x1B5\x02\x1C7\x02\x1D9\x02\x1E;\x02\x1F=\x02 ?\x02!A\x02" +
-		"\"C\x02#E\x02$G\x02%I\x02&K\x02\'M\x02(O\x02)Q\x02*S\x02+U\x02,W\x02-" +
-		"Y\x02.[\x02/]\x020_\x021a\x022c\x023e\x024g\x025i\x026k\x027m\x028o\x02" +
-		"9q\x02:s\x02;u\x02<w\x02=y\x02>{\x02?}\x02@\x7F\x02A\x81\x02B\x83\x02" +
-		"C\x85\x02D\x87\x02E\x89\x02F\x8B\x02G\x8D\x02H\x8F\x02I\x03\x02\x0E\x03" +
-		"\x022;\x03\x02//\x04\x02GGgg\x03\x023;\x05\x02\f\f\x0F\x0F$$\x05\x02\f" +
-		"\f\x0F\x0F))\x04\x02ZZzz\x05\x022;CHch\x04\x02C\\c|\x06\x022;C\\aac|\x05" +
-		"\x02\v\f\x0E\x0F\"\"\x04\x02\f\f\x0F\x0F\x02\u034B\x02\x03\x03\x02\x02" +
-		"\x02\x02\x05\x03\x02\x02\x02\x02\x07\x03\x02\x02\x02\x02\t\x03\x02\x02" +
-		"\x02\x02\v\x03\x02\x02\x02\x02\r\x03\x02\x02\x02\x02\x0F\x03\x02\x02\x02" +
-		"\x02\x11\x03\x02\x02\x02\x02\x13\x03\x02\x02\x02\x02\x15\x03\x02\x02\x02" +
-		"\x02\x17\x03\x02\x02\x02\x02\x19\x03\x02\x02\x02\x02\x1B\x03\x02\x02\x02" +
-		"\x02\x1D\x03\x02\x02\x02\x02\x1F\x03\x02\x02\x02\x02!\x03\x02\x02\x02" +
-		"\x02#\x03\x02\x02\x02\x02%\x03\x02\x02\x02\x02\'\x03\x02\x02\x02\x02)" +
-		"\x03\x02\x02\x02\x02+\x03\x02\x02\x02\x02-\x03\x02\x02\x02\x02/\x03\x02" +
-		"\x02\x02\x021\x03\x02\x02\x02\x023\x03\x02\x02\x02\x025\x03\x02\x02\x02" +
-		"\x027\x03\x02\x02\x02\x029\x03\x02\x02\x02\x02;\x03\x02\x02\x02\x02=\x03" +
-		"\x02\x02\x02\x02?\x03\x02\x02\x02\x02A\x03\x02\x02\x02\x02C\x03\x02\x02" +
-		"\x02\x02E\x03\x02\x02\x02\x02G\x03\x02\x02\x02\x02I\x03\x02\x02\x02\x02" +
-		"K\x03\x02\x02\x02\x02M\x03\x02\x02\x02\x02O\x03\x02\x02\x02\x02Q\x03\x02" +
-		"\x02\x02\x02S\x03\x02\x02\x02\x02U\x03\x02\x02\x02\x02W\x03\x02\x02\x02" +
-		"\x02Y\x03\x02\x02\x02\x02[\x03\x02\x02\x02\x02]\x03\x02\x02\x02\x02_\x03" +
-		"\x02\x02\x02\x02a\x03\x02\x02\x02\x02c\x03\x02\x02\x02\x02e\x03\x02\x02" +
-		"\x02\x02g\x03\x02\x02\x02\x02i\x03\x02\x02\x02\x02k\x03\x02\x02\x02\x02" +
-		"m\x03\x02\x02\x02\x02o\x03\x02\x02\x02\x02q\x03\x02\x02\x02\x02s\x03\x02" +
-		"\x02\x02\x02u\x03\x02\x02\x02\x02w\x03\x02\x02\x02\x02y\x03\x02\x02\x02" +
-		"\x02{\x03\x02\x02\x02\x02}\x03\x02\x02\x02\x02\x7F\x03\x02\x02\x02\x02" +
-		"\x81\x03\x02\x02\x02\x02\x83\x03\x02\x02\x02\x02\x85\x03\x02\x02\x02\x02" +
-		"\x87\x03\x02\x02\x02\x02\x89\x03\x02\x02\x02\x02\x8B\x03\x02\x02\x02\x02" +
-		"\x8D\x03\x02\x02\x02\x02\x8F\x03\x02\x02\x02\x03\x91\x03\x02\x02\x02\x05" +
-		"\x98\x03\x02\x02\x02\x07\x9A\x03\x02\x02\x02\t\xA5\x03\x02\x02\x02\v\xA7" +
-		"\x03\x02\x02\x02\r\xA9\x03\x02\x02\x02\x0F\xAC\x03\x02\x02\x02\x11\xAE" +
-		"\x03\x02\x02\x02\x13\xB0\x03\x02\x02\x02\x15\xB3\x03\x02\x02\x02\x17\xB5" +
-		"\x03\x02\x02\x02\x19\xBE\x03\x02\x02\x02\x1B\xC0\x03\x02\x02\x02\x1D\xC2" +
-		"\x03\x02\x02\x02\x1F\xCB\x03\x02\x02\x02!\xCD\x03\x02\x02\x02#\xCF\x03" +
-		"\x02\x02\x02%\xD1\x03\x02\x02\x02\'\xD9\x03\x02\x02\x02)\xDC\x03\x02\x02" +
-		"\x02+\xE1\x03\x02\x02\x02-\xE5\x03\x02\x02\x02/\xE7\x03\x02\x02\x021\xE9" +
-		"\x03\x02\x02\x023\xF4\x03\x02\x02\x025\xFB\x03\x02\x02\x027\u010C\x03" +
-		"\x02\x02\x029\u011B\x03\x02\x02\x02;\u012A\x03\x02\x02\x02=\u0137\x03" +
-		"\x02\x02\x02?\u0141\x03\x02\x02\x02A\u015A\x03\x02\x02\x02C\u0169\x03" +
-		"\x02\x02\x02E\u017C\x03\x02\x02\x02G\u018C\x03\x02\x02\x02I\u0197\x03" +
-		"\x02\x02\x02K\u019F\x03\x02\x02\x02M\u01A6\x03\x02\x02\x02O\u01A8\x03" +
-		"\x02\x02\x02Q\u01AA\x03\x02\x02\x02S\u01AC\x03\x02\x02\x02U\u01AE\x03" +
-		"\x02\x02\x02W\u01B0\x03\x02\x02\x02Y\u01B2\x03\x02\x02\x02[\u01B5\x03" +
-		"\x02\x02\x02]\u01B8\x03\x02\x02\x02_\u01BA\x03\x02\x02\x02a\u01BC\x03" +
-		"\x02\x02\x02c\u01BF\x03\x02\x02\x02e\u01C2\x03\x02\x02\x02g\u01CB\x03" +
-		"\x02\x02\x02i\u01CF\x03\x02\x02\x02k\u01D4\x03\x02\x02\x02m\u01DB\x03" +
-		"\x02\x02\x02o\u01E2\x03\x02\x02\x02q\u01E6\x03\x02\x02\x02s\u01EF\x03" +
-		"\x02\x02\x02u\u0208\x03\x02\x02\x02w\u0243\x03\x02\x02\x02y\u0246\x03" +
-		"\x02\x02\x02{\u0262\x03\x02\x02\x02}\u0264\x03\x02\x02\x02\x7F\u027F\x03" +
-		"\x02\x02\x02\x81\u0281\x03\x02\x02\x02\x83\u028A\x03\x02\x02\x02\x85\u029F" +
-		"\x03\x02\x02\x02\x87\u02FF\x03\x02\x02\x02\x89\u0301\x03\x02\x02\x02\x8B" +
-		"\u0309\x03\x02\x02\x02\x8D\u030F\x03\x02\x02\x02\x8F\u031D\x03\x02\x02" +
-		"\x02\x91\x92\x07r\x02\x02\x92\x93\x07t\x02\x02\x93\x94\x07c\x02\x02\x94" +
-		"\x95\x07i\x02\x02\x95\x96\x07o\x02\x02\x96\x97\x07c\x02\x02\x97\x04\x03" +
-		"\x02\x02\x02\x98\x99\x07=\x02\x02\x99\x06\x03\x02\x02\x02\x9A\x9B\x07" +
-		"e\x02\x02\x9B\x9C\x07c\x02\x02\x9C\x9D\x07u\x02\x02\x9D\x9E\x07j\x02\x02" +
-		"\x9E\x9F\x07u\x02\x02\x9F\xA0\x07e\x02\x02\xA0\xA1\x07t\x02\x02\xA1\xA2" +
-		"\x07k\x02\x02\xA2\xA3\x07r\x02\x02\xA3\xA4\x07v\x02\x02\xA4\b\x03\x02" +
-		"\x02\x02\xA5\xA6\x07`\x02\x02\xA6\n\x03\x02\x02\x02\xA7\xA8\x07\x80\x02" +
-		"\x02\xA8\f\x03\x02\x02\x02\xA9\xAA\x07@\x02\x02\xAA\xAB\x07?\x02\x02\xAB" +
-		"\x0E\x03\x02\x02\x02\xAC\xAD\x07@\x02\x02\xAD\x10\x03\x02\x02\x02\xAE" +
-		"\xAF\x07>\x02\x02\xAF\x12\x03\x02\x02\x02\xB0\xB1\x07>\x02\x02\xB1\xB2" +
-		"\x07?\x02\x02\xB2\x14\x03\x02\x02\x02\xB3\xB4\x07?\x02\x02\xB4\x16\x03" +
-		"\x02\x02\x02\xB5\xB6\x07e\x02\x02\xB6\xB7\x07q\x02\x02\xB7\xB8\x07p\x02" +
-		"\x02\xB8\xB9\x07v\x02\x02\xB9\xBA\x07t\x02\x02\xBA\xBB\x07c\x02\x02\xBB" +
-		"\xBC\x07e\x02\x02\xBC\xBD\x07v\x02\x02\xBD\x18\x03\x02\x02\x02\xBE\xBF" +
-		"\x07}\x02\x02\xBF\x1A\x03\x02\x02\x02\xC0\xC1\x07\x7F\x02\x02\xC1\x1C" +
-		"\x03\x02\x02\x02\xC2\xC3\x07h\x02\x02\xC3\xC4\x07w\x02\x02\xC4\xC5\x07" +
-		"p\x02\x02\xC5\xC6\x07e\x02\x02\xC6\xC7\x07v\x02\x02\xC7\xC8\x07k\x02\x02" +
-		"\xC8\xC9\x07q\x02\x02\xC9\xCA\x07p\x02\x02\xCA\x1E\x03\x02\x02\x02\xCB" +
-		"\xCC\x07*\x02\x02\xCC \x03\x02\x02\x02\xCD\xCE\x07.\x02\x02\xCE\"\x03" +
-		"\x02\x02\x02\xCF\xD0\x07+\x02\x02\xD0$\x03\x02\x02\x02\xD1\xD2\x07t\x02" +
-		"\x02\xD2\xD3\x07g\x02\x02\xD3\xD4\x07s\x02\x02\xD4\xD5\x07w\x02\x02\xD5" +
-		"\xD6\x07k\x02\x02\xD6\xD7\x07t\x02\x02\xD7\xD8\x07g\x02\x02\xD8&\x03\x02" +
-		"\x02\x02\xD9\xDA\x07k\x02\x02\xDA\xDB\x07h\x02\x02\xDB(\x03\x02\x02\x02" +
-		"\xDC\xDD\x07g\x02\x02\xDD\xDE\x07n\x02\x02\xDE\xDF\x07u\x02\x02\xDF\xE0" +
-		"\x07g\x02\x02\xE0*\x03\x02\x02\x02\xE1\xE2\x07p\x02\x02\xE2\xE3\x07g\x02" +
-		"\x02\xE3\xE4\x07y\x02\x02\xE4,\x03\x02\x02\x02\xE5\xE6\x07]\x02\x02\xE6" +
-		".\x03\x02\x02\x02\xE7\xE8\x07_\x02\x02\xE80\x03\x02\x02\x02\xE9\xEA\x07" +
-		"v\x02\x02\xEA\xEB\x07z\x02\x02\xEB\xEC\x070\x02\x02\xEC\xED\x07q\x02\x02" +
-		"\xED\xEE\x07w\x02\x02\xEE\xEF\x07v\x02\x02\xEF\xF0\x07r\x02\x02\xF0\xF1" +
-		"\x07w\x02\x02\xF1\xF2\x07v\x02\x02\xF2\xF3\x07u\x02\x02\xF32\x03\x02\x02" +
-		"\x02\xF4\xF5\x070\x02\x02\xF5\xF6\x07x\x02\x02\xF6\xF7\x07c\x02\x02\xF7" +
-		"\xF8\x07n\x02\x02\xF8\xF9\x07w\x02\x02\xF9\xFA\x07g\x02\x02\xFA4\x03\x02" +
-		"\x02\x02\xFB\xFC\x070\x02\x02\xFC\xFD\x07n\x02\x02\xFD\xFE\x07q\x02\x02" +
-		"\xFE\xFF\x07e\x02\x02\xFF\u0100\x07m\x02\x02\u0100\u0101\x07k\x02\x02" +
-		"\u0101\u0102\x07p\x02\x02\u0102\u0103\x07i\x02\x02\u0103\u0104\x07D\x02" +
-		"\x02\u0104\u0105\x07{\x02\x02\u0105\u0106\x07v\x02\x02\u0106\u0107\x07" +
-		"g\x02\x02\u0107\u0108\x07e\x02\x02\u0108\u0109\x07q\x02\x02\u0109\u010A" +
-		"\x07f\x02\x02\u010A\u010B\x07g\x02\x02\u010B6\x03\x02\x02\x02\u010C\u010D" +
-		"\x070\x02\x02\u010D\u010E\x07v\x02\x02\u010E\u010F\x07q\x02\x02\u010F" +
-		"\u0110\x07m\x02\x02\u0110\u0111\x07g\x02\x02\u0111\u0112\x07p\x02\x02" +
-		"\u0112\u0113\x07E\x02\x02\u0113\u0114\x07c\x02\x02\u0114\u0115\x07v\x02" +
-		"\x02\u0115\u0116\x07g\x02\x02\u0116\u0117\x07i\x02\x02\u0117\u0118\x07" +
-		"q\x02\x02\u0118\u0119\x07t\x02\x02\u0119\u011A\x07{\x02\x02\u011A8\x03" +
-		"\x02\x02\x02\u011B\u011C\x070\x02\x02\u011C\u011D\x07p\x02\x02\u011D\u011E" +
-		"\x07h\x02\x02\u011E\u011F\x07v\x02\x02\u011F\u0120\x07E\x02\x02\u0120" +
-		"\u0121\x07q\x02\x02\u0121\u0122\x07o\x02\x02\u0122\u0123\x07o\x02\x02" +
-		"\u0123\u0124\x07k\x02\x02\u0124\u0125\x07v\x02\x02\u0125\u0126\x07o\x02" +
-		"\x02\u0126\u0127\x07g\x02\x02\u0127\u0128\x07p\x02\x02\u0128\u0129\x07" +
-		"v\x02\x02\u0129:\x03\x02\x02\x02\u012A\u012B\x070\x02\x02\u012B\u012C" +
-		"\x07v\x02\x02\u012C\u012D\x07q\x02\x02\u012D\u012E\x07m\x02\x02\u012E" +
-		"\u012F\x07g\x02\x02\u012F\u0130\x07p\x02\x02\u0130\u0131\x07C\x02\x02" +
-		"\u0131\u0132\x07o\x02\x02\u0132\u0133\x07q\x02\x02\u0133\u0134\x07w\x02" +
-		"\x02\u0134\u0135\x07p\x02\x02\u0135\u0136\x07v\x02\x02\u0136<\x03\x02" +
-		"\x02\x02\u0137\u0138\x07v\x02\x02\u0138\u0139\x07z\x02\x02\u0139\u013A" +
-		"\x070\x02\x02\u013A\u013B\x07k\x02\x02\u013B\u013C\x07p\x02\x02\u013C" +
-		"\u013D\x07r\x02\x02\u013D\u013E\x07w\x02\x02\u013E\u013F\x07v\x02\x02" +
-		"\u013F\u0140\x07u\x02\x02\u0140>\x03\x02\x02\x02\u0141\u0142\x070\x02" +
-		"\x02\u0142\u0143\x07q\x02\x02\u0143\u0144\x07w\x02\x02\u0144\u0145\x07" +
-		"v\x02\x02\u0145\u0146\x07r\x02\x02\u0146\u0147\x07q\x02\x02\u0147\u0148" +
-		"\x07k\x02\x02\u0148\u0149\x07p\x02\x02\u0149\u014A\x07v\x02\x02\u014A" +
-		"\u014B\x07V\x02\x02\u014B\u014C\x07t\x02\x02\u014C\u014D\x07c\x02\x02" +
-		"\u014D\u014E\x07p\x02\x02\u014E\u014F\x07u\x02\x02\u014F\u0150\x07c\x02" +
-		"\x02\u0150\u0151\x07e\x02\x02\u0151\u0152\x07v\x02\x02\u0152\u0153\x07" +
-		"k\x02\x02\u0153\u0154\x07q\x02\x02\u0154\u0155\x07p\x02\x02\u0155\u0156" +
-		"\x07J\x02\x02\u0156\u0157\x07c\x02\x02\u0157\u0158\x07u\x02\x02\u0158" +
-		"\u0159\x07j\x02\x02\u0159@\x03\x02\x02\x02\u015A\u015B\x070\x02\x02\u015B" +
-		"\u015C\x07q\x02\x02\u015C\u015D\x07w\x02\x02\u015D\u015E\x07v\x02\x02" +
-		"\u015E\u015F\x07r\x02\x02\u015F\u0160\x07q\x02\x02\u0160\u0161\x07k\x02" +
-		"\x02\u0161\u0162\x07p\x02\x02\u0162\u0163\x07v\x02\x02\u0163\u0164\x07" +
-		"K\x02\x02\u0164\u0165\x07p\x02\x02\u0165\u0166\x07f\x02\x02\u0166\u0167" +
-		"\x07g\x02\x02\u0167\u0168\x07z\x02\x02\u0168B\x03\x02\x02\x02\u0169\u016A" +
-		"\x070\x02\x02\u016A\u016B\x07w\x02\x02\u016B\u016C\x07p\x02\x02\u016C" +
-		"\u016D\x07n\x02\x02\u016D\u016E\x07q\x02\x02\u016E\u016F\x07e\x02\x02" +
-		"\u016F\u0170\x07m\x02\x02\u0170\u0171\x07k\x02\x02\u0171\u0172\x07p\x02" +
-		"\x02\u0172\u0173\x07i\x02\x02\u0173\u0174\x07D\x02\x02\u0174\u0175\x07" +
-		"{\x02\x02\u0175\u0176\x07v\x02\x02\u0176\u0177\x07g\x02\x02\u0177\u0178" +
-		"\x07e\x02\x02\u0178\u0179\x07q\x02\x02\u0179\u017A\x07f\x02\x02\u017A" +
-		"\u017B\x07g\x02\x02\u017BD\x03\x02\x02\x02\u017C\u017D\x070\x02\x02\u017D" +
-		"\u017E\x07u\x02\x02\u017E\u017F\x07g\x02\x02\u017F\u0180\x07s\x02\x02" +
-		"\u0180\u0181\x07w\x02\x02\u0181\u0182\x07g\x02\x02\u0182\u0183\x07p\x02" +
-		"\x02\u0183\u0184\x07e\x02\x02\u0184\u0185\x07g\x02\x02\u0185\u0186\x07" +
-		"P\x02\x02\u0186\u0187\x07w\x02\x02\u0187\u0188\x07o\x02\x02\u0188\u0189" +
-		"\x07d\x02\x02\u0189\u018A\x07g\x02\x02\u018A\u018B\x07t\x02\x02\u018B" +
-		"F\x03\x02\x02\x02\u018C\u018D\x070\x02\x02\u018D\u018E\x07t\x02\x02\u018E" +
-		"\u018F\x07g\x02\x02\u018F\u0190\x07x\x02\x02\u0190\u0191\x07g\x02\x02" +
-		"\u0191\u0192\x07t\x02\x02\u0192\u0193\x07u\x02\x02\u0193\u0194\x07g\x02" +
-		"\x02\u0194\u0195\x07*\x02\x02\u0195\u0196\x07+\x02\x02\u0196H\x03\x02" +
-		"\x02\x02\u0197\u0198\x070\x02\x02\u0198\u0199\x07n\x02\x02\u0199\u019A" +
-		"\x07g\x02\x02\u019A\u019B\x07p\x02\x02\u019B\u019C\x07i\x02\x02\u019C" +
-		"\u019D\x07v\x02\x02\u019D\u019E\x07j\x02\x02\u019EJ\x03\x02\x02\x02\u019F" +
-		"\u01A0\x070\x02\x02\u01A0\u01A1\x07u\x02\x02\u01A1\u01A2\x07r\x02\x02" +
-		"\u01A2\u01A3\x07n\x02\x02\u01A3\u01A4\x07k\x02\x02\u01A4\u01A5\x07v\x02" +
-		"\x02\u01A5L\x03\x02\x02\x02\u01A6\u01A7\x07#\x02\x02\u01A7N\x03\x02\x02" +
-		"\x02\u01A8\u01A9\x07/\x02\x02\u01A9P\x03\x02\x02\x02\u01AA\u01AB\x07," +
-		"\x02\x02\u01ABR\x03\x02\x02\x02\u01AC\u01AD\x071\x02\x02\u01ADT\x03\x02" +
-		"\x02\x02\u01AE\u01AF\x07\'\x02\x02\u01AFV\x03\x02\x02\x02\u01B0\u01B1" +
-		"\x07-\x02\x02\u01B1X\x03\x02\x02\x02\u01B2\u01B3\x07?\x02\x02\u01B3\u01B4" +
-		"\x07?\x02\x02\u01B4Z\x03\x02\x02\x02\u01B5\u01B6\x07#\x02\x02\u01B6\u01B7" +
-		"\x07?\x02\x02\u01B7\\\x03\x02\x02\x02\u01B8\u01B9\x07(\x02\x02\u01B9^" +
-		"\x03\x02\x02\x02\u01BA\u01BB\x07~\x02\x02\u01BB`\x03\x02\x02\x02\u01BC" +
-		"\u01BD\x07(\x02\x02\u01BD\u01BE\x07(\x02\x02\u01BEb\x03\x02\x02\x02\u01BF" +
-		"\u01C0\x07~\x02\x02\u01C0\u01C1\x07~\x02\x02\u01C1d\x03\x02\x02\x02\u01C2" +
-		"\u01C3\x07e\x02\x02\u01C3\u01C4\x07q\x02\x02\u01C4\u01C5\x07p\x02\x02" +
-		"\u01C5\u01C6\x07u\x02\x02\u01C6\u01C7\x07v\x02\x02\u01C7\u01C8\x07c\x02" +
-		"\x02\u01C8\u01C9\x07p\x02\x02\u01C9\u01CA\x07v\x02\x02\u01CAf\x03\x02" +
-		"\x02\x02\u01CB\u01CC\x07k\x02\x02\u01CC\u01CD\x07p\x02\x02\u01CD\u01CE" +
-		"\x07v\x02\x02\u01CEh\x03\x02\x02\x02\u01CF\u01D0\x07d\x02\x02\u01D0\u01D1" +
-		"\x07q\x02\x02\u01D1\u01D2\x07q\x02\x02\u01D2\u01D3\x07n\x02\x02\u01D3" +
-		"j\x03\x02\x02\x02\u01D4\u01D5\x07u\x02\x02\u01D5\u01D6\x07v\x02\x02\u01D6" +
-		"\u01D7\x07t\x02\x02\u01D7\u01D8\x07k\x02\x02\u01D8\u01D9\x07p\x02\x02" +
-		"\u01D9\u01DA\x07i\x02\x02\u01DAl\x03\x02\x02\x02\u01DB\u01DC\x07r\x02" +
-		"\x02\u01DC\u01DD\x07w\x02\x02\u01DD\u01DE\x07d\x02\x02\u01DE\u01DF\x07" +
-		"m\x02\x02\u01DF\u01E0\x07g\x02\x02\u01E0\u01E1\x07{\x02\x02\u01E1n\x03" +
-		"\x02\x02\x02\u01E2\u01E3\x07u\x02\x02\u01E3\u01E4\x07k\x02\x02\u01E4\u01E5" +
-		"\x07i\x02\x02\u01E5p\x03\x02\x02\x02\u01E6\u01E7\x07f\x02\x02\u01E7\u01E8" +
-		"\x07c\x02\x02\u01E8\u01E9\x07v\x02\x02\u01E9\u01EA\x07c\x02\x02\u01EA" +
-		"\u01EB\x07u\x02\x02\u01EB\u01EC\x07k\x02\x02\u01EC\u01ED\x07i\x02\x02" +
-		"\u01EDr\x03\x02\x02\x02\u01EE\u01F0\t\x02\x02\x02\u01EF\u01EE\x03\x02" +
-		"\x02\x02\u01F0\u01F1\x03\x02\x02\x02\u01F1\u01EF\x03\x02\x02\x02\u01F1" +
-		"\u01F2\x03\x02\x02\x02\u01F2\u01F3\x03\x02\x02\x02\u01F3\u01F5\x070\x02" +
-		"\x02\u01F4\u01F6\t\x02\x02\x02\u01F5\u01F4\x03\x02\x02\x02\u01F6\u01F7" +
-		"\x03\x02\x02\x02\u01F7\u01F5\x03\x02\x02\x02\u01F7\u01F8\x03\x02\x02\x02" +
-		"\u01F8\u01F9\x03\x02\x02\x02\u01F9\u01FB\x070\x02\x02\u01FA\u01FC\t\x02" +
-		"\x02\x02\u01FB\u01FA";
+		"\x1E\x03\x1E\x03\x1E\x03\x1E\x03\x1E\x03\x1E\x03\x1E\x03\x1F\x03\x1F\x03" +
+		"\x1F\x03\x1F\x03\x1F\x03\x1F\x03\x1F\x03\x1F\x03\x1F\x03\x1F\x03\x1F\x03" +
+		"\x1F\x03\x1F\x03\x1F\x03\x1F\x03 \x03 \x03 \x03 \x03 \x03 \x03 \x03 \x03" +
+		" \x03 \x03 \x03 \x03 \x03 \x03 \x03!\x03!\x03!\x03!\x03!\x03!\x03!\x03" +
+		"!\x03!\x03!\x03!\x03!\x03!\x03\"\x03\"\x03\"\x03\"\x03\"\x03\"\x03\"\x03" +
+		"\"\x03\"\x03\"\x03#\x03#\x03#\x03#\x03#\x03#\x03#\x03#\x03#\x03#\x03#" +
+		"\x03#\x03#\x03#\x03#\x03#\x03#\x03#\x03#\x03#\x03#\x03#\x03#\x03#\x03" +
+		"#\x03$\x03$\x03$\x03$\x03$\x03$\x03$\x03$\x03$\x03$\x03$\x03$\x03$\x03" +
+		"$\x03$\x03%\x03%\x03%\x03%\x03%\x03%\x03%\x03%\x03%\x03%\x03%\x03%\x03" +
+		"%\x03%\x03%\x03%\x03%\x03%\x03%\x03&\x03&\x03&\x03&\x03&\x03&\x03&\x03" +
+		"&\x03&\x03&\x03&\x03&\x03&\x03&\x03&\x03&\x03\'\x03\'\x03\'\x03\'\x03" +
+		"\'\x03\'\x03\'\x03\'\x03\'\x03\'\x03\'\x03(\x03(\x03(\x03(\x03(\x03(\x03" +
+		"(\x03(\x03)\x03)\x03)\x03)\x03)\x03)\x03)\x03*\x03*\x03+\x03+\x03,\x03" +
+		",\x03-\x03-\x03.\x03.\x03/\x03/\x030\x030\x030\x031\x031\x031\x032\x03" +
+		"2\x033\x033\x034\x034\x034\x035\x035\x035\x036\x036\x036\x036\x036\x03" +
+		"6\x036\x036\x036\x037\x037\x037\x037\x038\x038\x038\x038\x038\x039\x03" +
+		"9\x039\x039\x039\x039\x039\x03:\x03:\x03:\x03:\x03:\x03:\x03:\x03;\x03" +
+		";\x03;\x03;\x03<\x03<\x03<\x03<\x03<\x03<\x03<\x03<\x03=\x06=\u0208\n" +
+		"=\r=\x0E=\u0209\x03=\x03=\x06=\u020E\n=\r=\x0E=\u020F\x03=\x03=\x06=\u0214" +
+		"\n=\r=\x0E=\u0215\x03>\x03>\x03>\x03>\x03>\x03>\x03>\x03>\x03>\x05>\u0221" +
+		"\n>\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03" +
+		"?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03" +
+		"?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03" +
+		"?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03" +
+		"?\x03?\x05?\u025C\n?\x03@\x05@\u025F\n@\x03@\x06@\u0262\n@\r@\x0E@\u0263" +
+		"\x03@\x03@\x06@\u0268\n@\r@\x0E@\u0269\x05@\u026C\n@\x03A\x03A\x03A\x03" +
+		"A\x03A\x03A\x03A\x05A\u0275\nA\x03A\x03A\x03A\x03A\x05A\u027B\nA\x03B" +
+		"\x03B\x07B\u027F\nB\fB\x0EB\u0282\vB\x03C\x03C\x03C\x03C\x07C\u0288\n" +
+		"C\fC\x0EC\u028B\vC\x03C\x03C\x03C\x03C\x03C\x07C\u0292\nC\fC\x0EC\u0295" +
+		"\vC\x03C\x05C\u0298\nC\x03D\x03D\x03D\x03D\x03D\x03D\x03D\x03D\x03D\x03" +
+		"E\x03E\x03E\x07E\u02A6\nE\fE\x0EE\u02A9\vE\x03F\x03F\x03F\x03F\x03F\x03" +
+		"F\x03F\x03F\x03F\x03F\x03F\x03F\x03F\x05F\u02B8\nF\x03G\x03G\x03G\x03" +
+		"G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03" +
+		"G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03" +
+		"G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03" +
+		"G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03" +
+		"G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03" +
+		"G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03" +
+		"G\x03G\x03G\x03G\x03G\x03G\x03G\x05G\u0318\nG\x03H\x03H\x07H\u031C\nH" +
+		"\fH\x0EH\u031F\vH\x03I\x06I\u0322\nI\rI\x0EI\u0323\x03I\x03I\x03J\x03" +
+		"J\x03J\x03J\x07J\u032C\nJ\fJ\x0EJ\u032F\vJ\x03J\x03J\x03J\x03J\x03J\x03" +
+		"K\x03K\x03K\x03K\x07K\u033A\nK\fK\x0EK\u033D\vK\x03K\x03K\x05\u0289\u0293" +
+		"\u032D\x02\x02L\x03\x02\x03\x05\x02\x04\x07\x02\x05\t\x02\x06\v\x02\x07" +
+		"\r\x02\b\x0F\x02\t\x11\x02\n\x13\x02\v\x15\x02\f\x17\x02\r\x19\x02\x0E" +
+		"\x1B\x02\x0F\x1D\x02\x10\x1F\x02\x11!\x02\x12#\x02\x13%\x02\x14\'\x02" +
+		"\x15)\x02\x16+\x02\x17-\x02\x18/\x02\x191\x02\x1A3\x02\x1B5\x02\x1C7\x02" +
+		"\x1D9\x02\x1E;\x02\x1F=\x02 ?\x02!A\x02\"C\x02#E\x02$G\x02%I\x02&K\x02" +
+		"\'M\x02(O\x02)Q\x02*S\x02+U\x02,W\x02-Y\x02.[\x02/]\x020_\x021a\x022c" +
+		"\x023e\x024g\x025i\x026k\x027m\x028o\x029q\x02:s\x02;u\x02<w\x02=y\x02" +
+		">{\x02?}\x02@\x7F\x02A\x81\x02B\x83\x02C\x85\x02D\x87\x02E\x89\x02F\x8B" +
+		"\x02G\x8D\x02H\x8F\x02I\x91\x02J\x93\x02K\x95\x02L\x03\x02\x0E\x03\x02" +
+		"2;\x03\x02//\x04\x02GGgg\x03\x023;\x05\x02\f\f\x0F\x0F$$\x05\x02\f\f\x0F" +
+		"\x0F))\x04\x02ZZzz\x05\x022;CHch\x04\x02C\\c|\x06\x022;C\\aac|\x05\x02" +
+		"\v\f\x0E\x0F\"\"\x04\x02\f\f\x0F\x0F\x02\u0363\x02\x03\x03\x02\x02\x02" +
+		"\x02\x05\x03\x02\x02\x02\x02\x07\x03\x02\x02\x02\x02\t\x03\x02\x02\x02" +
+		"\x02\v\x03\x02\x02\x02\x02\r\x03\x02\x02\x02\x02\x0F\x03\x02\x02\x02\x02" +
+		"\x11\x03\x02\x02\x02\x02\x13\x03\x02\x02\x02\x02\x15\x03\x02\x02\x02\x02" +
+		"\x17\x03\x02\x02\x02\x02\x19\x03\x02\x02\x02\x02\x1B\x03\x02\x02\x02\x02" +
+		"\x1D\x03\x02\x02\x02\x02\x1F\x03\x02\x02\x02\x02!\x03\x02\x02\x02\x02" +
+		"#\x03\x02\x02\x02\x02%\x03\x02\x02\x02\x02\'\x03\x02\x02\x02\x02)\x03" +
+		"\x02\x02\x02\x02+\x03\x02\x02\x02\x02-\x03\x02\x02\x02\x02/\x03\x02\x02" +
+		"\x02\x021\x03\x02\x02\x02\x023\x03\x02\x02\x02\x025\x03\x02\x02\x02\x02" +
+		"7\x03\x02\x02\x02\x029\x03\x02\x02\x02\x02;\x03\x02\x02\x02\x02=\x03\x02" +
+		"\x02\x02\x02?\x03\x02\x02\x02\x02A\x03\x02\x02\x02\x02C\x03\x02\x02\x02" +
+		"\x02E\x03\x02\x02\x02\x02G\x03\x02\x02\x02\x02I\x03\x02\x02\x02\x02K\x03" +
+		"\x02\x02\x02\x02M\x03\x02\x02\x02\x02O\x03\x02\x02\x02\x02Q\x03\x02\x02" +
+		"\x02\x02S\x03\x02\x02\x02\x02U\x03\x02\x02\x02\x02W\x03\x02\x02\x02\x02" +
+		"Y\x03\x02\x02\x02\x02[\x03\x02\x02\x02\x02]\x03\x02\x02\x02\x02_\x03\x02" +
+		"\x02\x02\x02a\x03\x02\x02\x02\x02c\x03\x02\x02\x02\x02e\x03\x02\x02\x02" +
+		"\x02g\x03\x02\x02\x02\x02i\x03\x02\x02\x02\x02k\x03\x02\x02\x02\x02m\x03" +
+		"\x02\x02\x02\x02o\x03\x02\x02\x02\x02q\x03\x02\x02\x02\x02s\x03\x02\x02" +
+		"\x02\x02u\x03\x02\x02\x02\x02w\x03\x02\x02\x02\x02y\x03\x02\x02\x02\x02" +
+		"{\x03\x02\x02\x02\x02}\x03\x02\x02\x02\x02\x7F\x03\x02\x02\x02\x02\x81" +
+		"\x03\x02\x02\x02\x02\x83\x03\x02\x02\x02\x02\x85\x03\x02\x02\x02\x02\x87" +
+		"\x03\x02\x02\x02\x02\x89\x03\x02\x02\x02\x02\x8B\x03\x02\x02\x02\x02\x8D" +
+		"\x03\x02\x02\x02\x02\x8F\x03\x02\x02\x02\x02\x91\x03\x02\x02\x02\x02\x93" +
+		"\x03\x02\x02\x02\x02\x95\x03\x02\x02\x02\x03\x97\x03\x02\x02\x02\x05\x9E" +
+		"\x03\x02\x02\x02\x07\xA0\x03\x02\x02\x02\t\xAB\x03\x02\x02\x02\v\xAD\x03" +
+		"\x02\x02\x02\r\xAF\x03\x02\x02\x02\x0F\xB2\x03\x02\x02\x02\x11\xB4\x03" +
+		"\x02\x02\x02\x13\xB6\x03\x02\x02\x02\x15\xB9\x03\x02\x02\x02\x17\xBB\x03" +
+		"\x02\x02\x02\x19\xC4\x03\x02\x02\x02\x1B\xC6\x03\x02\x02\x02\x1D\xC8\x03" +
+		"\x02\x02\x02\x1F\xD1\x03\x02\x02\x02!\xD3\x03\x02\x02\x02#\xD5\x03\x02" +
+		"\x02\x02%\xD7\x03\x02\x02\x02\'\xDF\x03\x02\x02\x02)\xE2\x03\x02\x02\x02" +
+		"+\xE7\x03\x02\x02\x02-\xEB\x03\x02\x02\x02/\xED\x03\x02\x02\x021\xEF\x03" +
+		"\x02\x02\x023\xF8\x03\x02\x02\x025\xFC\x03\x02\x02\x027\u0101\x03\x02" +
+		"\x02\x029\u010C\x03\x02\x02\x02;\u0113\x03\x02\x02\x02=\u0124\x03\x02" +
+		"\x02\x02?\u0133\x03\x02\x02\x02A\u0142\x03\x02\x02\x02C\u014F\x03\x02" +
+		"\x02\x02E\u0159\x03\x02\x02\x02G\u0172\x03\x02\x02\x02I\u0181\x03\x02" +
+		"\x02\x02K\u0194\x03\x02\x02\x02M\u01A4\x03\x02\x02\x02O\u01AF\x03\x02" +
+		"\x02\x02Q\u01B7\x03\x02\x02\x02S\u01BE\x03\x02\x02\x02U\u01C0\x03\x02" +
+		"\x02\x02W\u01C2\x03\x02\x02\x02Y\u01C4\x03\x02\x02\x02[\u01C6\x03\x02" +
+		"\x02\x02]\u01C8\x03\x02\x02\x02_\u01CA\x03\x02\x02\x02a\u01CD\x03\x02" +
+		"\x02\x02c\u01D0\x03\x02\x02\x02e\u01D2\x03\x02\x02\x02g\u01D4\x03\x02" +
+		"\x02\x02i\u01D7\x03\x02\x02\x02k\u01DA\x03\x02\x02\x02m\u01E3\x03\x02" +
+		"\x02\x02o\u01E7\x03\x02\x02\x02q\u01EC\x03\x02\x02\x02s\u01F3\x03\x02" +
+		"\x02\x02u\u01FA\x03\x02\x02\x02w\u01FE\x03\x02\x02\x02y\u0207\x03\x02" +
+		"\x02\x02{\u0220\x03\x02\x02\x02}\u025B\x03\x02\x02\x02\x7F\u025E\x03\x02" +
+		"\x02\x02\x81\u027A\x03\x02\x02\x02\x83\u027C\x03\x02\x02\x02\x85\u0297" +
+		"\x03\x02\x02\x02\x87\u0299\x03\x02\x02\x02\x89\u02A2\x03\x02\x02\x02\x8B" +
+		"\u02B7\x03\x02\x02\x02\x8D\u0317\x03\x02\x02\x02\x8F\u0319\x03\x02\x02" +
+		"\x02\x91\u0321\x03\x02\x02\x02\x93\u0327\x03\x02\x02\x02\x95\u0335\x03" +
+		"\x02\x02\x02\x97\x98\x07r\x02\x02\x98\x99\x07t\x02\x02\x99\x9A\x07c\x02" +
+		"\x02\x9A\x9B\x07i\x02\x02\x9B\x9C\x07o\x02\x02\x9C\x9D\x07c\x02\x02\x9D" +
+		"\x04\x03\x02\x02\x02\x9E\x9F\x07=\x02\x02\x9F\x06\x03\x02\x02\x02\xA0" +
+		"\xA1\x07e\x02\x02\xA1\xA2\x07c\x02\x02\xA2\xA3\x07u\x02\x02\xA3\xA4\x07" +
+		"j\x02\x02\xA4\xA5\x07u\x02\x02\xA5\xA6\x07e\x02\x02\xA6\xA7\x07t\x02\x02" +
+		"\xA7\xA8\x07k\x02\x02\xA8\xA9\x07r\x02\x02\xA9\xAA\x07v\x02\x02\xAA\b" +
+		"\x03\x02\x02\x02\xAB\xAC\x07`\x02\x02\xAC\n\x03\x02\x02\x02\xAD\xAE\x07" +
+		"\x80\x02\x02\xAE\f\x03\x02\x02\x02\xAF\xB0\x07@\x02\x02\xB0\xB1\x07?\x02" +
+		"\x02\xB1\x0E\x03\x02\x02\x02\xB2\xB3\x07@\x02\x02\xB3\x10\x03\x02\x02" +
+		"\x02\xB4\xB5\x07>\x02\x02\xB5\x12\x03\x02\x02\x02\xB6\xB7\x07>\x02\x02" +
+		"\xB7\xB8\x07?\x02\x02\xB8\x14\x03\x02\x02\x02\xB9\xBA\x07?\x02\x02\xBA" +
+		"\x16\x03\x02\x02\x02\xBB\xBC\x07e\x02\x02\xBC\xBD\x07q\x02\x02\xBD\xBE" +
+		"\x07p\x02\x02\xBE\xBF\x07v\x02\x02\xBF\xC0\x07t\x02\x02\xC0\xC1\x07c\x02" +
+		"\x02\xC1\xC2\x07e\x02\x02\xC2\xC3\x07v\x02\x02\xC3\x18\x03\x02\x02\x02" +
+		"\xC4\xC5\x07}\x02\x02\xC5\x1A\x03\x02\x02\x02\xC6\xC7\x07\x7F\x02\x02" +
+		"\xC7\x1C\x03\x02\x02\x02\xC8\xC9\x07h\x02\x02\xC9\xCA\x07w\x02\x02\xCA" +
+		"\xCB\x07p\x02\x02\xCB\xCC\x07e\x02\x02\xCC\xCD\x07v\x02\x02\xCD\xCE\x07" +
+		"k\x02\x02\xCE\xCF\x07q\x02\x02\xCF\xD0\x07p\x02\x02\xD0\x1E\x03\x02\x02" +
+		"\x02\xD1\xD2\x07*\x02\x02\xD2 \x03\x02\x02\x02\xD3\xD4\x07.\x02\x02\xD4" +
+		"\"\x03\x02\x02\x02\xD5\xD6\x07+\x02\x02\xD6$\x03\x02\x02\x02\xD7\xD8\x07" +
+		"t\x02\x02\xD8\xD9\x07g\x02\x02\xD9\xDA\x07s\x02\x02\xDA\xDB\x07w\x02\x02" +
+		"\xDB\xDC\x07k\x02\x02\xDC\xDD\x07t\x02\x02\xDD\xDE\x07g\x02\x02\xDE&\x03" +
+		"\x02\x02\x02\xDF\xE0\x07k\x02\x02\xE0\xE1\x07h\x02\x02\xE1(\x03\x02\x02" +
+		"\x02\xE2\xE3\x07g\x02\x02\xE3\xE4\x07n\x02\x02\xE4\xE5\x07u\x02\x02\xE5" +
+		"\xE6\x07g\x02\x02\xE6*\x03\x02\x02\x02\xE7\xE8\x07p\x02\x02\xE8\xE9\x07" +
+		"g\x02\x02\xE9\xEA\x07y\x02\x02\xEA,\x03\x02\x02\x02\xEB\xEC\x07]\x02\x02" +
+		"\xEC.\x03\x02\x02\x02\xED\xEE\x07_\x02\x02\xEE0\x03\x02\x02\x02\xEF\xF0" +
+		"\x07e\x02\x02\xF0\xF1\x07q\x02\x02\xF1\xF2\x07p\x02\x02\xF2\xF3\x07u\x02" +
+		"\x02\xF3\xF4\x07q\x02\x02\xF4\xF5\x07n\x02\x02\xF5\xF6\x07g\x02\x02\xF6" +
+		"\xF7\x070\x02\x02\xF72\x03\x02\x02\x02\xF8\xF9\x07n\x02\x02\xF9\xFA\x07" +
+		"q\x02\x02\xFA\xFB\x07i\x02\x02\xFB4\x03\x02\x02\x02\xFC\xFD\x07y\x02\x02" +
+		"\xFD\xFE\x07c\x02\x02\xFE\xFF\x07t\x02\x02\xFF\u0100\x07p\x02\x02\u0100" +
+		"6\x03\x02\x02\x02\u0101\u0102\x07v\x02\x02\u0102\u0103\x07z\x02\x02\u0103" +
+		"\u0104\x070\x02\x02\u0104\u0105\x07q\x02\x02\u0105\u0106\x07w\x02\x02" +
+		"\u0106\u0107\x07v\x02\x02\u0107\u0108\x07r\x02\x02\u0108\u0109\x07w\x02" +
+		"\x02\u0109\u010A\x07v\x02\x02\u010A\u010B\x07u\x02\x02\u010B8\x03\x02" +
+		"\x02\x02\u010C\u010D\x070\x02\x02\u010D\u010E\x07x\x02\x02\u010E\u010F" +
+		"\x07c\x02\x02\u010F\u0110\x07n\x02\x02\u0110\u0111\x07w\x02\x02\u0111" +
+		"\u0112\x07g\x02\x02\u0112:\x03\x02\x02\x02\u0113\u0114\x070\x02\x02\u0114" +
+		"\u0115\x07n\x02\x02\u0115\u0116\x07q\x02\x02\u0116\u0117\x07e\x02\x02" +
+		"\u0117\u0118\x07m\x02\x02\u0118\u0119\x07k\x02\x02\u0119\u011A\x07p\x02" +
+		"\x02\u011A\u011B\x07i\x02\x02\u011B\u011C\x07D\x02\x02\u011C\u011D\x07" +
+		"{\x02\x02\u011D\u011E\x07v\x02\x02\u011E\u011F\x07g\x02\x02\u011F\u0120" +
+		"\x07e\x02\x02\u0120\u0121\x07q\x02\x02\u0121\u0122\x07f\x02\x02\u0122" +
+		"\u0123\x07g\x02\x02\u0123<\x03\x02\x02\x02\u0124\u0125\x070\x02\x02\u0125" +
+		"\u0126\x07v\x02\x02\u0126\u0127\x07q\x02\x02\u0127\u0128\x07m\x02\x02" +
+		"\u0128\u0129\x07g\x02\x02\u0129\u012A\x07p\x02\x02\u012A\u012B\x07E\x02" +
+		"\x02\u012B\u012C\x07c\x02\x02\u012C\u012D\x07v\x02\x02\u012D\u012E\x07" +
+		"g\x02\x02\u012E\u012F\x07i\x02\x02\u012F\u0130\x07q\x02\x02\u0130\u0131" +
+		"\x07t\x02\x02\u0131\u0132\x07{\x02\x02\u0132>\x03\x02\x02\x02\u0133\u0134" +
+		"\x070\x02\x02\u0134\u0135\x07p\x02\x02\u0135\u0136\x07h\x02\x02\u0136" +
+		"\u0137\x07v\x02\x02\u0137\u0138\x07E\x02\x02\u0138\u0139\x07q\x02\x02" +
+		"\u0139\u013A\x07o\x02\x02\u013A\u013B\x07o\x02\x02\u013B\u013C\x07k\x02" +
+		"\x02\u013C\u013D\x07v\x02\x02\u013D\u013E\x07o\x02\x02\u013E\u013F\x07" +
+		"g\x02\x02\u013F\u0140\x07p\x02\x02\u0140\u0141\x07v\x02\x02\u0141@\x03" +
+		"\x02\x02\x02\u0142\u0143\x070\x02\x02\u0143\u0144\x07v\x02\x02\u0144\u0145" +
+		"\x07q\x02\x02\u0145\u0146\x07m\x02\x02\u0146\u0147\x07g\x02\x02\u0147" +
+		"\u0148\x07p\x02\x02\u0148\u0149\x07C\x02\x02\u0149\u014A\x07o\x02\x02" +
+		"\u014A\u014B\x07q\x02\x02\u014B\u014C\x07w\x02\x02\u014C\u014D\x07p\x02" +
+		"\x02\u014D\u014E\x07v\x02\x02\u014EB\x03\x02\x02\x02\u014F\u0150\x07v" +
+		"\x02\x02\u0150\u0151\x07z\x02\x02\u0151\u0152\x070\x02\x02\u0152\u0153" +
+		"\x07k\x02\x02\u0153\u0154\x07p\x02\x02\u0154\u0155\x07r\x02\x02\u0155" +
+		"\u0156\x07w\x02\x02\u0156\u0157\x07v\x02\x02\u0157\u0158\x07u\x02\x02" +
+		"\u0158D\x03\x02\x02\x02\u0159\u015A\x070\x02\x02\u015A\u015B\x07q\x02" +
+		"\x02\u015B\u015C\x07w\x02\x02\u015C\u015D\x07v\x02\x02\u015D\u015E\x07" +
+		"r\x02\x02\u015E\u015F\x07q\x02\x02\u015F\u0160\x07k\x02\x02\u0160\u0161" +
+		"\x07p\x02\x02\u0161\u0162\x07v\x02\x02\u0162\u0163\x07V\x02\x02\u0163" +
+		"\u0164\x07t\x02\x02\u0164\u0165\x07c\x02\x02\u0165\u0166\x07p\x02\x02" +
+		"\u0166\u0167\x07u\x02\x02\u0167\u0168\x07c\x02\x02\u0168\u0169\x07e\x02" +
+		"\x02\u0169\u016A\x07v\x02\x02\u016A\u016B\x07k\x02\x02\u016B\u016C\x07" +
+		"q\x02\x02\u016C\u016D\x07p\x02\x02\u016D\u016E\x07J\x02\x02\u016E\u016F" +
+		"\x07c\x02\x02\u016F\u0170\x07u\x02\x02\u0170\u0171\x07j\x02\x02\u0171" +
+		"F\x03\x02\x02\x02\u0172\u0173\x070\x02\x02\u0173\u0174\x07q\x02\x02\u0174" +
+		"\u0175\x07w\x02\x02\u0175\u0176\x07v\x02\x02\u0176\u0177\x07r\x02\x02" +
+		"\u0177\u0178\x07q\x02\x02\u0178\u0179\x07k\x02\x02\u0179\u017A\x07p\x02" +
+		"\x02\u017A\u017B\x07v\x02\x02\u017B\u017C\x07K\x02\x02\u017C\u017D\x07" +
+		"p\x02\x02\u017D\u017E\x07f\x02\x02\u017E\u017F\x07g\x02\x02\u017F\u0180" +
+		"\x07z\x02\x02\u0180H\x03\x02\x02\x02\u0181\u0182\x070\x02\x02\u0182\u0183" +
+		"\x07w\x02\x02\u0183\u0184\x07p\x02\x02\u0184\u0185\x07n\x02\x02\u0185" +
+		"\u0186\x07q\x02\x02\u0186\u0187\x07e\x02\x02\u0187\u0188\x07m\x02\x02" +
+		"\u0188\u0189\x07k\x02\x02\u0189\u018A\x07p\x02\x02\u018A\u018B\x07i\x02" +
+		"\x02\u018B\u018C\x07D\x02\x02\u018C\u018D\x07{\x02\x02\u018D\u018E\x07" +
+		"v\x02\x02\u018E\u018F\x07g\x02\x02\u018F\u0190\x07e\x02\x02\u0190\u0191" +
+		"\x07q\x02\x02\u0191\u0192\x07f\x02\x02\u0192\u0193\x07g\x02\x02\u0193" +
+		"J\x03\x02\x02\x02\u0194\u0195\x070\x02\x02\u0195\u0196\x07u\x02\x02\u0196" +
+		"\u0197\x07g\x02\x02\u0197\u0198\x07s\x02\x02\u0198\u0199\x07w\x02\x02" +
+		"\u0199\u019A\x07g\x02\x02\u019A\u019B\x07p\x02\x02\u019B\u019C\x07e\x02" +
+		"\x02\u019C\u019D\x07g\x02\x02\u019D\u019E\x07P\x02\x02\u019E\u019F\x07" +
+		"w\x02\x02\u019F\u01A0\x07o\x02\x02\u01A0\u01A1\x07d\x02\x02\u01A1\u01A2" +
+		"\x07g\x02\x02\u01A2\u01A3\x07t\x02\x02\u01A3L\x03\x02\x02\x02\u01A4\u01A5" +
+		"\x070\x02\x02\u01A5\u01A6\x07t\x02\x02\u01A6\u01A7\x07g\x02\x02\u01A7" +
+		"\u01A8\x07x\x02\x02\u01A8\u01A9\x07g\x02\x02\u01A9\u01AA\x07t\x02\x02" +
+		"\u01AA\u01AB\x07u\x02\x02\u01AB\u01AC\x07g\x02\x02\u01AC\u01AD\x07*\x02" +
+		"\x02\u01AD\u01AE\x07+\x02\x02\u01AEN\x03\x02\x02\x02\u01AF\u01B0\x070" +
+		"\x02\x02\u01B0\u01B1\x07n\x02\x02\u01B1\u01B2\x07g\x02\x02\u01B2\u01B3" +
+		"\x07p\x02\x02\u01B3\u01B4\x07i\x02\x02\u01B4\u01B5\x07v\x02\x02\u01B5" +
+		"\u01B6\x07j\x02\x02\u01B6P\x03\x02\x02\x02\u01B7\u01B8\x070\x02\x02\u01B8" +
+		"\u01B9\x07u\x02\x02\u01B9\u01BA\x07r\x02\x02\u01BA\u01BB\x07n\x02\x02" +
+		"\u01BB\u01BC\x07k\x02\x02\u01BC\u01BD\x07v\x02\x02\u01BDR\x03\x02\x02" +
+		"\x02\u01BE\u01BF\x07#\x02\x02\u01BFT\x03\x02\x02\x02\u01C0\u01C1\x07/" +
+		"\x02\x02\u01C1V\x03\x02\x02\x02\u01C2\u01C3\x07,\x02\x02\u01C3X\x03\x02" +
+		"\x02\x02\u01C4\u01C5\x071\x02\x02\u01C5Z\x03\x02\x02\x02\u01C6\u01C7\x07" +
+		"\'\x02\x02\u01C7\\\x03\x02\x02\x02\u01C8\u01C9\x07-\x02\x02\u01C9^\x03" +
+		"\x02\x02\x02\u01CA\u01CB\x07?\x02\x02\u01CB\u01CC\x07?\x02\x02\u01CC`" +
+		"\x03\x02\x02\x02\u01CD\u01CE\x07#\x02\x02\u01CE\u01CF\x07?\x02\x02\u01CF" +
+		"b\x03\x02\x02\x02\u01D0\u01D1\x07(\x02\x02\u01D1d\x03\x02\x02\x02\u01D2" +
+		"\u01D3\x07~\x02\x02\u01D3f\x03\x02\x02\x02\u01D4\u01D5\x07(\x02\x02\u01D5" +
+		"\u01D6\x07(\x02\x02\u01D6h\x03\x02\x02\x02\u01D7\u01D8\x07~\x02\x02\u01D8" +
+		"\u01D9\x07~\x02\x02\u01D9j\x03\x02\x02\x02\u01DA\u01DB\x07e\x02\x02\u01DB" +
+		"\u01DC\x07q\x02\x02\u01DC\u01DD\x07p\x02\x02\u01DD\u01DE\x07u\x02\x02" +
+		"\u01DE\u01DF\x07v\x02\x02\u01DF\u01E0\x07c\x02\x02\u01E0\u01E1\x07p\x02" +
+		"\x02\u01E1\u01E2\x07v\x02\x02\u01E2l\x03\x02\x02\x02\u01E3\u01E4\x07k" +
+		"\x02\x02\u01E4\u01E5\x07p\x02\x02\u01E5\u01E6\x07v\x02\x02\u01E6n\x03" +
+		"\x02\x02\x02\u01E7\u01E8\x07d\x02\x02\u01E8\u01E9\x07q\x02\x02\u01E9\u01EA" +
+		"\x07q\x02\x02\u01EA\u01EB\x07n\x02\x02\u01EBp\x03\x02\x02\x02\u01EC\u01ED" +
+		"\x07u\x02\x02\u01ED\u01EE\x07v\x02\x02\u01EE\u01EF\x07t\x02\x02\u01EF" +
+		"\u01F0\x07k\x02\x02\u01F0\u01F1\x07p\x02\x02\u01F1\u01F2\x07i\x02\x02" +
+		"\u01F2r\x03\x02\x02\x02\u01F3\u01F4\x07r\x02";
 	private static readonly _serializedATNSegment1: string =
-		"\x03\x02\x02\x02\u01FC\u01FD\x03\x02\x02\x02\u01FD\u01FB\x03\x02\x02\x02" +
-		"\u01FD\u01FE\x03\x02\x02\x02\u01FEt\x03\x02\x02\x02\u01FF\u0200\x07v\x02" +
-		"\x02\u0200\u0201\x07t\x02\x02\u0201\u0202\x07w\x02\x02\u0202\u0209\x07" +
-		"g\x02\x02\u0203\u0204\x07h\x02\x02\u0204\u0205\x07c\x02\x02\u0205\u0206" +
-		"\x07n\x02\x02\u0206\u0207\x07u\x02\x02\u0207\u0209\x07g\x02\x02\u0208" +
-		"\u01FF\x03\x02\x02\x02\u0208\u0203\x03\x02\x02\x02\u0209v\x03\x02\x02" +
-		"\x02\u020A\u020B\x07u\x02\x02\u020B\u020C\x07c\x02\x02\u020C\u020D\x07" +
-		"v\x02\x02\u020D\u020E\x07q\x02\x02\u020E\u020F\x07u\x02\x02\u020F\u0210" +
-		"\x07j\x02\x02\u0210\u0211\x07k\x02\x02\u0211\u0244\x07u\x02\x02\u0212" +
-		"\u0213\x07u\x02\x02\u0213\u0214\x07c\x02\x02\u0214\u0215\x07v\x02\x02" +
-		"\u0215\u0244\x07u\x02\x02\u0216\u0217\x07h\x02\x02\u0217\u0218\x07k\x02" +
-		"\x02\u0218\u0219\x07p\x02\x02\u0219\u021A\x07p\x02\x02\u021A\u021B\x07" +
-		"g\x02\x02\u021B\u0244\x07{\x02\x02\u021C\u021D\x07d\x02\x02\u021D\u021E" +
-		"\x07k\x02\x02\u021E\u021F\x07v\x02\x02\u021F\u0244\x07u\x02\x02\u0220" +
-		"\u0221\x07d\x02\x02\u0221\u0222\x07k\x02\x02\u0222\u0223\x07v\x02\x02" +
-		"\u0223\u0224\x07e\x02\x02\u0224\u0225\x07q\x02\x02\u0225\u0226\x07k\x02" +
-		"\x02\u0226\u0244\x07p\x02\x02\u0227\u0228\x07u\x02\x02\u0228\u0229\x07" +
-		"g\x02\x02\u0229\u022A\x07e\x02\x02\u022A\u022B\x07q\x02\x02\u022B\u022C" +
-		"\x07p\x02\x02\u022C\u022D\x07f\x02\x02\u022D\u0244\x07u\x02\x02\u022E" +
-		"\u022F\x07o\x02\x02\u022F\u0230\x07k\x02\x02\u0230\u0231\x07p\x02\x02" +
-		"\u0231\u0232\x07w\x02\x02\u0232\u0233\x07v\x02\x02\u0233\u0234\x07g\x02" +
-		"\x02\u0234\u0244\x07u\x02\x02\u0235\u0236\x07j\x02\x02\u0236\u0237\x07" +
-		"q\x02\x02\u0237\u0238\x07w\x02\x02\u0238\u0239\x07t\x02\x02\u0239\u0244" +
-		"\x07u\x02\x02\u023A\u023B\x07f\x02\x02\u023B\u023C\x07c\x02\x02\u023C" +
-		"\u023D\x07{\x02\x02\u023D\u0244\x07u\x02\x02\u023E\u023F\x07y\x02\x02" +
-		"\u023F\u0240\x07g\x02\x02\u0240\u0241\x07g\x02\x02\u0241\u0242\x07m\x02" +
-		"\x02\u0242\u0244\x07u\x02\x02\u0243\u020A\x03\x02\x02\x02\u0243\u0212" +
-		"\x03\x02\x02\x02\u0243\u0216\x03\x02\x02\x02\u0243\u021C\x03\x02\x02\x02" +
-		"\u0243\u0220\x03\x02\x02\x02\u0243\u0227\x03\x02\x02\x02\u0243\u022E\x03" +
-		"\x02\x02\x02\u0243\u0235\x03\x02\x02\x02\u0243\u023A\x03\x02\x02\x02\u0243" +
-		"\u023E\x03\x02\x02\x02\u0244x\x03\x02\x02\x02\u0245\u0247\t\x03\x02\x02" +
-		"\u0246\u0245\x03\x02\x02\x02\u0246\u0247\x03\x02\x02\x02\u0247\u0249\x03" +
-		"\x02\x02\x02\u0248\u024A\t\x02\x02\x02\u0249\u0248\x03\x02\x02\x02\u024A" +
-		"\u024B\x03\x02\x02\x02\u024B\u0249\x03\x02\x02\x02\u024B\u024C\x03\x02" +
-		"\x02\x02\u024C\u0253\x03\x02\x02\x02\u024D\u024F\t\x04\x02\x02\u024E\u0250" +
-		"\t\x02\x02\x02\u024F\u024E\x03\x02\x02\x02\u0250\u0251\x03\x02\x02\x02" +
-		"\u0251\u024F\x03\x02\x02\x02\u0251\u0252\x03\x02\x02\x02\u0252\u0254\x03" +
-		"\x02\x02\x02\u0253\u024D\x03\x02\x02\x02\u0253\u0254\x03\x02\x02\x02\u0254" +
-		"z\x03\x02\x02\x02\u0255\u0256\x07d\x02\x02\u0256\u0257\x07{\x02\x02\u0257" +
-		"\u0258\x07v\x02\x02\u0258\u0259\x07g\x02\x02\u0259\u025A\x07u\x02\x02" +
-		"\u025A\u025C\x03\x02\x02\x02\u025B\u025D\x05}?\x02\u025C\u025B\x03\x02" +
-		"\x02\x02\u025C\u025D\x03\x02\x02\x02\u025D\u0263\x03\x02\x02\x02\u025E" +
-		"\u025F\x07d\x02\x02\u025F\u0260\x07{\x02\x02\u0260\u0261\x07v\x02\x02" +
-		"\u0261\u0263\x07g\x02\x02\u0262\u0255\x03\x02\x02\x02\u0262\u025E\x03" +
-		"\x02\x02\x02\u0263|\x03\x02\x02\x02\u0264\u0268\t\x05\x02\x02\u0265\u0267" +
-		"\t\x02\x02\x02\u0266\u0265\x03\x02\x02\x02\u0267\u026A\x03\x02\x02\x02" +
-		"\u0268\u0266\x03\x02\x02\x02\u0268\u0269\x03\x02\x02\x02\u0269~\x03\x02" +
-		"\x02\x02\u026A\u0268\x03\x02\x02\x02\u026B\u0271\x07$\x02\x02\u026C\u026D" +
-		"\x07^\x02\x02\u026D\u0270\x07$\x02\x02\u026E\u0270\n\x06\x02\x02\u026F" +
-		"\u026C\x03\x02\x02\x02\u026F\u026E\x03\x02\x02\x02\u0270\u0273\x03\x02" +
-		"\x02\x02\u0271\u0272\x03\x02\x02\x02\u0271\u026F\x03\x02\x02\x02\u0272" +
-		"\u0274\x03\x02\x02\x02\u0273\u0271\x03\x02\x02\x02\u0274\u0280\x07$\x02" +
-		"\x02\u0275\u027B\x07)\x02\x02\u0276\u0277\x07^\x02\x02\u0277\u027A\x07" +
-		")\x02\x02\u0278\u027A\n\x07\x02\x02\u0279\u0276\x03\x02\x02\x02\u0279" +
-		"\u0278\x03\x02\x02\x02\u027A\u027D\x03\x02\x02\x02\u027B\u027C\x03\x02" +
-		"\x02\x02\u027B\u0279\x03\x02\x02\x02\u027C\u027E\x03\x02\x02\x02\u027D" +
-		"\u027B\x03\x02\x02\x02\u027E\u0280\x07)\x02\x02\u027F\u026B\x03\x02\x02" +
-		"\x02\u027F\u0275\x03\x02\x02\x02\u0280\x80\x03\x02\x02\x02\u0281\u0282" +
-		"\x07f\x02\x02\u0282\u0283\x07c\x02\x02\u0283\u0284\x07v\x02\x02\u0284" +
-		"\u0285\x07g\x02\x02\u0285\u0286\x07*\x02\x02\u0286\u0287\x03\x02\x02\x02" +
-		"\u0287\u0288\x05\x7F@\x02\u0288\u0289\x07+\x02\x02\u0289\x82\x03\x02\x02" +
-		"\x02\u028A\u028B\x072\x02\x02\u028B\u028F\t\b\x02\x02\u028C\u028E\t\t" +
-		"\x02\x02\u028D\u028C\x03\x02\x02\x02\u028E\u0291\x03\x02\x02\x02\u028F" +
-		"\u028D\x03\x02\x02\x02\u028F\u0290\x03\x02\x02\x02\u0290\x84\x03\x02\x02" +
-		"\x02\u0291\u028F\x03\x02\x02\x02\u0292\u0293\x07v\x02\x02\u0293\u0294" +
-		"\x07z\x02\x02\u0294\u0295\x070\x02\x02\u0295\u0296\x07c\x02\x02\u0296" +
-		"\u0297\x07i\x02\x02\u0297\u02A0\x07g\x02\x02\u0298\u0299\x07v\x02\x02" +
-		"\u0299\u029A\x07z\x02\x02\u029A\u029B\x070\x02\x02\u029B\u029C\x07v\x02" +
-		"\x02\u029C\u029D\x07k\x02\x02\u029D\u029E\x07o\x02\x02\u029E\u02A0\x07" +
-		"g\x02\x02\u029F\u0292\x03\x02\x02\x02\u029F\u0298\x03\x02\x02\x02\u02A0" +
-		"\x86\x03\x02\x02\x02\u02A1\u02A2\x07v\x02\x02\u02A2\u02A3\x07j\x02\x02" +
-		"\u02A3\u02A4\x07k\x02\x02\u02A4\u02A5\x07u\x02\x02\u02A5\u02A6\x070\x02" +
-		"\x02\u02A6\u02A7\x07c\x02\x02\u02A7\u02A8\x07e\x02\x02\u02A8\u02A9\x07" +
-		"v\x02\x02\u02A9\u02AA\x07k\x02\x02\u02AA\u02AB\x07x\x02\x02\u02AB\u02AC" +
-		"\x07g\x02\x02\u02AC\u02AD\x07K\x02\x02\u02AD\u02AE\x07p\x02\x02\u02AE" +
-		"\u02AF\x07r\x02\x02\u02AF\u02B0\x07w\x02\x02\u02B0\u02B1\x07v\x02\x02" +
-		"\u02B1\u02B2\x07K\x02\x02\u02B2\u02B3\x07p\x02\x02\u02B3\u02B4\x07f\x02" +
-		"\x02\u02B4\u02B5\x07g\x02\x02\u02B5\u0300\x07z\x02\x02\u02B6\u02B7\x07" +
-		"v\x02\x02\u02B7\u02B8\x07j\x02\x02\u02B8\u02B9\x07k\x02\x02\u02B9\u02BA" +
-		"\x07u\x02\x02\u02BA\u02BB\x070\x02\x02\u02BB\u02BC\x07c\x02\x02\u02BC" +
-		"\u02BD\x07e\x02\x02\u02BD\u02BE\x07v\x02\x02\u02BE\u02BF\x07k\x02\x02" +
-		"\u02BF\u02C0\x07x\x02\x02\u02C0\u02C1\x07g\x02\x02\u02C1\u02C2\x07D\x02" +
-		"\x02\u02C2\u02C3\x07{\x02\x02\u02C3\u02C4\x07v\x02\x02\u02C4\u02C5\x07" +
-		"g\x02\x02\u02C5\u02C6\x07e\x02\x02\u02C6\u02C7\x07q\x02\x02\u02C7\u02C8" +
-		"\x07f\x02\x02\u02C8\u0300\x07g\x02\x02\u02C9\u02CA\x07v\x02\x02\u02CA" +
-		"\u02CB\x07z\x02\x02\u02CB\u02CC\x070\x02\x02\u02CC\u02CD\x07k\x02\x02" +
-		"\u02CD\u02CE\x07p\x02\x02\u02CE\u02CF\x07r\x02\x02\u02CF\u02D0\x07w\x02" +
-		"\x02\u02D0\u02D1\x07v\x02\x02\u02D1\u02D2\x07u\x02\x02\u02D2\u02D3\x07" +
-		"0\x02\x02\u02D3\u02D4\x07n\x02\x02\u02D4\u02D5\x07g\x02\x02\u02D5\u02D6" +
-		"\x07p\x02\x02\u02D6\u02D7\x07i\x02\x02\u02D7\u02D8\x07v\x02\x02\u02D8" +
-		"\u0300\x07j\x02\x02\u02D9\u02DA\x07v\x02\x02\u02DA\u02DB\x07z\x02\x02" +
-		"\u02DB\u02DC\x070\x02\x02\u02DC\u02DD\x07q\x02\x02\u02DD\u02DE\x07w\x02" +
-		"\x02\u02DE\u02DF\x07v\x02\x02\u02DF\u02E0\x07r\x02\x02\u02E0\u02E1\x07" +
-		"w\x02\x02\u02E1\u02E2\x07v\x02\x02\u02E2\u02E3\x07u\x02\x02\u02E3\u02E4" +
-		"\x070\x02\x02\u02E4\u02E5\x07n\x02\x02\u02E5\u02E6\x07g\x02\x02\u02E6" +
-		"\u02E7\x07p\x02\x02\u02E7\u02E8\x07i\x02\x02\u02E8\u02E9\x07v\x02\x02" +
-		"\u02E9\u0300\x07j\x02\x02\u02EA\u02EB\x07v\x02\x02\u02EB\u02EC\x07z\x02" +
-		"\x02\u02EC\u02ED\x070\x02\x02\u02ED\u02EE\x07x\x02\x02\u02EE\u02EF\x07" +
-		"g\x02\x02\u02EF\u02F0\x07t\x02\x02\u02F0\u02F1\x07u\x02\x02\u02F1\u02F2" +
-		"\x07k\x02\x02\u02F2\u02F3\x07q\x02\x02\u02F3\u0300\x07p\x02\x02\u02F4" +
-		"\u02F5\x07v\x02\x02\u02F5\u02F6\x07z\x02\x02\u02F6\u02F7\x070\x02\x02" +
-		"\u02F7\u02F8\x07n\x02\x02\u02F8\u02F9\x07q\x02\x02\u02F9\u02FA\x07e\x02" +
-		"\x02\u02FA\u02FB\x07m\x02\x02\u02FB\u02FC\x07v\x02\x02\u02FC\u02FD\x07" +
-		"k\x02\x02\u02FD\u02FE\x07o\x02\x02\u02FE\u0300\x07g\x02\x02\u02FF\u02A1" +
-		"\x03\x02\x02\x02\u02FF\u02B6\x03\x02\x02\x02\u02FF\u02C9\x03\x02\x02\x02" +
-		"\u02FF\u02D9\x03\x02\x02\x02\u02FF\u02EA\x03\x02\x02\x02\u02FF\u02F4\x03" +
-		"\x02\x02\x02\u0300\x88\x03\x02\x02\x02\u0301\u0305\t\n\x02\x02\u0302\u0304" +
-		"\t\v\x02\x02\u0303\u0302\x03\x02\x02\x02\u0304\u0307\x03\x02\x02\x02\u0305" +
-		"\u0303\x03\x02\x02\x02\u0305\u0306\x03\x02\x02\x02\u0306\x8A\x03\x02\x02" +
-		"\x02\u0307\u0305\x03\x02\x02\x02\u0308\u030A\t\f\x02\x02\u0309\u0308\x03" +
-		"\x02\x02\x02\u030A\u030B\x03\x02\x02\x02\u030B\u0309\x03\x02\x02\x02\u030B" +
-		"\u030C\x03\x02\x02\x02\u030C\u030D\x03\x02\x02\x02\u030D\u030E\bF\x02" +
-		"\x02\u030E\x8C\x03\x02\x02\x02\u030F\u0310\x071\x02\x02\u0310\u0311\x07" +
-		",\x02\x02\u0311\u0315\x03\x02\x02\x02\u0312\u0314\v\x02\x02\x02\u0313" +
-		"\u0312\x03\x02\x02\x02\u0314\u0317\x03\x02\x02\x02\u0315\u0316\x03\x02" +
-		"\x02\x02\u0315\u0313\x03\x02\x02\x02\u0316\u0318\x03\x02\x02\x02\u0317" +
-		"\u0315\x03\x02\x02\x02\u0318\u0319\x07,\x02\x02\u0319\u031A\x071\x02\x02" +
-		"\u031A\u031B\x03\x02\x02\x02\u031B\u031C\bG\x03\x02\u031C\x8E\x03\x02" +
-		"\x02\x02\u031D\u031E\x071\x02\x02\u031E\u031F\x071\x02\x02\u031F\u0323" +
-		"\x03\x02\x02\x02\u0320\u0322\n\r\x02\x02\u0321\u0320\x03\x02\x02\x02\u0322" +
-		"\u0325\x03\x02\x02\x02\u0323\u0321\x03\x02\x02\x02\u0323\u0324\x03\x02" +
-		"\x02\x02\u0324\u0326\x03\x02\x02\x02\u0325\u0323\x03\x02\x02\x02\u0326" +
-		"\u0327\bH\x03\x02\u0327\x90\x03\x02\x02\x02\x1B\x02\u01F1\u01F7\u01FD" +
-		"\u0208\u0243\u0246\u024B\u0251\u0253\u025C\u0262\u0268\u026F\u0271\u0279" +
-		"\u027B\u027F\u028F\u029F\u02FF\u0305\u030B\u0315\u0323\x04\b\x02\x02\x02" +
-		"\x03\x02";
+		"\x02\u01F4\u01F5\x07w\x02\x02\u01F5\u01F6\x07d\x02\x02\u01F6\u01F7\x07" +
+		"m\x02\x02\u01F7\u01F8\x07g\x02\x02\u01F8\u01F9\x07{\x02\x02\u01F9t\x03" +
+		"\x02\x02\x02\u01FA\u01FB\x07u\x02\x02\u01FB\u01FC\x07k\x02\x02\u01FC\u01FD" +
+		"\x07i\x02\x02\u01FDv\x03\x02\x02\x02\u01FE\u01FF\x07f\x02\x02\u01FF\u0200" +
+		"\x07c\x02\x02\u0200\u0201\x07v\x02\x02\u0201\u0202\x07c\x02\x02\u0202" +
+		"\u0203\x07u\x02\x02\u0203\u0204\x07k\x02\x02\u0204\u0205\x07i\x02\x02" +
+		"\u0205x\x03\x02\x02\x02\u0206\u0208\t\x02\x02\x02\u0207\u0206\x03\x02" +
+		"\x02\x02\u0208\u0209\x03\x02\x02\x02\u0209\u0207\x03\x02\x02\x02\u0209" +
+		"\u020A\x03\x02\x02\x02\u020A\u020B\x03\x02\x02\x02\u020B\u020D\x070\x02" +
+		"\x02\u020C\u020E\t\x02\x02\x02\u020D\u020C\x03\x02\x02\x02\u020E\u020F" +
+		"\x03\x02\x02\x02\u020F\u020D\x03\x02\x02\x02\u020F\u0210\x03\x02\x02\x02" +
+		"\u0210\u0211\x03\x02\x02\x02\u0211\u0213\x070\x02\x02\u0212\u0214\t\x02" +
+		"\x02\x02\u0213\u0212\x03\x02\x02\x02\u0214\u0215\x03\x02\x02\x02\u0215" +
+		"\u0213\x03\x02\x02\x02\u0215\u0216\x03\x02\x02\x02\u0216z\x03\x02\x02" +
+		"\x02\u0217\u0218\x07v\x02\x02\u0218\u0219\x07t\x02\x02\u0219\u021A\x07" +
+		"w\x02\x02\u021A\u0221\x07g\x02\x02\u021B\u021C\x07h\x02\x02\u021C\u021D" +
+		"\x07c\x02\x02\u021D\u021E\x07n\x02\x02\u021E\u021F\x07u\x02\x02\u021F" +
+		"\u0221\x07g\x02\x02\u0220\u0217\x03\x02\x02\x02\u0220\u021B\x03\x02\x02" +
+		"\x02\u0221|\x03\x02\x02\x02\u0222\u0223\x07u\x02\x02\u0223\u0224\x07c" +
+		"\x02\x02\u0224\u0225\x07v\x02\x02\u0225\u0226\x07q\x02\x02\u0226\u0227" +
+		"\x07u\x02\x02\u0227\u0228\x07j\x02\x02\u0228\u0229\x07k\x02\x02\u0229" +
+		"\u025C\x07u\x02\x02\u022A\u022B\x07u\x02\x02\u022B\u022C\x07c\x02\x02" +
+		"\u022C\u022D\x07v\x02\x02\u022D\u025C\x07u\x02\x02\u022E\u022F\x07h\x02" +
+		"\x02\u022F\u0230\x07k\x02\x02\u0230\u0231\x07p\x02\x02\u0231\u0232\x07" +
+		"p\x02\x02\u0232\u0233\x07g\x02\x02\u0233\u025C\x07{\x02\x02\u0234\u0235" +
+		"\x07d\x02\x02\u0235\u0236\x07k\x02\x02\u0236\u0237\x07v\x02\x02\u0237" +
+		"\u025C\x07u\x02\x02\u0238\u0239\x07d\x02\x02\u0239\u023A\x07k\x02\x02" +
+		"\u023A\u023B\x07v\x02\x02\u023B\u023C\x07e\x02\x02\u023C\u023D\x07q\x02" +
+		"\x02\u023D\u023E\x07k\x02\x02\u023E\u025C\x07p\x02\x02\u023F\u0240\x07" +
+		"u\x02\x02\u0240\u0241\x07g\x02\x02\u0241\u0242\x07e\x02\x02\u0242\u0243" +
+		"\x07q\x02\x02\u0243\u0244\x07p\x02\x02\u0244\u0245\x07f\x02\x02\u0245" +
+		"\u025C\x07u\x02\x02\u0246\u0247\x07o\x02\x02\u0247\u0248\x07k\x02\x02" +
+		"\u0248\u0249\x07p\x02\x02\u0249\u024A\x07w\x02\x02\u024A\u024B\x07v\x02" +
+		"\x02\u024B\u024C\x07g\x02\x02\u024C\u025C\x07u\x02\x02\u024D\u024E\x07" +
+		"j\x02\x02\u024E\u024F\x07q\x02\x02\u024F\u0250\x07w\x02\x02\u0250\u0251" +
+		"\x07t\x02\x02\u0251\u025C\x07u\x02\x02\u0252\u0253\x07f\x02\x02\u0253" +
+		"\u0254\x07c\x02\x02\u0254\u0255\x07{\x02\x02\u0255\u025C\x07u\x02\x02" +
+		"\u0256\u0257\x07y\x02\x02\u0257\u0258\x07g\x02\x02\u0258\u0259\x07g\x02" +
+		"\x02\u0259\u025A\x07m\x02\x02\u025A\u025C\x07u\x02\x02\u025B\u0222\x03" +
+		"\x02\x02\x02\u025B\u022A\x03\x02\x02\x02\u025B\u022E\x03\x02\x02\x02\u025B" +
+		"\u0234\x03\x02\x02\x02\u025B\u0238\x03\x02\x02\x02\u025B\u023F\x03\x02" +
+		"\x02\x02\u025B\u0246\x03\x02\x02\x02\u025B\u024D\x03\x02\x02\x02\u025B" +
+		"\u0252\x03\x02\x02\x02\u025B\u0256\x03\x02\x02\x02\u025C~\x03\x02\x02" +
+		"\x02\u025D\u025F\t\x03\x02\x02\u025E\u025D\x03\x02\x02\x02\u025E\u025F" +
+		"\x03\x02\x02\x02\u025F\u0261\x03\x02\x02\x02\u0260\u0262\t\x02\x02\x02" +
+		"\u0261\u0260\x03\x02\x02\x02\u0262\u0263\x03\x02\x02\x02\u0263\u0261\x03" +
+		"\x02\x02\x02\u0263\u0264\x03\x02\x02\x02\u0264\u026B\x03\x02\x02\x02\u0265" +
+		"\u0267\t\x04\x02\x02\u0266\u0268\t\x02\x02\x02\u0267\u0266\x03\x02\x02" +
+		"\x02\u0268\u0269\x03\x02\x02\x02\u0269\u0267\x03\x02\x02\x02\u0269\u026A" +
+		"\x03\x02\x02\x02\u026A\u026C\x03\x02\x02\x02\u026B\u0265\x03\x02\x02\x02" +
+		"\u026B\u026C\x03\x02\x02\x02\u026C\x80\x03\x02\x02\x02\u026D\u026E\x07" +
+		"d\x02\x02\u026E\u026F\x07{\x02\x02\u026F\u0270\x07v\x02\x02\u0270\u0271" +
+		"\x07g\x02\x02\u0271\u0272\x07u\x02\x02\u0272\u0274\x03\x02\x02\x02\u0273" +
+		"\u0275\x05\x83B\x02\u0274\u0273\x03\x02\x02\x02\u0274\u0275\x03\x02\x02" +
+		"\x02\u0275\u027B\x03\x02\x02\x02\u0276\u0277\x07d\x02\x02\u0277\u0278" +
+		"\x07{\x02\x02\u0278\u0279\x07v\x02\x02\u0279\u027B\x07g\x02\x02\u027A" +
+		"\u026D\x03\x02\x02\x02\u027A\u0276\x03\x02\x02\x02\u027B\x82\x03\x02\x02" +
+		"\x02\u027C\u0280\t\x05\x02\x02\u027D\u027F\t\x02\x02\x02\u027E\u027D\x03" +
+		"\x02\x02\x02\u027F\u0282\x03\x02\x02\x02\u0280\u027E\x03\x02\x02\x02\u0280" +
+		"\u0281\x03\x02\x02\x02\u0281\x84\x03\x02\x02\x02\u0282\u0280\x03\x02\x02" +
+		"\x02\u0283\u0289\x07$\x02\x02\u0284\u0285\x07^\x02\x02\u0285\u0288\x07" +
+		"$\x02\x02\u0286\u0288\n\x06\x02\x02\u0287\u0284\x03\x02\x02\x02\u0287" +
+		"\u0286\x03\x02\x02\x02\u0288\u028B\x03\x02\x02\x02\u0289\u028A\x03\x02" +
+		"\x02\x02\u0289\u0287\x03\x02\x02\x02\u028A\u028C\x03\x02\x02\x02\u028B" +
+		"\u0289\x03\x02\x02\x02\u028C\u0298\x07$\x02\x02\u028D\u0293\x07)\x02\x02" +
+		"\u028E\u028F\x07^\x02\x02\u028F\u0292\x07)\x02\x02\u0290\u0292\n\x07\x02" +
+		"\x02\u0291\u028E\x03\x02\x02\x02\u0291\u0290\x03\x02\x02\x02\u0292\u0295" +
+		"\x03\x02\x02\x02\u0293\u0294\x03\x02\x02\x02\u0293\u0291\x03\x02\x02\x02" +
+		"\u0294\u0296\x03\x02\x02\x02\u0295\u0293\x03\x02\x02\x02\u0296\u0298\x07" +
+		")\x02\x02\u0297\u0283\x03\x02\x02\x02\u0297\u028D\x03\x02\x02\x02\u0298" +
+		"\x86\x03\x02\x02\x02\u0299\u029A\x07f\x02\x02\u029A\u029B\x07c\x02\x02" +
+		"\u029B\u029C\x07v\x02\x02\u029C\u029D\x07g\x02\x02\u029D\u029E\x07*\x02" +
+		"\x02\u029E\u029F\x03\x02\x02\x02\u029F\u02A0\x05\x85C\x02\u02A0\u02A1" +
+		"\x07+\x02\x02\u02A1\x88\x03\x02\x02\x02\u02A2\u02A3\x072\x02\x02\u02A3" +
+		"\u02A7\t\b\x02\x02\u02A4\u02A6\t\t\x02\x02\u02A5\u02A4\x03\x02\x02\x02" +
+		"\u02A6\u02A9\x03\x02\x02\x02\u02A7\u02A5\x03\x02\x02\x02\u02A7\u02A8\x03" +
+		"\x02\x02\x02\u02A8\x8A\x03\x02\x02\x02\u02A9\u02A7\x03\x02\x02\x02\u02AA" +
+		"\u02AB\x07v\x02\x02\u02AB\u02AC\x07z\x02\x02\u02AC\u02AD\x070\x02\x02" +
+		"\u02AD\u02AE\x07c\x02\x02\u02AE\u02AF\x07i\x02\x02\u02AF\u02B8\x07g\x02" +
+		"\x02\u02B0\u02B1\x07v\x02\x02\u02B1\u02B2\x07z\x02\x02\u02B2\u02B3\x07" +
+		"0\x02\x02\u02B3\u02B4\x07v\x02\x02\u02B4\u02B5\x07k\x02\x02\u02B5\u02B6" +
+		"\x07o\x02\x02\u02B6\u02B8\x07g\x02\x02\u02B7\u02AA\x03\x02\x02\x02\u02B7" +
+		"\u02B0\x03\x02\x02\x02\u02B8\x8C\x03\x02\x02\x02\u02B9\u02BA\x07v\x02" +
+		"\x02\u02BA\u02BB\x07j\x02\x02\u02BB\u02BC\x07k\x02\x02\u02BC\u02BD\x07" +
+		"u\x02\x02\u02BD\u02BE\x070\x02\x02\u02BE\u02BF\x07c\x02\x02\u02BF\u02C0" +
+		"\x07e\x02\x02\u02C0\u02C1\x07v\x02\x02\u02C1\u02C2\x07k\x02\x02\u02C2" +
+		"\u02C3\x07x\x02\x02\u02C3\u02C4\x07g\x02\x02\u02C4\u02C5\x07K\x02\x02" +
+		"\u02C5\u02C6\x07p\x02\x02\u02C6\u02C7\x07r\x02\x02\u02C7\u02C8\x07w\x02" +
+		"\x02\u02C8\u02C9\x07v\x02\x02\u02C9\u02CA\x07K\x02\x02\u02CA\u02CB\x07" +
+		"p\x02\x02\u02CB\u02CC\x07f\x02\x02\u02CC\u02CD\x07g\x02\x02\u02CD\u0318" +
+		"\x07z\x02\x02\u02CE\u02CF\x07v\x02\x02\u02CF\u02D0\x07j\x02\x02\u02D0" +
+		"\u02D1\x07k\x02\x02\u02D1\u02D2\x07u\x02\x02\u02D2\u02D3\x070\x02\x02" +
+		"\u02D3\u02D4\x07c\x02\x02\u02D4\u02D5\x07e\x02\x02\u02D5\u02D6\x07v\x02" +
+		"\x02\u02D6\u02D7\x07k\x02\x02\u02D7\u02D8\x07x\x02\x02\u02D8\u02D9\x07" +
+		"g\x02\x02\u02D9\u02DA\x07D\x02\x02\u02DA\u02DB\x07{\x02\x02\u02DB\u02DC" +
+		"\x07v\x02\x02\u02DC\u02DD\x07g\x02\x02\u02DD\u02DE\x07e\x02\x02\u02DE" +
+		"\u02DF\x07q\x02\x02\u02DF\u02E0\x07f\x02\x02\u02E0\u0318\x07g\x02\x02" +
+		"\u02E1\u02E2\x07v\x02\x02\u02E2\u02E3\x07z\x02\x02\u02E3\u02E4\x070\x02" +
+		"\x02\u02E4\u02E5\x07k\x02\x02\u02E5\u02E6\x07p\x02\x02\u02E6\u02E7\x07" +
+		"r\x02\x02\u02E7\u02E8\x07w\x02\x02\u02E8\u02E9\x07v\x02\x02\u02E9\u02EA" +
+		"\x07u\x02\x02\u02EA\u02EB\x070\x02\x02\u02EB\u02EC\x07n\x02\x02\u02EC" +
+		"\u02ED\x07g\x02\x02\u02ED\u02EE\x07p\x02\x02\u02EE\u02EF\x07i\x02\x02" +
+		"\u02EF\u02F0\x07v\x02\x02\u02F0\u0318\x07j\x02\x02\u02F1\u02F2\x07v\x02" +
+		"\x02\u02F2\u02F3\x07z\x02\x02\u02F3\u02F4\x070\x02\x02\u02F4\u02F5\x07" +
+		"q\x02\x02\u02F5\u02F6\x07w\x02\x02\u02F6\u02F7\x07v\x02\x02\u02F7\u02F8" +
+		"\x07r\x02\x02\u02F8\u02F9\x07w\x02\x02\u02F9\u02FA\x07v\x02\x02\u02FA" +
+		"\u02FB\x07u\x02\x02\u02FB\u02FC\x070\x02\x02\u02FC\u02FD\x07n\x02\x02" +
+		"\u02FD\u02FE\x07g\x02\x02\u02FE\u02FF\x07p\x02\x02\u02FF\u0300\x07i\x02" +
+		"\x02\u0300\u0301\x07v\x02\x02\u0301\u0318\x07j\x02\x02\u0302\u0303\x07" +
+		"v\x02\x02\u0303\u0304\x07z\x02\x02\u0304\u0305\x070\x02\x02\u0305\u0306" +
+		"\x07x\x02\x02\u0306\u0307\x07g\x02\x02\u0307\u0308\x07t\x02\x02\u0308" +
+		"\u0309\x07u\x02\x02\u0309\u030A\x07k\x02\x02\u030A\u030B\x07q\x02\x02" +
+		"\u030B\u0318\x07p\x02\x02\u030C\u030D\x07v\x02\x02\u030D\u030E\x07z\x02" +
+		"\x02\u030E\u030F\x070\x02\x02\u030F\u0310\x07n\x02\x02\u0310\u0311\x07" +
+		"q\x02\x02\u0311\u0312\x07e\x02\x02\u0312\u0313\x07m\x02\x02\u0313\u0314" +
+		"\x07v\x02\x02\u0314\u0315\x07k\x02\x02\u0315\u0316\x07o\x02\x02\u0316" +
+		"\u0318\x07g\x02\x02\u0317\u02B9\x03\x02\x02\x02\u0317\u02CE\x03\x02\x02" +
+		"\x02\u0317\u02E1\x03\x02\x02\x02\u0317\u02F1\x03\x02\x02\x02\u0317\u0302" +
+		"\x03\x02\x02\x02\u0317\u030C\x03\x02\x02\x02\u0318\x8E\x03\x02\x02\x02" +
+		"\u0319\u031D\t\n\x02\x02\u031A\u031C\t\v\x02\x02\u031B\u031A\x03\x02\x02" +
+		"\x02\u031C\u031F\x03\x02\x02\x02\u031D\u031B\x03\x02\x02\x02\u031D\u031E" +
+		"\x03\x02\x02\x02\u031E\x90\x03\x02\x02\x02\u031F\u031D\x03\x02\x02\x02" +
+		"\u0320\u0322\t\f\x02\x02\u0321\u0320\x03\x02\x02\x02\u0322\u0323\x03\x02" +
+		"\x02\x02\u0323\u0321\x03\x02\x02\x02\u0323\u0324\x03\x02\x02\x02\u0324" +
+		"\u0325\x03\x02\x02\x02\u0325\u0326\bI\x02\x02\u0326\x92\x03\x02\x02\x02" +
+		"\u0327\u0328\x071\x02\x02\u0328\u0329\x07,\x02\x02\u0329\u032D\x03\x02" +
+		"\x02\x02\u032A\u032C\v\x02\x02\x02\u032B\u032A\x03\x02\x02\x02\u032C\u032F" +
+		"\x03\x02\x02\x02\u032D\u032E\x03\x02\x02\x02\u032D\u032B\x03\x02\x02\x02" +
+		"\u032E\u0330\x03\x02\x02\x02\u032F\u032D\x03\x02\x02\x02\u0330\u0331\x07" +
+		",\x02\x02\u0331\u0332\x071\x02\x02\u0332\u0333\x03\x02\x02\x02\u0333\u0334" +
+		"\bJ\x03\x02\u0334\x94\x03\x02\x02\x02\u0335\u0336\x071\x02\x02\u0336\u0337" +
+		"\x071\x02\x02\u0337\u033B\x03\x02\x02\x02\u0338\u033A\n\r\x02\x02\u0339" +
+		"\u0338\x03\x02\x02\x02\u033A\u033D\x03\x02\x02\x02\u033B\u0339\x03\x02" +
+		"\x02\x02\u033B\u033C\x03\x02\x02\x02\u033C\u033E\x03\x02\x02\x02\u033D" +
+		"\u033B\x03\x02\x02\x02\u033E\u033F\bK\x03\x02\u033F\x96\x03\x02\x02\x02" +
+		"\x1B\x02\u0209\u020F\u0215\u0220\u025B\u025E\u0263\u0269\u026B\u0274\u027A" +
+		"\u0280\u0287\u0289\u0291\u0293\u0297\u02A7\u02B7\u0317\u031D\u0323\u032D" +
+		"\u033B\x04\b\x02\x02\x02\x03\x02";
 	public static readonly _serializedATN: string = Utils.join(
 		[
 			CashScriptLexer._serializedATNSegment0,
diff --git a/packages/cashc/src/grammar/CashScriptParser.ts b/packages/cashc/src/grammar/CashScriptParser.ts
index 0ea98f31..5e990dbe 100644
--- a/packages/cashc/src/grammar/CashScriptParser.ts
+++ b/packages/cashc/src/grammar/CashScriptParser.ts
@@ -83,21 +83,24 @@ export class CashScriptParser extends Parser {
 	public static readonly T__53 = 54;
 	public static readonly T__54 = 55;
 	public static readonly T__55 = 56;
-	public static readonly VersionLiteral = 57;
-	public static readonly BooleanLiteral = 58;
-	public static readonly NumberUnit = 59;
-	public static readonly NumberLiteral = 60;
-	public static readonly Bytes = 61;
-	public static readonly Bound = 62;
-	public static readonly StringLiteral = 63;
-	public static readonly DateLiteral = 64;
-	public static readonly HexLiteral = 65;
-	public static readonly TxVar = 66;
-	public static readonly NullaryOp = 67;
-	public static readonly Identifier = 68;
-	public static readonly WHITESPACE = 69;
-	public static readonly COMMENT = 70;
-	public static readonly LINE_COMMENT = 71;
+	public static readonly T__56 = 57;
+	public static readonly T__57 = 58;
+	public static readonly T__58 = 59;
+	public static readonly VersionLiteral = 60;
+	public static readonly BooleanLiteral = 61;
+	public static readonly NumberUnit = 62;
+	public static readonly NumberLiteral = 63;
+	public static readonly Bytes = 64;
+	public static readonly Bound = 65;
+	public static readonly StringLiteral = 66;
+	public static readonly DateLiteral = 67;
+	public static readonly HexLiteral = 68;
+	public static readonly TxVar = 69;
+	public static readonly NullaryOp = 70;
+	public static readonly Identifier = 71;
+	public static readonly WHITESPACE = 72;
+	public static readonly COMMENT = 73;
+	public static readonly LINE_COMMENT = 74;
 	public static readonly RULE_sourceFile = 0;
 	public static readonly RULE_pragmaDirective = 1;
 	public static readonly RULE_pragmaName = 2;
@@ -136,13 +139,13 @@ export class CashScriptParser extends Parser {
 	private static readonly _LITERAL_NAMES: Array<string | undefined> = [
 		undefined, "'pragma'", "';'", "'cashscript'", "'^'", "'~'", "'>='", "'>'", 
 		"'<'", "'<='", "'='", "'contract'", "'{'", "'}'", "'function'", "'('", 
-		"','", "')'", "'require'", "'if'", "'else'", "'new'", "'['", "']'", "'tx.outputs'", 
-		"'.value'", "'.lockingBytecode'", "'.tokenCategory'", "'.nftCommitment'", 
-		"'.tokenAmount'", "'tx.inputs'", "'.outpointTransactionHash'", "'.outpointIndex'", 
-		"'.unlockingBytecode'", "'.sequenceNumber'", "'.reverse()'", "'.length'", 
-		"'.split'", "'!'", "'-'", "'*'", "'/'", "'%'", "'+'", "'=='", "'!='", 
-		"'&'", "'|'", "'&&'", "'||'", "'constant'", "'int'", "'bool'", "'string'", 
-		"'pubkey'", "'sig'", "'datasig'",
+		"','", "')'", "'require'", "'if'", "'else'", "'new'", "'['", "']'", "'console.'", 
+		"'log'", "'warn'", "'tx.outputs'", "'.value'", "'.lockingBytecode'", "'.tokenCategory'", 
+		"'.nftCommitment'", "'.tokenAmount'", "'tx.inputs'", "'.outpointTransactionHash'", 
+		"'.outpointIndex'", "'.unlockingBytecode'", "'.sequenceNumber'", "'.reverse()'", 
+		"'.length'", "'.split'", "'!'", "'-'", "'*'", "'/'", "'%'", "'+'", "'=='", 
+		"'!='", "'&'", "'|'", "'&&'", "'||'", "'constant'", "'int'", "'bool'", 
+		"'string'", "'pubkey'", "'sig'", "'datasig'",
 	];
 	private static readonly _SYMBOLIC_NAMES: Array<string | undefined> = [
 		undefined, undefined, undefined, undefined, undefined, undefined, undefined, 
@@ -153,9 +156,10 @@ export class CashScriptParser extends Parser {
 		undefined, undefined, undefined, undefined, undefined, undefined, undefined, 
 		undefined, undefined, undefined, undefined, undefined, undefined, undefined, 
 		undefined, undefined, undefined, undefined, undefined, undefined, undefined, 
-		undefined, "VersionLiteral", "BooleanLiteral", "NumberUnit", "NumberLiteral", 
-		"Bytes", "Bound", "StringLiteral", "DateLiteral", "HexLiteral", "TxVar", 
-		"NullaryOp", "Identifier", "WHITESPACE", "COMMENT", "LINE_COMMENT",
+		undefined, undefined, undefined, undefined, "VersionLiteral", "BooleanLiteral", 
+		"NumberUnit", "NumberLiteral", "Bytes", "Bound", "StringLiteral", "DateLiteral", 
+		"HexLiteral", "TxVar", "NullaryOp", "Identifier", "WHITESPACE", "COMMENT", 
+		"LINE_COMMENT",
 	];
 	public static readonly VOCABULARY: Vocabulary = new VocabularyImpl(CashScriptParser._LITERAL_NAMES, CashScriptParser._SYMBOLIC_NAMES, []);
 
@@ -456,7 +460,7 @@ export class CashScriptParser extends Parser {
 			this.state = 96;
 			this._errHandler.sync(this);
 			_la = this._input.LA(1);
-			while (_la === CashScriptParser.T__17 || _la === CashScriptParser.T__18 || ((((_la - 51)) & ~0x1F) === 0 && ((1 << (_la - 51)) & ((1 << (CashScriptParser.T__50 - 51)) | (1 << (CashScriptParser.T__51 - 51)) | (1 << (CashScriptParser.T__52 - 51)) | (1 << (CashScriptParser.T__53 - 51)) | (1 << (CashScriptParser.T__54 - 51)) | (1 << (CashScriptParser.T__55 - 51)) | (1 << (CashScriptParser.Bytes - 51)) | (1 << (CashScriptParser.Identifier - 51)))) !== 0)) {
+			while (_la === CashScriptParser.T__17 || _la === CashScriptParser.T__18 || ((((_la - 54)) & ~0x1F) === 0 && ((1 << (_la - 54)) & ((1 << (CashScriptParser.T__53 - 54)) | (1 << (CashScriptParser.T__54 - 54)) | (1 << (CashScriptParser.T__55 - 54)) | (1 << (CashScriptParser.T__56 - 54)) | (1 << (CashScriptParser.T__57 - 54)) | (1 << (CashScriptParser.T__58 - 54)) | (1 << (CashScriptParser.Bytes - 54)) | (1 << (CashScriptParser.Identifier - 54)))) !== 0)) {
 				{
 				{
 				this.state = 93;
@@ -499,7 +503,7 @@ export class CashScriptParser extends Parser {
 			this.state = 113;
 			this._errHandler.sync(this);
 			_la = this._input.LA(1);
-			if (((((_la - 51)) & ~0x1F) === 0 && ((1 << (_la - 51)) & ((1 << (CashScriptParser.T__50 - 51)) | (1 << (CashScriptParser.T__51 - 51)) | (1 << (CashScriptParser.T__52 - 51)) | (1 << (CashScriptParser.T__53 - 51)) | (1 << (CashScriptParser.T__54 - 51)) | (1 << (CashScriptParser.T__55 - 51)) | (1 << (CashScriptParser.Bytes - 51)))) !== 0)) {
+			if (((((_la - 54)) & ~0x1F) === 0 && ((1 << (_la - 54)) & ((1 << (CashScriptParser.T__53 - 54)) | (1 << (CashScriptParser.T__54 - 54)) | (1 << (CashScriptParser.T__55 - 54)) | (1 << (CashScriptParser.T__56 - 54)) | (1 << (CashScriptParser.T__57 - 54)) | (1 << (CashScriptParser.T__58 - 54)) | (1 << (CashScriptParser.Bytes - 54)))) !== 0)) {
 				{
 				this.state = 102;
 				this.parameter();
@@ -596,7 +600,7 @@ export class CashScriptParser extends Parser {
 				this.state = 124;
 				this._errHandler.sync(this);
 				_la = this._input.LA(1);
-				while (_la === CashScriptParser.T__17 || _la === CashScriptParser.T__18 || ((((_la - 51)) & ~0x1F) === 0 && ((1 << (_la - 51)) & ((1 << (CashScriptParser.T__50 - 51)) | (1 << (CashScriptParser.T__51 - 51)) | (1 << (CashScriptParser.T__52 - 51)) | (1 << (CashScriptParser.T__53 - 51)) | (1 << (CashScriptParser.T__54 - 51)) | (1 << (CashScriptParser.T__55 - 51)) | (1 << (CashScriptParser.Bytes - 51)) | (1 << (CashScriptParser.Identifier - 51)))) !== 0)) {
+				while (_la === CashScriptParser.T__17 || _la === CashScriptParser.T__18 || ((((_la - 54)) & ~0x1F) === 0 && ((1 << (_la - 54)) & ((1 << (CashScriptParser.T__53 - 54)) | (1 << (CashScriptParser.T__54 - 54)) | (1 << (CashScriptParser.T__55 - 54)) | (1 << (CashScriptParser.T__56 - 54)) | (1 << (CashScriptParser.T__57 - 54)) | (1 << (CashScriptParser.T__58 - 54)) | (1 << (CashScriptParser.Bytes - 54)) | (1 << (CashScriptParser.Identifier - 54)))) !== 0)) {
 					{
 					{
 					this.state = 121;
@@ -613,12 +617,12 @@ export class CashScriptParser extends Parser {
 				break;
 			case CashScriptParser.T__17:
 			case CashScriptParser.T__18:
-			case CashScriptParser.T__50:
-			case CashScriptParser.T__51:
-			case CashScriptParser.T__52:
 			case CashScriptParser.T__53:
 			case CashScriptParser.T__54:
 			case CashScriptParser.T__55:
+			case CashScriptParser.T__56:
+			case CashScriptParser.T__57:
+			case CashScriptParser.T__58:
 			case CashScriptParser.Bytes:
 			case CashScriptParser.Identifier:
 				this.enterOuterAlt(_localctx, 2);
@@ -729,7 +733,7 @@ export class CashScriptParser extends Parser {
 			this.state = 143;
 			this._errHandler.sync(this);
 			_la = this._input.LA(1);
-			while (_la === CashScriptParser.T__49) {
+			while (_la === CashScriptParser.T__52) {
 				{
 				{
 				this.state = 140;
@@ -990,7 +994,7 @@ export class CashScriptParser extends Parser {
 			this.state = 203;
 			this._errHandler.sync(this);
 			_la = this._input.LA(1);
-			if ((((_la) & ~0x1F) === 0 && ((1 << _la) & ((1 << CashScriptParser.T__14) | (1 << CashScriptParser.T__20) | (1 << CashScriptParser.T__21) | (1 << CashScriptParser.T__23) | (1 << CashScriptParser.T__29))) !== 0) || ((((_la - 38)) & ~0x1F) === 0 && ((1 << (_la - 38)) & ((1 << (CashScriptParser.T__37 - 38)) | (1 << (CashScriptParser.T__38 - 38)) | (1 << (CashScriptParser.T__50 - 38)) | (1 << (CashScriptParser.T__51 - 38)) | (1 << (CashScriptParser.T__52 - 38)) | (1 << (CashScriptParser.T__53 - 38)) | (1 << (CashScriptParser.T__54 - 38)) | (1 << (CashScriptParser.T__55 - 38)) | (1 << (CashScriptParser.BooleanLiteral - 38)) | (1 << (CashScriptParser.NumberLiteral - 38)) | (1 << (CashScriptParser.Bytes - 38)) | (1 << (CashScriptParser.StringLiteral - 38)) | (1 << (CashScriptParser.DateLiteral - 38)) | (1 << (CashScriptParser.HexLiteral - 38)) | (1 << (CashScriptParser.NullaryOp - 38)) | (1 << (CashScriptParser.Identifier - 38)))) !== 0)) {
+			if (((((_la - 15)) & ~0x1F) === 0 && ((1 << (_la - 15)) & ((1 << (CashScriptParser.T__14 - 15)) | (1 << (CashScriptParser.T__20 - 15)) | (1 << (CashScriptParser.T__21 - 15)) | (1 << (CashScriptParser.T__23 - 15)) | (1 << (CashScriptParser.T__26 - 15)) | (1 << (CashScriptParser.T__32 - 15)) | (1 << (CashScriptParser.T__40 - 15)) | (1 << (CashScriptParser.T__41 - 15)))) !== 0) || ((((_la - 54)) & ~0x1F) === 0 && ((1 << (_la - 54)) & ((1 << (CashScriptParser.T__53 - 54)) | (1 << (CashScriptParser.T__54 - 54)) | (1 << (CashScriptParser.T__55 - 54)) | (1 << (CashScriptParser.T__56 - 54)) | (1 << (CashScriptParser.T__57 - 54)) | (1 << (CashScriptParser.T__58 - 54)) | (1 << (CashScriptParser.BooleanLiteral - 54)) | (1 << (CashScriptParser.NumberLiteral - 54)) | (1 << (CashScriptParser.Bytes - 54)) | (1 << (CashScriptParser.StringLiteral - 54)) | (1 << (CashScriptParser.DateLiteral - 54)) | (1 << (CashScriptParser.HexLiteral - 54)) | (1 << (CashScriptParser.NullaryOp - 54)) | (1 << (CashScriptParser.Identifier - 54)))) !== 0)) {
 				{
 				this.state = 192;
 				this.expression(0);
@@ -1063,7 +1067,7 @@ export class CashScriptParser extends Parser {
 			let _alt: number;
 			this.enterOuterAlt(_localctx, 1);
 			{
-			this.state = 260;
+			this.state = 263;
 			this._errHandler.sync(this);
 			switch ( this.interpreter.adaptivePredict(this._input, 21, this._ctx) ) {
 			case 1:
@@ -1145,21 +1149,46 @@ export class CashScriptParser extends Parser {
 
 			case 5:
 				{
-				_localctx = new UnaryIntrospectionOpContext(_localctx);
+				_localctx = new ConsoleExpressionContext(_localctx);
 				this._ctx = _localctx;
 				_prevctx = _localctx;
 				this.state = 228;
-				(_localctx as UnaryIntrospectionOpContext)._scope = this.match(CashScriptParser.T__23);
+				(_localctx as ConsoleExpressionContext)._scope = this.match(CashScriptParser.T__23);
 				this.state = 229;
-				this.match(CashScriptParser.T__21);
+				(_localctx as ConsoleExpressionContext)._op = this._input.LT(1);
+				_la = this._input.LA(1);
+				if (!(_la === CashScriptParser.T__24 || _la === CashScriptParser.T__25)) {
+					(_localctx as ConsoleExpressionContext)._op = this._errHandler.recoverInline(this);
+				} else {
+					if (this._input.LA(1) === Token.EOF) {
+						this.matchedEOF = true;
+					}
+
+					this._errHandler.reportMatch(this);
+					this.consume();
+				}
 				this.state = 230;
-				this.expression(0);
+				this.expressionList();
+				}
+				break;
+
+			case 6:
+				{
+				_localctx = new UnaryIntrospectionOpContext(_localctx);
+				this._ctx = _localctx;
+				_prevctx = _localctx;
 				this.state = 231;
-				this.match(CashScriptParser.T__22);
+				(_localctx as UnaryIntrospectionOpContext)._scope = this.match(CashScriptParser.T__26);
 				this.state = 232;
+				this.match(CashScriptParser.T__21);
+				this.state = 233;
+				this.expression(0);
+				this.state = 234;
+				this.match(CashScriptParser.T__22);
+				this.state = 235;
 				(_localctx as UnaryIntrospectionOpContext)._op = this._input.LT(1);
 				_la = this._input.LA(1);
-				if (!((((_la) & ~0x1F) === 0 && ((1 << _la) & ((1 << CashScriptParser.T__24) | (1 << CashScriptParser.T__25) | (1 << CashScriptParser.T__26) | (1 << CashScriptParser.T__27) | (1 << CashScriptParser.T__28))) !== 0))) {
+				if (!(((((_la - 28)) & ~0x1F) === 0 && ((1 << (_la - 28)) & ((1 << (CashScriptParser.T__27 - 28)) | (1 << (CashScriptParser.T__28 - 28)) | (1 << (CashScriptParser.T__29 - 28)) | (1 << (CashScriptParser.T__30 - 28)) | (1 << (CashScriptParser.T__31 - 28)))) !== 0))) {
 					(_localctx as UnaryIntrospectionOpContext)._op = this._errHandler.recoverInline(this);
 				} else {
 					if (this._input.LA(1) === Token.EOF) {
@@ -1172,23 +1201,23 @@ export class CashScriptParser extends Parser {
 				}
 				break;
 
-			case 6:
+			case 7:
 				{
 				_localctx = new UnaryIntrospectionOpContext(_localctx);
 				this._ctx = _localctx;
 				_prevctx = _localctx;
-				this.state = 234;
-				(_localctx as UnaryIntrospectionOpContext)._scope = this.match(CashScriptParser.T__29);
-				this.state = 235;
+				this.state = 237;
+				(_localctx as UnaryIntrospectionOpContext)._scope = this.match(CashScriptParser.T__32);
+				this.state = 238;
 				this.match(CashScriptParser.T__21);
-				this.state = 236;
+				this.state = 239;
 				this.expression(0);
-				this.state = 237;
+				this.state = 240;
 				this.match(CashScriptParser.T__22);
-				this.state = 238;
+				this.state = 241;
 				(_localctx as UnaryIntrospectionOpContext)._op = this._input.LT(1);
 				_la = this._input.LA(1);
-				if (!(((((_la - 25)) & ~0x1F) === 0 && ((1 << (_la - 25)) & ((1 << (CashScriptParser.T__24 - 25)) | (1 << (CashScriptParser.T__25 - 25)) | (1 << (CashScriptParser.T__26 - 25)) | (1 << (CashScriptParser.T__27 - 25)) | (1 << (CashScriptParser.T__28 - 25)) | (1 << (CashScriptParser.T__30 - 25)) | (1 << (CashScriptParser.T__31 - 25)) | (1 << (CashScriptParser.T__32 - 25)) | (1 << (CashScriptParser.T__33 - 25)))) !== 0))) {
+				if (!(((((_la - 28)) & ~0x1F) === 0 && ((1 << (_la - 28)) & ((1 << (CashScriptParser.T__27 - 28)) | (1 << (CashScriptParser.T__28 - 28)) | (1 << (CashScriptParser.T__29 - 28)) | (1 << (CashScriptParser.T__30 - 28)) | (1 << (CashScriptParser.T__31 - 28)) | (1 << (CashScriptParser.T__33 - 28)) | (1 << (CashScriptParser.T__34 - 28)) | (1 << (CashScriptParser.T__35 - 28)) | (1 << (CashScriptParser.T__36 - 28)))) !== 0))) {
 					(_localctx as UnaryIntrospectionOpContext)._op = this._errHandler.recoverInline(this);
 				} else {
 					if (this._input.LA(1) === Token.EOF) {
@@ -1201,15 +1230,15 @@ export class CashScriptParser extends Parser {
 				}
 				break;
 
-			case 7:
+			case 8:
 				{
 				_localctx = new UnaryOpContext(_localctx);
 				this._ctx = _localctx;
 				_prevctx = _localctx;
-				this.state = 240;
+				this.state = 243;
 				(_localctx as UnaryOpContext)._op = this._input.LT(1);
 				_la = this._input.LA(1);
-				if (!(_la === CashScriptParser.T__37 || _la === CashScriptParser.T__38)) {
+				if (!(_la === CashScriptParser.T__40 || _la === CashScriptParser.T__41)) {
 					(_localctx as UnaryOpContext)._op = this._errHandler.recoverInline(this);
 				} else {
 					if (this._input.LA(1) === Token.EOF) {
@@ -1219,49 +1248,49 @@ export class CashScriptParser extends Parser {
 					this._errHandler.reportMatch(this);
 					this.consume();
 				}
-				this.state = 241;
+				this.state = 244;
 				this.expression(14);
 				}
 				break;
 
-			case 8:
+			case 9:
 				{
 				_localctx = new ArrayContext(_localctx);
 				this._ctx = _localctx;
 				_prevctx = _localctx;
-				this.state = 242;
+				this.state = 245;
 				this.match(CashScriptParser.T__21);
-				this.state = 254;
+				this.state = 257;
 				this._errHandler.sync(this);
 				_la = this._input.LA(1);
-				if ((((_la) & ~0x1F) === 0 && ((1 << _la) & ((1 << CashScriptParser.T__14) | (1 << CashScriptParser.T__20) | (1 << CashScriptParser.T__21) | (1 << CashScriptParser.T__23) | (1 << CashScriptParser.T__29))) !== 0) || ((((_la - 38)) & ~0x1F) === 0 && ((1 << (_la - 38)) & ((1 << (CashScriptParser.T__37 - 38)) | (1 << (CashScriptParser.T__38 - 38)) | (1 << (CashScriptParser.T__50 - 38)) | (1 << (CashScriptParser.T__51 - 38)) | (1 << (CashScriptParser.T__52 - 38)) | (1 << (CashScriptParser.T__53 - 38)) | (1 << (CashScriptParser.T__54 - 38)) | (1 << (CashScriptParser.T__55 - 38)) | (1 << (CashScriptParser.BooleanLiteral - 38)) | (1 << (CashScriptParser.NumberLiteral - 38)) | (1 << (CashScriptParser.Bytes - 38)) | (1 << (CashScriptParser.StringLiteral - 38)) | (1 << (CashScriptParser.DateLiteral - 38)) | (1 << (CashScriptParser.HexLiteral - 38)) | (1 << (CashScriptParser.NullaryOp - 38)) | (1 << (CashScriptParser.Identifier - 38)))) !== 0)) {
+				if (((((_la - 15)) & ~0x1F) === 0 && ((1 << (_la - 15)) & ((1 << (CashScriptParser.T__14 - 15)) | (1 << (CashScriptParser.T__20 - 15)) | (1 << (CashScriptParser.T__21 - 15)) | (1 << (CashScriptParser.T__23 - 15)) | (1 << (CashScriptParser.T__26 - 15)) | (1 << (CashScriptParser.T__32 - 15)) | (1 << (CashScriptParser.T__40 - 15)) | (1 << (CashScriptParser.T__41 - 15)))) !== 0) || ((((_la - 54)) & ~0x1F) === 0 && ((1 << (_la - 54)) & ((1 << (CashScriptParser.T__53 - 54)) | (1 << (CashScriptParser.T__54 - 54)) | (1 << (CashScriptParser.T__55 - 54)) | (1 << (CashScriptParser.T__56 - 54)) | (1 << (CashScriptParser.T__57 - 54)) | (1 << (CashScriptParser.T__58 - 54)) | (1 << (CashScriptParser.BooleanLiteral - 54)) | (1 << (CashScriptParser.NumberLiteral - 54)) | (1 << (CashScriptParser.Bytes - 54)) | (1 << (CashScriptParser.StringLiteral - 54)) | (1 << (CashScriptParser.DateLiteral - 54)) | (1 << (CashScriptParser.HexLiteral - 54)) | (1 << (CashScriptParser.NullaryOp - 54)) | (1 << (CashScriptParser.Identifier - 54)))) !== 0)) {
 					{
-					this.state = 243;
+					this.state = 246;
 					this.expression(0);
-					this.state = 248;
+					this.state = 251;
 					this._errHandler.sync(this);
 					_alt = this.interpreter.adaptivePredict(this._input, 18, this._ctx);
 					while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
 						if (_alt === 1) {
 							{
 							{
-							this.state = 244;
+							this.state = 247;
 							this.match(CashScriptParser.T__15);
-							this.state = 245;
+							this.state = 248;
 							this.expression(0);
 							}
 							}
 						}
-						this.state = 250;
+						this.state = 253;
 						this._errHandler.sync(this);
 						_alt = this.interpreter.adaptivePredict(this._input, 18, this._ctx);
 					}
-					this.state = 252;
+					this.state = 255;
 					this._errHandler.sync(this);
 					_la = this._input.LA(1);
 					if (_la === CashScriptParser.T__15) {
 						{
-						this.state = 251;
+						this.state = 254;
 						this.match(CashScriptParser.T__15);
 						}
 					}
@@ -1269,43 +1298,43 @@ export class CashScriptParser extends Parser {
 					}
 				}
 
-				this.state = 256;
+				this.state = 259;
 				this.match(CashScriptParser.T__22);
 				}
 				break;
 
-			case 9:
+			case 10:
 				{
 				_localctx = new NullaryOpContext(_localctx);
 				this._ctx = _localctx;
 				_prevctx = _localctx;
-				this.state = 257;
+				this.state = 260;
 				this.match(CashScriptParser.NullaryOp);
 				}
 				break;
 
-			case 10:
+			case 11:
 				{
 				_localctx = new IdentifierContext(_localctx);
 				this._ctx = _localctx;
 				_prevctx = _localctx;
-				this.state = 258;
+				this.state = 261;
 				this.match(CashScriptParser.Identifier);
 				}
 				break;
 
-			case 11:
+			case 12:
 				{
 				_localctx = new LiteralExpressionContext(_localctx);
 				this._ctx = _localctx;
 				_prevctx = _localctx;
-				this.state = 259;
+				this.state = 262;
 				this.literal();
 				}
 				break;
 			}
 			this._ctx._stop = this._input.tryLT(-1);
-			this.state = 303;
+			this.state = 306;
 			this._errHandler.sync(this);
 			_alt = this.interpreter.adaptivePredict(this._input, 23, this._ctx);
 			while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
@@ -1315,7 +1344,7 @@ export class CashScriptParser extends Parser {
 					}
 					_prevctx = _localctx;
 					{
-					this.state = 301;
+					this.state = 304;
 					this._errHandler.sync(this);
 					switch ( this.interpreter.adaptivePredict(this._input, 22, this._ctx) ) {
 					case 1:
@@ -1323,14 +1352,14 @@ export class CashScriptParser extends Parser {
 						_localctx = new BinaryOpContext(new ExpressionContext(_parentctx, _parentState));
 						(_localctx as BinaryOpContext)._left = _prevctx;
 						this.pushNewRecursionContext(_localctx, _startState, CashScriptParser.RULE_expression);
-						this.state = 262;
+						this.state = 265;
 						if (!(this.precpred(this._ctx, 13))) {
 							throw this.createFailedPredicateException("this.precpred(this._ctx, 13)");
 						}
-						this.state = 263;
+						this.state = 266;
 						(_localctx as BinaryOpContext)._op = this._input.LT(1);
 						_la = this._input.LA(1);
-						if (!(((((_la - 40)) & ~0x1F) === 0 && ((1 << (_la - 40)) & ((1 << (CashScriptParser.T__39 - 40)) | (1 << (CashScriptParser.T__40 - 40)) | (1 << (CashScriptParser.T__41 - 40)))) !== 0))) {
+						if (!(((((_la - 43)) & ~0x1F) === 0 && ((1 << (_la - 43)) & ((1 << (CashScriptParser.T__42 - 43)) | (1 << (CashScriptParser.T__43 - 43)) | (1 << (CashScriptParser.T__44 - 43)))) !== 0))) {
 							(_localctx as BinaryOpContext)._op = this._errHandler.recoverInline(this);
 						} else {
 							if (this._input.LA(1) === Token.EOF) {
@@ -1340,7 +1369,7 @@ export class CashScriptParser extends Parser {
 							this._errHandler.reportMatch(this);
 							this.consume();
 						}
-						this.state = 264;
+						this.state = 267;
 						(_localctx as BinaryOpContext)._right = this.expression(14);
 						}
 						break;
@@ -1350,14 +1379,14 @@ export class CashScriptParser extends Parser {
 						_localctx = new BinaryOpContext(new ExpressionContext(_parentctx, _parentState));
 						(_localctx as BinaryOpContext)._left = _prevctx;
 						this.pushNewRecursionContext(_localctx, _startState, CashScriptParser.RULE_expression);
-						this.state = 265;
+						this.state = 268;
 						if (!(this.precpred(this._ctx, 12))) {
 							throw this.createFailedPredicateException("this.precpred(this._ctx, 12)");
 						}
-						this.state = 266;
+						this.state = 269;
 						(_localctx as BinaryOpContext)._op = this._input.LT(1);
 						_la = this._input.LA(1);
-						if (!(_la === CashScriptParser.T__38 || _la === CashScriptParser.T__42)) {
+						if (!(_la === CashScriptParser.T__41 || _la === CashScriptParser.T__45)) {
 							(_localctx as BinaryOpContext)._op = this._errHandler.recoverInline(this);
 						} else {
 							if (this._input.LA(1) === Token.EOF) {
@@ -1367,7 +1396,7 @@ export class CashScriptParser extends Parser {
 							this._errHandler.reportMatch(this);
 							this.consume();
 						}
-						this.state = 267;
+						this.state = 270;
 						(_localctx as BinaryOpContext)._right = this.expression(13);
 						}
 						break;
@@ -1377,11 +1406,11 @@ export class CashScriptParser extends Parser {
 						_localctx = new BinaryOpContext(new ExpressionContext(_parentctx, _parentState));
 						(_localctx as BinaryOpContext)._left = _prevctx;
 						this.pushNewRecursionContext(_localctx, _startState, CashScriptParser.RULE_expression);
-						this.state = 268;
+						this.state = 271;
 						if (!(this.precpred(this._ctx, 11))) {
 							throw this.createFailedPredicateException("this.precpred(this._ctx, 11)");
 						}
-						this.state = 269;
+						this.state = 272;
 						(_localctx as BinaryOpContext)._op = this._input.LT(1);
 						_la = this._input.LA(1);
 						if (!((((_la) & ~0x1F) === 0 && ((1 << _la) & ((1 << CashScriptParser.T__5) | (1 << CashScriptParser.T__6) | (1 << CashScriptParser.T__7) | (1 << CashScriptParser.T__8))) !== 0))) {
@@ -1394,7 +1423,7 @@ export class CashScriptParser extends Parser {
 							this._errHandler.reportMatch(this);
 							this.consume();
 						}
-						this.state = 270;
+						this.state = 273;
 						(_localctx as BinaryOpContext)._right = this.expression(12);
 						}
 						break;
@@ -1404,14 +1433,14 @@ export class CashScriptParser extends Parser {
 						_localctx = new BinaryOpContext(new ExpressionContext(_parentctx, _parentState));
 						(_localctx as BinaryOpContext)._left = _prevctx;
 						this.pushNewRecursionContext(_localctx, _startState, CashScriptParser.RULE_expression);
-						this.state = 271;
+						this.state = 274;
 						if (!(this.precpred(this._ctx, 10))) {
 							throw this.createFailedPredicateException("this.precpred(this._ctx, 10)");
 						}
-						this.state = 272;
+						this.state = 275;
 						(_localctx as BinaryOpContext)._op = this._input.LT(1);
 						_la = this._input.LA(1);
-						if (!(_la === CashScriptParser.T__43 || _la === CashScriptParser.T__44)) {
+						if (!(_la === CashScriptParser.T__46 || _la === CashScriptParser.T__47)) {
 							(_localctx as BinaryOpContext)._op = this._errHandler.recoverInline(this);
 						} else {
 							if (this._input.LA(1) === Token.EOF) {
@@ -1421,7 +1450,7 @@ export class CashScriptParser extends Parser {
 							this._errHandler.reportMatch(this);
 							this.consume();
 						}
-						this.state = 273;
+						this.state = 276;
 						(_localctx as BinaryOpContext)._right = this.expression(11);
 						}
 						break;
@@ -1431,13 +1460,13 @@ export class CashScriptParser extends Parser {
 						_localctx = new BinaryOpContext(new ExpressionContext(_parentctx, _parentState));
 						(_localctx as BinaryOpContext)._left = _prevctx;
 						this.pushNewRecursionContext(_localctx, _startState, CashScriptParser.RULE_expression);
-						this.state = 274;
+						this.state = 277;
 						if (!(this.precpred(this._ctx, 9))) {
 							throw this.createFailedPredicateException("this.precpred(this._ctx, 9)");
 						}
-						this.state = 275;
-						(_localctx as BinaryOpContext)._op = this.match(CashScriptParser.T__45);
-						this.state = 276;
+						this.state = 278;
+						(_localctx as BinaryOpContext)._op = this.match(CashScriptParser.T__48);
+						this.state = 279;
 						(_localctx as BinaryOpContext)._right = this.expression(10);
 						}
 						break;
@@ -1447,13 +1476,13 @@ export class CashScriptParser extends Parser {
 						_localctx = new BinaryOpContext(new ExpressionContext(_parentctx, _parentState));
 						(_localctx as BinaryOpContext)._left = _prevctx;
 						this.pushNewRecursionContext(_localctx, _startState, CashScriptParser.RULE_expression);
-						this.state = 277;
+						this.state = 280;
 						if (!(this.precpred(this._ctx, 8))) {
 							throw this.createFailedPredicateException("this.precpred(this._ctx, 8)");
 						}
-						this.state = 278;
+						this.state = 281;
 						(_localctx as BinaryOpContext)._op = this.match(CashScriptParser.T__3);
-						this.state = 279;
+						this.state = 282;
 						(_localctx as BinaryOpContext)._right = this.expression(9);
 						}
 						break;
@@ -1463,13 +1492,13 @@ export class CashScriptParser extends Parser {
 						_localctx = new BinaryOpContext(new ExpressionContext(_parentctx, _parentState));
 						(_localctx as BinaryOpContext)._left = _prevctx;
 						this.pushNewRecursionContext(_localctx, _startState, CashScriptParser.RULE_expression);
-						this.state = 280;
+						this.state = 283;
 						if (!(this.precpred(this._ctx, 7))) {
 							throw this.createFailedPredicateException("this.precpred(this._ctx, 7)");
 						}
-						this.state = 281;
-						(_localctx as BinaryOpContext)._op = this.match(CashScriptParser.T__46);
-						this.state = 282;
+						this.state = 284;
+						(_localctx as BinaryOpContext)._op = this.match(CashScriptParser.T__49);
+						this.state = 285;
 						(_localctx as BinaryOpContext)._right = this.expression(8);
 						}
 						break;
@@ -1479,13 +1508,13 @@ export class CashScriptParser extends Parser {
 						_localctx = new BinaryOpContext(new ExpressionContext(_parentctx, _parentState));
 						(_localctx as BinaryOpContext)._left = _prevctx;
 						this.pushNewRecursionContext(_localctx, _startState, CashScriptParser.RULE_expression);
-						this.state = 283;
+						this.state = 286;
 						if (!(this.precpred(this._ctx, 6))) {
 							throw this.createFailedPredicateException("this.precpred(this._ctx, 6)");
 						}
-						this.state = 284;
-						(_localctx as BinaryOpContext)._op = this.match(CashScriptParser.T__47);
-						this.state = 285;
+						this.state = 287;
+						(_localctx as BinaryOpContext)._op = this.match(CashScriptParser.T__50);
+						this.state = 288;
 						(_localctx as BinaryOpContext)._right = this.expression(7);
 						}
 						break;
@@ -1495,13 +1524,13 @@ export class CashScriptParser extends Parser {
 						_localctx = new BinaryOpContext(new ExpressionContext(_parentctx, _parentState));
 						(_localctx as BinaryOpContext)._left = _prevctx;
 						this.pushNewRecursionContext(_localctx, _startState, CashScriptParser.RULE_expression);
-						this.state = 286;
+						this.state = 289;
 						if (!(this.precpred(this._ctx, 5))) {
 							throw this.createFailedPredicateException("this.precpred(this._ctx, 5)");
 						}
-						this.state = 287;
-						(_localctx as BinaryOpContext)._op = this.match(CashScriptParser.T__48);
-						this.state = 288;
+						this.state = 290;
+						(_localctx as BinaryOpContext)._op = this.match(CashScriptParser.T__51);
+						this.state = 291;
 						(_localctx as BinaryOpContext)._right = this.expression(6);
 						}
 						break;
@@ -1510,15 +1539,15 @@ export class CashScriptParser extends Parser {
 						{
 						_localctx = new TupleIndexOpContext(new ExpressionContext(_parentctx, _parentState));
 						this.pushNewRecursionContext(_localctx, _startState, CashScriptParser.RULE_expression);
-						this.state = 289;
-						if (!(this.precpred(this._ctx, 19))) {
-							throw this.createFailedPredicateException("this.precpred(this._ctx, 19)");
+						this.state = 292;
+						if (!(this.precpred(this._ctx, 20))) {
+							throw this.createFailedPredicateException("this.precpred(this._ctx, 20)");
 						}
-						this.state = 290;
+						this.state = 293;
 						this.match(CashScriptParser.T__21);
-						this.state = 291;
+						this.state = 294;
 						(_localctx as TupleIndexOpContext)._index = this.match(CashScriptParser.NumberLiteral);
-						this.state = 292;
+						this.state = 295;
 						this.match(CashScriptParser.T__22);
 						}
 						break;
@@ -1527,14 +1556,14 @@ export class CashScriptParser extends Parser {
 						{
 						_localctx = new UnaryOpContext(new ExpressionContext(_parentctx, _parentState));
 						this.pushNewRecursionContext(_localctx, _startState, CashScriptParser.RULE_expression);
-						this.state = 293;
+						this.state = 296;
 						if (!(this.precpred(this._ctx, 16))) {
 							throw this.createFailedPredicateException("this.precpred(this._ctx, 16)");
 						}
-						this.state = 294;
+						this.state = 297;
 						(_localctx as UnaryOpContext)._op = this._input.LT(1);
 						_la = this._input.LA(1);
-						if (!(_la === CashScriptParser.T__34 || _la === CashScriptParser.T__35)) {
+						if (!(_la === CashScriptParser.T__37 || _la === CashScriptParser.T__38)) {
 							(_localctx as UnaryOpContext)._op = this._errHandler.recoverInline(this);
 						} else {
 							if (this._input.LA(1) === Token.EOF) {
@@ -1552,24 +1581,24 @@ export class CashScriptParser extends Parser {
 						_localctx = new BinaryOpContext(new ExpressionContext(_parentctx, _parentState));
 						(_localctx as BinaryOpContext)._left = _prevctx;
 						this.pushNewRecursionContext(_localctx, _startState, CashScriptParser.RULE_expression);
-						this.state = 295;
+						this.state = 298;
 						if (!(this.precpred(this._ctx, 15))) {
 							throw this.createFailedPredicateException("this.precpred(this._ctx, 15)");
 						}
-						this.state = 296;
-						(_localctx as BinaryOpContext)._op = this.match(CashScriptParser.T__36);
-						this.state = 297;
+						this.state = 299;
+						(_localctx as BinaryOpContext)._op = this.match(CashScriptParser.T__39);
+						this.state = 300;
 						this.match(CashScriptParser.T__14);
-						this.state = 298;
+						this.state = 301;
 						(_localctx as BinaryOpContext)._right = this.expression(0);
-						this.state = 299;
+						this.state = 302;
 						this.match(CashScriptParser.T__16);
 						}
 						break;
 					}
 					}
 				}
-				this.state = 305;
+				this.state = 308;
 				this._errHandler.sync(this);
 				_alt = this.interpreter.adaptivePredict(this._input, 23, this._ctx);
 			}
@@ -1596,8 +1625,8 @@ export class CashScriptParser extends Parser {
 		try {
 			this.enterOuterAlt(_localctx, 1);
 			{
-			this.state = 306;
-			this.match(CashScriptParser.T__49);
+			this.state = 309;
+			this.match(CashScriptParser.T__52);
 			}
 		}
 		catch (re) {
@@ -1619,41 +1648,41 @@ export class CashScriptParser extends Parser {
 		let _localctx: LiteralContext = new LiteralContext(this._ctx, this.state);
 		this.enterRule(_localctx, 44, CashScriptParser.RULE_literal);
 		try {
-			this.state = 313;
+			this.state = 316;
 			this._errHandler.sync(this);
 			switch (this._input.LA(1)) {
 			case CashScriptParser.BooleanLiteral:
 				this.enterOuterAlt(_localctx, 1);
 				{
-				this.state = 308;
+				this.state = 311;
 				this.match(CashScriptParser.BooleanLiteral);
 				}
 				break;
 			case CashScriptParser.NumberLiteral:
 				this.enterOuterAlt(_localctx, 2);
 				{
-				this.state = 309;
+				this.state = 312;
 				this.numberLiteral();
 				}
 				break;
 			case CashScriptParser.StringLiteral:
 				this.enterOuterAlt(_localctx, 3);
 				{
-				this.state = 310;
+				this.state = 313;
 				this.match(CashScriptParser.StringLiteral);
 				}
 				break;
 			case CashScriptParser.DateLiteral:
 				this.enterOuterAlt(_localctx, 4);
 				{
-				this.state = 311;
+				this.state = 314;
 				this.match(CashScriptParser.DateLiteral);
 				}
 				break;
 			case CashScriptParser.HexLiteral:
 				this.enterOuterAlt(_localctx, 5);
 				{
-				this.state = 312;
+				this.state = 315;
 				this.match(CashScriptParser.HexLiteral);
 				}
 				break;
@@ -1682,14 +1711,14 @@ export class CashScriptParser extends Parser {
 		try {
 			this.enterOuterAlt(_localctx, 1);
 			{
-			this.state = 315;
+			this.state = 318;
 			this.match(CashScriptParser.NumberLiteral);
-			this.state = 317;
+			this.state = 320;
 			this._errHandler.sync(this);
 			switch ( this.interpreter.adaptivePredict(this._input, 25, this._ctx) ) {
 			case 1:
 				{
-				this.state = 316;
+				this.state = 319;
 				this.match(CashScriptParser.NumberUnit);
 				}
 				break;
@@ -1718,9 +1747,9 @@ export class CashScriptParser extends Parser {
 		try {
 			this.enterOuterAlt(_localctx, 1);
 			{
-			this.state = 319;
+			this.state = 322;
 			_la = this._input.LA(1);
-			if (!(((((_la - 51)) & ~0x1F) === 0 && ((1 << (_la - 51)) & ((1 << (CashScriptParser.T__50 - 51)) | (1 << (CashScriptParser.T__51 - 51)) | (1 << (CashScriptParser.T__52 - 51)) | (1 << (CashScriptParser.T__53 - 51)) | (1 << (CashScriptParser.T__54 - 51)) | (1 << (CashScriptParser.T__55 - 51)) | (1 << (CashScriptParser.Bytes - 51)))) !== 0))) {
+			if (!(((((_la - 54)) & ~0x1F) === 0 && ((1 << (_la - 54)) & ((1 << (CashScriptParser.T__53 - 54)) | (1 << (CashScriptParser.T__54 - 54)) | (1 << (CashScriptParser.T__55 - 54)) | (1 << (CashScriptParser.T__56 - 54)) | (1 << (CashScriptParser.T__57 - 54)) | (1 << (CashScriptParser.T__58 - 54)) | (1 << (CashScriptParser.Bytes - 54)))) !== 0))) {
 			this._errHandler.recoverInline(this);
 			} else {
 				if (this._input.LA(1) === Token.EOF) {
@@ -1784,7 +1813,7 @@ export class CashScriptParser extends Parser {
 			return this.precpred(this._ctx, 5);
 
 		case 9:
-			return this.precpred(this._ctx, 19);
+			return this.precpred(this._ctx, 20);
 
 		case 10:
 			return this.precpred(this._ctx, 16);
@@ -1796,7 +1825,7 @@ export class CashScriptParser extends Parser {
 	}
 
 	public static readonly _serializedATN: string =
-		"\x03\uC91D\uCABA\u058D\uAFBA\u4F53\u0607\uEA8B\uC241\x03I\u0144\x04\x02" +
+		"\x03\uC91D\uCABA\u058D\uAFBA\u4F53\u0607\uEA8B\uC241\x03L\u0147\x04\x02" +
 		"\t\x02\x04\x03\t\x03\x04\x04\t\x04\x04\x05\t\x05\x04\x06\t\x06\x04\x07" +
 		"\t\x07\x04\b\t\b\x04\t\t\t\x04\n\t\n\x04\v\t\v\x04\f\t\f\x04\r\t\r\x04" +
 		"\x0E\t\x0E\x04\x0F\t\x0F\x04\x10\t\x10\x04\x11\t\x11\x04\x12\t\x12\x04" +
@@ -1821,133 +1850,135 @@ export class CashScriptParser extends Parser {
 		"\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x05\x16\xDC\n\x16\x03\x16" +
 		"\x05\x16\xDF\n\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03" +
 		"\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03" +
-		"\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x07" +
-		"\x16\xF9\n\x16\f\x16\x0E\x16\xFC\v\x16\x03\x16\x05\x16\xFF\n\x16\x05\x16" +
-		"\u0101\n\x16\x03\x16\x03\x16\x03\x16\x03\x16\x05\x16\u0107\n\x16\x03\x16" +
-		"\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16" +
-		"\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16" +
-		"\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16" +
-		"\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16" +
-		"\x03\x16\x03\x16\x07\x16\u0130\n\x16\f\x16\x0E\x16\u0133\v\x16\x03\x17" +
-		"\x03\x17\x03\x18\x03\x18\x03\x18\x03\x18\x03\x18\x05\x18\u013C\n\x18\x03" +
-		"\x19\x03\x19\x05\x19\u0140\n\x19\x03\x1A\x03\x1A\x03\x1A\x02\x02\x03*" +
-		"\x1B\x02\x02\x04\x02\x06\x02\b\x02\n\x02\f\x02\x0E\x02\x10\x02\x12\x02" +
-		"\x14\x02\x16\x02\x18\x02\x1A\x02\x1C\x02\x1E\x02 \x02\"\x02$\x02&\x02" +
-		"(\x02*\x02,\x02.\x020\x022\x02\x02\f\x03\x02\x06\f\x03\x02\x1B\x1F\x04" +
-		"\x02\x1B\x1F!$\x03\x02()\x03\x02*,\x04\x02))--\x03\x02\b\v\x03\x02./\x03" +
-		"\x02%&\x04\x025:??\x02\u015E\x027\x03\x02\x02\x02\x04=\x03\x02\x02\x02" +
-		"\x06B\x03\x02\x02\x02\bD\x03\x02\x02\x02\nI\x03\x02\x02\x02\fM\x03\x02" +
-		"\x02\x02\x0EO\x03\x02\x02\x02\x10[\x03\x02\x02\x02\x12g\x03\x02\x02\x02" +
-		"\x14w\x03\x02\x02\x02\x16\x83\x03\x02\x02\x02\x18\x8B\x03\x02\x02\x02" +
-		"\x1A\x8D\x03\x02\x02\x02\x1C\x99\x03\x02\x02\x02\x1E\xA2\x03\x02\x02\x02" +
-		" \xA7\x03\x02\x02\x02\"\xAF\x03\x02\x02\x02$\xB5\x03\x02\x02\x02&\xBE" +
-		"\x03\x02\x02\x02(\xC1\x03\x02\x02\x02*\u0106\x03\x02\x02\x02,\u0134\x03" +
-		"\x02\x02\x02.\u013B\x03\x02\x02\x020\u013D\x03\x02\x02\x022\u0141\x03" +
-		"\x02\x02\x0246\x05\x04\x03\x0254\x03\x02\x02\x0269\x03\x02\x02\x0275\x03" +
-		"\x02\x02\x0278\x03\x02\x02\x028:\x03\x02\x02\x0297\x03\x02\x02\x02:;\x05" +
-		"\x0E\b\x02;<\x07\x02\x02\x03<\x03\x03\x02\x02\x02=>\x07\x03\x02\x02>?" +
-		"\x05\x06\x04\x02?@\x05\b\x05\x02@A\x07\x04\x02\x02A\x05\x03\x02\x02\x02" +
-		"BC\x07\x05\x02\x02C\x07\x03\x02\x02\x02DF\x05\n\x06\x02EG\x05\n\x06\x02" +
-		"FE\x03\x02\x02\x02FG\x03\x02\x02\x02G\t\x03\x02\x02\x02HJ\x05\f\x07\x02" +
-		"IH\x03\x02\x02\x02IJ\x03\x02\x02\x02JK\x03\x02\x02\x02KL\x07;\x02\x02" +
-		"L\v\x03\x02\x02\x02MN\t\x02\x02\x02N\r\x03\x02\x02\x02OP\x07\r\x02\x02" +
-		"PQ\x07F\x02\x02QR\x05\x12\n\x02RV\x07\x0E\x02\x02SU\x05\x10\t\x02TS\x03" +
-		"\x02\x02\x02UX\x03\x02\x02\x02VT\x03\x02\x02\x02VW\x03\x02\x02\x02WY\x03" +
-		"\x02\x02\x02XV\x03\x02\x02\x02YZ\x07\x0F\x02\x02Z\x0F\x03\x02\x02\x02" +
-		"[\\\x07\x10\x02\x02\\]\x07F\x02\x02]^\x05\x12\n\x02^b\x07\x0E\x02\x02" +
-		"_a\x05\x18\r\x02`_\x03\x02\x02\x02ad\x03\x02\x02\x02b`\x03\x02\x02\x02" +
-		"bc\x03\x02\x02\x02ce\x03\x02\x02\x02db\x03\x02\x02\x02ef\x07\x0F\x02\x02" +
-		"f\x11\x03\x02\x02\x02gs\x07\x11\x02\x02hm\x05\x14\v\x02ij\x07\x12\x02" +
-		"\x02jl\x05\x14\v\x02ki\x03\x02\x02\x02lo\x03\x02\x02\x02mk\x03\x02\x02" +
-		"\x02mn\x03\x02\x02\x02nq\x03\x02\x02\x02om\x03\x02\x02\x02pr\x07\x12\x02" +
-		"\x02qp\x03\x02\x02\x02qr\x03\x02\x02\x02rt\x03\x02\x02\x02sh\x03\x02\x02" +
-		"\x02st\x03\x02\x02\x02tu\x03\x02\x02\x02uv\x07\x13\x02\x02v\x13\x03\x02" +
-		"\x02\x02wx\x052\x1A\x02xy\x07F\x02\x02y\x15\x03\x02\x02\x02z~\x07\x0E" +
-		"\x02\x02{}\x05\x18\r\x02|{\x03\x02\x02\x02}\x80\x03\x02\x02\x02~|\x03" +
-		"\x02\x02\x02~\x7F\x03\x02\x02\x02\x7F\x81\x03\x02\x02\x02\x80~\x03\x02" +
-		"\x02\x02\x81\x84\x07\x0F\x02\x02\x82\x84\x05\x18\r\x02\x83z\x03\x02\x02" +
-		"\x02\x83\x82\x03\x02\x02\x02\x84\x17\x03\x02\x02\x02\x85\x8C\x05\x1A\x0E" +
-		"\x02\x86\x8C\x05\x1C\x0F\x02\x87\x8C\x05\x1E\x10\x02\x88\x8C\x05 \x11" +
-		"\x02\x89\x8C\x05\"\x12\x02\x8A\x8C\x05$\x13\x02\x8B\x85\x03\x02\x02\x02" +
-		"\x8B\x86\x03\x02\x02\x02\x8B\x87\x03\x02\x02\x02\x8B\x88\x03\x02\x02\x02" +
-		"\x8B\x89\x03\x02\x02\x02\x8B\x8A\x03\x02\x02\x02\x8C\x19\x03\x02\x02\x02" +
-		"\x8D\x91\x052\x1A\x02\x8E\x90\x05,\x17\x02\x8F\x8E\x03\x02\x02\x02\x90" +
-		"\x93\x03\x02\x02\x02\x91\x8F\x03\x02\x02\x02\x91\x92\x03\x02\x02\x02\x92" +
-		"\x94\x03\x02\x02\x02\x93\x91\x03\x02\x02\x02\x94\x95\x07F\x02\x02\x95" +
-		"\x96\x07\f\x02\x02\x96\x97\x05*\x16\x02\x97\x98\x07\x04\x02\x02\x98\x1B" +
-		"\x03\x02\x02\x02\x99\x9A\x052\x1A\x02\x9A\x9B\x07F\x02\x02\x9B\x9C\x07" +
-		"\x12\x02\x02\x9C\x9D\x052\x1A\x02\x9D\x9E\x07F\x02\x02\x9E\x9F\x07\f\x02" +
-		"\x02\x9F\xA0\x05*\x16\x02\xA0\xA1\x07\x04\x02\x02\xA1\x1D\x03\x02\x02" +
-		"\x02\xA2\xA3\x07F\x02\x02\xA3\xA4\x07\f\x02\x02\xA4\xA5\x05*\x16\x02\xA5" +
-		"\xA6\x07\x04\x02\x02\xA6\x1F\x03\x02\x02\x02\xA7\xA8\x07\x14\x02\x02\xA8" +
-		"\xA9\x07\x11\x02\x02\xA9\xAA\x07D\x02\x02\xAA\xAB\x07\b\x02\x02\xAB\xAC" +
-		"\x05*\x16\x02\xAC\xAD\x07\x13\x02\x02\xAD\xAE\x07\x04\x02\x02\xAE!\x03" +
-		"\x02\x02\x02\xAF\xB0\x07\x14\x02\x02\xB0\xB1\x07\x11\x02\x02\xB1\xB2\x05" +
-		"*\x16\x02\xB2\xB3\x07\x13\x02\x02\xB3\xB4\x07\x04\x02\x02\xB4#\x03\x02" +
-		"\x02\x02\xB5\xB6\x07\x15\x02\x02\xB6\xB7\x07\x11\x02\x02\xB7\xB8\x05*" +
-		"\x16\x02\xB8\xB9\x07\x13\x02\x02\xB9\xBC\x05\x16\f\x02\xBA\xBB\x07\x16" +
-		"\x02\x02\xBB\xBD\x05\x16\f\x02\xBC\xBA\x03\x02\x02\x02\xBC\xBD\x03\x02" +
-		"\x02\x02\xBD%\x03\x02\x02\x02\xBE\xBF\x07F\x02\x02\xBF\xC0\x05(\x15\x02" +
-		"\xC0\'\x03\x02\x02\x02\xC1\xCD\x07\x11\x02\x02\xC2\xC7\x05*\x16\x02\xC3" +
-		"\xC4\x07\x12\x02\x02\xC4\xC6\x05*\x16\x02\xC5\xC3\x03\x02\x02\x02\xC6" +
-		"\xC9\x03\x02\x02\x02\xC7\xC5\x03\x02\x02\x02\xC7\xC8\x03\x02\x02\x02\xC8" +
-		"\xCB\x03\x02\x02\x02\xC9\xC7\x03\x02\x02\x02\xCA\xCC\x07\x12\x02\x02\xCB" +
-		"\xCA\x03\x02\x02\x02\xCB\xCC\x03\x02\x02\x02\xCC\xCE\x03\x02\x02\x02\xCD" +
-		"\xC2\x03\x02\x02\x02\xCD\xCE\x03\x02\x02\x02\xCE\xCF\x03\x02\x02\x02\xCF" +
-		"\xD0\x07\x13\x02\x02\xD0)\x03\x02\x02\x02\xD1\xD2\b\x16\x01\x02\xD2\xD3" +
-		"\x07\x11\x02\x02\xD3\xD4\x05*\x16\x02\xD4\xD5\x07\x13\x02\x02\xD5\u0107" +
-		"\x03\x02\x02\x02\xD6\xD7\x052\x1A\x02\xD7\xD8\x07\x11\x02\x02\xD8\xDB" +
-		"\x05*\x16\x02\xD9\xDA\x07\x12\x02\x02\xDA\xDC\x05*\x16\x02\xDB\xD9\x03" +
-		"\x02\x02\x02\xDB\xDC\x03\x02\x02\x02\xDC\xDE\x03\x02\x02\x02\xDD\xDF\x07" +
-		"\x12\x02\x02\xDE\xDD\x03\x02\x02\x02\xDE\xDF\x03\x02\x02\x02\xDF\xE0\x03" +
-		"\x02\x02\x02\xE0\xE1\x07\x13\x02\x02\xE1\u0107\x03\x02\x02\x02\xE2\u0107" +
-		"\x05&\x14\x02\xE3\xE4\x07\x17\x02\x02\xE4\xE5\x07F\x02\x02\xE5\u0107\x05" +
-		"(\x15\x02\xE6\xE7\x07\x1A\x02\x02\xE7\xE8\x07\x18\x02\x02\xE8\xE9\x05" +
-		"*\x16\x02\xE9\xEA\x07\x19\x02\x02\xEA\xEB\t\x03\x02\x02\xEB\u0107\x03" +
-		"\x02\x02\x02\xEC\xED\x07 \x02\x02\xED\xEE\x07\x18\x02\x02\xEE\xEF\x05" +
-		"*\x16\x02\xEF\xF0\x07\x19\x02\x02\xF0\xF1\t\x04\x02\x02\xF1\u0107\x03" +
-		"\x02\x02\x02\xF2\xF3\t\x05\x02\x02\xF3\u0107\x05*\x16\x10\xF4\u0100\x07" +
-		"\x18\x02\x02\xF5\xFA\x05*\x16\x02\xF6\xF7\x07\x12\x02\x02\xF7\xF9\x05" +
-		"*\x16\x02\xF8\xF6\x03\x02\x02\x02\xF9\xFC\x03\x02\x02\x02\xFA\xF8\x03" +
-		"\x02\x02\x02\xFA\xFB\x03\x02\x02\x02\xFB\xFE\x03\x02\x02\x02\xFC\xFA\x03" +
-		"\x02\x02\x02\xFD\xFF\x07\x12\x02\x02\xFE\xFD\x03\x02\x02\x02\xFE\xFF\x03" +
-		"\x02\x02\x02\xFF\u0101\x03\x02\x02\x02\u0100\xF5\x03\x02\x02\x02\u0100" +
-		"\u0101\x03\x02\x02\x02\u0101\u0102\x03\x02\x02\x02\u0102\u0107\x07\x19" +
-		"\x02\x02\u0103\u0107\x07E\x02\x02\u0104\u0107\x07F\x02\x02\u0105\u0107" +
-		"\x05.\x18\x02\u0106\xD1\x03\x02\x02\x02\u0106\xD6\x03\x02\x02\x02\u0106" +
-		"\xE2\x03\x02\x02\x02\u0106\xE3\x03\x02\x02\x02\u0106\xE6\x03\x02\x02\x02" +
-		"\u0106\xEC\x03\x02\x02\x02\u0106\xF2\x03\x02\x02\x02\u0106\xF4\x03\x02" +
-		"\x02\x02\u0106\u0103\x03\x02\x02\x02\u0106\u0104\x03\x02\x02\x02\u0106" +
-		"\u0105\x03\x02\x02\x02\u0107\u0131\x03\x02\x02\x02\u0108\u0109\f\x0F\x02" +
-		"\x02\u0109\u010A\t\x06\x02\x02\u010A\u0130\x05*\x16\x10\u010B\u010C\f" +
-		"\x0E\x02\x02\u010C\u010D\t\x07\x02\x02\u010D\u0130\x05*\x16\x0F\u010E" +
-		"\u010F\f\r\x02\x02\u010F\u0110\t\b\x02\x02\u0110\u0130\x05*\x16\x0E\u0111" +
-		"\u0112\f\f\x02\x02\u0112\u0113\t\t\x02\x02\u0113\u0130\x05*\x16\r\u0114" +
-		"\u0115\f\v\x02\x02\u0115\u0116\x070\x02\x02\u0116\u0130\x05*\x16\f\u0117" +
-		"\u0118\f\n\x02\x02\u0118\u0119\x07\x06\x02\x02\u0119\u0130\x05*\x16\v" +
-		"\u011A\u011B\f\t\x02\x02\u011B\u011C\x071\x02\x02\u011C\u0130\x05*\x16" +
-		"\n\u011D\u011E\f\b\x02\x02\u011E\u011F\x072\x02\x02\u011F\u0130\x05*\x16" +
-		"\t\u0120\u0121\f\x07\x02\x02\u0121\u0122\x073\x02\x02\u0122\u0130\x05" +
-		"*\x16\b\u0123\u0124\f\x15\x02\x02\u0124\u0125\x07\x18\x02\x02\u0125\u0126" +
-		"\x07>\x02\x02\u0126\u0130\x07\x19\x02\x02\u0127\u0128\f\x12\x02\x02\u0128" +
-		"\u0130\t\n\x02\x02\u0129\u012A\f\x11\x02\x02\u012A\u012B\x07\'\x02\x02" +
-		"\u012B\u012C\x07\x11\x02\x02\u012C\u012D\x05*\x16\x02\u012D\u012E\x07" +
-		"\x13\x02\x02\u012E\u0130\x03\x02\x02\x02\u012F\u0108\x03\x02\x02\x02\u012F" +
-		"\u010B\x03\x02\x02\x02\u012F\u010E\x03\x02\x02\x02\u012F\u0111\x03\x02" +
-		"\x02\x02\u012F\u0114\x03\x02\x02\x02\u012F\u0117\x03\x02\x02\x02\u012F" +
-		"\u011A\x03\x02\x02\x02\u012F\u011D\x03\x02\x02\x02\u012F\u0120\x03\x02" +
-		"\x02\x02\u012F\u0123\x03\x02\x02\x02\u012F\u0127\x03\x02\x02\x02\u012F" +
-		"\u0129\x03\x02\x02\x02\u0130\u0133\x03\x02\x02\x02\u0131\u012F\x03\x02" +
-		"\x02\x02\u0131\u0132\x03\x02\x02\x02\u0132+\x03\x02\x02\x02\u0133\u0131" +
-		"\x03\x02\x02\x02\u0134\u0135\x074\x02\x02\u0135-\x03\x02\x02\x02\u0136" +
-		"\u013C\x07<\x02\x02\u0137\u013C\x050\x19\x02\u0138\u013C\x07A\x02\x02" +
-		"\u0139\u013C\x07B\x02\x02\u013A\u013C\x07C\x02\x02\u013B\u0136\x03\x02" +
-		"\x02\x02\u013B\u0137\x03\x02\x02\x02\u013B\u0138\x03\x02\x02\x02\u013B" +
-		"\u0139\x03\x02\x02\x02\u013B\u013A\x03\x02\x02\x02\u013C/\x03\x02\x02" +
-		"\x02\u013D\u013F\x07>\x02\x02\u013E\u0140\x07=\x02\x02\u013F\u013E\x03" +
-		"\x02\x02\x02\u013F\u0140\x03\x02\x02\x02\u01401\x03\x02\x02\x02\u0141" +
-		"\u0142\t\v\x02\x02\u01423\x03\x02\x02\x02\x1C7FIVbmqs~\x83\x8B\x91\xBC" +
-		"\xC7\xCB\xCD\xDB\xDE\xFA\xFE\u0100\u0106\u012F\u0131\u013B\u013F";
+		"\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03" +
+		"\x16\x03\x16\x03\x16\x07\x16\xFC\n\x16\f\x16\x0E\x16\xFF\v\x16\x03\x16" +
+		"\x05\x16\u0102\n\x16\x05\x16\u0104\n\x16\x03\x16\x03\x16\x03\x16\x03\x16" +
+		"\x05\x16\u010A\n\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03" +
+		"\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03" +
+		"\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03" +
+		"\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03" +
+		"\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x07\x16\u0133\n\x16\f\x16" +
+		"\x0E\x16\u0136\v\x16\x03\x17\x03\x17\x03\x18\x03\x18\x03\x18\x03\x18\x03" +
+		"\x18\x05\x18\u013F\n\x18\x03\x19\x03\x19\x05\x19\u0143\n\x19\x03\x1A\x03" +
+		"\x1A\x03\x1A\x02\x02\x03*\x1B\x02\x02\x04\x02\x06\x02\b\x02\n\x02\f\x02" +
+		"\x0E\x02\x10\x02\x12\x02\x14\x02\x16\x02\x18\x02\x1A\x02\x1C\x02\x1E\x02" +
+		" \x02\"\x02$\x02&\x02(\x02*\x02,\x02.\x020\x022\x02\x02\r\x03\x02\x06" +
+		"\f\x03\x02\x1B\x1C\x03\x02\x1E\"\x04\x02\x1E\"$\'\x03\x02+,\x03\x02-/" +
+		"\x04\x02,,00\x03\x02\b\v\x03\x0212\x03\x02()\x04\x028=BB\x02\u0162\x02" +
+		"7\x03\x02\x02\x02\x04=\x03\x02\x02\x02\x06B\x03\x02\x02\x02\bD\x03\x02" +
+		"\x02\x02\nI\x03\x02\x02\x02\fM\x03\x02\x02\x02\x0EO\x03\x02\x02\x02\x10" +
+		"[\x03\x02\x02\x02\x12g\x03\x02\x02\x02\x14w\x03\x02\x02\x02\x16\x83\x03" +
+		"\x02\x02\x02\x18\x8B\x03\x02\x02\x02\x1A\x8D\x03\x02\x02\x02\x1C\x99\x03" +
+		"\x02\x02\x02\x1E\xA2\x03\x02\x02\x02 \xA7\x03\x02\x02\x02\"\xAF\x03\x02" +
+		"\x02\x02$\xB5\x03\x02\x02\x02&\xBE\x03\x02\x02\x02(\xC1\x03\x02\x02\x02" +
+		"*\u0109\x03\x02\x02\x02,\u0137\x03\x02\x02\x02.\u013E\x03\x02\x02\x02" +
+		"0\u0140\x03\x02\x02\x022\u0144\x03\x02\x02\x0246\x05\x04\x03\x0254\x03" +
+		"\x02\x02\x0269\x03\x02\x02\x0275\x03\x02\x02\x0278\x03\x02\x02\x028:\x03" +
+		"\x02\x02\x0297\x03\x02\x02\x02:;\x05\x0E\b\x02;<\x07\x02\x02\x03<\x03" +
+		"\x03\x02\x02\x02=>\x07\x03\x02\x02>?\x05\x06\x04\x02?@\x05\b\x05\x02@" +
+		"A\x07\x04\x02\x02A\x05\x03\x02\x02\x02BC\x07\x05\x02\x02C\x07\x03\x02" +
+		"\x02\x02DF\x05\n\x06\x02EG\x05\n\x06\x02FE\x03\x02\x02\x02FG\x03\x02\x02" +
+		"\x02G\t\x03\x02\x02\x02HJ\x05\f\x07\x02IH\x03\x02\x02\x02IJ\x03\x02\x02" +
+		"\x02JK\x03\x02\x02\x02KL\x07>\x02\x02L\v\x03\x02\x02\x02MN\t\x02\x02\x02" +
+		"N\r\x03\x02\x02\x02OP\x07\r\x02\x02PQ\x07I\x02\x02QR\x05\x12\n\x02RV\x07" +
+		"\x0E\x02\x02SU\x05\x10\t\x02TS\x03\x02\x02\x02UX\x03\x02\x02\x02VT\x03" +
+		"\x02\x02\x02VW\x03\x02\x02\x02WY\x03\x02\x02\x02XV\x03\x02\x02\x02YZ\x07" +
+		"\x0F\x02\x02Z\x0F\x03\x02\x02\x02[\\\x07\x10\x02\x02\\]\x07I\x02\x02]" +
+		"^\x05\x12\n\x02^b\x07\x0E\x02\x02_a\x05\x18\r\x02`_\x03\x02\x02\x02ad" +
+		"\x03\x02\x02\x02b`\x03\x02\x02\x02bc\x03\x02\x02\x02ce\x03\x02\x02\x02" +
+		"db\x03\x02\x02\x02ef\x07\x0F\x02\x02f\x11\x03\x02\x02\x02gs\x07\x11\x02" +
+		"\x02hm\x05\x14\v\x02ij\x07\x12\x02\x02jl\x05\x14\v\x02ki\x03\x02\x02\x02" +
+		"lo\x03\x02\x02\x02mk\x03\x02\x02\x02mn\x03\x02\x02\x02nq\x03\x02\x02\x02" +
+		"om\x03\x02\x02\x02pr\x07\x12\x02\x02qp\x03\x02\x02\x02qr\x03\x02\x02\x02" +
+		"rt\x03\x02\x02\x02sh\x03\x02\x02\x02st\x03\x02\x02\x02tu\x03\x02\x02\x02" +
+		"uv\x07\x13\x02\x02v\x13\x03\x02\x02\x02wx\x052\x1A\x02xy\x07I\x02\x02" +
+		"y\x15\x03\x02\x02\x02z~\x07\x0E\x02\x02{}\x05\x18\r\x02|{\x03\x02\x02" +
+		"\x02}\x80\x03\x02\x02\x02~|\x03\x02\x02\x02~\x7F\x03\x02\x02\x02\x7F\x81" +
+		"\x03\x02\x02\x02\x80~\x03\x02\x02\x02\x81\x84\x07\x0F\x02\x02\x82\x84" +
+		"\x05\x18\r\x02\x83z\x03\x02\x02\x02\x83\x82\x03\x02\x02\x02\x84\x17\x03" +
+		"\x02\x02\x02\x85\x8C\x05\x1A\x0E\x02\x86\x8C\x05\x1C\x0F\x02\x87\x8C\x05" +
+		"\x1E\x10\x02\x88\x8C\x05 \x11\x02\x89\x8C\x05\"\x12\x02\x8A\x8C\x05$\x13" +
+		"\x02\x8B\x85\x03\x02\x02\x02\x8B\x86\x03\x02\x02\x02\x8B\x87\x03\x02\x02" +
+		"\x02\x8B\x88\x03\x02\x02\x02\x8B\x89\x03\x02\x02\x02\x8B\x8A\x03\x02\x02" +
+		"\x02\x8C\x19\x03\x02\x02\x02\x8D\x91\x052\x1A\x02\x8E\x90\x05,\x17\x02" +
+		"\x8F\x8E\x03\x02\x02\x02\x90\x93\x03\x02\x02\x02\x91\x8F\x03\x02\x02\x02" +
+		"\x91\x92\x03\x02\x02\x02\x92\x94\x03\x02\x02\x02\x93\x91\x03\x02\x02\x02" +
+		"\x94\x95\x07I\x02\x02\x95\x96\x07\f\x02\x02\x96\x97\x05*\x16\x02\x97\x98" +
+		"\x07\x04\x02\x02\x98\x1B\x03\x02\x02\x02\x99\x9A\x052\x1A\x02\x9A\x9B" +
+		"\x07I\x02\x02\x9B\x9C\x07\x12\x02\x02\x9C\x9D\x052\x1A\x02\x9D\x9E\x07" +
+		"I\x02\x02\x9E\x9F\x07\f\x02\x02\x9F\xA0\x05*\x16\x02\xA0\xA1\x07\x04\x02" +
+		"\x02\xA1\x1D\x03\x02\x02\x02\xA2\xA3\x07I\x02\x02\xA3\xA4\x07\f\x02\x02" +
+		"\xA4\xA5\x05*\x16\x02\xA5\xA6\x07\x04\x02\x02\xA6\x1F\x03\x02\x02\x02" +
+		"\xA7\xA8\x07\x14\x02\x02\xA8\xA9\x07\x11\x02\x02\xA9\xAA\x07G\x02\x02" +
+		"\xAA\xAB\x07\b\x02\x02\xAB\xAC\x05*\x16\x02\xAC\xAD\x07\x13\x02\x02\xAD" +
+		"\xAE\x07\x04\x02\x02\xAE!\x03\x02\x02\x02\xAF\xB0\x07\x14\x02\x02\xB0" +
+		"\xB1\x07\x11\x02\x02\xB1\xB2\x05*\x16\x02\xB2\xB3\x07\x13\x02\x02\xB3" +
+		"\xB4\x07\x04\x02\x02\xB4#\x03\x02\x02\x02\xB5\xB6\x07\x15\x02\x02\xB6" +
+		"\xB7\x07\x11\x02\x02\xB7\xB8\x05*\x16\x02\xB8\xB9\x07\x13\x02\x02\xB9" +
+		"\xBC\x05\x16\f\x02\xBA\xBB\x07\x16\x02\x02\xBB\xBD\x05\x16\f\x02\xBC\xBA" +
+		"\x03\x02\x02\x02\xBC\xBD\x03\x02\x02\x02\xBD%\x03\x02\x02\x02\xBE\xBF" +
+		"\x07I\x02\x02\xBF\xC0\x05(\x15\x02\xC0\'\x03\x02\x02\x02\xC1\xCD\x07\x11" +
+		"\x02\x02\xC2\xC7\x05*\x16\x02\xC3\xC4\x07\x12\x02\x02\xC4\xC6\x05*\x16" +
+		"\x02\xC5\xC3\x03\x02\x02\x02\xC6\xC9\x03\x02\x02\x02\xC7\xC5\x03\x02\x02" +
+		"\x02\xC7\xC8\x03\x02\x02\x02\xC8\xCB\x03\x02\x02\x02\xC9\xC7\x03\x02\x02" +
+		"\x02\xCA\xCC\x07\x12\x02\x02\xCB\xCA\x03\x02\x02\x02\xCB\xCC\x03\x02\x02" +
+		"\x02\xCC\xCE\x03\x02\x02\x02\xCD\xC2\x03\x02\x02\x02\xCD\xCE\x03\x02\x02" +
+		"\x02\xCE\xCF\x03\x02\x02\x02\xCF\xD0\x07\x13\x02\x02\xD0)\x03\x02\x02" +
+		"\x02\xD1\xD2\b\x16\x01\x02\xD2\xD3\x07\x11\x02\x02\xD3\xD4\x05*\x16\x02" +
+		"\xD4\xD5\x07\x13\x02\x02\xD5\u010A\x03\x02\x02\x02\xD6\xD7\x052\x1A\x02" +
+		"\xD7\xD8\x07\x11\x02\x02\xD8\xDB\x05*\x16\x02\xD9\xDA\x07\x12\x02\x02" +
+		"\xDA\xDC\x05*\x16\x02\xDB\xD9\x03\x02\x02\x02\xDB\xDC\x03\x02\x02\x02" +
+		"\xDC\xDE\x03\x02\x02\x02\xDD\xDF\x07\x12\x02\x02\xDE\xDD\x03\x02\x02\x02" +
+		"\xDE\xDF\x03\x02\x02\x02\xDF\xE0\x03\x02\x02\x02\xE0\xE1\x07\x13\x02\x02" +
+		"\xE1\u010A\x03\x02\x02\x02\xE2\u010A\x05&\x14\x02\xE3\xE4\x07\x17\x02" +
+		"\x02\xE4\xE5\x07I\x02\x02\xE5\u010A\x05(\x15\x02\xE6\xE7\x07\x1A\x02\x02" +
+		"\xE7\xE8\t\x03\x02\x02\xE8\u010A\x05(\x15\x02\xE9\xEA\x07\x1D\x02\x02" +
+		"\xEA\xEB\x07\x18\x02\x02\xEB\xEC\x05*\x16\x02\xEC\xED\x07\x19\x02\x02" +
+		"\xED\xEE\t\x04\x02\x02\xEE\u010A\x03\x02\x02\x02\xEF\xF0\x07#\x02\x02" +
+		"\xF0\xF1\x07\x18\x02\x02\xF1\xF2\x05*\x16\x02\xF2\xF3\x07\x19\x02\x02" +
+		"\xF3\xF4\t\x05\x02\x02\xF4\u010A\x03\x02\x02\x02\xF5\xF6\t\x06\x02\x02" +
+		"\xF6\u010A\x05*\x16\x10\xF7\u0103\x07\x18\x02\x02\xF8\xFD\x05*\x16\x02" +
+		"\xF9\xFA\x07\x12\x02\x02\xFA\xFC\x05*\x16\x02\xFB\xF9\x03\x02\x02\x02" +
+		"\xFC\xFF\x03\x02\x02\x02\xFD\xFB\x03\x02\x02\x02\xFD\xFE\x03\x02\x02\x02" +
+		"\xFE\u0101\x03\x02\x02\x02\xFF\xFD\x03\x02\x02\x02\u0100\u0102\x07\x12" +
+		"\x02\x02\u0101\u0100\x03\x02\x02\x02\u0101\u0102\x03\x02\x02\x02\u0102" +
+		"\u0104\x03\x02\x02\x02\u0103\xF8\x03\x02\x02\x02\u0103\u0104\x03\x02\x02" +
+		"\x02\u0104\u0105\x03\x02\x02\x02\u0105\u010A\x07\x19\x02\x02\u0106\u010A" +
+		"\x07H\x02\x02\u0107\u010A\x07I\x02\x02\u0108\u010A\x05.\x18\x02\u0109" +
+		"\xD1\x03\x02\x02\x02\u0109\xD6\x03\x02\x02\x02\u0109\xE2\x03\x02\x02\x02" +
+		"\u0109\xE3\x03\x02\x02\x02\u0109\xE6\x03\x02\x02\x02\u0109\xE9\x03\x02" +
+		"\x02\x02\u0109\xEF\x03\x02\x02\x02\u0109\xF5\x03\x02\x02\x02\u0109\xF7" +
+		"\x03\x02\x02\x02\u0109\u0106\x03\x02\x02\x02\u0109\u0107\x03\x02\x02\x02" +
+		"\u0109\u0108\x03\x02\x02\x02\u010A\u0134\x03\x02\x02\x02\u010B\u010C\f" +
+		"\x0F\x02\x02\u010C\u010D\t\x07\x02\x02\u010D\u0133\x05*\x16\x10\u010E" +
+		"\u010F\f\x0E\x02\x02\u010F\u0110\t\b\x02\x02\u0110\u0133\x05*\x16\x0F" +
+		"\u0111\u0112\f\r\x02\x02\u0112\u0113\t\t\x02\x02\u0113\u0133\x05*\x16" +
+		"\x0E\u0114\u0115\f\f\x02\x02\u0115\u0116\t\n\x02\x02\u0116\u0133\x05*" +
+		"\x16\r\u0117\u0118\f\v\x02\x02\u0118\u0119\x073\x02\x02\u0119\u0133\x05" +
+		"*\x16\f\u011A\u011B\f\n\x02\x02\u011B\u011C\x07\x06\x02\x02\u011C\u0133" +
+		"\x05*\x16\v\u011D\u011E\f\t\x02\x02\u011E\u011F\x074\x02\x02\u011F\u0133" +
+		"\x05*\x16\n\u0120\u0121\f\b\x02\x02\u0121\u0122\x075\x02\x02\u0122\u0133" +
+		"\x05*\x16\t\u0123\u0124\f\x07\x02\x02\u0124\u0125\x076\x02\x02\u0125\u0133" +
+		"\x05*\x16\b\u0126\u0127\f\x16\x02\x02\u0127\u0128\x07\x18\x02\x02\u0128" +
+		"\u0129\x07A\x02\x02\u0129\u0133\x07\x19\x02\x02\u012A\u012B\f\x12\x02" +
+		"\x02\u012B\u0133\t\v\x02\x02\u012C\u012D\f\x11\x02\x02\u012D\u012E\x07" +
+		"*\x02\x02\u012E\u012F\x07\x11\x02\x02\u012F\u0130\x05*\x16\x02\u0130\u0131" +
+		"\x07\x13\x02\x02\u0131\u0133\x03\x02\x02\x02\u0132\u010B\x03\x02\x02\x02" +
+		"\u0132\u010E\x03\x02\x02\x02\u0132\u0111\x03\x02\x02\x02\u0132\u0114\x03" +
+		"\x02\x02\x02\u0132\u0117\x03\x02\x02\x02\u0132\u011A\x03\x02\x02\x02\u0132" +
+		"\u011D\x03\x02\x02\x02\u0132\u0120\x03\x02\x02\x02\u0132\u0123\x03\x02" +
+		"\x02\x02\u0132\u0126\x03\x02\x02\x02\u0132\u012A\x03\x02\x02\x02\u0132" +
+		"\u012C\x03\x02\x02\x02\u0133\u0136\x03\x02\x02\x02\u0134\u0132\x03\x02" +
+		"\x02\x02\u0134\u0135\x03\x02\x02\x02\u0135+\x03\x02\x02\x02\u0136\u0134" +
+		"\x03\x02\x02\x02\u0137\u0138\x077\x02\x02\u0138-\x03\x02\x02\x02\u0139" +
+		"\u013F\x07?\x02\x02\u013A\u013F\x050\x19\x02\u013B\u013F\x07D\x02\x02" +
+		"\u013C\u013F\x07E\x02\x02\u013D\u013F\x07F\x02\x02\u013E\u0139\x03\x02" +
+		"\x02\x02\u013E\u013A\x03\x02\x02\x02\u013E\u013B\x03\x02\x02\x02\u013E" +
+		"\u013C\x03\x02\x02\x02\u013E\u013D\x03\x02\x02\x02\u013F/\x03\x02\x02" +
+		"\x02\u0140\u0142\x07A\x02\x02\u0141\u0143\x07@\x02\x02\u0142\u0141\x03" +
+		"\x02\x02\x02\u0142\u0143\x03\x02\x02\x02\u01431\x03\x02\x02\x02\u0144" +
+		"\u0145\t\f\x02\x02\u01453\x03\x02\x02\x02\x1C7FIVbmqs~\x83\x8B\x91\xBC" +
+		"\xC7\xCB\xCD\xDB\xDE\xFD\u0101\u0103\u0109\u0132\u0134\u013E\u0142";
 	public static __ATN: ATN;
 	public static get _ATN(): ATN {
 		if (!CashScriptParser.__ATN) {
@@ -2581,6 +2612,25 @@ export class TupleIndexOpContext extends ExpressionContext {
 		}
 	}
 }
+export class ConsoleExpressionContext extends ExpressionContext {
+	public _scope!: Token;
+	public _op!: Token;
+	public expressionList(): ExpressionListContext {
+		return this.getRuleContext(0, ExpressionListContext);
+	}
+	constructor(ctx: ExpressionContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public accept<Result>(visitor: CashScriptVisitor<Result>): Result {
+		if (visitor.visitConsoleExpression) {
+			return visitor.visitConsoleExpression(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
 export class UnaryIntrospectionOpContext extends ExpressionContext {
 	public _scope!: Token;
 	public _op!: Token;
diff --git a/packages/cashc/src/grammar/CashScriptVisitor.ts b/packages/cashc/src/grammar/CashScriptVisitor.ts
index d557ffef..b752dc73 100644
--- a/packages/cashc/src/grammar/CashScriptVisitor.ts
+++ b/packages/cashc/src/grammar/CashScriptVisitor.ts
@@ -8,6 +8,7 @@ import { CastContext } from "./CashScriptParser.js";
 import { FunctionCallExpressionContext } from "./CashScriptParser.js";
 import { InstantiationContext } from "./CashScriptParser.js";
 import { TupleIndexOpContext } from "./CashScriptParser.js";
+import { ConsoleExpressionContext } from "./CashScriptParser.js";
 import { UnaryIntrospectionOpContext } from "./CashScriptParser.js";
 import { UnaryOpContext } from "./CashScriptParser.js";
 import { BinaryOpContext } from "./CashScriptParser.js";
@@ -90,6 +91,14 @@ export interface CashScriptVisitor<Result> extends ParseTreeVisitor<Result> {
 	 */
 	visitTupleIndexOp?: (ctx: TupleIndexOpContext) => Result;
 
+	/**
+	 * Visit a parse tree produced by the `ConsoleExpression`
+	 * labeled alternative in `CashScriptParser.expression`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitConsoleExpression?: (ctx: ConsoleExpressionContext) => Result;
+
 	/**
 	 * Visit a parse tree produced by the `UnaryIntrospectionOp`
 	 * labeled alternative in `CashScriptParser.expression`.
diff --git a/packages/cashc/test/ast/Location.test.ts b/packages/cashc/test/ast/Location.test.ts
index 54c51769..5e93229f 100644
--- a/packages/cashc/test/ast/Location.test.ts
+++ b/packages/cashc/test/ast/Location.test.ts
@@ -1,6 +1,6 @@
 import fs from 'fs';
 import { URL } from 'url';
-import { parseCode } from '../../src/compiler.js';
+import { compileString, parseCode } from '../../src/compiler.js';
 
 describe('Location', () => {
   it('should retrieve correct text from location', () => {
@@ -12,4 +12,31 @@ describe('Location', () => {
     expect(f.location).toBeDefined();
     expect((f.location!).text(code)).toEqual('function hello(sig s, pubkey pk) {\n        require(checkSig(s, pk));\n    }');
   });
+
+  it('kek', () => {
+    const code = `
+pragma cashscript ^0.9.0;
+
+contract TransferWithTimeout(
+    pubkey sender,
+    pubkey recipient,
+    int timeout
+) {
+    // Require recipient's signature to match
+    function transfer(sig recipientSig) {
+        require(checkSig(recipientSig, recipient));
+    }
+
+    // Require timeout time to be reached and sender's signature to match
+    function timeout(sig senderSig) {
+        conolelog("asdf", senderSig, "zxcv");
+        require(checkSig(senderSig, sender));
+        require(tx.time >= timeout);
+    }
+}
+`;
+    const artifact = compileString(code);
+    console.log(artifact);
+
+  });
 });

From 41eeb463334c037e5057a4f770c523f46839c47a Mon Sep 17 00:00:00 2001
From: mainnet-pat <mainnet_pat@protonmail.com>
Date: Thu, 23 Nov 2023 13:17:29 +0000
Subject: [PATCH 003/171] Console logs ready

---
 packages/cashc/src/artifact/Artifact.ts       |   21 +-
 packages/cashc/src/ast/AST.ts                 |   14 +-
 packages/cashc/src/ast/AstBuilder.ts          |   31 +-
 packages/cashc/src/ast/AstTraversal.ts        |   10 +-
 packages/cashc/src/ast/AstVisitor.ts          |    8 +-
 packages/cashc/src/compiler.ts                |   15 +-
 .../src/generation/GenerateTargetTraversal.ts |   46 +-
 packages/cashc/src/grammar/CashScript.g4      |   31 +-
 packages/cashc/src/grammar/CashScript.interp  |   11 +-
 packages/cashc/src/grammar/CashScript.tokens  |  108 +-
 .../cashc/src/grammar/CashScriptLexer.interp  |   10 +-
 .../cashc/src/grammar/CashScriptLexer.tokens  |  108 +-
 packages/cashc/src/grammar/CashScriptLexer.ts |  791 ++++++-----
 .../cashc/src/grammar/CashScriptParser.ts     | 1167 ++++++++++-------
 .../cashc/src/grammar/CashScriptVisitor.ts    |   33 +-
 .../src/semantic/SymbolTableTraversal.ts      |   13 +
 packages/cashc/test/ast/Location.test.ts      |    4 +-
 packages/cashscript/src/LibauthTemplate.ts    |   37 +-
 .../cashscript/test/LibauthTemplate.test.ts   |   89 +-
 19 files changed, 1409 insertions(+), 1138 deletions(-)

diff --git a/packages/cashc/src/artifact/Artifact.ts b/packages/cashc/src/artifact/Artifact.ts
index 5a4c88fe..14dd78ac 100644
--- a/packages/cashc/src/artifact/Artifact.ts
+++ b/packages/cashc/src/artifact/Artifact.ts
@@ -1,4 +1,4 @@
-import { Artifact, Script, scriptToAsm } from '@cashscript/utils';
+import { Artifact, LogEntry, Script, scriptToAsm } from '@cashscript/utils';
 import { version } from '../index.js';
 import { Ast } from '../ast/AST.js';
 
@@ -6,8 +6,11 @@ export function generateArtifact(
     ast: Ast,
     script: Script,
     source: string,
-    debugScript: Script,
-    sourceMap: string
+    debug: {
+      script: Script,
+      sourceMap: string,
+      logs: LogEntry[]
+    }
   ): Artifact {
   const { contract } = ast;
 
@@ -23,7 +26,7 @@ export function generateArtifact(
   }));
 
   const bytecode = scriptToAsm(script);
-  const debugBytecode = scriptToAsm(debugScript);
+  const debugBytecode = scriptToAsm(debug.script);
 
   return {
     contractName: contract.name,
@@ -33,8 +36,8 @@ export function generateArtifact(
     source,
     debug: {
       bytecode: debugBytecode,
-      sourceMap: sourceMap,
-      logs: [],
+      sourceMap: debug.sourceMap,
+      logs: debug.logs,
     },
     compiler: {
       name: 'cashc',
@@ -43,3 +46,9 @@ export function generateArtifact(
     updatedAt: new Date().toISOString(),
   };
 }
+
+// strip verbose debug info from artifact for production use
+export function stripArtifact(artifact: Artifact): Omit<Artifact, "debug"> {
+  delete artifact.debug;
+  return artifact;
+}
diff --git a/packages/cashc/src/ast/AST.ts b/packages/cashc/src/ast/AST.ts
index fe990d74..5517361b 100644
--- a/packages/cashc/src/ast/AST.ts
+++ b/packages/cashc/src/ast/AST.ts
@@ -352,28 +352,28 @@ export class HexLiteralNode extends LiteralNode {
   }
 }
 
-export class ConsoleLogNode extends Node {
+export class ConsoleStatementNode extends Node {
   constructor(
-    public parameters: ConsoleLogParameterNode[],
+    public parameters: ConsoleParameterNode[],
   ) {
     super();
   }
 
   accept<T>(visitor: AstVisitor<T>): T {
-    return visitor.visitConsoleLog(this);
+    return visitor.visitConsoleStatement(this);
   }
 }
 
 
-export class ConsoleLogParameterNode extends Node {
+export class ConsoleParameterNode extends Node {
   constructor(
-    public message?: StringLiteralNode,
-    public identifier?: IdentifierNode,
+    public message?: string,
+    public identifier?: string,
   ) {
     super();
   }
 
   accept<T>(visitor: AstVisitor<T>): T {
-    return visitor.visitConsoleLogParameter(this);
+    return visitor.visitConsoleParameter(this);
   }
 }
diff --git a/packages/cashc/src/ast/AstBuilder.ts b/packages/cashc/src/ast/AstBuilder.ts
index d04b8d72..cbf6352b 100644
--- a/packages/cashc/src/ast/AstBuilder.ts
+++ b/packages/cashc/src/ast/AstBuilder.ts
@@ -33,8 +33,8 @@ import {
   InstantiationNode,
   TupleAssignmentNode,
   NullaryOpNode,
-  ConsoleLogNode,
-  ConsoleLogParameterNode,
+  ConsoleStatementNode,
+  ConsoleParameterNode,
 } from './AST.js';
 import { UnaryOperator, BinaryOperator, NullaryOperator } from './Operator.js';
 import type {
@@ -65,9 +65,8 @@ import type {
   InstantiationContext,
   NullaryOpContext,
   UnaryIntrospectionOpContext,
-  ConsoleLogContext,
-  ConsoleLogParameterContext,
-  ConsoleLogExpressionContext,
+  ConsoleStatementContext,
+  ConsoleParameterContext,
 } from '../grammar/CashScriptParser.js';
 import type { CashScriptVisitor } from '../grammar/CashScriptVisitor.js';
 import { Location } from './Location.js';
@@ -383,24 +382,22 @@ export default class AstBuilder
     return hexLiteral;
   }
 
-  visitConsoleLogExpression(ctx: ConsoleLogExpressionContext): ConsoleLogNode {
-    return this.visit(ctx.consoleLog()) as ConsoleLogNode;
-  }
-
-  visitConsoleLog(ctx: ConsoleLogContext): ConsoleLogNode {
-    const parameters = ctx.consoleParameterList().consoleLogParameter().map((p) => this.visit(p) as ConsoleLogParameterNode);
-
-    const node = new ConsoleLogNode(parameters);
+  visitConsoleStatement(ctx: ConsoleStatementContext): ConsoleStatementNode {
+    const parameters = ctx.consoleParameterList().consoleParameter().map((p) => this.visit(p) as ConsoleParameterNode);
+    const node = new ConsoleStatementNode(parameters);
     node.location = Location.fromCtx(ctx);
 
     return node;
   }
 
-  visitConsoleLogParameter(ctx: ConsoleLogParameterContext): ConsoleLogParameterNode {
-    const stringLiteral = ctx.StringLiteral() ? this.createStringLiteral(ctx as any) : undefined;
-    const identifier = ctx.Identifier() as IdentifierNode | undefined;
+  visitConsoleParameter(ctx: ConsoleParameterContext): ConsoleParameterNode {
+    let message = (ctx.BooleanLiteral() ?? ctx.HexLiteral() ?? ctx.NumberLiteral() ?? ctx.StringLiteral())?.text;
+    if (message?.[0] === '"') {
+      message = message.slice(1, -1);
+    }
+    const identifier = ctx.Identifier()?.text;
 
-    const node = new ConsoleLogParameterNode(stringLiteral, identifier);
+    const node = new ConsoleParameterNode(message, identifier);
     node.location = Location.fromCtx(ctx);
     return node;
   }
diff --git a/packages/cashc/src/ast/AstTraversal.ts b/packages/cashc/src/ast/AstTraversal.ts
index 04cfa96f..15c99829 100644
--- a/packages/cashc/src/ast/AstTraversal.ts
+++ b/packages/cashc/src/ast/AstTraversal.ts
@@ -25,8 +25,8 @@ import {
   InstantiationNode,
   TupleAssignmentNode,
   NullaryOpNode,
-  ConsoleLogNode,
-  ConsoleLogParameterNode,
+  ConsoleStatementNode,
+  ConsoleParameterNode,
 } from './AST.js';
 import AstVisitor from './AstVisitor.js';
 
@@ -153,12 +153,12 @@ export default class AstTraversal extends AstVisitor<Node> {
     return node;
   }
 
-  visitConsoleLog(node: ConsoleLogNode): Node {
-    node.parameters = this.visitList(node.parameters) as ConsoleLogParameterNode[];
+  visitConsoleStatement(node: ConsoleStatementNode): Node {
+    node.parameters = this.visitList(node.parameters) as ConsoleParameterNode[];
     return node;
   }
 
-  visitConsoleLogParameter(node: ConsoleLogParameterNode): Node {
+  visitConsoleParameter(node: ConsoleParameterNode): Node {
     return node;
   }
 }
diff --git a/packages/cashc/src/ast/AstVisitor.ts b/packages/cashc/src/ast/AstVisitor.ts
index 1fbd43d5..e846d3c2 100644
--- a/packages/cashc/src/ast/AstVisitor.ts
+++ b/packages/cashc/src/ast/AstVisitor.ts
@@ -24,8 +24,8 @@ import {
   InstantiationNode,
   TupleAssignmentNode,
   NullaryOpNode,
-  ConsoleLogNode,
-  ConsoleLogParameterNode,
+  ConsoleStatementNode,
+  ConsoleParameterNode,
 } from './AST.js';
 
 export default abstract class AstVisitor<T> {
@@ -53,8 +53,8 @@ export default abstract class AstVisitor<T> {
   abstract visitIntLiteral(node: IntLiteralNode): T;
   abstract visitStringLiteral(node: StringLiteralNode): T;
   abstract visitHexLiteral(node: HexLiteralNode): T;
-  abstract visitConsoleLog(node: ConsoleLogNode): T;
-  abstract visitConsoleLogParameter(node: ConsoleLogParameterNode): T;
+  abstract visitConsoleStatement(node: ConsoleStatementNode): T;
+  abstract visitConsoleParameter(node: ConsoleParameterNode): T;
 
   visit(node: Node): T {
     return node.accept(this);
diff --git a/packages/cashc/src/compiler.ts b/packages/cashc/src/compiler.ts
index a38b5718..db6cc3e2 100644
--- a/packages/cashc/src/compiler.ts
+++ b/packages/cashc/src/compiler.ts
@@ -17,20 +17,23 @@ export function compileString(code: string): Artifact {
   let ast = parseCode(code);
 
   // Semantic analysis
-  ast = ast.accept(new SymbolTableTraversal()) as Ast;
+  const symbolTableTraversal = new SymbolTableTraversal();
+  ast = ast.accept(symbolTableTraversal) as Ast;
   ast = ast.accept(new TypeCheckTraversal()) as Ast;
   ast = ast.accept(new EnsureFinalRequireTraversal()) as Ast;
 
   // Code generation
-  const traversal = new GenerateTargetTraversal();
+  const traversal = new GenerateTargetTraversal(symbolTableTraversal.logSymbols);
   ast = ast.accept(traversal) as Ast;
-  const bytecode = traversal.output;
 
   // Bytecode optimisation
-  const optimisedBytecode = optimiseBytecode(bytecode);
-  const sourceMap = generateSourceMap(traversal.locationData);
+  const optimisedBytecode = optimiseBytecode(traversal.output);
 
-  return generateArtifact(ast, optimisedBytecode, code, bytecode, sourceMap);
+  return generateArtifact(ast, optimisedBytecode, code, {
+    script: traversal.output,
+    sourceMap: traversal.souceMap,
+    logs: traversal.consoleLogs
+  });
 }
 
 export function compileFile(codeFile: PathLike): Artifact {
diff --git a/packages/cashc/src/generation/GenerateTargetTraversal.ts b/packages/cashc/src/generation/GenerateTargetTraversal.ts
index 950c082a..41e3a1f2 100644
--- a/packages/cashc/src/generation/GenerateTargetTraversal.ts
+++ b/packages/cashc/src/generation/GenerateTargetTraversal.ts
@@ -41,11 +41,11 @@ import {
   InstantiationNode,
   TupleAssignmentNode,
   NullaryOpNode,
-  ConsoleLogNode,
-  ConsoleLogParameterNode,
+  ConsoleParameterNode,
+  ConsoleStatementNode,
 } from '../ast/AST.js';
 import AstTraversal from '../ast/AstTraversal.js';
-import { GlobalFunction, Class, GLOBAL_SYMBOL_TABLE } from '../ast/Globals.js';
+import { GlobalFunction, Class } from '../ast/Globals.js';
 import { BinaryOperator } from '../ast/Operator.js';
 import {
   compileBinaryOp,
@@ -57,16 +57,22 @@ import {
 } from './utils.js';
 import { Location } from '../ast/Location.js';
 import { ParseError } from '../Errors.js';
+import { Symbol } from '../ast/SymbolTable.js';
 
 export default class GenerateTargetTraversalWithLocation extends AstTraversal {
-  locationData: LocationData = [];
+  private locationData: LocationData = []; // detailed location data needed for sourcemap creation
+  souceMap: string;
   output: Script = [];
   stack: string[] = [];
-  souceMap: string;
-  consoleLogs: LogEntry[];
+  consoleLogs: LogEntry[] = [];
 
   private scopeDepth = 0;
   private currentFunction: FunctionDefinitionNode;
+  private constructorParameterCount: number;
+
+  constructor(private logSymbols: Symbol[]) {
+    super();
+  }
 
   private emit(op: OpOrData | OpOrData[], location: LocationI, positionHint?: number): void {
     if (Array.isArray(op)) {
@@ -119,6 +125,7 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
 
   visitContract(node: ContractNode): Node {
     node.parameters = this.visitList(node.parameters) as ParameterNode[];
+    this.constructorParameterCount = node.parameters.length;
     if (node.functions.length === 1) {
       node.functions = this.visitList(node.functions) as FunctionDefinitionNode[];
     } else {
@@ -517,10 +524,13 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
     return node;
   }
 
-  visitConsoleLog(node: ConsoleLogNode): Node {
-    const ip = this.output.length;
+  visitConsoleStatement(node: ConsoleStatementNode): Node {
+    // instruction pointer is the count of emitted opcodes + number of constructor data pushes
+    const ip = this.output.length + this.constructorParameterCount;
+
     const line = node.location!.start.line;
 
+    // check if log entry exists for the instruction pointer, create if not
     let index = this.consoleLogs.findIndex((entry: LogEntry) => entry.ip === ip);
     if (index === -1) {
       index = this.consoleLogs.push({
@@ -530,19 +540,25 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
       }) - 1;
     };
 
-    node.parameters.forEach((parameter: ConsoleLogParameterNode) => {
-      if (parameter.identifier?.name) {
-        const symbol = GLOBAL_SYMBOL_TABLE.get(parameter.identifier.name);
+    node.parameters.forEach((parameter: ConsoleParameterNode) => {
+      if (parameter.identifier) {
+        // we look for all symbols with identifier name
+        // then take the first which is declared in the nearest code block
+        const symbol = this.logSymbols.
+          filter(symbol => symbol.name === parameter.identifier).
+          sort((a, b) => b.definition?.location?.start.line! - a.definition?.location?.start.line!)[0];
+
         if (!symbol) {
-          throw new ParseError(`Invalid symbol for console.log: ${symbol}`);
+          throw new ParseError(`Undefined reference to symbol ${parameter.identifier} at ${parameter.location?.start}`);
         }
-        const stackIndex = this.getStackIndex(parameter.identifier.name);
+
+        const stackIndex = this.getStackIndex(parameter.identifier);
         this.consoleLogs[index].data.push({
           stackIndex,
           type: typeof symbol.type === "string" ? symbol.type : symbol.toString(),
         })
-      } else if (parameter.message?.value) {
-        this.consoleLogs[index].data.push(parameter.message.value);
+      } else if (parameter.message) {
+        this.consoleLogs[index].data.push(parameter.message);
       }
     });
 
diff --git a/packages/cashc/src/grammar/CashScript.g4 b/packages/cashc/src/grammar/CashScript.g4
index 455bea92..ff8776c1 100644
--- a/packages/cashc/src/grammar/CashScript.g4
+++ b/packages/cashc/src/grammar/CashScript.g4
@@ -52,6 +52,7 @@ statement
     | timeOpStatement
     | requireStatement
     | ifStatement
+    | consoleStatement
     ;
 
 variableDefinition
@@ -78,6 +79,22 @@ ifStatement
     : 'if' '(' expression ')' ifBlock=block ('else' elseBlock=block)?
     ;
 
+consoleStatement
+    : 'console.log' consoleParameterList ';'
+    ;
+
+consoleParameter
+    : Identifier
+    | StringLiteral
+    | NumberLiteral
+    | HexLiteral
+    | BooleanLiteral
+    ;
+
+consoleParameterList
+    : '(' (consoleParameter (',' consoleParameter)* ','?)? ')'
+    ;
+
 functionCall
     : Identifier expressionList // Only built-in functions are accepted
     ;
@@ -92,7 +109,6 @@ expression
     | functionCall # FunctionCallExpression
     | 'new' Identifier expressionList #Instantiation
     | expression '[' index=NumberLiteral ']' # TupleIndexOp
-    | scope='console.' op=('log' | 'warn') expressionList # ConsoleExpression
     | scope='tx.outputs' '[' expression ']' op=('.value' | '.lockingBytecode' | '.tokenCategory' | '.nftCommitment' | '.tokenAmount') # UnaryIntrospectionOp
     | scope='tx.inputs' '[' expression ']' op=('.value' | '.lockingBytecode' | '.outpointTransactionHash' | '.outpointIndex' | '.unlockingBytecode' | '.sequenceNumber' | '.tokenCategory' | '.nftCommitment' | '.tokenAmount') # UnaryIntrospectionOp
     | expression op=('.reverse()' | '.length') # UnaryOp
@@ -201,16 +217,3 @@ COMMENT
 LINE_COMMENT
     : '//' ~[\r\n]* -> channel(HIDDEN)
     ;
-
-// consoleLogParameter
-//     : Identifier
-//     | StringLiteral
-//     ;
-
-// consoleParameterList
-//     : '(' (consoleLogParameter (',' consoleLogParameter)* ','?)? ')'
-//     ;
-
-// consoleLog
-//     : 'consolelog' consoleParameterList
-//     ;
\ No newline at end of file
diff --git a/packages/cashc/src/grammar/CashScript.interp b/packages/cashc/src/grammar/CashScript.interp
index e663be56..8d28905b 100644
--- a/packages/cashc/src/grammar/CashScript.interp
+++ b/packages/cashc/src/grammar/CashScript.interp
@@ -20,12 +20,10 @@ null
 'require'
 'if'
 'else'
+'console.log'
 'new'
 '['
 ']'
-'console.'
-'log'
-'warn'
 'tx.outputs'
 '.value'
 '.lockingBytecode'
@@ -134,8 +132,6 @@ null
 null
 null
 null
-null
-null
 VersionLiteral
 BooleanLiteral
 NumberUnit
@@ -171,6 +167,9 @@ assignStatement
 timeOpStatement
 requireStatement
 ifStatement
+consoleStatement
+consoleParameter
+consoleParameterList
 functionCall
 expressionList
 expression
@@ -181,4 +180,4 @@ typeName
 
 
 atn:
-[3, 51485, 51898, 1421, 44986, 20307, 1543, 60043, 49729, 3, 76, 327, 4, 2, 9, 2, 4, 3, 9, 3, 4, 4, 9, 4, 4, 5, 9, 5, 4, 6, 9, 6, 4, 7, 9, 7, 4, 8, 9, 8, 4, 9, 9, 9, 4, 10, 9, 10, 4, 11, 9, 11, 4, 12, 9, 12, 4, 13, 9, 13, 4, 14, 9, 14, 4, 15, 9, 15, 4, 16, 9, 16, 4, 17, 9, 17, 4, 18, 9, 18, 4, 19, 9, 19, 4, 20, 9, 20, 4, 21, 9, 21, 4, 22, 9, 22, 4, 23, 9, 23, 4, 24, 9, 24, 4, 25, 9, 25, 4, 26, 9, 26, 3, 2, 7, 2, 54, 10, 2, 12, 2, 14, 2, 57, 11, 2, 3, 2, 3, 2, 3, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 3, 4, 3, 5, 3, 5, 5, 5, 71, 10, 5, 3, 6, 5, 6, 74, 10, 6, 3, 6, 3, 6, 3, 7, 3, 7, 3, 8, 3, 8, 3, 8, 3, 8, 3, 8, 7, 8, 85, 10, 8, 12, 8, 14, 8, 88, 11, 8, 3, 8, 3, 8, 3, 9, 3, 9, 3, 9, 3, 9, 3, 9, 7, 9, 97, 10, 9, 12, 9, 14, 9, 100, 11, 9, 3, 9, 3, 9, 3, 10, 3, 10, 3, 10, 3, 10, 7, 10, 108, 10, 10, 12, 10, 14, 10, 111, 11, 10, 3, 10, 5, 10, 114, 10, 10, 5, 10, 116, 10, 10, 3, 10, 3, 10, 3, 11, 3, 11, 3, 11, 3, 12, 3, 12, 7, 12, 125, 10, 12, 12, 12, 14, 12, 128, 11, 12, 3, 12, 3, 12, 5, 12, 132, 10, 12, 3, 13, 3, 13, 3, 13, 3, 13, 3, 13, 3, 13, 5, 13, 140, 10, 13, 3, 14, 3, 14, 7, 14, 144, 10, 14, 12, 14, 14, 14, 147, 11, 14, 3, 14, 3, 14, 3, 14, 3, 14, 3, 14, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 3, 16, 3, 16, 3, 16, 3, 16, 3, 16, 3, 17, 3, 17, 3, 17, 3, 17, 3, 17, 3, 17, 3, 17, 3, 17, 3, 18, 3, 18, 3, 18, 3, 18, 3, 18, 3, 18, 3, 19, 3, 19, 3, 19, 3, 19, 3, 19, 3, 19, 3, 19, 5, 19, 189, 10, 19, 3, 20, 3, 20, 3, 20, 3, 21, 3, 21, 3, 21, 3, 21, 7, 21, 198, 10, 21, 12, 21, 14, 21, 201, 11, 21, 3, 21, 5, 21, 204, 10, 21, 5, 21, 206, 10, 21, 3, 21, 3, 21, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 5, 22, 220, 10, 22, 3, 22, 5, 22, 223, 10, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 7, 22, 252, 10, 22, 12, 22, 14, 22, 255, 11, 22, 3, 22, 5, 22, 258, 10, 22, 5, 22, 260, 10, 22, 3, 22, 3, 22, 3, 22, 3, 22, 5, 22, 266, 10, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 7, 22, 307, 10, 22, 12, 22, 14, 22, 310, 11, 22, 3, 23, 3, 23, 3, 24, 3, 24, 3, 24, 3, 24, 3, 24, 5, 24, 319, 10, 24, 3, 25, 3, 25, 5, 25, 323, 10, 25, 3, 26, 3, 26, 3, 26, 2, 2, 3, 42, 27, 2, 2, 4, 2, 6, 2, 8, 2, 10, 2, 12, 2, 14, 2, 16, 2, 18, 2, 20, 2, 22, 2, 24, 2, 26, 2, 28, 2, 30, 2, 32, 2, 34, 2, 36, 2, 38, 2, 40, 2, 42, 2, 44, 2, 46, 2, 48, 2, 50, 2, 2, 13, 3, 2, 6, 12, 3, 2, 27, 28, 3, 2, 30, 34, 4, 2, 30, 34, 36, 39, 3, 2, 43, 44, 3, 2, 45, 47, 4, 2, 44, 44, 48, 48, 3, 2, 8, 11, 3, 2, 49, 50, 3, 2, 40, 41, 4, 2, 56, 61, 66, 66, 2, 354, 2, 55, 3, 2, 2, 2, 4, 61, 3, 2, 2, 2, 6, 66, 3, 2, 2, 2, 8, 68, 3, 2, 2, 2, 10, 73, 3, 2, 2, 2, 12, 77, 3, 2, 2, 2, 14, 79, 3, 2, 2, 2, 16, 91, 3, 2, 2, 2, 18, 103, 3, 2, 2, 2, 20, 119, 3, 2, 2, 2, 22, 131, 3, 2, 2, 2, 24, 139, 3, 2, 2, 2, 26, 141, 3, 2, 2, 2, 28, 153, 3, 2, 2, 2, 30, 162, 3, 2, 2, 2, 32, 167, 3, 2, 2, 2, 34, 175, 3, 2, 2, 2, 36, 181, 3, 2, 2, 2, 38, 190, 3, 2, 2, 2, 40, 193, 3, 2, 2, 2, 42, 265, 3, 2, 2, 2, 44, 311, 3, 2, 2, 2, 46, 318, 3, 2, 2, 2, 48, 320, 3, 2, 2, 2, 50, 324, 3, 2, 2, 2, 52, 54, 5, 4, 3, 2, 53, 52, 3, 2, 2, 2, 54, 57, 3, 2, 2, 2, 55, 53, 3, 2, 2, 2, 55, 56, 3, 2, 2, 2, 56, 58, 3, 2, 2, 2, 57, 55, 3, 2, 2, 2, 58, 59, 5, 14, 8, 2, 59, 60, 7, 2, 2, 3, 60, 3, 3, 2, 2, 2, 61, 62, 7, 3, 2, 2, 62, 63, 5, 6, 4, 2, 63, 64, 5, 8, 5, 2, 64, 65, 7, 4, 2, 2, 65, 5, 3, 2, 2, 2, 66, 67, 7, 5, 2, 2, 67, 7, 3, 2, 2, 2, 68, 70, 5, 10, 6, 2, 69, 71, 5, 10, 6, 2, 70, 69, 3, 2, 2, 2, 70, 71, 3, 2, 2, 2, 71, 9, 3, 2, 2, 2, 72, 74, 5, 12, 7, 2, 73, 72, 3, 2, 2, 2, 73, 74, 3, 2, 2, 2, 74, 75, 3, 2, 2, 2, 75, 76, 7, 62, 2, 2, 76, 11, 3, 2, 2, 2, 77, 78, 9, 2, 2, 2, 78, 13, 3, 2, 2, 2, 79, 80, 7, 13, 2, 2, 80, 81, 7, 73, 2, 2, 81, 82, 5, 18, 10, 2, 82, 86, 7, 14, 2, 2, 83, 85, 5, 16, 9, 2, 84, 83, 3, 2, 2, 2, 85, 88, 3, 2, 2, 2, 86, 84, 3, 2, 2, 2, 86, 87, 3, 2, 2, 2, 87, 89, 3, 2, 2, 2, 88, 86, 3, 2, 2, 2, 89, 90, 7, 15, 2, 2, 90, 15, 3, 2, 2, 2, 91, 92, 7, 16, 2, 2, 92, 93, 7, 73, 2, 2, 93, 94, 5, 18, 10, 2, 94, 98, 7, 14, 2, 2, 95, 97, 5, 24, 13, 2, 96, 95, 3, 2, 2, 2, 97, 100, 3, 2, 2, 2, 98, 96, 3, 2, 2, 2, 98, 99, 3, 2, 2, 2, 99, 101, 3, 2, 2, 2, 100, 98, 3, 2, 2, 2, 101, 102, 7, 15, 2, 2, 102, 17, 3, 2, 2, 2, 103, 115, 7, 17, 2, 2, 104, 109, 5, 20, 11, 2, 105, 106, 7, 18, 2, 2, 106, 108, 5, 20, 11, 2, 107, 105, 3, 2, 2, 2, 108, 111, 3, 2, 2, 2, 109, 107, 3, 2, 2, 2, 109, 110, 3, 2, 2, 2, 110, 113, 3, 2, 2, 2, 111, 109, 3, 2, 2, 2, 112, 114, 7, 18, 2, 2, 113, 112, 3, 2, 2, 2, 113, 114, 3, 2, 2, 2, 114, 116, 3, 2, 2, 2, 115, 104, 3, 2, 2, 2, 115, 116, 3, 2, 2, 2, 116, 117, 3, 2, 2, 2, 117, 118, 7, 19, 2, 2, 118, 19, 3, 2, 2, 2, 119, 120, 5, 50, 26, 2, 120, 121, 7, 73, 2, 2, 121, 21, 3, 2, 2, 2, 122, 126, 7, 14, 2, 2, 123, 125, 5, 24, 13, 2, 124, 123, 3, 2, 2, 2, 125, 128, 3, 2, 2, 2, 126, 124, 3, 2, 2, 2, 126, 127, 3, 2, 2, 2, 127, 129, 3, 2, 2, 2, 128, 126, 3, 2, 2, 2, 129, 132, 7, 15, 2, 2, 130, 132, 5, 24, 13, 2, 131, 122, 3, 2, 2, 2, 131, 130, 3, 2, 2, 2, 132, 23, 3, 2, 2, 2, 133, 140, 5, 26, 14, 2, 134, 140, 5, 28, 15, 2, 135, 140, 5, 30, 16, 2, 136, 140, 5, 32, 17, 2, 137, 140, 5, 34, 18, 2, 138, 140, 5, 36, 19, 2, 139, 133, 3, 2, 2, 2, 139, 134, 3, 2, 2, 2, 139, 135, 3, 2, 2, 2, 139, 136, 3, 2, 2, 2, 139, 137, 3, 2, 2, 2, 139, 138, 3, 2, 2, 2, 140, 25, 3, 2, 2, 2, 141, 145, 5, 50, 26, 2, 142, 144, 5, 44, 23, 2, 143, 142, 3, 2, 2, 2, 144, 147, 3, 2, 2, 2, 145, 143, 3, 2, 2, 2, 145, 146, 3, 2, 2, 2, 146, 148, 3, 2, 2, 2, 147, 145, 3, 2, 2, 2, 148, 149, 7, 73, 2, 2, 149, 150, 7, 12, 2, 2, 150, 151, 5, 42, 22, 2, 151, 152, 7, 4, 2, 2, 152, 27, 3, 2, 2, 2, 153, 154, 5, 50, 26, 2, 154, 155, 7, 73, 2, 2, 155, 156, 7, 18, 2, 2, 156, 157, 5, 50, 26, 2, 157, 158, 7, 73, 2, 2, 158, 159, 7, 12, 2, 2, 159, 160, 5, 42, 22, 2, 160, 161, 7, 4, 2, 2, 161, 29, 3, 2, 2, 2, 162, 163, 7, 73, 2, 2, 163, 164, 7, 12, 2, 2, 164, 165, 5, 42, 22, 2, 165, 166, 7, 4, 2, 2, 166, 31, 3, 2, 2, 2, 167, 168, 7, 20, 2, 2, 168, 169, 7, 17, 2, 2, 169, 170, 7, 71, 2, 2, 170, 171, 7, 8, 2, 2, 171, 172, 5, 42, 22, 2, 172, 173, 7, 19, 2, 2, 173, 174, 7, 4, 2, 2, 174, 33, 3, 2, 2, 2, 175, 176, 7, 20, 2, 2, 176, 177, 7, 17, 2, 2, 177, 178, 5, 42, 22, 2, 178, 179, 7, 19, 2, 2, 179, 180, 7, 4, 2, 2, 180, 35, 3, 2, 2, 2, 181, 182, 7, 21, 2, 2, 182, 183, 7, 17, 2, 2, 183, 184, 5, 42, 22, 2, 184, 185, 7, 19, 2, 2, 185, 188, 5, 22, 12, 2, 186, 187, 7, 22, 2, 2, 187, 189, 5, 22, 12, 2, 188, 186, 3, 2, 2, 2, 188, 189, 3, 2, 2, 2, 189, 37, 3, 2, 2, 2, 190, 191, 7, 73, 2, 2, 191, 192, 5, 40, 21, 2, 192, 39, 3, 2, 2, 2, 193, 205, 7, 17, 2, 2, 194, 199, 5, 42, 22, 2, 195, 196, 7, 18, 2, 2, 196, 198, 5, 42, 22, 2, 197, 195, 3, 2, 2, 2, 198, 201, 3, 2, 2, 2, 199, 197, 3, 2, 2, 2, 199, 200, 3, 2, 2, 2, 200, 203, 3, 2, 2, 2, 201, 199, 3, 2, 2, 2, 202, 204, 7, 18, 2, 2, 203, 202, 3, 2, 2, 2, 203, 204, 3, 2, 2, 2, 204, 206, 3, 2, 2, 2, 205, 194, 3, 2, 2, 2, 205, 206, 3, 2, 2, 2, 206, 207, 3, 2, 2, 2, 207, 208, 7, 19, 2, 2, 208, 41, 3, 2, 2, 2, 209, 210, 8, 22, 1, 2, 210, 211, 7, 17, 2, 2, 211, 212, 5, 42, 22, 2, 212, 213, 7, 19, 2, 2, 213, 266, 3, 2, 2, 2, 214, 215, 5, 50, 26, 2, 215, 216, 7, 17, 2, 2, 216, 219, 5, 42, 22, 2, 217, 218, 7, 18, 2, 2, 218, 220, 5, 42, 22, 2, 219, 217, 3, 2, 2, 2, 219, 220, 3, 2, 2, 2, 220, 222, 3, 2, 2, 2, 221, 223, 7, 18, 2, 2, 222, 221, 3, 2, 2, 2, 222, 223, 3, 2, 2, 2, 223, 224, 3, 2, 2, 2, 224, 225, 7, 19, 2, 2, 225, 266, 3, 2, 2, 2, 226, 266, 5, 38, 20, 2, 227, 228, 7, 23, 2, 2, 228, 229, 7, 73, 2, 2, 229, 266, 5, 40, 21, 2, 230, 231, 7, 26, 2, 2, 231, 232, 9, 3, 2, 2, 232, 266, 5, 40, 21, 2, 233, 234, 7, 29, 2, 2, 234, 235, 7, 24, 2, 2, 235, 236, 5, 42, 22, 2, 236, 237, 7, 25, 2, 2, 237, 238, 9, 4, 2, 2, 238, 266, 3, 2, 2, 2, 239, 240, 7, 35, 2, 2, 240, 241, 7, 24, 2, 2, 241, 242, 5, 42, 22, 2, 242, 243, 7, 25, 2, 2, 243, 244, 9, 5, 2, 2, 244, 266, 3, 2, 2, 2, 245, 246, 9, 6, 2, 2, 246, 266, 5, 42, 22, 16, 247, 259, 7, 24, 2, 2, 248, 253, 5, 42, 22, 2, 249, 250, 7, 18, 2, 2, 250, 252, 5, 42, 22, 2, 251, 249, 3, 2, 2, 2, 252, 255, 3, 2, 2, 2, 253, 251, 3, 2, 2, 2, 253, 254, 3, 2, 2, 2, 254, 257, 3, 2, 2, 2, 255, 253, 3, 2, 2, 2, 256, 258, 7, 18, 2, 2, 257, 256, 3, 2, 2, 2, 257, 258, 3, 2, 2, 2, 258, 260, 3, 2, 2, 2, 259, 248, 3, 2, 2, 2, 259, 260, 3, 2, 2, 2, 260, 261, 3, 2, 2, 2, 261, 266, 7, 25, 2, 2, 262, 266, 7, 72, 2, 2, 263, 266, 7, 73, 2, 2, 264, 266, 5, 46, 24, 2, 265, 209, 3, 2, 2, 2, 265, 214, 3, 2, 2, 2, 265, 226, 3, 2, 2, 2, 265, 227, 3, 2, 2, 2, 265, 230, 3, 2, 2, 2, 265, 233, 3, 2, 2, 2, 265, 239, 3, 2, 2, 2, 265, 245, 3, 2, 2, 2, 265, 247, 3, 2, 2, 2, 265, 262, 3, 2, 2, 2, 265, 263, 3, 2, 2, 2, 265, 264, 3, 2, 2, 2, 266, 308, 3, 2, 2, 2, 267, 268, 12, 15, 2, 2, 268, 269, 9, 7, 2, 2, 269, 307, 5, 42, 22, 16, 270, 271, 12, 14, 2, 2, 271, 272, 9, 8, 2, 2, 272, 307, 5, 42, 22, 15, 273, 274, 12, 13, 2, 2, 274, 275, 9, 9, 2, 2, 275, 307, 5, 42, 22, 14, 276, 277, 12, 12, 2, 2, 277, 278, 9, 10, 2, 2, 278, 307, 5, 42, 22, 13, 279, 280, 12, 11, 2, 2, 280, 281, 7, 51, 2, 2, 281, 307, 5, 42, 22, 12, 282, 283, 12, 10, 2, 2, 283, 284, 7, 6, 2, 2, 284, 307, 5, 42, 22, 11, 285, 286, 12, 9, 2, 2, 286, 287, 7, 52, 2, 2, 287, 307, 5, 42, 22, 10, 288, 289, 12, 8, 2, 2, 289, 290, 7, 53, 2, 2, 290, 307, 5, 42, 22, 9, 291, 292, 12, 7, 2, 2, 292, 293, 7, 54, 2, 2, 293, 307, 5, 42, 22, 8, 294, 295, 12, 22, 2, 2, 295, 296, 7, 24, 2, 2, 296, 297, 7, 65, 2, 2, 297, 307, 7, 25, 2, 2, 298, 299, 12, 18, 2, 2, 299, 307, 9, 11, 2, 2, 300, 301, 12, 17, 2, 2, 301, 302, 7, 42, 2, 2, 302, 303, 7, 17, 2, 2, 303, 304, 5, 42, 22, 2, 304, 305, 7, 19, 2, 2, 305, 307, 3, 2, 2, 2, 306, 267, 3, 2, 2, 2, 306, 270, 3, 2, 2, 2, 306, 273, 3, 2, 2, 2, 306, 276, 3, 2, 2, 2, 306, 279, 3, 2, 2, 2, 306, 282, 3, 2, 2, 2, 306, 285, 3, 2, 2, 2, 306, 288, 3, 2, 2, 2, 306, 291, 3, 2, 2, 2, 306, 294, 3, 2, 2, 2, 306, 298, 3, 2, 2, 2, 306, 300, 3, 2, 2, 2, 307, 310, 3, 2, 2, 2, 308, 306, 3, 2, 2, 2, 308, 309, 3, 2, 2, 2, 309, 43, 3, 2, 2, 2, 310, 308, 3, 2, 2, 2, 311, 312, 7, 55, 2, 2, 312, 45, 3, 2, 2, 2, 313, 319, 7, 63, 2, 2, 314, 319, 5, 48, 25, 2, 315, 319, 7, 68, 2, 2, 316, 319, 7, 69, 2, 2, 317, 319, 7, 70, 2, 2, 318, 313, 3, 2, 2, 2, 318, 314, 3, 2, 2, 2, 318, 315, 3, 2, 2, 2, 318, 316, 3, 2, 2, 2, 318, 317, 3, 2, 2, 2, 319, 47, 3, 2, 2, 2, 320, 322, 7, 65, 2, 2, 321, 323, 7, 64, 2, 2, 322, 321, 3, 2, 2, 2, 322, 323, 3, 2, 2, 2, 323, 49, 3, 2, 2, 2, 324, 325, 9, 12, 2, 2, 325, 51, 3, 2, 2, 2, 28, 55, 70, 73, 86, 98, 109, 113, 115, 126, 131, 139, 145, 188, 199, 203, 205, 219, 222, 253, 257, 259, 265, 306, 308, 318, 322]
\ No newline at end of file
+[3, 51485, 51898, 1421, 44986, 20307, 1543, 60043, 49729, 3, 74, 353, 4, 2, 9, 2, 4, 3, 9, 3, 4, 4, 9, 4, 4, 5, 9, 5, 4, 6, 9, 6, 4, 7, 9, 7, 4, 8, 9, 8, 4, 9, 9, 9, 4, 10, 9, 10, 4, 11, 9, 11, 4, 12, 9, 12, 4, 13, 9, 13, 4, 14, 9, 14, 4, 15, 9, 15, 4, 16, 9, 16, 4, 17, 9, 17, 4, 18, 9, 18, 4, 19, 9, 19, 4, 20, 9, 20, 4, 21, 9, 21, 4, 22, 9, 22, 4, 23, 9, 23, 4, 24, 9, 24, 4, 25, 9, 25, 4, 26, 9, 26, 4, 27, 9, 27, 4, 28, 9, 28, 4, 29, 9, 29, 3, 2, 7, 2, 60, 10, 2, 12, 2, 14, 2, 63, 11, 2, 3, 2, 3, 2, 3, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 3, 4, 3, 5, 3, 5, 5, 5, 77, 10, 5, 3, 6, 5, 6, 80, 10, 6, 3, 6, 3, 6, 3, 7, 3, 7, 3, 8, 3, 8, 3, 8, 3, 8, 3, 8, 7, 8, 91, 10, 8, 12, 8, 14, 8, 94, 11, 8, 3, 8, 3, 8, 3, 9, 3, 9, 3, 9, 3, 9, 3, 9, 7, 9, 103, 10, 9, 12, 9, 14, 9, 106, 11, 9, 3, 9, 3, 9, 3, 10, 3, 10, 3, 10, 3, 10, 7, 10, 114, 10, 10, 12, 10, 14, 10, 117, 11, 10, 3, 10, 5, 10, 120, 10, 10, 5, 10, 122, 10, 10, 3, 10, 3, 10, 3, 11, 3, 11, 3, 11, 3, 12, 3, 12, 7, 12, 131, 10, 12, 12, 12, 14, 12, 134, 11, 12, 3, 12, 3, 12, 5, 12, 138, 10, 12, 3, 13, 3, 13, 3, 13, 3, 13, 3, 13, 3, 13, 3, 13, 5, 13, 147, 10, 13, 3, 14, 3, 14, 7, 14, 151, 10, 14, 12, 14, 14, 14, 154, 11, 14, 3, 14, 3, 14, 3, 14, 3, 14, 3, 14, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 3, 16, 3, 16, 3, 16, 3, 16, 3, 16, 3, 17, 3, 17, 3, 17, 3, 17, 3, 17, 3, 17, 3, 17, 3, 17, 3, 18, 3, 18, 3, 18, 3, 18, 3, 18, 3, 18, 3, 19, 3, 19, 3, 19, 3, 19, 3, 19, 3, 19, 3, 19, 5, 19, 196, 10, 19, 3, 20, 3, 20, 3, 20, 3, 20, 3, 21, 3, 21, 3, 22, 3, 22, 3, 22, 3, 22, 7, 22, 208, 10, 22, 12, 22, 14, 22, 211, 11, 22, 3, 22, 5, 22, 214, 10, 22, 5, 22, 216, 10, 22, 3, 22, 3, 22, 3, 23, 3, 23, 3, 23, 3, 24, 3, 24, 3, 24, 3, 24, 7, 24, 227, 10, 24, 12, 24, 14, 24, 230, 11, 24, 3, 24, 5, 24, 233, 10, 24, 5, 24, 235, 10, 24, 3, 24, 3, 24, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 5, 25, 249, 10, 25, 3, 25, 5, 25, 252, 10, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 7, 25, 278, 10, 25, 12, 25, 14, 25, 281, 11, 25, 3, 25, 5, 25, 284, 10, 25, 5, 25, 286, 10, 25, 3, 25, 3, 25, 3, 25, 3, 25, 5, 25, 292, 10, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 7, 25, 333, 10, 25, 12, 25, 14, 25, 336, 11, 25, 3, 26, 3, 26, 3, 27, 3, 27, 3, 27, 3, 27, 3, 27, 5, 27, 345, 10, 27, 3, 28, 3, 28, 5, 28, 349, 10, 28, 3, 29, 3, 29, 3, 29, 2, 2, 3, 48, 30, 2, 2, 4, 2, 6, 2, 8, 2, 10, 2, 12, 2, 14, 2, 16, 2, 18, 2, 20, 2, 22, 2, 24, 2, 26, 2, 28, 2, 30, 2, 32, 2, 34, 2, 36, 2, 38, 2, 40, 2, 42, 2, 44, 2, 46, 2, 48, 2, 50, 2, 52, 2, 54, 2, 56, 2, 2, 13, 3, 2, 6, 12, 7, 2, 61, 61, 63, 63, 66, 66, 68, 68, 71, 71, 3, 2, 28, 32, 4, 2, 28, 32, 34, 37, 3, 2, 41, 42, 3, 2, 43, 45, 4, 2, 42, 42, 46, 46, 3, 2, 8, 11, 3, 2, 47, 48, 3, 2, 38, 39, 4, 2, 54, 59, 64, 64, 2, 380, 2, 61, 3, 2, 2, 2, 4, 67, 3, 2, 2, 2, 6, 72, 3, 2, 2, 2, 8, 74, 3, 2, 2, 2, 10, 79, 3, 2, 2, 2, 12, 83, 3, 2, 2, 2, 14, 85, 3, 2, 2, 2, 16, 97, 3, 2, 2, 2, 18, 109, 3, 2, 2, 2, 20, 125, 3, 2, 2, 2, 22, 137, 3, 2, 2, 2, 24, 146, 3, 2, 2, 2, 26, 148, 3, 2, 2, 2, 28, 160, 3, 2, 2, 2, 30, 169, 3, 2, 2, 2, 32, 174, 3, 2, 2, 2, 34, 182, 3, 2, 2, 2, 36, 188, 3, 2, 2, 2, 38, 197, 3, 2, 2, 2, 40, 201, 3, 2, 2, 2, 42, 203, 3, 2, 2, 2, 44, 219, 3, 2, 2, 2, 46, 222, 3, 2, 2, 2, 48, 291, 3, 2, 2, 2, 50, 337, 3, 2, 2, 2, 52, 344, 3, 2, 2, 2, 54, 346, 3, 2, 2, 2, 56, 350, 3, 2, 2, 2, 58, 60, 5, 4, 3, 2, 59, 58, 3, 2, 2, 2, 60, 63, 3, 2, 2, 2, 61, 59, 3, 2, 2, 2, 61, 62, 3, 2, 2, 2, 62, 64, 3, 2, 2, 2, 63, 61, 3, 2, 2, 2, 64, 65, 5, 14, 8, 2, 65, 66, 7, 2, 2, 3, 66, 3, 3, 2, 2, 2, 67, 68, 7, 3, 2, 2, 68, 69, 5, 6, 4, 2, 69, 70, 5, 8, 5, 2, 70, 71, 7, 4, 2, 2, 71, 5, 3, 2, 2, 2, 72, 73, 7, 5, 2, 2, 73, 7, 3, 2, 2, 2, 74, 76, 5, 10, 6, 2, 75, 77, 5, 10, 6, 2, 76, 75, 3, 2, 2, 2, 76, 77, 3, 2, 2, 2, 77, 9, 3, 2, 2, 2, 78, 80, 5, 12, 7, 2, 79, 78, 3, 2, 2, 2, 79, 80, 3, 2, 2, 2, 80, 81, 3, 2, 2, 2, 81, 82, 7, 60, 2, 2, 82, 11, 3, 2, 2, 2, 83, 84, 9, 2, 2, 2, 84, 13, 3, 2, 2, 2, 85, 86, 7, 13, 2, 2, 86, 87, 7, 71, 2, 2, 87, 88, 5, 18, 10, 2, 88, 92, 7, 14, 2, 2, 89, 91, 5, 16, 9, 2, 90, 89, 3, 2, 2, 2, 91, 94, 3, 2, 2, 2, 92, 90, 3, 2, 2, 2, 92, 93, 3, 2, 2, 2, 93, 95, 3, 2, 2, 2, 94, 92, 3, 2, 2, 2, 95, 96, 7, 15, 2, 2, 96, 15, 3, 2, 2, 2, 97, 98, 7, 16, 2, 2, 98, 99, 7, 71, 2, 2, 99, 100, 5, 18, 10, 2, 100, 104, 7, 14, 2, 2, 101, 103, 5, 24, 13, 2, 102, 101, 3, 2, 2, 2, 103, 106, 3, 2, 2, 2, 104, 102, 3, 2, 2, 2, 104, 105, 3, 2, 2, 2, 105, 107, 3, 2, 2, 2, 106, 104, 3, 2, 2, 2, 107, 108, 7, 15, 2, 2, 108, 17, 3, 2, 2, 2, 109, 121, 7, 17, 2, 2, 110, 115, 5, 20, 11, 2, 111, 112, 7, 18, 2, 2, 112, 114, 5, 20, 11, 2, 113, 111, 3, 2, 2, 2, 114, 117, 3, 2, 2, 2, 115, 113, 3, 2, 2, 2, 115, 116, 3, 2, 2, 2, 116, 119, 3, 2, 2, 2, 117, 115, 3, 2, 2, 2, 118, 120, 7, 18, 2, 2, 119, 118, 3, 2, 2, 2, 119, 120, 3, 2, 2, 2, 120, 122, 3, 2, 2, 2, 121, 110, 3, 2, 2, 2, 121, 122, 3, 2, 2, 2, 122, 123, 3, 2, 2, 2, 123, 124, 7, 19, 2, 2, 124, 19, 3, 2, 2, 2, 125, 126, 5, 56, 29, 2, 126, 127, 7, 71, 2, 2, 127, 21, 3, 2, 2, 2, 128, 132, 7, 14, 2, 2, 129, 131, 5, 24, 13, 2, 130, 129, 3, 2, 2, 2, 131, 134, 3, 2, 2, 2, 132, 130, 3, 2, 2, 2, 132, 133, 3, 2, 2, 2, 133, 135, 3, 2, 2, 2, 134, 132, 3, 2, 2, 2, 135, 138, 7, 15, 2, 2, 136, 138, 5, 24, 13, 2, 137, 128, 3, 2, 2, 2, 137, 136, 3, 2, 2, 2, 138, 23, 3, 2, 2, 2, 139, 147, 5, 26, 14, 2, 140, 147, 5, 28, 15, 2, 141, 147, 5, 30, 16, 2, 142, 147, 5, 32, 17, 2, 143, 147, 5, 34, 18, 2, 144, 147, 5, 36, 19, 2, 145, 147, 5, 38, 20, 2, 146, 139, 3, 2, 2, 2, 146, 140, 3, 2, 2, 2, 146, 141, 3, 2, 2, 2, 146, 142, 3, 2, 2, 2, 146, 143, 3, 2, 2, 2, 146, 144, 3, 2, 2, 2, 146, 145, 3, 2, 2, 2, 147, 25, 3, 2, 2, 2, 148, 152, 5, 56, 29, 2, 149, 151, 5, 50, 26, 2, 150, 149, 3, 2, 2, 2, 151, 154, 3, 2, 2, 2, 152, 150, 3, 2, 2, 2, 152, 153, 3, 2, 2, 2, 153, 155, 3, 2, 2, 2, 154, 152, 3, 2, 2, 2, 155, 156, 7, 71, 2, 2, 156, 157, 7, 12, 2, 2, 157, 158, 5, 48, 25, 2, 158, 159, 7, 4, 2, 2, 159, 27, 3, 2, 2, 2, 160, 161, 5, 56, 29, 2, 161, 162, 7, 71, 2, 2, 162, 163, 7, 18, 2, 2, 163, 164, 5, 56, 29, 2, 164, 165, 7, 71, 2, 2, 165, 166, 7, 12, 2, 2, 166, 167, 5, 48, 25, 2, 167, 168, 7, 4, 2, 2, 168, 29, 3, 2, 2, 2, 169, 170, 7, 71, 2, 2, 170, 171, 7, 12, 2, 2, 171, 172, 5, 48, 25, 2, 172, 173, 7, 4, 2, 2, 173, 31, 3, 2, 2, 2, 174, 175, 7, 20, 2, 2, 175, 176, 7, 17, 2, 2, 176, 177, 7, 69, 2, 2, 177, 178, 7, 8, 2, 2, 178, 179, 5, 48, 25, 2, 179, 180, 7, 19, 2, 2, 180, 181, 7, 4, 2, 2, 181, 33, 3, 2, 2, 2, 182, 183, 7, 20, 2, 2, 183, 184, 7, 17, 2, 2, 184, 185, 5, 48, 25, 2, 185, 186, 7, 19, 2, 2, 186, 187, 7, 4, 2, 2, 187, 35, 3, 2, 2, 2, 188, 189, 7, 21, 2, 2, 189, 190, 7, 17, 2, 2, 190, 191, 5, 48, 25, 2, 191, 192, 7, 19, 2, 2, 192, 195, 5, 22, 12, 2, 193, 194, 7, 22, 2, 2, 194, 196, 5, 22, 12, 2, 195, 193, 3, 2, 2, 2, 195, 196, 3, 2, 2, 2, 196, 37, 3, 2, 2, 2, 197, 198, 7, 23, 2, 2, 198, 199, 5, 42, 22, 2, 199, 200, 7, 4, 2, 2, 200, 39, 3, 2, 2, 2, 201, 202, 9, 3, 2, 2, 202, 41, 3, 2, 2, 2, 203, 215, 7, 17, 2, 2, 204, 209, 5, 40, 21, 2, 205, 206, 7, 18, 2, 2, 206, 208, 5, 40, 21, 2, 207, 205, 3, 2, 2, 2, 208, 211, 3, 2, 2, 2, 209, 207, 3, 2, 2, 2, 209, 210, 3, 2, 2, 2, 210, 213, 3, 2, 2, 2, 211, 209, 3, 2, 2, 2, 212, 214, 7, 18, 2, 2, 213, 212, 3, 2, 2, 2, 213, 214, 3, 2, 2, 2, 214, 216, 3, 2, 2, 2, 215, 204, 3, 2, 2, 2, 215, 216, 3, 2, 2, 2, 216, 217, 3, 2, 2, 2, 217, 218, 7, 19, 2, 2, 218, 43, 3, 2, 2, 2, 219, 220, 7, 71, 2, 2, 220, 221, 5, 46, 24, 2, 221, 45, 3, 2, 2, 2, 222, 234, 7, 17, 2, 2, 223, 228, 5, 48, 25, 2, 224, 225, 7, 18, 2, 2, 225, 227, 5, 48, 25, 2, 226, 224, 3, 2, 2, 2, 227, 230, 3, 2, 2, 2, 228, 226, 3, 2, 2, 2, 228, 229, 3, 2, 2, 2, 229, 232, 3, 2, 2, 2, 230, 228, 3, 2, 2, 2, 231, 233, 7, 18, 2, 2, 232, 231, 3, 2, 2, 2, 232, 233, 3, 2, 2, 2, 233, 235, 3, 2, 2, 2, 234, 223, 3, 2, 2, 2, 234, 235, 3, 2, 2, 2, 235, 236, 3, 2, 2, 2, 236, 237, 7, 19, 2, 2, 237, 47, 3, 2, 2, 2, 238, 239, 8, 25, 1, 2, 239, 240, 7, 17, 2, 2, 240, 241, 5, 48, 25, 2, 241, 242, 7, 19, 2, 2, 242, 292, 3, 2, 2, 2, 243, 244, 5, 56, 29, 2, 244, 245, 7, 17, 2, 2, 245, 248, 5, 48, 25, 2, 246, 247, 7, 18, 2, 2, 247, 249, 5, 48, 25, 2, 248, 246, 3, 2, 2, 2, 248, 249, 3, 2, 2, 2, 249, 251, 3, 2, 2, 2, 250, 252, 7, 18, 2, 2, 251, 250, 3, 2, 2, 2, 251, 252, 3, 2, 2, 2, 252, 253, 3, 2, 2, 2, 253, 254, 7, 19, 2, 2, 254, 292, 3, 2, 2, 2, 255, 292, 5, 44, 23, 2, 256, 257, 7, 24, 2, 2, 257, 258, 7, 71, 2, 2, 258, 292, 5, 46, 24, 2, 259, 260, 7, 27, 2, 2, 260, 261, 7, 25, 2, 2, 261, 262, 5, 48, 25, 2, 262, 263, 7, 26, 2, 2, 263, 264, 9, 4, 2, 2, 264, 292, 3, 2, 2, 2, 265, 266, 7, 33, 2, 2, 266, 267, 7, 25, 2, 2, 267, 268, 5, 48, 25, 2, 268, 269, 7, 26, 2, 2, 269, 270, 9, 5, 2, 2, 270, 292, 3, 2, 2, 2, 271, 272, 9, 6, 2, 2, 272, 292, 5, 48, 25, 16, 273, 285, 7, 25, 2, 2, 274, 279, 5, 48, 25, 2, 275, 276, 7, 18, 2, 2, 276, 278, 5, 48, 25, 2, 277, 275, 3, 2, 2, 2, 278, 281, 3, 2, 2, 2, 279, 277, 3, 2, 2, 2, 279, 280, 3, 2, 2, 2, 280, 283, 3, 2, 2, 2, 281, 279, 3, 2, 2, 2, 282, 284, 7, 18, 2, 2, 283, 282, 3, 2, 2, 2, 283, 284, 3, 2, 2, 2, 284, 286, 3, 2, 2, 2, 285, 274, 3, 2, 2, 2, 285, 286, 3, 2, 2, 2, 286, 287, 3, 2, 2, 2, 287, 292, 7, 26, 2, 2, 288, 292, 7, 70, 2, 2, 289, 292, 7, 71, 2, 2, 290, 292, 5, 52, 27, 2, 291, 238, 3, 2, 2, 2, 291, 243, 3, 2, 2, 2, 291, 255, 3, 2, 2, 2, 291, 256, 3, 2, 2, 2, 291, 259, 3, 2, 2, 2, 291, 265, 3, 2, 2, 2, 291, 271, 3, 2, 2, 2, 291, 273, 3, 2, 2, 2, 291, 288, 3, 2, 2, 2, 291, 289, 3, 2, 2, 2, 291, 290, 3, 2, 2, 2, 292, 334, 3, 2, 2, 2, 293, 294, 12, 15, 2, 2, 294, 295, 9, 7, 2, 2, 295, 333, 5, 48, 25, 16, 296, 297, 12, 14, 2, 2, 297, 298, 9, 8, 2, 2, 298, 333, 5, 48, 25, 15, 299, 300, 12, 13, 2, 2, 300, 301, 9, 9, 2, 2, 301, 333, 5, 48, 25, 14, 302, 303, 12, 12, 2, 2, 303, 304, 9, 10, 2, 2, 304, 333, 5, 48, 25, 13, 305, 306, 12, 11, 2, 2, 306, 307, 7, 49, 2, 2, 307, 333, 5, 48, 25, 12, 308, 309, 12, 10, 2, 2, 309, 310, 7, 6, 2, 2, 310, 333, 5, 48, 25, 11, 311, 312, 12, 9, 2, 2, 312, 313, 7, 50, 2, 2, 313, 333, 5, 48, 25, 10, 314, 315, 12, 8, 2, 2, 315, 316, 7, 51, 2, 2, 316, 333, 5, 48, 25, 9, 317, 318, 12, 7, 2, 2, 318, 319, 7, 52, 2, 2, 319, 333, 5, 48, 25, 8, 320, 321, 12, 21, 2, 2, 321, 322, 7, 25, 2, 2, 322, 323, 7, 63, 2, 2, 323, 333, 7, 26, 2, 2, 324, 325, 12, 18, 2, 2, 325, 333, 9, 11, 2, 2, 326, 327, 12, 17, 2, 2, 327, 328, 7, 40, 2, 2, 328, 329, 7, 17, 2, 2, 329, 330, 5, 48, 25, 2, 330, 331, 7, 19, 2, 2, 331, 333, 3, 2, 2, 2, 332, 293, 3, 2, 2, 2, 332, 296, 3, 2, 2, 2, 332, 299, 3, 2, 2, 2, 332, 302, 3, 2, 2, 2, 332, 305, 3, 2, 2, 2, 332, 308, 3, 2, 2, 2, 332, 311, 3, 2, 2, 2, 332, 314, 3, 2, 2, 2, 332, 317, 3, 2, 2, 2, 332, 320, 3, 2, 2, 2, 332, 324, 3, 2, 2, 2, 332, 326, 3, 2, 2, 2, 333, 336, 3, 2, 2, 2, 334, 332, 3, 2, 2, 2, 334, 335, 3, 2, 2, 2, 335, 49, 3, 2, 2, 2, 336, 334, 3, 2, 2, 2, 337, 338, 7, 53, 2, 2, 338, 51, 3, 2, 2, 2, 339, 345, 7, 61, 2, 2, 340, 345, 5, 54, 28, 2, 341, 345, 7, 66, 2, 2, 342, 345, 7, 67, 2, 2, 343, 345, 7, 68, 2, 2, 344, 339, 3, 2, 2, 2, 344, 340, 3, 2, 2, 2, 344, 341, 3, 2, 2, 2, 344, 342, 3, 2, 2, 2, 344, 343, 3, 2, 2, 2, 345, 53, 3, 2, 2, 2, 346, 348, 7, 63, 2, 2, 347, 349, 7, 62, 2, 2, 348, 347, 3, 2, 2, 2, 348, 349, 3, 2, 2, 2, 349, 55, 3, 2, 2, 2, 350, 351, 9, 12, 2, 2, 351, 57, 3, 2, 2, 2, 31, 61, 76, 79, 92, 104, 115, 119, 121, 132, 137, 146, 152, 195, 209, 213, 215, 228, 232, 234, 248, 251, 279, 283, 285, 291, 332, 334, 344, 348]
\ No newline at end of file
diff --git a/packages/cashc/src/grammar/CashScript.tokens b/packages/cashc/src/grammar/CashScript.tokens
index 99983b17..c7289b6a 100644
--- a/packages/cashc/src/grammar/CashScript.tokens
+++ b/packages/cashc/src/grammar/CashScript.tokens
@@ -55,23 +55,21 @@ T__53=54
 T__54=55
 T__55=56
 T__56=57
-T__57=58
-T__58=59
-VersionLiteral=60
-BooleanLiteral=61
-NumberUnit=62
-NumberLiteral=63
-Bytes=64
-Bound=65
-StringLiteral=66
-DateLiteral=67
-HexLiteral=68
-TxVar=69
-NullaryOp=70
-Identifier=71
-WHITESPACE=72
-COMMENT=73
-LINE_COMMENT=74
+VersionLiteral=58
+BooleanLiteral=59
+NumberUnit=60
+NumberLiteral=61
+Bytes=62
+Bound=63
+StringLiteral=64
+DateLiteral=65
+HexLiteral=66
+TxVar=67
+NullaryOp=68
+Identifier=69
+WHITESPACE=70
+COMMENT=71
+LINE_COMMENT=72
 'pragma'=1
 ';'=2
 'cashscript'=3
@@ -92,42 +90,40 @@ LINE_COMMENT=74
 'require'=18
 'if'=19
 'else'=20
-'new'=21
-'['=22
-']'=23
-'console.'=24
-'log'=25
-'warn'=26
-'tx.outputs'=27
-'.value'=28
-'.lockingBytecode'=29
-'.tokenCategory'=30
-'.nftCommitment'=31
-'.tokenAmount'=32
-'tx.inputs'=33
-'.outpointTransactionHash'=34
-'.outpointIndex'=35
-'.unlockingBytecode'=36
-'.sequenceNumber'=37
-'.reverse()'=38
-'.length'=39
-'.split'=40
-'!'=41
-'-'=42
-'*'=43
-'/'=44
-'%'=45
-'+'=46
-'=='=47
-'!='=48
-'&'=49
-'|'=50
-'&&'=51
-'||'=52
-'constant'=53
-'int'=54
-'bool'=55
-'string'=56
-'pubkey'=57
-'sig'=58
-'datasig'=59
+'console.log'=21
+'new'=22
+'['=23
+']'=24
+'tx.outputs'=25
+'.value'=26
+'.lockingBytecode'=27
+'.tokenCategory'=28
+'.nftCommitment'=29
+'.tokenAmount'=30
+'tx.inputs'=31
+'.outpointTransactionHash'=32
+'.outpointIndex'=33
+'.unlockingBytecode'=34
+'.sequenceNumber'=35
+'.reverse()'=36
+'.length'=37
+'.split'=38
+'!'=39
+'-'=40
+'*'=41
+'/'=42
+'%'=43
+'+'=44
+'=='=45
+'!='=46
+'&'=47
+'|'=48
+'&&'=49
+'||'=50
+'constant'=51
+'int'=52
+'bool'=53
+'string'=54
+'pubkey'=55
+'sig'=56
+'datasig'=57
diff --git a/packages/cashc/src/grammar/CashScriptLexer.interp b/packages/cashc/src/grammar/CashScriptLexer.interp
index 5fd73423..bc535506 100644
--- a/packages/cashc/src/grammar/CashScriptLexer.interp
+++ b/packages/cashc/src/grammar/CashScriptLexer.interp
@@ -20,12 +20,10 @@ null
 'require'
 'if'
 'else'
+'console.log'
 'new'
 '['
 ']'
-'console.'
-'log'
-'warn'
 'tx.outputs'
 '.value'
 '.lockingBytecode'
@@ -134,8 +132,6 @@ null
 null
 null
 null
-null
-null
 VersionLiteral
 BooleanLiteral
 NumberUnit
@@ -210,8 +206,6 @@ T__53
 T__54
 T__55
 T__56
-T__57
-T__58
 VersionLiteral
 BooleanLiteral
 NumberUnit
@@ -236,4 +230,4 @@ mode names:
 DEFAULT_MODE
 
 atn:
-[3, 51485, 51898, 1421, 44986, 20307, 1543, 60043, 49729, 2, 76, 832, 8, 1, 4, 2, 9, 2, 4, 3, 9, 3, 4, 4, 9, 4, 4, 5, 9, 5, 4, 6, 9, 6, 4, 7, 9, 7, 4, 8, 9, 8, 4, 9, 9, 9, 4, 10, 9, 10, 4, 11, 9, 11, 4, 12, 9, 12, 4, 13, 9, 13, 4, 14, 9, 14, 4, 15, 9, 15, 4, 16, 9, 16, 4, 17, 9, 17, 4, 18, 9, 18, 4, 19, 9, 19, 4, 20, 9, 20, 4, 21, 9, 21, 4, 22, 9, 22, 4, 23, 9, 23, 4, 24, 9, 24, 4, 25, 9, 25, 4, 26, 9, 26, 4, 27, 9, 27, 4, 28, 9, 28, 4, 29, 9, 29, 4, 30, 9, 30, 4, 31, 9, 31, 4, 32, 9, 32, 4, 33, 9, 33, 4, 34, 9, 34, 4, 35, 9, 35, 4, 36, 9, 36, 4, 37, 9, 37, 4, 38, 9, 38, 4, 39, 9, 39, 4, 40, 9, 40, 4, 41, 9, 41, 4, 42, 9, 42, 4, 43, 9, 43, 4, 44, 9, 44, 4, 45, 9, 45, 4, 46, 9, 46, 4, 47, 9, 47, 4, 48, 9, 48, 4, 49, 9, 49, 4, 50, 9, 50, 4, 51, 9, 51, 4, 52, 9, 52, 4, 53, 9, 53, 4, 54, 9, 54, 4, 55, 9, 55, 4, 56, 9, 56, 4, 57, 9, 57, 4, 58, 9, 58, 4, 59, 9, 59, 4, 60, 9, 60, 4, 61, 9, 61, 4, 62, 9, 62, 4, 63, 9, 63, 4, 64, 9, 64, 4, 65, 9, 65, 4, 66, 9, 66, 4, 67, 9, 67, 4, 68, 9, 68, 4, 69, 9, 69, 4, 70, 9, 70, 4, 71, 9, 71, 4, 72, 9, 72, 4, 73, 9, 73, 4, 74, 9, 74, 4, 75, 9, 75, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 3, 3, 3, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 5, 3, 5, 3, 6, 3, 6, 3, 7, 3, 7, 3, 7, 3, 8, 3, 8, 3, 9, 3, 9, 3, 10, 3, 10, 3, 10, 3, 11, 3, 11, 3, 12, 3, 12, 3, 12, 3, 12, 3, 12, 3, 12, 3, 12, 3, 12, 3, 12, 3, 13, 3, 13, 3, 14, 3, 14, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 3, 16, 3, 16, 3, 17, 3, 17, 3, 18, 3, 18, 3, 19, 3, 19, 3, 19, 3, 19, 3, 19, 3, 19, 3, 19, 3, 19, 3, 20, 3, 20, 3, 20, 3, 21, 3, 21, 3, 21, 3, 21, 3, 21, 3, 22, 3, 22, 3, 22, 3, 22, 3, 23, 3, 23, 3, 24, 3, 24, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 26, 3, 26, 3, 26, 3, 26, 3, 27, 3, 27, 3, 27, 3, 27, 3, 27, 3, 28, 3, 28, 3, 28, 3, 28, 3, 28, 3, 28, 3, 28, 3, 28, 3, 28, 3, 28, 3, 28, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 30, 3, 30, 3, 30, 3, 30, 3, 30, 3, 30, 3, 30, 3, 30, 3, 30, 3, 30, 3, 30, 3, 30, 3, 30, 3, 30, 3, 30, 3, 30, 3, 30, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 37, 3, 37, 3, 37, 3, 37, 3, 37, 3, 37, 3, 37, 3, 37, 3, 37, 3, 37, 3, 37, 3, 37, 3, 37, 3, 37, 3, 37, 3, 37, 3, 37, 3, 37, 3, 37, 3, 38, 3, 38, 3, 38, 3, 38, 3, 38, 3, 38, 3, 38, 3, 38, 3, 38, 3, 38, 3, 38, 3, 38, 3, 38, 3, 38, 3, 38, 3, 38, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 42, 3, 42, 3, 43, 3, 43, 3, 44, 3, 44, 3, 45, 3, 45, 3, 46, 3, 46, 3, 47, 3, 47, 3, 48, 3, 48, 3, 48, 3, 49, 3, 49, 3, 49, 3, 50, 3, 50, 3, 51, 3, 51, 3, 52, 3, 52, 3, 52, 3, 53, 3, 53, 3, 53, 3, 54, 3, 54, 3, 54, 3, 54, 3, 54, 3, 54, 3, 54, 3, 54, 3, 54, 3, 55, 3, 55, 3, 55, 3, 55, 3, 56, 3, 56, 3, 56, 3, 56, 3, 56, 3, 57, 3, 57, 3, 57, 3, 57, 3, 57, 3, 57, 3, 57, 3, 58, 3, 58, 3, 58, 3, 58, 3, 58, 3, 58, 3, 58, 3, 59, 3, 59, 3, 59, 3, 59, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 61, 6, 61, 520, 10, 61, 13, 61, 14, 61, 521, 3, 61, 3, 61, 6, 61, 526, 10, 61, 13, 61, 14, 61, 527, 3, 61, 3, 61, 6, 61, 532, 10, 61, 13, 61, 14, 61, 533, 3, 62, 3, 62, 3, 62, 3, 62, 3, 62, 3, 62, 3, 62, 3, 62, 3, 62, 5, 62, 545, 10, 62, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 5, 63, 604, 10, 63, 3, 64, 5, 64, 607, 10, 64, 3, 64, 6, 64, 610, 10, 64, 13, 64, 14, 64, 611, 3, 64, 3, 64, 6, 64, 616, 10, 64, 13, 64, 14, 64, 617, 5, 64, 620, 10, 64, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 5, 65, 629, 10, 65, 3, 65, 3, 65, 3, 65, 3, 65, 5, 65, 635, 10, 65, 3, 66, 3, 66, 7, 66, 639, 10, 66, 12, 66, 14, 66, 642, 11, 66, 3, 67, 3, 67, 3, 67, 3, 67, 7, 67, 648, 10, 67, 12, 67, 14, 67, 651, 11, 67, 3, 67, 3, 67, 3, 67, 3, 67, 3, 67, 7, 67, 658, 10, 67, 12, 67, 14, 67, 661, 11, 67, 3, 67, 5, 67, 664, 10, 67, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 69, 3, 69, 3, 69, 7, 69, 678, 10, 69, 12, 69, 14, 69, 681, 11, 69, 3, 70, 3, 70, 3, 70, 3, 70, 3, 70, 3, 70, 3, 70, 3, 70, 3, 70, 3, 70, 3, 70, 3, 70, 3, 70, 5, 70, 696, 10, 70, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 5, 71, 792, 10, 71, 3, 72, 3, 72, 7, 72, 796, 10, 72, 12, 72, 14, 72, 799, 11, 72, 3, 73, 6, 73, 802, 10, 73, 13, 73, 14, 73, 803, 3, 73, 3, 73, 3, 74, 3, 74, 3, 74, 3, 74, 7, 74, 812, 10, 74, 12, 74, 14, 74, 815, 11, 74, 3, 74, 3, 74, 3, 74, 3, 74, 3, 74, 3, 75, 3, 75, 3, 75, 3, 75, 7, 75, 826, 10, 75, 12, 75, 14, 75, 829, 11, 75, 3, 75, 3, 75, 5, 649, 659, 813, 2, 2, 76, 3, 2, 3, 5, 2, 4, 7, 2, 5, 9, 2, 6, 11, 2, 7, 13, 2, 8, 15, 2, 9, 17, 2, 10, 19, 2, 11, 21, 2, 12, 23, 2, 13, 25, 2, 14, 27, 2, 15, 29, 2, 16, 31, 2, 17, 33, 2, 18, 35, 2, 19, 37, 2, 20, 39, 2, 21, 41, 2, 22, 43, 2, 23, 45, 2, 24, 47, 2, 25, 49, 2, 26, 51, 2, 27, 53, 2, 28, 55, 2, 29, 57, 2, 30, 59, 2, 31, 61, 2, 32, 63, 2, 33, 65, 2, 34, 67, 2, 35, 69, 2, 36, 71, 2, 37, 73, 2, 38, 75, 2, 39, 77, 2, 40, 79, 2, 41, 81, 2, 42, 83, 2, 43, 85, 2, 44, 87, 2, 45, 89, 2, 46, 91, 2, 47, 93, 2, 48, 95, 2, 49, 97, 2, 50, 99, 2, 51, 101, 2, 52, 103, 2, 53, 105, 2, 54, 107, 2, 55, 109, 2, 56, 111, 2, 57, 113, 2, 58, 115, 2, 59, 117, 2, 60, 119, 2, 61, 121, 2, 62, 123, 2, 63, 125, 2, 64, 127, 2, 65, 129, 2, 66, 131, 2, 67, 133, 2, 68, 135, 2, 69, 137, 2, 70, 139, 2, 71, 141, 2, 72, 143, 2, 73, 145, 2, 74, 147, 2, 75, 149, 2, 76, 3, 2, 14, 3, 2, 50, 59, 3, 2, 47, 47, 4, 2, 71, 71, 103, 103, 3, 2, 51, 59, 5, 2, 12, 12, 15, 15, 36, 36, 5, 2, 12, 12, 15, 15, 41, 41, 4, 2, 90, 90, 122, 122, 5, 2, 50, 59, 67, 72, 99, 104, 4, 2, 67, 92, 99, 124, 6, 2, 50, 59, 67, 92, 97, 97, 99, 124, 5, 2, 11, 12, 14, 15, 34, 34, 4, 2, 12, 12, 15, 15, 2, 867, 2, 3, 3, 2, 2, 2, 2, 5, 3, 2, 2, 2, 2, 7, 3, 2, 2, 2, 2, 9, 3, 2, 2, 2, 2, 11, 3, 2, 2, 2, 2, 13, 3, 2, 2, 2, 2, 15, 3, 2, 2, 2, 2, 17, 3, 2, 2, 2, 2, 19, 3, 2, 2, 2, 2, 21, 3, 2, 2, 2, 2, 23, 3, 2, 2, 2, 2, 25, 3, 2, 2, 2, 2, 27, 3, 2, 2, 2, 2, 29, 3, 2, 2, 2, 2, 31, 3, 2, 2, 2, 2, 33, 3, 2, 2, 2, 2, 35, 3, 2, 2, 2, 2, 37, 3, 2, 2, 2, 2, 39, 3, 2, 2, 2, 2, 41, 3, 2, 2, 2, 2, 43, 3, 2, 2, 2, 2, 45, 3, 2, 2, 2, 2, 47, 3, 2, 2, 2, 2, 49, 3, 2, 2, 2, 2, 51, 3, 2, 2, 2, 2, 53, 3, 2, 2, 2, 2, 55, 3, 2, 2, 2, 2, 57, 3, 2, 2, 2, 2, 59, 3, 2, 2, 2, 2, 61, 3, 2, 2, 2, 2, 63, 3, 2, 2, 2, 2, 65, 3, 2, 2, 2, 2, 67, 3, 2, 2, 2, 2, 69, 3, 2, 2, 2, 2, 71, 3, 2, 2, 2, 2, 73, 3, 2, 2, 2, 2, 75, 3, 2, 2, 2, 2, 77, 3, 2, 2, 2, 2, 79, 3, 2, 2, 2, 2, 81, 3, 2, 2, 2, 2, 83, 3, 2, 2, 2, 2, 85, 3, 2, 2, 2, 2, 87, 3, 2, 2, 2, 2, 89, 3, 2, 2, 2, 2, 91, 3, 2, 2, 2, 2, 93, 3, 2, 2, 2, 2, 95, 3, 2, 2, 2, 2, 97, 3, 2, 2, 2, 2, 99, 3, 2, 2, 2, 2, 101, 3, 2, 2, 2, 2, 103, 3, 2, 2, 2, 2, 105, 3, 2, 2, 2, 2, 107, 3, 2, 2, 2, 2, 109, 3, 2, 2, 2, 2, 111, 3, 2, 2, 2, 2, 113, 3, 2, 2, 2, 2, 115, 3, 2, 2, 2, 2, 117, 3, 2, 2, 2, 2, 119, 3, 2, 2, 2, 2, 121, 3, 2, 2, 2, 2, 123, 3, 2, 2, 2, 2, 125, 3, 2, 2, 2, 2, 127, 3, 2, 2, 2, 2, 129, 3, 2, 2, 2, 2, 131, 3, 2, 2, 2, 2, 133, 3, 2, 2, 2, 2, 135, 3, 2, 2, 2, 2, 137, 3, 2, 2, 2, 2, 139, 3, 2, 2, 2, 2, 141, 3, 2, 2, 2, 2, 143, 3, 2, 2, 2, 2, 145, 3, 2, 2, 2, 2, 147, 3, 2, 2, 2, 2, 149, 3, 2, 2, 2, 3, 151, 3, 2, 2, 2, 5, 158, 3, 2, 2, 2, 7, 160, 3, 2, 2, 2, 9, 171, 3, 2, 2, 2, 11, 173, 3, 2, 2, 2, 13, 175, 3, 2, 2, 2, 15, 178, 3, 2, 2, 2, 17, 180, 3, 2, 2, 2, 19, 182, 3, 2, 2, 2, 21, 185, 3, 2, 2, 2, 23, 187, 3, 2, 2, 2, 25, 196, 3, 2, 2, 2, 27, 198, 3, 2, 2, 2, 29, 200, 3, 2, 2, 2, 31, 209, 3, 2, 2, 2, 33, 211, 3, 2, 2, 2, 35, 213, 3, 2, 2, 2, 37, 215, 3, 2, 2, 2, 39, 223, 3, 2, 2, 2, 41, 226, 3, 2, 2, 2, 43, 231, 3, 2, 2, 2, 45, 235, 3, 2, 2, 2, 47, 237, 3, 2, 2, 2, 49, 239, 3, 2, 2, 2, 51, 248, 3, 2, 2, 2, 53, 252, 3, 2, 2, 2, 55, 257, 3, 2, 2, 2, 57, 268, 3, 2, 2, 2, 59, 275, 3, 2, 2, 2, 61, 292, 3, 2, 2, 2, 63, 307, 3, 2, 2, 2, 65, 322, 3, 2, 2, 2, 67, 335, 3, 2, 2, 2, 69, 345, 3, 2, 2, 2, 71, 370, 3, 2, 2, 2, 73, 385, 3, 2, 2, 2, 75, 404, 3, 2, 2, 2, 77, 420, 3, 2, 2, 2, 79, 431, 3, 2, 2, 2, 81, 439, 3, 2, 2, 2, 83, 446, 3, 2, 2, 2, 85, 448, 3, 2, 2, 2, 87, 450, 3, 2, 2, 2, 89, 452, 3, 2, 2, 2, 91, 454, 3, 2, 2, 2, 93, 456, 3, 2, 2, 2, 95, 458, 3, 2, 2, 2, 97, 461, 3, 2, 2, 2, 99, 464, 3, 2, 2, 2, 101, 466, 3, 2, 2, 2, 103, 468, 3, 2, 2, 2, 105, 471, 3, 2, 2, 2, 107, 474, 3, 2, 2, 2, 109, 483, 3, 2, 2, 2, 111, 487, 3, 2, 2, 2, 113, 492, 3, 2, 2, 2, 115, 499, 3, 2, 2, 2, 117, 506, 3, 2, 2, 2, 119, 510, 3, 2, 2, 2, 121, 519, 3, 2, 2, 2, 123, 544, 3, 2, 2, 2, 125, 603, 3, 2, 2, 2, 127, 606, 3, 2, 2, 2, 129, 634, 3, 2, 2, 2, 131, 636, 3, 2, 2, 2, 133, 663, 3, 2, 2, 2, 135, 665, 3, 2, 2, 2, 137, 674, 3, 2, 2, 2, 139, 695, 3, 2, 2, 2, 141, 791, 3, 2, 2, 2, 143, 793, 3, 2, 2, 2, 145, 801, 3, 2, 2, 2, 147, 807, 3, 2, 2, 2, 149, 821, 3, 2, 2, 2, 151, 152, 7, 114, 2, 2, 152, 153, 7, 116, 2, 2, 153, 154, 7, 99, 2, 2, 154, 155, 7, 105, 2, 2, 155, 156, 7, 111, 2, 2, 156, 157, 7, 99, 2, 2, 157, 4, 3, 2, 2, 2, 158, 159, 7, 61, 2, 2, 159, 6, 3, 2, 2, 2, 160, 161, 7, 101, 2, 2, 161, 162, 7, 99, 2, 2, 162, 163, 7, 117, 2, 2, 163, 164, 7, 106, 2, 2, 164, 165, 7, 117, 2, 2, 165, 166, 7, 101, 2, 2, 166, 167, 7, 116, 2, 2, 167, 168, 7, 107, 2, 2, 168, 169, 7, 114, 2, 2, 169, 170, 7, 118, 2, 2, 170, 8, 3, 2, 2, 2, 171, 172, 7, 96, 2, 2, 172, 10, 3, 2, 2, 2, 173, 174, 7, 128, 2, 2, 174, 12, 3, 2, 2, 2, 175, 176, 7, 64, 2, 2, 176, 177, 7, 63, 2, 2, 177, 14, 3, 2, 2, 2, 178, 179, 7, 64, 2, 2, 179, 16, 3, 2, 2, 2, 180, 181, 7, 62, 2, 2, 181, 18, 3, 2, 2, 2, 182, 183, 7, 62, 2, 2, 183, 184, 7, 63, 2, 2, 184, 20, 3, 2, 2, 2, 185, 186, 7, 63, 2, 2, 186, 22, 3, 2, 2, 2, 187, 188, 7, 101, 2, 2, 188, 189, 7, 113, 2, 2, 189, 190, 7, 112, 2, 2, 190, 191, 7, 118, 2, 2, 191, 192, 7, 116, 2, 2, 192, 193, 7, 99, 2, 2, 193, 194, 7, 101, 2, 2, 194, 195, 7, 118, 2, 2, 195, 24, 3, 2, 2, 2, 196, 197, 7, 125, 2, 2, 197, 26, 3, 2, 2, 2, 198, 199, 7, 127, 2, 2, 199, 28, 3, 2, 2, 2, 200, 201, 7, 104, 2, 2, 201, 202, 7, 119, 2, 2, 202, 203, 7, 112, 2, 2, 203, 204, 7, 101, 2, 2, 204, 205, 7, 118, 2, 2, 205, 206, 7, 107, 2, 2, 206, 207, 7, 113, 2, 2, 207, 208, 7, 112, 2, 2, 208, 30, 3, 2, 2, 2, 209, 210, 7, 42, 2, 2, 210, 32, 3, 2, 2, 2, 211, 212, 7, 46, 2, 2, 212, 34, 3, 2, 2, 2, 213, 214, 7, 43, 2, 2, 214, 36, 3, 2, 2, 2, 215, 216, 7, 116, 2, 2, 216, 217, 7, 103, 2, 2, 217, 218, 7, 115, 2, 2, 218, 219, 7, 119, 2, 2, 219, 220, 7, 107, 2, 2, 220, 221, 7, 116, 2, 2, 221, 222, 7, 103, 2, 2, 222, 38, 3, 2, 2, 2, 223, 224, 7, 107, 2, 2, 224, 225, 7, 104, 2, 2, 225, 40, 3, 2, 2, 2, 226, 227, 7, 103, 2, 2, 227, 228, 7, 110, 2, 2, 228, 229, 7, 117, 2, 2, 229, 230, 7, 103, 2, 2, 230, 42, 3, 2, 2, 2, 231, 232, 7, 112, 2, 2, 232, 233, 7, 103, 2, 2, 233, 234, 7, 121, 2, 2, 234, 44, 3, 2, 2, 2, 235, 236, 7, 93, 2, 2, 236, 46, 3, 2, 2, 2, 237, 238, 7, 95, 2, 2, 238, 48, 3, 2, 2, 2, 239, 240, 7, 101, 2, 2, 240, 241, 7, 113, 2, 2, 241, 242, 7, 112, 2, 2, 242, 243, 7, 117, 2, 2, 243, 244, 7, 113, 2, 2, 244, 245, 7, 110, 2, 2, 245, 246, 7, 103, 2, 2, 246, 247, 7, 48, 2, 2, 247, 50, 3, 2, 2, 2, 248, 249, 7, 110, 2, 2, 249, 250, 7, 113, 2, 2, 250, 251, 7, 105, 2, 2, 251, 52, 3, 2, 2, 2, 252, 253, 7, 121, 2, 2, 253, 254, 7, 99, 2, 2, 254, 255, 7, 116, 2, 2, 255, 256, 7, 112, 2, 2, 256, 54, 3, 2, 2, 2, 257, 258, 7, 118, 2, 2, 258, 259, 7, 122, 2, 2, 259, 260, 7, 48, 2, 2, 260, 261, 7, 113, 2, 2, 261, 262, 7, 119, 2, 2, 262, 263, 7, 118, 2, 2, 263, 264, 7, 114, 2, 2, 264, 265, 7, 119, 2, 2, 265, 266, 7, 118, 2, 2, 266, 267, 7, 117, 2, 2, 267, 56, 3, 2, 2, 2, 268, 269, 7, 48, 2, 2, 269, 270, 7, 120, 2, 2, 270, 271, 7, 99, 2, 2, 271, 272, 7, 110, 2, 2, 272, 273, 7, 119, 2, 2, 273, 274, 7, 103, 2, 2, 274, 58, 3, 2, 2, 2, 275, 276, 7, 48, 2, 2, 276, 277, 7, 110, 2, 2, 277, 278, 7, 113, 2, 2, 278, 279, 7, 101, 2, 2, 279, 280, 7, 109, 2, 2, 280, 281, 7, 107, 2, 2, 281, 282, 7, 112, 2, 2, 282, 283, 7, 105, 2, 2, 283, 284, 7, 68, 2, 2, 284, 285, 7, 123, 2, 2, 285, 286, 7, 118, 2, 2, 286, 287, 7, 103, 2, 2, 287, 288, 7, 101, 2, 2, 288, 289, 7, 113, 2, 2, 289, 290, 7, 102, 2, 2, 290, 291, 7, 103, 2, 2, 291, 60, 3, 2, 2, 2, 292, 293, 7, 48, 2, 2, 293, 294, 7, 118, 2, 2, 294, 295, 7, 113, 2, 2, 295, 296, 7, 109, 2, 2, 296, 297, 7, 103, 2, 2, 297, 298, 7, 112, 2, 2, 298, 299, 7, 69, 2, 2, 299, 300, 7, 99, 2, 2, 300, 301, 7, 118, 2, 2, 301, 302, 7, 103, 2, 2, 302, 303, 7, 105, 2, 2, 303, 304, 7, 113, 2, 2, 304, 305, 7, 116, 2, 2, 305, 306, 7, 123, 2, 2, 306, 62, 3, 2, 2, 2, 307, 308, 7, 48, 2, 2, 308, 309, 7, 112, 2, 2, 309, 310, 7, 104, 2, 2, 310, 311, 7, 118, 2, 2, 311, 312, 7, 69, 2, 2, 312, 313, 7, 113, 2, 2, 313, 314, 7, 111, 2, 2, 314, 315, 7, 111, 2, 2, 315, 316, 7, 107, 2, 2, 316, 317, 7, 118, 2, 2, 317, 318, 7, 111, 2, 2, 318, 319, 7, 103, 2, 2, 319, 320, 7, 112, 2, 2, 320, 321, 7, 118, 2, 2, 321, 64, 3, 2, 2, 2, 322, 323, 7, 48, 2, 2, 323, 324, 7, 118, 2, 2, 324, 325, 7, 113, 2, 2, 325, 326, 7, 109, 2, 2, 326, 327, 7, 103, 2, 2, 327, 328, 7, 112, 2, 2, 328, 329, 7, 67, 2, 2, 329, 330, 7, 111, 2, 2, 330, 331, 7, 113, 2, 2, 331, 332, 7, 119, 2, 2, 332, 333, 7, 112, 2, 2, 333, 334, 7, 118, 2, 2, 334, 66, 3, 2, 2, 2, 335, 336, 7, 118, 2, 2, 336, 337, 7, 122, 2, 2, 337, 338, 7, 48, 2, 2, 338, 339, 7, 107, 2, 2, 339, 340, 7, 112, 2, 2, 340, 341, 7, 114, 2, 2, 341, 342, 7, 119, 2, 2, 342, 343, 7, 118, 2, 2, 343, 344, 7, 117, 2, 2, 344, 68, 3, 2, 2, 2, 345, 346, 7, 48, 2, 2, 346, 347, 7, 113, 2, 2, 347, 348, 7, 119, 2, 2, 348, 349, 7, 118, 2, 2, 349, 350, 7, 114, 2, 2, 350, 351, 7, 113, 2, 2, 351, 352, 7, 107, 2, 2, 352, 353, 7, 112, 2, 2, 353, 354, 7, 118, 2, 2, 354, 355, 7, 86, 2, 2, 355, 356, 7, 116, 2, 2, 356, 357, 7, 99, 2, 2, 357, 358, 7, 112, 2, 2, 358, 359, 7, 117, 2, 2, 359, 360, 7, 99, 2, 2, 360, 361, 7, 101, 2, 2, 361, 362, 7, 118, 2, 2, 362, 363, 7, 107, 2, 2, 363, 364, 7, 113, 2, 2, 364, 365, 7, 112, 2, 2, 365, 366, 7, 74, 2, 2, 366, 367, 7, 99, 2, 2, 367, 368, 7, 117, 2, 2, 368, 369, 7, 106, 2, 2, 369, 70, 3, 2, 2, 2, 370, 371, 7, 48, 2, 2, 371, 372, 7, 113, 2, 2, 372, 373, 7, 119, 2, 2, 373, 374, 7, 118, 2, 2, 374, 375, 7, 114, 2, 2, 375, 376, 7, 113, 2, 2, 376, 377, 7, 107, 2, 2, 377, 378, 7, 112, 2, 2, 378, 379, 7, 118, 2, 2, 379, 380, 7, 75, 2, 2, 380, 381, 7, 112, 2, 2, 381, 382, 7, 102, 2, 2, 382, 383, 7, 103, 2, 2, 383, 384, 7, 122, 2, 2, 384, 72, 3, 2, 2, 2, 385, 386, 7, 48, 2, 2, 386, 387, 7, 119, 2, 2, 387, 388, 7, 112, 2, 2, 388, 389, 7, 110, 2, 2, 389, 390, 7, 113, 2, 2, 390, 391, 7, 101, 2, 2, 391, 392, 7, 109, 2, 2, 392, 393, 7, 107, 2, 2, 393, 394, 7, 112, 2, 2, 394, 395, 7, 105, 2, 2, 395, 396, 7, 68, 2, 2, 396, 397, 7, 123, 2, 2, 397, 398, 7, 118, 2, 2, 398, 399, 7, 103, 2, 2, 399, 400, 7, 101, 2, 2, 400, 401, 7, 113, 2, 2, 401, 402, 7, 102, 2, 2, 402, 403, 7, 103, 2, 2, 403, 74, 3, 2, 2, 2, 404, 405, 7, 48, 2, 2, 405, 406, 7, 117, 2, 2, 406, 407, 7, 103, 2, 2, 407, 408, 7, 115, 2, 2, 408, 409, 7, 119, 2, 2, 409, 410, 7, 103, 2, 2, 410, 411, 7, 112, 2, 2, 411, 412, 7, 101, 2, 2, 412, 413, 7, 103, 2, 2, 413, 414, 7, 80, 2, 2, 414, 415, 7, 119, 2, 2, 415, 416, 7, 111, 2, 2, 416, 417, 7, 100, 2, 2, 417, 418, 7, 103, 2, 2, 418, 419, 7, 116, 2, 2, 419, 76, 3, 2, 2, 2, 420, 421, 7, 48, 2, 2, 421, 422, 7, 116, 2, 2, 422, 423, 7, 103, 2, 2, 423, 424, 7, 120, 2, 2, 424, 425, 7, 103, 2, 2, 425, 426, 7, 116, 2, 2, 426, 427, 7, 117, 2, 2, 427, 428, 7, 103, 2, 2, 428, 429, 7, 42, 2, 2, 429, 430, 7, 43, 2, 2, 430, 78, 3, 2, 2, 2, 431, 432, 7, 48, 2, 2, 432, 433, 7, 110, 2, 2, 433, 434, 7, 103, 2, 2, 434, 435, 7, 112, 2, 2, 435, 436, 7, 105, 2, 2, 436, 437, 7, 118, 2, 2, 437, 438, 7, 106, 2, 2, 438, 80, 3, 2, 2, 2, 439, 440, 7, 48, 2, 2, 440, 441, 7, 117, 2, 2, 441, 442, 7, 114, 2, 2, 442, 443, 7, 110, 2, 2, 443, 444, 7, 107, 2, 2, 444, 445, 7, 118, 2, 2, 445, 82, 3, 2, 2, 2, 446, 447, 7, 35, 2, 2, 447, 84, 3, 2, 2, 2, 448, 449, 7, 47, 2, 2, 449, 86, 3, 2, 2, 2, 450, 451, 7, 44, 2, 2, 451, 88, 3, 2, 2, 2, 452, 453, 7, 49, 2, 2, 453, 90, 3, 2, 2, 2, 454, 455, 7, 39, 2, 2, 455, 92, 3, 2, 2, 2, 456, 457, 7, 45, 2, 2, 457, 94, 3, 2, 2, 2, 458, 459, 7, 63, 2, 2, 459, 460, 7, 63, 2, 2, 460, 96, 3, 2, 2, 2, 461, 462, 7, 35, 2, 2, 462, 463, 7, 63, 2, 2, 463, 98, 3, 2, 2, 2, 464, 465, 7, 40, 2, 2, 465, 100, 3, 2, 2, 2, 466, 467, 7, 126, 2, 2, 467, 102, 3, 2, 2, 2, 468, 469, 7, 40, 2, 2, 469, 470, 7, 40, 2, 2, 470, 104, 3, 2, 2, 2, 471, 472, 7, 126, 2, 2, 472, 473, 7, 126, 2, 2, 473, 106, 3, 2, 2, 2, 474, 475, 7, 101, 2, 2, 475, 476, 7, 113, 2, 2, 476, 477, 7, 112, 2, 2, 477, 478, 7, 117, 2, 2, 478, 479, 7, 118, 2, 2, 479, 480, 7, 99, 2, 2, 480, 481, 7, 112, 2, 2, 481, 482, 7, 118, 2, 2, 482, 108, 3, 2, 2, 2, 483, 484, 7, 107, 2, 2, 484, 485, 7, 112, 2, 2, 485, 486, 7, 118, 2, 2, 486, 110, 3, 2, 2, 2, 487, 488, 7, 100, 2, 2, 488, 489, 7, 113, 2, 2, 489, 490, 7, 113, 2, 2, 490, 491, 7, 110, 2, 2, 491, 112, 3, 2, 2, 2, 492, 493, 7, 117, 2, 2, 493, 494, 7, 118, 2, 2, 494, 495, 7, 116, 2, 2, 495, 496, 7, 107, 2, 2, 496, 497, 7, 112, 2, 2, 497, 498, 7, 105, 2, 2, 498, 114, 3, 2, 2, 2, 499, 500, 7, 114, 2, 2, 500, 501, 7, 119, 2, 2, 501, 502, 7, 100, 2, 2, 502, 503, 7, 109, 2, 2, 503, 504, 7, 103, 2, 2, 504, 505, 7, 123, 2, 2, 505, 116, 3, 2, 2, 2, 506, 507, 7, 117, 2, 2, 507, 508, 7, 107, 2, 2, 508, 509, 7, 105, 2, 2, 509, 118, 3, 2, 2, 2, 510, 511, 7, 102, 2, 2, 511, 512, 7, 99, 2, 2, 512, 513, 7, 118, 2, 2, 513, 514, 7, 99, 2, 2, 514, 515, 7, 117, 2, 2, 515, 516, 7, 107, 2, 2, 516, 517, 7, 105, 2, 2, 517, 120, 3, 2, 2, 2, 518, 520, 9, 2, 2, 2, 519, 518, 3, 2, 2, 2, 520, 521, 3, 2, 2, 2, 521, 519, 3, 2, 2, 2, 521, 522, 3, 2, 2, 2, 522, 523, 3, 2, 2, 2, 523, 525, 7, 48, 2, 2, 524, 526, 9, 2, 2, 2, 525, 524, 3, 2, 2, 2, 526, 527, 3, 2, 2, 2, 527, 525, 3, 2, 2, 2, 527, 528, 3, 2, 2, 2, 528, 529, 3, 2, 2, 2, 529, 531, 7, 48, 2, 2, 530, 532, 9, 2, 2, 2, 531, 530, 3, 2, 2, 2, 532, 533, 3, 2, 2, 2, 533, 531, 3, 2, 2, 2, 533, 534, 3, 2, 2, 2, 534, 122, 3, 2, 2, 2, 535, 536, 7, 118, 2, 2, 536, 537, 7, 116, 2, 2, 537, 538, 7, 119, 2, 2, 538, 545, 7, 103, 2, 2, 539, 540, 7, 104, 2, 2, 540, 541, 7, 99, 2, 2, 541, 542, 7, 110, 2, 2, 542, 543, 7, 117, 2, 2, 543, 545, 7, 103, 2, 2, 544, 535, 3, 2, 2, 2, 544, 539, 3, 2, 2, 2, 545, 124, 3, 2, 2, 2, 546, 547, 7, 117, 2, 2, 547, 548, 7, 99, 2, 2, 548, 549, 7, 118, 2, 2, 549, 550, 7, 113, 2, 2, 550, 551, 7, 117, 2, 2, 551, 552, 7, 106, 2, 2, 552, 553, 7, 107, 2, 2, 553, 604, 7, 117, 2, 2, 554, 555, 7, 117, 2, 2, 555, 556, 7, 99, 2, 2, 556, 557, 7, 118, 2, 2, 557, 604, 7, 117, 2, 2, 558, 559, 7, 104, 2, 2, 559, 560, 7, 107, 2, 2, 560, 561, 7, 112, 2, 2, 561, 562, 7, 112, 2, 2, 562, 563, 7, 103, 2, 2, 563, 604, 7, 123, 2, 2, 564, 565, 7, 100, 2, 2, 565, 566, 7, 107, 2, 2, 566, 567, 7, 118, 2, 2, 567, 604, 7, 117, 2, 2, 568, 569, 7, 100, 2, 2, 569, 570, 7, 107, 2, 2, 570, 571, 7, 118, 2, 2, 571, 572, 7, 101, 2, 2, 572, 573, 7, 113, 2, 2, 573, 574, 7, 107, 2, 2, 574, 604, 7, 112, 2, 2, 575, 576, 7, 117, 2, 2, 576, 577, 7, 103, 2, 2, 577, 578, 7, 101, 2, 2, 578, 579, 7, 113, 2, 2, 579, 580, 7, 112, 2, 2, 580, 581, 7, 102, 2, 2, 581, 604, 7, 117, 2, 2, 582, 583, 7, 111, 2, 2, 583, 584, 7, 107, 2, 2, 584, 585, 7, 112, 2, 2, 585, 586, 7, 119, 2, 2, 586, 587, 7, 118, 2, 2, 587, 588, 7, 103, 2, 2, 588, 604, 7, 117, 2, 2, 589, 590, 7, 106, 2, 2, 590, 591, 7, 113, 2, 2, 591, 592, 7, 119, 2, 2, 592, 593, 7, 116, 2, 2, 593, 604, 7, 117, 2, 2, 594, 595, 7, 102, 2, 2, 595, 596, 7, 99, 2, 2, 596, 597, 7, 123, 2, 2, 597, 604, 7, 117, 2, 2, 598, 599, 7, 121, 2, 2, 599, 600, 7, 103, 2, 2, 600, 601, 7, 103, 2, 2, 601, 602, 7, 109, 2, 2, 602, 604, 7, 117, 2, 2, 603, 546, 3, 2, 2, 2, 603, 554, 3, 2, 2, 2, 603, 558, 3, 2, 2, 2, 603, 564, 3, 2, 2, 2, 603, 568, 3, 2, 2, 2, 603, 575, 3, 2, 2, 2, 603, 582, 3, 2, 2, 2, 603, 589, 3, 2, 2, 2, 603, 594, 3, 2, 2, 2, 603, 598, 3, 2, 2, 2, 604, 126, 3, 2, 2, 2, 605, 607, 9, 3, 2, 2, 606, 605, 3, 2, 2, 2, 606, 607, 3, 2, 2, 2, 607, 609, 3, 2, 2, 2, 608, 610, 9, 2, 2, 2, 609, 608, 3, 2, 2, 2, 610, 611, 3, 2, 2, 2, 611, 609, 3, 2, 2, 2, 611, 612, 3, 2, 2, 2, 612, 619, 3, 2, 2, 2, 613, 615, 9, 4, 2, 2, 614, 616, 9, 2, 2, 2, 615, 614, 3, 2, 2, 2, 616, 617, 3, 2, 2, 2, 617, 615, 3, 2, 2, 2, 617, 618, 3, 2, 2, 2, 618, 620, 3, 2, 2, 2, 619, 613, 3, 2, 2, 2, 619, 620, 3, 2, 2, 2, 620, 128, 3, 2, 2, 2, 621, 622, 7, 100, 2, 2, 622, 623, 7, 123, 2, 2, 623, 624, 7, 118, 2, 2, 624, 625, 7, 103, 2, 2, 625, 626, 7, 117, 2, 2, 626, 628, 3, 2, 2, 2, 627, 629, 5, 131, 66, 2, 628, 627, 3, 2, 2, 2, 628, 629, 3, 2, 2, 2, 629, 635, 3, 2, 2, 2, 630, 631, 7, 100, 2, 2, 631, 632, 7, 123, 2, 2, 632, 633, 7, 118, 2, 2, 633, 635, 7, 103, 2, 2, 634, 621, 3, 2, 2, 2, 634, 630, 3, 2, 2, 2, 635, 130, 3, 2, 2, 2, 636, 640, 9, 5, 2, 2, 637, 639, 9, 2, 2, 2, 638, 637, 3, 2, 2, 2, 639, 642, 3, 2, 2, 2, 640, 638, 3, 2, 2, 2, 640, 641, 3, 2, 2, 2, 641, 132, 3, 2, 2, 2, 642, 640, 3, 2, 2, 2, 643, 649, 7, 36, 2, 2, 644, 645, 7, 94, 2, 2, 645, 648, 7, 36, 2, 2, 646, 648, 10, 6, 2, 2, 647, 644, 3, 2, 2, 2, 647, 646, 3, 2, 2, 2, 648, 651, 3, 2, 2, 2, 649, 650, 3, 2, 2, 2, 649, 647, 3, 2, 2, 2, 650, 652, 3, 2, 2, 2, 651, 649, 3, 2, 2, 2, 652, 664, 7, 36, 2, 2, 653, 659, 7, 41, 2, 2, 654, 655, 7, 94, 2, 2, 655, 658, 7, 41, 2, 2, 656, 658, 10, 7, 2, 2, 657, 654, 3, 2, 2, 2, 657, 656, 3, 2, 2, 2, 658, 661, 3, 2, 2, 2, 659, 660, 3, 2, 2, 2, 659, 657, 3, 2, 2, 2, 660, 662, 3, 2, 2, 2, 661, 659, 3, 2, 2, 2, 662, 664, 7, 41, 2, 2, 663, 643, 3, 2, 2, 2, 663, 653, 3, 2, 2, 2, 664, 134, 3, 2, 2, 2, 665, 666, 7, 102, 2, 2, 666, 667, 7, 99, 2, 2, 667, 668, 7, 118, 2, 2, 668, 669, 7, 103, 2, 2, 669, 670, 7, 42, 2, 2, 670, 671, 3, 2, 2, 2, 671, 672, 5, 133, 67, 2, 672, 673, 7, 43, 2, 2, 673, 136, 3, 2, 2, 2, 674, 675, 7, 50, 2, 2, 675, 679, 9, 8, 2, 2, 676, 678, 9, 9, 2, 2, 677, 676, 3, 2, 2, 2, 678, 681, 3, 2, 2, 2, 679, 677, 3, 2, 2, 2, 679, 680, 3, 2, 2, 2, 680, 138, 3, 2, 2, 2, 681, 679, 3, 2, 2, 2, 682, 683, 7, 118, 2, 2, 683, 684, 7, 122, 2, 2, 684, 685, 7, 48, 2, 2, 685, 686, 7, 99, 2, 2, 686, 687, 7, 105, 2, 2, 687, 696, 7, 103, 2, 2, 688, 689, 7, 118, 2, 2, 689, 690, 7, 122, 2, 2, 690, 691, 7, 48, 2, 2, 691, 692, 7, 118, 2, 2, 692, 693, 7, 107, 2, 2, 693, 694, 7, 111, 2, 2, 694, 696, 7, 103, 2, 2, 695, 682, 3, 2, 2, 2, 695, 688, 3, 2, 2, 2, 696, 140, 3, 2, 2, 2, 697, 698, 7, 118, 2, 2, 698, 699, 7, 106, 2, 2, 699, 700, 7, 107, 2, 2, 700, 701, 7, 117, 2, 2, 701, 702, 7, 48, 2, 2, 702, 703, 7, 99, 2, 2, 703, 704, 7, 101, 2, 2, 704, 705, 7, 118, 2, 2, 705, 706, 7, 107, 2, 2, 706, 707, 7, 120, 2, 2, 707, 708, 7, 103, 2, 2, 708, 709, 7, 75, 2, 2, 709, 710, 7, 112, 2, 2, 710, 711, 7, 114, 2, 2, 711, 712, 7, 119, 2, 2, 712, 713, 7, 118, 2, 2, 713, 714, 7, 75, 2, 2, 714, 715, 7, 112, 2, 2, 715, 716, 7, 102, 2, 2, 716, 717, 7, 103, 2, 2, 717, 792, 7, 122, 2, 2, 718, 719, 7, 118, 2, 2, 719, 720, 7, 106, 2, 2, 720, 721, 7, 107, 2, 2, 721, 722, 7, 117, 2, 2, 722, 723, 7, 48, 2, 2, 723, 724, 7, 99, 2, 2, 724, 725, 7, 101, 2, 2, 725, 726, 7, 118, 2, 2, 726, 727, 7, 107, 2, 2, 727, 728, 7, 120, 2, 2, 728, 729, 7, 103, 2, 2, 729, 730, 7, 68, 2, 2, 730, 731, 7, 123, 2, 2, 731, 732, 7, 118, 2, 2, 732, 733, 7, 103, 2, 2, 733, 734, 7, 101, 2, 2, 734, 735, 7, 113, 2, 2, 735, 736, 7, 102, 2, 2, 736, 792, 7, 103, 2, 2, 737, 738, 7, 118, 2, 2, 738, 739, 7, 122, 2, 2, 739, 740, 7, 48, 2, 2, 740, 741, 7, 107, 2, 2, 741, 742, 7, 112, 2, 2, 742, 743, 7, 114, 2, 2, 743, 744, 7, 119, 2, 2, 744, 745, 7, 118, 2, 2, 745, 746, 7, 117, 2, 2, 746, 747, 7, 48, 2, 2, 747, 748, 7, 110, 2, 2, 748, 749, 7, 103, 2, 2, 749, 750, 7, 112, 2, 2, 750, 751, 7, 105, 2, 2, 751, 752, 7, 118, 2, 2, 752, 792, 7, 106, 2, 2, 753, 754, 7, 118, 2, 2, 754, 755, 7, 122, 2, 2, 755, 756, 7, 48, 2, 2, 756, 757, 7, 113, 2, 2, 757, 758, 7, 119, 2, 2, 758, 759, 7, 118, 2, 2, 759, 760, 7, 114, 2, 2, 760, 761, 7, 119, 2, 2, 761, 762, 7, 118, 2, 2, 762, 763, 7, 117, 2, 2, 763, 764, 7, 48, 2, 2, 764, 765, 7, 110, 2, 2, 765, 766, 7, 103, 2, 2, 766, 767, 7, 112, 2, 2, 767, 768, 7, 105, 2, 2, 768, 769, 7, 118, 2, 2, 769, 792, 7, 106, 2, 2, 770, 771, 7, 118, 2, 2, 771, 772, 7, 122, 2, 2, 772, 773, 7, 48, 2, 2, 773, 774, 7, 120, 2, 2, 774, 775, 7, 103, 2, 2, 775, 776, 7, 116, 2, 2, 776, 777, 7, 117, 2, 2, 777, 778, 7, 107, 2, 2, 778, 779, 7, 113, 2, 2, 779, 792, 7, 112, 2, 2, 780, 781, 7, 118, 2, 2, 781, 782, 7, 122, 2, 2, 782, 783, 7, 48, 2, 2, 783, 784, 7, 110, 2, 2, 784, 785, 7, 113, 2, 2, 785, 786, 7, 101, 2, 2, 786, 787, 7, 109, 2, 2, 787, 788, 7, 118, 2, 2, 788, 789, 7, 107, 2, 2, 789, 790, 7, 111, 2, 2, 790, 792, 7, 103, 2, 2, 791, 697, 3, 2, 2, 2, 791, 718, 3, 2, 2, 2, 791, 737, 3, 2, 2, 2, 791, 753, 3, 2, 2, 2, 791, 770, 3, 2, 2, 2, 791, 780, 3, 2, 2, 2, 792, 142, 3, 2, 2, 2, 793, 797, 9, 10, 2, 2, 794, 796, 9, 11, 2, 2, 795, 794, 3, 2, 2, 2, 796, 799, 3, 2, 2, 2, 797, 795, 3, 2, 2, 2, 797, 798, 3, 2, 2, 2, 798, 144, 3, 2, 2, 2, 799, 797, 3, 2, 2, 2, 800, 802, 9, 12, 2, 2, 801, 800, 3, 2, 2, 2, 802, 803, 3, 2, 2, 2, 803, 801, 3, 2, 2, 2, 803, 804, 3, 2, 2, 2, 804, 805, 3, 2, 2, 2, 805, 806, 8, 73, 2, 2, 806, 146, 3, 2, 2, 2, 807, 808, 7, 49, 2, 2, 808, 809, 7, 44, 2, 2, 809, 813, 3, 2, 2, 2, 810, 812, 11, 2, 2, 2, 811, 810, 3, 2, 2, 2, 812, 815, 3, 2, 2, 2, 813, 814, 3, 2, 2, 2, 813, 811, 3, 2, 2, 2, 814, 816, 3, 2, 2, 2, 815, 813, 3, 2, 2, 2, 816, 817, 7, 44, 2, 2, 817, 818, 7, 49, 2, 2, 818, 819, 3, 2, 2, 2, 819, 820, 8, 74, 3, 2, 820, 148, 3, 2, 2, 2, 821, 822, 7, 49, 2, 2, 822, 823, 7, 49, 2, 2, 823, 827, 3, 2, 2, 2, 824, 826, 10, 13, 2, 2, 825, 824, 3, 2, 2, 2, 826, 829, 3, 2, 2, 2, 827, 825, 3, 2, 2, 2, 827, 828, 3, 2, 2, 2, 828, 830, 3, 2, 2, 2, 829, 827, 3, 2, 2, 2, 830, 831, 8, 75, 3, 2, 831, 150, 3, 2, 2, 2, 27, 2, 521, 527, 533, 544, 603, 606, 611, 617, 619, 628, 634, 640, 647, 649, 657, 659, 663, 679, 695, 791, 797, 803, 813, 827, 4, 8, 2, 2, 2, 3, 2]
\ No newline at end of file
+[3, 51485, 51898, 1421, 44986, 20307, 1543, 60043, 49729, 2, 74, 822, 8, 1, 4, 2, 9, 2, 4, 3, 9, 3, 4, 4, 9, 4, 4, 5, 9, 5, 4, 6, 9, 6, 4, 7, 9, 7, 4, 8, 9, 8, 4, 9, 9, 9, 4, 10, 9, 10, 4, 11, 9, 11, 4, 12, 9, 12, 4, 13, 9, 13, 4, 14, 9, 14, 4, 15, 9, 15, 4, 16, 9, 16, 4, 17, 9, 17, 4, 18, 9, 18, 4, 19, 9, 19, 4, 20, 9, 20, 4, 21, 9, 21, 4, 22, 9, 22, 4, 23, 9, 23, 4, 24, 9, 24, 4, 25, 9, 25, 4, 26, 9, 26, 4, 27, 9, 27, 4, 28, 9, 28, 4, 29, 9, 29, 4, 30, 9, 30, 4, 31, 9, 31, 4, 32, 9, 32, 4, 33, 9, 33, 4, 34, 9, 34, 4, 35, 9, 35, 4, 36, 9, 36, 4, 37, 9, 37, 4, 38, 9, 38, 4, 39, 9, 39, 4, 40, 9, 40, 4, 41, 9, 41, 4, 42, 9, 42, 4, 43, 9, 43, 4, 44, 9, 44, 4, 45, 9, 45, 4, 46, 9, 46, 4, 47, 9, 47, 4, 48, 9, 48, 4, 49, 9, 49, 4, 50, 9, 50, 4, 51, 9, 51, 4, 52, 9, 52, 4, 53, 9, 53, 4, 54, 9, 54, 4, 55, 9, 55, 4, 56, 9, 56, 4, 57, 9, 57, 4, 58, 9, 58, 4, 59, 9, 59, 4, 60, 9, 60, 4, 61, 9, 61, 4, 62, 9, 62, 4, 63, 9, 63, 4, 64, 9, 64, 4, 65, 9, 65, 4, 66, 9, 66, 4, 67, 9, 67, 4, 68, 9, 68, 4, 69, 9, 69, 4, 70, 9, 70, 4, 71, 9, 71, 4, 72, 9, 72, 4, 73, 9, 73, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 3, 3, 3, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 5, 3, 5, 3, 6, 3, 6, 3, 7, 3, 7, 3, 7, 3, 8, 3, 8, 3, 9, 3, 9, 3, 10, 3, 10, 3, 10, 3, 11, 3, 11, 3, 12, 3, 12, 3, 12, 3, 12, 3, 12, 3, 12, 3, 12, 3, 12, 3, 12, 3, 13, 3, 13, 3, 14, 3, 14, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 3, 16, 3, 16, 3, 17, 3, 17, 3, 18, 3, 18, 3, 19, 3, 19, 3, 19, 3, 19, 3, 19, 3, 19, 3, 19, 3, 19, 3, 20, 3, 20, 3, 20, 3, 21, 3, 21, 3, 21, 3, 21, 3, 21, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 23, 3, 23, 3, 23, 3, 23, 3, 24, 3, 24, 3, 25, 3, 25, 3, 26, 3, 26, 3, 26, 3, 26, 3, 26, 3, 26, 3, 26, 3, 26, 3, 26, 3, 26, 3, 26, 3, 27, 3, 27, 3, 27, 3, 27, 3, 27, 3, 27, 3, 27, 3, 28, 3, 28, 3, 28, 3, 28, 3, 28, 3, 28, 3, 28, 3, 28, 3, 28, 3, 28, 3, 28, 3, 28, 3, 28, 3, 28, 3, 28, 3, 28, 3, 28, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 30, 3, 30, 3, 30, 3, 30, 3, 30, 3, 30, 3, 30, 3, 30, 3, 30, 3, 30, 3, 30, 3, 30, 3, 30, 3, 30, 3, 30, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 37, 3, 37, 3, 37, 3, 37, 3, 37, 3, 37, 3, 37, 3, 37, 3, 37, 3, 37, 3, 37, 3, 38, 3, 38, 3, 38, 3, 38, 3, 38, 3, 38, 3, 38, 3, 38, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 3, 40, 3, 40, 3, 41, 3, 41, 3, 42, 3, 42, 3, 43, 3, 43, 3, 44, 3, 44, 3, 45, 3, 45, 3, 46, 3, 46, 3, 46, 3, 47, 3, 47, 3, 47, 3, 48, 3, 48, 3, 49, 3, 49, 3, 50, 3, 50, 3, 50, 3, 51, 3, 51, 3, 51, 3, 52, 3, 52, 3, 52, 3, 52, 3, 52, 3, 52, 3, 52, 3, 52, 3, 52, 3, 53, 3, 53, 3, 53, 3, 53, 3, 54, 3, 54, 3, 54, 3, 54, 3, 54, 3, 55, 3, 55, 3, 55, 3, 55, 3, 55, 3, 55, 3, 55, 3, 56, 3, 56, 3, 56, 3, 56, 3, 56, 3, 56, 3, 56, 3, 57, 3, 57, 3, 57, 3, 57, 3, 58, 3, 58, 3, 58, 3, 58, 3, 58, 3, 58, 3, 58, 3, 58, 3, 59, 6, 59, 510, 10, 59, 13, 59, 14, 59, 511, 3, 59, 3, 59, 6, 59, 516, 10, 59, 13, 59, 14, 59, 517, 3, 59, 3, 59, 6, 59, 522, 10, 59, 13, 59, 14, 59, 523, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 5, 60, 535, 10, 60, 3, 61, 3, 61, 3, 61, 3, 61, 3, 61, 3, 61, 3, 61, 3, 61, 3, 61, 3, 61, 3, 61, 3, 61, 3, 61, 3, 61, 3, 61, 3, 61, 3, 61, 3, 61, 3, 61, 3, 61, 3, 61, 3, 61, 3, 61, 3, 61, 3, 61, 3, 61, 3, 61, 3, 61, 3, 61, 3, 61, 3, 61, 3, 61, 3, 61, 3, 61, 3, 61, 3, 61, 3, 61, 3, 61, 3, 61, 3, 61, 3, 61, 3, 61, 3, 61, 3, 61, 3, 61, 3, 61, 3, 61, 3, 61, 3, 61, 3, 61, 3, 61, 3, 61, 3, 61, 3, 61, 3, 61, 3, 61, 3, 61, 5, 61, 594, 10, 61, 3, 62, 5, 62, 597, 10, 62, 3, 62, 6, 62, 600, 10, 62, 13, 62, 14, 62, 601, 3, 62, 3, 62, 6, 62, 606, 10, 62, 13, 62, 14, 62, 607, 5, 62, 610, 10, 62, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 5, 63, 619, 10, 63, 3, 63, 3, 63, 3, 63, 3, 63, 5, 63, 625, 10, 63, 3, 64, 3, 64, 7, 64, 629, 10, 64, 12, 64, 14, 64, 632, 11, 64, 3, 65, 3, 65, 3, 65, 3, 65, 7, 65, 638, 10, 65, 12, 65, 14, 65, 641, 11, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 7, 65, 648, 10, 65, 12, 65, 14, 65, 651, 11, 65, 3, 65, 5, 65, 654, 10, 65, 3, 66, 3, 66, 3, 66, 3, 66, 3, 66, 3, 66, 3, 66, 3, 66, 3, 66, 3, 67, 3, 67, 3, 67, 7, 67, 668, 10, 67, 12, 67, 14, 67, 671, 11, 67, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 5, 68, 686, 10, 68, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 5, 69, 782, 10, 69, 3, 70, 3, 70, 7, 70, 786, 10, 70, 12, 70, 14, 70, 789, 11, 70, 3, 71, 6, 71, 792, 10, 71, 13, 71, 14, 71, 793, 3, 71, 3, 71, 3, 72, 3, 72, 3, 72, 3, 72, 7, 72, 802, 10, 72, 12, 72, 14, 72, 805, 11, 72, 3, 72, 3, 72, 3, 72, 3, 72, 3, 72, 3, 73, 3, 73, 3, 73, 3, 73, 7, 73, 816, 10, 73, 12, 73, 14, 73, 819, 11, 73, 3, 73, 3, 73, 5, 639, 649, 803, 2, 2, 74, 3, 2, 3, 5, 2, 4, 7, 2, 5, 9, 2, 6, 11, 2, 7, 13, 2, 8, 15, 2, 9, 17, 2, 10, 19, 2, 11, 21, 2, 12, 23, 2, 13, 25, 2, 14, 27, 2, 15, 29, 2, 16, 31, 2, 17, 33, 2, 18, 35, 2, 19, 37, 2, 20, 39, 2, 21, 41, 2, 22, 43, 2, 23, 45, 2, 24, 47, 2, 25, 49, 2, 26, 51, 2, 27, 53, 2, 28, 55, 2, 29, 57, 2, 30, 59, 2, 31, 61, 2, 32, 63, 2, 33, 65, 2, 34, 67, 2, 35, 69, 2, 36, 71, 2, 37, 73, 2, 38, 75, 2, 39, 77, 2, 40, 79, 2, 41, 81, 2, 42, 83, 2, 43, 85, 2, 44, 87, 2, 45, 89, 2, 46, 91, 2, 47, 93, 2, 48, 95, 2, 49, 97, 2, 50, 99, 2, 51, 101, 2, 52, 103, 2, 53, 105, 2, 54, 107, 2, 55, 109, 2, 56, 111, 2, 57, 113, 2, 58, 115, 2, 59, 117, 2, 60, 119, 2, 61, 121, 2, 62, 123, 2, 63, 125, 2, 64, 127, 2, 65, 129, 2, 66, 131, 2, 67, 133, 2, 68, 135, 2, 69, 137, 2, 70, 139, 2, 71, 141, 2, 72, 143, 2, 73, 145, 2, 74, 3, 2, 14, 3, 2, 50, 59, 3, 2, 47, 47, 4, 2, 71, 71, 103, 103, 3, 2, 51, 59, 5, 2, 12, 12, 15, 15, 36, 36, 5, 2, 12, 12, 15, 15, 41, 41, 4, 2, 90, 90, 122, 122, 5, 2, 50, 59, 67, 72, 99, 104, 4, 2, 67, 92, 99, 124, 6, 2, 50, 59, 67, 92, 97, 97, 99, 124, 5, 2, 11, 12, 14, 15, 34, 34, 4, 2, 12, 12, 15, 15, 2, 857, 2, 3, 3, 2, 2, 2, 2, 5, 3, 2, 2, 2, 2, 7, 3, 2, 2, 2, 2, 9, 3, 2, 2, 2, 2, 11, 3, 2, 2, 2, 2, 13, 3, 2, 2, 2, 2, 15, 3, 2, 2, 2, 2, 17, 3, 2, 2, 2, 2, 19, 3, 2, 2, 2, 2, 21, 3, 2, 2, 2, 2, 23, 3, 2, 2, 2, 2, 25, 3, 2, 2, 2, 2, 27, 3, 2, 2, 2, 2, 29, 3, 2, 2, 2, 2, 31, 3, 2, 2, 2, 2, 33, 3, 2, 2, 2, 2, 35, 3, 2, 2, 2, 2, 37, 3, 2, 2, 2, 2, 39, 3, 2, 2, 2, 2, 41, 3, 2, 2, 2, 2, 43, 3, 2, 2, 2, 2, 45, 3, 2, 2, 2, 2, 47, 3, 2, 2, 2, 2, 49, 3, 2, 2, 2, 2, 51, 3, 2, 2, 2, 2, 53, 3, 2, 2, 2, 2, 55, 3, 2, 2, 2, 2, 57, 3, 2, 2, 2, 2, 59, 3, 2, 2, 2, 2, 61, 3, 2, 2, 2, 2, 63, 3, 2, 2, 2, 2, 65, 3, 2, 2, 2, 2, 67, 3, 2, 2, 2, 2, 69, 3, 2, 2, 2, 2, 71, 3, 2, 2, 2, 2, 73, 3, 2, 2, 2, 2, 75, 3, 2, 2, 2, 2, 77, 3, 2, 2, 2, 2, 79, 3, 2, 2, 2, 2, 81, 3, 2, 2, 2, 2, 83, 3, 2, 2, 2, 2, 85, 3, 2, 2, 2, 2, 87, 3, 2, 2, 2, 2, 89, 3, 2, 2, 2, 2, 91, 3, 2, 2, 2, 2, 93, 3, 2, 2, 2, 2, 95, 3, 2, 2, 2, 2, 97, 3, 2, 2, 2, 2, 99, 3, 2, 2, 2, 2, 101, 3, 2, 2, 2, 2, 103, 3, 2, 2, 2, 2, 105, 3, 2, 2, 2, 2, 107, 3, 2, 2, 2, 2, 109, 3, 2, 2, 2, 2, 111, 3, 2, 2, 2, 2, 113, 3, 2, 2, 2, 2, 115, 3, 2, 2, 2, 2, 117, 3, 2, 2, 2, 2, 119, 3, 2, 2, 2, 2, 121, 3, 2, 2, 2, 2, 123, 3, 2, 2, 2, 2, 125, 3, 2, 2, 2, 2, 127, 3, 2, 2, 2, 2, 129, 3, 2, 2, 2, 2, 131, 3, 2, 2, 2, 2, 133, 3, 2, 2, 2, 2, 135, 3, 2, 2, 2, 2, 137, 3, 2, 2, 2, 2, 139, 3, 2, 2, 2, 2, 141, 3, 2, 2, 2, 2, 143, 3, 2, 2, 2, 2, 145, 3, 2, 2, 2, 3, 147, 3, 2, 2, 2, 5, 154, 3, 2, 2, 2, 7, 156, 3, 2, 2, 2, 9, 167, 3, 2, 2, 2, 11, 169, 3, 2, 2, 2, 13, 171, 3, 2, 2, 2, 15, 174, 3, 2, 2, 2, 17, 176, 3, 2, 2, 2, 19, 178, 3, 2, 2, 2, 21, 181, 3, 2, 2, 2, 23, 183, 3, 2, 2, 2, 25, 192, 3, 2, 2, 2, 27, 194, 3, 2, 2, 2, 29, 196, 3, 2, 2, 2, 31, 205, 3, 2, 2, 2, 33, 207, 3, 2, 2, 2, 35, 209, 3, 2, 2, 2, 37, 211, 3, 2, 2, 2, 39, 219, 3, 2, 2, 2, 41, 222, 3, 2, 2, 2, 43, 227, 3, 2, 2, 2, 45, 239, 3, 2, 2, 2, 47, 243, 3, 2, 2, 2, 49, 245, 3, 2, 2, 2, 51, 247, 3, 2, 2, 2, 53, 258, 3, 2, 2, 2, 55, 265, 3, 2, 2, 2, 57, 282, 3, 2, 2, 2, 59, 297, 3, 2, 2, 2, 61, 312, 3, 2, 2, 2, 63, 325, 3, 2, 2, 2, 65, 335, 3, 2, 2, 2, 67, 360, 3, 2, 2, 2, 69, 375, 3, 2, 2, 2, 71, 394, 3, 2, 2, 2, 73, 410, 3, 2, 2, 2, 75, 421, 3, 2, 2, 2, 77, 429, 3, 2, 2, 2, 79, 436, 3, 2, 2, 2, 81, 438, 3, 2, 2, 2, 83, 440, 3, 2, 2, 2, 85, 442, 3, 2, 2, 2, 87, 444, 3, 2, 2, 2, 89, 446, 3, 2, 2, 2, 91, 448, 3, 2, 2, 2, 93, 451, 3, 2, 2, 2, 95, 454, 3, 2, 2, 2, 97, 456, 3, 2, 2, 2, 99, 458, 3, 2, 2, 2, 101, 461, 3, 2, 2, 2, 103, 464, 3, 2, 2, 2, 105, 473, 3, 2, 2, 2, 107, 477, 3, 2, 2, 2, 109, 482, 3, 2, 2, 2, 111, 489, 3, 2, 2, 2, 113, 496, 3, 2, 2, 2, 115, 500, 3, 2, 2, 2, 117, 509, 3, 2, 2, 2, 119, 534, 3, 2, 2, 2, 121, 593, 3, 2, 2, 2, 123, 596, 3, 2, 2, 2, 125, 624, 3, 2, 2, 2, 127, 626, 3, 2, 2, 2, 129, 653, 3, 2, 2, 2, 131, 655, 3, 2, 2, 2, 133, 664, 3, 2, 2, 2, 135, 685, 3, 2, 2, 2, 137, 781, 3, 2, 2, 2, 139, 783, 3, 2, 2, 2, 141, 791, 3, 2, 2, 2, 143, 797, 3, 2, 2, 2, 145, 811, 3, 2, 2, 2, 147, 148, 7, 114, 2, 2, 148, 149, 7, 116, 2, 2, 149, 150, 7, 99, 2, 2, 150, 151, 7, 105, 2, 2, 151, 152, 7, 111, 2, 2, 152, 153, 7, 99, 2, 2, 153, 4, 3, 2, 2, 2, 154, 155, 7, 61, 2, 2, 155, 6, 3, 2, 2, 2, 156, 157, 7, 101, 2, 2, 157, 158, 7, 99, 2, 2, 158, 159, 7, 117, 2, 2, 159, 160, 7, 106, 2, 2, 160, 161, 7, 117, 2, 2, 161, 162, 7, 101, 2, 2, 162, 163, 7, 116, 2, 2, 163, 164, 7, 107, 2, 2, 164, 165, 7, 114, 2, 2, 165, 166, 7, 118, 2, 2, 166, 8, 3, 2, 2, 2, 167, 168, 7, 96, 2, 2, 168, 10, 3, 2, 2, 2, 169, 170, 7, 128, 2, 2, 170, 12, 3, 2, 2, 2, 171, 172, 7, 64, 2, 2, 172, 173, 7, 63, 2, 2, 173, 14, 3, 2, 2, 2, 174, 175, 7, 64, 2, 2, 175, 16, 3, 2, 2, 2, 176, 177, 7, 62, 2, 2, 177, 18, 3, 2, 2, 2, 178, 179, 7, 62, 2, 2, 179, 180, 7, 63, 2, 2, 180, 20, 3, 2, 2, 2, 181, 182, 7, 63, 2, 2, 182, 22, 3, 2, 2, 2, 183, 184, 7, 101, 2, 2, 184, 185, 7, 113, 2, 2, 185, 186, 7, 112, 2, 2, 186, 187, 7, 118, 2, 2, 187, 188, 7, 116, 2, 2, 188, 189, 7, 99, 2, 2, 189, 190, 7, 101, 2, 2, 190, 191, 7, 118, 2, 2, 191, 24, 3, 2, 2, 2, 192, 193, 7, 125, 2, 2, 193, 26, 3, 2, 2, 2, 194, 195, 7, 127, 2, 2, 195, 28, 3, 2, 2, 2, 196, 197, 7, 104, 2, 2, 197, 198, 7, 119, 2, 2, 198, 199, 7, 112, 2, 2, 199, 200, 7, 101, 2, 2, 200, 201, 7, 118, 2, 2, 201, 202, 7, 107, 2, 2, 202, 203, 7, 113, 2, 2, 203, 204, 7, 112, 2, 2, 204, 30, 3, 2, 2, 2, 205, 206, 7, 42, 2, 2, 206, 32, 3, 2, 2, 2, 207, 208, 7, 46, 2, 2, 208, 34, 3, 2, 2, 2, 209, 210, 7, 43, 2, 2, 210, 36, 3, 2, 2, 2, 211, 212, 7, 116, 2, 2, 212, 213, 7, 103, 2, 2, 213, 214, 7, 115, 2, 2, 214, 215, 7, 119, 2, 2, 215, 216, 7, 107, 2, 2, 216, 217, 7, 116, 2, 2, 217, 218, 7, 103, 2, 2, 218, 38, 3, 2, 2, 2, 219, 220, 7, 107, 2, 2, 220, 221, 7, 104, 2, 2, 221, 40, 3, 2, 2, 2, 222, 223, 7, 103, 2, 2, 223, 224, 7, 110, 2, 2, 224, 225, 7, 117, 2, 2, 225, 226, 7, 103, 2, 2, 226, 42, 3, 2, 2, 2, 227, 228, 7, 101, 2, 2, 228, 229, 7, 113, 2, 2, 229, 230, 7, 112, 2, 2, 230, 231, 7, 117, 2, 2, 231, 232, 7, 113, 2, 2, 232, 233, 7, 110, 2, 2, 233, 234, 7, 103, 2, 2, 234, 235, 7, 48, 2, 2, 235, 236, 7, 110, 2, 2, 236, 237, 7, 113, 2, 2, 237, 238, 7, 105, 2, 2, 238, 44, 3, 2, 2, 2, 239, 240, 7, 112, 2, 2, 240, 241, 7, 103, 2, 2, 241, 242, 7, 121, 2, 2, 242, 46, 3, 2, 2, 2, 243, 244, 7, 93, 2, 2, 244, 48, 3, 2, 2, 2, 245, 246, 7, 95, 2, 2, 246, 50, 3, 2, 2, 2, 247, 248, 7, 118, 2, 2, 248, 249, 7, 122, 2, 2, 249, 250, 7, 48, 2, 2, 250, 251, 7, 113, 2, 2, 251, 252, 7, 119, 2, 2, 252, 253, 7, 118, 2, 2, 253, 254, 7, 114, 2, 2, 254, 255, 7, 119, 2, 2, 255, 256, 7, 118, 2, 2, 256, 257, 7, 117, 2, 2, 257, 52, 3, 2, 2, 2, 258, 259, 7, 48, 2, 2, 259, 260, 7, 120, 2, 2, 260, 261, 7, 99, 2, 2, 261, 262, 7, 110, 2, 2, 262, 263, 7, 119, 2, 2, 263, 264, 7, 103, 2, 2, 264, 54, 3, 2, 2, 2, 265, 266, 7, 48, 2, 2, 266, 267, 7, 110, 2, 2, 267, 268, 7, 113, 2, 2, 268, 269, 7, 101, 2, 2, 269, 270, 7, 109, 2, 2, 270, 271, 7, 107, 2, 2, 271, 272, 7, 112, 2, 2, 272, 273, 7, 105, 2, 2, 273, 274, 7, 68, 2, 2, 274, 275, 7, 123, 2, 2, 275, 276, 7, 118, 2, 2, 276, 277, 7, 103, 2, 2, 277, 278, 7, 101, 2, 2, 278, 279, 7, 113, 2, 2, 279, 280, 7, 102, 2, 2, 280, 281, 7, 103, 2, 2, 281, 56, 3, 2, 2, 2, 282, 283, 7, 48, 2, 2, 283, 284, 7, 118, 2, 2, 284, 285, 7, 113, 2, 2, 285, 286, 7, 109, 2, 2, 286, 287, 7, 103, 2, 2, 287, 288, 7, 112, 2, 2, 288, 289, 7, 69, 2, 2, 289, 290, 7, 99, 2, 2, 290, 291, 7, 118, 2, 2, 291, 292, 7, 103, 2, 2, 292, 293, 7, 105, 2, 2, 293, 294, 7, 113, 2, 2, 294, 295, 7, 116, 2, 2, 295, 296, 7, 123, 2, 2, 296, 58, 3, 2, 2, 2, 297, 298, 7, 48, 2, 2, 298, 299, 7, 112, 2, 2, 299, 300, 7, 104, 2, 2, 300, 301, 7, 118, 2, 2, 301, 302, 7, 69, 2, 2, 302, 303, 7, 113, 2, 2, 303, 304, 7, 111, 2, 2, 304, 305, 7, 111, 2, 2, 305, 306, 7, 107, 2, 2, 306, 307, 7, 118, 2, 2, 307, 308, 7, 111, 2, 2, 308, 309, 7, 103, 2, 2, 309, 310, 7, 112, 2, 2, 310, 311, 7, 118, 2, 2, 311, 60, 3, 2, 2, 2, 312, 313, 7, 48, 2, 2, 313, 314, 7, 118, 2, 2, 314, 315, 7, 113, 2, 2, 315, 316, 7, 109, 2, 2, 316, 317, 7, 103, 2, 2, 317, 318, 7, 112, 2, 2, 318, 319, 7, 67, 2, 2, 319, 320, 7, 111, 2, 2, 320, 321, 7, 113, 2, 2, 321, 322, 7, 119, 2, 2, 322, 323, 7, 112, 2, 2, 323, 324, 7, 118, 2, 2, 324, 62, 3, 2, 2, 2, 325, 326, 7, 118, 2, 2, 326, 327, 7, 122, 2, 2, 327, 328, 7, 48, 2, 2, 328, 329, 7, 107, 2, 2, 329, 330, 7, 112, 2, 2, 330, 331, 7, 114, 2, 2, 331, 332, 7, 119, 2, 2, 332, 333, 7, 118, 2, 2, 333, 334, 7, 117, 2, 2, 334, 64, 3, 2, 2, 2, 335, 336, 7, 48, 2, 2, 336, 337, 7, 113, 2, 2, 337, 338, 7, 119, 2, 2, 338, 339, 7, 118, 2, 2, 339, 340, 7, 114, 2, 2, 340, 341, 7, 113, 2, 2, 341, 342, 7, 107, 2, 2, 342, 343, 7, 112, 2, 2, 343, 344, 7, 118, 2, 2, 344, 345, 7, 86, 2, 2, 345, 346, 7, 116, 2, 2, 346, 347, 7, 99, 2, 2, 347, 348, 7, 112, 2, 2, 348, 349, 7, 117, 2, 2, 349, 350, 7, 99, 2, 2, 350, 351, 7, 101, 2, 2, 351, 352, 7, 118, 2, 2, 352, 353, 7, 107, 2, 2, 353, 354, 7, 113, 2, 2, 354, 355, 7, 112, 2, 2, 355, 356, 7, 74, 2, 2, 356, 357, 7, 99, 2, 2, 357, 358, 7, 117, 2, 2, 358, 359, 7, 106, 2, 2, 359, 66, 3, 2, 2, 2, 360, 361, 7, 48, 2, 2, 361, 362, 7, 113, 2, 2, 362, 363, 7, 119, 2, 2, 363, 364, 7, 118, 2, 2, 364, 365, 7, 114, 2, 2, 365, 366, 7, 113, 2, 2, 366, 367, 7, 107, 2, 2, 367, 368, 7, 112, 2, 2, 368, 369, 7, 118, 2, 2, 369, 370, 7, 75, 2, 2, 370, 371, 7, 112, 2, 2, 371, 372, 7, 102, 2, 2, 372, 373, 7, 103, 2, 2, 373, 374, 7, 122, 2, 2, 374, 68, 3, 2, 2, 2, 375, 376, 7, 48, 2, 2, 376, 377, 7, 119, 2, 2, 377, 378, 7, 112, 2, 2, 378, 379, 7, 110, 2, 2, 379, 380, 7, 113, 2, 2, 380, 381, 7, 101, 2, 2, 381, 382, 7, 109, 2, 2, 382, 383, 7, 107, 2, 2, 383, 384, 7, 112, 2, 2, 384, 385, 7, 105, 2, 2, 385, 386, 7, 68, 2, 2, 386, 387, 7, 123, 2, 2, 387, 388, 7, 118, 2, 2, 388, 389, 7, 103, 2, 2, 389, 390, 7, 101, 2, 2, 390, 391, 7, 113, 2, 2, 391, 392, 7, 102, 2, 2, 392, 393, 7, 103, 2, 2, 393, 70, 3, 2, 2, 2, 394, 395, 7, 48, 2, 2, 395, 396, 7, 117, 2, 2, 396, 397, 7, 103, 2, 2, 397, 398, 7, 115, 2, 2, 398, 399, 7, 119, 2, 2, 399, 400, 7, 103, 2, 2, 400, 401, 7, 112, 2, 2, 401, 402, 7, 101, 2, 2, 402, 403, 7, 103, 2, 2, 403, 404, 7, 80, 2, 2, 404, 405, 7, 119, 2, 2, 405, 406, 7, 111, 2, 2, 406, 407, 7, 100, 2, 2, 407, 408, 7, 103, 2, 2, 408, 409, 7, 116, 2, 2, 409, 72, 3, 2, 2, 2, 410, 411, 7, 48, 2, 2, 411, 412, 7, 116, 2, 2, 412, 413, 7, 103, 2, 2, 413, 414, 7, 120, 2, 2, 414, 415, 7, 103, 2, 2, 415, 416, 7, 116, 2, 2, 416, 417, 7, 117, 2, 2, 417, 418, 7, 103, 2, 2, 418, 419, 7, 42, 2, 2, 419, 420, 7, 43, 2, 2, 420, 74, 3, 2, 2, 2, 421, 422, 7, 48, 2, 2, 422, 423, 7, 110, 2, 2, 423, 424, 7, 103, 2, 2, 424, 425, 7, 112, 2, 2, 425, 426, 7, 105, 2, 2, 426, 427, 7, 118, 2, 2, 427, 428, 7, 106, 2, 2, 428, 76, 3, 2, 2, 2, 429, 430, 7, 48, 2, 2, 430, 431, 7, 117, 2, 2, 431, 432, 7, 114, 2, 2, 432, 433, 7, 110, 2, 2, 433, 434, 7, 107, 2, 2, 434, 435, 7, 118, 2, 2, 435, 78, 3, 2, 2, 2, 436, 437, 7, 35, 2, 2, 437, 80, 3, 2, 2, 2, 438, 439, 7, 47, 2, 2, 439, 82, 3, 2, 2, 2, 440, 441, 7, 44, 2, 2, 441, 84, 3, 2, 2, 2, 442, 443, 7, 49, 2, 2, 443, 86, 3, 2, 2, 2, 444, 445, 7, 39, 2, 2, 445, 88, 3, 2, 2, 2, 446, 447, 7, 45, 2, 2, 447, 90, 3, 2, 2, 2, 448, 449, 7, 63, 2, 2, 449, 450, 7, 63, 2, 2, 450, 92, 3, 2, 2, 2, 451, 452, 7, 35, 2, 2, 452, 453, 7, 63, 2, 2, 453, 94, 3, 2, 2, 2, 454, 455, 7, 40, 2, 2, 455, 96, 3, 2, 2, 2, 456, 457, 7, 126, 2, 2, 457, 98, 3, 2, 2, 2, 458, 459, 7, 40, 2, 2, 459, 460, 7, 40, 2, 2, 460, 100, 3, 2, 2, 2, 461, 462, 7, 126, 2, 2, 462, 463, 7, 126, 2, 2, 463, 102, 3, 2, 2, 2, 464, 465, 7, 101, 2, 2, 465, 466, 7, 113, 2, 2, 466, 467, 7, 112, 2, 2, 467, 468, 7, 117, 2, 2, 468, 469, 7, 118, 2, 2, 469, 470, 7, 99, 2, 2, 470, 471, 7, 112, 2, 2, 471, 472, 7, 118, 2, 2, 472, 104, 3, 2, 2, 2, 473, 474, 7, 107, 2, 2, 474, 475, 7, 112, 2, 2, 475, 476, 7, 118, 2, 2, 476, 106, 3, 2, 2, 2, 477, 478, 7, 100, 2, 2, 478, 479, 7, 113, 2, 2, 479, 480, 7, 113, 2, 2, 480, 481, 7, 110, 2, 2, 481, 108, 3, 2, 2, 2, 482, 483, 7, 117, 2, 2, 483, 484, 7, 118, 2, 2, 484, 485, 7, 116, 2, 2, 485, 486, 7, 107, 2, 2, 486, 487, 7, 112, 2, 2, 487, 488, 7, 105, 2, 2, 488, 110, 3, 2, 2, 2, 489, 490, 7, 114, 2, 2, 490, 491, 7, 119, 2, 2, 491, 492, 7, 100, 2, 2, 492, 493, 7, 109, 2, 2, 493, 494, 7, 103, 2, 2, 494, 495, 7, 123, 2, 2, 495, 112, 3, 2, 2, 2, 496, 497, 7, 117, 2, 2, 497, 498, 7, 107, 2, 2, 498, 499, 7, 105, 2, 2, 499, 114, 3, 2, 2, 2, 500, 501, 7, 102, 2, 2, 501, 502, 7, 99, 2, 2, 502, 503, 7, 118, 2, 2, 503, 504, 7, 99, 2, 2, 504, 505, 7, 117, 2, 2, 505, 506, 7, 107, 2, 2, 506, 507, 7, 105, 2, 2, 507, 116, 3, 2, 2, 2, 508, 510, 9, 2, 2, 2, 509, 508, 3, 2, 2, 2, 510, 511, 3, 2, 2, 2, 511, 509, 3, 2, 2, 2, 511, 512, 3, 2, 2, 2, 512, 513, 3, 2, 2, 2, 513, 515, 7, 48, 2, 2, 514, 516, 9, 2, 2, 2, 515, 514, 3, 2, 2, 2, 516, 517, 3, 2, 2, 2, 517, 515, 3, 2, 2, 2, 517, 518, 3, 2, 2, 2, 518, 519, 3, 2, 2, 2, 519, 521, 7, 48, 2, 2, 520, 522, 9, 2, 2, 2, 521, 520, 3, 2, 2, 2, 522, 523, 3, 2, 2, 2, 523, 521, 3, 2, 2, 2, 523, 524, 3, 2, 2, 2, 524, 118, 3, 2, 2, 2, 525, 526, 7, 118, 2, 2, 526, 527, 7, 116, 2, 2, 527, 528, 7, 119, 2, 2, 528, 535, 7, 103, 2, 2, 529, 530, 7, 104, 2, 2, 530, 531, 7, 99, 2, 2, 531, 532, 7, 110, 2, 2, 532, 533, 7, 117, 2, 2, 533, 535, 7, 103, 2, 2, 534, 525, 3, 2, 2, 2, 534, 529, 3, 2, 2, 2, 535, 120, 3, 2, 2, 2, 536, 537, 7, 117, 2, 2, 537, 538, 7, 99, 2, 2, 538, 539, 7, 118, 2, 2, 539, 540, 7, 113, 2, 2, 540, 541, 7, 117, 2, 2, 541, 542, 7, 106, 2, 2, 542, 543, 7, 107, 2, 2, 543, 594, 7, 117, 2, 2, 544, 545, 7, 117, 2, 2, 545, 546, 7, 99, 2, 2, 546, 547, 7, 118, 2, 2, 547, 594, 7, 117, 2, 2, 548, 549, 7, 104, 2, 2, 549, 550, 7, 107, 2, 2, 550, 551, 7, 112, 2, 2, 551, 552, 7, 112, 2, 2, 552, 553, 7, 103, 2, 2, 553, 594, 7, 123, 2, 2, 554, 555, 7, 100, 2, 2, 555, 556, 7, 107, 2, 2, 556, 557, 7, 118, 2, 2, 557, 594, 7, 117, 2, 2, 558, 559, 7, 100, 2, 2, 559, 560, 7, 107, 2, 2, 560, 561, 7, 118, 2, 2, 561, 562, 7, 101, 2, 2, 562, 563, 7, 113, 2, 2, 563, 564, 7, 107, 2, 2, 564, 594, 7, 112, 2, 2, 565, 566, 7, 117, 2, 2, 566, 567, 7, 103, 2, 2, 567, 568, 7, 101, 2, 2, 568, 569, 7, 113, 2, 2, 569, 570, 7, 112, 2, 2, 570, 571, 7, 102, 2, 2, 571, 594, 7, 117, 2, 2, 572, 573, 7, 111, 2, 2, 573, 574, 7, 107, 2, 2, 574, 575, 7, 112, 2, 2, 575, 576, 7, 119, 2, 2, 576, 577, 7, 118, 2, 2, 577, 578, 7, 103, 2, 2, 578, 594, 7, 117, 2, 2, 579, 580, 7, 106, 2, 2, 580, 581, 7, 113, 2, 2, 581, 582, 7, 119, 2, 2, 582, 583, 7, 116, 2, 2, 583, 594, 7, 117, 2, 2, 584, 585, 7, 102, 2, 2, 585, 586, 7, 99, 2, 2, 586, 587, 7, 123, 2, 2, 587, 594, 7, 117, 2, 2, 588, 589, 7, 121, 2, 2, 589, 590, 7, 103, 2, 2, 590, 591, 7, 103, 2, 2, 591, 592, 7, 109, 2, 2, 592, 594, 7, 117, 2, 2, 593, 536, 3, 2, 2, 2, 593, 544, 3, 2, 2, 2, 593, 548, 3, 2, 2, 2, 593, 554, 3, 2, 2, 2, 593, 558, 3, 2, 2, 2, 593, 565, 3, 2, 2, 2, 593, 572, 3, 2, 2, 2, 593, 579, 3, 2, 2, 2, 593, 584, 3, 2, 2, 2, 593, 588, 3, 2, 2, 2, 594, 122, 3, 2, 2, 2, 595, 597, 9, 3, 2, 2, 596, 595, 3, 2, 2, 2, 596, 597, 3, 2, 2, 2, 597, 599, 3, 2, 2, 2, 598, 600, 9, 2, 2, 2, 599, 598, 3, 2, 2, 2, 600, 601, 3, 2, 2, 2, 601, 599, 3, 2, 2, 2, 601, 602, 3, 2, 2, 2, 602, 609, 3, 2, 2, 2, 603, 605, 9, 4, 2, 2, 604, 606, 9, 2, 2, 2, 605, 604, 3, 2, 2, 2, 606, 607, 3, 2, 2, 2, 607, 605, 3, 2, 2, 2, 607, 608, 3, 2, 2, 2, 608, 610, 3, 2, 2, 2, 609, 603, 3, 2, 2, 2, 609, 610, 3, 2, 2, 2, 610, 124, 3, 2, 2, 2, 611, 612, 7, 100, 2, 2, 612, 613, 7, 123, 2, 2, 613, 614, 7, 118, 2, 2, 614, 615, 7, 103, 2, 2, 615, 616, 7, 117, 2, 2, 616, 618, 3, 2, 2, 2, 617, 619, 5, 127, 64, 2, 618, 617, 3, 2, 2, 2, 618, 619, 3, 2, 2, 2, 619, 625, 3, 2, 2, 2, 620, 621, 7, 100, 2, 2, 621, 622, 7, 123, 2, 2, 622, 623, 7, 118, 2, 2, 623, 625, 7, 103, 2, 2, 624, 611, 3, 2, 2, 2, 624, 620, 3, 2, 2, 2, 625, 126, 3, 2, 2, 2, 626, 630, 9, 5, 2, 2, 627, 629, 9, 2, 2, 2, 628, 627, 3, 2, 2, 2, 629, 632, 3, 2, 2, 2, 630, 628, 3, 2, 2, 2, 630, 631, 3, 2, 2, 2, 631, 128, 3, 2, 2, 2, 632, 630, 3, 2, 2, 2, 633, 639, 7, 36, 2, 2, 634, 635, 7, 94, 2, 2, 635, 638, 7, 36, 2, 2, 636, 638, 10, 6, 2, 2, 637, 634, 3, 2, 2, 2, 637, 636, 3, 2, 2, 2, 638, 641, 3, 2, 2, 2, 639, 640, 3, 2, 2, 2, 639, 637, 3, 2, 2, 2, 640, 642, 3, 2, 2, 2, 641, 639, 3, 2, 2, 2, 642, 654, 7, 36, 2, 2, 643, 649, 7, 41, 2, 2, 644, 645, 7, 94, 2, 2, 645, 648, 7, 41, 2, 2, 646, 648, 10, 7, 2, 2, 647, 644, 3, 2, 2, 2, 647, 646, 3, 2, 2, 2, 648, 651, 3, 2, 2, 2, 649, 650, 3, 2, 2, 2, 649, 647, 3, 2, 2, 2, 650, 652, 3, 2, 2, 2, 651, 649, 3, 2, 2, 2, 652, 654, 7, 41, 2, 2, 653, 633, 3, 2, 2, 2, 653, 643, 3, 2, 2, 2, 654, 130, 3, 2, 2, 2, 655, 656, 7, 102, 2, 2, 656, 657, 7, 99, 2, 2, 657, 658, 7, 118, 2, 2, 658, 659, 7, 103, 2, 2, 659, 660, 7, 42, 2, 2, 660, 661, 3, 2, 2, 2, 661, 662, 5, 129, 65, 2, 662, 663, 7, 43, 2, 2, 663, 132, 3, 2, 2, 2, 664, 665, 7, 50, 2, 2, 665, 669, 9, 8, 2, 2, 666, 668, 9, 9, 2, 2, 667, 666, 3, 2, 2, 2, 668, 671, 3, 2, 2, 2, 669, 667, 3, 2, 2, 2, 669, 670, 3, 2, 2, 2, 670, 134, 3, 2, 2, 2, 671, 669, 3, 2, 2, 2, 672, 673, 7, 118, 2, 2, 673, 674, 7, 122, 2, 2, 674, 675, 7, 48, 2, 2, 675, 676, 7, 99, 2, 2, 676, 677, 7, 105, 2, 2, 677, 686, 7, 103, 2, 2, 678, 679, 7, 118, 2, 2, 679, 680, 7, 122, 2, 2, 680, 681, 7, 48, 2, 2, 681, 682, 7, 118, 2, 2, 682, 683, 7, 107, 2, 2, 683, 684, 7, 111, 2, 2, 684, 686, 7, 103, 2, 2, 685, 672, 3, 2, 2, 2, 685, 678, 3, 2, 2, 2, 686, 136, 3, 2, 2, 2, 687, 688, 7, 118, 2, 2, 688, 689, 7, 106, 2, 2, 689, 690, 7, 107, 2, 2, 690, 691, 7, 117, 2, 2, 691, 692, 7, 48, 2, 2, 692, 693, 7, 99, 2, 2, 693, 694, 7, 101, 2, 2, 694, 695, 7, 118, 2, 2, 695, 696, 7, 107, 2, 2, 696, 697, 7, 120, 2, 2, 697, 698, 7, 103, 2, 2, 698, 699, 7, 75, 2, 2, 699, 700, 7, 112, 2, 2, 700, 701, 7, 114, 2, 2, 701, 702, 7, 119, 2, 2, 702, 703, 7, 118, 2, 2, 703, 704, 7, 75, 2, 2, 704, 705, 7, 112, 2, 2, 705, 706, 7, 102, 2, 2, 706, 707, 7, 103, 2, 2, 707, 782, 7, 122, 2, 2, 708, 709, 7, 118, 2, 2, 709, 710, 7, 106, 2, 2, 710, 711, 7, 107, 2, 2, 711, 712, 7, 117, 2, 2, 712, 713, 7, 48, 2, 2, 713, 714, 7, 99, 2, 2, 714, 715, 7, 101, 2, 2, 715, 716, 7, 118, 2, 2, 716, 717, 7, 107, 2, 2, 717, 718, 7, 120, 2, 2, 718, 719, 7, 103, 2, 2, 719, 720, 7, 68, 2, 2, 720, 721, 7, 123, 2, 2, 721, 722, 7, 118, 2, 2, 722, 723, 7, 103, 2, 2, 723, 724, 7, 101, 2, 2, 724, 725, 7, 113, 2, 2, 725, 726, 7, 102, 2, 2, 726, 782, 7, 103, 2, 2, 727, 728, 7, 118, 2, 2, 728, 729, 7, 122, 2, 2, 729, 730, 7, 48, 2, 2, 730, 731, 7, 107, 2, 2, 731, 732, 7, 112, 2, 2, 732, 733, 7, 114, 2, 2, 733, 734, 7, 119, 2, 2, 734, 735, 7, 118, 2, 2, 735, 736, 7, 117, 2, 2, 736, 737, 7, 48, 2, 2, 737, 738, 7, 110, 2, 2, 738, 739, 7, 103, 2, 2, 739, 740, 7, 112, 2, 2, 740, 741, 7, 105, 2, 2, 741, 742, 7, 118, 2, 2, 742, 782, 7, 106, 2, 2, 743, 744, 7, 118, 2, 2, 744, 745, 7, 122, 2, 2, 745, 746, 7, 48, 2, 2, 746, 747, 7, 113, 2, 2, 747, 748, 7, 119, 2, 2, 748, 749, 7, 118, 2, 2, 749, 750, 7, 114, 2, 2, 750, 751, 7, 119, 2, 2, 751, 752, 7, 118, 2, 2, 752, 753, 7, 117, 2, 2, 753, 754, 7, 48, 2, 2, 754, 755, 7, 110, 2, 2, 755, 756, 7, 103, 2, 2, 756, 757, 7, 112, 2, 2, 757, 758, 7, 105, 2, 2, 758, 759, 7, 118, 2, 2, 759, 782, 7, 106, 2, 2, 760, 761, 7, 118, 2, 2, 761, 762, 7, 122, 2, 2, 762, 763, 7, 48, 2, 2, 763, 764, 7, 120, 2, 2, 764, 765, 7, 103, 2, 2, 765, 766, 7, 116, 2, 2, 766, 767, 7, 117, 2, 2, 767, 768, 7, 107, 2, 2, 768, 769, 7, 113, 2, 2, 769, 782, 7, 112, 2, 2, 770, 771, 7, 118, 2, 2, 771, 772, 7, 122, 2, 2, 772, 773, 7, 48, 2, 2, 773, 774, 7, 110, 2, 2, 774, 775, 7, 113, 2, 2, 775, 776, 7, 101, 2, 2, 776, 777, 7, 109, 2, 2, 777, 778, 7, 118, 2, 2, 778, 779, 7, 107, 2, 2, 779, 780, 7, 111, 2, 2, 780, 782, 7, 103, 2, 2, 781, 687, 3, 2, 2, 2, 781, 708, 3, 2, 2, 2, 781, 727, 3, 2, 2, 2, 781, 743, 3, 2, 2, 2, 781, 760, 3, 2, 2, 2, 781, 770, 3, 2, 2, 2, 782, 138, 3, 2, 2, 2, 783, 787, 9, 10, 2, 2, 784, 786, 9, 11, 2, 2, 785, 784, 3, 2, 2, 2, 786, 789, 3, 2, 2, 2, 787, 785, 3, 2, 2, 2, 787, 788, 3, 2, 2, 2, 788, 140, 3, 2, 2, 2, 789, 787, 3, 2, 2, 2, 790, 792, 9, 12, 2, 2, 791, 790, 3, 2, 2, 2, 792, 793, 3, 2, 2, 2, 793, 791, 3, 2, 2, 2, 793, 794, 3, 2, 2, 2, 794, 795, 3, 2, 2, 2, 795, 796, 8, 71, 2, 2, 796, 142, 3, 2, 2, 2, 797, 798, 7, 49, 2, 2, 798, 799, 7, 44, 2, 2, 799, 803, 3, 2, 2, 2, 800, 802, 11, 2, 2, 2, 801, 800, 3, 2, 2, 2, 802, 805, 3, 2, 2, 2, 803, 804, 3, 2, 2, 2, 803, 801, 3, 2, 2, 2, 804, 806, 3, 2, 2, 2, 805, 803, 3, 2, 2, 2, 806, 807, 7, 44, 2, 2, 807, 808, 7, 49, 2, 2, 808, 809, 3, 2, 2, 2, 809, 810, 8, 72, 3, 2, 810, 144, 3, 2, 2, 2, 811, 812, 7, 49, 2, 2, 812, 813, 7, 49, 2, 2, 813, 817, 3, 2, 2, 2, 814, 816, 10, 13, 2, 2, 815, 814, 3, 2, 2, 2, 816, 819, 3, 2, 2, 2, 817, 815, 3, 2, 2, 2, 817, 818, 3, 2, 2, 2, 818, 820, 3, 2, 2, 2, 819, 817, 3, 2, 2, 2, 820, 821, 8, 73, 3, 2, 821, 146, 3, 2, 2, 2, 27, 2, 511, 517, 523, 534, 593, 596, 601, 607, 609, 618, 624, 630, 637, 639, 647, 649, 653, 669, 685, 781, 787, 793, 803, 817, 4, 8, 2, 2, 2, 3, 2]
\ No newline at end of file
diff --git a/packages/cashc/src/grammar/CashScriptLexer.tokens b/packages/cashc/src/grammar/CashScriptLexer.tokens
index 99983b17..c7289b6a 100644
--- a/packages/cashc/src/grammar/CashScriptLexer.tokens
+++ b/packages/cashc/src/grammar/CashScriptLexer.tokens
@@ -55,23 +55,21 @@ T__53=54
 T__54=55
 T__55=56
 T__56=57
-T__57=58
-T__58=59
-VersionLiteral=60
-BooleanLiteral=61
-NumberUnit=62
-NumberLiteral=63
-Bytes=64
-Bound=65
-StringLiteral=66
-DateLiteral=67
-HexLiteral=68
-TxVar=69
-NullaryOp=70
-Identifier=71
-WHITESPACE=72
-COMMENT=73
-LINE_COMMENT=74
+VersionLiteral=58
+BooleanLiteral=59
+NumberUnit=60
+NumberLiteral=61
+Bytes=62
+Bound=63
+StringLiteral=64
+DateLiteral=65
+HexLiteral=66
+TxVar=67
+NullaryOp=68
+Identifier=69
+WHITESPACE=70
+COMMENT=71
+LINE_COMMENT=72
 'pragma'=1
 ';'=2
 'cashscript'=3
@@ -92,42 +90,40 @@ LINE_COMMENT=74
 'require'=18
 'if'=19
 'else'=20
-'new'=21
-'['=22
-']'=23
-'console.'=24
-'log'=25
-'warn'=26
-'tx.outputs'=27
-'.value'=28
-'.lockingBytecode'=29
-'.tokenCategory'=30
-'.nftCommitment'=31
-'.tokenAmount'=32
-'tx.inputs'=33
-'.outpointTransactionHash'=34
-'.outpointIndex'=35
-'.unlockingBytecode'=36
-'.sequenceNumber'=37
-'.reverse()'=38
-'.length'=39
-'.split'=40
-'!'=41
-'-'=42
-'*'=43
-'/'=44
-'%'=45
-'+'=46
-'=='=47
-'!='=48
-'&'=49
-'|'=50
-'&&'=51
-'||'=52
-'constant'=53
-'int'=54
-'bool'=55
-'string'=56
-'pubkey'=57
-'sig'=58
-'datasig'=59
+'console.log'=21
+'new'=22
+'['=23
+']'=24
+'tx.outputs'=25
+'.value'=26
+'.lockingBytecode'=27
+'.tokenCategory'=28
+'.nftCommitment'=29
+'.tokenAmount'=30
+'tx.inputs'=31
+'.outpointTransactionHash'=32
+'.outpointIndex'=33
+'.unlockingBytecode'=34
+'.sequenceNumber'=35
+'.reverse()'=36
+'.length'=37
+'.split'=38
+'!'=39
+'-'=40
+'*'=41
+'/'=42
+'%'=43
+'+'=44
+'=='=45
+'!='=46
+'&'=47
+'|'=48
+'&&'=49
+'||'=50
+'constant'=51
+'int'=52
+'bool'=53
+'string'=54
+'pubkey'=55
+'sig'=56
+'datasig'=57
diff --git a/packages/cashc/src/grammar/CashScriptLexer.ts b/packages/cashc/src/grammar/CashScriptLexer.ts
index 0363a66f..944762f1 100644
--- a/packages/cashc/src/grammar/CashScriptLexer.ts
+++ b/packages/cashc/src/grammar/CashScriptLexer.ts
@@ -73,23 +73,21 @@ export class CashScriptLexer extends Lexer {
 	public static readonly T__54 = 55;
 	public static readonly T__55 = 56;
 	public static readonly T__56 = 57;
-	public static readonly T__57 = 58;
-	public static readonly T__58 = 59;
-	public static readonly VersionLiteral = 60;
-	public static readonly BooleanLiteral = 61;
-	public static readonly NumberUnit = 62;
-	public static readonly NumberLiteral = 63;
-	public static readonly Bytes = 64;
-	public static readonly Bound = 65;
-	public static readonly StringLiteral = 66;
-	public static readonly DateLiteral = 67;
-	public static readonly HexLiteral = 68;
-	public static readonly TxVar = 69;
-	public static readonly NullaryOp = 70;
-	public static readonly Identifier = 71;
-	public static readonly WHITESPACE = 72;
-	public static readonly COMMENT = 73;
-	public static readonly LINE_COMMENT = 74;
+	public static readonly VersionLiteral = 58;
+	public static readonly BooleanLiteral = 59;
+	public static readonly NumberUnit = 60;
+	public static readonly NumberLiteral = 61;
+	public static readonly Bytes = 62;
+	public static readonly Bound = 63;
+	public static readonly StringLiteral = 64;
+	public static readonly DateLiteral = 65;
+	public static readonly HexLiteral = 66;
+	public static readonly TxVar = 67;
+	public static readonly NullaryOp = 68;
+	public static readonly Identifier = 69;
+	public static readonly WHITESPACE = 70;
+	public static readonly COMMENT = 71;
+	public static readonly LINE_COMMENT = 72;
 
 	// tslint:disable:no-trailing-whitespace
 	public static readonly channelNames: string[] = [
@@ -109,16 +107,16 @@ export class CashScriptLexer extends Lexer {
 		"T__33", "T__34", "T__35", "T__36", "T__37", "T__38", "T__39", "T__40", 
 		"T__41", "T__42", "T__43", "T__44", "T__45", "T__46", "T__47", "T__48", 
 		"T__49", "T__50", "T__51", "T__52", "T__53", "T__54", "T__55", "T__56", 
-		"T__57", "T__58", "VersionLiteral", "BooleanLiteral", "NumberUnit", "NumberLiteral", 
-		"Bytes", "Bound", "StringLiteral", "DateLiteral", "HexLiteral", "TxVar", 
-		"NullaryOp", "Identifier", "WHITESPACE", "COMMENT", "LINE_COMMENT",
+		"VersionLiteral", "BooleanLiteral", "NumberUnit", "NumberLiteral", "Bytes", 
+		"Bound", "StringLiteral", "DateLiteral", "HexLiteral", "TxVar", "NullaryOp", 
+		"Identifier", "WHITESPACE", "COMMENT", "LINE_COMMENT",
 	];
 
 	private static readonly _LITERAL_NAMES: Array<string | undefined> = [
 		undefined, "'pragma'", "';'", "'cashscript'", "'^'", "'~'", "'>='", "'>'", 
 		"'<'", "'<='", "'='", "'contract'", "'{'", "'}'", "'function'", "'('", 
-		"','", "')'", "'require'", "'if'", "'else'", "'new'", "'['", "']'", "'console.'", 
-		"'log'", "'warn'", "'tx.outputs'", "'.value'", "'.lockingBytecode'", "'.tokenCategory'", 
+		"','", "')'", "'require'", "'if'", "'else'", "'console.log'", "'new'", 
+		"'['", "']'", "'tx.outputs'", "'.value'", "'.lockingBytecode'", "'.tokenCategory'", 
 		"'.nftCommitment'", "'.tokenAmount'", "'tx.inputs'", "'.outpointTransactionHash'", 
 		"'.outpointIndex'", "'.unlockingBytecode'", "'.sequenceNumber'", "'.reverse()'", 
 		"'.length'", "'.split'", "'!'", "'-'", "'*'", "'/'", "'%'", "'+'", "'=='", 
@@ -134,10 +132,9 @@ export class CashScriptLexer extends Lexer {
 		undefined, undefined, undefined, undefined, undefined, undefined, undefined, 
 		undefined, undefined, undefined, undefined, undefined, undefined, undefined, 
 		undefined, undefined, undefined, undefined, undefined, undefined, undefined, 
-		undefined, undefined, undefined, undefined, "VersionLiteral", "BooleanLiteral", 
-		"NumberUnit", "NumberLiteral", "Bytes", "Bound", "StringLiteral", "DateLiteral", 
-		"HexLiteral", "TxVar", "NullaryOp", "Identifier", "WHITESPACE", "COMMENT", 
-		"LINE_COMMENT",
+		undefined, undefined, "VersionLiteral", "BooleanLiteral", "NumberUnit", 
+		"NumberLiteral", "Bytes", "Bound", "StringLiteral", "DateLiteral", "HexLiteral", 
+		"TxVar", "NullaryOp", "Identifier", "WHITESPACE", "COMMENT", "LINE_COMMENT",
 	];
 	public static readonly VOCABULARY: Vocabulary = new VocabularyImpl(CashScriptLexer._LITERAL_NAMES, CashScriptLexer._SYMBOLIC_NAMES, []);
 
@@ -171,7 +168,7 @@ export class CashScriptLexer extends Lexer {
 
 	private static readonly _serializedATNSegments: number = 2;
 	private static readonly _serializedATNSegment0: string =
-		"\x03\uC91D\uCABA\u058D\uAFBA\u4F53\u0607\uEA8B\uC241\x02L\u0340\b\x01" +
+		"\x03\uC91D\uCABA\u058D\uAFBA\u4F53\u0607\uEA8B\uC241\x02J\u0336\b\x01" +
 		"\x04\x02\t\x02\x04\x03\t\x03\x04\x04\t\x04\x04\x05\t\x05\x04\x06\t\x06" +
 		"\x04\x07\t\x07\x04\b\t\b\x04\t\t\t\x04\n\t\n\x04\v\t\v\x04\f\t\f\x04\r" +
 		"\t\r\x04\x0E\t\x0E\x04\x0F\t\x0F\x04\x10\t\x10\x04\x11\t\x11\x04\x12\t" +
@@ -182,379 +179,375 @@ export class CashScriptLexer extends Lexer {
 		"+\t+\x04,\t,\x04-\t-\x04.\t.\x04/\t/\x040\t0\x041\t1\x042\t2\x043\t3\x04" +
 		"4\t4\x045\t5\x046\t6\x047\t7\x048\t8\x049\t9\x04:\t:\x04;\t;\x04<\t<\x04" +
 		"=\t=\x04>\t>\x04?\t?\x04@\t@\x04A\tA\x04B\tB\x04C\tC\x04D\tD\x04E\tE\x04" +
-		"F\tF\x04G\tG\x04H\tH\x04I\tI\x04J\tJ\x04K\tK\x03\x02\x03\x02\x03\x02\x03" +
-		"\x02\x03\x02\x03\x02\x03\x02\x03\x03\x03\x03\x03\x04\x03\x04\x03\x04\x03" +
-		"\x04\x03\x04\x03\x04\x03\x04\x03\x04\x03\x04\x03\x04\x03\x04\x03\x05\x03" +
-		"\x05\x03\x06\x03\x06\x03\x07\x03\x07\x03\x07\x03\b\x03\b\x03\t\x03\t\x03" +
-		"\n\x03\n\x03\n\x03\v\x03\v\x03\f\x03\f\x03\f\x03\f\x03\f\x03\f\x03\f\x03" +
-		"\f\x03\f\x03\r\x03\r\x03\x0E\x03\x0E\x03\x0F\x03\x0F\x03\x0F\x03\x0F\x03" +
-		"\x0F\x03\x0F\x03\x0F\x03\x0F\x03\x0F\x03\x10\x03\x10\x03\x11\x03\x11\x03" +
-		"\x12\x03\x12\x03\x13\x03\x13\x03\x13\x03\x13\x03\x13\x03\x13\x03\x13\x03" +
-		"\x13\x03\x14\x03\x14\x03\x14\x03\x15\x03\x15\x03\x15\x03\x15\x03\x15\x03" +
-		"\x16\x03\x16\x03\x16\x03\x16\x03\x17\x03\x17\x03\x18\x03\x18\x03\x19\x03" +
-		"\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x1A\x03" +
-		"\x1A\x03\x1A\x03\x1A\x03\x1B\x03\x1B\x03\x1B\x03\x1B\x03\x1B\x03\x1C\x03" +
-		"\x1C\x03\x1C\x03\x1C\x03\x1C\x03\x1C\x03\x1C\x03\x1C\x03\x1C\x03\x1C\x03" +
-		"\x1C\x03\x1D\x03\x1D\x03\x1D\x03\x1D\x03\x1D\x03\x1D\x03\x1D\x03\x1E\x03" +
-		"\x1E\x03\x1E\x03\x1E\x03\x1E\x03\x1E\x03\x1E\x03\x1E\x03\x1E\x03\x1E\x03" +
-		"\x1E\x03\x1E\x03\x1E\x03\x1E\x03\x1E\x03\x1E\x03\x1E\x03\x1F\x03\x1F\x03" +
-		"\x1F\x03\x1F\x03\x1F\x03\x1F\x03\x1F\x03\x1F\x03\x1F\x03\x1F\x03\x1F\x03" +
-		"\x1F\x03\x1F\x03\x1F\x03\x1F\x03 \x03 \x03 \x03 \x03 \x03 \x03 \x03 \x03" +
-		" \x03 \x03 \x03 \x03 \x03 \x03 \x03!\x03!\x03!\x03!\x03!\x03!\x03!\x03" +
-		"!\x03!\x03!\x03!\x03!\x03!\x03\"\x03\"\x03\"\x03\"\x03\"\x03\"\x03\"\x03" +
-		"\"\x03\"\x03\"\x03#\x03#\x03#\x03#\x03#\x03#\x03#\x03#\x03#\x03#\x03#" +
-		"\x03#\x03#\x03#\x03#\x03#\x03#\x03#\x03#\x03#\x03#\x03#\x03#\x03#\x03" +
-		"#\x03$\x03$\x03$\x03$\x03$\x03$\x03$\x03$\x03$\x03$\x03$\x03$\x03$\x03" +
-		"$\x03$\x03%\x03%\x03%\x03%\x03%\x03%\x03%\x03%\x03%\x03%\x03%\x03%\x03" +
-		"%\x03%\x03%\x03%\x03%\x03%\x03%\x03&\x03&\x03&\x03&\x03&\x03&\x03&\x03" +
-		"&\x03&\x03&\x03&\x03&\x03&\x03&\x03&\x03&\x03\'\x03\'\x03\'\x03\'\x03" +
-		"\'\x03\'\x03\'\x03\'\x03\'\x03\'\x03\'\x03(\x03(\x03(\x03(\x03(\x03(\x03" +
-		"(\x03(\x03)\x03)\x03)\x03)\x03)\x03)\x03)\x03*\x03*\x03+\x03+\x03,\x03" +
-		",\x03-\x03-\x03.\x03.\x03/\x03/\x030\x030\x030\x031\x031\x031\x032\x03" +
-		"2\x033\x033\x034\x034\x034\x035\x035\x035\x036\x036\x036\x036\x036\x03" +
-		"6\x036\x036\x036\x037\x037\x037\x037\x038\x038\x038\x038\x038\x039\x03" +
-		"9\x039\x039\x039\x039\x039\x03:\x03:\x03:\x03:\x03:\x03:\x03:\x03;\x03" +
-		";\x03;\x03;\x03<\x03<\x03<\x03<\x03<\x03<\x03<\x03<\x03=\x06=\u0208\n" +
-		"=\r=\x0E=\u0209\x03=\x03=\x06=\u020E\n=\r=\x0E=\u020F\x03=\x03=\x06=\u0214" +
-		"\n=\r=\x0E=\u0215\x03>\x03>\x03>\x03>\x03>\x03>\x03>\x03>\x03>\x05>\u0221" +
-		"\n>\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03" +
-		"?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03" +
-		"?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03" +
-		"?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03" +
-		"?\x03?\x05?\u025C\n?\x03@\x05@\u025F\n@\x03@\x06@\u0262\n@\r@\x0E@\u0263" +
-		"\x03@\x03@\x06@\u0268\n@\r@\x0E@\u0269\x05@\u026C\n@\x03A\x03A\x03A\x03" +
-		"A\x03A\x03A\x03A\x05A\u0275\nA\x03A\x03A\x03A\x03A\x05A\u027B\nA\x03B" +
-		"\x03B\x07B\u027F\nB\fB\x0EB\u0282\vB\x03C\x03C\x03C\x03C\x07C\u0288\n" +
-		"C\fC\x0EC\u028B\vC\x03C\x03C\x03C\x03C\x03C\x07C\u0292\nC\fC\x0EC\u0295" +
-		"\vC\x03C\x05C\u0298\nC\x03D\x03D\x03D\x03D\x03D\x03D\x03D\x03D\x03D\x03" +
-		"E\x03E\x03E\x07E\u02A6\nE\fE\x0EE\u02A9\vE\x03F\x03F\x03F\x03F\x03F\x03" +
-		"F\x03F\x03F\x03F\x03F\x03F\x03F\x03F\x05F\u02B8\nF\x03G\x03G\x03G\x03" +
-		"G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03" +
-		"G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03" +
-		"G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03" +
-		"G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03" +
-		"G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03" +
-		"G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03G\x03" +
-		"G\x03G\x03G\x03G\x03G\x03G\x03G\x05G\u0318\nG\x03H\x03H\x07H\u031C\nH" +
-		"\fH\x0EH\u031F\vH\x03I\x06I\u0322\nI\rI\x0EI\u0323\x03I\x03I\x03J\x03" +
-		"J\x03J\x03J\x07J\u032C\nJ\fJ\x0EJ\u032F\vJ\x03J\x03J\x03J\x03J\x03J\x03" +
-		"K\x03K\x03K\x03K\x07K\u033A\nK\fK\x0EK\u033D\vK\x03K\x03K\x05\u0289\u0293" +
-		"\u032D\x02\x02L\x03\x02\x03\x05\x02\x04\x07\x02\x05\t\x02\x06\v\x02\x07" +
-		"\r\x02\b\x0F\x02\t\x11\x02\n\x13\x02\v\x15\x02\f\x17\x02\r\x19\x02\x0E" +
-		"\x1B\x02\x0F\x1D\x02\x10\x1F\x02\x11!\x02\x12#\x02\x13%\x02\x14\'\x02" +
-		"\x15)\x02\x16+\x02\x17-\x02\x18/\x02\x191\x02\x1A3\x02\x1B5\x02\x1C7\x02" +
-		"\x1D9\x02\x1E;\x02\x1F=\x02 ?\x02!A\x02\"C\x02#E\x02$G\x02%I\x02&K\x02" +
-		"\'M\x02(O\x02)Q\x02*S\x02+U\x02,W\x02-Y\x02.[\x02/]\x020_\x021a\x022c" +
-		"\x023e\x024g\x025i\x026k\x027m\x028o\x029q\x02:s\x02;u\x02<w\x02=y\x02" +
-		">{\x02?}\x02@\x7F\x02A\x81\x02B\x83\x02C\x85\x02D\x87\x02E\x89\x02F\x8B" +
-		"\x02G\x8D\x02H\x8F\x02I\x91\x02J\x93\x02K\x95\x02L\x03\x02\x0E\x03\x02" +
-		"2;\x03\x02//\x04\x02GGgg\x03\x023;\x05\x02\f\f\x0F\x0F$$\x05\x02\f\f\x0F" +
-		"\x0F))\x04\x02ZZzz\x05\x022;CHch\x04\x02C\\c|\x06\x022;C\\aac|\x05\x02" +
-		"\v\f\x0E\x0F\"\"\x04\x02\f\f\x0F\x0F\x02\u0363\x02\x03\x03\x02\x02\x02" +
-		"\x02\x05\x03\x02\x02\x02\x02\x07\x03\x02\x02\x02\x02\t\x03\x02\x02\x02" +
-		"\x02\v\x03\x02\x02\x02\x02\r\x03\x02\x02\x02\x02\x0F\x03\x02\x02\x02\x02" +
-		"\x11\x03\x02\x02\x02\x02\x13\x03\x02\x02\x02\x02\x15\x03\x02\x02\x02\x02" +
-		"\x17\x03\x02\x02\x02\x02\x19\x03\x02\x02\x02\x02\x1B\x03\x02\x02\x02\x02" +
-		"\x1D\x03\x02\x02\x02\x02\x1F\x03\x02\x02\x02\x02!\x03\x02\x02\x02\x02" +
-		"#\x03\x02\x02\x02\x02%\x03\x02\x02\x02\x02\'\x03\x02\x02\x02\x02)\x03" +
-		"\x02\x02\x02\x02+\x03\x02\x02\x02\x02-\x03\x02\x02\x02\x02/\x03\x02\x02" +
-		"\x02\x021\x03\x02\x02\x02\x023\x03\x02\x02\x02\x025\x03\x02\x02\x02\x02" +
-		"7\x03\x02\x02\x02\x029\x03\x02\x02\x02\x02;\x03\x02\x02\x02\x02=\x03\x02" +
-		"\x02\x02\x02?\x03\x02\x02\x02\x02A\x03\x02\x02\x02\x02C\x03\x02\x02\x02" +
-		"\x02E\x03\x02\x02\x02\x02G\x03\x02\x02\x02\x02I\x03\x02\x02\x02\x02K\x03" +
-		"\x02\x02\x02\x02M\x03\x02\x02\x02\x02O\x03\x02\x02\x02\x02Q\x03\x02\x02" +
-		"\x02\x02S\x03\x02\x02\x02\x02U\x03\x02\x02\x02\x02W\x03\x02\x02\x02\x02" +
-		"Y\x03\x02\x02\x02\x02[\x03\x02\x02\x02\x02]\x03\x02\x02\x02\x02_\x03\x02" +
-		"\x02\x02\x02a\x03\x02\x02\x02\x02c\x03\x02\x02\x02\x02e\x03\x02\x02\x02" +
-		"\x02g\x03\x02\x02\x02\x02i\x03\x02\x02\x02\x02k\x03\x02\x02\x02\x02m\x03" +
-		"\x02\x02\x02\x02o\x03\x02\x02\x02\x02q\x03\x02\x02\x02\x02s\x03\x02\x02" +
-		"\x02\x02u\x03\x02\x02\x02\x02w\x03\x02\x02\x02\x02y\x03\x02\x02\x02\x02" +
-		"{\x03\x02\x02\x02\x02}\x03\x02\x02\x02\x02\x7F\x03\x02\x02\x02\x02\x81" +
-		"\x03\x02\x02\x02\x02\x83\x03\x02\x02\x02\x02\x85\x03\x02\x02\x02\x02\x87" +
-		"\x03\x02\x02\x02\x02\x89\x03\x02\x02\x02\x02\x8B\x03\x02\x02\x02\x02\x8D" +
-		"\x03\x02\x02\x02\x02\x8F\x03\x02\x02\x02\x02\x91\x03\x02\x02\x02\x02\x93" +
-		"\x03\x02\x02\x02\x02\x95\x03\x02\x02\x02\x03\x97\x03\x02\x02\x02\x05\x9E" +
-		"\x03\x02\x02\x02\x07\xA0\x03\x02\x02\x02\t\xAB\x03\x02\x02\x02\v\xAD\x03" +
-		"\x02\x02\x02\r\xAF\x03\x02\x02\x02\x0F\xB2\x03\x02\x02\x02\x11\xB4\x03" +
-		"\x02\x02\x02\x13\xB6\x03\x02\x02\x02\x15\xB9\x03\x02\x02\x02\x17\xBB\x03" +
-		"\x02\x02\x02\x19\xC4\x03\x02\x02\x02\x1B\xC6\x03\x02\x02\x02\x1D\xC8\x03" +
-		"\x02\x02\x02\x1F\xD1\x03\x02\x02\x02!\xD3\x03\x02\x02\x02#\xD5\x03\x02" +
-		"\x02\x02%\xD7\x03\x02\x02\x02\'\xDF\x03\x02\x02\x02)\xE2\x03\x02\x02\x02" +
-		"+\xE7\x03\x02\x02\x02-\xEB\x03\x02\x02\x02/\xED\x03\x02\x02\x021\xEF\x03" +
-		"\x02\x02\x023\xF8\x03\x02\x02\x025\xFC\x03\x02\x02\x027\u0101\x03\x02" +
-		"\x02\x029\u010C\x03\x02\x02\x02;\u0113\x03\x02\x02\x02=\u0124\x03\x02" +
-		"\x02\x02?\u0133\x03\x02\x02\x02A\u0142\x03\x02\x02\x02C\u014F\x03\x02" +
-		"\x02\x02E\u0159\x03\x02\x02\x02G\u0172\x03\x02\x02\x02I\u0181\x03\x02" +
-		"\x02\x02K\u0194\x03\x02\x02\x02M\u01A4\x03\x02\x02\x02O\u01AF\x03\x02" +
-		"\x02\x02Q\u01B7\x03\x02\x02\x02S\u01BE\x03\x02\x02\x02U\u01C0\x03\x02" +
-		"\x02\x02W\u01C2\x03\x02\x02\x02Y\u01C4\x03\x02\x02\x02[\u01C6\x03\x02" +
-		"\x02\x02]\u01C8\x03\x02\x02\x02_\u01CA\x03\x02\x02\x02a\u01CD\x03\x02" +
-		"\x02\x02c\u01D0\x03\x02\x02\x02e\u01D2\x03\x02\x02\x02g\u01D4\x03\x02" +
-		"\x02\x02i\u01D7\x03\x02\x02\x02k\u01DA\x03\x02\x02\x02m\u01E3\x03\x02" +
-		"\x02\x02o\u01E7\x03\x02\x02\x02q\u01EC\x03\x02\x02\x02s\u01F3\x03\x02" +
-		"\x02\x02u\u01FA\x03\x02\x02\x02w\u01FE\x03\x02\x02\x02y\u0207\x03\x02" +
-		"\x02\x02{\u0220\x03\x02\x02\x02}\u025B\x03\x02\x02\x02\x7F\u025E\x03\x02" +
-		"\x02\x02\x81\u027A\x03\x02\x02\x02\x83\u027C\x03\x02\x02\x02\x85\u0297" +
-		"\x03\x02\x02\x02\x87\u0299\x03\x02\x02\x02\x89\u02A2\x03\x02\x02\x02\x8B" +
-		"\u02B7\x03\x02\x02\x02\x8D\u0317\x03\x02\x02\x02\x8F\u0319\x03\x02\x02" +
-		"\x02\x91\u0321\x03\x02\x02\x02\x93\u0327\x03\x02\x02\x02\x95\u0335\x03" +
-		"\x02\x02\x02\x97\x98\x07r\x02\x02\x98\x99\x07t\x02\x02\x99\x9A\x07c\x02" +
-		"\x02\x9A\x9B\x07i\x02\x02\x9B\x9C\x07o\x02\x02\x9C\x9D\x07c\x02\x02\x9D" +
-		"\x04\x03\x02\x02\x02\x9E\x9F\x07=\x02\x02\x9F\x06\x03\x02\x02\x02\xA0" +
-		"\xA1\x07e\x02\x02\xA1\xA2\x07c\x02\x02\xA2\xA3\x07u\x02\x02\xA3\xA4\x07" +
-		"j\x02\x02\xA4\xA5\x07u\x02\x02\xA5\xA6\x07e\x02\x02\xA6\xA7\x07t\x02\x02" +
-		"\xA7\xA8\x07k\x02\x02\xA8\xA9\x07r\x02\x02\xA9\xAA\x07v\x02\x02\xAA\b" +
-		"\x03\x02\x02\x02\xAB\xAC\x07`\x02\x02\xAC\n\x03\x02\x02\x02\xAD\xAE\x07" +
-		"\x80\x02\x02\xAE\f\x03\x02\x02\x02\xAF\xB0\x07@\x02\x02\xB0\xB1\x07?\x02" +
-		"\x02\xB1\x0E\x03\x02\x02\x02\xB2\xB3\x07@\x02\x02\xB3\x10\x03\x02\x02" +
-		"\x02\xB4\xB5\x07>\x02\x02\xB5\x12\x03\x02\x02\x02\xB6\xB7\x07>\x02\x02" +
-		"\xB7\xB8\x07?\x02\x02\xB8\x14\x03\x02\x02\x02\xB9\xBA\x07?\x02\x02\xBA" +
-		"\x16\x03\x02\x02\x02\xBB\xBC\x07e\x02\x02\xBC\xBD\x07q\x02\x02\xBD\xBE" +
-		"\x07p\x02\x02\xBE\xBF\x07v\x02\x02\xBF\xC0\x07t\x02\x02\xC0\xC1\x07c\x02" +
-		"\x02\xC1\xC2\x07e\x02\x02\xC2\xC3\x07v\x02\x02\xC3\x18\x03\x02\x02\x02" +
-		"\xC4\xC5\x07}\x02\x02\xC5\x1A\x03\x02\x02\x02\xC6\xC7\x07\x7F\x02\x02" +
-		"\xC7\x1C\x03\x02\x02\x02\xC8\xC9\x07h\x02\x02\xC9\xCA\x07w\x02\x02\xCA" +
-		"\xCB\x07p\x02\x02\xCB\xCC\x07e\x02\x02\xCC\xCD\x07v\x02\x02\xCD\xCE\x07" +
-		"k\x02\x02\xCE\xCF\x07q\x02\x02\xCF\xD0\x07p\x02\x02\xD0\x1E\x03\x02\x02" +
-		"\x02\xD1\xD2\x07*\x02\x02\xD2 \x03\x02\x02\x02\xD3\xD4\x07.\x02\x02\xD4" +
-		"\"\x03\x02\x02\x02\xD5\xD6\x07+\x02\x02\xD6$\x03\x02\x02\x02\xD7\xD8\x07" +
-		"t\x02\x02\xD8\xD9\x07g\x02\x02\xD9\xDA\x07s\x02\x02\xDA\xDB\x07w\x02\x02" +
-		"\xDB\xDC\x07k\x02\x02\xDC\xDD\x07t\x02\x02\xDD\xDE\x07g\x02\x02\xDE&\x03" +
-		"\x02\x02\x02\xDF\xE0\x07k\x02\x02\xE0\xE1\x07h\x02\x02\xE1(\x03\x02\x02" +
-		"\x02\xE2\xE3\x07g\x02\x02\xE3\xE4\x07n\x02\x02\xE4\xE5\x07u\x02\x02\xE5" +
-		"\xE6\x07g\x02\x02\xE6*\x03\x02\x02\x02\xE7\xE8\x07p\x02\x02\xE8\xE9\x07" +
-		"g\x02\x02\xE9\xEA\x07y\x02\x02\xEA,\x03\x02\x02\x02\xEB\xEC\x07]\x02\x02" +
-		"\xEC.\x03\x02\x02\x02\xED\xEE\x07_\x02\x02\xEE0\x03\x02\x02\x02\xEF\xF0" +
-		"\x07e\x02\x02\xF0\xF1\x07q\x02\x02\xF1\xF2\x07p\x02\x02\xF2\xF3\x07u\x02" +
-		"\x02\xF3\xF4\x07q\x02\x02\xF4\xF5\x07n\x02\x02\xF5\xF6\x07g\x02\x02\xF6" +
-		"\xF7\x070\x02\x02\xF72\x03\x02\x02\x02\xF8\xF9\x07n\x02\x02\xF9\xFA\x07" +
-		"q\x02\x02\xFA\xFB\x07i\x02\x02\xFB4\x03\x02\x02\x02\xFC\xFD\x07y\x02\x02" +
-		"\xFD\xFE\x07c\x02\x02\xFE\xFF\x07t\x02\x02\xFF\u0100\x07p\x02\x02\u0100" +
-		"6\x03\x02\x02\x02\u0101\u0102\x07v\x02\x02\u0102\u0103\x07z\x02\x02\u0103" +
-		"\u0104\x070\x02\x02\u0104\u0105\x07q\x02\x02\u0105\u0106\x07w\x02\x02" +
-		"\u0106\u0107\x07v\x02\x02\u0107\u0108\x07r\x02\x02\u0108\u0109\x07w\x02" +
-		"\x02\u0109\u010A\x07v\x02\x02\u010A\u010B\x07u\x02\x02\u010B8\x03\x02" +
-		"\x02\x02\u010C\u010D\x070\x02\x02\u010D\u010E\x07x\x02\x02\u010E\u010F" +
-		"\x07c\x02\x02\u010F\u0110\x07n\x02\x02\u0110\u0111\x07w\x02\x02\u0111" +
-		"\u0112\x07g\x02\x02\u0112:\x03\x02\x02\x02\u0113\u0114\x070\x02\x02\u0114" +
-		"\u0115\x07n\x02\x02\u0115\u0116\x07q\x02\x02\u0116\u0117\x07e\x02\x02" +
-		"\u0117\u0118\x07m\x02\x02\u0118\u0119\x07k\x02\x02\u0119\u011A\x07p\x02" +
-		"\x02\u011A\u011B\x07i\x02\x02\u011B\u011C\x07D\x02\x02\u011C\u011D\x07" +
-		"{\x02\x02\u011D\u011E\x07v\x02\x02\u011E\u011F\x07g\x02\x02\u011F\u0120" +
-		"\x07e\x02\x02\u0120\u0121\x07q\x02\x02\u0121\u0122\x07f\x02\x02\u0122" +
-		"\u0123\x07g\x02\x02\u0123<\x03\x02\x02\x02\u0124\u0125\x070\x02\x02\u0125" +
-		"\u0126\x07v\x02\x02\u0126\u0127\x07q\x02\x02\u0127\u0128\x07m\x02\x02" +
-		"\u0128\u0129\x07g\x02\x02\u0129\u012A\x07p\x02\x02\u012A\u012B\x07E\x02" +
-		"\x02\u012B\u012C\x07c\x02\x02\u012C\u012D\x07v\x02\x02\u012D\u012E\x07" +
-		"g\x02\x02\u012E\u012F\x07i\x02\x02\u012F\u0130\x07q\x02\x02\u0130\u0131" +
-		"\x07t\x02\x02\u0131\u0132\x07{\x02\x02\u0132>\x03\x02\x02\x02\u0133\u0134" +
-		"\x070\x02\x02\u0134\u0135\x07p\x02\x02\u0135\u0136\x07h\x02\x02\u0136" +
-		"\u0137\x07v\x02\x02\u0137\u0138\x07E\x02\x02\u0138\u0139\x07q\x02\x02" +
-		"\u0139\u013A\x07o\x02\x02\u013A\u013B\x07o\x02\x02\u013B\u013C\x07k\x02" +
-		"\x02\u013C\u013D\x07v\x02\x02\u013D\u013E\x07o\x02\x02\u013E\u013F\x07" +
-		"g\x02\x02\u013F\u0140\x07p\x02\x02\u0140\u0141\x07v\x02\x02\u0141@\x03" +
-		"\x02\x02\x02\u0142\u0143\x070\x02\x02\u0143\u0144\x07v\x02\x02\u0144\u0145" +
-		"\x07q\x02\x02\u0145\u0146\x07m\x02\x02\u0146\u0147\x07g\x02\x02\u0147" +
-		"\u0148\x07p\x02\x02\u0148\u0149\x07C\x02\x02\u0149\u014A\x07o\x02\x02" +
-		"\u014A\u014B\x07q\x02\x02\u014B\u014C\x07w\x02\x02\u014C\u014D\x07p\x02" +
-		"\x02\u014D\u014E\x07v\x02\x02\u014EB\x03\x02\x02\x02\u014F\u0150\x07v" +
-		"\x02\x02\u0150\u0151\x07z\x02\x02\u0151\u0152\x070\x02\x02\u0152\u0153" +
-		"\x07k\x02\x02\u0153\u0154\x07p\x02\x02\u0154\u0155\x07r\x02\x02\u0155" +
-		"\u0156\x07w\x02\x02\u0156\u0157\x07v\x02\x02\u0157\u0158\x07u\x02\x02" +
-		"\u0158D\x03\x02\x02\x02\u0159\u015A\x070\x02\x02\u015A\u015B\x07q\x02" +
-		"\x02\u015B\u015C\x07w\x02\x02\u015C\u015D\x07v\x02\x02\u015D\u015E\x07" +
-		"r\x02\x02\u015E\u015F\x07q\x02\x02\u015F\u0160\x07k\x02\x02\u0160\u0161" +
-		"\x07p\x02\x02\u0161\u0162\x07v\x02\x02\u0162\u0163\x07V\x02\x02\u0163" +
-		"\u0164\x07t\x02\x02\u0164\u0165\x07c\x02\x02\u0165\u0166\x07p\x02\x02" +
-		"\u0166\u0167\x07u\x02\x02\u0167\u0168\x07c\x02\x02\u0168\u0169\x07e\x02" +
-		"\x02\u0169\u016A\x07v\x02\x02\u016A\u016B\x07k\x02\x02\u016B\u016C\x07" +
-		"q\x02\x02\u016C\u016D\x07p\x02\x02\u016D\u016E\x07J\x02\x02\u016E\u016F" +
-		"\x07c\x02\x02\u016F\u0170\x07u\x02\x02\u0170\u0171\x07j\x02\x02\u0171" +
-		"F\x03\x02\x02\x02\u0172\u0173\x070\x02\x02\u0173\u0174\x07q\x02\x02\u0174" +
-		"\u0175\x07w\x02\x02\u0175\u0176\x07v\x02\x02\u0176\u0177\x07r\x02\x02" +
-		"\u0177\u0178\x07q\x02\x02\u0178\u0179\x07k\x02\x02\u0179\u017A\x07p\x02" +
-		"\x02\u017A\u017B\x07v\x02\x02\u017B\u017C\x07K\x02\x02\u017C\u017D\x07" +
-		"p\x02\x02\u017D\u017E\x07f\x02\x02\u017E\u017F\x07g\x02\x02\u017F\u0180" +
-		"\x07z\x02\x02\u0180H\x03\x02\x02\x02\u0181\u0182\x070\x02\x02\u0182\u0183" +
-		"\x07w\x02\x02\u0183\u0184\x07p\x02\x02\u0184\u0185\x07n\x02\x02\u0185" +
-		"\u0186\x07q\x02\x02\u0186\u0187\x07e\x02\x02\u0187\u0188\x07m\x02\x02" +
-		"\u0188\u0189\x07k\x02\x02\u0189\u018A\x07p\x02\x02\u018A\u018B\x07i\x02" +
-		"\x02\u018B\u018C\x07D\x02\x02\u018C\u018D\x07{\x02\x02\u018D\u018E\x07" +
-		"v\x02\x02\u018E\u018F\x07g\x02\x02\u018F\u0190\x07e\x02\x02\u0190\u0191" +
-		"\x07q\x02\x02\u0191\u0192\x07f\x02\x02\u0192\u0193\x07g\x02\x02\u0193" +
-		"J\x03\x02\x02\x02\u0194\u0195\x070\x02\x02\u0195\u0196\x07u\x02\x02\u0196" +
-		"\u0197\x07g\x02\x02\u0197\u0198\x07s\x02\x02\u0198\u0199\x07w\x02\x02" +
-		"\u0199\u019A\x07g\x02\x02\u019A\u019B\x07p\x02\x02\u019B\u019C\x07e\x02" +
-		"\x02\u019C\u019D\x07g\x02\x02\u019D\u019E\x07P\x02\x02\u019E\u019F\x07" +
-		"w\x02\x02\u019F\u01A0\x07o\x02\x02\u01A0\u01A1\x07d\x02\x02\u01A1\u01A2" +
-		"\x07g\x02\x02\u01A2\u01A3\x07t\x02\x02\u01A3L\x03\x02\x02\x02\u01A4\u01A5" +
-		"\x070\x02\x02\u01A5\u01A6\x07t\x02\x02\u01A6\u01A7\x07g\x02\x02\u01A7" +
-		"\u01A8\x07x\x02\x02\u01A8\u01A9\x07g\x02\x02\u01A9\u01AA\x07t\x02\x02" +
-		"\u01AA\u01AB\x07u\x02\x02\u01AB\u01AC\x07g\x02\x02\u01AC\u01AD\x07*\x02" +
-		"\x02\u01AD\u01AE\x07+\x02\x02\u01AEN\x03\x02\x02\x02\u01AF\u01B0\x070" +
-		"\x02\x02\u01B0\u01B1\x07n\x02\x02\u01B1\u01B2\x07g\x02\x02\u01B2\u01B3" +
-		"\x07p\x02\x02\u01B3\u01B4\x07i\x02\x02\u01B4\u01B5\x07v\x02\x02\u01B5" +
-		"\u01B6\x07j\x02\x02\u01B6P\x03\x02\x02\x02\u01B7\u01B8\x070\x02\x02\u01B8" +
-		"\u01B9\x07u\x02\x02\u01B9\u01BA\x07r\x02\x02\u01BA\u01BB\x07n\x02\x02" +
-		"\u01BB\u01BC\x07k\x02\x02\u01BC\u01BD\x07v\x02\x02\u01BDR\x03\x02\x02" +
-		"\x02\u01BE\u01BF\x07#\x02\x02\u01BFT\x03\x02\x02\x02\u01C0\u01C1\x07/" +
-		"\x02\x02\u01C1V\x03\x02\x02\x02\u01C2\u01C3\x07,\x02\x02\u01C3X\x03\x02" +
-		"\x02\x02\u01C4\u01C5\x071\x02\x02\u01C5Z\x03\x02\x02\x02\u01C6\u01C7\x07" +
-		"\'\x02\x02\u01C7\\\x03\x02\x02\x02\u01C8\u01C9\x07-\x02\x02\u01C9^\x03" +
-		"\x02\x02\x02\u01CA\u01CB\x07?\x02\x02\u01CB\u01CC\x07?\x02\x02\u01CC`" +
-		"\x03\x02\x02\x02\u01CD\u01CE\x07#\x02\x02\u01CE\u01CF\x07?\x02\x02\u01CF" +
-		"b\x03\x02\x02\x02\u01D0\u01D1\x07(\x02\x02\u01D1d\x03\x02\x02\x02\u01D2" +
-		"\u01D3\x07~\x02\x02\u01D3f\x03\x02\x02\x02\u01D4\u01D5\x07(\x02\x02\u01D5" +
-		"\u01D6\x07(\x02\x02\u01D6h\x03\x02\x02\x02\u01D7\u01D8\x07~\x02\x02\u01D8" +
-		"\u01D9\x07~\x02\x02\u01D9j\x03\x02\x02\x02\u01DA\u01DB\x07e\x02\x02\u01DB" +
-		"\u01DC\x07q\x02\x02\u01DC\u01DD\x07p\x02\x02\u01DD\u01DE\x07u\x02\x02" +
-		"\u01DE\u01DF\x07v\x02\x02\u01DF\u01E0\x07c\x02\x02\u01E0\u01E1\x07p\x02" +
-		"\x02\u01E1\u01E2\x07v\x02\x02\u01E2l\x03\x02\x02\x02\u01E3\u01E4\x07k" +
-		"\x02\x02\u01E4\u01E5\x07p\x02\x02\u01E5\u01E6\x07v\x02\x02\u01E6n\x03" +
-		"\x02\x02\x02\u01E7\u01E8\x07d\x02\x02\u01E8\u01E9\x07q\x02\x02\u01E9\u01EA" +
-		"\x07q\x02\x02\u01EA\u01EB\x07n\x02\x02\u01EBp\x03\x02\x02\x02\u01EC\u01ED" +
-		"\x07u\x02\x02\u01ED\u01EE\x07v\x02\x02\u01EE\u01EF\x07t\x02\x02\u01EF" +
-		"\u01F0\x07k\x02\x02\u01F0\u01F1\x07p\x02\x02\u01F1\u01F2\x07i\x02\x02" +
-		"\u01F2r\x03\x02\x02\x02\u01F3\u01F4\x07r\x02";
+		"F\tF\x04G\tG\x04H\tH\x04I\tI\x03\x02\x03\x02\x03\x02\x03\x02\x03\x02\x03" +
+		"\x02\x03\x02\x03\x03\x03\x03\x03\x04\x03\x04\x03\x04\x03\x04\x03\x04\x03" +
+		"\x04\x03\x04\x03\x04\x03\x04\x03\x04\x03\x04\x03\x05\x03\x05\x03\x06\x03" +
+		"\x06\x03\x07\x03\x07\x03\x07\x03\b\x03\b\x03\t\x03\t\x03\n\x03\n\x03\n" +
+		"\x03\v\x03\v\x03\f\x03\f\x03\f\x03\f\x03\f\x03\f\x03\f\x03\f\x03\f\x03" +
+		"\r\x03\r\x03\x0E\x03\x0E\x03\x0F\x03\x0F\x03\x0F\x03\x0F\x03\x0F\x03\x0F" +
+		"\x03\x0F\x03\x0F\x03\x0F\x03\x10\x03\x10\x03\x11\x03\x11\x03\x12\x03\x12" +
+		"\x03\x13\x03\x13\x03\x13\x03\x13\x03\x13\x03\x13\x03\x13\x03\x13\x03\x14" +
+		"\x03\x14\x03\x14\x03\x15\x03\x15\x03\x15\x03\x15\x03\x15\x03\x16\x03\x16" +
+		"\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16" +
+		"\x03\x16\x03\x17\x03\x17\x03\x17\x03\x17\x03\x18\x03\x18\x03\x19\x03\x19" +
+		"\x03\x1A\x03\x1A\x03\x1A\x03\x1A\x03\x1A\x03\x1A\x03\x1A\x03\x1A\x03\x1A" +
+		"\x03\x1A\x03\x1A\x03\x1B\x03\x1B\x03\x1B\x03\x1B\x03\x1B\x03\x1B\x03\x1B" +
+		"\x03\x1C\x03\x1C\x03\x1C\x03\x1C\x03\x1C\x03\x1C\x03\x1C\x03\x1C\x03\x1C" +
+		"\x03\x1C\x03\x1C\x03\x1C\x03\x1C\x03\x1C\x03\x1C\x03\x1C\x03\x1C\x03\x1D" +
+		"\x03\x1D\x03\x1D\x03\x1D\x03\x1D\x03\x1D\x03\x1D\x03\x1D\x03\x1D\x03\x1D" +
+		"\x03\x1D\x03\x1D\x03\x1D\x03\x1D\x03\x1D\x03\x1E\x03\x1E\x03\x1E\x03\x1E" +
+		"\x03\x1E\x03\x1E\x03\x1E\x03\x1E\x03\x1E\x03\x1E\x03\x1E\x03\x1E\x03\x1E" +
+		"\x03\x1E\x03\x1E\x03\x1F\x03\x1F\x03\x1F\x03\x1F\x03\x1F\x03\x1F\x03\x1F" +
+		"\x03\x1F\x03\x1F\x03\x1F\x03\x1F\x03\x1F\x03\x1F\x03 \x03 \x03 \x03 \x03" +
+		" \x03 \x03 \x03 \x03 \x03 \x03!\x03!\x03!\x03!\x03!\x03!\x03!\x03!\x03" +
+		"!\x03!\x03!\x03!\x03!\x03!\x03!\x03!\x03!\x03!\x03!\x03!\x03!\x03!\x03" +
+		"!\x03!\x03!\x03\"\x03\"\x03\"\x03\"\x03\"\x03\"\x03\"\x03\"\x03\"\x03" +
+		"\"\x03\"\x03\"\x03\"\x03\"\x03\"\x03#\x03#\x03#\x03#\x03#\x03#\x03#\x03" +
+		"#\x03#\x03#\x03#\x03#\x03#\x03#\x03#\x03#\x03#\x03#\x03#\x03$\x03$\x03" +
+		"$\x03$\x03$\x03$\x03$\x03$\x03$\x03$\x03$\x03$\x03$\x03$\x03$\x03$\x03" +
+		"%\x03%\x03%\x03%\x03%\x03%\x03%\x03%\x03%\x03%\x03%\x03&\x03&\x03&\x03" +
+		"&\x03&\x03&\x03&\x03&\x03\'\x03\'\x03\'\x03\'\x03\'\x03\'\x03\'\x03(\x03" +
+		"(\x03)\x03)\x03*\x03*\x03+\x03+\x03,\x03,\x03-\x03-\x03.\x03.\x03.\x03" +
+		"/\x03/\x03/\x030\x030\x031\x031\x032\x032\x032\x033\x033\x033\x034\x03" +
+		"4\x034\x034\x034\x034\x034\x034\x034\x035\x035\x035\x035\x036\x036\x03" +
+		"6\x036\x036\x037\x037\x037\x037\x037\x037\x037\x038\x038\x038\x038\x03" +
+		"8\x038\x038\x039\x039\x039\x039\x03:\x03:\x03:\x03:\x03:\x03:\x03:\x03" +
+		":\x03;\x06;\u01FE\n;\r;\x0E;\u01FF\x03;\x03;\x06;\u0204\n;\r;\x0E;\u0205" +
+		"\x03;\x03;\x06;\u020A\n;\r;\x0E;\u020B\x03<\x03<\x03<\x03<\x03<\x03<\x03" +
+		"<\x03<\x03<\x05<\u0217\n<\x03=\x03=\x03=\x03=\x03=\x03=\x03=\x03=\x03" +
+		"=\x03=\x03=\x03=\x03=\x03=\x03=\x03=\x03=\x03=\x03=\x03=\x03=\x03=\x03" +
+		"=\x03=\x03=\x03=\x03=\x03=\x03=\x03=\x03=\x03=\x03=\x03=\x03=\x03=\x03" +
+		"=\x03=\x03=\x03=\x03=\x03=\x03=\x03=\x03=\x03=\x03=\x03=\x03=\x03=\x03" +
+		"=\x03=\x03=\x03=\x03=\x03=\x03=\x05=\u0252\n=\x03>\x05>\u0255\n>\x03>" +
+		"\x06>\u0258\n>\r>\x0E>\u0259\x03>\x03>\x06>\u025E\n>\r>\x0E>\u025F\x05" +
+		">\u0262\n>\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x05?\u026B\n?\x03?\x03?" +
+		"\x03?\x03?\x05?\u0271\n?\x03@\x03@\x07@\u0275\n@\f@\x0E@\u0278\v@\x03" +
+		"A\x03A\x03A\x03A\x07A\u027E\nA\fA\x0EA\u0281\vA\x03A\x03A\x03A\x03A\x03" +
+		"A\x07A\u0288\nA\fA\x0EA\u028B\vA\x03A\x05A\u028E\nA\x03B\x03B\x03B\x03" +
+		"B\x03B\x03B\x03B\x03B\x03B\x03C\x03C\x03C\x07C\u029C\nC\fC\x0EC\u029F" +
+		"\vC\x03D\x03D\x03D\x03D\x03D\x03D\x03D\x03D\x03D\x03D\x03D\x03D\x03D\x05" +
+		"D\u02AE\nD\x03E\x03E\x03E\x03E\x03E\x03E\x03E\x03E\x03E\x03E\x03E\x03" +
+		"E\x03E\x03E\x03E\x03E\x03E\x03E\x03E\x03E\x03E\x03E\x03E\x03E\x03E\x03" +
+		"E\x03E\x03E\x03E\x03E\x03E\x03E\x03E\x03E\x03E\x03E\x03E\x03E\x03E\x03" +
+		"E\x03E\x03E\x03E\x03E\x03E\x03E\x03E\x03E\x03E\x03E\x03E\x03E\x03E\x03" +
+		"E\x03E\x03E\x03E\x03E\x03E\x03E\x03E\x03E\x03E\x03E\x03E\x03E\x03E\x03" +
+		"E\x03E\x03E\x03E\x03E\x03E\x03E\x03E\x03E\x03E\x03E\x03E\x03E\x03E\x03" +
+		"E\x03E\x03E\x03E\x03E\x03E\x03E\x03E\x03E\x03E\x03E\x03E\x03E\x05E\u030E" +
+		"\nE\x03F\x03F\x07F\u0312\nF\fF\x0EF\u0315\vF\x03G\x06G\u0318\nG\rG\x0E" +
+		"G\u0319\x03G\x03G\x03H\x03H\x03H\x03H\x07H\u0322\nH\fH\x0EH\u0325\vH\x03" +
+		"H\x03H\x03H\x03H\x03H\x03I\x03I\x03I\x03I\x07I\u0330\nI\fI\x0EI\u0333" +
+		"\vI\x03I\x03I\x05\u027F\u0289\u0323\x02\x02J\x03\x02\x03\x05\x02\x04\x07" +
+		"\x02\x05\t\x02\x06\v\x02\x07\r\x02\b\x0F\x02\t\x11\x02\n\x13\x02\v\x15" +
+		"\x02\f\x17\x02\r\x19\x02\x0E\x1B\x02\x0F\x1D\x02\x10\x1F\x02\x11!\x02" +
+		"\x12#\x02\x13%\x02\x14\'\x02\x15)\x02\x16+\x02\x17-\x02\x18/\x02\x191" +
+		"\x02\x1A3\x02\x1B5\x02\x1C7\x02\x1D9\x02\x1E;\x02\x1F=\x02 ?\x02!A\x02" +
+		"\"C\x02#E\x02$G\x02%I\x02&K\x02\'M\x02(O\x02)Q\x02*S\x02+U\x02,W\x02-" +
+		"Y\x02.[\x02/]\x020_\x021a\x022c\x023e\x024g\x025i\x026k\x027m\x028o\x02" +
+		"9q\x02:s\x02;u\x02<w\x02=y\x02>{\x02?}\x02@\x7F\x02A\x81\x02B\x83\x02" +
+		"C\x85\x02D\x87\x02E\x89\x02F\x8B\x02G\x8D\x02H\x8F\x02I\x91\x02J\x03\x02" +
+		"\x0E\x03\x022;\x03\x02//\x04\x02GGgg\x03\x023;\x05\x02\f\f\x0F\x0F$$\x05" +
+		"\x02\f\f\x0F\x0F))\x04\x02ZZzz\x05\x022;CHch\x04\x02C\\c|\x06\x022;C\\" +
+		"aac|\x05\x02\v\f\x0E\x0F\"\"\x04\x02\f\f\x0F\x0F\x02\u0359\x02\x03\x03" +
+		"\x02\x02\x02\x02\x05\x03\x02\x02\x02\x02\x07\x03\x02\x02\x02\x02\t\x03" +
+		"\x02\x02\x02\x02\v\x03\x02\x02\x02\x02\r\x03\x02\x02\x02\x02\x0F\x03\x02" +
+		"\x02\x02\x02\x11\x03\x02\x02\x02\x02\x13\x03\x02\x02\x02\x02\x15\x03\x02" +
+		"\x02\x02\x02\x17\x03\x02\x02\x02\x02\x19\x03\x02\x02\x02\x02\x1B\x03\x02" +
+		"\x02\x02\x02\x1D\x03\x02\x02\x02\x02\x1F\x03\x02\x02\x02\x02!\x03\x02" +
+		"\x02\x02\x02#\x03\x02\x02\x02\x02%\x03\x02\x02\x02\x02\'\x03\x02\x02\x02" +
+		"\x02)\x03\x02\x02\x02\x02+\x03\x02\x02\x02\x02-\x03\x02\x02\x02\x02/\x03" +
+		"\x02\x02\x02\x021\x03\x02\x02\x02\x023\x03\x02\x02\x02\x025\x03\x02\x02" +
+		"\x02\x027\x03\x02\x02\x02\x029\x03\x02\x02\x02\x02;\x03\x02\x02\x02\x02" +
+		"=\x03\x02\x02\x02\x02?\x03\x02\x02\x02\x02A\x03\x02\x02\x02\x02C\x03\x02" +
+		"\x02\x02\x02E\x03\x02\x02\x02\x02G\x03\x02\x02\x02\x02I\x03\x02\x02\x02" +
+		"\x02K\x03\x02\x02\x02\x02M\x03\x02\x02\x02\x02O\x03\x02\x02\x02\x02Q\x03" +
+		"\x02\x02\x02\x02S\x03\x02\x02\x02\x02U\x03\x02\x02\x02\x02W\x03\x02\x02" +
+		"\x02\x02Y\x03\x02\x02\x02\x02[\x03\x02\x02\x02\x02]\x03\x02\x02\x02\x02" +
+		"_\x03\x02\x02\x02\x02a\x03\x02\x02\x02\x02c\x03\x02\x02\x02\x02e\x03\x02" +
+		"\x02\x02\x02g\x03\x02\x02\x02\x02i\x03\x02\x02\x02\x02k\x03\x02\x02\x02" +
+		"\x02m\x03\x02\x02\x02\x02o\x03\x02\x02\x02\x02q\x03\x02\x02\x02\x02s\x03" +
+		"\x02\x02\x02\x02u\x03\x02\x02\x02\x02w\x03\x02\x02\x02\x02y\x03\x02\x02" +
+		"\x02\x02{\x03\x02\x02\x02\x02}\x03\x02\x02\x02\x02\x7F\x03\x02\x02\x02" +
+		"\x02\x81\x03\x02\x02\x02\x02\x83\x03\x02\x02\x02\x02\x85\x03\x02\x02\x02" +
+		"\x02\x87\x03\x02\x02\x02\x02\x89\x03\x02\x02\x02\x02\x8B\x03\x02\x02\x02" +
+		"\x02\x8D\x03\x02\x02\x02\x02\x8F\x03\x02\x02\x02\x02\x91\x03\x02\x02\x02" +
+		"\x03\x93\x03\x02\x02\x02\x05\x9A\x03\x02\x02\x02\x07\x9C\x03\x02\x02\x02" +
+		"\t\xA7\x03\x02\x02\x02\v\xA9\x03\x02\x02\x02\r\xAB\x03\x02\x02\x02\x0F" +
+		"\xAE\x03\x02\x02\x02\x11\xB0\x03\x02\x02\x02\x13\xB2\x03\x02\x02\x02\x15" +
+		"\xB5\x03\x02\x02\x02\x17\xB7\x03\x02\x02\x02\x19\xC0\x03\x02\x02\x02\x1B" +
+		"\xC2\x03\x02\x02\x02\x1D\xC4\x03\x02\x02\x02\x1F\xCD\x03\x02\x02\x02!" +
+		"\xCF\x03\x02\x02\x02#\xD1\x03\x02\x02\x02%\xD3\x03\x02\x02\x02\'\xDB\x03" +
+		"\x02\x02\x02)\xDE\x03\x02\x02\x02+\xE3\x03\x02\x02\x02-\xEF\x03\x02\x02" +
+		"\x02/\xF3\x03\x02\x02\x021\xF5\x03\x02\x02\x023\xF7\x03\x02\x02\x025\u0102" +
+		"\x03\x02\x02\x027\u0109\x03\x02\x02\x029\u011A\x03\x02\x02\x02;\u0129" +
+		"\x03\x02\x02\x02=\u0138\x03\x02\x02\x02?\u0145\x03\x02\x02\x02A\u014F" +
+		"\x03\x02\x02\x02C\u0168\x03\x02\x02\x02E\u0177\x03\x02\x02\x02G\u018A" +
+		"\x03\x02\x02\x02I\u019A\x03\x02\x02\x02K\u01A5\x03\x02\x02\x02M\u01AD" +
+		"\x03\x02\x02\x02O\u01B4\x03\x02\x02\x02Q\u01B6\x03\x02\x02\x02S\u01B8" +
+		"\x03\x02\x02\x02U\u01BA\x03\x02\x02\x02W\u01BC\x03\x02\x02\x02Y\u01BE" +
+		"\x03\x02\x02\x02[\u01C0\x03\x02\x02\x02]\u01C3\x03\x02\x02\x02_\u01C6" +
+		"\x03\x02\x02\x02a\u01C8\x03\x02\x02\x02c\u01CA\x03\x02\x02\x02e\u01CD" +
+		"\x03\x02\x02\x02g\u01D0\x03\x02\x02\x02i\u01D9\x03\x02\x02\x02k\u01DD" +
+		"\x03\x02\x02\x02m\u01E2\x03\x02\x02\x02o\u01E9\x03\x02\x02\x02q\u01F0" +
+		"\x03\x02\x02\x02s\u01F4\x03\x02\x02\x02u\u01FD\x03\x02\x02\x02w\u0216" +
+		"\x03\x02\x02\x02y\u0251\x03\x02\x02\x02{\u0254\x03\x02\x02\x02}\u0270" +
+		"\x03\x02\x02\x02\x7F\u0272\x03\x02\x02\x02\x81\u028D\x03\x02\x02\x02\x83" +
+		"\u028F\x03\x02\x02\x02\x85\u0298\x03\x02\x02\x02\x87\u02AD\x03\x02\x02" +
+		"\x02\x89\u030D\x03\x02\x02\x02\x8B\u030F\x03\x02\x02\x02\x8D\u0317\x03" +
+		"\x02\x02\x02\x8F\u031D\x03\x02\x02\x02\x91\u032B\x03\x02\x02\x02\x93\x94" +
+		"\x07r\x02\x02\x94\x95\x07t\x02\x02\x95\x96\x07c\x02\x02\x96\x97\x07i\x02" +
+		"\x02\x97\x98\x07o\x02\x02\x98\x99\x07c\x02\x02\x99\x04\x03\x02\x02\x02" +
+		"\x9A\x9B\x07=\x02\x02\x9B\x06\x03\x02\x02\x02\x9C\x9D\x07e\x02\x02\x9D" +
+		"\x9E\x07c\x02\x02\x9E\x9F\x07u\x02\x02\x9F\xA0\x07j\x02\x02\xA0\xA1\x07" +
+		"u\x02\x02\xA1\xA2\x07e\x02\x02\xA2\xA3\x07t\x02\x02\xA3\xA4\x07k\x02\x02" +
+		"\xA4\xA5\x07r\x02\x02\xA5\xA6\x07v\x02\x02\xA6\b\x03\x02\x02\x02\xA7\xA8" +
+		"\x07`\x02\x02\xA8\n\x03\x02\x02\x02\xA9\xAA\x07\x80\x02\x02\xAA\f\x03" +
+		"\x02\x02\x02\xAB\xAC\x07@\x02\x02\xAC\xAD\x07?\x02\x02\xAD\x0E\x03\x02" +
+		"\x02\x02\xAE\xAF\x07@\x02\x02\xAF\x10\x03\x02\x02\x02\xB0\xB1\x07>\x02" +
+		"\x02\xB1\x12\x03\x02\x02\x02\xB2\xB3\x07>\x02\x02\xB3\xB4\x07?\x02\x02" +
+		"\xB4\x14\x03\x02\x02\x02\xB5\xB6\x07?\x02\x02\xB6\x16\x03\x02\x02\x02" +
+		"\xB7\xB8\x07e\x02\x02\xB8\xB9\x07q\x02\x02\xB9\xBA\x07p\x02\x02\xBA\xBB" +
+		"\x07v\x02\x02\xBB\xBC\x07t\x02\x02\xBC\xBD\x07c\x02\x02\xBD\xBE\x07e\x02" +
+		"\x02\xBE\xBF\x07v\x02\x02\xBF\x18\x03\x02\x02\x02\xC0\xC1\x07}\x02\x02" +
+		"\xC1\x1A\x03\x02\x02\x02\xC2\xC3\x07\x7F\x02\x02\xC3\x1C\x03\x02\x02\x02" +
+		"\xC4\xC5\x07h\x02\x02\xC5\xC6\x07w\x02\x02\xC6\xC7\x07p\x02\x02\xC7\xC8" +
+		"\x07e\x02\x02\xC8\xC9\x07v\x02\x02\xC9\xCA\x07k\x02\x02\xCA\xCB\x07q\x02" +
+		"\x02\xCB\xCC\x07p\x02\x02\xCC\x1E\x03\x02\x02\x02\xCD\xCE\x07*\x02\x02" +
+		"\xCE \x03\x02\x02\x02\xCF\xD0\x07.\x02\x02\xD0\"\x03\x02\x02\x02\xD1\xD2" +
+		"\x07+\x02\x02\xD2$\x03\x02\x02\x02\xD3\xD4\x07t\x02\x02\xD4\xD5\x07g\x02" +
+		"\x02\xD5\xD6\x07s\x02\x02\xD6\xD7\x07w\x02\x02\xD7\xD8\x07k\x02\x02\xD8" +
+		"\xD9\x07t\x02\x02\xD9\xDA\x07g\x02\x02\xDA&\x03\x02\x02\x02\xDB\xDC\x07" +
+		"k\x02\x02\xDC\xDD\x07h\x02\x02\xDD(\x03\x02\x02\x02\xDE\xDF\x07g\x02\x02" +
+		"\xDF\xE0\x07n\x02\x02\xE0\xE1\x07u\x02\x02\xE1\xE2\x07g\x02\x02\xE2*\x03" +
+		"\x02\x02\x02\xE3\xE4\x07e\x02\x02\xE4\xE5\x07q\x02\x02\xE5\xE6\x07p\x02" +
+		"\x02\xE6\xE7\x07u\x02\x02\xE7\xE8\x07q\x02\x02\xE8\xE9\x07n\x02\x02\xE9" +
+		"\xEA\x07g\x02\x02\xEA\xEB\x070\x02\x02\xEB\xEC\x07n\x02\x02\xEC\xED\x07" +
+		"q\x02\x02\xED\xEE\x07i\x02\x02\xEE,\x03\x02\x02\x02\xEF\xF0\x07p\x02\x02" +
+		"\xF0\xF1\x07g\x02\x02\xF1\xF2\x07y\x02\x02\xF2.\x03\x02\x02\x02\xF3\xF4" +
+		"\x07]\x02\x02\xF40\x03\x02\x02\x02\xF5\xF6\x07_\x02\x02\xF62\x03\x02\x02" +
+		"\x02\xF7\xF8\x07v\x02\x02\xF8\xF9\x07z\x02\x02\xF9\xFA\x070\x02\x02\xFA" +
+		"\xFB\x07q\x02\x02\xFB\xFC\x07w\x02\x02\xFC\xFD\x07v\x02\x02\xFD\xFE\x07" +
+		"r\x02\x02\xFE\xFF\x07w\x02\x02\xFF\u0100\x07v\x02\x02\u0100\u0101\x07" +
+		"u\x02\x02\u01014\x03\x02\x02\x02\u0102\u0103\x070\x02\x02\u0103\u0104" +
+		"\x07x\x02\x02\u0104\u0105\x07c\x02\x02\u0105\u0106\x07n\x02\x02\u0106" +
+		"\u0107\x07w\x02\x02\u0107\u0108\x07g\x02\x02\u01086\x03\x02\x02\x02\u0109" +
+		"\u010A\x070\x02\x02\u010A\u010B\x07n\x02\x02\u010B\u010C\x07q\x02\x02" +
+		"\u010C\u010D\x07e\x02\x02\u010D\u010E\x07m\x02\x02\u010E\u010F\x07k\x02" +
+		"\x02\u010F\u0110\x07p\x02\x02\u0110\u0111\x07i\x02\x02\u0111\u0112\x07" +
+		"D\x02\x02\u0112\u0113\x07{\x02\x02\u0113\u0114\x07v\x02\x02\u0114\u0115" +
+		"\x07g\x02\x02\u0115\u0116\x07e\x02\x02\u0116\u0117\x07q\x02\x02\u0117" +
+		"\u0118\x07f\x02\x02\u0118\u0119\x07g\x02\x02\u01198\x03\x02\x02\x02\u011A" +
+		"\u011B\x070\x02\x02\u011B\u011C\x07v\x02\x02\u011C\u011D\x07q\x02\x02" +
+		"\u011D\u011E\x07m\x02\x02\u011E\u011F\x07g\x02\x02\u011F\u0120\x07p\x02" +
+		"\x02\u0120\u0121\x07E\x02\x02\u0121\u0122\x07c\x02\x02\u0122\u0123\x07" +
+		"v\x02\x02\u0123\u0124\x07g\x02\x02\u0124\u0125\x07i\x02\x02\u0125\u0126" +
+		"\x07q\x02\x02\u0126\u0127\x07t\x02\x02\u0127\u0128\x07{\x02\x02\u0128" +
+		":\x03\x02\x02\x02\u0129\u012A\x070\x02\x02\u012A\u012B\x07p\x02\x02\u012B" +
+		"\u012C\x07h\x02\x02\u012C\u012D\x07v\x02\x02\u012D\u012E\x07E\x02\x02" +
+		"\u012E\u012F\x07q\x02\x02\u012F\u0130\x07o\x02\x02\u0130\u0131\x07o\x02" +
+		"\x02\u0131\u0132\x07k\x02\x02\u0132\u0133\x07v\x02\x02\u0133\u0134\x07" +
+		"o\x02\x02\u0134\u0135\x07g\x02\x02\u0135\u0136\x07p\x02\x02\u0136\u0137" +
+		"\x07v\x02\x02\u0137<\x03\x02\x02\x02\u0138\u0139\x070\x02\x02\u0139\u013A" +
+		"\x07v\x02\x02\u013A\u013B\x07q\x02\x02\u013B\u013C\x07m\x02\x02\u013C" +
+		"\u013D\x07g\x02\x02\u013D\u013E\x07p\x02\x02\u013E\u013F\x07C\x02\x02" +
+		"\u013F\u0140\x07o\x02\x02\u0140\u0141\x07q\x02\x02\u0141\u0142\x07w\x02" +
+		"\x02\u0142\u0143\x07p\x02\x02\u0143\u0144\x07v\x02\x02\u0144>\x03\x02" +
+		"\x02\x02\u0145\u0146\x07v\x02\x02\u0146\u0147\x07z\x02\x02\u0147\u0148" +
+		"\x070\x02\x02\u0148\u0149\x07k\x02\x02\u0149\u014A\x07p\x02\x02\u014A" +
+		"\u014B\x07r\x02\x02\u014B\u014C\x07w\x02\x02\u014C\u014D\x07v\x02\x02" +
+		"\u014D\u014E\x07u\x02\x02\u014E@\x03\x02\x02\x02\u014F\u0150\x070\x02" +
+		"\x02\u0150\u0151\x07q\x02\x02\u0151\u0152\x07w\x02\x02\u0152\u0153\x07" +
+		"v\x02\x02\u0153\u0154\x07r\x02\x02\u0154\u0155\x07q\x02\x02\u0155\u0156" +
+		"\x07k\x02\x02\u0156\u0157\x07p\x02\x02\u0157\u0158\x07v\x02\x02\u0158" +
+		"\u0159\x07V\x02\x02\u0159\u015A\x07t\x02\x02\u015A\u015B\x07c\x02\x02" +
+		"\u015B\u015C\x07p\x02\x02\u015C\u015D\x07u\x02\x02\u015D\u015E\x07c\x02" +
+		"\x02\u015E\u015F\x07e\x02\x02\u015F\u0160\x07v\x02\x02\u0160\u0161\x07" +
+		"k\x02\x02\u0161\u0162\x07q\x02\x02\u0162\u0163\x07p\x02\x02\u0163\u0164" +
+		"\x07J\x02\x02\u0164\u0165\x07c\x02\x02\u0165\u0166\x07u\x02\x02\u0166" +
+		"\u0167\x07j\x02\x02\u0167B\x03\x02\x02\x02\u0168\u0169\x070\x02\x02\u0169" +
+		"\u016A\x07q\x02\x02\u016A\u016B\x07w\x02\x02\u016B\u016C\x07v\x02\x02" +
+		"\u016C\u016D\x07r\x02\x02\u016D\u016E\x07q\x02\x02\u016E\u016F\x07k\x02" +
+		"\x02\u016F\u0170\x07p\x02\x02\u0170\u0171\x07v\x02\x02\u0171\u0172\x07" +
+		"K\x02\x02\u0172\u0173\x07p\x02\x02\u0173\u0174\x07f\x02\x02\u0174\u0175" +
+		"\x07g\x02\x02\u0175\u0176\x07z\x02\x02\u0176D\x03\x02\x02\x02\u0177\u0178" +
+		"\x070\x02\x02\u0178\u0179\x07w\x02\x02\u0179\u017A\x07p\x02\x02\u017A" +
+		"\u017B\x07n\x02\x02\u017B\u017C\x07q\x02\x02\u017C\u017D\x07e\x02\x02" +
+		"\u017D\u017E\x07m\x02\x02\u017E\u017F\x07k\x02\x02\u017F\u0180\x07p\x02" +
+		"\x02\u0180\u0181\x07i\x02\x02\u0181\u0182\x07D\x02\x02\u0182\u0183\x07" +
+		"{\x02\x02\u0183\u0184\x07v\x02\x02\u0184\u0185\x07g\x02\x02\u0185\u0186" +
+		"\x07e\x02\x02\u0186\u0187\x07q\x02\x02\u0187\u0188\x07f\x02\x02\u0188" +
+		"\u0189\x07g\x02\x02\u0189F\x03\x02\x02\x02\u018A\u018B\x070\x02\x02\u018B" +
+		"\u018C\x07u\x02\x02\u018C\u018D\x07g\x02\x02\u018D\u018E\x07s\x02\x02" +
+		"\u018E\u018F\x07w\x02\x02\u018F\u0190\x07g\x02\x02\u0190\u0191\x07p\x02" +
+		"\x02\u0191\u0192\x07e\x02\x02\u0192\u0193\x07g\x02\x02\u0193\u0194\x07" +
+		"P\x02\x02\u0194\u0195\x07w\x02\x02\u0195\u0196\x07o\x02\x02\u0196\u0197" +
+		"\x07d\x02\x02\u0197\u0198\x07g\x02\x02\u0198\u0199\x07t\x02\x02\u0199" +
+		"H\x03\x02\x02\x02\u019A\u019B\x070\x02\x02\u019B\u019C\x07t\x02\x02\u019C" +
+		"\u019D\x07g\x02\x02\u019D\u019E\x07x\x02\x02\u019E\u019F\x07g\x02\x02" +
+		"\u019F\u01A0\x07t\x02\x02\u01A0\u01A1\x07u\x02\x02\u01A1\u01A2\x07g\x02" +
+		"\x02\u01A2\u01A3\x07*\x02\x02\u01A3\u01A4\x07+\x02\x02\u01A4J\x03\x02" +
+		"\x02\x02\u01A5\u01A6\x070\x02\x02\u01A6\u01A7\x07n\x02\x02\u01A7\u01A8" +
+		"\x07g\x02\x02\u01A8\u01A9\x07p\x02\x02\u01A9\u01AA\x07i\x02\x02\u01AA" +
+		"\u01AB\x07v\x02\x02\u01AB\u01AC\x07j\x02\x02\u01ACL\x03\x02\x02\x02\u01AD" +
+		"\u01AE\x070\x02\x02\u01AE\u01AF\x07u\x02\x02\u01AF\u01B0\x07r\x02\x02" +
+		"\u01B0\u01B1\x07n\x02\x02\u01B1\u01B2\x07k\x02\x02\u01B2\u01B3\x07v\x02" +
+		"\x02\u01B3N\x03\x02\x02\x02\u01B4\u01B5\x07#\x02\x02\u01B5P\x03\x02\x02" +
+		"\x02\u01B6\u01B7\x07/\x02\x02\u01B7R\x03\x02\x02\x02\u01B8\u01B9\x07," +
+		"\x02\x02\u01B9T\x03\x02\x02\x02\u01BA\u01BB\x071\x02\x02\u01BBV\x03\x02" +
+		"\x02\x02\u01BC\u01BD\x07\'\x02\x02\u01BDX\x03\x02\x02\x02\u01BE\u01BF" +
+		"\x07-\x02\x02\u01BFZ\x03\x02\x02\x02\u01C0\u01C1\x07?\x02\x02\u01C1\u01C2" +
+		"\x07?\x02\x02\u01C2\\\x03\x02\x02\x02\u01C3\u01C4\x07#\x02\x02\u01C4\u01C5" +
+		"\x07?\x02\x02\u01C5^\x03\x02\x02\x02\u01C6\u01C7\x07(\x02\x02\u01C7`\x03" +
+		"\x02\x02\x02\u01C8\u01C9\x07~\x02\x02\u01C9b\x03\x02\x02\x02\u01CA\u01CB" +
+		"\x07(\x02\x02\u01CB\u01CC\x07(\x02\x02\u01CCd\x03\x02\x02\x02\u01CD\u01CE" +
+		"\x07~\x02\x02\u01CE\u01CF\x07~\x02\x02\u01CFf\x03\x02\x02\x02\u01D0\u01D1" +
+		"\x07e\x02\x02\u01D1\u01D2\x07q\x02\x02\u01D2\u01D3\x07p\x02\x02\u01D3" +
+		"\u01D4\x07u\x02\x02\u01D4\u01D5\x07v\x02\x02\u01D5\u01D6\x07c\x02\x02" +
+		"\u01D6\u01D7\x07p\x02\x02\u01D7\u01D8\x07v\x02\x02\u01D8h\x03\x02\x02" +
+		"\x02\u01D9\u01DA\x07k\x02\x02\u01DA\u01DB\x07p\x02\x02\u01DB\u01DC\x07" +
+		"v\x02\x02\u01DCj\x03\x02\x02\x02\u01DD\u01DE\x07d\x02\x02\u01DE\u01DF" +
+		"\x07q\x02\x02\u01DF\u01E0\x07q\x02\x02\u01E0\u01E1\x07n\x02\x02\u01E1" +
+		"l\x03\x02\x02\x02\u01E2\u01E3\x07u\x02\x02\u01E3\u01E4\x07v\x02\x02\u01E4" +
+		"\u01E5\x07t\x02\x02\u01E5\u01E6\x07k\x02\x02\u01E6\u01E7\x07p\x02\x02" +
+		"\u01E7\u01E8\x07i\x02\x02\u01E8n\x03\x02\x02\x02\u01E9\u01EA\x07r\x02" +
+		"\x02\u01EA\u01EB\x07w\x02\x02\u01EB\u01EC\x07d\x02\x02\u01EC\u01ED\x07" +
+		"m\x02\x02\u01ED\u01EE\x07g\x02\x02\u01EE\u01EF\x07{\x02\x02\u01EFp\x03" +
+		"\x02\x02\x02\u01F0\u01F1\x07u\x02\x02\u01F1\u01F2\x07k\x02\x02\u01F2\u01F3" +
+		"\x07i\x02\x02\u01F3r\x03\x02\x02\x02\u01F4\u01F5\x07f\x02\x02\u01F5\u01F6" +
+		"\x07c\x02\x02\u01F6\u01F7\x07v\x02\x02\u01F7\u01F8\x07c\x02\x02\u01F8";
 	private static readonly _serializedATNSegment1: string =
-		"\x02\u01F4\u01F5\x07w\x02\x02\u01F5\u01F6\x07d\x02\x02\u01F6\u01F7\x07" +
-		"m\x02\x02\u01F7\u01F8\x07g\x02\x02\u01F8\u01F9\x07{\x02\x02\u01F9t\x03" +
-		"\x02\x02\x02\u01FA\u01FB\x07u\x02\x02\u01FB\u01FC\x07k\x02\x02\u01FC\u01FD" +
-		"\x07i\x02\x02\u01FDv\x03\x02\x02\x02\u01FE\u01FF\x07f\x02\x02\u01FF\u0200" +
-		"\x07c\x02\x02\u0200\u0201\x07v\x02\x02\u0201\u0202\x07c\x02\x02\u0202" +
-		"\u0203\x07u\x02\x02\u0203\u0204\x07k\x02\x02\u0204\u0205\x07i\x02\x02" +
-		"\u0205x\x03\x02\x02\x02\u0206\u0208\t\x02\x02\x02\u0207\u0206\x03\x02" +
-		"\x02\x02\u0208\u0209\x03\x02\x02\x02\u0209\u0207\x03\x02\x02\x02\u0209" +
-		"\u020A\x03\x02\x02\x02\u020A\u020B\x03\x02\x02\x02\u020B\u020D\x070\x02" +
-		"\x02\u020C\u020E\t\x02\x02\x02\u020D\u020C\x03\x02\x02\x02\u020E\u020F" +
-		"\x03\x02\x02\x02\u020F\u020D\x03\x02\x02\x02\u020F\u0210\x03\x02\x02\x02" +
-		"\u0210\u0211\x03\x02\x02\x02\u0211\u0213\x070\x02\x02\u0212\u0214\t\x02" +
-		"\x02\x02\u0213\u0212\x03\x02\x02\x02\u0214\u0215\x03\x02\x02\x02\u0215" +
-		"\u0213\x03\x02\x02\x02\u0215\u0216\x03\x02\x02\x02\u0216z\x03\x02\x02" +
-		"\x02\u0217\u0218\x07v\x02\x02\u0218\u0219\x07t\x02\x02\u0219\u021A\x07" +
-		"w\x02\x02\u021A\u0221\x07g\x02\x02\u021B\u021C\x07h\x02\x02\u021C\u021D" +
-		"\x07c\x02\x02\u021D\u021E\x07n\x02\x02\u021E\u021F\x07u\x02\x02\u021F" +
-		"\u0221\x07g\x02\x02\u0220\u0217\x03\x02\x02\x02\u0220\u021B\x03\x02\x02" +
-		"\x02\u0221|\x03\x02\x02\x02\u0222\u0223\x07u\x02\x02\u0223\u0224\x07c" +
-		"\x02\x02\u0224\u0225\x07v\x02\x02\u0225\u0226\x07q\x02\x02\u0226\u0227" +
-		"\x07u\x02\x02\u0227\u0228\x07j\x02\x02\u0228\u0229\x07k\x02\x02\u0229" +
-		"\u025C\x07u\x02\x02\u022A\u022B\x07u\x02\x02\u022B\u022C\x07c\x02\x02" +
-		"\u022C\u022D\x07v\x02\x02\u022D\u025C\x07u\x02\x02\u022E\u022F\x07h\x02" +
-		"\x02\u022F\u0230\x07k\x02\x02\u0230\u0231\x07p\x02\x02\u0231\u0232\x07" +
-		"p\x02\x02\u0232\u0233\x07g\x02\x02\u0233\u025C\x07{\x02\x02\u0234\u0235" +
-		"\x07d\x02\x02\u0235\u0236\x07k\x02\x02\u0236\u0237\x07v\x02\x02\u0237" +
-		"\u025C\x07u\x02\x02\u0238\u0239\x07d\x02\x02\u0239\u023A\x07k\x02\x02" +
-		"\u023A\u023B\x07v\x02\x02\u023B\u023C\x07e\x02\x02\u023C\u023D\x07q\x02" +
-		"\x02\u023D\u023E\x07k\x02\x02\u023E\u025C\x07p\x02\x02\u023F\u0240\x07" +
-		"u\x02\x02\u0240\u0241\x07g\x02\x02\u0241\u0242\x07e\x02\x02\u0242\u0243" +
-		"\x07q\x02\x02\u0243\u0244\x07p\x02\x02\u0244\u0245\x07f\x02\x02\u0245" +
-		"\u025C\x07u\x02\x02\u0246\u0247\x07o\x02\x02\u0247\u0248\x07k\x02\x02" +
-		"\u0248\u0249\x07p\x02\x02\u0249\u024A\x07w\x02\x02\u024A\u024B\x07v\x02" +
-		"\x02\u024B\u024C\x07g\x02\x02\u024C\u025C\x07u\x02\x02\u024D\u024E\x07" +
-		"j\x02\x02\u024E\u024F\x07q\x02\x02\u024F\u0250\x07w\x02\x02\u0250\u0251" +
-		"\x07t\x02\x02\u0251\u025C\x07u\x02\x02\u0252\u0253\x07f\x02\x02\u0253" +
-		"\u0254\x07c\x02\x02\u0254\u0255\x07{\x02\x02\u0255\u025C\x07u\x02\x02" +
-		"\u0256\u0257\x07y\x02\x02\u0257\u0258\x07g\x02\x02\u0258\u0259\x07g\x02" +
-		"\x02\u0259\u025A\x07m\x02\x02\u025A\u025C\x07u\x02\x02\u025B\u0222\x03" +
-		"\x02\x02\x02\u025B\u022A\x03\x02\x02\x02\u025B\u022E\x03\x02\x02\x02\u025B" +
-		"\u0234\x03\x02\x02\x02\u025B\u0238\x03\x02\x02\x02\u025B\u023F\x03\x02" +
-		"\x02\x02\u025B\u0246\x03\x02\x02\x02\u025B\u024D\x03\x02\x02\x02\u025B" +
-		"\u0252\x03\x02\x02\x02\u025B\u0256\x03\x02\x02\x02\u025C~\x03\x02\x02" +
-		"\x02\u025D\u025F\t\x03\x02\x02\u025E\u025D\x03\x02\x02\x02\u025E\u025F" +
-		"\x03\x02\x02\x02\u025F\u0261\x03\x02\x02\x02\u0260\u0262\t\x02\x02\x02" +
-		"\u0261\u0260\x03\x02\x02\x02\u0262\u0263\x03\x02\x02\x02\u0263\u0261\x03" +
-		"\x02\x02\x02\u0263\u0264\x03\x02\x02\x02\u0264\u026B\x03\x02\x02\x02\u0265" +
-		"\u0267\t\x04\x02\x02\u0266\u0268\t\x02\x02\x02\u0267\u0266\x03\x02\x02" +
-		"\x02\u0268\u0269\x03\x02\x02\x02\u0269\u0267\x03\x02\x02\x02\u0269\u026A" +
-		"\x03\x02\x02\x02\u026A\u026C\x03\x02\x02\x02\u026B\u0265\x03\x02\x02\x02" +
-		"\u026B\u026C\x03\x02\x02\x02\u026C\x80\x03\x02\x02\x02\u026D\u026E\x07" +
-		"d\x02\x02\u026E\u026F\x07{\x02\x02\u026F\u0270\x07v\x02\x02\u0270\u0271" +
-		"\x07g\x02\x02\u0271\u0272\x07u\x02\x02\u0272\u0274\x03\x02\x02\x02\u0273" +
-		"\u0275\x05\x83B\x02\u0274\u0273\x03\x02\x02\x02\u0274\u0275\x03\x02\x02" +
-		"\x02\u0275\u027B\x03\x02\x02\x02\u0276\u0277\x07d\x02\x02\u0277\u0278" +
-		"\x07{\x02\x02\u0278\u0279\x07v\x02\x02\u0279\u027B\x07g\x02\x02\u027A" +
-		"\u026D\x03\x02\x02\x02\u027A\u0276\x03\x02\x02\x02\u027B\x82\x03\x02\x02" +
-		"\x02\u027C\u0280\t\x05\x02\x02\u027D\u027F\t\x02\x02\x02\u027E\u027D\x03" +
-		"\x02\x02\x02\u027F\u0282\x03\x02\x02\x02\u0280\u027E\x03\x02\x02\x02\u0280" +
-		"\u0281\x03\x02\x02\x02\u0281\x84\x03\x02\x02\x02\u0282\u0280\x03\x02\x02" +
-		"\x02\u0283\u0289\x07$\x02\x02\u0284\u0285\x07^\x02\x02\u0285\u0288\x07" +
-		"$\x02\x02\u0286\u0288\n\x06\x02\x02\u0287\u0284\x03\x02\x02\x02\u0287" +
-		"\u0286\x03\x02\x02\x02\u0288\u028B\x03\x02\x02\x02\u0289\u028A\x03\x02" +
-		"\x02\x02\u0289\u0287\x03\x02\x02\x02\u028A\u028C\x03\x02\x02\x02\u028B" +
-		"\u0289\x03\x02\x02\x02\u028C\u0298\x07$\x02\x02\u028D\u0293\x07)\x02\x02" +
-		"\u028E\u028F\x07^\x02\x02\u028F\u0292\x07)\x02\x02\u0290\u0292\n\x07\x02" +
-		"\x02\u0291\u028E\x03\x02\x02\x02\u0291\u0290\x03\x02\x02\x02\u0292\u0295" +
-		"\x03\x02\x02\x02\u0293\u0294\x03\x02\x02\x02\u0293\u0291\x03\x02\x02\x02" +
-		"\u0294\u0296\x03\x02\x02\x02\u0295\u0293\x03\x02\x02\x02\u0296\u0298\x07" +
-		")\x02\x02\u0297\u0283\x03\x02\x02\x02\u0297\u028D\x03\x02\x02\x02\u0298" +
-		"\x86\x03\x02\x02\x02\u0299\u029A\x07f\x02\x02\u029A\u029B\x07c\x02\x02" +
-		"\u029B\u029C\x07v\x02\x02\u029C\u029D\x07g\x02\x02\u029D\u029E\x07*\x02" +
-		"\x02\u029E\u029F\x03\x02\x02\x02\u029F\u02A0\x05\x85C\x02\u02A0\u02A1" +
-		"\x07+\x02\x02\u02A1\x88\x03\x02\x02\x02\u02A2\u02A3\x072\x02\x02\u02A3" +
-		"\u02A7\t\b\x02\x02\u02A4\u02A6\t\t\x02\x02\u02A5\u02A4\x03\x02\x02\x02" +
-		"\u02A6\u02A9\x03\x02\x02\x02\u02A7\u02A5\x03\x02\x02\x02\u02A7\u02A8\x03" +
-		"\x02\x02\x02\u02A8\x8A\x03\x02\x02\x02\u02A9\u02A7\x03\x02\x02\x02\u02AA" +
-		"\u02AB\x07v\x02\x02\u02AB\u02AC\x07z\x02\x02\u02AC\u02AD\x070\x02\x02" +
-		"\u02AD\u02AE\x07c\x02\x02\u02AE\u02AF\x07i\x02\x02\u02AF\u02B8\x07g\x02" +
-		"\x02\u02B0\u02B1\x07v\x02\x02\u02B1\u02B2\x07z\x02\x02\u02B2\u02B3\x07" +
-		"0\x02\x02\u02B3\u02B4\x07v\x02\x02\u02B4\u02B5\x07k\x02\x02\u02B5\u02B6" +
-		"\x07o\x02\x02\u02B6\u02B8\x07g\x02\x02\u02B7\u02AA\x03\x02\x02\x02\u02B7" +
-		"\u02B0\x03\x02\x02\x02\u02B8\x8C\x03\x02\x02\x02\u02B9\u02BA\x07v\x02" +
-		"\x02\u02BA\u02BB\x07j\x02\x02\u02BB\u02BC\x07k\x02\x02\u02BC\u02BD\x07" +
-		"u\x02\x02\u02BD\u02BE\x070\x02\x02\u02BE\u02BF\x07c\x02\x02\u02BF\u02C0" +
-		"\x07e\x02\x02\u02C0\u02C1\x07v\x02\x02\u02C1\u02C2\x07k\x02\x02\u02C2" +
-		"\u02C3\x07x\x02\x02\u02C3\u02C4\x07g\x02\x02\u02C4\u02C5\x07K\x02\x02" +
-		"\u02C5\u02C6\x07p\x02\x02\u02C6\u02C7\x07r\x02\x02\u02C7\u02C8\x07w\x02" +
-		"\x02\u02C8\u02C9\x07v\x02\x02\u02C9\u02CA\x07K\x02\x02\u02CA\u02CB\x07" +
-		"p\x02\x02\u02CB\u02CC\x07f\x02\x02\u02CC\u02CD\x07g\x02\x02\u02CD\u0318" +
-		"\x07z\x02\x02\u02CE\u02CF\x07v\x02\x02\u02CF\u02D0\x07j\x02\x02\u02D0" +
-		"\u02D1\x07k\x02\x02\u02D1\u02D2\x07u\x02\x02\u02D2\u02D3\x070\x02\x02" +
-		"\u02D3\u02D4\x07c\x02\x02\u02D4\u02D5\x07e\x02\x02\u02D5\u02D6\x07v\x02" +
-		"\x02\u02D6\u02D7\x07k\x02\x02\u02D7\u02D8\x07x\x02\x02\u02D8\u02D9\x07" +
-		"g\x02\x02\u02D9\u02DA\x07D\x02\x02\u02DA\u02DB\x07{\x02\x02\u02DB\u02DC" +
-		"\x07v\x02\x02\u02DC\u02DD\x07g\x02\x02\u02DD\u02DE\x07e\x02\x02\u02DE" +
-		"\u02DF\x07q\x02\x02\u02DF\u02E0\x07f\x02\x02\u02E0\u0318\x07g\x02\x02" +
-		"\u02E1\u02E2\x07v\x02\x02\u02E2\u02E3\x07z\x02\x02\u02E3\u02E4\x070\x02" +
-		"\x02\u02E4\u02E5\x07k\x02\x02\u02E5\u02E6\x07p\x02\x02\u02E6\u02E7\x07" +
-		"r\x02\x02\u02E7\u02E8\x07w\x02\x02\u02E8\u02E9\x07v\x02\x02\u02E9\u02EA" +
-		"\x07u\x02\x02\u02EA\u02EB\x070\x02\x02\u02EB\u02EC\x07n\x02\x02\u02EC" +
-		"\u02ED\x07g\x02\x02\u02ED\u02EE\x07p\x02\x02\u02EE\u02EF\x07i\x02\x02" +
-		"\u02EF\u02F0\x07v\x02\x02\u02F0\u0318\x07j\x02\x02\u02F1\u02F2\x07v\x02" +
-		"\x02\u02F2\u02F3\x07z\x02\x02\u02F3\u02F4\x070\x02\x02\u02F4\u02F5\x07" +
-		"q\x02\x02\u02F5\u02F6\x07w\x02\x02\u02F6\u02F7\x07v\x02\x02\u02F7\u02F8" +
-		"\x07r\x02\x02\u02F8\u02F9\x07w\x02\x02\u02F9\u02FA\x07v\x02\x02\u02FA" +
-		"\u02FB\x07u\x02\x02\u02FB\u02FC\x070\x02\x02\u02FC\u02FD\x07n\x02\x02" +
-		"\u02FD\u02FE\x07g\x02\x02\u02FE\u02FF\x07p\x02\x02\u02FF\u0300\x07i\x02" +
-		"\x02\u0300\u0301\x07v\x02\x02\u0301\u0318\x07j\x02\x02\u0302\u0303\x07" +
-		"v\x02\x02\u0303\u0304\x07z\x02\x02\u0304\u0305\x070\x02\x02\u0305\u0306" +
-		"\x07x\x02\x02\u0306\u0307\x07g\x02\x02\u0307\u0308\x07t\x02\x02\u0308" +
-		"\u0309\x07u\x02\x02\u0309\u030A\x07k\x02\x02\u030A\u030B\x07q\x02\x02" +
-		"\u030B\u0318\x07p\x02\x02\u030C\u030D\x07v\x02\x02\u030D\u030E\x07z\x02" +
-		"\x02\u030E\u030F\x070\x02\x02\u030F\u0310\x07n\x02\x02\u0310\u0311\x07" +
-		"q\x02\x02\u0311\u0312\x07e\x02\x02\u0312\u0313\x07m\x02\x02\u0313\u0314" +
-		"\x07v\x02\x02\u0314\u0315\x07k\x02\x02\u0315\u0316\x07o\x02\x02\u0316" +
-		"\u0318\x07g\x02\x02\u0317\u02B9\x03\x02\x02\x02\u0317\u02CE\x03\x02\x02" +
-		"\x02\u0317\u02E1\x03\x02\x02\x02\u0317\u02F1\x03\x02\x02\x02\u0317\u0302" +
-		"\x03\x02\x02\x02\u0317\u030C\x03\x02\x02\x02\u0318\x8E\x03\x02\x02\x02" +
-		"\u0319\u031D\t\n\x02\x02\u031A\u031C\t\v\x02\x02\u031B\u031A\x03\x02\x02" +
-		"\x02\u031C\u031F\x03\x02\x02\x02\u031D\u031B\x03\x02\x02\x02\u031D\u031E" +
-		"\x03\x02\x02\x02\u031E\x90\x03\x02\x02\x02\u031F\u031D\x03\x02\x02\x02" +
-		"\u0320\u0322\t\f\x02\x02\u0321\u0320\x03\x02\x02\x02\u0322\u0323\x03\x02" +
-		"\x02\x02\u0323\u0321\x03\x02\x02\x02\u0323\u0324\x03\x02\x02\x02\u0324" +
-		"\u0325\x03\x02\x02\x02\u0325\u0326\bI\x02\x02\u0326\x92\x03\x02\x02\x02" +
-		"\u0327\u0328\x071\x02\x02\u0328\u0329\x07,\x02\x02\u0329\u032D\x03\x02" +
-		"\x02\x02\u032A\u032C\v\x02\x02\x02\u032B\u032A\x03\x02\x02\x02\u032C\u032F" +
-		"\x03\x02\x02\x02\u032D\u032E\x03\x02\x02\x02\u032D\u032B\x03\x02\x02\x02" +
-		"\u032E\u0330\x03\x02\x02\x02\u032F\u032D\x03\x02\x02\x02\u0330\u0331\x07" +
-		",\x02\x02\u0331\u0332\x071\x02\x02\u0332\u0333\x03\x02\x02\x02\u0333\u0334" +
-		"\bJ\x03\x02\u0334\x94\x03\x02\x02\x02\u0335\u0336\x071\x02\x02\u0336\u0337" +
-		"\x071\x02\x02\u0337\u033B\x03\x02\x02\x02\u0338\u033A\n\r\x02\x02\u0339" +
-		"\u0338\x03\x02\x02\x02\u033A\u033D\x03\x02\x02\x02\u033B\u0339\x03\x02" +
-		"\x02\x02\u033B\u033C\x03\x02\x02\x02\u033C\u033E\x03\x02\x02\x02\u033D" +
-		"\u033B\x03\x02\x02\x02\u033E\u033F\bK\x03\x02\u033F\x96\x03\x02\x02\x02" +
-		"\x1B\x02\u0209\u020F\u0215\u0220\u025B\u025E\u0263\u0269\u026B\u0274\u027A" +
-		"\u0280\u0287\u0289\u0291\u0293\u0297\u02A7\u02B7\u0317\u031D\u0323\u032D" +
-		"\u033B\x04\b\x02\x02\x02\x03\x02";
+		"\u01F9\x07u\x02\x02\u01F9\u01FA\x07k\x02\x02\u01FA\u01FB\x07i\x02\x02" +
+		"\u01FBt\x03\x02\x02\x02\u01FC\u01FE\t\x02\x02\x02\u01FD\u01FC\x03\x02" +
+		"\x02\x02\u01FE\u01FF\x03\x02\x02\x02\u01FF\u01FD\x03\x02\x02\x02\u01FF" +
+		"\u0200\x03\x02\x02\x02\u0200\u0201\x03\x02\x02\x02\u0201\u0203\x070\x02" +
+		"\x02\u0202\u0204\t\x02\x02\x02\u0203\u0202\x03\x02\x02\x02\u0204\u0205" +
+		"\x03\x02\x02\x02\u0205\u0203\x03\x02\x02\x02\u0205\u0206\x03\x02\x02\x02" +
+		"\u0206\u0207\x03\x02\x02\x02\u0207\u0209\x070\x02\x02\u0208\u020A\t\x02" +
+		"\x02\x02\u0209\u0208\x03\x02\x02\x02\u020A\u020B\x03\x02\x02\x02\u020B" +
+		"\u0209\x03\x02\x02\x02\u020B\u020C\x03\x02\x02\x02\u020Cv\x03\x02\x02" +
+		"\x02\u020D\u020E\x07v\x02\x02\u020E\u020F\x07t\x02\x02\u020F\u0210\x07" +
+		"w\x02\x02\u0210\u0217\x07g\x02\x02\u0211\u0212\x07h\x02\x02\u0212\u0213" +
+		"\x07c\x02\x02\u0213\u0214\x07n\x02\x02\u0214\u0215\x07u\x02\x02\u0215" +
+		"\u0217\x07g\x02\x02\u0216\u020D\x03\x02\x02\x02\u0216\u0211\x03\x02\x02" +
+		"\x02\u0217x\x03\x02\x02\x02\u0218\u0219\x07u\x02\x02\u0219\u021A\x07c" +
+		"\x02\x02\u021A\u021B\x07v\x02\x02\u021B\u021C\x07q\x02\x02\u021C\u021D" +
+		"\x07u\x02\x02\u021D\u021E\x07j\x02\x02\u021E\u021F\x07k\x02\x02\u021F" +
+		"\u0252\x07u\x02\x02\u0220\u0221\x07u\x02\x02\u0221\u0222\x07c\x02\x02" +
+		"\u0222\u0223\x07v\x02\x02\u0223\u0252\x07u\x02\x02\u0224\u0225\x07h\x02" +
+		"\x02\u0225\u0226\x07k\x02\x02\u0226\u0227\x07p\x02\x02\u0227\u0228\x07" +
+		"p\x02\x02\u0228\u0229\x07g\x02\x02\u0229\u0252\x07{\x02\x02\u022A\u022B" +
+		"\x07d\x02\x02\u022B\u022C\x07k\x02\x02\u022C\u022D\x07v\x02\x02\u022D" +
+		"\u0252\x07u\x02\x02\u022E\u022F\x07d\x02\x02\u022F\u0230\x07k\x02\x02" +
+		"\u0230\u0231\x07v\x02\x02\u0231\u0232\x07e\x02\x02\u0232\u0233\x07q\x02" +
+		"\x02\u0233\u0234\x07k\x02\x02\u0234\u0252\x07p\x02\x02\u0235\u0236\x07" +
+		"u\x02\x02\u0236\u0237\x07g\x02\x02\u0237\u0238\x07e\x02\x02\u0238\u0239" +
+		"\x07q\x02\x02\u0239\u023A\x07p\x02\x02\u023A\u023B\x07f\x02\x02\u023B" +
+		"\u0252\x07u\x02\x02\u023C\u023D\x07o\x02\x02\u023D\u023E\x07k\x02\x02" +
+		"\u023E\u023F\x07p\x02\x02\u023F\u0240\x07w\x02\x02\u0240\u0241\x07v\x02" +
+		"\x02\u0241\u0242\x07g\x02\x02\u0242\u0252\x07u\x02\x02\u0243\u0244\x07" +
+		"j\x02\x02\u0244\u0245\x07q\x02\x02\u0245\u0246\x07w\x02\x02\u0246\u0247" +
+		"\x07t\x02\x02\u0247\u0252\x07u\x02\x02\u0248\u0249\x07f\x02\x02\u0249" +
+		"\u024A\x07c\x02\x02\u024A\u024B\x07{\x02\x02\u024B\u0252\x07u\x02\x02" +
+		"\u024C\u024D\x07y\x02\x02\u024D\u024E\x07g\x02\x02\u024E\u024F\x07g\x02" +
+		"\x02\u024F\u0250\x07m\x02\x02\u0250\u0252\x07u\x02\x02\u0251\u0218\x03" +
+		"\x02\x02\x02\u0251\u0220\x03\x02\x02\x02\u0251\u0224\x03\x02\x02\x02\u0251" +
+		"\u022A\x03\x02\x02\x02\u0251\u022E\x03\x02\x02\x02\u0251\u0235\x03\x02" +
+		"\x02\x02\u0251\u023C\x03\x02\x02\x02\u0251\u0243\x03\x02\x02\x02\u0251" +
+		"\u0248\x03\x02\x02\x02\u0251\u024C\x03\x02\x02\x02\u0252z\x03\x02\x02" +
+		"\x02\u0253\u0255\t\x03\x02\x02\u0254\u0253\x03\x02\x02\x02\u0254\u0255" +
+		"\x03\x02\x02\x02\u0255\u0257\x03\x02\x02\x02\u0256\u0258\t\x02\x02\x02" +
+		"\u0257\u0256\x03\x02\x02\x02\u0258\u0259\x03\x02\x02\x02\u0259\u0257\x03" +
+		"\x02\x02\x02\u0259\u025A\x03\x02\x02\x02\u025A\u0261\x03\x02\x02\x02\u025B" +
+		"\u025D\t\x04\x02\x02\u025C\u025E\t\x02\x02\x02\u025D\u025C\x03\x02\x02" +
+		"\x02\u025E\u025F\x03\x02\x02\x02\u025F\u025D\x03\x02\x02\x02\u025F\u0260" +
+		"\x03\x02\x02\x02\u0260\u0262\x03\x02\x02\x02\u0261\u025B\x03\x02\x02\x02" +
+		"\u0261\u0262\x03\x02\x02\x02\u0262|\x03\x02\x02\x02\u0263\u0264\x07d\x02" +
+		"\x02\u0264\u0265\x07{\x02\x02\u0265\u0266\x07v\x02\x02\u0266\u0267\x07" +
+		"g\x02\x02\u0267\u0268\x07u\x02\x02\u0268\u026A\x03\x02\x02\x02\u0269\u026B" +
+		"\x05\x7F@\x02\u026A\u0269\x03\x02\x02\x02\u026A\u026B\x03\x02\x02\x02" +
+		"\u026B\u0271\x03\x02\x02\x02\u026C\u026D\x07d\x02\x02\u026D\u026E\x07" +
+		"{\x02\x02\u026E\u026F\x07v\x02\x02\u026F\u0271\x07g\x02\x02\u0270\u0263" +
+		"\x03\x02\x02\x02\u0270\u026C\x03\x02\x02\x02\u0271~\x03\x02\x02\x02\u0272" +
+		"\u0276\t\x05\x02\x02\u0273\u0275\t\x02\x02\x02\u0274\u0273\x03\x02\x02" +
+		"\x02\u0275\u0278\x03\x02\x02\x02\u0276\u0274\x03\x02\x02\x02\u0276\u0277" +
+		"\x03\x02\x02\x02\u0277\x80\x03\x02\x02\x02\u0278\u0276\x03\x02\x02\x02" +
+		"\u0279\u027F\x07$\x02\x02\u027A\u027B\x07^\x02\x02\u027B\u027E\x07$\x02" +
+		"\x02\u027C\u027E\n\x06\x02\x02\u027D\u027A\x03\x02\x02\x02\u027D\u027C" +
+		"\x03\x02\x02\x02\u027E\u0281\x03\x02\x02\x02\u027F\u0280\x03\x02\x02\x02" +
+		"\u027F\u027D\x03\x02\x02\x02\u0280\u0282\x03\x02\x02\x02\u0281\u027F\x03" +
+		"\x02\x02\x02\u0282\u028E\x07$\x02\x02\u0283\u0289\x07)\x02\x02\u0284\u0285" +
+		"\x07^\x02\x02\u0285\u0288\x07)\x02\x02\u0286\u0288\n\x07\x02\x02\u0287" +
+		"\u0284\x03\x02\x02\x02\u0287\u0286\x03\x02\x02\x02\u0288\u028B\x03\x02" +
+		"\x02\x02\u0289\u028A\x03\x02\x02\x02\u0289\u0287\x03\x02\x02\x02\u028A" +
+		"\u028C\x03\x02\x02\x02\u028B\u0289\x03\x02\x02\x02\u028C\u028E\x07)\x02" +
+		"\x02\u028D\u0279\x03\x02\x02\x02\u028D\u0283\x03\x02\x02\x02\u028E\x82" +
+		"\x03\x02\x02\x02\u028F\u0290\x07f\x02\x02\u0290\u0291\x07c\x02\x02\u0291" +
+		"\u0292\x07v\x02\x02\u0292\u0293\x07g\x02\x02\u0293\u0294\x07*\x02\x02" +
+		"\u0294\u0295\x03\x02\x02\x02\u0295\u0296\x05\x81A\x02\u0296\u0297\x07" +
+		"+\x02\x02\u0297\x84\x03\x02\x02\x02\u0298\u0299\x072\x02\x02\u0299\u029D" +
+		"\t\b\x02\x02\u029A\u029C\t\t\x02\x02\u029B\u029A\x03\x02\x02\x02\u029C" +
+		"\u029F\x03\x02\x02\x02\u029D\u029B\x03\x02\x02\x02\u029D\u029E\x03\x02" +
+		"\x02\x02\u029E\x86\x03\x02\x02\x02\u029F\u029D\x03\x02\x02\x02\u02A0\u02A1" +
+		"\x07v\x02\x02\u02A1\u02A2\x07z\x02\x02\u02A2\u02A3\x070\x02\x02\u02A3" +
+		"\u02A4\x07c\x02\x02\u02A4\u02A5\x07i\x02\x02\u02A5\u02AE\x07g\x02\x02" +
+		"\u02A6\u02A7\x07v\x02\x02\u02A7\u02A8\x07z\x02\x02\u02A8\u02A9\x070\x02" +
+		"\x02\u02A9\u02AA\x07v\x02\x02\u02AA\u02AB\x07k\x02\x02\u02AB\u02AC\x07" +
+		"o\x02\x02\u02AC\u02AE\x07g\x02\x02\u02AD\u02A0\x03\x02\x02\x02\u02AD\u02A6" +
+		"\x03\x02\x02\x02\u02AE\x88\x03\x02\x02\x02\u02AF\u02B0\x07v\x02\x02\u02B0" +
+		"\u02B1\x07j\x02\x02\u02B1\u02B2\x07k\x02\x02\u02B2\u02B3\x07u\x02\x02" +
+		"\u02B3\u02B4\x070\x02\x02\u02B4\u02B5\x07c\x02\x02\u02B5\u02B6\x07e\x02" +
+		"\x02\u02B6\u02B7\x07v\x02\x02\u02B7\u02B8\x07k\x02\x02\u02B8\u02B9\x07" +
+		"x\x02\x02\u02B9\u02BA\x07g\x02\x02\u02BA\u02BB\x07K\x02\x02\u02BB\u02BC" +
+		"\x07p\x02\x02\u02BC\u02BD\x07r\x02\x02\u02BD\u02BE\x07w\x02\x02\u02BE" +
+		"\u02BF\x07v\x02\x02\u02BF\u02C0\x07K\x02\x02\u02C0\u02C1\x07p\x02\x02" +
+		"\u02C1\u02C2\x07f\x02\x02\u02C2\u02C3\x07g\x02\x02\u02C3\u030E\x07z\x02" +
+		"\x02\u02C4\u02C5\x07v\x02\x02\u02C5\u02C6\x07j\x02\x02\u02C6\u02C7\x07" +
+		"k\x02\x02\u02C7\u02C8\x07u\x02\x02\u02C8\u02C9\x070\x02\x02\u02C9\u02CA" +
+		"\x07c\x02\x02\u02CA\u02CB\x07e\x02\x02\u02CB\u02CC\x07v\x02\x02\u02CC" +
+		"\u02CD\x07k\x02\x02\u02CD\u02CE\x07x\x02\x02\u02CE\u02CF\x07g\x02\x02" +
+		"\u02CF\u02D0\x07D\x02\x02\u02D0\u02D1\x07{\x02\x02\u02D1\u02D2\x07v\x02" +
+		"\x02\u02D2\u02D3\x07g\x02\x02\u02D3\u02D4\x07e\x02\x02\u02D4\u02D5\x07" +
+		"q\x02\x02\u02D5\u02D6\x07f\x02\x02\u02D6\u030E\x07g\x02\x02\u02D7\u02D8" +
+		"\x07v\x02\x02\u02D8\u02D9\x07z\x02\x02\u02D9\u02DA\x070\x02\x02\u02DA" +
+		"\u02DB\x07k\x02\x02\u02DB\u02DC\x07p\x02\x02\u02DC\u02DD\x07r\x02\x02" +
+		"\u02DD\u02DE\x07w\x02\x02\u02DE\u02DF\x07v\x02\x02\u02DF\u02E0\x07u\x02" +
+		"\x02\u02E0\u02E1\x070\x02\x02\u02E1\u02E2\x07n\x02\x02\u02E2\u02E3\x07" +
+		"g\x02\x02\u02E3\u02E4\x07p\x02\x02\u02E4\u02E5\x07i\x02\x02\u02E5\u02E6" +
+		"\x07v\x02\x02\u02E6\u030E\x07j\x02\x02\u02E7\u02E8\x07v\x02\x02\u02E8" +
+		"\u02E9\x07z\x02\x02\u02E9\u02EA\x070\x02\x02\u02EA\u02EB\x07q\x02\x02" +
+		"\u02EB\u02EC\x07w\x02\x02\u02EC\u02ED\x07v\x02\x02\u02ED\u02EE\x07r\x02" +
+		"\x02\u02EE\u02EF\x07w\x02\x02\u02EF\u02F0\x07v\x02\x02\u02F0\u02F1\x07" +
+		"u\x02\x02\u02F1\u02F2\x070\x02\x02\u02F2\u02F3\x07n\x02\x02\u02F3\u02F4" +
+		"\x07g\x02\x02\u02F4\u02F5\x07p\x02\x02\u02F5\u02F6\x07i\x02\x02\u02F6" +
+		"\u02F7\x07v\x02\x02\u02F7\u030E\x07j\x02\x02\u02F8\u02F9\x07v\x02\x02" +
+		"\u02F9\u02FA\x07z\x02\x02\u02FA\u02FB\x070\x02\x02\u02FB\u02FC\x07x\x02" +
+		"\x02\u02FC\u02FD\x07g\x02\x02\u02FD\u02FE\x07t\x02\x02\u02FE\u02FF\x07" +
+		"u\x02\x02\u02FF\u0300\x07k\x02\x02\u0300\u0301\x07q\x02\x02\u0301\u030E" +
+		"\x07p\x02\x02\u0302\u0303\x07v\x02\x02\u0303\u0304\x07z\x02\x02\u0304" +
+		"\u0305\x070\x02\x02\u0305\u0306\x07n\x02\x02\u0306\u0307\x07q\x02\x02" +
+		"\u0307\u0308\x07e\x02\x02\u0308\u0309\x07m\x02\x02\u0309\u030A\x07v\x02" +
+		"\x02\u030A\u030B\x07k\x02\x02\u030B\u030C\x07o\x02\x02\u030C\u030E\x07" +
+		"g\x02\x02\u030D\u02AF\x03\x02\x02\x02\u030D\u02C4\x03\x02\x02\x02\u030D" +
+		"\u02D7\x03\x02\x02\x02\u030D\u02E7\x03\x02\x02\x02\u030D\u02F8\x03\x02" +
+		"\x02\x02\u030D\u0302\x03\x02\x02\x02\u030E\x8A\x03\x02\x02\x02\u030F\u0313" +
+		"\t\n\x02\x02\u0310\u0312\t\v\x02\x02\u0311\u0310\x03\x02\x02\x02\u0312" +
+		"\u0315\x03\x02\x02\x02\u0313\u0311\x03\x02\x02\x02\u0313\u0314\x03\x02" +
+		"\x02\x02\u0314\x8C\x03\x02\x02\x02\u0315\u0313\x03\x02\x02\x02\u0316\u0318" +
+		"\t\f\x02\x02\u0317\u0316\x03\x02\x02\x02\u0318\u0319\x03\x02\x02\x02\u0319" +
+		"\u0317\x03\x02\x02\x02\u0319\u031A\x03\x02\x02\x02\u031A\u031B\x03\x02" +
+		"\x02\x02\u031B\u031C\bG\x02\x02\u031C\x8E\x03\x02\x02\x02\u031D\u031E" +
+		"\x071\x02\x02\u031E\u031F\x07,\x02\x02\u031F\u0323\x03\x02\x02\x02\u0320" +
+		"\u0322\v\x02\x02\x02\u0321\u0320\x03\x02\x02\x02\u0322\u0325\x03\x02\x02" +
+		"\x02\u0323\u0324\x03\x02\x02\x02\u0323\u0321\x03\x02\x02\x02\u0324\u0326" +
+		"\x03\x02\x02\x02\u0325\u0323\x03\x02\x02\x02\u0326\u0327\x07,\x02\x02" +
+		"\u0327\u0328\x071\x02\x02\u0328\u0329\x03\x02\x02\x02\u0329\u032A\bH\x03" +
+		"\x02\u032A\x90\x03\x02\x02\x02\u032B\u032C\x071\x02\x02\u032C\u032D\x07" +
+		"1\x02\x02\u032D\u0331\x03\x02\x02\x02\u032E\u0330\n\r\x02\x02\u032F\u032E" +
+		"\x03\x02\x02\x02\u0330\u0333\x03\x02\x02\x02\u0331\u032F\x03\x02\x02\x02" +
+		"\u0331\u0332\x03\x02\x02\x02\u0332\u0334\x03\x02\x02\x02\u0333\u0331\x03" +
+		"\x02\x02\x02\u0334\u0335\bI\x03\x02\u0335\x92\x03\x02\x02\x02\x1B\x02" +
+		"\u01FF\u0205\u020B\u0216\u0251\u0254\u0259\u025F\u0261\u026A\u0270\u0276" +
+		"\u027D\u027F\u0287\u0289\u028D\u029D\u02AD\u030D\u0313\u0319\u0323\u0331" +
+		"\x04\b\x02\x02\x02\x03\x02";
 	public static readonly _serializedATN: string = Utils.join(
 		[
 			CashScriptLexer._serializedATNSegment0,
diff --git a/packages/cashc/src/grammar/CashScriptParser.ts b/packages/cashc/src/grammar/CashScriptParser.ts
index 5e990dbe..c1be0de8 100644
--- a/packages/cashc/src/grammar/CashScriptParser.ts
+++ b/packages/cashc/src/grammar/CashScriptParser.ts
@@ -84,23 +84,21 @@ export class CashScriptParser extends Parser {
 	public static readonly T__54 = 55;
 	public static readonly T__55 = 56;
 	public static readonly T__56 = 57;
-	public static readonly T__57 = 58;
-	public static readonly T__58 = 59;
-	public static readonly VersionLiteral = 60;
-	public static readonly BooleanLiteral = 61;
-	public static readonly NumberUnit = 62;
-	public static readonly NumberLiteral = 63;
-	public static readonly Bytes = 64;
-	public static readonly Bound = 65;
-	public static readonly StringLiteral = 66;
-	public static readonly DateLiteral = 67;
-	public static readonly HexLiteral = 68;
-	public static readonly TxVar = 69;
-	public static readonly NullaryOp = 70;
-	public static readonly Identifier = 71;
-	public static readonly WHITESPACE = 72;
-	public static readonly COMMENT = 73;
-	public static readonly LINE_COMMENT = 74;
+	public static readonly VersionLiteral = 58;
+	public static readonly BooleanLiteral = 59;
+	public static readonly NumberUnit = 60;
+	public static readonly NumberLiteral = 61;
+	public static readonly Bytes = 62;
+	public static readonly Bound = 63;
+	public static readonly StringLiteral = 64;
+	public static readonly DateLiteral = 65;
+	public static readonly HexLiteral = 66;
+	public static readonly TxVar = 67;
+	public static readonly NullaryOp = 68;
+	public static readonly Identifier = 69;
+	public static readonly WHITESPACE = 70;
+	public static readonly COMMENT = 71;
+	public static readonly LINE_COMMENT = 72;
 	public static readonly RULE_sourceFile = 0;
 	public static readonly RULE_pragmaDirective = 1;
 	public static readonly RULE_pragmaName = 2;
@@ -119,28 +117,32 @@ export class CashScriptParser extends Parser {
 	public static readonly RULE_timeOpStatement = 15;
 	public static readonly RULE_requireStatement = 16;
 	public static readonly RULE_ifStatement = 17;
-	public static readonly RULE_functionCall = 18;
-	public static readonly RULE_expressionList = 19;
-	public static readonly RULE_expression = 20;
-	public static readonly RULE_modifier = 21;
-	public static readonly RULE_literal = 22;
-	public static readonly RULE_numberLiteral = 23;
-	public static readonly RULE_typeName = 24;
+	public static readonly RULE_consoleStatement = 18;
+	public static readonly RULE_consoleParameter = 19;
+	public static readonly RULE_consoleParameterList = 20;
+	public static readonly RULE_functionCall = 21;
+	public static readonly RULE_expressionList = 22;
+	public static readonly RULE_expression = 23;
+	public static readonly RULE_modifier = 24;
+	public static readonly RULE_literal = 25;
+	public static readonly RULE_numberLiteral = 26;
+	public static readonly RULE_typeName = 27;
 	// tslint:disable:no-trailing-whitespace
 	public static readonly ruleNames: string[] = [
 		"sourceFile", "pragmaDirective", "pragmaName", "pragmaValue", "versionConstraint", 
 		"versionOperator", "contractDefinition", "functionDefinition", "parameterList", 
 		"parameter", "block", "statement", "variableDefinition", "tupleAssignment", 
 		"assignStatement", "timeOpStatement", "requireStatement", "ifStatement", 
-		"functionCall", "expressionList", "expression", "modifier", "literal", 
-		"numberLiteral", "typeName",
+		"consoleStatement", "consoleParameter", "consoleParameterList", "functionCall", 
+		"expressionList", "expression", "modifier", "literal", "numberLiteral", 
+		"typeName",
 	];
 
 	private static readonly _LITERAL_NAMES: Array<string | undefined> = [
 		undefined, "'pragma'", "';'", "'cashscript'", "'^'", "'~'", "'>='", "'>'", 
 		"'<'", "'<='", "'='", "'contract'", "'{'", "'}'", "'function'", "'('", 
-		"','", "')'", "'require'", "'if'", "'else'", "'new'", "'['", "']'", "'console.'", 
-		"'log'", "'warn'", "'tx.outputs'", "'.value'", "'.lockingBytecode'", "'.tokenCategory'", 
+		"','", "')'", "'require'", "'if'", "'else'", "'console.log'", "'new'", 
+		"'['", "']'", "'tx.outputs'", "'.value'", "'.lockingBytecode'", "'.tokenCategory'", 
 		"'.nftCommitment'", "'.tokenAmount'", "'tx.inputs'", "'.outpointTransactionHash'", 
 		"'.outpointIndex'", "'.unlockingBytecode'", "'.sequenceNumber'", "'.reverse()'", 
 		"'.length'", "'.split'", "'!'", "'-'", "'*'", "'/'", "'%'", "'+'", "'=='", 
@@ -156,10 +158,9 @@ export class CashScriptParser extends Parser {
 		undefined, undefined, undefined, undefined, undefined, undefined, undefined, 
 		undefined, undefined, undefined, undefined, undefined, undefined, undefined, 
 		undefined, undefined, undefined, undefined, undefined, undefined, undefined, 
-		undefined, undefined, undefined, undefined, "VersionLiteral", "BooleanLiteral", 
-		"NumberUnit", "NumberLiteral", "Bytes", "Bound", "StringLiteral", "DateLiteral", 
-		"HexLiteral", "TxVar", "NullaryOp", "Identifier", "WHITESPACE", "COMMENT", 
-		"LINE_COMMENT",
+		undefined, undefined, "VersionLiteral", "BooleanLiteral", "NumberUnit", 
+		"NumberLiteral", "Bytes", "Bound", "StringLiteral", "DateLiteral", "HexLiteral", 
+		"TxVar", "NullaryOp", "Identifier", "WHITESPACE", "COMMENT", "LINE_COMMENT",
 	];
 	public static readonly VOCABULARY: Vocabulary = new VocabularyImpl(CashScriptParser._LITERAL_NAMES, CashScriptParser._SYMBOLIC_NAMES, []);
 
@@ -195,23 +196,23 @@ export class CashScriptParser extends Parser {
 		try {
 			this.enterOuterAlt(_localctx, 1);
 			{
-			this.state = 53;
+			this.state = 59;
 			this._errHandler.sync(this);
 			_la = this._input.LA(1);
 			while (_la === CashScriptParser.T__0) {
 				{
 				{
-				this.state = 50;
+				this.state = 56;
 				this.pragmaDirective();
 				}
 				}
-				this.state = 55;
+				this.state = 61;
 				this._errHandler.sync(this);
 				_la = this._input.LA(1);
 			}
-			this.state = 56;
+			this.state = 62;
 			this.contractDefinition();
-			this.state = 57;
+			this.state = 63;
 			this.match(CashScriptParser.EOF);
 			}
 		}
@@ -236,13 +237,13 @@ export class CashScriptParser extends Parser {
 		try {
 			this.enterOuterAlt(_localctx, 1);
 			{
-			this.state = 59;
+			this.state = 65;
 			this.match(CashScriptParser.T__0);
-			this.state = 60;
+			this.state = 66;
 			this.pragmaName();
-			this.state = 61;
+			this.state = 67;
 			this.pragmaValue();
-			this.state = 62;
+			this.state = 68;
 			this.match(CashScriptParser.T__1);
 			}
 		}
@@ -267,7 +268,7 @@ export class CashScriptParser extends Parser {
 		try {
 			this.enterOuterAlt(_localctx, 1);
 			{
-			this.state = 64;
+			this.state = 70;
 			this.match(CashScriptParser.T__2);
 			}
 		}
@@ -293,14 +294,14 @@ export class CashScriptParser extends Parser {
 		try {
 			this.enterOuterAlt(_localctx, 1);
 			{
-			this.state = 66;
+			this.state = 72;
 			this.versionConstraint();
-			this.state = 68;
+			this.state = 74;
 			this._errHandler.sync(this);
 			_la = this._input.LA(1);
 			if ((((_la) & ~0x1F) === 0 && ((1 << _la) & ((1 << CashScriptParser.T__3) | (1 << CashScriptParser.T__4) | (1 << CashScriptParser.T__5) | (1 << CashScriptParser.T__6) | (1 << CashScriptParser.T__7) | (1 << CashScriptParser.T__8) | (1 << CashScriptParser.T__9))) !== 0) || _la === CashScriptParser.VersionLiteral) {
 				{
-				this.state = 67;
+				this.state = 73;
 				this.versionConstraint();
 				}
 			}
@@ -329,17 +330,17 @@ export class CashScriptParser extends Parser {
 		try {
 			this.enterOuterAlt(_localctx, 1);
 			{
-			this.state = 71;
+			this.state = 77;
 			this._errHandler.sync(this);
 			_la = this._input.LA(1);
 			if ((((_la) & ~0x1F) === 0 && ((1 << _la) & ((1 << CashScriptParser.T__3) | (1 << CashScriptParser.T__4) | (1 << CashScriptParser.T__5) | (1 << CashScriptParser.T__6) | (1 << CashScriptParser.T__7) | (1 << CashScriptParser.T__8) | (1 << CashScriptParser.T__9))) !== 0)) {
 				{
-				this.state = 70;
+				this.state = 76;
 				this.versionOperator();
 				}
 			}
 
-			this.state = 73;
+			this.state = 79;
 			this.match(CashScriptParser.VersionLiteral);
 			}
 		}
@@ -365,7 +366,7 @@ export class CashScriptParser extends Parser {
 		try {
 			this.enterOuterAlt(_localctx, 1);
 			{
-			this.state = 75;
+			this.state = 81;
 			_la = this._input.LA(1);
 			if (!((((_la) & ~0x1F) === 0 && ((1 << _la) & ((1 << CashScriptParser.T__3) | (1 << CashScriptParser.T__4) | (1 << CashScriptParser.T__5) | (1 << CashScriptParser.T__6) | (1 << CashScriptParser.T__7) | (1 << CashScriptParser.T__8) | (1 << CashScriptParser.T__9))) !== 0))) {
 			this._errHandler.recoverInline(this);
@@ -401,29 +402,29 @@ export class CashScriptParser extends Parser {
 		try {
 			this.enterOuterAlt(_localctx, 1);
 			{
-			this.state = 77;
+			this.state = 83;
 			this.match(CashScriptParser.T__10);
-			this.state = 78;
+			this.state = 84;
 			this.match(CashScriptParser.Identifier);
-			this.state = 79;
+			this.state = 85;
 			this.parameterList();
-			this.state = 80;
+			this.state = 86;
 			this.match(CashScriptParser.T__11);
-			this.state = 84;
+			this.state = 90;
 			this._errHandler.sync(this);
 			_la = this._input.LA(1);
 			while (_la === CashScriptParser.T__13) {
 				{
 				{
-				this.state = 81;
+				this.state = 87;
 				this.functionDefinition();
 				}
 				}
-				this.state = 86;
+				this.state = 92;
 				this._errHandler.sync(this);
 				_la = this._input.LA(1);
 			}
-			this.state = 87;
+			this.state = 93;
 			this.match(CashScriptParser.T__12);
 			}
 		}
@@ -449,29 +450,29 @@ export class CashScriptParser extends Parser {
 		try {
 			this.enterOuterAlt(_localctx, 1);
 			{
-			this.state = 89;
+			this.state = 95;
 			this.match(CashScriptParser.T__13);
-			this.state = 90;
+			this.state = 96;
 			this.match(CashScriptParser.Identifier);
-			this.state = 91;
+			this.state = 97;
 			this.parameterList();
-			this.state = 92;
+			this.state = 98;
 			this.match(CashScriptParser.T__11);
-			this.state = 96;
+			this.state = 102;
 			this._errHandler.sync(this);
 			_la = this._input.LA(1);
-			while (_la === CashScriptParser.T__17 || _la === CashScriptParser.T__18 || ((((_la - 54)) & ~0x1F) === 0 && ((1 << (_la - 54)) & ((1 << (CashScriptParser.T__53 - 54)) | (1 << (CashScriptParser.T__54 - 54)) | (1 << (CashScriptParser.T__55 - 54)) | (1 << (CashScriptParser.T__56 - 54)) | (1 << (CashScriptParser.T__57 - 54)) | (1 << (CashScriptParser.T__58 - 54)) | (1 << (CashScriptParser.Bytes - 54)) | (1 << (CashScriptParser.Identifier - 54)))) !== 0)) {
+			while ((((_la) & ~0x1F) === 0 && ((1 << _la) & ((1 << CashScriptParser.T__17) | (1 << CashScriptParser.T__18) | (1 << CashScriptParser.T__20))) !== 0) || ((((_la - 52)) & ~0x1F) === 0 && ((1 << (_la - 52)) & ((1 << (CashScriptParser.T__51 - 52)) | (1 << (CashScriptParser.T__52 - 52)) | (1 << (CashScriptParser.T__53 - 52)) | (1 << (CashScriptParser.T__54 - 52)) | (1 << (CashScriptParser.T__55 - 52)) | (1 << (CashScriptParser.T__56 - 52)) | (1 << (CashScriptParser.Bytes - 52)) | (1 << (CashScriptParser.Identifier - 52)))) !== 0)) {
 				{
 				{
-				this.state = 93;
+				this.state = 99;
 				this.statement();
 				}
 				}
-				this.state = 98;
+				this.state = 104;
 				this._errHandler.sync(this);
 				_la = this._input.LA(1);
 			}
-			this.state = 99;
+			this.state = 105;
 			this.match(CashScriptParser.T__12);
 			}
 		}
@@ -498,39 +499,39 @@ export class CashScriptParser extends Parser {
 			let _alt: number;
 			this.enterOuterAlt(_localctx, 1);
 			{
-			this.state = 101;
+			this.state = 107;
 			this.match(CashScriptParser.T__14);
-			this.state = 113;
+			this.state = 119;
 			this._errHandler.sync(this);
 			_la = this._input.LA(1);
-			if (((((_la - 54)) & ~0x1F) === 0 && ((1 << (_la - 54)) & ((1 << (CashScriptParser.T__53 - 54)) | (1 << (CashScriptParser.T__54 - 54)) | (1 << (CashScriptParser.T__55 - 54)) | (1 << (CashScriptParser.T__56 - 54)) | (1 << (CashScriptParser.T__57 - 54)) | (1 << (CashScriptParser.T__58 - 54)) | (1 << (CashScriptParser.Bytes - 54)))) !== 0)) {
+			if (((((_la - 52)) & ~0x1F) === 0 && ((1 << (_la - 52)) & ((1 << (CashScriptParser.T__51 - 52)) | (1 << (CashScriptParser.T__52 - 52)) | (1 << (CashScriptParser.T__53 - 52)) | (1 << (CashScriptParser.T__54 - 52)) | (1 << (CashScriptParser.T__55 - 52)) | (1 << (CashScriptParser.T__56 - 52)) | (1 << (CashScriptParser.Bytes - 52)))) !== 0)) {
 				{
-				this.state = 102;
+				this.state = 108;
 				this.parameter();
-				this.state = 107;
+				this.state = 113;
 				this._errHandler.sync(this);
 				_alt = this.interpreter.adaptivePredict(this._input, 5, this._ctx);
 				while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
 					if (_alt === 1) {
 						{
 						{
-						this.state = 103;
+						this.state = 109;
 						this.match(CashScriptParser.T__15);
-						this.state = 104;
+						this.state = 110;
 						this.parameter();
 						}
 						}
 					}
-					this.state = 109;
+					this.state = 115;
 					this._errHandler.sync(this);
 					_alt = this.interpreter.adaptivePredict(this._input, 5, this._ctx);
 				}
-				this.state = 111;
+				this.state = 117;
 				this._errHandler.sync(this);
 				_la = this._input.LA(1);
 				if (_la === CashScriptParser.T__15) {
 					{
-					this.state = 110;
+					this.state = 116;
 					this.match(CashScriptParser.T__15);
 					}
 				}
@@ -538,7 +539,7 @@ export class CashScriptParser extends Parser {
 				}
 			}
 
-			this.state = 115;
+			this.state = 121;
 			this.match(CashScriptParser.T__16);
 			}
 		}
@@ -563,9 +564,9 @@ export class CashScriptParser extends Parser {
 		try {
 			this.enterOuterAlt(_localctx, 1);
 			{
-			this.state = 117;
+			this.state = 123;
 			this.typeName();
-			this.state = 118;
+			this.state = 124;
 			this.match(CashScriptParser.Identifier);
 			}
 		}
@@ -589,45 +590,46 @@ export class CashScriptParser extends Parser {
 		this.enterRule(_localctx, 20, CashScriptParser.RULE_block);
 		let _la: number;
 		try {
-			this.state = 129;
+			this.state = 135;
 			this._errHandler.sync(this);
 			switch (this._input.LA(1)) {
 			case CashScriptParser.T__11:
 				this.enterOuterAlt(_localctx, 1);
 				{
-				this.state = 120;
+				this.state = 126;
 				this.match(CashScriptParser.T__11);
-				this.state = 124;
+				this.state = 130;
 				this._errHandler.sync(this);
 				_la = this._input.LA(1);
-				while (_la === CashScriptParser.T__17 || _la === CashScriptParser.T__18 || ((((_la - 54)) & ~0x1F) === 0 && ((1 << (_la - 54)) & ((1 << (CashScriptParser.T__53 - 54)) | (1 << (CashScriptParser.T__54 - 54)) | (1 << (CashScriptParser.T__55 - 54)) | (1 << (CashScriptParser.T__56 - 54)) | (1 << (CashScriptParser.T__57 - 54)) | (1 << (CashScriptParser.T__58 - 54)) | (1 << (CashScriptParser.Bytes - 54)) | (1 << (CashScriptParser.Identifier - 54)))) !== 0)) {
+				while ((((_la) & ~0x1F) === 0 && ((1 << _la) & ((1 << CashScriptParser.T__17) | (1 << CashScriptParser.T__18) | (1 << CashScriptParser.T__20))) !== 0) || ((((_la - 52)) & ~0x1F) === 0 && ((1 << (_la - 52)) & ((1 << (CashScriptParser.T__51 - 52)) | (1 << (CashScriptParser.T__52 - 52)) | (1 << (CashScriptParser.T__53 - 52)) | (1 << (CashScriptParser.T__54 - 52)) | (1 << (CashScriptParser.T__55 - 52)) | (1 << (CashScriptParser.T__56 - 52)) | (1 << (CashScriptParser.Bytes - 52)) | (1 << (CashScriptParser.Identifier - 52)))) !== 0)) {
 					{
 					{
-					this.state = 121;
+					this.state = 127;
 					this.statement();
 					}
 					}
-					this.state = 126;
+					this.state = 132;
 					this._errHandler.sync(this);
 					_la = this._input.LA(1);
 				}
-				this.state = 127;
+				this.state = 133;
 				this.match(CashScriptParser.T__12);
 				}
 				break;
 			case CashScriptParser.T__17:
 			case CashScriptParser.T__18:
+			case CashScriptParser.T__20:
+			case CashScriptParser.T__51:
+			case CashScriptParser.T__52:
 			case CashScriptParser.T__53:
 			case CashScriptParser.T__54:
 			case CashScriptParser.T__55:
 			case CashScriptParser.T__56:
-			case CashScriptParser.T__57:
-			case CashScriptParser.T__58:
 			case CashScriptParser.Bytes:
 			case CashScriptParser.Identifier:
 				this.enterOuterAlt(_localctx, 2);
 				{
-				this.state = 128;
+				this.state = 134;
 				this.statement();
 				}
 				break;
@@ -654,13 +656,13 @@ export class CashScriptParser extends Parser {
 		let _localctx: StatementContext = new StatementContext(this._ctx, this.state);
 		this.enterRule(_localctx, 22, CashScriptParser.RULE_statement);
 		try {
-			this.state = 137;
+			this.state = 144;
 			this._errHandler.sync(this);
 			switch ( this.interpreter.adaptivePredict(this._input, 10, this._ctx) ) {
 			case 1:
 				this.enterOuterAlt(_localctx, 1);
 				{
-				this.state = 131;
+				this.state = 137;
 				this.variableDefinition();
 				}
 				break;
@@ -668,7 +670,7 @@ export class CashScriptParser extends Parser {
 			case 2:
 				this.enterOuterAlt(_localctx, 2);
 				{
-				this.state = 132;
+				this.state = 138;
 				this.tupleAssignment();
 				}
 				break;
@@ -676,7 +678,7 @@ export class CashScriptParser extends Parser {
 			case 3:
 				this.enterOuterAlt(_localctx, 3);
 				{
-				this.state = 133;
+				this.state = 139;
 				this.assignStatement();
 				}
 				break;
@@ -684,7 +686,7 @@ export class CashScriptParser extends Parser {
 			case 4:
 				this.enterOuterAlt(_localctx, 4);
 				{
-				this.state = 134;
+				this.state = 140;
 				this.timeOpStatement();
 				}
 				break;
@@ -692,7 +694,7 @@ export class CashScriptParser extends Parser {
 			case 5:
 				this.enterOuterAlt(_localctx, 5);
 				{
-				this.state = 135;
+				this.state = 141;
 				this.requireStatement();
 				}
 				break;
@@ -700,10 +702,18 @@ export class CashScriptParser extends Parser {
 			case 6:
 				this.enterOuterAlt(_localctx, 6);
 				{
-				this.state = 136;
+				this.state = 142;
 				this.ifStatement();
 				}
 				break;
+
+			case 7:
+				this.enterOuterAlt(_localctx, 7);
+				{
+				this.state = 143;
+				this.consoleStatement();
+				}
+				break;
 			}
 		}
 		catch (re) {
@@ -728,29 +738,29 @@ export class CashScriptParser extends Parser {
 		try {
 			this.enterOuterAlt(_localctx, 1);
 			{
-			this.state = 139;
+			this.state = 146;
 			this.typeName();
-			this.state = 143;
+			this.state = 150;
 			this._errHandler.sync(this);
 			_la = this._input.LA(1);
-			while (_la === CashScriptParser.T__52) {
+			while (_la === CashScriptParser.T__50) {
 				{
 				{
-				this.state = 140;
+				this.state = 147;
 				this.modifier();
 				}
 				}
-				this.state = 145;
+				this.state = 152;
 				this._errHandler.sync(this);
 				_la = this._input.LA(1);
 			}
-			this.state = 146;
+			this.state = 153;
 			this.match(CashScriptParser.Identifier);
-			this.state = 147;
+			this.state = 154;
 			this.match(CashScriptParser.T__9);
-			this.state = 148;
+			this.state = 155;
 			this.expression(0);
-			this.state = 149;
+			this.state = 156;
 			this.match(CashScriptParser.T__1);
 			}
 		}
@@ -775,21 +785,21 @@ export class CashScriptParser extends Parser {
 		try {
 			this.enterOuterAlt(_localctx, 1);
 			{
-			this.state = 151;
+			this.state = 158;
 			this.typeName();
-			this.state = 152;
+			this.state = 159;
 			this.match(CashScriptParser.Identifier);
-			this.state = 153;
+			this.state = 160;
 			this.match(CashScriptParser.T__15);
-			this.state = 154;
+			this.state = 161;
 			this.typeName();
-			this.state = 155;
+			this.state = 162;
 			this.match(CashScriptParser.Identifier);
-			this.state = 156;
+			this.state = 163;
 			this.match(CashScriptParser.T__9);
-			this.state = 157;
+			this.state = 164;
 			this.expression(0);
-			this.state = 158;
+			this.state = 165;
 			this.match(CashScriptParser.T__1);
 			}
 		}
@@ -814,13 +824,13 @@ export class CashScriptParser extends Parser {
 		try {
 			this.enterOuterAlt(_localctx, 1);
 			{
-			this.state = 160;
+			this.state = 167;
 			this.match(CashScriptParser.Identifier);
-			this.state = 161;
+			this.state = 168;
 			this.match(CashScriptParser.T__9);
-			this.state = 162;
+			this.state = 169;
 			this.expression(0);
-			this.state = 163;
+			this.state = 170;
 			this.match(CashScriptParser.T__1);
 			}
 		}
@@ -845,19 +855,19 @@ export class CashScriptParser extends Parser {
 		try {
 			this.enterOuterAlt(_localctx, 1);
 			{
-			this.state = 165;
+			this.state = 172;
 			this.match(CashScriptParser.T__17);
-			this.state = 166;
+			this.state = 173;
 			this.match(CashScriptParser.T__14);
-			this.state = 167;
+			this.state = 174;
 			this.match(CashScriptParser.TxVar);
-			this.state = 168;
+			this.state = 175;
 			this.match(CashScriptParser.T__5);
-			this.state = 169;
+			this.state = 176;
 			this.expression(0);
-			this.state = 170;
+			this.state = 177;
 			this.match(CashScriptParser.T__16);
-			this.state = 171;
+			this.state = 178;
 			this.match(CashScriptParser.T__1);
 			}
 		}
@@ -882,15 +892,15 @@ export class CashScriptParser extends Parser {
 		try {
 			this.enterOuterAlt(_localctx, 1);
 			{
-			this.state = 173;
+			this.state = 180;
 			this.match(CashScriptParser.T__17);
-			this.state = 174;
+			this.state = 181;
 			this.match(CashScriptParser.T__14);
-			this.state = 175;
+			this.state = 182;
 			this.expression(0);
-			this.state = 176;
+			this.state = 183;
 			this.match(CashScriptParser.T__16);
-			this.state = 177;
+			this.state = 184;
 			this.match(CashScriptParser.T__1);
 			}
 		}
@@ -915,24 +925,24 @@ export class CashScriptParser extends Parser {
 		try {
 			this.enterOuterAlt(_localctx, 1);
 			{
-			this.state = 179;
+			this.state = 186;
 			this.match(CashScriptParser.T__18);
-			this.state = 180;
+			this.state = 187;
 			this.match(CashScriptParser.T__14);
-			this.state = 181;
+			this.state = 188;
 			this.expression(0);
-			this.state = 182;
+			this.state = 189;
 			this.match(CashScriptParser.T__16);
-			this.state = 183;
+			this.state = 190;
 			_localctx._ifBlock = this.block();
-			this.state = 186;
+			this.state = 193;
 			this._errHandler.sync(this);
 			switch ( this.interpreter.adaptivePredict(this._input, 12, this._ctx) ) {
 			case 1:
 				{
-				this.state = 184;
+				this.state = 191;
 				this.match(CashScriptParser.T__19);
-				this.state = 185;
+				this.state = 192;
 				_localctx._elseBlock = this.block();
 				}
 				break;
@@ -954,15 +964,147 @@ export class CashScriptParser extends Parser {
 		return _localctx;
 	}
 	// @RuleVersion(0)
+	public consoleStatement(): ConsoleStatementContext {
+		let _localctx: ConsoleStatementContext = new ConsoleStatementContext(this._ctx, this.state);
+		this.enterRule(_localctx, 36, CashScriptParser.RULE_consoleStatement);
+		try {
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 195;
+			this.match(CashScriptParser.T__20);
+			this.state = 196;
+			this.consoleParameterList();
+			this.state = 197;
+			this.match(CashScriptParser.T__1);
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public consoleParameter(): ConsoleParameterContext {
+		let _localctx: ConsoleParameterContext = new ConsoleParameterContext(this._ctx, this.state);
+		this.enterRule(_localctx, 38, CashScriptParser.RULE_consoleParameter);
+		let _la: number;
+		try {
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 199;
+			_la = this._input.LA(1);
+			if (!(((((_la - 59)) & ~0x1F) === 0 && ((1 << (_la - 59)) & ((1 << (CashScriptParser.BooleanLiteral - 59)) | (1 << (CashScriptParser.NumberLiteral - 59)) | (1 << (CashScriptParser.StringLiteral - 59)) | (1 << (CashScriptParser.HexLiteral - 59)) | (1 << (CashScriptParser.Identifier - 59)))) !== 0))) {
+			this._errHandler.recoverInline(this);
+			} else {
+				if (this._input.LA(1) === Token.EOF) {
+					this.matchedEOF = true;
+				}
+
+				this._errHandler.reportMatch(this);
+				this.consume();
+			}
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public consoleParameterList(): ConsoleParameterListContext {
+		let _localctx: ConsoleParameterListContext = new ConsoleParameterListContext(this._ctx, this.state);
+		this.enterRule(_localctx, 40, CashScriptParser.RULE_consoleParameterList);
+		let _la: number;
+		try {
+			let _alt: number;
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 201;
+			this.match(CashScriptParser.T__14);
+			this.state = 213;
+			this._errHandler.sync(this);
+			_la = this._input.LA(1);
+			if (((((_la - 59)) & ~0x1F) === 0 && ((1 << (_la - 59)) & ((1 << (CashScriptParser.BooleanLiteral - 59)) | (1 << (CashScriptParser.NumberLiteral - 59)) | (1 << (CashScriptParser.StringLiteral - 59)) | (1 << (CashScriptParser.HexLiteral - 59)) | (1 << (CashScriptParser.Identifier - 59)))) !== 0)) {
+				{
+				this.state = 202;
+				this.consoleParameter();
+				this.state = 207;
+				this._errHandler.sync(this);
+				_alt = this.interpreter.adaptivePredict(this._input, 13, this._ctx);
+				while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
+					if (_alt === 1) {
+						{
+						{
+						this.state = 203;
+						this.match(CashScriptParser.T__15);
+						this.state = 204;
+						this.consoleParameter();
+						}
+						}
+					}
+					this.state = 209;
+					this._errHandler.sync(this);
+					_alt = this.interpreter.adaptivePredict(this._input, 13, this._ctx);
+				}
+				this.state = 211;
+				this._errHandler.sync(this);
+				_la = this._input.LA(1);
+				if (_la === CashScriptParser.T__15) {
+					{
+					this.state = 210;
+					this.match(CashScriptParser.T__15);
+					}
+				}
+
+				}
+			}
+
+			this.state = 215;
+			this.match(CashScriptParser.T__16);
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
 	public functionCall(): FunctionCallContext {
 		let _localctx: FunctionCallContext = new FunctionCallContext(this._ctx, this.state);
-		this.enterRule(_localctx, 36, CashScriptParser.RULE_functionCall);
+		this.enterRule(_localctx, 42, CashScriptParser.RULE_functionCall);
 		try {
 			this.enterOuterAlt(_localctx, 1);
 			{
-			this.state = 188;
+			this.state = 217;
 			this.match(CashScriptParser.Identifier);
-			this.state = 189;
+			this.state = 218;
 			this.expressionList();
 			}
 		}
@@ -983,45 +1125,45 @@ export class CashScriptParser extends Parser {
 	// @RuleVersion(0)
 	public expressionList(): ExpressionListContext {
 		let _localctx: ExpressionListContext = new ExpressionListContext(this._ctx, this.state);
-		this.enterRule(_localctx, 38, CashScriptParser.RULE_expressionList);
+		this.enterRule(_localctx, 44, CashScriptParser.RULE_expressionList);
 		let _la: number;
 		try {
 			let _alt: number;
 			this.enterOuterAlt(_localctx, 1);
 			{
-			this.state = 191;
+			this.state = 220;
 			this.match(CashScriptParser.T__14);
-			this.state = 203;
+			this.state = 232;
 			this._errHandler.sync(this);
 			_la = this._input.LA(1);
-			if (((((_la - 15)) & ~0x1F) === 0 && ((1 << (_la - 15)) & ((1 << (CashScriptParser.T__14 - 15)) | (1 << (CashScriptParser.T__20 - 15)) | (1 << (CashScriptParser.T__21 - 15)) | (1 << (CashScriptParser.T__23 - 15)) | (1 << (CashScriptParser.T__26 - 15)) | (1 << (CashScriptParser.T__32 - 15)) | (1 << (CashScriptParser.T__40 - 15)) | (1 << (CashScriptParser.T__41 - 15)))) !== 0) || ((((_la - 54)) & ~0x1F) === 0 && ((1 << (_la - 54)) & ((1 << (CashScriptParser.T__53 - 54)) | (1 << (CashScriptParser.T__54 - 54)) | (1 << (CashScriptParser.T__55 - 54)) | (1 << (CashScriptParser.T__56 - 54)) | (1 << (CashScriptParser.T__57 - 54)) | (1 << (CashScriptParser.T__58 - 54)) | (1 << (CashScriptParser.BooleanLiteral - 54)) | (1 << (CashScriptParser.NumberLiteral - 54)) | (1 << (CashScriptParser.Bytes - 54)) | (1 << (CashScriptParser.StringLiteral - 54)) | (1 << (CashScriptParser.DateLiteral - 54)) | (1 << (CashScriptParser.HexLiteral - 54)) | (1 << (CashScriptParser.NullaryOp - 54)) | (1 << (CashScriptParser.Identifier - 54)))) !== 0)) {
+			if ((((_la) & ~0x1F) === 0 && ((1 << _la) & ((1 << CashScriptParser.T__14) | (1 << CashScriptParser.T__21) | (1 << CashScriptParser.T__22) | (1 << CashScriptParser.T__24) | (1 << CashScriptParser.T__30))) !== 0) || ((((_la - 39)) & ~0x1F) === 0 && ((1 << (_la - 39)) & ((1 << (CashScriptParser.T__38 - 39)) | (1 << (CashScriptParser.T__39 - 39)) | (1 << (CashScriptParser.T__51 - 39)) | (1 << (CashScriptParser.T__52 - 39)) | (1 << (CashScriptParser.T__53 - 39)) | (1 << (CashScriptParser.T__54 - 39)) | (1 << (CashScriptParser.T__55 - 39)) | (1 << (CashScriptParser.T__56 - 39)) | (1 << (CashScriptParser.BooleanLiteral - 39)) | (1 << (CashScriptParser.NumberLiteral - 39)) | (1 << (CashScriptParser.Bytes - 39)) | (1 << (CashScriptParser.StringLiteral - 39)) | (1 << (CashScriptParser.DateLiteral - 39)) | (1 << (CashScriptParser.HexLiteral - 39)) | (1 << (CashScriptParser.NullaryOp - 39)) | (1 << (CashScriptParser.Identifier - 39)))) !== 0)) {
 				{
-				this.state = 192;
+				this.state = 221;
 				this.expression(0);
-				this.state = 197;
+				this.state = 226;
 				this._errHandler.sync(this);
-				_alt = this.interpreter.adaptivePredict(this._input, 13, this._ctx);
+				_alt = this.interpreter.adaptivePredict(this._input, 16, this._ctx);
 				while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
 					if (_alt === 1) {
 						{
 						{
-						this.state = 193;
+						this.state = 222;
 						this.match(CashScriptParser.T__15);
-						this.state = 194;
+						this.state = 223;
 						this.expression(0);
 						}
 						}
 					}
-					this.state = 199;
+					this.state = 228;
 					this._errHandler.sync(this);
-					_alt = this.interpreter.adaptivePredict(this._input, 13, this._ctx);
+					_alt = this.interpreter.adaptivePredict(this._input, 16, this._ctx);
 				}
-				this.state = 201;
+				this.state = 230;
 				this._errHandler.sync(this);
 				_la = this._input.LA(1);
 				if (_la === CashScriptParser.T__15) {
 					{
-					this.state = 200;
+					this.state = 229;
 					this.match(CashScriptParser.T__15);
 					}
 				}
@@ -1029,7 +1171,7 @@ export class CashScriptParser extends Parser {
 				}
 			}
 
-			this.state = 205;
+			this.state = 234;
 			this.match(CashScriptParser.T__16);
 			}
 		}
@@ -1060,27 +1202,27 @@ export class CashScriptParser extends Parser {
 		let _parentState: number = this.state;
 		let _localctx: ExpressionContext = new ExpressionContext(this._ctx, _parentState);
 		let _prevctx: ExpressionContext = _localctx;
-		let _startState: number = 40;
-		this.enterRecursionRule(_localctx, 40, CashScriptParser.RULE_expression, _p);
+		let _startState: number = 46;
+		this.enterRecursionRule(_localctx, 46, CashScriptParser.RULE_expression, _p);
 		let _la: number;
 		try {
 			let _alt: number;
 			this.enterOuterAlt(_localctx, 1);
 			{
-			this.state = 263;
+			this.state = 289;
 			this._errHandler.sync(this);
-			switch ( this.interpreter.adaptivePredict(this._input, 21, this._ctx) ) {
+			switch ( this.interpreter.adaptivePredict(this._input, 24, this._ctx) ) {
 			case 1:
 				{
 				_localctx = new ParenthesisedContext(_localctx);
 				this._ctx = _localctx;
 				_prevctx = _localctx;
 
-				this.state = 208;
+				this.state = 237;
 				this.match(CashScriptParser.T__14);
-				this.state = 209;
+				this.state = 238;
 				this.expression(0);
-				this.state = 210;
+				this.state = 239;
 				this.match(CashScriptParser.T__16);
 				}
 				break;
@@ -1090,35 +1232,35 @@ export class CashScriptParser extends Parser {
 				_localctx = new CastContext(_localctx);
 				this._ctx = _localctx;
 				_prevctx = _localctx;
-				this.state = 212;
+				this.state = 241;
 				this.typeName();
-				this.state = 213;
+				this.state = 242;
 				this.match(CashScriptParser.T__14);
-				this.state = 214;
+				this.state = 243;
 				(_localctx as CastContext)._castable = this.expression(0);
-				this.state = 217;
+				this.state = 246;
 				this._errHandler.sync(this);
-				switch ( this.interpreter.adaptivePredict(this._input, 16, this._ctx) ) {
+				switch ( this.interpreter.adaptivePredict(this._input, 19, this._ctx) ) {
 				case 1:
 					{
-					this.state = 215;
+					this.state = 244;
 					this.match(CashScriptParser.T__15);
-					this.state = 216;
+					this.state = 245;
 					(_localctx as CastContext)._size = this.expression(0);
 					}
 					break;
 				}
-				this.state = 220;
+				this.state = 249;
 				this._errHandler.sync(this);
 				_la = this._input.LA(1);
 				if (_la === CashScriptParser.T__15) {
 					{
-					this.state = 219;
+					this.state = 248;
 					this.match(CashScriptParser.T__15);
 					}
 				}
 
-				this.state = 222;
+				this.state = 251;
 				this.match(CashScriptParser.T__16);
 				}
 				break;
@@ -1128,7 +1270,7 @@ export class CashScriptParser extends Parser {
 				_localctx = new FunctionCallExpressionContext(_localctx);
 				this._ctx = _localctx;
 				_prevctx = _localctx;
-				this.state = 224;
+				this.state = 253;
 				this.functionCall();
 				}
 				break;
@@ -1138,57 +1280,32 @@ export class CashScriptParser extends Parser {
 				_localctx = new InstantiationContext(_localctx);
 				this._ctx = _localctx;
 				_prevctx = _localctx;
-				this.state = 225;
-				this.match(CashScriptParser.T__20);
-				this.state = 226;
+				this.state = 254;
+				this.match(CashScriptParser.T__21);
+				this.state = 255;
 				this.match(CashScriptParser.Identifier);
-				this.state = 227;
+				this.state = 256;
 				this.expressionList();
 				}
 				break;
 
 			case 5:
-				{
-				_localctx = new ConsoleExpressionContext(_localctx);
-				this._ctx = _localctx;
-				_prevctx = _localctx;
-				this.state = 228;
-				(_localctx as ConsoleExpressionContext)._scope = this.match(CashScriptParser.T__23);
-				this.state = 229;
-				(_localctx as ConsoleExpressionContext)._op = this._input.LT(1);
-				_la = this._input.LA(1);
-				if (!(_la === CashScriptParser.T__24 || _la === CashScriptParser.T__25)) {
-					(_localctx as ConsoleExpressionContext)._op = this._errHandler.recoverInline(this);
-				} else {
-					if (this._input.LA(1) === Token.EOF) {
-						this.matchedEOF = true;
-					}
-
-					this._errHandler.reportMatch(this);
-					this.consume();
-				}
-				this.state = 230;
-				this.expressionList();
-				}
-				break;
-
-			case 6:
 				{
 				_localctx = new UnaryIntrospectionOpContext(_localctx);
 				this._ctx = _localctx;
 				_prevctx = _localctx;
-				this.state = 231;
-				(_localctx as UnaryIntrospectionOpContext)._scope = this.match(CashScriptParser.T__26);
-				this.state = 232;
-				this.match(CashScriptParser.T__21);
-				this.state = 233;
-				this.expression(0);
-				this.state = 234;
+				this.state = 257;
+				(_localctx as UnaryIntrospectionOpContext)._scope = this.match(CashScriptParser.T__24);
+				this.state = 258;
 				this.match(CashScriptParser.T__22);
-				this.state = 235;
+				this.state = 259;
+				this.expression(0);
+				this.state = 260;
+				this.match(CashScriptParser.T__23);
+				this.state = 261;
 				(_localctx as UnaryIntrospectionOpContext)._op = this._input.LT(1);
 				_la = this._input.LA(1);
-				if (!(((((_la - 28)) & ~0x1F) === 0 && ((1 << (_la - 28)) & ((1 << (CashScriptParser.T__27 - 28)) | (1 << (CashScriptParser.T__28 - 28)) | (1 << (CashScriptParser.T__29 - 28)) | (1 << (CashScriptParser.T__30 - 28)) | (1 << (CashScriptParser.T__31 - 28)))) !== 0))) {
+				if (!((((_la) & ~0x1F) === 0 && ((1 << _la) & ((1 << CashScriptParser.T__25) | (1 << CashScriptParser.T__26) | (1 << CashScriptParser.T__27) | (1 << CashScriptParser.T__28) | (1 << CashScriptParser.T__29))) !== 0))) {
 					(_localctx as UnaryIntrospectionOpContext)._op = this._errHandler.recoverInline(this);
 				} else {
 					if (this._input.LA(1) === Token.EOF) {
@@ -1201,23 +1318,23 @@ export class CashScriptParser extends Parser {
 				}
 				break;
 
-			case 7:
+			case 6:
 				{
 				_localctx = new UnaryIntrospectionOpContext(_localctx);
 				this._ctx = _localctx;
 				_prevctx = _localctx;
-				this.state = 237;
-				(_localctx as UnaryIntrospectionOpContext)._scope = this.match(CashScriptParser.T__32);
-				this.state = 238;
-				this.match(CashScriptParser.T__21);
-				this.state = 239;
-				this.expression(0);
-				this.state = 240;
+				this.state = 263;
+				(_localctx as UnaryIntrospectionOpContext)._scope = this.match(CashScriptParser.T__30);
+				this.state = 264;
 				this.match(CashScriptParser.T__22);
-				this.state = 241;
+				this.state = 265;
+				this.expression(0);
+				this.state = 266;
+				this.match(CashScriptParser.T__23);
+				this.state = 267;
 				(_localctx as UnaryIntrospectionOpContext)._op = this._input.LT(1);
 				_la = this._input.LA(1);
-				if (!(((((_la - 28)) & ~0x1F) === 0 && ((1 << (_la - 28)) & ((1 << (CashScriptParser.T__27 - 28)) | (1 << (CashScriptParser.T__28 - 28)) | (1 << (CashScriptParser.T__29 - 28)) | (1 << (CashScriptParser.T__30 - 28)) | (1 << (CashScriptParser.T__31 - 28)) | (1 << (CashScriptParser.T__33 - 28)) | (1 << (CashScriptParser.T__34 - 28)) | (1 << (CashScriptParser.T__35 - 28)) | (1 << (CashScriptParser.T__36 - 28)))) !== 0))) {
+				if (!(((((_la - 26)) & ~0x1F) === 0 && ((1 << (_la - 26)) & ((1 << (CashScriptParser.T__25 - 26)) | (1 << (CashScriptParser.T__26 - 26)) | (1 << (CashScriptParser.T__27 - 26)) | (1 << (CashScriptParser.T__28 - 26)) | (1 << (CashScriptParser.T__29 - 26)) | (1 << (CashScriptParser.T__31 - 26)) | (1 << (CashScriptParser.T__32 - 26)) | (1 << (CashScriptParser.T__33 - 26)) | (1 << (CashScriptParser.T__34 - 26)))) !== 0))) {
 					(_localctx as UnaryIntrospectionOpContext)._op = this._errHandler.recoverInline(this);
 				} else {
 					if (this._input.LA(1) === Token.EOF) {
@@ -1230,15 +1347,15 @@ export class CashScriptParser extends Parser {
 				}
 				break;
 
-			case 8:
+			case 7:
 				{
 				_localctx = new UnaryOpContext(_localctx);
 				this._ctx = _localctx;
 				_prevctx = _localctx;
-				this.state = 243;
+				this.state = 269;
 				(_localctx as UnaryOpContext)._op = this._input.LT(1);
 				_la = this._input.LA(1);
-				if (!(_la === CashScriptParser.T__40 || _la === CashScriptParser.T__41)) {
+				if (!(_la === CashScriptParser.T__38 || _la === CashScriptParser.T__39)) {
 					(_localctx as UnaryOpContext)._op = this._errHandler.recoverInline(this);
 				} else {
 					if (this._input.LA(1) === Token.EOF) {
@@ -1248,49 +1365,49 @@ export class CashScriptParser extends Parser {
 					this._errHandler.reportMatch(this);
 					this.consume();
 				}
-				this.state = 244;
+				this.state = 270;
 				this.expression(14);
 				}
 				break;
 
-			case 9:
+			case 8:
 				{
 				_localctx = new ArrayContext(_localctx);
 				this._ctx = _localctx;
 				_prevctx = _localctx;
-				this.state = 245;
-				this.match(CashScriptParser.T__21);
-				this.state = 257;
+				this.state = 271;
+				this.match(CashScriptParser.T__22);
+				this.state = 283;
 				this._errHandler.sync(this);
 				_la = this._input.LA(1);
-				if (((((_la - 15)) & ~0x1F) === 0 && ((1 << (_la - 15)) & ((1 << (CashScriptParser.T__14 - 15)) | (1 << (CashScriptParser.T__20 - 15)) | (1 << (CashScriptParser.T__21 - 15)) | (1 << (CashScriptParser.T__23 - 15)) | (1 << (CashScriptParser.T__26 - 15)) | (1 << (CashScriptParser.T__32 - 15)) | (1 << (CashScriptParser.T__40 - 15)) | (1 << (CashScriptParser.T__41 - 15)))) !== 0) || ((((_la - 54)) & ~0x1F) === 0 && ((1 << (_la - 54)) & ((1 << (CashScriptParser.T__53 - 54)) | (1 << (CashScriptParser.T__54 - 54)) | (1 << (CashScriptParser.T__55 - 54)) | (1 << (CashScriptParser.T__56 - 54)) | (1 << (CashScriptParser.T__57 - 54)) | (1 << (CashScriptParser.T__58 - 54)) | (1 << (CashScriptParser.BooleanLiteral - 54)) | (1 << (CashScriptParser.NumberLiteral - 54)) | (1 << (CashScriptParser.Bytes - 54)) | (1 << (CashScriptParser.StringLiteral - 54)) | (1 << (CashScriptParser.DateLiteral - 54)) | (1 << (CashScriptParser.HexLiteral - 54)) | (1 << (CashScriptParser.NullaryOp - 54)) | (1 << (CashScriptParser.Identifier - 54)))) !== 0)) {
+				if ((((_la) & ~0x1F) === 0 && ((1 << _la) & ((1 << CashScriptParser.T__14) | (1 << CashScriptParser.T__21) | (1 << CashScriptParser.T__22) | (1 << CashScriptParser.T__24) | (1 << CashScriptParser.T__30))) !== 0) || ((((_la - 39)) & ~0x1F) === 0 && ((1 << (_la - 39)) & ((1 << (CashScriptParser.T__38 - 39)) | (1 << (CashScriptParser.T__39 - 39)) | (1 << (CashScriptParser.T__51 - 39)) | (1 << (CashScriptParser.T__52 - 39)) | (1 << (CashScriptParser.T__53 - 39)) | (1 << (CashScriptParser.T__54 - 39)) | (1 << (CashScriptParser.T__55 - 39)) | (1 << (CashScriptParser.T__56 - 39)) | (1 << (CashScriptParser.BooleanLiteral - 39)) | (1 << (CashScriptParser.NumberLiteral - 39)) | (1 << (CashScriptParser.Bytes - 39)) | (1 << (CashScriptParser.StringLiteral - 39)) | (1 << (CashScriptParser.DateLiteral - 39)) | (1 << (CashScriptParser.HexLiteral - 39)) | (1 << (CashScriptParser.NullaryOp - 39)) | (1 << (CashScriptParser.Identifier - 39)))) !== 0)) {
 					{
-					this.state = 246;
+					this.state = 272;
 					this.expression(0);
-					this.state = 251;
+					this.state = 277;
 					this._errHandler.sync(this);
-					_alt = this.interpreter.adaptivePredict(this._input, 18, this._ctx);
+					_alt = this.interpreter.adaptivePredict(this._input, 21, this._ctx);
 					while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
 						if (_alt === 1) {
 							{
 							{
-							this.state = 247;
+							this.state = 273;
 							this.match(CashScriptParser.T__15);
-							this.state = 248;
+							this.state = 274;
 							this.expression(0);
 							}
 							}
 						}
-						this.state = 253;
+						this.state = 279;
 						this._errHandler.sync(this);
-						_alt = this.interpreter.adaptivePredict(this._input, 18, this._ctx);
+						_alt = this.interpreter.adaptivePredict(this._input, 21, this._ctx);
 					}
-					this.state = 255;
+					this.state = 281;
 					this._errHandler.sync(this);
 					_la = this._input.LA(1);
 					if (_la === CashScriptParser.T__15) {
 						{
-						this.state = 254;
+						this.state = 280;
 						this.match(CashScriptParser.T__15);
 						}
 					}
@@ -1298,45 +1415,45 @@ export class CashScriptParser extends Parser {
 					}
 				}
 
-				this.state = 259;
-				this.match(CashScriptParser.T__22);
+				this.state = 285;
+				this.match(CashScriptParser.T__23);
 				}
 				break;
 
-			case 10:
+			case 9:
 				{
 				_localctx = new NullaryOpContext(_localctx);
 				this._ctx = _localctx;
 				_prevctx = _localctx;
-				this.state = 260;
+				this.state = 286;
 				this.match(CashScriptParser.NullaryOp);
 				}
 				break;
 
-			case 11:
+			case 10:
 				{
 				_localctx = new IdentifierContext(_localctx);
 				this._ctx = _localctx;
 				_prevctx = _localctx;
-				this.state = 261;
+				this.state = 287;
 				this.match(CashScriptParser.Identifier);
 				}
 				break;
 
-			case 12:
+			case 11:
 				{
 				_localctx = new LiteralExpressionContext(_localctx);
 				this._ctx = _localctx;
 				_prevctx = _localctx;
-				this.state = 262;
+				this.state = 288;
 				this.literal();
 				}
 				break;
 			}
 			this._ctx._stop = this._input.tryLT(-1);
-			this.state = 306;
+			this.state = 332;
 			this._errHandler.sync(this);
-			_alt = this.interpreter.adaptivePredict(this._input, 23, this._ctx);
+			_alt = this.interpreter.adaptivePredict(this._input, 26, this._ctx);
 			while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
 				if (_alt === 1) {
 					if (this._parseListeners != null) {
@@ -1344,22 +1461,22 @@ export class CashScriptParser extends Parser {
 					}
 					_prevctx = _localctx;
 					{
-					this.state = 304;
+					this.state = 330;
 					this._errHandler.sync(this);
-					switch ( this.interpreter.adaptivePredict(this._input, 22, this._ctx) ) {
+					switch ( this.interpreter.adaptivePredict(this._input, 25, this._ctx) ) {
 					case 1:
 						{
 						_localctx = new BinaryOpContext(new ExpressionContext(_parentctx, _parentState));
 						(_localctx as BinaryOpContext)._left = _prevctx;
 						this.pushNewRecursionContext(_localctx, _startState, CashScriptParser.RULE_expression);
-						this.state = 265;
+						this.state = 291;
 						if (!(this.precpred(this._ctx, 13))) {
 							throw this.createFailedPredicateException("this.precpred(this._ctx, 13)");
 						}
-						this.state = 266;
+						this.state = 292;
 						(_localctx as BinaryOpContext)._op = this._input.LT(1);
 						_la = this._input.LA(1);
-						if (!(((((_la - 43)) & ~0x1F) === 0 && ((1 << (_la - 43)) & ((1 << (CashScriptParser.T__42 - 43)) | (1 << (CashScriptParser.T__43 - 43)) | (1 << (CashScriptParser.T__44 - 43)))) !== 0))) {
+						if (!(((((_la - 41)) & ~0x1F) === 0 && ((1 << (_la - 41)) & ((1 << (CashScriptParser.T__40 - 41)) | (1 << (CashScriptParser.T__41 - 41)) | (1 << (CashScriptParser.T__42 - 41)))) !== 0))) {
 							(_localctx as BinaryOpContext)._op = this._errHandler.recoverInline(this);
 						} else {
 							if (this._input.LA(1) === Token.EOF) {
@@ -1369,7 +1486,7 @@ export class CashScriptParser extends Parser {
 							this._errHandler.reportMatch(this);
 							this.consume();
 						}
-						this.state = 267;
+						this.state = 293;
 						(_localctx as BinaryOpContext)._right = this.expression(14);
 						}
 						break;
@@ -1379,14 +1496,14 @@ export class CashScriptParser extends Parser {
 						_localctx = new BinaryOpContext(new ExpressionContext(_parentctx, _parentState));
 						(_localctx as BinaryOpContext)._left = _prevctx;
 						this.pushNewRecursionContext(_localctx, _startState, CashScriptParser.RULE_expression);
-						this.state = 268;
+						this.state = 294;
 						if (!(this.precpred(this._ctx, 12))) {
 							throw this.createFailedPredicateException("this.precpred(this._ctx, 12)");
 						}
-						this.state = 269;
+						this.state = 295;
 						(_localctx as BinaryOpContext)._op = this._input.LT(1);
 						_la = this._input.LA(1);
-						if (!(_la === CashScriptParser.T__41 || _la === CashScriptParser.T__45)) {
+						if (!(_la === CashScriptParser.T__39 || _la === CashScriptParser.T__43)) {
 							(_localctx as BinaryOpContext)._op = this._errHandler.recoverInline(this);
 						} else {
 							if (this._input.LA(1) === Token.EOF) {
@@ -1396,7 +1513,7 @@ export class CashScriptParser extends Parser {
 							this._errHandler.reportMatch(this);
 							this.consume();
 						}
-						this.state = 270;
+						this.state = 296;
 						(_localctx as BinaryOpContext)._right = this.expression(13);
 						}
 						break;
@@ -1406,11 +1523,11 @@ export class CashScriptParser extends Parser {
 						_localctx = new BinaryOpContext(new ExpressionContext(_parentctx, _parentState));
 						(_localctx as BinaryOpContext)._left = _prevctx;
 						this.pushNewRecursionContext(_localctx, _startState, CashScriptParser.RULE_expression);
-						this.state = 271;
+						this.state = 297;
 						if (!(this.precpred(this._ctx, 11))) {
 							throw this.createFailedPredicateException("this.precpred(this._ctx, 11)");
 						}
-						this.state = 272;
+						this.state = 298;
 						(_localctx as BinaryOpContext)._op = this._input.LT(1);
 						_la = this._input.LA(1);
 						if (!((((_la) & ~0x1F) === 0 && ((1 << _la) & ((1 << CashScriptParser.T__5) | (1 << CashScriptParser.T__6) | (1 << CashScriptParser.T__7) | (1 << CashScriptParser.T__8))) !== 0))) {
@@ -1423,7 +1540,7 @@ export class CashScriptParser extends Parser {
 							this._errHandler.reportMatch(this);
 							this.consume();
 						}
-						this.state = 273;
+						this.state = 299;
 						(_localctx as BinaryOpContext)._right = this.expression(12);
 						}
 						break;
@@ -1433,14 +1550,14 @@ export class CashScriptParser extends Parser {
 						_localctx = new BinaryOpContext(new ExpressionContext(_parentctx, _parentState));
 						(_localctx as BinaryOpContext)._left = _prevctx;
 						this.pushNewRecursionContext(_localctx, _startState, CashScriptParser.RULE_expression);
-						this.state = 274;
+						this.state = 300;
 						if (!(this.precpred(this._ctx, 10))) {
 							throw this.createFailedPredicateException("this.precpred(this._ctx, 10)");
 						}
-						this.state = 275;
+						this.state = 301;
 						(_localctx as BinaryOpContext)._op = this._input.LT(1);
 						_la = this._input.LA(1);
-						if (!(_la === CashScriptParser.T__46 || _la === CashScriptParser.T__47)) {
+						if (!(_la === CashScriptParser.T__44 || _la === CashScriptParser.T__45)) {
 							(_localctx as BinaryOpContext)._op = this._errHandler.recoverInline(this);
 						} else {
 							if (this._input.LA(1) === Token.EOF) {
@@ -1450,7 +1567,7 @@ export class CashScriptParser extends Parser {
 							this._errHandler.reportMatch(this);
 							this.consume();
 						}
-						this.state = 276;
+						this.state = 302;
 						(_localctx as BinaryOpContext)._right = this.expression(11);
 						}
 						break;
@@ -1460,13 +1577,13 @@ export class CashScriptParser extends Parser {
 						_localctx = new BinaryOpContext(new ExpressionContext(_parentctx, _parentState));
 						(_localctx as BinaryOpContext)._left = _prevctx;
 						this.pushNewRecursionContext(_localctx, _startState, CashScriptParser.RULE_expression);
-						this.state = 277;
+						this.state = 303;
 						if (!(this.precpred(this._ctx, 9))) {
 							throw this.createFailedPredicateException("this.precpred(this._ctx, 9)");
 						}
-						this.state = 278;
-						(_localctx as BinaryOpContext)._op = this.match(CashScriptParser.T__48);
-						this.state = 279;
+						this.state = 304;
+						(_localctx as BinaryOpContext)._op = this.match(CashScriptParser.T__46);
+						this.state = 305;
 						(_localctx as BinaryOpContext)._right = this.expression(10);
 						}
 						break;
@@ -1476,13 +1593,13 @@ export class CashScriptParser extends Parser {
 						_localctx = new BinaryOpContext(new ExpressionContext(_parentctx, _parentState));
 						(_localctx as BinaryOpContext)._left = _prevctx;
 						this.pushNewRecursionContext(_localctx, _startState, CashScriptParser.RULE_expression);
-						this.state = 280;
+						this.state = 306;
 						if (!(this.precpred(this._ctx, 8))) {
 							throw this.createFailedPredicateException("this.precpred(this._ctx, 8)");
 						}
-						this.state = 281;
+						this.state = 307;
 						(_localctx as BinaryOpContext)._op = this.match(CashScriptParser.T__3);
-						this.state = 282;
+						this.state = 308;
 						(_localctx as BinaryOpContext)._right = this.expression(9);
 						}
 						break;
@@ -1492,13 +1609,13 @@ export class CashScriptParser extends Parser {
 						_localctx = new BinaryOpContext(new ExpressionContext(_parentctx, _parentState));
 						(_localctx as BinaryOpContext)._left = _prevctx;
 						this.pushNewRecursionContext(_localctx, _startState, CashScriptParser.RULE_expression);
-						this.state = 283;
+						this.state = 309;
 						if (!(this.precpred(this._ctx, 7))) {
 							throw this.createFailedPredicateException("this.precpred(this._ctx, 7)");
 						}
-						this.state = 284;
-						(_localctx as BinaryOpContext)._op = this.match(CashScriptParser.T__49);
-						this.state = 285;
+						this.state = 310;
+						(_localctx as BinaryOpContext)._op = this.match(CashScriptParser.T__47);
+						this.state = 311;
 						(_localctx as BinaryOpContext)._right = this.expression(8);
 						}
 						break;
@@ -1508,13 +1625,13 @@ export class CashScriptParser extends Parser {
 						_localctx = new BinaryOpContext(new ExpressionContext(_parentctx, _parentState));
 						(_localctx as BinaryOpContext)._left = _prevctx;
 						this.pushNewRecursionContext(_localctx, _startState, CashScriptParser.RULE_expression);
-						this.state = 286;
+						this.state = 312;
 						if (!(this.precpred(this._ctx, 6))) {
 							throw this.createFailedPredicateException("this.precpred(this._ctx, 6)");
 						}
-						this.state = 287;
-						(_localctx as BinaryOpContext)._op = this.match(CashScriptParser.T__50);
-						this.state = 288;
+						this.state = 313;
+						(_localctx as BinaryOpContext)._op = this.match(CashScriptParser.T__48);
+						this.state = 314;
 						(_localctx as BinaryOpContext)._right = this.expression(7);
 						}
 						break;
@@ -1524,13 +1641,13 @@ export class CashScriptParser extends Parser {
 						_localctx = new BinaryOpContext(new ExpressionContext(_parentctx, _parentState));
 						(_localctx as BinaryOpContext)._left = _prevctx;
 						this.pushNewRecursionContext(_localctx, _startState, CashScriptParser.RULE_expression);
-						this.state = 289;
+						this.state = 315;
 						if (!(this.precpred(this._ctx, 5))) {
 							throw this.createFailedPredicateException("this.precpred(this._ctx, 5)");
 						}
-						this.state = 290;
-						(_localctx as BinaryOpContext)._op = this.match(CashScriptParser.T__51);
-						this.state = 291;
+						this.state = 316;
+						(_localctx as BinaryOpContext)._op = this.match(CashScriptParser.T__49);
+						this.state = 317;
 						(_localctx as BinaryOpContext)._right = this.expression(6);
 						}
 						break;
@@ -1539,16 +1656,16 @@ export class CashScriptParser extends Parser {
 						{
 						_localctx = new TupleIndexOpContext(new ExpressionContext(_parentctx, _parentState));
 						this.pushNewRecursionContext(_localctx, _startState, CashScriptParser.RULE_expression);
-						this.state = 292;
-						if (!(this.precpred(this._ctx, 20))) {
-							throw this.createFailedPredicateException("this.precpred(this._ctx, 20)");
+						this.state = 318;
+						if (!(this.precpred(this._ctx, 19))) {
+							throw this.createFailedPredicateException("this.precpred(this._ctx, 19)");
 						}
-						this.state = 293;
-						this.match(CashScriptParser.T__21);
-						this.state = 294;
-						(_localctx as TupleIndexOpContext)._index = this.match(CashScriptParser.NumberLiteral);
-						this.state = 295;
+						this.state = 319;
 						this.match(CashScriptParser.T__22);
+						this.state = 320;
+						(_localctx as TupleIndexOpContext)._index = this.match(CashScriptParser.NumberLiteral);
+						this.state = 321;
+						this.match(CashScriptParser.T__23);
 						}
 						break;
 
@@ -1556,14 +1673,14 @@ export class CashScriptParser extends Parser {
 						{
 						_localctx = new UnaryOpContext(new ExpressionContext(_parentctx, _parentState));
 						this.pushNewRecursionContext(_localctx, _startState, CashScriptParser.RULE_expression);
-						this.state = 296;
+						this.state = 322;
 						if (!(this.precpred(this._ctx, 16))) {
 							throw this.createFailedPredicateException("this.precpred(this._ctx, 16)");
 						}
-						this.state = 297;
+						this.state = 323;
 						(_localctx as UnaryOpContext)._op = this._input.LT(1);
 						_la = this._input.LA(1);
-						if (!(_la === CashScriptParser.T__37 || _la === CashScriptParser.T__38)) {
+						if (!(_la === CashScriptParser.T__35 || _la === CashScriptParser.T__36)) {
 							(_localctx as UnaryOpContext)._op = this._errHandler.recoverInline(this);
 						} else {
 							if (this._input.LA(1) === Token.EOF) {
@@ -1581,26 +1698,26 @@ export class CashScriptParser extends Parser {
 						_localctx = new BinaryOpContext(new ExpressionContext(_parentctx, _parentState));
 						(_localctx as BinaryOpContext)._left = _prevctx;
 						this.pushNewRecursionContext(_localctx, _startState, CashScriptParser.RULE_expression);
-						this.state = 298;
+						this.state = 324;
 						if (!(this.precpred(this._ctx, 15))) {
 							throw this.createFailedPredicateException("this.precpred(this._ctx, 15)");
 						}
-						this.state = 299;
-						(_localctx as BinaryOpContext)._op = this.match(CashScriptParser.T__39);
-						this.state = 300;
+						this.state = 325;
+						(_localctx as BinaryOpContext)._op = this.match(CashScriptParser.T__37);
+						this.state = 326;
 						this.match(CashScriptParser.T__14);
-						this.state = 301;
+						this.state = 327;
 						(_localctx as BinaryOpContext)._right = this.expression(0);
-						this.state = 302;
+						this.state = 328;
 						this.match(CashScriptParser.T__16);
 						}
 						break;
 					}
 					}
 				}
-				this.state = 308;
+				this.state = 334;
 				this._errHandler.sync(this);
-				_alt = this.interpreter.adaptivePredict(this._input, 23, this._ctx);
+				_alt = this.interpreter.adaptivePredict(this._input, 26, this._ctx);
 			}
 			}
 		}
@@ -1621,12 +1738,12 @@ export class CashScriptParser extends Parser {
 	// @RuleVersion(0)
 	public modifier(): ModifierContext {
 		let _localctx: ModifierContext = new ModifierContext(this._ctx, this.state);
-		this.enterRule(_localctx, 42, CashScriptParser.RULE_modifier);
+		this.enterRule(_localctx, 48, CashScriptParser.RULE_modifier);
 		try {
 			this.enterOuterAlt(_localctx, 1);
 			{
-			this.state = 309;
-			this.match(CashScriptParser.T__52);
+			this.state = 335;
+			this.match(CashScriptParser.T__50);
 			}
 		}
 		catch (re) {
@@ -1646,43 +1763,43 @@ export class CashScriptParser extends Parser {
 	// @RuleVersion(0)
 	public literal(): LiteralContext {
 		let _localctx: LiteralContext = new LiteralContext(this._ctx, this.state);
-		this.enterRule(_localctx, 44, CashScriptParser.RULE_literal);
+		this.enterRule(_localctx, 50, CashScriptParser.RULE_literal);
 		try {
-			this.state = 316;
+			this.state = 342;
 			this._errHandler.sync(this);
 			switch (this._input.LA(1)) {
 			case CashScriptParser.BooleanLiteral:
 				this.enterOuterAlt(_localctx, 1);
 				{
-				this.state = 311;
+				this.state = 337;
 				this.match(CashScriptParser.BooleanLiteral);
 				}
 				break;
 			case CashScriptParser.NumberLiteral:
 				this.enterOuterAlt(_localctx, 2);
 				{
-				this.state = 312;
+				this.state = 338;
 				this.numberLiteral();
 				}
 				break;
 			case CashScriptParser.StringLiteral:
 				this.enterOuterAlt(_localctx, 3);
 				{
-				this.state = 313;
+				this.state = 339;
 				this.match(CashScriptParser.StringLiteral);
 				}
 				break;
 			case CashScriptParser.DateLiteral:
 				this.enterOuterAlt(_localctx, 4);
 				{
-				this.state = 314;
+				this.state = 340;
 				this.match(CashScriptParser.DateLiteral);
 				}
 				break;
 			case CashScriptParser.HexLiteral:
 				this.enterOuterAlt(_localctx, 5);
 				{
-				this.state = 315;
+				this.state = 341;
 				this.match(CashScriptParser.HexLiteral);
 				}
 				break;
@@ -1707,18 +1824,18 @@ export class CashScriptParser extends Parser {
 	// @RuleVersion(0)
 	public numberLiteral(): NumberLiteralContext {
 		let _localctx: NumberLiteralContext = new NumberLiteralContext(this._ctx, this.state);
-		this.enterRule(_localctx, 46, CashScriptParser.RULE_numberLiteral);
+		this.enterRule(_localctx, 52, CashScriptParser.RULE_numberLiteral);
 		try {
 			this.enterOuterAlt(_localctx, 1);
 			{
-			this.state = 318;
+			this.state = 344;
 			this.match(CashScriptParser.NumberLiteral);
-			this.state = 320;
+			this.state = 346;
 			this._errHandler.sync(this);
-			switch ( this.interpreter.adaptivePredict(this._input, 25, this._ctx) ) {
+			switch ( this.interpreter.adaptivePredict(this._input, 28, this._ctx) ) {
 			case 1:
 				{
-				this.state = 319;
+				this.state = 345;
 				this.match(CashScriptParser.NumberUnit);
 				}
 				break;
@@ -1742,14 +1859,14 @@ export class CashScriptParser extends Parser {
 	// @RuleVersion(0)
 	public typeName(): TypeNameContext {
 		let _localctx: TypeNameContext = new TypeNameContext(this._ctx, this.state);
-		this.enterRule(_localctx, 48, CashScriptParser.RULE_typeName);
+		this.enterRule(_localctx, 54, CashScriptParser.RULE_typeName);
 		let _la: number;
 		try {
 			this.enterOuterAlt(_localctx, 1);
 			{
-			this.state = 322;
+			this.state = 348;
 			_la = this._input.LA(1);
-			if (!(((((_la - 54)) & ~0x1F) === 0 && ((1 << (_la - 54)) & ((1 << (CashScriptParser.T__53 - 54)) | (1 << (CashScriptParser.T__54 - 54)) | (1 << (CashScriptParser.T__55 - 54)) | (1 << (CashScriptParser.T__56 - 54)) | (1 << (CashScriptParser.T__57 - 54)) | (1 << (CashScriptParser.T__58 - 54)) | (1 << (CashScriptParser.Bytes - 54)))) !== 0))) {
+			if (!(((((_la - 52)) & ~0x1F) === 0 && ((1 << (_la - 52)) & ((1 << (CashScriptParser.T__51 - 52)) | (1 << (CashScriptParser.T__52 - 52)) | (1 << (CashScriptParser.T__53 - 52)) | (1 << (CashScriptParser.T__54 - 52)) | (1 << (CashScriptParser.T__55 - 52)) | (1 << (CashScriptParser.T__56 - 52)) | (1 << (CashScriptParser.Bytes - 52)))) !== 0))) {
 			this._errHandler.recoverInline(this);
 			} else {
 				if (this._input.LA(1) === Token.EOF) {
@@ -1778,7 +1895,7 @@ export class CashScriptParser extends Parser {
 
 	public sempred(_localctx: RuleContext, ruleIndex: number, predIndex: number): boolean {
 		switch (ruleIndex) {
-		case 20:
+		case 23:
 			return this.expression_sempred(_localctx as ExpressionContext, predIndex);
 		}
 		return true;
@@ -1813,7 +1930,7 @@ export class CashScriptParser extends Parser {
 			return this.precpred(this._ctx, 5);
 
 		case 9:
-			return this.precpred(this._ctx, 20);
+			return this.precpred(this._ctx, 19);
 
 		case 10:
 			return this.precpred(this._ctx, 16);
@@ -1825,160 +1942,174 @@ export class CashScriptParser extends Parser {
 	}
 
 	public static readonly _serializedATN: string =
-		"\x03\uC91D\uCABA\u058D\uAFBA\u4F53\u0607\uEA8B\uC241\x03L\u0147\x04\x02" +
+		"\x03\uC91D\uCABA\u058D\uAFBA\u4F53\u0607\uEA8B\uC241\x03J\u0161\x04\x02" +
 		"\t\x02\x04\x03\t\x03\x04\x04\t\x04\x04\x05\t\x05\x04\x06\t\x06\x04\x07" +
 		"\t\x07\x04\b\t\b\x04\t\t\t\x04\n\t\n\x04\v\t\v\x04\f\t\f\x04\r\t\r\x04" +
 		"\x0E\t\x0E\x04\x0F\t\x0F\x04\x10\t\x10\x04\x11\t\x11\x04\x12\t\x12\x04" +
 		"\x13\t\x13\x04\x14\t\x14\x04\x15\t\x15\x04\x16\t\x16\x04\x17\t\x17\x04" +
-		"\x18\t\x18\x04\x19\t\x19\x04\x1A\t\x1A\x03\x02\x07\x026\n\x02\f\x02\x0E" +
-		"\x029\v\x02\x03\x02\x03\x02\x03\x02\x03\x03\x03\x03\x03\x03\x03\x03\x03" +
-		"\x03\x03\x04\x03\x04\x03\x05\x03\x05\x05\x05G\n\x05\x03\x06\x05\x06J\n" +
-		"\x06\x03\x06\x03\x06\x03\x07\x03\x07\x03\b\x03\b\x03\b\x03\b\x03\b\x07" +
-		"\bU\n\b\f\b\x0E\bX\v\b\x03\b\x03\b\x03\t\x03\t\x03\t\x03\t\x03\t\x07\t" +
-		"a\n\t\f\t\x0E\td\v\t\x03\t\x03\t\x03\n\x03\n\x03\n\x03\n\x07\nl\n\n\f" +
-		"\n\x0E\no\v\n\x03\n\x05\nr\n\n\x05\nt\n\n\x03\n\x03\n\x03\v\x03\v\x03" +
-		"\v\x03\f\x03\f\x07\f}\n\f\f\f\x0E\f\x80\v\f\x03\f\x03\f\x05\f\x84\n\f" +
-		"\x03\r\x03\r\x03\r\x03\r\x03\r\x03\r\x05\r\x8C\n\r\x03\x0E\x03\x0E\x07" +
-		"\x0E\x90\n\x0E\f\x0E\x0E\x0E\x93\v\x0E\x03\x0E\x03\x0E\x03\x0E\x03\x0E" +
-		"\x03\x0E\x03\x0F\x03\x0F\x03\x0F\x03\x0F\x03\x0F\x03\x0F\x03\x0F\x03\x0F" +
-		"\x03\x0F\x03\x10\x03\x10\x03\x10\x03\x10\x03\x10\x03\x11\x03\x11\x03\x11" +
-		"\x03\x11\x03\x11\x03\x11\x03\x11\x03\x11\x03\x12\x03\x12\x03\x12\x03\x12" +
-		"\x03\x12\x03\x12\x03\x13\x03\x13\x03\x13\x03\x13\x03\x13\x03\x13\x03\x13" +
-		"\x05\x13\xBD\n\x13\x03\x14\x03\x14\x03\x14\x03\x15\x03\x15\x03\x15\x03" +
-		"\x15\x07\x15\xC6\n\x15\f\x15\x0E\x15\xC9\v\x15\x03\x15\x05\x15\xCC\n\x15" +
-		"\x05\x15\xCE\n\x15\x03\x15\x03\x15\x03\x16\x03\x16\x03\x16\x03\x16\x03" +
-		"\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x05\x16\xDC\n\x16\x03\x16" +
-		"\x05\x16\xDF\n\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03" +
-		"\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03" +
-		"\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03" +
-		"\x16\x03\x16\x03\x16\x07\x16\xFC\n\x16\f\x16\x0E\x16\xFF\v\x16\x03\x16" +
-		"\x05\x16\u0102\n\x16\x05\x16\u0104\n\x16\x03\x16\x03\x16\x03\x16\x03\x16" +
-		"\x05\x16\u010A\n\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03" +
-		"\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03" +
-		"\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03" +
-		"\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03" +
-		"\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x07\x16\u0133\n\x16\f\x16" +
-		"\x0E\x16\u0136\v\x16\x03\x17\x03\x17\x03\x18\x03\x18\x03\x18\x03\x18\x03" +
-		"\x18\x05\x18\u013F\n\x18\x03\x19\x03\x19\x05\x19\u0143\n\x19\x03\x1A\x03" +
-		"\x1A\x03\x1A\x02\x02\x03*\x1B\x02\x02\x04\x02\x06\x02\b\x02\n\x02\f\x02" +
-		"\x0E\x02\x10\x02\x12\x02\x14\x02\x16\x02\x18\x02\x1A\x02\x1C\x02\x1E\x02" +
-		" \x02\"\x02$\x02&\x02(\x02*\x02,\x02.\x020\x022\x02\x02\r\x03\x02\x06" +
-		"\f\x03\x02\x1B\x1C\x03\x02\x1E\"\x04\x02\x1E\"$\'\x03\x02+,\x03\x02-/" +
-		"\x04\x02,,00\x03\x02\b\v\x03\x0212\x03\x02()\x04\x028=BB\x02\u0162\x02" +
-		"7\x03\x02\x02\x02\x04=\x03\x02\x02\x02\x06B\x03\x02\x02\x02\bD\x03\x02" +
-		"\x02\x02\nI\x03\x02\x02\x02\fM\x03\x02\x02\x02\x0EO\x03\x02\x02\x02\x10" +
-		"[\x03\x02\x02\x02\x12g\x03\x02\x02\x02\x14w\x03\x02\x02\x02\x16\x83\x03" +
-		"\x02\x02\x02\x18\x8B\x03\x02\x02\x02\x1A\x8D\x03\x02\x02\x02\x1C\x99\x03" +
-		"\x02\x02\x02\x1E\xA2\x03\x02\x02\x02 \xA7\x03\x02\x02\x02\"\xAF\x03\x02" +
-		"\x02\x02$\xB5\x03\x02\x02\x02&\xBE\x03\x02\x02\x02(\xC1\x03\x02\x02\x02" +
-		"*\u0109\x03\x02\x02\x02,\u0137\x03\x02\x02\x02.\u013E\x03\x02\x02\x02" +
-		"0\u0140\x03\x02\x02\x022\u0144\x03\x02\x02\x0246\x05\x04\x03\x0254\x03" +
-		"\x02\x02\x0269\x03\x02\x02\x0275\x03\x02\x02\x0278\x03\x02\x02\x028:\x03" +
-		"\x02\x02\x0297\x03\x02\x02\x02:;\x05\x0E\b\x02;<\x07\x02\x02\x03<\x03" +
-		"\x03\x02\x02\x02=>\x07\x03\x02\x02>?\x05\x06\x04\x02?@\x05\b\x05\x02@" +
-		"A\x07\x04\x02\x02A\x05\x03\x02\x02\x02BC\x07\x05\x02\x02C\x07\x03\x02" +
-		"\x02\x02DF\x05\n\x06\x02EG\x05\n\x06\x02FE\x03\x02\x02\x02FG\x03\x02\x02" +
-		"\x02G\t\x03\x02\x02\x02HJ\x05\f\x07\x02IH\x03\x02\x02\x02IJ\x03\x02\x02" +
-		"\x02JK\x03\x02\x02\x02KL\x07>\x02\x02L\v\x03\x02\x02\x02MN\t\x02\x02\x02" +
-		"N\r\x03\x02\x02\x02OP\x07\r\x02\x02PQ\x07I\x02\x02QR\x05\x12\n\x02RV\x07" +
-		"\x0E\x02\x02SU\x05\x10\t\x02TS\x03\x02\x02\x02UX\x03\x02\x02\x02VT\x03" +
-		"\x02\x02\x02VW\x03\x02\x02\x02WY\x03\x02\x02\x02XV\x03\x02\x02\x02YZ\x07" +
-		"\x0F\x02\x02Z\x0F\x03\x02\x02\x02[\\\x07\x10\x02\x02\\]\x07I\x02\x02]" +
-		"^\x05\x12\n\x02^b\x07\x0E\x02\x02_a\x05\x18\r\x02`_\x03\x02\x02\x02ad" +
-		"\x03\x02\x02\x02b`\x03\x02\x02\x02bc\x03\x02\x02\x02ce\x03\x02\x02\x02" +
-		"db\x03\x02\x02\x02ef\x07\x0F\x02\x02f\x11\x03\x02\x02\x02gs\x07\x11\x02" +
-		"\x02hm\x05\x14\v\x02ij\x07\x12\x02\x02jl\x05\x14\v\x02ki\x03\x02\x02\x02" +
-		"lo\x03\x02\x02\x02mk\x03\x02\x02\x02mn\x03\x02\x02\x02nq\x03\x02\x02\x02" +
-		"om\x03\x02\x02\x02pr\x07\x12\x02\x02qp\x03\x02\x02\x02qr\x03\x02\x02\x02" +
-		"rt\x03\x02\x02\x02sh\x03\x02\x02\x02st\x03\x02\x02\x02tu\x03\x02\x02\x02" +
-		"uv\x07\x13\x02\x02v\x13\x03\x02\x02\x02wx\x052\x1A\x02xy\x07I\x02\x02" +
-		"y\x15\x03\x02\x02\x02z~\x07\x0E\x02\x02{}\x05\x18\r\x02|{\x03\x02\x02" +
-		"\x02}\x80\x03\x02\x02\x02~|\x03\x02\x02\x02~\x7F\x03\x02\x02\x02\x7F\x81" +
-		"\x03\x02\x02\x02\x80~\x03\x02\x02\x02\x81\x84\x07\x0F\x02\x02\x82\x84" +
-		"\x05\x18\r\x02\x83z\x03\x02\x02\x02\x83\x82\x03\x02\x02\x02\x84\x17\x03" +
-		"\x02\x02\x02\x85\x8C\x05\x1A\x0E\x02\x86\x8C\x05\x1C\x0F\x02\x87\x8C\x05" +
-		"\x1E\x10\x02\x88\x8C\x05 \x11\x02\x89\x8C\x05\"\x12\x02\x8A\x8C\x05$\x13" +
-		"\x02\x8B\x85\x03\x02\x02\x02\x8B\x86\x03\x02\x02\x02\x8B\x87\x03\x02\x02" +
-		"\x02\x8B\x88\x03\x02\x02\x02\x8B\x89\x03\x02\x02\x02\x8B\x8A\x03\x02\x02" +
-		"\x02\x8C\x19\x03\x02\x02\x02\x8D\x91\x052\x1A\x02\x8E\x90\x05,\x17\x02" +
-		"\x8F\x8E\x03\x02\x02\x02\x90\x93\x03\x02\x02\x02\x91\x8F\x03\x02\x02\x02" +
-		"\x91\x92\x03\x02\x02\x02\x92\x94\x03\x02\x02\x02\x93\x91\x03\x02\x02\x02" +
-		"\x94\x95\x07I\x02\x02\x95\x96\x07\f\x02\x02\x96\x97\x05*\x16\x02\x97\x98" +
-		"\x07\x04\x02\x02\x98\x1B\x03\x02\x02\x02\x99\x9A\x052\x1A\x02\x9A\x9B" +
-		"\x07I\x02\x02\x9B\x9C\x07\x12\x02\x02\x9C\x9D\x052\x1A\x02\x9D\x9E\x07" +
-		"I\x02\x02\x9E\x9F\x07\f\x02\x02\x9F\xA0\x05*\x16\x02\xA0\xA1\x07\x04\x02" +
-		"\x02\xA1\x1D\x03\x02\x02\x02\xA2\xA3\x07I\x02\x02\xA3\xA4\x07\f\x02\x02" +
-		"\xA4\xA5\x05*\x16\x02\xA5\xA6\x07\x04\x02\x02\xA6\x1F\x03\x02\x02\x02" +
-		"\xA7\xA8\x07\x14\x02\x02\xA8\xA9\x07\x11\x02\x02\xA9\xAA\x07G\x02\x02" +
-		"\xAA\xAB\x07\b\x02\x02\xAB\xAC\x05*\x16\x02\xAC\xAD\x07\x13\x02\x02\xAD" +
-		"\xAE\x07\x04\x02\x02\xAE!\x03\x02\x02\x02\xAF\xB0\x07\x14\x02\x02\xB0" +
-		"\xB1\x07\x11\x02\x02\xB1\xB2\x05*\x16\x02\xB2\xB3\x07\x13\x02\x02\xB3" +
-		"\xB4\x07\x04\x02\x02\xB4#\x03\x02\x02\x02\xB5\xB6\x07\x15\x02\x02\xB6" +
-		"\xB7\x07\x11\x02\x02\xB7\xB8\x05*\x16\x02\xB8\xB9\x07\x13\x02\x02\xB9" +
-		"\xBC\x05\x16\f\x02\xBA\xBB\x07\x16\x02\x02\xBB\xBD\x05\x16\f\x02\xBC\xBA" +
-		"\x03\x02\x02\x02\xBC\xBD\x03\x02\x02\x02\xBD%\x03\x02\x02\x02\xBE\xBF" +
-		"\x07I\x02\x02\xBF\xC0\x05(\x15\x02\xC0\'\x03\x02\x02\x02\xC1\xCD\x07\x11" +
-		"\x02\x02\xC2\xC7\x05*\x16\x02\xC3\xC4\x07\x12\x02\x02\xC4\xC6\x05*\x16" +
-		"\x02\xC5\xC3\x03\x02\x02\x02\xC6\xC9\x03\x02\x02\x02\xC7\xC5\x03\x02\x02" +
-		"\x02\xC7\xC8\x03\x02\x02\x02\xC8\xCB\x03\x02\x02\x02\xC9\xC7\x03\x02\x02" +
-		"\x02\xCA\xCC\x07\x12\x02\x02\xCB\xCA\x03\x02\x02\x02\xCB\xCC\x03\x02\x02" +
-		"\x02\xCC\xCE\x03\x02\x02\x02\xCD\xC2\x03\x02\x02\x02\xCD\xCE\x03\x02\x02" +
-		"\x02\xCE\xCF\x03\x02\x02\x02\xCF\xD0\x07\x13\x02\x02\xD0)\x03\x02\x02" +
-		"\x02\xD1\xD2\b\x16\x01\x02\xD2\xD3\x07\x11\x02\x02\xD3\xD4\x05*\x16\x02" +
-		"\xD4\xD5\x07\x13\x02\x02\xD5\u010A\x03\x02\x02\x02\xD6\xD7\x052\x1A\x02" +
-		"\xD7\xD8\x07\x11\x02\x02\xD8\xDB\x05*\x16\x02\xD9\xDA\x07\x12\x02\x02" +
-		"\xDA\xDC\x05*\x16\x02\xDB\xD9\x03\x02\x02\x02\xDB\xDC\x03\x02\x02\x02" +
-		"\xDC\xDE\x03\x02\x02\x02\xDD\xDF\x07\x12\x02\x02\xDE\xDD\x03\x02\x02\x02" +
-		"\xDE\xDF\x03\x02\x02\x02\xDF\xE0\x03\x02\x02\x02\xE0\xE1\x07\x13\x02\x02" +
-		"\xE1\u010A\x03\x02\x02\x02\xE2\u010A\x05&\x14\x02\xE3\xE4\x07\x17\x02" +
-		"\x02\xE4\xE5\x07I\x02\x02\xE5\u010A\x05(\x15\x02\xE6\xE7\x07\x1A\x02\x02" +
-		"\xE7\xE8\t\x03\x02\x02\xE8\u010A\x05(\x15\x02\xE9\xEA\x07\x1D\x02\x02" +
-		"\xEA\xEB\x07\x18\x02\x02\xEB\xEC\x05*\x16\x02\xEC\xED\x07\x19\x02\x02" +
-		"\xED\xEE\t\x04\x02\x02\xEE\u010A\x03\x02\x02\x02\xEF\xF0\x07#\x02\x02" +
-		"\xF0\xF1\x07\x18\x02\x02\xF1\xF2\x05*\x16\x02\xF2\xF3\x07\x19\x02\x02" +
-		"\xF3\xF4\t\x05\x02\x02\xF4\u010A\x03\x02\x02\x02\xF5\xF6\t\x06\x02\x02" +
-		"\xF6\u010A\x05*\x16\x10\xF7\u0103\x07\x18\x02\x02\xF8\xFD\x05*\x16\x02" +
-		"\xF9\xFA\x07\x12\x02\x02\xFA\xFC\x05*\x16\x02\xFB\xF9\x03\x02\x02\x02" +
-		"\xFC\xFF\x03\x02\x02\x02\xFD\xFB\x03\x02\x02\x02\xFD\xFE\x03\x02\x02\x02" +
-		"\xFE\u0101\x03\x02\x02\x02\xFF\xFD\x03\x02\x02\x02\u0100\u0102\x07\x12" +
-		"\x02\x02\u0101\u0100\x03\x02\x02\x02\u0101\u0102\x03\x02\x02\x02\u0102" +
-		"\u0104\x03\x02\x02\x02\u0103\xF8\x03\x02\x02\x02\u0103\u0104\x03\x02\x02" +
-		"\x02\u0104\u0105\x03\x02\x02\x02\u0105\u010A\x07\x19\x02\x02\u0106\u010A" +
-		"\x07H\x02\x02\u0107\u010A\x07I\x02\x02\u0108\u010A\x05.\x18\x02\u0109" +
-		"\xD1\x03\x02\x02\x02\u0109\xD6\x03\x02\x02\x02\u0109\xE2\x03\x02\x02\x02" +
-		"\u0109\xE3\x03\x02\x02\x02\u0109\xE6\x03\x02\x02\x02\u0109\xE9\x03\x02" +
-		"\x02\x02\u0109\xEF\x03\x02\x02\x02\u0109\xF5\x03\x02\x02\x02\u0109\xF7" +
-		"\x03\x02\x02\x02\u0109\u0106\x03\x02\x02\x02\u0109\u0107\x03\x02\x02\x02" +
-		"\u0109\u0108\x03\x02\x02\x02\u010A\u0134\x03\x02\x02\x02\u010B\u010C\f" +
-		"\x0F\x02\x02\u010C\u010D\t\x07\x02\x02\u010D\u0133\x05*\x16\x10\u010E" +
-		"\u010F\f\x0E\x02\x02\u010F\u0110\t\b\x02\x02\u0110\u0133\x05*\x16\x0F" +
-		"\u0111\u0112\f\r\x02\x02\u0112\u0113\t\t\x02\x02\u0113\u0133\x05*\x16" +
-		"\x0E\u0114\u0115\f\f\x02\x02\u0115\u0116\t\n\x02\x02\u0116\u0133\x05*" +
-		"\x16\r\u0117\u0118\f\v\x02\x02\u0118\u0119\x073\x02\x02\u0119\u0133\x05" +
-		"*\x16\f\u011A\u011B\f\n\x02\x02\u011B\u011C\x07\x06\x02\x02\u011C\u0133" +
-		"\x05*\x16\v\u011D\u011E\f\t\x02\x02\u011E\u011F\x074\x02\x02\u011F\u0133" +
-		"\x05*\x16\n\u0120\u0121\f\b\x02\x02\u0121\u0122\x075\x02\x02\u0122\u0133" +
-		"\x05*\x16\t\u0123\u0124\f\x07\x02\x02\u0124\u0125\x076\x02\x02\u0125\u0133" +
-		"\x05*\x16\b\u0126\u0127\f\x16\x02\x02\u0127\u0128\x07\x18\x02\x02\u0128" +
-		"\u0129\x07A\x02\x02\u0129\u0133\x07\x19\x02\x02\u012A\u012B\f\x12\x02" +
-		"\x02\u012B\u0133\t\v\x02\x02\u012C\u012D\f\x11\x02\x02\u012D\u012E\x07" +
-		"*\x02\x02\u012E\u012F\x07\x11\x02\x02\u012F\u0130\x05*\x16\x02\u0130\u0131" +
-		"\x07\x13\x02\x02\u0131\u0133\x03\x02\x02\x02\u0132\u010B\x03\x02\x02\x02" +
-		"\u0132\u010E\x03\x02\x02\x02\u0132\u0111\x03\x02\x02\x02\u0132\u0114\x03" +
-		"\x02\x02\x02\u0132\u0117\x03\x02\x02\x02\u0132\u011A\x03\x02\x02\x02\u0132" +
-		"\u011D\x03\x02\x02\x02\u0132\u0120\x03\x02\x02\x02\u0132\u0123\x03\x02" +
-		"\x02\x02\u0132\u0126\x03\x02\x02\x02\u0132\u012A\x03\x02\x02\x02\u0132" +
-		"\u012C\x03\x02\x02\x02\u0133\u0136\x03\x02\x02\x02\u0134\u0132\x03\x02" +
-		"\x02\x02\u0134\u0135\x03\x02\x02\x02\u0135+\x03\x02\x02\x02\u0136\u0134" +
-		"\x03\x02\x02\x02\u0137\u0138\x077\x02\x02\u0138-\x03\x02\x02\x02\u0139" +
-		"\u013F\x07?\x02\x02\u013A\u013F\x050\x19\x02\u013B\u013F\x07D\x02\x02" +
-		"\u013C\u013F\x07E\x02\x02\u013D\u013F\x07F\x02\x02\u013E\u0139\x03\x02" +
-		"\x02\x02\u013E\u013A\x03\x02\x02\x02\u013E\u013B\x03\x02\x02\x02\u013E" +
-		"\u013C\x03\x02\x02\x02\u013E\u013D\x03\x02\x02\x02\u013F/\x03\x02\x02" +
-		"\x02\u0140\u0142\x07A\x02\x02\u0141\u0143\x07@\x02\x02\u0142\u0141\x03" +
-		"\x02\x02\x02\u0142\u0143\x03\x02\x02\x02\u01431\x03\x02\x02\x02\u0144" +
-		"\u0145\t\f\x02\x02\u01453\x03\x02\x02\x02\x1C7FIVbmqs~\x83\x8B\x91\xBC" +
-		"\xC7\xCB\xCD\xDB\xDE\xFD\u0101\u0103\u0109\u0132\u0134\u013E\u0142";
+		"\x18\t\x18\x04\x19\t\x19\x04\x1A\t\x1A\x04\x1B\t\x1B\x04\x1C\t\x1C\x04" +
+		"\x1D\t\x1D\x03\x02\x07\x02<\n\x02\f\x02\x0E\x02?\v\x02\x03\x02\x03\x02" +
+		"\x03\x02\x03\x03\x03\x03\x03\x03\x03\x03\x03\x03\x03\x04\x03\x04\x03\x05" +
+		"\x03\x05\x05\x05M\n\x05\x03\x06\x05\x06P\n\x06\x03\x06\x03\x06\x03\x07" +
+		"\x03\x07\x03\b\x03\b\x03\b\x03\b\x03\b\x07\b[\n\b\f\b\x0E\b^\v\b\x03\b" +
+		"\x03\b\x03\t\x03\t\x03\t\x03\t\x03\t\x07\tg\n\t\f\t\x0E\tj\v\t\x03\t\x03" +
+		"\t\x03\n\x03\n\x03\n\x03\n\x07\nr\n\n\f\n\x0E\nu\v\n\x03\n\x05\nx\n\n" +
+		"\x05\nz\n\n\x03\n\x03\n\x03\v\x03\v\x03\v\x03\f\x03\f\x07\f\x83\n\f\f" +
+		"\f\x0E\f\x86\v\f\x03\f\x03\f\x05\f\x8A\n\f\x03\r\x03\r\x03\r\x03\r\x03" +
+		"\r\x03\r\x03\r\x05\r\x93\n\r\x03\x0E\x03\x0E\x07\x0E\x97\n\x0E\f\x0E\x0E" +
+		"\x0E\x9A\v\x0E\x03\x0E\x03\x0E\x03\x0E\x03\x0E\x03\x0E\x03\x0F\x03\x0F" +
+		"\x03\x0F\x03\x0F\x03\x0F\x03\x0F\x03\x0F\x03\x0F\x03\x0F\x03\x10\x03\x10" +
+		"\x03\x10\x03\x10\x03\x10\x03\x11\x03\x11\x03\x11\x03\x11\x03\x11\x03\x11" +
+		"\x03\x11\x03\x11\x03\x12\x03\x12\x03\x12\x03\x12\x03\x12\x03\x12\x03\x13" +
+		"\x03\x13\x03\x13\x03\x13\x03\x13\x03\x13\x03\x13\x05\x13\xC4\n\x13\x03" +
+		"\x14\x03\x14\x03\x14\x03\x14\x03\x15\x03\x15\x03\x16\x03\x16\x03\x16\x03" +
+		"\x16\x07\x16\xD0\n\x16\f\x16\x0E\x16\xD3\v\x16\x03\x16\x05\x16\xD6\n\x16" +
+		"\x05\x16\xD8\n\x16\x03\x16\x03\x16\x03\x17\x03\x17\x03\x17\x03\x18\x03" +
+		"\x18\x03\x18\x03\x18\x07\x18\xE3\n\x18\f\x18\x0E\x18\xE6\v\x18\x03\x18" +
+		"\x05\x18\xE9\n\x18\x05\x18\xEB\n\x18\x03\x18\x03\x18\x03\x19\x03\x19\x03" +
+		"\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19\x05\x19\xF9" +
+		"\n\x19\x03\x19\x05\x19\xFC\n\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19" +
+		"\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19" +
+		"\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19" +
+		"\x03\x19\x07\x19\u0116\n\x19\f\x19\x0E\x19\u0119\v\x19\x03\x19\x05\x19" +
+		"\u011C\n\x19\x05\x19\u011E\n\x19\x03\x19\x03\x19\x03\x19\x03\x19\x05\x19" +
+		"\u0124\n\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03" +
+		"\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03" +
+		"\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03" +
+		"\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03" +
+		"\x19\x03\x19\x03\x19\x03\x19\x03\x19\x07\x19\u014D\n\x19\f\x19\x0E\x19" +
+		"\u0150\v\x19\x03\x1A\x03\x1A\x03\x1B\x03\x1B\x03\x1B\x03\x1B\x03\x1B\x05" +
+		"\x1B\u0159\n\x1B\x03\x1C\x03\x1C\x05\x1C\u015D\n\x1C\x03\x1D\x03\x1D\x03" +
+		"\x1D\x02\x02\x030\x1E\x02\x02\x04\x02\x06\x02\b\x02\n\x02\f\x02\x0E\x02" +
+		"\x10\x02\x12\x02\x14\x02\x16\x02\x18\x02\x1A\x02\x1C\x02\x1E\x02 \x02" +
+		"\"\x02$\x02&\x02(\x02*\x02,\x02.\x020\x022\x024\x026\x028\x02\x02\r\x03" +
+		"\x02\x06\f\x07\x02==??BBDDGG\x03\x02\x1C \x04\x02\x1C \"%\x03\x02)*\x03" +
+		"\x02+-\x04\x02**..\x03\x02\b\v\x03\x02/0\x03\x02&\'\x04\x026;@@\x02\u017C" +
+		"\x02=\x03\x02\x02\x02\x04C\x03\x02\x02\x02\x06H\x03\x02\x02\x02\bJ\x03" +
+		"\x02\x02\x02\nO\x03\x02\x02\x02\fS\x03\x02\x02\x02\x0EU\x03\x02\x02\x02" +
+		"\x10a\x03\x02\x02\x02\x12m\x03\x02\x02\x02\x14}\x03\x02\x02\x02\x16\x89" +
+		"\x03\x02\x02\x02\x18\x92\x03\x02\x02\x02\x1A\x94\x03\x02\x02\x02\x1C\xA0" +
+		"\x03\x02\x02\x02\x1E\xA9\x03\x02\x02\x02 \xAE\x03\x02\x02\x02\"\xB6\x03" +
+		"\x02\x02\x02$\xBC\x03\x02\x02\x02&\xC5\x03\x02\x02\x02(\xC9\x03\x02\x02" +
+		"\x02*\xCB\x03\x02\x02\x02,\xDB\x03\x02\x02\x02.\xDE\x03\x02\x02\x020\u0123" +
+		"\x03\x02\x02\x022\u0151\x03\x02\x02\x024\u0158\x03\x02\x02\x026\u015A" +
+		"\x03\x02\x02\x028\u015E\x03\x02\x02\x02:<\x05\x04\x03\x02;:\x03\x02\x02" +
+		"\x02<?\x03\x02\x02\x02=;\x03\x02\x02\x02=>\x03\x02\x02\x02>@\x03\x02\x02" +
+		"\x02?=\x03\x02\x02\x02@A\x05\x0E\b\x02AB\x07\x02\x02\x03B\x03\x03\x02" +
+		"\x02\x02CD\x07\x03\x02\x02DE\x05\x06\x04\x02EF\x05\b\x05\x02FG\x07\x04" +
+		"\x02\x02G\x05\x03\x02\x02\x02HI\x07\x05\x02\x02I\x07\x03\x02\x02\x02J" +
+		"L\x05\n\x06\x02KM\x05\n\x06\x02LK\x03\x02\x02\x02LM\x03\x02\x02\x02M\t" +
+		"\x03\x02\x02\x02NP\x05\f\x07\x02ON\x03\x02\x02\x02OP\x03\x02\x02\x02P" +
+		"Q\x03\x02\x02\x02QR\x07<\x02\x02R\v\x03\x02\x02\x02ST\t\x02\x02\x02T\r" +
+		"\x03\x02\x02\x02UV\x07\r\x02\x02VW\x07G\x02\x02WX\x05\x12\n\x02X\\\x07" +
+		"\x0E\x02\x02Y[\x05\x10\t\x02ZY\x03\x02\x02\x02[^\x03\x02\x02\x02\\Z\x03" +
+		"\x02\x02\x02\\]\x03\x02\x02\x02]_\x03\x02\x02\x02^\\\x03\x02\x02\x02_" +
+		"`\x07\x0F\x02\x02`\x0F\x03\x02\x02\x02ab\x07\x10\x02\x02bc\x07G\x02\x02" +
+		"cd\x05\x12\n\x02dh\x07\x0E\x02\x02eg\x05\x18\r\x02fe\x03\x02\x02\x02g" +
+		"j\x03\x02\x02\x02hf\x03\x02\x02\x02hi\x03\x02\x02\x02ik\x03\x02\x02\x02" +
+		"jh\x03\x02\x02\x02kl\x07\x0F\x02\x02l\x11\x03\x02\x02\x02my\x07\x11\x02" +
+		"\x02ns\x05\x14\v\x02op\x07\x12\x02\x02pr\x05\x14\v\x02qo\x03\x02\x02\x02" +
+		"ru\x03\x02\x02\x02sq\x03\x02\x02\x02st\x03\x02\x02\x02tw\x03\x02\x02\x02" +
+		"us\x03\x02\x02\x02vx\x07\x12\x02\x02wv\x03\x02\x02\x02wx\x03\x02\x02\x02" +
+		"xz\x03\x02\x02\x02yn\x03\x02\x02\x02yz\x03\x02\x02\x02z{\x03\x02\x02\x02" +
+		"{|\x07\x13\x02\x02|\x13\x03\x02\x02\x02}~\x058\x1D\x02~\x7F\x07G\x02\x02" +
+		"\x7F\x15\x03\x02\x02\x02\x80\x84\x07\x0E\x02\x02\x81\x83\x05\x18\r\x02" +
+		"\x82\x81\x03\x02\x02\x02\x83\x86\x03\x02\x02\x02\x84\x82\x03\x02\x02\x02" +
+		"\x84\x85\x03\x02\x02\x02\x85\x87\x03\x02\x02\x02\x86\x84\x03\x02\x02\x02" +
+		"\x87\x8A\x07\x0F\x02\x02\x88\x8A\x05\x18\r\x02\x89\x80\x03\x02\x02\x02" +
+		"\x89\x88\x03\x02\x02\x02\x8A\x17\x03\x02\x02\x02\x8B\x93\x05\x1A\x0E\x02" +
+		"\x8C\x93\x05\x1C\x0F\x02\x8D\x93\x05\x1E\x10\x02\x8E\x93\x05 \x11\x02" +
+		"\x8F\x93\x05\"\x12\x02\x90\x93\x05$\x13\x02\x91\x93\x05&\x14\x02\x92\x8B" +
+		"\x03\x02\x02\x02\x92\x8C\x03\x02\x02\x02\x92\x8D\x03\x02\x02\x02\x92\x8E" +
+		"\x03\x02\x02\x02\x92\x8F\x03\x02\x02\x02\x92\x90\x03\x02\x02\x02\x92\x91" +
+		"\x03\x02\x02\x02\x93\x19\x03\x02\x02\x02\x94\x98\x058\x1D\x02\x95\x97" +
+		"\x052\x1A\x02\x96\x95\x03\x02\x02\x02\x97\x9A\x03\x02\x02\x02\x98\x96" +
+		"\x03\x02\x02\x02\x98\x99\x03\x02\x02\x02\x99\x9B\x03\x02\x02\x02\x9A\x98" +
+		"\x03\x02\x02\x02\x9B\x9C\x07G\x02\x02\x9C\x9D\x07\f\x02\x02\x9D\x9E\x05" +
+		"0\x19\x02\x9E\x9F\x07\x04\x02\x02\x9F\x1B\x03\x02\x02\x02\xA0\xA1\x05" +
+		"8\x1D\x02\xA1\xA2\x07G\x02\x02\xA2\xA3\x07\x12\x02\x02\xA3\xA4\x058\x1D" +
+		"\x02\xA4\xA5\x07G\x02\x02\xA5\xA6\x07\f\x02\x02\xA6\xA7\x050\x19\x02\xA7" +
+		"\xA8\x07\x04\x02\x02\xA8\x1D\x03\x02\x02\x02\xA9\xAA\x07G\x02\x02\xAA" +
+		"\xAB\x07\f\x02\x02\xAB\xAC\x050\x19\x02\xAC\xAD\x07\x04\x02\x02\xAD\x1F" +
+		"\x03\x02\x02\x02\xAE\xAF\x07\x14\x02\x02\xAF\xB0\x07\x11\x02\x02\xB0\xB1" +
+		"\x07E\x02\x02\xB1\xB2\x07\b\x02\x02\xB2\xB3\x050\x19\x02\xB3\xB4\x07\x13" +
+		"\x02\x02\xB4\xB5\x07\x04\x02\x02\xB5!\x03\x02\x02\x02\xB6\xB7\x07\x14" +
+		"\x02\x02\xB7\xB8\x07\x11\x02\x02\xB8\xB9\x050\x19\x02\xB9\xBA\x07\x13" +
+		"\x02\x02\xBA\xBB\x07\x04\x02\x02\xBB#\x03\x02\x02\x02\xBC\xBD\x07\x15" +
+		"\x02\x02\xBD\xBE\x07\x11\x02\x02\xBE\xBF\x050\x19\x02\xBF\xC0\x07\x13" +
+		"\x02\x02\xC0\xC3\x05\x16\f\x02\xC1\xC2\x07\x16\x02\x02\xC2\xC4\x05\x16" +
+		"\f\x02\xC3\xC1\x03\x02\x02\x02\xC3\xC4\x03\x02\x02\x02\xC4%\x03\x02\x02" +
+		"\x02\xC5\xC6\x07\x17\x02\x02\xC6\xC7\x05*\x16\x02\xC7\xC8\x07\x04\x02" +
+		"\x02\xC8\'\x03\x02\x02\x02\xC9\xCA\t\x03\x02\x02\xCA)\x03\x02\x02\x02" +
+		"\xCB\xD7\x07\x11\x02\x02\xCC\xD1\x05(\x15\x02\xCD\xCE\x07\x12\x02\x02" +
+		"\xCE\xD0\x05(\x15\x02\xCF\xCD\x03\x02\x02\x02\xD0\xD3\x03\x02\x02\x02" +
+		"\xD1\xCF\x03\x02\x02\x02\xD1\xD2\x03\x02\x02\x02\xD2\xD5\x03\x02\x02\x02" +
+		"\xD3\xD1\x03\x02\x02\x02\xD4\xD6\x07\x12\x02\x02\xD5\xD4\x03\x02\x02\x02" +
+		"\xD5\xD6\x03\x02\x02\x02\xD6\xD8\x03\x02\x02\x02\xD7\xCC\x03\x02\x02\x02" +
+		"\xD7\xD8\x03\x02\x02\x02\xD8\xD9\x03\x02\x02\x02\xD9\xDA\x07\x13\x02\x02" +
+		"\xDA+\x03\x02\x02\x02\xDB\xDC\x07G\x02\x02\xDC\xDD\x05.\x18\x02\xDD-\x03" +
+		"\x02\x02\x02\xDE\xEA\x07\x11\x02\x02\xDF\xE4\x050\x19\x02\xE0\xE1\x07" +
+		"\x12\x02\x02\xE1\xE3\x050\x19\x02\xE2\xE0\x03\x02\x02\x02\xE3\xE6\x03" +
+		"\x02\x02\x02\xE4\xE2\x03\x02\x02\x02\xE4\xE5\x03\x02\x02\x02\xE5\xE8\x03" +
+		"\x02\x02\x02\xE6\xE4\x03\x02\x02\x02\xE7\xE9\x07\x12\x02\x02\xE8\xE7\x03" +
+		"\x02\x02\x02\xE8\xE9\x03\x02\x02\x02\xE9\xEB\x03\x02\x02\x02\xEA\xDF\x03" +
+		"\x02\x02\x02\xEA\xEB\x03\x02\x02\x02\xEB\xEC\x03\x02\x02\x02\xEC\xED\x07" +
+		"\x13\x02\x02\xED/\x03\x02\x02\x02\xEE\xEF\b\x19\x01\x02\xEF\xF0\x07\x11" +
+		"\x02\x02\xF0\xF1\x050\x19\x02\xF1\xF2\x07\x13\x02\x02\xF2\u0124\x03\x02" +
+		"\x02\x02\xF3\xF4\x058\x1D\x02\xF4\xF5\x07\x11\x02\x02\xF5\xF8\x050\x19" +
+		"\x02\xF6\xF7\x07\x12\x02\x02\xF7\xF9\x050\x19\x02\xF8\xF6\x03\x02\x02" +
+		"\x02\xF8\xF9\x03\x02\x02\x02\xF9\xFB\x03\x02\x02\x02\xFA\xFC\x07\x12\x02" +
+		"\x02\xFB\xFA\x03\x02\x02\x02\xFB\xFC\x03\x02\x02\x02\xFC\xFD\x03\x02\x02" +
+		"\x02\xFD\xFE\x07\x13\x02\x02\xFE\u0124\x03\x02\x02\x02\xFF\u0124\x05," +
+		"\x17\x02\u0100\u0101\x07\x18\x02\x02\u0101\u0102\x07G\x02\x02\u0102\u0124" +
+		"\x05.\x18\x02\u0103\u0104\x07\x1B\x02\x02\u0104\u0105\x07\x19\x02\x02" +
+		"\u0105\u0106\x050\x19\x02\u0106\u0107\x07\x1A\x02\x02\u0107\u0108\t\x04" +
+		"\x02\x02\u0108\u0124\x03\x02\x02\x02\u0109\u010A\x07!\x02\x02\u010A\u010B" +
+		"\x07\x19\x02\x02\u010B\u010C\x050\x19\x02\u010C\u010D\x07\x1A\x02\x02" +
+		"\u010D\u010E\t\x05\x02\x02\u010E\u0124\x03\x02\x02\x02\u010F\u0110\t\x06" +
+		"\x02\x02\u0110\u0124\x050\x19\x10\u0111\u011D\x07\x19\x02\x02\u0112\u0117" +
+		"\x050\x19\x02\u0113\u0114\x07\x12\x02\x02\u0114\u0116\x050\x19\x02\u0115" +
+		"\u0113\x03\x02\x02\x02\u0116\u0119\x03\x02\x02\x02\u0117\u0115\x03\x02" +
+		"\x02\x02\u0117\u0118\x03\x02\x02\x02\u0118\u011B\x03\x02\x02\x02\u0119" +
+		"\u0117\x03\x02\x02\x02\u011A\u011C\x07\x12\x02\x02\u011B\u011A\x03\x02" +
+		"\x02\x02\u011B\u011C\x03\x02\x02\x02\u011C\u011E\x03\x02\x02\x02\u011D" +
+		"\u0112\x03\x02\x02\x02\u011D\u011E\x03\x02\x02\x02\u011E\u011F\x03\x02" +
+		"\x02\x02\u011F\u0124\x07\x1A\x02\x02\u0120\u0124\x07F\x02\x02\u0121\u0124" +
+		"\x07G\x02\x02\u0122\u0124\x054\x1B\x02\u0123\xEE\x03\x02\x02\x02\u0123" +
+		"\xF3\x03\x02\x02\x02\u0123\xFF\x03\x02\x02\x02\u0123\u0100\x03\x02\x02" +
+		"\x02\u0123\u0103\x03\x02\x02\x02\u0123\u0109\x03\x02\x02\x02\u0123\u010F" +
+		"\x03\x02\x02\x02\u0123\u0111\x03\x02\x02\x02\u0123\u0120\x03\x02\x02\x02" +
+		"\u0123\u0121\x03\x02\x02\x02\u0123\u0122\x03\x02\x02\x02\u0124\u014E\x03" +
+		"\x02\x02\x02\u0125\u0126\f\x0F\x02\x02\u0126\u0127\t\x07\x02\x02\u0127" +
+		"\u014D\x050\x19\x10\u0128\u0129\f\x0E\x02\x02\u0129\u012A\t\b\x02\x02" +
+		"\u012A\u014D\x050\x19\x0F\u012B\u012C\f\r\x02\x02\u012C\u012D\t\t\x02" +
+		"\x02\u012D\u014D\x050\x19\x0E\u012E\u012F\f\f\x02\x02\u012F\u0130\t\n" +
+		"\x02\x02\u0130\u014D\x050\x19\r\u0131\u0132\f\v\x02\x02\u0132\u0133\x07" +
+		"1\x02\x02\u0133\u014D\x050\x19\f\u0134\u0135\f\n\x02\x02\u0135\u0136\x07" +
+		"\x06\x02\x02\u0136\u014D\x050\x19\v\u0137\u0138\f\t\x02\x02\u0138\u0139" +
+		"\x072\x02\x02\u0139\u014D\x050\x19\n\u013A\u013B\f\b\x02\x02\u013B\u013C" +
+		"\x073\x02\x02\u013C\u014D\x050\x19\t\u013D\u013E\f\x07\x02\x02\u013E\u013F" +
+		"\x074\x02\x02\u013F\u014D\x050\x19\b\u0140\u0141\f\x15\x02\x02\u0141\u0142" +
+		"\x07\x19\x02\x02\u0142\u0143\x07?\x02\x02\u0143\u014D\x07\x1A\x02\x02" +
+		"\u0144\u0145\f\x12\x02\x02\u0145\u014D\t\v\x02\x02\u0146\u0147\f\x11\x02" +
+		"\x02\u0147\u0148\x07(\x02\x02\u0148\u0149\x07\x11\x02\x02\u0149\u014A" +
+		"\x050\x19\x02\u014A\u014B\x07\x13\x02\x02\u014B\u014D\x03\x02\x02\x02" +
+		"\u014C\u0125\x03\x02\x02\x02\u014C\u0128\x03\x02\x02\x02\u014C\u012B\x03" +
+		"\x02\x02\x02\u014C\u012E\x03\x02\x02\x02\u014C\u0131\x03\x02\x02\x02\u014C" +
+		"\u0134\x03\x02\x02\x02\u014C\u0137\x03\x02\x02\x02\u014C\u013A\x03\x02" +
+		"\x02\x02\u014C\u013D\x03\x02\x02\x02\u014C\u0140\x03\x02\x02\x02\u014C" +
+		"\u0144\x03\x02\x02\x02\u014C\u0146\x03\x02\x02\x02\u014D\u0150\x03\x02" +
+		"\x02\x02\u014E\u014C\x03\x02\x02\x02\u014E\u014F\x03\x02\x02\x02\u014F" +
+		"1\x03\x02\x02\x02\u0150\u014E\x03\x02\x02\x02\u0151\u0152\x075\x02\x02" +
+		"\u01523\x03\x02\x02\x02\u0153\u0159\x07=\x02\x02\u0154\u0159\x056\x1C" +
+		"\x02\u0155\u0159\x07B\x02\x02\u0156\u0159\x07C\x02\x02\u0157\u0159\x07" +
+		"D\x02\x02\u0158\u0153\x03\x02\x02\x02\u0158\u0154\x03\x02\x02\x02\u0158" +
+		"\u0155\x03\x02\x02\x02\u0158\u0156\x03\x02\x02\x02\u0158\u0157\x03\x02" +
+		"\x02\x02\u01595\x03\x02\x02\x02\u015A\u015C\x07?\x02\x02\u015B\u015D\x07" +
+		">\x02\x02\u015C\u015B\x03\x02\x02\x02\u015C\u015D\x03\x02\x02\x02\u015D" +
+		"7\x03\x02\x02\x02\u015E\u015F\t\f\x02\x02\u015F9\x03\x02\x02\x02\x1F=" +
+		"LO\\hswy\x84\x89\x92\x98\xC3\xD1\xD5\xD7\xE4\xE8\xEA\xF8\xFB\u0117\u011B" +
+		"\u011D\u0123\u014C\u014E\u0158\u015C";
 	public static __ATN: ATN;
 	public static get _ATN(): ATN {
 		if (!CashScriptParser.__ATN) {
@@ -2276,6 +2407,9 @@ export class StatementContext extends ParserRuleContext {
 	public ifStatement(): IfStatementContext | undefined {
 		return this.tryGetRuleContext(0, IfStatementContext);
 	}
+	public consoleStatement(): ConsoleStatementContext | undefined {
+		return this.tryGetRuleContext(0, ConsoleStatementContext);
+	}
 	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
 		super(parent, invokingState);
 	}
@@ -2456,6 +2590,74 @@ export class IfStatementContext extends ParserRuleContext {
 }
 
 
+export class ConsoleStatementContext extends ParserRuleContext {
+	public consoleParameterList(): ConsoleParameterListContext {
+		return this.getRuleContext(0, ConsoleParameterListContext);
+	}
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return CashScriptParser.RULE_consoleStatement; }
+	// @Override
+	public accept<Result>(visitor: CashScriptVisitor<Result>): Result {
+		if (visitor.visitConsoleStatement) {
+			return visitor.visitConsoleStatement(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class ConsoleParameterContext extends ParserRuleContext {
+	public Identifier(): TerminalNode | undefined { return this.tryGetToken(CashScriptParser.Identifier, 0); }
+	public StringLiteral(): TerminalNode | undefined { return this.tryGetToken(CashScriptParser.StringLiteral, 0); }
+	public NumberLiteral(): TerminalNode | undefined { return this.tryGetToken(CashScriptParser.NumberLiteral, 0); }
+	public HexLiteral(): TerminalNode | undefined { return this.tryGetToken(CashScriptParser.HexLiteral, 0); }
+	public BooleanLiteral(): TerminalNode | undefined { return this.tryGetToken(CashScriptParser.BooleanLiteral, 0); }
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return CashScriptParser.RULE_consoleParameter; }
+	// @Override
+	public accept<Result>(visitor: CashScriptVisitor<Result>): Result {
+		if (visitor.visitConsoleParameter) {
+			return visitor.visitConsoleParameter(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class ConsoleParameterListContext extends ParserRuleContext {
+	public consoleParameter(): ConsoleParameterContext[];
+	public consoleParameter(i: number): ConsoleParameterContext;
+	public consoleParameter(i?: number): ConsoleParameterContext | ConsoleParameterContext[] {
+		if (i === undefined) {
+			return this.getRuleContexts(ConsoleParameterContext);
+		} else {
+			return this.getRuleContext(i, ConsoleParameterContext);
+		}
+	}
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return CashScriptParser.RULE_consoleParameterList; }
+	// @Override
+	public accept<Result>(visitor: CashScriptVisitor<Result>): Result {
+		if (visitor.visitConsoleParameterList) {
+			return visitor.visitConsoleParameterList(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
 export class FunctionCallContext extends ParserRuleContext {
 	public Identifier(): TerminalNode { return this.getToken(CashScriptParser.Identifier, 0); }
 	public expressionList(): ExpressionListContext {
@@ -2612,25 +2814,6 @@ export class TupleIndexOpContext extends ExpressionContext {
 		}
 	}
 }
-export class ConsoleExpressionContext extends ExpressionContext {
-	public _scope!: Token;
-	public _op!: Token;
-	public expressionList(): ExpressionListContext {
-		return this.getRuleContext(0, ExpressionListContext);
-	}
-	constructor(ctx: ExpressionContext) {
-		super(ctx.parent, ctx.invokingState);
-		this.copyFrom(ctx);
-	}
-	// @Override
-	public accept<Result>(visitor: CashScriptVisitor<Result>): Result {
-		if (visitor.visitConsoleExpression) {
-			return visitor.visitConsoleExpression(this);
-		} else {
-			return visitor.visitChildren(this);
-		}
-	}
-}
 export class UnaryIntrospectionOpContext extends ExpressionContext {
 	public _scope!: Token;
 	public _op!: Token;
diff --git a/packages/cashc/src/grammar/CashScriptVisitor.ts b/packages/cashc/src/grammar/CashScriptVisitor.ts
index b752dc73..ccdf8153 100644
--- a/packages/cashc/src/grammar/CashScriptVisitor.ts
+++ b/packages/cashc/src/grammar/CashScriptVisitor.ts
@@ -8,7 +8,6 @@ import { CastContext } from "./CashScriptParser.js";
 import { FunctionCallExpressionContext } from "./CashScriptParser.js";
 import { InstantiationContext } from "./CashScriptParser.js";
 import { TupleIndexOpContext } from "./CashScriptParser.js";
-import { ConsoleExpressionContext } from "./CashScriptParser.js";
 import { UnaryIntrospectionOpContext } from "./CashScriptParser.js";
 import { UnaryOpContext } from "./CashScriptParser.js";
 import { BinaryOpContext } from "./CashScriptParser.js";
@@ -34,6 +33,9 @@ import { AssignStatementContext } from "./CashScriptParser.js";
 import { TimeOpStatementContext } from "./CashScriptParser.js";
 import { RequireStatementContext } from "./CashScriptParser.js";
 import { IfStatementContext } from "./CashScriptParser.js";
+import { ConsoleStatementContext } from "./CashScriptParser.js";
+import { ConsoleParameterContext } from "./CashScriptParser.js";
+import { ConsoleParameterListContext } from "./CashScriptParser.js";
 import { FunctionCallContext } from "./CashScriptParser.js";
 import { ExpressionListContext } from "./CashScriptParser.js";
 import { ExpressionContext } from "./CashScriptParser.js";
@@ -91,14 +93,6 @@ export interface CashScriptVisitor<Result> extends ParseTreeVisitor<Result> {
 	 */
 	visitTupleIndexOp?: (ctx: TupleIndexOpContext) => Result;
 
-	/**
-	 * Visit a parse tree produced by the `ConsoleExpression`
-	 * labeled alternative in `CashScriptParser.expression`.
-	 * @param ctx the parse tree
-	 * @return the visitor result
-	 */
-	visitConsoleExpression?: (ctx: ConsoleExpressionContext) => Result;
-
 	/**
 	 * Visit a parse tree produced by the `UnaryIntrospectionOp`
 	 * labeled alternative in `CashScriptParser.expression`.
@@ -281,6 +275,27 @@ export interface CashScriptVisitor<Result> extends ParseTreeVisitor<Result> {
 	 */
 	visitIfStatement?: (ctx: IfStatementContext) => Result;
 
+	/**
+	 * Visit a parse tree produced by `CashScriptParser.consoleStatement`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitConsoleStatement?: (ctx: ConsoleStatementContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `CashScriptParser.consoleParameter`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitConsoleParameter?: (ctx: ConsoleParameterContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `CashScriptParser.consoleParameterList`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitConsoleParameterList?: (ctx: ConsoleParameterListContext) => Result;
+
 	/**
 	 * Visit a parse tree produced by `CashScriptParser.functionCall`.
 	 * @param ctx the parse tree
diff --git a/packages/cashc/src/semantic/SymbolTableTraversal.ts b/packages/cashc/src/semantic/SymbolTableTraversal.ts
index 3e7f2e92..36c91502 100644
--- a/packages/cashc/src/semantic/SymbolTableTraversal.ts
+++ b/packages/cashc/src/semantic/SymbolTableTraversal.ts
@@ -12,6 +12,7 @@ import {
   InstantiationNode,
   AssignNode,
   TupleAssignmentNode,
+  ConsoleStatementNode,
 } from '../ast/AST.js';
 import AstTraversal from '../ast/AstTraversal.js';
 import { SymbolTable, Symbol, SymbolType } from '../ast/SymbolTable.js';
@@ -29,6 +30,7 @@ export default class SymbolTableTraversal extends AstTraversal {
   private functionNames: Map<string, boolean> = new Map<string, boolean>();
   private currentFunction: FunctionDefinitionNode;
   private expectedSymbolType: SymbolType = SymbolType.VARIABLE;
+  public logSymbols: Symbol[] = [];
 
   visitContract(node: ContractNode): Node {
     node.symbolTable = new SymbolTable(this.symbolTables[0]);
@@ -168,4 +170,15 @@ export default class SymbolTableTraversal extends AstTraversal {
 
     return node;
   }
+
+  visitConsoleStatement(node: ConsoleStatementNode): ConsoleStatementNode {
+    // there might be same-name symbols in different code scopes
+    // so we collect all symbols with their location, which will be analyzed later
+    const symbols = node.parameters.
+      map(parameter => this.symbolTables[0].get(parameter.identifier!)!).
+      filter(symbol => symbol);
+
+    this.logSymbols.push(...symbols);
+    return node;
+  }
 }
diff --git a/packages/cashc/test/ast/Location.test.ts b/packages/cashc/test/ast/Location.test.ts
index 5e93229f..adc53294 100644
--- a/packages/cashc/test/ast/Location.test.ts
+++ b/packages/cashc/test/ast/Location.test.ts
@@ -1,6 +1,7 @@
 import fs from 'fs';
 import { URL } from 'url';
 import { compileString, parseCode } from '../../src/compiler.js';
+import { binToHex, hexToBin, vmNumberToBigInt } from '@bitauth/libauth';
 
 describe('Location', () => {
   it('should retrieve correct text from location', () => {
@@ -29,7 +30,7 @@ contract TransferWithTimeout(
 
     // Require timeout time to be reached and sender's signature to match
     function timeout(sig senderSig) {
-        conolelog("asdf", senderSig, "zxcv");
+      console.log(senderSig, "a", senderSig);
         require(checkSig(senderSig, sender));
         require(tx.time >= timeout);
     }
@@ -37,6 +38,7 @@ contract TransferWithTimeout(
 `;
     const artifact = compileString(code);
     console.log(artifact);
+    // console.log(hexToBin(""), `'${binToHex(Uint8Array.from([]))}'`, vmNumberToBigInt(Uint8Array.from([])));
 
   });
 });
diff --git a/packages/cashscript/src/LibauthTemplate.ts b/packages/cashscript/src/LibauthTemplate.ts
index d9c9be94..e158a8d0 100644
--- a/packages/cashscript/src/LibauthTemplate.ts
+++ b/packages/cashscript/src/LibauthTemplate.ts
@@ -15,6 +15,8 @@ import {
   authenticationTemplateToCompilerConfiguration,
   createCompiler,
   createVirtualMachineBCHCHIPs,
+  binToBase64,
+  utf8ToBin,
 } from "@bitauth/libauth";
 import { deflate } from "pako";
 import {
@@ -29,6 +31,7 @@ import { Argument, encodeArgument as csEncodeArgument } from "./Argument.js";
 import SignatureTemplate from "./SignatureTemplate.js";
 import { Transaction } from "./Transaction.js";
 
+// all bitauth variables must be in snake case
 function snake_case(str: string) {
   return (
     str &&
@@ -59,6 +62,7 @@ const encodeArgument = (
   return csEncodeArgument(argument, typeStr);
 };
 
+// stringify version which can serialize otherwise unsupported types
 export const stringify = (any: any, spaces?: number) =>
   JSON.stringify(
     any,
@@ -74,15 +78,6 @@ export const stringify = (any: any, spaces?: number) =>
     spaces
   );
 
-export const getBitauthUri = (template: AuthenticationTemplate) => {
-  const base64toBase64Url = (base64: string) =>
-    base64.replace(/\+/g, "-").replace(/\//g, "_");
-  const payload = base64toBase64Url(
-    binToBase64(deflate(utf8ToBin(stringify(template))))
-  );
-  return `https://ide.bitauth.com/import-template/${payload}`;
-};
-
 export const buildTemplate = async ({
   contract,
   transaction,
@@ -464,7 +459,16 @@ export const buildTemplate = async ({
   } as AuthenticationTemplate;
 };
 
+export const getBitauthUri = (template: AuthenticationTemplate) => {
+  const base64toBase64Url = (base64: string) =>
+    base64.replace(/\+/g, "-").replace(/\//g, "_");
+  const payload = base64toBase64Url(
+    binToBase64(deflate(utf8ToBin(stringify(template))))
+  );
+  return `https://ide.bitauth.com/import-template/${payload}`;
+};
 
+// internal util. instantiates the virtual machine and compiles the template into a program
 const createProgram = (template: AuthenticationTemplate) => {
   const configuration = authenticationTemplateToCompilerConfiguration(template);
   const vm = createVirtualMachineBCHCHIPs();
@@ -487,6 +491,7 @@ const createProgram = (template: AuthenticationTemplate) => {
   return { vm, program: scenarioGeneration.scenario.program };
 }
 
+// evaluates the fully defined template, throws upon error
 export const evaluateTemplate = (template: AuthenticationTemplate) => {
   const { vm, program } = createProgram(template);
 
@@ -498,13 +503,14 @@ export const evaluateTemplate = (template: AuthenticationTemplate) => {
   return verifyResult;
 };
 
+// debugs the template, optionally logging the execution data
 export const debugTemplate = (template: AuthenticationTemplate, artifact: Artifact) => {
   const { vm, program } = createProgram(template);
 
   const debugResult = vm.debug(program);
 
   for (const log of artifact.debug?.logs ?? []) {
-    const state = debugResult[log.ip];
+    const state = debugResult.find(state => state.ip === log.ip)!;
 
     let line = `${artifact.contractName}.cash:${log.line}`
     log.data.forEach(element => {
@@ -512,7 +518,7 @@ export const debugTemplate = (template: AuthenticationTemplate, artifact: Artifa
       if (typeof element === "string") {
         value = element;
       } else {
-        const stackItem = state.stack[element.stackIndex];
+        const stackItem = state.stack.slice().reverse()[element.stackIndex];
         switch (element.type) {
           case PrimitiveType.BOOL:
             value = decodeBool(stackItem);
@@ -531,17 +537,8 @@ export const debugTemplate = (template: AuthenticationTemplate, artifact: Artifa
 
       line += ` ${value}`;
     });
-
-    console.log(line);
   }
 
   return debugResult;
 };
-function binToBase64(arg0: Uint8Array): string {
-  throw new Error("Function not implemented.");
-}
-
-function utf8ToBin(arg0: string): string | import("pako").Data {
-  throw new Error("Function not implemented.");
-}
 
diff --git a/packages/cashscript/test/LibauthTemplate.test.ts b/packages/cashscript/test/LibauthTemplate.test.ts
index 245fd4da..2690d178 100644
--- a/packages/cashscript/test/LibauthTemplate.test.ts
+++ b/packages/cashscript/test/LibauthTemplate.test.ts
@@ -2,41 +2,96 @@ import { Contract, ElectrumNetworkProvider, Network, SignatureTemplate } from '.
 import artifact from './fixture/transfer_with_timeout.json' assert { type: "json" };
 import { alicePriv, alicePub, bobPriv, bobPub } from './fixture/vars.js';
 import { buildTemplate, debugTemplate, evaluateTemplate, stringify } from '../src/LibauthTemplate.js';
+import { compileString } from 'cashc';
+import { binToHex } from '@bitauth/libauth';
 
 describe(`Libauth template generation tests`, () => {
   test("Test transfer with timeout template", async () => {
-    // {
-    //   const provider = new ElectrumNetworkProvider(Network.CHIPNET);
-    //   const contract = new Contract(artifact, [alicePub, bobPub, 100000n], { provider });
-
-    //   const transaction = contract.functions.transfer(new SignatureTemplate(bobPriv)).to(contract.address, 10000n);
-    //   const template = await buildTemplate({
-    //     contract,
-    //     transaction,
-    //     manglePrivateKeys: false
-    //   });
+    {
+      const code = `
+      pragma cashscript ^0.9.0;
+      
+      contract TransferWithTimeout(
+          pubkey sender,
+          pubkey recipient,
+          int timeout
+      ) {
+          // Require recipient's signature to match
+          function transfer(sig recipientSig) {
+            console.log(recipientSig, timeout, recipient, sender, 1, "A");
+              require(checkSig(recipientSig, recipient));
+          }
 
-    //   // console.log(stringify(template));
+          // Require timeout time to be reached and sender's signature to match
+          function timeout(sig senderSig) {
 
-    //   expect(evaluateTemplate(template)).toBe(true);
-    // }
+              require(checkSig(senderSig, sender));
+              require(tx.time >= timeout);
+          }
+      }
+      `;
+          const artifact = compileString(code);
 
-    {
       const provider = new ElectrumNetworkProvider(Network.CHIPNET);
-      const contract = new Contract(artifact, [alicePub, bobPub, 2000000n], { provider });
+      const contract = new Contract(artifact, [alicePub, bobPub, 100000n], { provider });
+      console.log(binToHex(alicePub), binToHex(bobPub));
 
-      const transaction = contract.functions.timeout(new SignatureTemplate(alicePriv)).to(contract.address, 10000n);
+      const transaction = contract.functions.transfer(new SignatureTemplate(bobPriv)).to(contract.address, 10000n);
       const template = await buildTemplate({
         contract,
         transaction,
         manglePrivateKeys: false
       });
 
+      console.log(stringify(template));
       debugTemplate(template, artifact);
 
-      // expect(debugTemplate(template)).toBe(false);
+
+      // expect(evaluateTemplate(template)).toBe(true);
     }
 
+    // {
+    //   const code = `
+    //   pragma cashscript ^0.9.0;
+      
+    //   contract TransferWithTimeout(
+    //       pubkey sender,
+    //       pubkey recipient,
+    //       int timeout
+    //   ) {
+    //       // Require recipient's signature to match
+    //       function transfer(sig recipientSig) {
+    //           require(checkSig(recipientSig, recipient));
+    //       }
+
+    //       // Require timeout time to be reached and sender's signature to match
+    //       function timeout(sig senderSig) {
+
+    //         console.log(senderSig, "a", sender, timeout, 0x00, 123, true, );
+    //           require(checkSig(senderSig, sender));
+    //           require(tx.time >= timeout);
+    //       }
+    //   }
+    //   `;
+    //       const artifact = compileString(code);
+
+    //   const provider = new ElectrumNetworkProvider(Network.CHIPNET);
+    //   const contract = new Contract(artifact, [alicePub, bobPub, 2000000n], { provider });
+
+    //   console.log(binToHex(alicePub), binToHex(bobPub));
+
+    //   const transaction = contract.functions.timeout(new SignatureTemplate(alicePriv)).to(contract.address, 10000n);
+    //   const template = await buildTemplate({
+    //     contract,
+    //     transaction,
+    //     manglePrivateKeys: false
+    //   });
+
+    //   debugTemplate(template, artifact);
+
+    //   // expect(debugTemplate(template)).toBe(false);
+    // }
+
     // const failingTemplate = (await contract.runFunctionFromStrings({
     //   action: "buildTemplate",
     //   function: "transfer",

From c39c7360c05f0b0c02836f272151d0f83880abfb Mon Sep 17 00:00:00 2001
From: mainnet-pat <mainnet_pat@protonmail.com>
Date: Thu, 23 Nov 2023 20:15:05 +0000
Subject: [PATCH 004/171] Add failure message to require statements

---
 packages/cashc/src/artifact/Artifact.ts       |   6 +-
 packages/cashc/src/ast/AST.ts                 |   2 +
 packages/cashc/src/ast/AstBuilder.ts          |   6 +-
 packages/cashc/src/compiler.ts                |   3 +-
 .../src/generation/GenerateTargetTraversal.ts |  24 +-
 packages/cashc/src/grammar/CashScript.g4      |   4 +-
 packages/cashc/src/grammar/CashScript.interp  |   2 +-
 .../cashc/src/grammar/CashScriptParser.ts     | 625 +++++++++---------
 packages/cashc/test/ast/Location.test.ts      |  31 +-
 packages/utils/src/artifact.ts                |   7 +
 10 files changed, 375 insertions(+), 335 deletions(-)

diff --git a/packages/cashc/src/artifact/Artifact.ts b/packages/cashc/src/artifact/Artifact.ts
index 14dd78ac..340161c4 100644
--- a/packages/cashc/src/artifact/Artifact.ts
+++ b/packages/cashc/src/artifact/Artifact.ts
@@ -1,4 +1,4 @@
-import { Artifact, LogEntry, Script, scriptToAsm } from '@cashscript/utils';
+import { Artifact, LogEntry, RequireMessage, Script, scriptToAsm } from '@cashscript/utils';
 import { version } from '../index.js';
 import { Ast } from '../ast/AST.js';
 
@@ -9,7 +9,8 @@ export function generateArtifact(
     debug: {
       script: Script,
       sourceMap: string,
-      logs: LogEntry[]
+      logs: LogEntry[],
+      requireMessages: RequireMessage[],
     }
   ): Artifact {
   const { contract } = ast;
@@ -38,6 +39,7 @@ export function generateArtifact(
       bytecode: debugBytecode,
       sourceMap: debug.sourceMap,
       logs: debug.logs,
+      requireMessages: debug.requireMessages,
     },
     compiler: {
       name: 'cashc',
diff --git a/packages/cashc/src/ast/AST.ts b/packages/cashc/src/ast/AST.ts
index 5517361b..2aaf8450 100644
--- a/packages/cashc/src/ast/AST.ts
+++ b/packages/cashc/src/ast/AST.ts
@@ -126,6 +126,7 @@ export class TimeOpNode extends StatementNode {
   constructor(
     public timeOp: TimeOp,
     public expression: ExpressionNode,
+    public message?: string,
   ) {
     super();
   }
@@ -138,6 +139,7 @@ export class TimeOpNode extends StatementNode {
 export class RequireNode extends StatementNode {
   constructor(
     public expression: ExpressionNode,
+    public message?: string,
   ) {
     super();
   }
diff --git a/packages/cashc/src/ast/AstBuilder.ts b/packages/cashc/src/ast/AstBuilder.ts
index cbf6352b..1621ac1c 100644
--- a/packages/cashc/src/ast/AstBuilder.ts
+++ b/packages/cashc/src/ast/AstBuilder.ts
@@ -183,7 +183,8 @@ export default class AstBuilder
 
   visitTimeOpStatement(ctx: TimeOpStatementContext): TimeOpNode {
     const expression = this.visit(ctx.expression());
-    const timeOp = new TimeOpNode(ctx.TxVar().text as TimeOp, expression);
+    const message = ctx.StringLiteral() && this.createStringLiteral(ctx as any)?.value;
+    const timeOp = new TimeOpNode(ctx.TxVar().text as TimeOp, expression, message);
     timeOp.location = Location.fromCtx(ctx);
 
     return timeOp;
@@ -191,7 +192,8 @@ export default class AstBuilder
 
   visitRequireStatement(ctx: RequireStatementContext): RequireNode {
     const expression = this.visit(ctx.expression());
-    const require = new RequireNode(expression);
+    const message = ctx.StringLiteral() && this.createStringLiteral(ctx as any)?.value;
+    const require = new RequireNode(expression, message);
     require.location = Location.fromCtx(ctx);
     return require;
   }
diff --git a/packages/cashc/src/compiler.ts b/packages/cashc/src/compiler.ts
index db6cc3e2..038f2eb5 100644
--- a/packages/cashc/src/compiler.ts
+++ b/packages/cashc/src/compiler.ts
@@ -32,7 +32,8 @@ export function compileString(code: string): Artifact {
   return generateArtifact(ast, optimisedBytecode, code, {
     script: traversal.output,
     sourceMap: traversal.souceMap,
-    logs: traversal.consoleLogs
+    logs: traversal.consoleLogs,
+    requireMessages: traversal.requireMessages,
   });
 }
 
diff --git a/packages/cashc/src/generation/GenerateTargetTraversal.ts b/packages/cashc/src/generation/GenerateTargetTraversal.ts
index 41e3a1f2..d1c21e60 100644
--- a/packages/cashc/src/generation/GenerateTargetTraversal.ts
+++ b/packages/cashc/src/generation/GenerateTargetTraversal.ts
@@ -13,7 +13,8 @@ import {
   generateSourceMap,
   LocationI,
   LocationData,
-  LogEntry
+  LogEntry,
+  RequireMessage
 } from '@cashscript/utils';
 import {
   ContractNode,
@@ -65,6 +66,7 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
   output: Script = [];
   stack: string[] = [];
   consoleLogs: LogEntry[] = [];
+  requireMessages: RequireMessage[] = [];
 
   private scopeDepth = 0;
   private currentFunction: FunctionDefinitionNode;
@@ -267,6 +269,16 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
   visitTimeOp(node: TimeOpNode): Node {
     node.expression = this.visit(node.expression);
     this.emit(compileTimeOp(node.timeOp), node.location!);
+
+    // add debug require message
+    if (node.message) {
+      this.requireMessages.push({
+        ip: this.output.length + this.constructorParameterCount - 1,
+        line: node.location!.start.line,
+        message: node.message
+      });
+    }
+
     this.popFromStack();
     return node;
   }
@@ -275,6 +287,16 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
     node.expression = this.visit(node.expression);
 
     this.emit(Op.OP_VERIFY, node.location!);
+
+    // add debug require message
+    if (node.message) {
+      this.requireMessages.push({
+        ip: this.output.length + this.constructorParameterCount - 1,
+        line: node.location!.start.line,
+        message: node.message
+      });
+    }
+
     this.popFromStack();
     return node;
   }
diff --git a/packages/cashc/src/grammar/CashScript.g4 b/packages/cashc/src/grammar/CashScript.g4
index ff8776c1..a7890d08 100644
--- a/packages/cashc/src/grammar/CashScript.g4
+++ b/packages/cashc/src/grammar/CashScript.g4
@@ -68,11 +68,11 @@ assignStatement
     ;
 
 timeOpStatement
-    : 'require' '(' TxVar '>=' expression ')' ';'
+    : 'require' '(' TxVar '>=' expression (',' StringLiteral)? ')' ';'
     ;
 
 requireStatement
-    : 'require' '(' expression ')' ';'
+    : 'require' '(' expression (',' StringLiteral)? ')' ';'
     ;
 
 ifStatement
diff --git a/packages/cashc/src/grammar/CashScript.interp b/packages/cashc/src/grammar/CashScript.interp
index 8d28905b..7f1a6c5e 100644
--- a/packages/cashc/src/grammar/CashScript.interp
+++ b/packages/cashc/src/grammar/CashScript.interp
@@ -180,4 +180,4 @@ typeName
 
 
 atn:
-[3, 51485, 51898, 1421, 44986, 20307, 1543, 60043, 49729, 3, 74, 353, 4, 2, 9, 2, 4, 3, 9, 3, 4, 4, 9, 4, 4, 5, 9, 5, 4, 6, 9, 6, 4, 7, 9, 7, 4, 8, 9, 8, 4, 9, 9, 9, 4, 10, 9, 10, 4, 11, 9, 11, 4, 12, 9, 12, 4, 13, 9, 13, 4, 14, 9, 14, 4, 15, 9, 15, 4, 16, 9, 16, 4, 17, 9, 17, 4, 18, 9, 18, 4, 19, 9, 19, 4, 20, 9, 20, 4, 21, 9, 21, 4, 22, 9, 22, 4, 23, 9, 23, 4, 24, 9, 24, 4, 25, 9, 25, 4, 26, 9, 26, 4, 27, 9, 27, 4, 28, 9, 28, 4, 29, 9, 29, 3, 2, 7, 2, 60, 10, 2, 12, 2, 14, 2, 63, 11, 2, 3, 2, 3, 2, 3, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 3, 4, 3, 5, 3, 5, 5, 5, 77, 10, 5, 3, 6, 5, 6, 80, 10, 6, 3, 6, 3, 6, 3, 7, 3, 7, 3, 8, 3, 8, 3, 8, 3, 8, 3, 8, 7, 8, 91, 10, 8, 12, 8, 14, 8, 94, 11, 8, 3, 8, 3, 8, 3, 9, 3, 9, 3, 9, 3, 9, 3, 9, 7, 9, 103, 10, 9, 12, 9, 14, 9, 106, 11, 9, 3, 9, 3, 9, 3, 10, 3, 10, 3, 10, 3, 10, 7, 10, 114, 10, 10, 12, 10, 14, 10, 117, 11, 10, 3, 10, 5, 10, 120, 10, 10, 5, 10, 122, 10, 10, 3, 10, 3, 10, 3, 11, 3, 11, 3, 11, 3, 12, 3, 12, 7, 12, 131, 10, 12, 12, 12, 14, 12, 134, 11, 12, 3, 12, 3, 12, 5, 12, 138, 10, 12, 3, 13, 3, 13, 3, 13, 3, 13, 3, 13, 3, 13, 3, 13, 5, 13, 147, 10, 13, 3, 14, 3, 14, 7, 14, 151, 10, 14, 12, 14, 14, 14, 154, 11, 14, 3, 14, 3, 14, 3, 14, 3, 14, 3, 14, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 3, 16, 3, 16, 3, 16, 3, 16, 3, 16, 3, 17, 3, 17, 3, 17, 3, 17, 3, 17, 3, 17, 3, 17, 3, 17, 3, 18, 3, 18, 3, 18, 3, 18, 3, 18, 3, 18, 3, 19, 3, 19, 3, 19, 3, 19, 3, 19, 3, 19, 3, 19, 5, 19, 196, 10, 19, 3, 20, 3, 20, 3, 20, 3, 20, 3, 21, 3, 21, 3, 22, 3, 22, 3, 22, 3, 22, 7, 22, 208, 10, 22, 12, 22, 14, 22, 211, 11, 22, 3, 22, 5, 22, 214, 10, 22, 5, 22, 216, 10, 22, 3, 22, 3, 22, 3, 23, 3, 23, 3, 23, 3, 24, 3, 24, 3, 24, 3, 24, 7, 24, 227, 10, 24, 12, 24, 14, 24, 230, 11, 24, 3, 24, 5, 24, 233, 10, 24, 5, 24, 235, 10, 24, 3, 24, 3, 24, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 5, 25, 249, 10, 25, 3, 25, 5, 25, 252, 10, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 7, 25, 278, 10, 25, 12, 25, 14, 25, 281, 11, 25, 3, 25, 5, 25, 284, 10, 25, 5, 25, 286, 10, 25, 3, 25, 3, 25, 3, 25, 3, 25, 5, 25, 292, 10, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 7, 25, 333, 10, 25, 12, 25, 14, 25, 336, 11, 25, 3, 26, 3, 26, 3, 27, 3, 27, 3, 27, 3, 27, 3, 27, 5, 27, 345, 10, 27, 3, 28, 3, 28, 5, 28, 349, 10, 28, 3, 29, 3, 29, 3, 29, 2, 2, 3, 48, 30, 2, 2, 4, 2, 6, 2, 8, 2, 10, 2, 12, 2, 14, 2, 16, 2, 18, 2, 20, 2, 22, 2, 24, 2, 26, 2, 28, 2, 30, 2, 32, 2, 34, 2, 36, 2, 38, 2, 40, 2, 42, 2, 44, 2, 46, 2, 48, 2, 50, 2, 52, 2, 54, 2, 56, 2, 2, 13, 3, 2, 6, 12, 7, 2, 61, 61, 63, 63, 66, 66, 68, 68, 71, 71, 3, 2, 28, 32, 4, 2, 28, 32, 34, 37, 3, 2, 41, 42, 3, 2, 43, 45, 4, 2, 42, 42, 46, 46, 3, 2, 8, 11, 3, 2, 47, 48, 3, 2, 38, 39, 4, 2, 54, 59, 64, 64, 2, 380, 2, 61, 3, 2, 2, 2, 4, 67, 3, 2, 2, 2, 6, 72, 3, 2, 2, 2, 8, 74, 3, 2, 2, 2, 10, 79, 3, 2, 2, 2, 12, 83, 3, 2, 2, 2, 14, 85, 3, 2, 2, 2, 16, 97, 3, 2, 2, 2, 18, 109, 3, 2, 2, 2, 20, 125, 3, 2, 2, 2, 22, 137, 3, 2, 2, 2, 24, 146, 3, 2, 2, 2, 26, 148, 3, 2, 2, 2, 28, 160, 3, 2, 2, 2, 30, 169, 3, 2, 2, 2, 32, 174, 3, 2, 2, 2, 34, 182, 3, 2, 2, 2, 36, 188, 3, 2, 2, 2, 38, 197, 3, 2, 2, 2, 40, 201, 3, 2, 2, 2, 42, 203, 3, 2, 2, 2, 44, 219, 3, 2, 2, 2, 46, 222, 3, 2, 2, 2, 48, 291, 3, 2, 2, 2, 50, 337, 3, 2, 2, 2, 52, 344, 3, 2, 2, 2, 54, 346, 3, 2, 2, 2, 56, 350, 3, 2, 2, 2, 58, 60, 5, 4, 3, 2, 59, 58, 3, 2, 2, 2, 60, 63, 3, 2, 2, 2, 61, 59, 3, 2, 2, 2, 61, 62, 3, 2, 2, 2, 62, 64, 3, 2, 2, 2, 63, 61, 3, 2, 2, 2, 64, 65, 5, 14, 8, 2, 65, 66, 7, 2, 2, 3, 66, 3, 3, 2, 2, 2, 67, 68, 7, 3, 2, 2, 68, 69, 5, 6, 4, 2, 69, 70, 5, 8, 5, 2, 70, 71, 7, 4, 2, 2, 71, 5, 3, 2, 2, 2, 72, 73, 7, 5, 2, 2, 73, 7, 3, 2, 2, 2, 74, 76, 5, 10, 6, 2, 75, 77, 5, 10, 6, 2, 76, 75, 3, 2, 2, 2, 76, 77, 3, 2, 2, 2, 77, 9, 3, 2, 2, 2, 78, 80, 5, 12, 7, 2, 79, 78, 3, 2, 2, 2, 79, 80, 3, 2, 2, 2, 80, 81, 3, 2, 2, 2, 81, 82, 7, 60, 2, 2, 82, 11, 3, 2, 2, 2, 83, 84, 9, 2, 2, 2, 84, 13, 3, 2, 2, 2, 85, 86, 7, 13, 2, 2, 86, 87, 7, 71, 2, 2, 87, 88, 5, 18, 10, 2, 88, 92, 7, 14, 2, 2, 89, 91, 5, 16, 9, 2, 90, 89, 3, 2, 2, 2, 91, 94, 3, 2, 2, 2, 92, 90, 3, 2, 2, 2, 92, 93, 3, 2, 2, 2, 93, 95, 3, 2, 2, 2, 94, 92, 3, 2, 2, 2, 95, 96, 7, 15, 2, 2, 96, 15, 3, 2, 2, 2, 97, 98, 7, 16, 2, 2, 98, 99, 7, 71, 2, 2, 99, 100, 5, 18, 10, 2, 100, 104, 7, 14, 2, 2, 101, 103, 5, 24, 13, 2, 102, 101, 3, 2, 2, 2, 103, 106, 3, 2, 2, 2, 104, 102, 3, 2, 2, 2, 104, 105, 3, 2, 2, 2, 105, 107, 3, 2, 2, 2, 106, 104, 3, 2, 2, 2, 107, 108, 7, 15, 2, 2, 108, 17, 3, 2, 2, 2, 109, 121, 7, 17, 2, 2, 110, 115, 5, 20, 11, 2, 111, 112, 7, 18, 2, 2, 112, 114, 5, 20, 11, 2, 113, 111, 3, 2, 2, 2, 114, 117, 3, 2, 2, 2, 115, 113, 3, 2, 2, 2, 115, 116, 3, 2, 2, 2, 116, 119, 3, 2, 2, 2, 117, 115, 3, 2, 2, 2, 118, 120, 7, 18, 2, 2, 119, 118, 3, 2, 2, 2, 119, 120, 3, 2, 2, 2, 120, 122, 3, 2, 2, 2, 121, 110, 3, 2, 2, 2, 121, 122, 3, 2, 2, 2, 122, 123, 3, 2, 2, 2, 123, 124, 7, 19, 2, 2, 124, 19, 3, 2, 2, 2, 125, 126, 5, 56, 29, 2, 126, 127, 7, 71, 2, 2, 127, 21, 3, 2, 2, 2, 128, 132, 7, 14, 2, 2, 129, 131, 5, 24, 13, 2, 130, 129, 3, 2, 2, 2, 131, 134, 3, 2, 2, 2, 132, 130, 3, 2, 2, 2, 132, 133, 3, 2, 2, 2, 133, 135, 3, 2, 2, 2, 134, 132, 3, 2, 2, 2, 135, 138, 7, 15, 2, 2, 136, 138, 5, 24, 13, 2, 137, 128, 3, 2, 2, 2, 137, 136, 3, 2, 2, 2, 138, 23, 3, 2, 2, 2, 139, 147, 5, 26, 14, 2, 140, 147, 5, 28, 15, 2, 141, 147, 5, 30, 16, 2, 142, 147, 5, 32, 17, 2, 143, 147, 5, 34, 18, 2, 144, 147, 5, 36, 19, 2, 145, 147, 5, 38, 20, 2, 146, 139, 3, 2, 2, 2, 146, 140, 3, 2, 2, 2, 146, 141, 3, 2, 2, 2, 146, 142, 3, 2, 2, 2, 146, 143, 3, 2, 2, 2, 146, 144, 3, 2, 2, 2, 146, 145, 3, 2, 2, 2, 147, 25, 3, 2, 2, 2, 148, 152, 5, 56, 29, 2, 149, 151, 5, 50, 26, 2, 150, 149, 3, 2, 2, 2, 151, 154, 3, 2, 2, 2, 152, 150, 3, 2, 2, 2, 152, 153, 3, 2, 2, 2, 153, 155, 3, 2, 2, 2, 154, 152, 3, 2, 2, 2, 155, 156, 7, 71, 2, 2, 156, 157, 7, 12, 2, 2, 157, 158, 5, 48, 25, 2, 158, 159, 7, 4, 2, 2, 159, 27, 3, 2, 2, 2, 160, 161, 5, 56, 29, 2, 161, 162, 7, 71, 2, 2, 162, 163, 7, 18, 2, 2, 163, 164, 5, 56, 29, 2, 164, 165, 7, 71, 2, 2, 165, 166, 7, 12, 2, 2, 166, 167, 5, 48, 25, 2, 167, 168, 7, 4, 2, 2, 168, 29, 3, 2, 2, 2, 169, 170, 7, 71, 2, 2, 170, 171, 7, 12, 2, 2, 171, 172, 5, 48, 25, 2, 172, 173, 7, 4, 2, 2, 173, 31, 3, 2, 2, 2, 174, 175, 7, 20, 2, 2, 175, 176, 7, 17, 2, 2, 176, 177, 7, 69, 2, 2, 177, 178, 7, 8, 2, 2, 178, 179, 5, 48, 25, 2, 179, 180, 7, 19, 2, 2, 180, 181, 7, 4, 2, 2, 181, 33, 3, 2, 2, 2, 182, 183, 7, 20, 2, 2, 183, 184, 7, 17, 2, 2, 184, 185, 5, 48, 25, 2, 185, 186, 7, 19, 2, 2, 186, 187, 7, 4, 2, 2, 187, 35, 3, 2, 2, 2, 188, 189, 7, 21, 2, 2, 189, 190, 7, 17, 2, 2, 190, 191, 5, 48, 25, 2, 191, 192, 7, 19, 2, 2, 192, 195, 5, 22, 12, 2, 193, 194, 7, 22, 2, 2, 194, 196, 5, 22, 12, 2, 195, 193, 3, 2, 2, 2, 195, 196, 3, 2, 2, 2, 196, 37, 3, 2, 2, 2, 197, 198, 7, 23, 2, 2, 198, 199, 5, 42, 22, 2, 199, 200, 7, 4, 2, 2, 200, 39, 3, 2, 2, 2, 201, 202, 9, 3, 2, 2, 202, 41, 3, 2, 2, 2, 203, 215, 7, 17, 2, 2, 204, 209, 5, 40, 21, 2, 205, 206, 7, 18, 2, 2, 206, 208, 5, 40, 21, 2, 207, 205, 3, 2, 2, 2, 208, 211, 3, 2, 2, 2, 209, 207, 3, 2, 2, 2, 209, 210, 3, 2, 2, 2, 210, 213, 3, 2, 2, 2, 211, 209, 3, 2, 2, 2, 212, 214, 7, 18, 2, 2, 213, 212, 3, 2, 2, 2, 213, 214, 3, 2, 2, 2, 214, 216, 3, 2, 2, 2, 215, 204, 3, 2, 2, 2, 215, 216, 3, 2, 2, 2, 216, 217, 3, 2, 2, 2, 217, 218, 7, 19, 2, 2, 218, 43, 3, 2, 2, 2, 219, 220, 7, 71, 2, 2, 220, 221, 5, 46, 24, 2, 221, 45, 3, 2, 2, 2, 222, 234, 7, 17, 2, 2, 223, 228, 5, 48, 25, 2, 224, 225, 7, 18, 2, 2, 225, 227, 5, 48, 25, 2, 226, 224, 3, 2, 2, 2, 227, 230, 3, 2, 2, 2, 228, 226, 3, 2, 2, 2, 228, 229, 3, 2, 2, 2, 229, 232, 3, 2, 2, 2, 230, 228, 3, 2, 2, 2, 231, 233, 7, 18, 2, 2, 232, 231, 3, 2, 2, 2, 232, 233, 3, 2, 2, 2, 233, 235, 3, 2, 2, 2, 234, 223, 3, 2, 2, 2, 234, 235, 3, 2, 2, 2, 235, 236, 3, 2, 2, 2, 236, 237, 7, 19, 2, 2, 237, 47, 3, 2, 2, 2, 238, 239, 8, 25, 1, 2, 239, 240, 7, 17, 2, 2, 240, 241, 5, 48, 25, 2, 241, 242, 7, 19, 2, 2, 242, 292, 3, 2, 2, 2, 243, 244, 5, 56, 29, 2, 244, 245, 7, 17, 2, 2, 245, 248, 5, 48, 25, 2, 246, 247, 7, 18, 2, 2, 247, 249, 5, 48, 25, 2, 248, 246, 3, 2, 2, 2, 248, 249, 3, 2, 2, 2, 249, 251, 3, 2, 2, 2, 250, 252, 7, 18, 2, 2, 251, 250, 3, 2, 2, 2, 251, 252, 3, 2, 2, 2, 252, 253, 3, 2, 2, 2, 253, 254, 7, 19, 2, 2, 254, 292, 3, 2, 2, 2, 255, 292, 5, 44, 23, 2, 256, 257, 7, 24, 2, 2, 257, 258, 7, 71, 2, 2, 258, 292, 5, 46, 24, 2, 259, 260, 7, 27, 2, 2, 260, 261, 7, 25, 2, 2, 261, 262, 5, 48, 25, 2, 262, 263, 7, 26, 2, 2, 263, 264, 9, 4, 2, 2, 264, 292, 3, 2, 2, 2, 265, 266, 7, 33, 2, 2, 266, 267, 7, 25, 2, 2, 267, 268, 5, 48, 25, 2, 268, 269, 7, 26, 2, 2, 269, 270, 9, 5, 2, 2, 270, 292, 3, 2, 2, 2, 271, 272, 9, 6, 2, 2, 272, 292, 5, 48, 25, 16, 273, 285, 7, 25, 2, 2, 274, 279, 5, 48, 25, 2, 275, 276, 7, 18, 2, 2, 276, 278, 5, 48, 25, 2, 277, 275, 3, 2, 2, 2, 278, 281, 3, 2, 2, 2, 279, 277, 3, 2, 2, 2, 279, 280, 3, 2, 2, 2, 280, 283, 3, 2, 2, 2, 281, 279, 3, 2, 2, 2, 282, 284, 7, 18, 2, 2, 283, 282, 3, 2, 2, 2, 283, 284, 3, 2, 2, 2, 284, 286, 3, 2, 2, 2, 285, 274, 3, 2, 2, 2, 285, 286, 3, 2, 2, 2, 286, 287, 3, 2, 2, 2, 287, 292, 7, 26, 2, 2, 288, 292, 7, 70, 2, 2, 289, 292, 7, 71, 2, 2, 290, 292, 5, 52, 27, 2, 291, 238, 3, 2, 2, 2, 291, 243, 3, 2, 2, 2, 291, 255, 3, 2, 2, 2, 291, 256, 3, 2, 2, 2, 291, 259, 3, 2, 2, 2, 291, 265, 3, 2, 2, 2, 291, 271, 3, 2, 2, 2, 291, 273, 3, 2, 2, 2, 291, 288, 3, 2, 2, 2, 291, 289, 3, 2, 2, 2, 291, 290, 3, 2, 2, 2, 292, 334, 3, 2, 2, 2, 293, 294, 12, 15, 2, 2, 294, 295, 9, 7, 2, 2, 295, 333, 5, 48, 25, 16, 296, 297, 12, 14, 2, 2, 297, 298, 9, 8, 2, 2, 298, 333, 5, 48, 25, 15, 299, 300, 12, 13, 2, 2, 300, 301, 9, 9, 2, 2, 301, 333, 5, 48, 25, 14, 302, 303, 12, 12, 2, 2, 303, 304, 9, 10, 2, 2, 304, 333, 5, 48, 25, 13, 305, 306, 12, 11, 2, 2, 306, 307, 7, 49, 2, 2, 307, 333, 5, 48, 25, 12, 308, 309, 12, 10, 2, 2, 309, 310, 7, 6, 2, 2, 310, 333, 5, 48, 25, 11, 311, 312, 12, 9, 2, 2, 312, 313, 7, 50, 2, 2, 313, 333, 5, 48, 25, 10, 314, 315, 12, 8, 2, 2, 315, 316, 7, 51, 2, 2, 316, 333, 5, 48, 25, 9, 317, 318, 12, 7, 2, 2, 318, 319, 7, 52, 2, 2, 319, 333, 5, 48, 25, 8, 320, 321, 12, 21, 2, 2, 321, 322, 7, 25, 2, 2, 322, 323, 7, 63, 2, 2, 323, 333, 7, 26, 2, 2, 324, 325, 12, 18, 2, 2, 325, 333, 9, 11, 2, 2, 326, 327, 12, 17, 2, 2, 327, 328, 7, 40, 2, 2, 328, 329, 7, 17, 2, 2, 329, 330, 5, 48, 25, 2, 330, 331, 7, 19, 2, 2, 331, 333, 3, 2, 2, 2, 332, 293, 3, 2, 2, 2, 332, 296, 3, 2, 2, 2, 332, 299, 3, 2, 2, 2, 332, 302, 3, 2, 2, 2, 332, 305, 3, 2, 2, 2, 332, 308, 3, 2, 2, 2, 332, 311, 3, 2, 2, 2, 332, 314, 3, 2, 2, 2, 332, 317, 3, 2, 2, 2, 332, 320, 3, 2, 2, 2, 332, 324, 3, 2, 2, 2, 332, 326, 3, 2, 2, 2, 333, 336, 3, 2, 2, 2, 334, 332, 3, 2, 2, 2, 334, 335, 3, 2, 2, 2, 335, 49, 3, 2, 2, 2, 336, 334, 3, 2, 2, 2, 337, 338, 7, 53, 2, 2, 338, 51, 3, 2, 2, 2, 339, 345, 7, 61, 2, 2, 340, 345, 5, 54, 28, 2, 341, 345, 7, 66, 2, 2, 342, 345, 7, 67, 2, 2, 343, 345, 7, 68, 2, 2, 344, 339, 3, 2, 2, 2, 344, 340, 3, 2, 2, 2, 344, 341, 3, 2, 2, 2, 344, 342, 3, 2, 2, 2, 344, 343, 3, 2, 2, 2, 345, 53, 3, 2, 2, 2, 346, 348, 7, 63, 2, 2, 347, 349, 7, 62, 2, 2, 348, 347, 3, 2, 2, 2, 348, 349, 3, 2, 2, 2, 349, 55, 3, 2, 2, 2, 350, 351, 9, 12, 2, 2, 351, 57, 3, 2, 2, 2, 31, 61, 76, 79, 92, 104, 115, 119, 121, 132, 137, 146, 152, 195, 209, 213, 215, 228, 232, 234, 248, 251, 279, 283, 285, 291, 332, 334, 344, 348]
\ No newline at end of file
+[3, 51485, 51898, 1421, 44986, 20307, 1543, 60043, 49729, 3, 74, 361, 4, 2, 9, 2, 4, 3, 9, 3, 4, 4, 9, 4, 4, 5, 9, 5, 4, 6, 9, 6, 4, 7, 9, 7, 4, 8, 9, 8, 4, 9, 9, 9, 4, 10, 9, 10, 4, 11, 9, 11, 4, 12, 9, 12, 4, 13, 9, 13, 4, 14, 9, 14, 4, 15, 9, 15, 4, 16, 9, 16, 4, 17, 9, 17, 4, 18, 9, 18, 4, 19, 9, 19, 4, 20, 9, 20, 4, 21, 9, 21, 4, 22, 9, 22, 4, 23, 9, 23, 4, 24, 9, 24, 4, 25, 9, 25, 4, 26, 9, 26, 4, 27, 9, 27, 4, 28, 9, 28, 4, 29, 9, 29, 3, 2, 7, 2, 60, 10, 2, 12, 2, 14, 2, 63, 11, 2, 3, 2, 3, 2, 3, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 3, 4, 3, 5, 3, 5, 5, 5, 77, 10, 5, 3, 6, 5, 6, 80, 10, 6, 3, 6, 3, 6, 3, 7, 3, 7, 3, 8, 3, 8, 3, 8, 3, 8, 3, 8, 7, 8, 91, 10, 8, 12, 8, 14, 8, 94, 11, 8, 3, 8, 3, 8, 3, 9, 3, 9, 3, 9, 3, 9, 3, 9, 7, 9, 103, 10, 9, 12, 9, 14, 9, 106, 11, 9, 3, 9, 3, 9, 3, 10, 3, 10, 3, 10, 3, 10, 7, 10, 114, 10, 10, 12, 10, 14, 10, 117, 11, 10, 3, 10, 5, 10, 120, 10, 10, 5, 10, 122, 10, 10, 3, 10, 3, 10, 3, 11, 3, 11, 3, 11, 3, 12, 3, 12, 7, 12, 131, 10, 12, 12, 12, 14, 12, 134, 11, 12, 3, 12, 3, 12, 5, 12, 138, 10, 12, 3, 13, 3, 13, 3, 13, 3, 13, 3, 13, 3, 13, 3, 13, 5, 13, 147, 10, 13, 3, 14, 3, 14, 7, 14, 151, 10, 14, 12, 14, 14, 14, 154, 11, 14, 3, 14, 3, 14, 3, 14, 3, 14, 3, 14, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 3, 16, 3, 16, 3, 16, 3, 16, 3, 16, 3, 17, 3, 17, 3, 17, 3, 17, 3, 17, 3, 17, 3, 17, 5, 17, 182, 10, 17, 3, 17, 3, 17, 3, 17, 3, 18, 3, 18, 3, 18, 3, 18, 3, 18, 5, 18, 192, 10, 18, 3, 18, 3, 18, 3, 18, 3, 19, 3, 19, 3, 19, 3, 19, 3, 19, 3, 19, 3, 19, 5, 19, 204, 10, 19, 3, 20, 3, 20, 3, 20, 3, 20, 3, 21, 3, 21, 3, 22, 3, 22, 3, 22, 3, 22, 7, 22, 216, 10, 22, 12, 22, 14, 22, 219, 11, 22, 3, 22, 5, 22, 222, 10, 22, 5, 22, 224, 10, 22, 3, 22, 3, 22, 3, 23, 3, 23, 3, 23, 3, 24, 3, 24, 3, 24, 3, 24, 7, 24, 235, 10, 24, 12, 24, 14, 24, 238, 11, 24, 3, 24, 5, 24, 241, 10, 24, 5, 24, 243, 10, 24, 3, 24, 3, 24, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 5, 25, 257, 10, 25, 3, 25, 5, 25, 260, 10, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 7, 25, 286, 10, 25, 12, 25, 14, 25, 289, 11, 25, 3, 25, 5, 25, 292, 10, 25, 5, 25, 294, 10, 25, 3, 25, 3, 25, 3, 25, 3, 25, 5, 25, 300, 10, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 7, 25, 341, 10, 25, 12, 25, 14, 25, 344, 11, 25, 3, 26, 3, 26, 3, 27, 3, 27, 3, 27, 3, 27, 3, 27, 5, 27, 353, 10, 27, 3, 28, 3, 28, 5, 28, 357, 10, 28, 3, 29, 3, 29, 3, 29, 2, 2, 3, 48, 30, 2, 2, 4, 2, 6, 2, 8, 2, 10, 2, 12, 2, 14, 2, 16, 2, 18, 2, 20, 2, 22, 2, 24, 2, 26, 2, 28, 2, 30, 2, 32, 2, 34, 2, 36, 2, 38, 2, 40, 2, 42, 2, 44, 2, 46, 2, 48, 2, 50, 2, 52, 2, 54, 2, 56, 2, 2, 13, 3, 2, 6, 12, 7, 2, 61, 61, 63, 63, 66, 66, 68, 68, 71, 71, 3, 2, 28, 32, 4, 2, 28, 32, 34, 37, 3, 2, 41, 42, 3, 2, 43, 45, 4, 2, 42, 42, 46, 46, 3, 2, 8, 11, 3, 2, 47, 48, 3, 2, 38, 39, 4, 2, 54, 59, 64, 64, 2, 390, 2, 61, 3, 2, 2, 2, 4, 67, 3, 2, 2, 2, 6, 72, 3, 2, 2, 2, 8, 74, 3, 2, 2, 2, 10, 79, 3, 2, 2, 2, 12, 83, 3, 2, 2, 2, 14, 85, 3, 2, 2, 2, 16, 97, 3, 2, 2, 2, 18, 109, 3, 2, 2, 2, 20, 125, 3, 2, 2, 2, 22, 137, 3, 2, 2, 2, 24, 146, 3, 2, 2, 2, 26, 148, 3, 2, 2, 2, 28, 160, 3, 2, 2, 2, 30, 169, 3, 2, 2, 2, 32, 174, 3, 2, 2, 2, 34, 186, 3, 2, 2, 2, 36, 196, 3, 2, 2, 2, 38, 205, 3, 2, 2, 2, 40, 209, 3, 2, 2, 2, 42, 211, 3, 2, 2, 2, 44, 227, 3, 2, 2, 2, 46, 230, 3, 2, 2, 2, 48, 299, 3, 2, 2, 2, 50, 345, 3, 2, 2, 2, 52, 352, 3, 2, 2, 2, 54, 354, 3, 2, 2, 2, 56, 358, 3, 2, 2, 2, 58, 60, 5, 4, 3, 2, 59, 58, 3, 2, 2, 2, 60, 63, 3, 2, 2, 2, 61, 59, 3, 2, 2, 2, 61, 62, 3, 2, 2, 2, 62, 64, 3, 2, 2, 2, 63, 61, 3, 2, 2, 2, 64, 65, 5, 14, 8, 2, 65, 66, 7, 2, 2, 3, 66, 3, 3, 2, 2, 2, 67, 68, 7, 3, 2, 2, 68, 69, 5, 6, 4, 2, 69, 70, 5, 8, 5, 2, 70, 71, 7, 4, 2, 2, 71, 5, 3, 2, 2, 2, 72, 73, 7, 5, 2, 2, 73, 7, 3, 2, 2, 2, 74, 76, 5, 10, 6, 2, 75, 77, 5, 10, 6, 2, 76, 75, 3, 2, 2, 2, 76, 77, 3, 2, 2, 2, 77, 9, 3, 2, 2, 2, 78, 80, 5, 12, 7, 2, 79, 78, 3, 2, 2, 2, 79, 80, 3, 2, 2, 2, 80, 81, 3, 2, 2, 2, 81, 82, 7, 60, 2, 2, 82, 11, 3, 2, 2, 2, 83, 84, 9, 2, 2, 2, 84, 13, 3, 2, 2, 2, 85, 86, 7, 13, 2, 2, 86, 87, 7, 71, 2, 2, 87, 88, 5, 18, 10, 2, 88, 92, 7, 14, 2, 2, 89, 91, 5, 16, 9, 2, 90, 89, 3, 2, 2, 2, 91, 94, 3, 2, 2, 2, 92, 90, 3, 2, 2, 2, 92, 93, 3, 2, 2, 2, 93, 95, 3, 2, 2, 2, 94, 92, 3, 2, 2, 2, 95, 96, 7, 15, 2, 2, 96, 15, 3, 2, 2, 2, 97, 98, 7, 16, 2, 2, 98, 99, 7, 71, 2, 2, 99, 100, 5, 18, 10, 2, 100, 104, 7, 14, 2, 2, 101, 103, 5, 24, 13, 2, 102, 101, 3, 2, 2, 2, 103, 106, 3, 2, 2, 2, 104, 102, 3, 2, 2, 2, 104, 105, 3, 2, 2, 2, 105, 107, 3, 2, 2, 2, 106, 104, 3, 2, 2, 2, 107, 108, 7, 15, 2, 2, 108, 17, 3, 2, 2, 2, 109, 121, 7, 17, 2, 2, 110, 115, 5, 20, 11, 2, 111, 112, 7, 18, 2, 2, 112, 114, 5, 20, 11, 2, 113, 111, 3, 2, 2, 2, 114, 117, 3, 2, 2, 2, 115, 113, 3, 2, 2, 2, 115, 116, 3, 2, 2, 2, 116, 119, 3, 2, 2, 2, 117, 115, 3, 2, 2, 2, 118, 120, 7, 18, 2, 2, 119, 118, 3, 2, 2, 2, 119, 120, 3, 2, 2, 2, 120, 122, 3, 2, 2, 2, 121, 110, 3, 2, 2, 2, 121, 122, 3, 2, 2, 2, 122, 123, 3, 2, 2, 2, 123, 124, 7, 19, 2, 2, 124, 19, 3, 2, 2, 2, 125, 126, 5, 56, 29, 2, 126, 127, 7, 71, 2, 2, 127, 21, 3, 2, 2, 2, 128, 132, 7, 14, 2, 2, 129, 131, 5, 24, 13, 2, 130, 129, 3, 2, 2, 2, 131, 134, 3, 2, 2, 2, 132, 130, 3, 2, 2, 2, 132, 133, 3, 2, 2, 2, 133, 135, 3, 2, 2, 2, 134, 132, 3, 2, 2, 2, 135, 138, 7, 15, 2, 2, 136, 138, 5, 24, 13, 2, 137, 128, 3, 2, 2, 2, 137, 136, 3, 2, 2, 2, 138, 23, 3, 2, 2, 2, 139, 147, 5, 26, 14, 2, 140, 147, 5, 28, 15, 2, 141, 147, 5, 30, 16, 2, 142, 147, 5, 32, 17, 2, 143, 147, 5, 34, 18, 2, 144, 147, 5, 36, 19, 2, 145, 147, 5, 38, 20, 2, 146, 139, 3, 2, 2, 2, 146, 140, 3, 2, 2, 2, 146, 141, 3, 2, 2, 2, 146, 142, 3, 2, 2, 2, 146, 143, 3, 2, 2, 2, 146, 144, 3, 2, 2, 2, 146, 145, 3, 2, 2, 2, 147, 25, 3, 2, 2, 2, 148, 152, 5, 56, 29, 2, 149, 151, 5, 50, 26, 2, 150, 149, 3, 2, 2, 2, 151, 154, 3, 2, 2, 2, 152, 150, 3, 2, 2, 2, 152, 153, 3, 2, 2, 2, 153, 155, 3, 2, 2, 2, 154, 152, 3, 2, 2, 2, 155, 156, 7, 71, 2, 2, 156, 157, 7, 12, 2, 2, 157, 158, 5, 48, 25, 2, 158, 159, 7, 4, 2, 2, 159, 27, 3, 2, 2, 2, 160, 161, 5, 56, 29, 2, 161, 162, 7, 71, 2, 2, 162, 163, 7, 18, 2, 2, 163, 164, 5, 56, 29, 2, 164, 165, 7, 71, 2, 2, 165, 166, 7, 12, 2, 2, 166, 167, 5, 48, 25, 2, 167, 168, 7, 4, 2, 2, 168, 29, 3, 2, 2, 2, 169, 170, 7, 71, 2, 2, 170, 171, 7, 12, 2, 2, 171, 172, 5, 48, 25, 2, 172, 173, 7, 4, 2, 2, 173, 31, 3, 2, 2, 2, 174, 175, 7, 20, 2, 2, 175, 176, 7, 17, 2, 2, 176, 177, 7, 69, 2, 2, 177, 178, 7, 8, 2, 2, 178, 181, 5, 48, 25, 2, 179, 180, 7, 18, 2, 2, 180, 182, 7, 66, 2, 2, 181, 179, 3, 2, 2, 2, 181, 182, 3, 2, 2, 2, 182, 183, 3, 2, 2, 2, 183, 184, 7, 19, 2, 2, 184, 185, 7, 4, 2, 2, 185, 33, 3, 2, 2, 2, 186, 187, 7, 20, 2, 2, 187, 188, 7, 17, 2, 2, 188, 191, 5, 48, 25, 2, 189, 190, 7, 18, 2, 2, 190, 192, 7, 66, 2, 2, 191, 189, 3, 2, 2, 2, 191, 192, 3, 2, 2, 2, 192, 193, 3, 2, 2, 2, 193, 194, 7, 19, 2, 2, 194, 195, 7, 4, 2, 2, 195, 35, 3, 2, 2, 2, 196, 197, 7, 21, 2, 2, 197, 198, 7, 17, 2, 2, 198, 199, 5, 48, 25, 2, 199, 200, 7, 19, 2, 2, 200, 203, 5, 22, 12, 2, 201, 202, 7, 22, 2, 2, 202, 204, 5, 22, 12, 2, 203, 201, 3, 2, 2, 2, 203, 204, 3, 2, 2, 2, 204, 37, 3, 2, 2, 2, 205, 206, 7, 23, 2, 2, 206, 207, 5, 42, 22, 2, 207, 208, 7, 4, 2, 2, 208, 39, 3, 2, 2, 2, 209, 210, 9, 3, 2, 2, 210, 41, 3, 2, 2, 2, 211, 223, 7, 17, 2, 2, 212, 217, 5, 40, 21, 2, 213, 214, 7, 18, 2, 2, 214, 216, 5, 40, 21, 2, 215, 213, 3, 2, 2, 2, 216, 219, 3, 2, 2, 2, 217, 215, 3, 2, 2, 2, 217, 218, 3, 2, 2, 2, 218, 221, 3, 2, 2, 2, 219, 217, 3, 2, 2, 2, 220, 222, 7, 18, 2, 2, 221, 220, 3, 2, 2, 2, 221, 222, 3, 2, 2, 2, 222, 224, 3, 2, 2, 2, 223, 212, 3, 2, 2, 2, 223, 224, 3, 2, 2, 2, 224, 225, 3, 2, 2, 2, 225, 226, 7, 19, 2, 2, 226, 43, 3, 2, 2, 2, 227, 228, 7, 71, 2, 2, 228, 229, 5, 46, 24, 2, 229, 45, 3, 2, 2, 2, 230, 242, 7, 17, 2, 2, 231, 236, 5, 48, 25, 2, 232, 233, 7, 18, 2, 2, 233, 235, 5, 48, 25, 2, 234, 232, 3, 2, 2, 2, 235, 238, 3, 2, 2, 2, 236, 234, 3, 2, 2, 2, 236, 237, 3, 2, 2, 2, 237, 240, 3, 2, 2, 2, 238, 236, 3, 2, 2, 2, 239, 241, 7, 18, 2, 2, 240, 239, 3, 2, 2, 2, 240, 241, 3, 2, 2, 2, 241, 243, 3, 2, 2, 2, 242, 231, 3, 2, 2, 2, 242, 243, 3, 2, 2, 2, 243, 244, 3, 2, 2, 2, 244, 245, 7, 19, 2, 2, 245, 47, 3, 2, 2, 2, 246, 247, 8, 25, 1, 2, 247, 248, 7, 17, 2, 2, 248, 249, 5, 48, 25, 2, 249, 250, 7, 19, 2, 2, 250, 300, 3, 2, 2, 2, 251, 252, 5, 56, 29, 2, 252, 253, 7, 17, 2, 2, 253, 256, 5, 48, 25, 2, 254, 255, 7, 18, 2, 2, 255, 257, 5, 48, 25, 2, 256, 254, 3, 2, 2, 2, 256, 257, 3, 2, 2, 2, 257, 259, 3, 2, 2, 2, 258, 260, 7, 18, 2, 2, 259, 258, 3, 2, 2, 2, 259, 260, 3, 2, 2, 2, 260, 261, 3, 2, 2, 2, 261, 262, 7, 19, 2, 2, 262, 300, 3, 2, 2, 2, 263, 300, 5, 44, 23, 2, 264, 265, 7, 24, 2, 2, 265, 266, 7, 71, 2, 2, 266, 300, 5, 46, 24, 2, 267, 268, 7, 27, 2, 2, 268, 269, 7, 25, 2, 2, 269, 270, 5, 48, 25, 2, 270, 271, 7, 26, 2, 2, 271, 272, 9, 4, 2, 2, 272, 300, 3, 2, 2, 2, 273, 274, 7, 33, 2, 2, 274, 275, 7, 25, 2, 2, 275, 276, 5, 48, 25, 2, 276, 277, 7, 26, 2, 2, 277, 278, 9, 5, 2, 2, 278, 300, 3, 2, 2, 2, 279, 280, 9, 6, 2, 2, 280, 300, 5, 48, 25, 16, 281, 293, 7, 25, 2, 2, 282, 287, 5, 48, 25, 2, 283, 284, 7, 18, 2, 2, 284, 286, 5, 48, 25, 2, 285, 283, 3, 2, 2, 2, 286, 289, 3, 2, 2, 2, 287, 285, 3, 2, 2, 2, 287, 288, 3, 2, 2, 2, 288, 291, 3, 2, 2, 2, 289, 287, 3, 2, 2, 2, 290, 292, 7, 18, 2, 2, 291, 290, 3, 2, 2, 2, 291, 292, 3, 2, 2, 2, 292, 294, 3, 2, 2, 2, 293, 282, 3, 2, 2, 2, 293, 294, 3, 2, 2, 2, 294, 295, 3, 2, 2, 2, 295, 300, 7, 26, 2, 2, 296, 300, 7, 70, 2, 2, 297, 300, 7, 71, 2, 2, 298, 300, 5, 52, 27, 2, 299, 246, 3, 2, 2, 2, 299, 251, 3, 2, 2, 2, 299, 263, 3, 2, 2, 2, 299, 264, 3, 2, 2, 2, 299, 267, 3, 2, 2, 2, 299, 273, 3, 2, 2, 2, 299, 279, 3, 2, 2, 2, 299, 281, 3, 2, 2, 2, 299, 296, 3, 2, 2, 2, 299, 297, 3, 2, 2, 2, 299, 298, 3, 2, 2, 2, 300, 342, 3, 2, 2, 2, 301, 302, 12, 15, 2, 2, 302, 303, 9, 7, 2, 2, 303, 341, 5, 48, 25, 16, 304, 305, 12, 14, 2, 2, 305, 306, 9, 8, 2, 2, 306, 341, 5, 48, 25, 15, 307, 308, 12, 13, 2, 2, 308, 309, 9, 9, 2, 2, 309, 341, 5, 48, 25, 14, 310, 311, 12, 12, 2, 2, 311, 312, 9, 10, 2, 2, 312, 341, 5, 48, 25, 13, 313, 314, 12, 11, 2, 2, 314, 315, 7, 49, 2, 2, 315, 341, 5, 48, 25, 12, 316, 317, 12, 10, 2, 2, 317, 318, 7, 6, 2, 2, 318, 341, 5, 48, 25, 11, 319, 320, 12, 9, 2, 2, 320, 321, 7, 50, 2, 2, 321, 341, 5, 48, 25, 10, 322, 323, 12, 8, 2, 2, 323, 324, 7, 51, 2, 2, 324, 341, 5, 48, 25, 9, 325, 326, 12, 7, 2, 2, 326, 327, 7, 52, 2, 2, 327, 341, 5, 48, 25, 8, 328, 329, 12, 21, 2, 2, 329, 330, 7, 25, 2, 2, 330, 331, 7, 63, 2, 2, 331, 341, 7, 26, 2, 2, 332, 333, 12, 18, 2, 2, 333, 341, 9, 11, 2, 2, 334, 335, 12, 17, 2, 2, 335, 336, 7, 40, 2, 2, 336, 337, 7, 17, 2, 2, 337, 338, 5, 48, 25, 2, 338, 339, 7, 19, 2, 2, 339, 341, 3, 2, 2, 2, 340, 301, 3, 2, 2, 2, 340, 304, 3, 2, 2, 2, 340, 307, 3, 2, 2, 2, 340, 310, 3, 2, 2, 2, 340, 313, 3, 2, 2, 2, 340, 316, 3, 2, 2, 2, 340, 319, 3, 2, 2, 2, 340, 322, 3, 2, 2, 2, 340, 325, 3, 2, 2, 2, 340, 328, 3, 2, 2, 2, 340, 332, 3, 2, 2, 2, 340, 334, 3, 2, 2, 2, 341, 344, 3, 2, 2, 2, 342, 340, 3, 2, 2, 2, 342, 343, 3, 2, 2, 2, 343, 49, 3, 2, 2, 2, 344, 342, 3, 2, 2, 2, 345, 346, 7, 53, 2, 2, 346, 51, 3, 2, 2, 2, 347, 353, 7, 61, 2, 2, 348, 353, 5, 54, 28, 2, 349, 353, 7, 66, 2, 2, 350, 353, 7, 67, 2, 2, 351, 353, 7, 68, 2, 2, 352, 347, 3, 2, 2, 2, 352, 348, 3, 2, 2, 2, 352, 349, 3, 2, 2, 2, 352, 350, 3, 2, 2, 2, 352, 351, 3, 2, 2, 2, 353, 53, 3, 2, 2, 2, 354, 356, 7, 63, 2, 2, 355, 357, 7, 62, 2, 2, 356, 355, 3, 2, 2, 2, 356, 357, 3, 2, 2, 2, 357, 55, 3, 2, 2, 2, 358, 359, 9, 12, 2, 2, 359, 57, 3, 2, 2, 2, 33, 61, 76, 79, 92, 104, 115, 119, 121, 132, 137, 146, 152, 181, 191, 203, 217, 221, 223, 236, 240, 242, 256, 259, 287, 291, 293, 299, 340, 342, 352, 356]
\ No newline at end of file
diff --git a/packages/cashc/src/grammar/CashScriptParser.ts b/packages/cashc/src/grammar/CashScriptParser.ts
index c1be0de8..79caef25 100644
--- a/packages/cashc/src/grammar/CashScriptParser.ts
+++ b/packages/cashc/src/grammar/CashScriptParser.ts
@@ -852,6 +852,7 @@ export class CashScriptParser extends Parser {
 	public timeOpStatement(): TimeOpStatementContext {
 		let _localctx: TimeOpStatementContext = new TimeOpStatementContext(this._ctx, this.state);
 		this.enterRule(_localctx, 30, CashScriptParser.RULE_timeOpStatement);
+		let _la: number;
 		try {
 			this.enterOuterAlt(_localctx, 1);
 			{
@@ -865,9 +866,21 @@ export class CashScriptParser extends Parser {
 			this.match(CashScriptParser.T__5);
 			this.state = 176;
 			this.expression(0);
-			this.state = 177;
+			this.state = 179;
+			this._errHandler.sync(this);
+			_la = this._input.LA(1);
+			if (_la === CashScriptParser.T__15) {
+				{
+				this.state = 177;
+				this.match(CashScriptParser.T__15);
+				this.state = 178;
+				this.match(CashScriptParser.StringLiteral);
+				}
+			}
+
+			this.state = 181;
 			this.match(CashScriptParser.T__16);
-			this.state = 178;
+			this.state = 182;
 			this.match(CashScriptParser.T__1);
 			}
 		}
@@ -889,18 +902,31 @@ export class CashScriptParser extends Parser {
 	public requireStatement(): RequireStatementContext {
 		let _localctx: RequireStatementContext = new RequireStatementContext(this._ctx, this.state);
 		this.enterRule(_localctx, 32, CashScriptParser.RULE_requireStatement);
+		let _la: number;
 		try {
 			this.enterOuterAlt(_localctx, 1);
 			{
-			this.state = 180;
+			this.state = 184;
 			this.match(CashScriptParser.T__17);
-			this.state = 181;
+			this.state = 185;
 			this.match(CashScriptParser.T__14);
-			this.state = 182;
+			this.state = 186;
 			this.expression(0);
-			this.state = 183;
+			this.state = 189;
+			this._errHandler.sync(this);
+			_la = this._input.LA(1);
+			if (_la === CashScriptParser.T__15) {
+				{
+				this.state = 187;
+				this.match(CashScriptParser.T__15);
+				this.state = 188;
+				this.match(CashScriptParser.StringLiteral);
+				}
+			}
+
+			this.state = 191;
 			this.match(CashScriptParser.T__16);
-			this.state = 184;
+			this.state = 192;
 			this.match(CashScriptParser.T__1);
 			}
 		}
@@ -925,24 +951,24 @@ export class CashScriptParser extends Parser {
 		try {
 			this.enterOuterAlt(_localctx, 1);
 			{
-			this.state = 186;
+			this.state = 194;
 			this.match(CashScriptParser.T__18);
-			this.state = 187;
+			this.state = 195;
 			this.match(CashScriptParser.T__14);
-			this.state = 188;
+			this.state = 196;
 			this.expression(0);
-			this.state = 189;
+			this.state = 197;
 			this.match(CashScriptParser.T__16);
-			this.state = 190;
+			this.state = 198;
 			_localctx._ifBlock = this.block();
-			this.state = 193;
+			this.state = 201;
 			this._errHandler.sync(this);
-			switch ( this.interpreter.adaptivePredict(this._input, 12, this._ctx) ) {
+			switch ( this.interpreter.adaptivePredict(this._input, 14, this._ctx) ) {
 			case 1:
 				{
-				this.state = 191;
+				this.state = 199;
 				this.match(CashScriptParser.T__19);
-				this.state = 192;
+				this.state = 200;
 				_localctx._elseBlock = this.block();
 				}
 				break;
@@ -970,11 +996,11 @@ export class CashScriptParser extends Parser {
 		try {
 			this.enterOuterAlt(_localctx, 1);
 			{
-			this.state = 195;
+			this.state = 203;
 			this.match(CashScriptParser.T__20);
-			this.state = 196;
+			this.state = 204;
 			this.consoleParameterList();
-			this.state = 197;
+			this.state = 205;
 			this.match(CashScriptParser.T__1);
 			}
 		}
@@ -1000,7 +1026,7 @@ export class CashScriptParser extends Parser {
 		try {
 			this.enterOuterAlt(_localctx, 1);
 			{
-			this.state = 199;
+			this.state = 207;
 			_la = this._input.LA(1);
 			if (!(((((_la - 59)) & ~0x1F) === 0 && ((1 << (_la - 59)) & ((1 << (CashScriptParser.BooleanLiteral - 59)) | (1 << (CashScriptParser.NumberLiteral - 59)) | (1 << (CashScriptParser.StringLiteral - 59)) | (1 << (CashScriptParser.HexLiteral - 59)) | (1 << (CashScriptParser.Identifier - 59)))) !== 0))) {
 			this._errHandler.recoverInline(this);
@@ -1037,39 +1063,39 @@ export class CashScriptParser extends Parser {
 			let _alt: number;
 			this.enterOuterAlt(_localctx, 1);
 			{
-			this.state = 201;
+			this.state = 209;
 			this.match(CashScriptParser.T__14);
-			this.state = 213;
+			this.state = 221;
 			this._errHandler.sync(this);
 			_la = this._input.LA(1);
 			if (((((_la - 59)) & ~0x1F) === 0 && ((1 << (_la - 59)) & ((1 << (CashScriptParser.BooleanLiteral - 59)) | (1 << (CashScriptParser.NumberLiteral - 59)) | (1 << (CashScriptParser.StringLiteral - 59)) | (1 << (CashScriptParser.HexLiteral - 59)) | (1 << (CashScriptParser.Identifier - 59)))) !== 0)) {
 				{
-				this.state = 202;
+				this.state = 210;
 				this.consoleParameter();
-				this.state = 207;
+				this.state = 215;
 				this._errHandler.sync(this);
-				_alt = this.interpreter.adaptivePredict(this._input, 13, this._ctx);
+				_alt = this.interpreter.adaptivePredict(this._input, 15, this._ctx);
 				while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
 					if (_alt === 1) {
 						{
 						{
-						this.state = 203;
+						this.state = 211;
 						this.match(CashScriptParser.T__15);
-						this.state = 204;
+						this.state = 212;
 						this.consoleParameter();
 						}
 						}
 					}
-					this.state = 209;
+					this.state = 217;
 					this._errHandler.sync(this);
-					_alt = this.interpreter.adaptivePredict(this._input, 13, this._ctx);
+					_alt = this.interpreter.adaptivePredict(this._input, 15, this._ctx);
 				}
-				this.state = 211;
+				this.state = 219;
 				this._errHandler.sync(this);
 				_la = this._input.LA(1);
 				if (_la === CashScriptParser.T__15) {
 					{
-					this.state = 210;
+					this.state = 218;
 					this.match(CashScriptParser.T__15);
 					}
 				}
@@ -1077,7 +1103,7 @@ export class CashScriptParser extends Parser {
 				}
 			}
 
-			this.state = 215;
+			this.state = 223;
 			this.match(CashScriptParser.T__16);
 			}
 		}
@@ -1102,9 +1128,9 @@ export class CashScriptParser extends Parser {
 		try {
 			this.enterOuterAlt(_localctx, 1);
 			{
-			this.state = 217;
+			this.state = 225;
 			this.match(CashScriptParser.Identifier);
-			this.state = 218;
+			this.state = 226;
 			this.expressionList();
 			}
 		}
@@ -1131,39 +1157,39 @@ export class CashScriptParser extends Parser {
 			let _alt: number;
 			this.enterOuterAlt(_localctx, 1);
 			{
-			this.state = 220;
+			this.state = 228;
 			this.match(CashScriptParser.T__14);
-			this.state = 232;
+			this.state = 240;
 			this._errHandler.sync(this);
 			_la = this._input.LA(1);
 			if ((((_la) & ~0x1F) === 0 && ((1 << _la) & ((1 << CashScriptParser.T__14) | (1 << CashScriptParser.T__21) | (1 << CashScriptParser.T__22) | (1 << CashScriptParser.T__24) | (1 << CashScriptParser.T__30))) !== 0) || ((((_la - 39)) & ~0x1F) === 0 && ((1 << (_la - 39)) & ((1 << (CashScriptParser.T__38 - 39)) | (1 << (CashScriptParser.T__39 - 39)) | (1 << (CashScriptParser.T__51 - 39)) | (1 << (CashScriptParser.T__52 - 39)) | (1 << (CashScriptParser.T__53 - 39)) | (1 << (CashScriptParser.T__54 - 39)) | (1 << (CashScriptParser.T__55 - 39)) | (1 << (CashScriptParser.T__56 - 39)) | (1 << (CashScriptParser.BooleanLiteral - 39)) | (1 << (CashScriptParser.NumberLiteral - 39)) | (1 << (CashScriptParser.Bytes - 39)) | (1 << (CashScriptParser.StringLiteral - 39)) | (1 << (CashScriptParser.DateLiteral - 39)) | (1 << (CashScriptParser.HexLiteral - 39)) | (1 << (CashScriptParser.NullaryOp - 39)) | (1 << (CashScriptParser.Identifier - 39)))) !== 0)) {
 				{
-				this.state = 221;
+				this.state = 229;
 				this.expression(0);
-				this.state = 226;
+				this.state = 234;
 				this._errHandler.sync(this);
-				_alt = this.interpreter.adaptivePredict(this._input, 16, this._ctx);
+				_alt = this.interpreter.adaptivePredict(this._input, 18, this._ctx);
 				while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
 					if (_alt === 1) {
 						{
 						{
-						this.state = 222;
+						this.state = 230;
 						this.match(CashScriptParser.T__15);
-						this.state = 223;
+						this.state = 231;
 						this.expression(0);
 						}
 						}
 					}
-					this.state = 228;
+					this.state = 236;
 					this._errHandler.sync(this);
-					_alt = this.interpreter.adaptivePredict(this._input, 16, this._ctx);
+					_alt = this.interpreter.adaptivePredict(this._input, 18, this._ctx);
 				}
-				this.state = 230;
+				this.state = 238;
 				this._errHandler.sync(this);
 				_la = this._input.LA(1);
 				if (_la === CashScriptParser.T__15) {
 					{
-					this.state = 229;
+					this.state = 237;
 					this.match(CashScriptParser.T__15);
 					}
 				}
@@ -1171,7 +1197,7 @@ export class CashScriptParser extends Parser {
 				}
 			}
 
-			this.state = 234;
+			this.state = 242;
 			this.match(CashScriptParser.T__16);
 			}
 		}
@@ -1209,20 +1235,20 @@ export class CashScriptParser extends Parser {
 			let _alt: number;
 			this.enterOuterAlt(_localctx, 1);
 			{
-			this.state = 289;
+			this.state = 297;
 			this._errHandler.sync(this);
-			switch ( this.interpreter.adaptivePredict(this._input, 24, this._ctx) ) {
+			switch ( this.interpreter.adaptivePredict(this._input, 26, this._ctx) ) {
 			case 1:
 				{
 				_localctx = new ParenthesisedContext(_localctx);
 				this._ctx = _localctx;
 				_prevctx = _localctx;
 
-				this.state = 237;
+				this.state = 245;
 				this.match(CashScriptParser.T__14);
-				this.state = 238;
+				this.state = 246;
 				this.expression(0);
-				this.state = 239;
+				this.state = 247;
 				this.match(CashScriptParser.T__16);
 				}
 				break;
@@ -1232,35 +1258,35 @@ export class CashScriptParser extends Parser {
 				_localctx = new CastContext(_localctx);
 				this._ctx = _localctx;
 				_prevctx = _localctx;
-				this.state = 241;
+				this.state = 249;
 				this.typeName();
-				this.state = 242;
+				this.state = 250;
 				this.match(CashScriptParser.T__14);
-				this.state = 243;
+				this.state = 251;
 				(_localctx as CastContext)._castable = this.expression(0);
-				this.state = 246;
+				this.state = 254;
 				this._errHandler.sync(this);
-				switch ( this.interpreter.adaptivePredict(this._input, 19, this._ctx) ) {
+				switch ( this.interpreter.adaptivePredict(this._input, 21, this._ctx) ) {
 				case 1:
 					{
-					this.state = 244;
+					this.state = 252;
 					this.match(CashScriptParser.T__15);
-					this.state = 245;
+					this.state = 253;
 					(_localctx as CastContext)._size = this.expression(0);
 					}
 					break;
 				}
-				this.state = 249;
+				this.state = 257;
 				this._errHandler.sync(this);
 				_la = this._input.LA(1);
 				if (_la === CashScriptParser.T__15) {
 					{
-					this.state = 248;
+					this.state = 256;
 					this.match(CashScriptParser.T__15);
 					}
 				}
 
-				this.state = 251;
+				this.state = 259;
 				this.match(CashScriptParser.T__16);
 				}
 				break;
@@ -1270,7 +1296,7 @@ export class CashScriptParser extends Parser {
 				_localctx = new FunctionCallExpressionContext(_localctx);
 				this._ctx = _localctx;
 				_prevctx = _localctx;
-				this.state = 253;
+				this.state = 261;
 				this.functionCall();
 				}
 				break;
@@ -1280,11 +1306,11 @@ export class CashScriptParser extends Parser {
 				_localctx = new InstantiationContext(_localctx);
 				this._ctx = _localctx;
 				_prevctx = _localctx;
-				this.state = 254;
+				this.state = 262;
 				this.match(CashScriptParser.T__21);
-				this.state = 255;
+				this.state = 263;
 				this.match(CashScriptParser.Identifier);
-				this.state = 256;
+				this.state = 264;
 				this.expressionList();
 				}
 				break;
@@ -1294,15 +1320,15 @@ export class CashScriptParser extends Parser {
 				_localctx = new UnaryIntrospectionOpContext(_localctx);
 				this._ctx = _localctx;
 				_prevctx = _localctx;
-				this.state = 257;
+				this.state = 265;
 				(_localctx as UnaryIntrospectionOpContext)._scope = this.match(CashScriptParser.T__24);
-				this.state = 258;
+				this.state = 266;
 				this.match(CashScriptParser.T__22);
-				this.state = 259;
+				this.state = 267;
 				this.expression(0);
-				this.state = 260;
+				this.state = 268;
 				this.match(CashScriptParser.T__23);
-				this.state = 261;
+				this.state = 269;
 				(_localctx as UnaryIntrospectionOpContext)._op = this._input.LT(1);
 				_la = this._input.LA(1);
 				if (!((((_la) & ~0x1F) === 0 && ((1 << _la) & ((1 << CashScriptParser.T__25) | (1 << CashScriptParser.T__26) | (1 << CashScriptParser.T__27) | (1 << CashScriptParser.T__28) | (1 << CashScriptParser.T__29))) !== 0))) {
@@ -1323,15 +1349,15 @@ export class CashScriptParser extends Parser {
 				_localctx = new UnaryIntrospectionOpContext(_localctx);
 				this._ctx = _localctx;
 				_prevctx = _localctx;
-				this.state = 263;
+				this.state = 271;
 				(_localctx as UnaryIntrospectionOpContext)._scope = this.match(CashScriptParser.T__30);
-				this.state = 264;
+				this.state = 272;
 				this.match(CashScriptParser.T__22);
-				this.state = 265;
+				this.state = 273;
 				this.expression(0);
-				this.state = 266;
+				this.state = 274;
 				this.match(CashScriptParser.T__23);
-				this.state = 267;
+				this.state = 275;
 				(_localctx as UnaryIntrospectionOpContext)._op = this._input.LT(1);
 				_la = this._input.LA(1);
 				if (!(((((_la - 26)) & ~0x1F) === 0 && ((1 << (_la - 26)) & ((1 << (CashScriptParser.T__25 - 26)) | (1 << (CashScriptParser.T__26 - 26)) | (1 << (CashScriptParser.T__27 - 26)) | (1 << (CashScriptParser.T__28 - 26)) | (1 << (CashScriptParser.T__29 - 26)) | (1 << (CashScriptParser.T__31 - 26)) | (1 << (CashScriptParser.T__32 - 26)) | (1 << (CashScriptParser.T__33 - 26)) | (1 << (CashScriptParser.T__34 - 26)))) !== 0))) {
@@ -1352,7 +1378,7 @@ export class CashScriptParser extends Parser {
 				_localctx = new UnaryOpContext(_localctx);
 				this._ctx = _localctx;
 				_prevctx = _localctx;
-				this.state = 269;
+				this.state = 277;
 				(_localctx as UnaryOpContext)._op = this._input.LT(1);
 				_la = this._input.LA(1);
 				if (!(_la === CashScriptParser.T__38 || _la === CashScriptParser.T__39)) {
@@ -1365,7 +1391,7 @@ export class CashScriptParser extends Parser {
 					this._errHandler.reportMatch(this);
 					this.consume();
 				}
-				this.state = 270;
+				this.state = 278;
 				this.expression(14);
 				}
 				break;
@@ -1375,39 +1401,39 @@ export class CashScriptParser extends Parser {
 				_localctx = new ArrayContext(_localctx);
 				this._ctx = _localctx;
 				_prevctx = _localctx;
-				this.state = 271;
+				this.state = 279;
 				this.match(CashScriptParser.T__22);
-				this.state = 283;
+				this.state = 291;
 				this._errHandler.sync(this);
 				_la = this._input.LA(1);
 				if ((((_la) & ~0x1F) === 0 && ((1 << _la) & ((1 << CashScriptParser.T__14) | (1 << CashScriptParser.T__21) | (1 << CashScriptParser.T__22) | (1 << CashScriptParser.T__24) | (1 << CashScriptParser.T__30))) !== 0) || ((((_la - 39)) & ~0x1F) === 0 && ((1 << (_la - 39)) & ((1 << (CashScriptParser.T__38 - 39)) | (1 << (CashScriptParser.T__39 - 39)) | (1 << (CashScriptParser.T__51 - 39)) | (1 << (CashScriptParser.T__52 - 39)) | (1 << (CashScriptParser.T__53 - 39)) | (1 << (CashScriptParser.T__54 - 39)) | (1 << (CashScriptParser.T__55 - 39)) | (1 << (CashScriptParser.T__56 - 39)) | (1 << (CashScriptParser.BooleanLiteral - 39)) | (1 << (CashScriptParser.NumberLiteral - 39)) | (1 << (CashScriptParser.Bytes - 39)) | (1 << (CashScriptParser.StringLiteral - 39)) | (1 << (CashScriptParser.DateLiteral - 39)) | (1 << (CashScriptParser.HexLiteral - 39)) | (1 << (CashScriptParser.NullaryOp - 39)) | (1 << (CashScriptParser.Identifier - 39)))) !== 0)) {
 					{
-					this.state = 272;
+					this.state = 280;
 					this.expression(0);
-					this.state = 277;
+					this.state = 285;
 					this._errHandler.sync(this);
-					_alt = this.interpreter.adaptivePredict(this._input, 21, this._ctx);
+					_alt = this.interpreter.adaptivePredict(this._input, 23, this._ctx);
 					while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
 						if (_alt === 1) {
 							{
 							{
-							this.state = 273;
+							this.state = 281;
 							this.match(CashScriptParser.T__15);
-							this.state = 274;
+							this.state = 282;
 							this.expression(0);
 							}
 							}
 						}
-						this.state = 279;
+						this.state = 287;
 						this._errHandler.sync(this);
-						_alt = this.interpreter.adaptivePredict(this._input, 21, this._ctx);
+						_alt = this.interpreter.adaptivePredict(this._input, 23, this._ctx);
 					}
-					this.state = 281;
+					this.state = 289;
 					this._errHandler.sync(this);
 					_la = this._input.LA(1);
 					if (_la === CashScriptParser.T__15) {
 						{
-						this.state = 280;
+						this.state = 288;
 						this.match(CashScriptParser.T__15);
 						}
 					}
@@ -1415,7 +1441,7 @@ export class CashScriptParser extends Parser {
 					}
 				}
 
-				this.state = 285;
+				this.state = 293;
 				this.match(CashScriptParser.T__23);
 				}
 				break;
@@ -1425,7 +1451,7 @@ export class CashScriptParser extends Parser {
 				_localctx = new NullaryOpContext(_localctx);
 				this._ctx = _localctx;
 				_prevctx = _localctx;
-				this.state = 286;
+				this.state = 294;
 				this.match(CashScriptParser.NullaryOp);
 				}
 				break;
@@ -1435,7 +1461,7 @@ export class CashScriptParser extends Parser {
 				_localctx = new IdentifierContext(_localctx);
 				this._ctx = _localctx;
 				_prevctx = _localctx;
-				this.state = 287;
+				this.state = 295;
 				this.match(CashScriptParser.Identifier);
 				}
 				break;
@@ -1445,15 +1471,15 @@ export class CashScriptParser extends Parser {
 				_localctx = new LiteralExpressionContext(_localctx);
 				this._ctx = _localctx;
 				_prevctx = _localctx;
-				this.state = 288;
+				this.state = 296;
 				this.literal();
 				}
 				break;
 			}
 			this._ctx._stop = this._input.tryLT(-1);
-			this.state = 332;
+			this.state = 340;
 			this._errHandler.sync(this);
-			_alt = this.interpreter.adaptivePredict(this._input, 26, this._ctx);
+			_alt = this.interpreter.adaptivePredict(this._input, 28, this._ctx);
 			while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
 				if (_alt === 1) {
 					if (this._parseListeners != null) {
@@ -1461,19 +1487,19 @@ export class CashScriptParser extends Parser {
 					}
 					_prevctx = _localctx;
 					{
-					this.state = 330;
+					this.state = 338;
 					this._errHandler.sync(this);
-					switch ( this.interpreter.adaptivePredict(this._input, 25, this._ctx) ) {
+					switch ( this.interpreter.adaptivePredict(this._input, 27, this._ctx) ) {
 					case 1:
 						{
 						_localctx = new BinaryOpContext(new ExpressionContext(_parentctx, _parentState));
 						(_localctx as BinaryOpContext)._left = _prevctx;
 						this.pushNewRecursionContext(_localctx, _startState, CashScriptParser.RULE_expression);
-						this.state = 291;
+						this.state = 299;
 						if (!(this.precpred(this._ctx, 13))) {
 							throw this.createFailedPredicateException("this.precpred(this._ctx, 13)");
 						}
-						this.state = 292;
+						this.state = 300;
 						(_localctx as BinaryOpContext)._op = this._input.LT(1);
 						_la = this._input.LA(1);
 						if (!(((((_la - 41)) & ~0x1F) === 0 && ((1 << (_la - 41)) & ((1 << (CashScriptParser.T__40 - 41)) | (1 << (CashScriptParser.T__41 - 41)) | (1 << (CashScriptParser.T__42 - 41)))) !== 0))) {
@@ -1486,7 +1512,7 @@ export class CashScriptParser extends Parser {
 							this._errHandler.reportMatch(this);
 							this.consume();
 						}
-						this.state = 293;
+						this.state = 301;
 						(_localctx as BinaryOpContext)._right = this.expression(14);
 						}
 						break;
@@ -1496,11 +1522,11 @@ export class CashScriptParser extends Parser {
 						_localctx = new BinaryOpContext(new ExpressionContext(_parentctx, _parentState));
 						(_localctx as BinaryOpContext)._left = _prevctx;
 						this.pushNewRecursionContext(_localctx, _startState, CashScriptParser.RULE_expression);
-						this.state = 294;
+						this.state = 302;
 						if (!(this.precpred(this._ctx, 12))) {
 							throw this.createFailedPredicateException("this.precpred(this._ctx, 12)");
 						}
-						this.state = 295;
+						this.state = 303;
 						(_localctx as BinaryOpContext)._op = this._input.LT(1);
 						_la = this._input.LA(1);
 						if (!(_la === CashScriptParser.T__39 || _la === CashScriptParser.T__43)) {
@@ -1513,7 +1539,7 @@ export class CashScriptParser extends Parser {
 							this._errHandler.reportMatch(this);
 							this.consume();
 						}
-						this.state = 296;
+						this.state = 304;
 						(_localctx as BinaryOpContext)._right = this.expression(13);
 						}
 						break;
@@ -1523,11 +1549,11 @@ export class CashScriptParser extends Parser {
 						_localctx = new BinaryOpContext(new ExpressionContext(_parentctx, _parentState));
 						(_localctx as BinaryOpContext)._left = _prevctx;
 						this.pushNewRecursionContext(_localctx, _startState, CashScriptParser.RULE_expression);
-						this.state = 297;
+						this.state = 305;
 						if (!(this.precpred(this._ctx, 11))) {
 							throw this.createFailedPredicateException("this.precpred(this._ctx, 11)");
 						}
-						this.state = 298;
+						this.state = 306;
 						(_localctx as BinaryOpContext)._op = this._input.LT(1);
 						_la = this._input.LA(1);
 						if (!((((_la) & ~0x1F) === 0 && ((1 << _la) & ((1 << CashScriptParser.T__5) | (1 << CashScriptParser.T__6) | (1 << CashScriptParser.T__7) | (1 << CashScriptParser.T__8))) !== 0))) {
@@ -1540,7 +1566,7 @@ export class CashScriptParser extends Parser {
 							this._errHandler.reportMatch(this);
 							this.consume();
 						}
-						this.state = 299;
+						this.state = 307;
 						(_localctx as BinaryOpContext)._right = this.expression(12);
 						}
 						break;
@@ -1550,11 +1576,11 @@ export class CashScriptParser extends Parser {
 						_localctx = new BinaryOpContext(new ExpressionContext(_parentctx, _parentState));
 						(_localctx as BinaryOpContext)._left = _prevctx;
 						this.pushNewRecursionContext(_localctx, _startState, CashScriptParser.RULE_expression);
-						this.state = 300;
+						this.state = 308;
 						if (!(this.precpred(this._ctx, 10))) {
 							throw this.createFailedPredicateException("this.precpred(this._ctx, 10)");
 						}
-						this.state = 301;
+						this.state = 309;
 						(_localctx as BinaryOpContext)._op = this._input.LT(1);
 						_la = this._input.LA(1);
 						if (!(_la === CashScriptParser.T__44 || _la === CashScriptParser.T__45)) {
@@ -1567,7 +1593,7 @@ export class CashScriptParser extends Parser {
 							this._errHandler.reportMatch(this);
 							this.consume();
 						}
-						this.state = 302;
+						this.state = 310;
 						(_localctx as BinaryOpContext)._right = this.expression(11);
 						}
 						break;
@@ -1577,13 +1603,13 @@ export class CashScriptParser extends Parser {
 						_localctx = new BinaryOpContext(new ExpressionContext(_parentctx, _parentState));
 						(_localctx as BinaryOpContext)._left = _prevctx;
 						this.pushNewRecursionContext(_localctx, _startState, CashScriptParser.RULE_expression);
-						this.state = 303;
+						this.state = 311;
 						if (!(this.precpred(this._ctx, 9))) {
 							throw this.createFailedPredicateException("this.precpred(this._ctx, 9)");
 						}
-						this.state = 304;
+						this.state = 312;
 						(_localctx as BinaryOpContext)._op = this.match(CashScriptParser.T__46);
-						this.state = 305;
+						this.state = 313;
 						(_localctx as BinaryOpContext)._right = this.expression(10);
 						}
 						break;
@@ -1593,13 +1619,13 @@ export class CashScriptParser extends Parser {
 						_localctx = new BinaryOpContext(new ExpressionContext(_parentctx, _parentState));
 						(_localctx as BinaryOpContext)._left = _prevctx;
 						this.pushNewRecursionContext(_localctx, _startState, CashScriptParser.RULE_expression);
-						this.state = 306;
+						this.state = 314;
 						if (!(this.precpred(this._ctx, 8))) {
 							throw this.createFailedPredicateException("this.precpred(this._ctx, 8)");
 						}
-						this.state = 307;
+						this.state = 315;
 						(_localctx as BinaryOpContext)._op = this.match(CashScriptParser.T__3);
-						this.state = 308;
+						this.state = 316;
 						(_localctx as BinaryOpContext)._right = this.expression(9);
 						}
 						break;
@@ -1609,13 +1635,13 @@ export class CashScriptParser extends Parser {
 						_localctx = new BinaryOpContext(new ExpressionContext(_parentctx, _parentState));
 						(_localctx as BinaryOpContext)._left = _prevctx;
 						this.pushNewRecursionContext(_localctx, _startState, CashScriptParser.RULE_expression);
-						this.state = 309;
+						this.state = 317;
 						if (!(this.precpred(this._ctx, 7))) {
 							throw this.createFailedPredicateException("this.precpred(this._ctx, 7)");
 						}
-						this.state = 310;
+						this.state = 318;
 						(_localctx as BinaryOpContext)._op = this.match(CashScriptParser.T__47);
-						this.state = 311;
+						this.state = 319;
 						(_localctx as BinaryOpContext)._right = this.expression(8);
 						}
 						break;
@@ -1625,13 +1651,13 @@ export class CashScriptParser extends Parser {
 						_localctx = new BinaryOpContext(new ExpressionContext(_parentctx, _parentState));
 						(_localctx as BinaryOpContext)._left = _prevctx;
 						this.pushNewRecursionContext(_localctx, _startState, CashScriptParser.RULE_expression);
-						this.state = 312;
+						this.state = 320;
 						if (!(this.precpred(this._ctx, 6))) {
 							throw this.createFailedPredicateException("this.precpred(this._ctx, 6)");
 						}
-						this.state = 313;
+						this.state = 321;
 						(_localctx as BinaryOpContext)._op = this.match(CashScriptParser.T__48);
-						this.state = 314;
+						this.state = 322;
 						(_localctx as BinaryOpContext)._right = this.expression(7);
 						}
 						break;
@@ -1641,13 +1667,13 @@ export class CashScriptParser extends Parser {
 						_localctx = new BinaryOpContext(new ExpressionContext(_parentctx, _parentState));
 						(_localctx as BinaryOpContext)._left = _prevctx;
 						this.pushNewRecursionContext(_localctx, _startState, CashScriptParser.RULE_expression);
-						this.state = 315;
+						this.state = 323;
 						if (!(this.precpred(this._ctx, 5))) {
 							throw this.createFailedPredicateException("this.precpred(this._ctx, 5)");
 						}
-						this.state = 316;
+						this.state = 324;
 						(_localctx as BinaryOpContext)._op = this.match(CashScriptParser.T__49);
-						this.state = 317;
+						this.state = 325;
 						(_localctx as BinaryOpContext)._right = this.expression(6);
 						}
 						break;
@@ -1656,15 +1682,15 @@ export class CashScriptParser extends Parser {
 						{
 						_localctx = new TupleIndexOpContext(new ExpressionContext(_parentctx, _parentState));
 						this.pushNewRecursionContext(_localctx, _startState, CashScriptParser.RULE_expression);
-						this.state = 318;
+						this.state = 326;
 						if (!(this.precpred(this._ctx, 19))) {
 							throw this.createFailedPredicateException("this.precpred(this._ctx, 19)");
 						}
-						this.state = 319;
+						this.state = 327;
 						this.match(CashScriptParser.T__22);
-						this.state = 320;
+						this.state = 328;
 						(_localctx as TupleIndexOpContext)._index = this.match(CashScriptParser.NumberLiteral);
-						this.state = 321;
+						this.state = 329;
 						this.match(CashScriptParser.T__23);
 						}
 						break;
@@ -1673,11 +1699,11 @@ export class CashScriptParser extends Parser {
 						{
 						_localctx = new UnaryOpContext(new ExpressionContext(_parentctx, _parentState));
 						this.pushNewRecursionContext(_localctx, _startState, CashScriptParser.RULE_expression);
-						this.state = 322;
+						this.state = 330;
 						if (!(this.precpred(this._ctx, 16))) {
 							throw this.createFailedPredicateException("this.precpred(this._ctx, 16)");
 						}
-						this.state = 323;
+						this.state = 331;
 						(_localctx as UnaryOpContext)._op = this._input.LT(1);
 						_la = this._input.LA(1);
 						if (!(_la === CashScriptParser.T__35 || _la === CashScriptParser.T__36)) {
@@ -1698,26 +1724,26 @@ export class CashScriptParser extends Parser {
 						_localctx = new BinaryOpContext(new ExpressionContext(_parentctx, _parentState));
 						(_localctx as BinaryOpContext)._left = _prevctx;
 						this.pushNewRecursionContext(_localctx, _startState, CashScriptParser.RULE_expression);
-						this.state = 324;
+						this.state = 332;
 						if (!(this.precpred(this._ctx, 15))) {
 							throw this.createFailedPredicateException("this.precpred(this._ctx, 15)");
 						}
-						this.state = 325;
+						this.state = 333;
 						(_localctx as BinaryOpContext)._op = this.match(CashScriptParser.T__37);
-						this.state = 326;
+						this.state = 334;
 						this.match(CashScriptParser.T__14);
-						this.state = 327;
+						this.state = 335;
 						(_localctx as BinaryOpContext)._right = this.expression(0);
-						this.state = 328;
+						this.state = 336;
 						this.match(CashScriptParser.T__16);
 						}
 						break;
 					}
 					}
 				}
-				this.state = 334;
+				this.state = 342;
 				this._errHandler.sync(this);
-				_alt = this.interpreter.adaptivePredict(this._input, 26, this._ctx);
+				_alt = this.interpreter.adaptivePredict(this._input, 28, this._ctx);
 			}
 			}
 		}
@@ -1742,7 +1768,7 @@ export class CashScriptParser extends Parser {
 		try {
 			this.enterOuterAlt(_localctx, 1);
 			{
-			this.state = 335;
+			this.state = 343;
 			this.match(CashScriptParser.T__50);
 			}
 		}
@@ -1765,41 +1791,41 @@ export class CashScriptParser extends Parser {
 		let _localctx: LiteralContext = new LiteralContext(this._ctx, this.state);
 		this.enterRule(_localctx, 50, CashScriptParser.RULE_literal);
 		try {
-			this.state = 342;
+			this.state = 350;
 			this._errHandler.sync(this);
 			switch (this._input.LA(1)) {
 			case CashScriptParser.BooleanLiteral:
 				this.enterOuterAlt(_localctx, 1);
 				{
-				this.state = 337;
+				this.state = 345;
 				this.match(CashScriptParser.BooleanLiteral);
 				}
 				break;
 			case CashScriptParser.NumberLiteral:
 				this.enterOuterAlt(_localctx, 2);
 				{
-				this.state = 338;
+				this.state = 346;
 				this.numberLiteral();
 				}
 				break;
 			case CashScriptParser.StringLiteral:
 				this.enterOuterAlt(_localctx, 3);
 				{
-				this.state = 339;
+				this.state = 347;
 				this.match(CashScriptParser.StringLiteral);
 				}
 				break;
 			case CashScriptParser.DateLiteral:
 				this.enterOuterAlt(_localctx, 4);
 				{
-				this.state = 340;
+				this.state = 348;
 				this.match(CashScriptParser.DateLiteral);
 				}
 				break;
 			case CashScriptParser.HexLiteral:
 				this.enterOuterAlt(_localctx, 5);
 				{
-				this.state = 341;
+				this.state = 349;
 				this.match(CashScriptParser.HexLiteral);
 				}
 				break;
@@ -1828,14 +1854,14 @@ export class CashScriptParser extends Parser {
 		try {
 			this.enterOuterAlt(_localctx, 1);
 			{
-			this.state = 344;
+			this.state = 352;
 			this.match(CashScriptParser.NumberLiteral);
-			this.state = 346;
+			this.state = 354;
 			this._errHandler.sync(this);
-			switch ( this.interpreter.adaptivePredict(this._input, 28, this._ctx) ) {
+			switch ( this.interpreter.adaptivePredict(this._input, 30, this._ctx) ) {
 			case 1:
 				{
-				this.state = 345;
+				this.state = 353;
 				this.match(CashScriptParser.NumberUnit);
 				}
 				break;
@@ -1864,7 +1890,7 @@ export class CashScriptParser extends Parser {
 		try {
 			this.enterOuterAlt(_localctx, 1);
 			{
-			this.state = 348;
+			this.state = 356;
 			_la = this._input.LA(1);
 			if (!(((((_la - 52)) & ~0x1F) === 0 && ((1 << (_la - 52)) & ((1 << (CashScriptParser.T__51 - 52)) | (1 << (CashScriptParser.T__52 - 52)) | (1 << (CashScriptParser.T__53 - 52)) | (1 << (CashScriptParser.T__54 - 52)) | (1 << (CashScriptParser.T__55 - 52)) | (1 << (CashScriptParser.T__56 - 52)) | (1 << (CashScriptParser.Bytes - 52)))) !== 0))) {
 			this._errHandler.recoverInline(this);
@@ -1942,7 +1968,7 @@ export class CashScriptParser extends Parser {
 	}
 
 	public static readonly _serializedATN: string =
-		"\x03\uC91D\uCABA\u058D\uAFBA\u4F53\u0607\uEA8B\uC241\x03J\u0161\x04\x02" +
+		"\x03\uC91D\uCABA\u058D\uAFBA\u4F53\u0607\uEA8B\uC241\x03J\u0169\x04\x02" +
 		"\t\x02\x04\x03\t\x03\x04\x04\t\x04\x04\x05\t\x05\x04\x06\t\x06\x04\x07" +
 		"\t\x07\x04\b\t\b\x04\t\t\t\x04\n\t\n\x04\v\t\v\x04\f\t\f\x04\r\t\r\x04" +
 		"\x0E\t\x0E\x04\x0F\t\x0F\x04\x10\t\x10\x04\x11\t\x11\x04\x12\t\x12\x04" +
@@ -1960,156 +1986,161 @@ export class CashScriptParser extends Parser {
 		"\x0E\x9A\v\x0E\x03\x0E\x03\x0E\x03\x0E\x03\x0E\x03\x0E\x03\x0F\x03\x0F" +
 		"\x03\x0F\x03\x0F\x03\x0F\x03\x0F\x03\x0F\x03\x0F\x03\x0F\x03\x10\x03\x10" +
 		"\x03\x10\x03\x10\x03\x10\x03\x11\x03\x11\x03\x11\x03\x11\x03\x11\x03\x11" +
-		"\x03\x11\x03\x11\x03\x12\x03\x12\x03\x12\x03\x12\x03\x12\x03\x12\x03\x13" +
-		"\x03\x13\x03\x13\x03\x13\x03\x13\x03\x13\x03\x13\x05\x13\xC4\n\x13\x03" +
+		"\x03\x11\x05\x11\xB6\n\x11\x03\x11\x03\x11\x03\x11\x03\x12\x03\x12\x03" +
+		"\x12\x03\x12\x03\x12\x05\x12\xC0\n\x12\x03\x12\x03\x12\x03\x12\x03\x13" +
+		"\x03\x13\x03\x13\x03\x13\x03\x13\x03\x13\x03\x13\x05\x13\xCC\n\x13\x03" +
 		"\x14\x03\x14\x03\x14\x03\x14\x03\x15\x03\x15\x03\x16\x03\x16\x03\x16\x03" +
-		"\x16\x07\x16\xD0\n\x16\f\x16\x0E\x16\xD3\v\x16\x03\x16\x05\x16\xD6\n\x16" +
-		"\x05\x16\xD8\n\x16\x03\x16\x03\x16\x03\x17\x03\x17\x03\x17\x03\x18\x03" +
-		"\x18\x03\x18\x03\x18\x07\x18\xE3\n\x18\f\x18\x0E\x18\xE6\v\x18\x03\x18" +
-		"\x05\x18\xE9\n\x18\x05\x18\xEB\n\x18\x03\x18\x03\x18\x03\x19\x03\x19\x03" +
-		"\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19\x05\x19\xF9" +
-		"\n\x19\x03\x19\x05\x19\xFC\n\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19" +
-		"\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19" +
-		"\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19" +
-		"\x03\x19\x07\x19\u0116\n\x19\f\x19\x0E\x19\u0119\v\x19\x03\x19\x05\x19" +
-		"\u011C\n\x19\x05\x19\u011E\n\x19\x03\x19\x03\x19\x03\x19\x03\x19\x05\x19" +
-		"\u0124\n\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03" +
+		"\x16\x07\x16\xD8\n\x16\f\x16\x0E\x16\xDB\v\x16\x03\x16\x05\x16\xDE\n\x16" +
+		"\x05\x16\xE0\n\x16\x03\x16\x03\x16\x03\x17\x03\x17\x03\x17\x03\x18\x03" +
+		"\x18\x03\x18\x03\x18\x07\x18\xEB\n\x18\f\x18\x0E\x18\xEE\v\x18\x03\x18" +
+		"\x05\x18\xF1\n\x18\x05\x18\xF3\n\x18\x03\x18\x03\x18\x03\x19\x03\x19\x03" +
+		"\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19\x05\x19\u0101" +
+		"\n\x19\x03\x19\x05\x19\u0104\n\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03" +
 		"\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03" +
 		"\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03" +
-		"\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03" +
-		"\x19\x03\x19\x03\x19\x03\x19\x03\x19\x07\x19\u014D\n\x19\f\x19\x0E\x19" +
-		"\u0150\v\x19\x03\x1A\x03\x1A\x03\x1B\x03\x1B\x03\x1B\x03\x1B\x03\x1B\x05" +
-		"\x1B\u0159\n\x1B\x03\x1C\x03\x1C\x05\x1C\u015D\n\x1C\x03\x1D\x03\x1D\x03" +
-		"\x1D\x02\x02\x030\x1E\x02\x02\x04\x02\x06\x02\b\x02\n\x02\f\x02\x0E\x02" +
-		"\x10\x02\x12\x02\x14\x02\x16\x02\x18\x02\x1A\x02\x1C\x02\x1E\x02 \x02" +
-		"\"\x02$\x02&\x02(\x02*\x02,\x02.\x020\x022\x024\x026\x028\x02\x02\r\x03" +
-		"\x02\x06\f\x07\x02==??BBDDGG\x03\x02\x1C \x04\x02\x1C \"%\x03\x02)*\x03" +
-		"\x02+-\x04\x02**..\x03\x02\b\v\x03\x02/0\x03\x02&\'\x04\x026;@@\x02\u017C" +
-		"\x02=\x03\x02\x02\x02\x04C\x03\x02\x02\x02\x06H\x03\x02\x02\x02\bJ\x03" +
-		"\x02\x02\x02\nO\x03\x02\x02\x02\fS\x03\x02\x02\x02\x0EU\x03\x02\x02\x02" +
-		"\x10a\x03\x02\x02\x02\x12m\x03\x02\x02\x02\x14}\x03\x02\x02\x02\x16\x89" +
-		"\x03\x02\x02\x02\x18\x92\x03\x02\x02\x02\x1A\x94\x03\x02\x02\x02\x1C\xA0" +
-		"\x03\x02\x02\x02\x1E\xA9\x03\x02\x02\x02 \xAE\x03\x02\x02\x02\"\xB6\x03" +
-		"\x02\x02\x02$\xBC\x03\x02\x02\x02&\xC5\x03\x02\x02\x02(\xC9\x03\x02\x02" +
-		"\x02*\xCB\x03\x02\x02\x02,\xDB\x03\x02\x02\x02.\xDE\x03\x02\x02\x020\u0123" +
-		"\x03\x02\x02\x022\u0151\x03\x02\x02\x024\u0158\x03\x02\x02\x026\u015A" +
-		"\x03\x02\x02\x028\u015E\x03\x02\x02\x02:<\x05\x04\x03\x02;:\x03\x02\x02" +
-		"\x02<?\x03\x02\x02\x02=;\x03\x02\x02\x02=>\x03\x02\x02\x02>@\x03\x02\x02" +
-		"\x02?=\x03\x02\x02\x02@A\x05\x0E\b\x02AB\x07\x02\x02\x03B\x03\x03\x02" +
-		"\x02\x02CD\x07\x03\x02\x02DE\x05\x06\x04\x02EF\x05\b\x05\x02FG\x07\x04" +
-		"\x02\x02G\x05\x03\x02\x02\x02HI\x07\x05\x02\x02I\x07\x03\x02\x02\x02J" +
-		"L\x05\n\x06\x02KM\x05\n\x06\x02LK\x03\x02\x02\x02LM\x03\x02\x02\x02M\t" +
-		"\x03\x02\x02\x02NP\x05\f\x07\x02ON\x03\x02\x02\x02OP\x03\x02\x02\x02P" +
-		"Q\x03\x02\x02\x02QR\x07<\x02\x02R\v\x03\x02\x02\x02ST\t\x02\x02\x02T\r" +
-		"\x03\x02\x02\x02UV\x07\r\x02\x02VW\x07G\x02\x02WX\x05\x12\n\x02X\\\x07" +
-		"\x0E\x02\x02Y[\x05\x10\t\x02ZY\x03\x02\x02\x02[^\x03\x02\x02\x02\\Z\x03" +
-		"\x02\x02\x02\\]\x03\x02\x02\x02]_\x03\x02\x02\x02^\\\x03\x02\x02\x02_" +
-		"`\x07\x0F\x02\x02`\x0F\x03\x02\x02\x02ab\x07\x10\x02\x02bc\x07G\x02\x02" +
-		"cd\x05\x12\n\x02dh\x07\x0E\x02\x02eg\x05\x18\r\x02fe\x03\x02\x02\x02g" +
-		"j\x03\x02\x02\x02hf\x03\x02\x02\x02hi\x03\x02\x02\x02ik\x03\x02\x02\x02" +
-		"jh\x03\x02\x02\x02kl\x07\x0F\x02\x02l\x11\x03\x02\x02\x02my\x07\x11\x02" +
-		"\x02ns\x05\x14\v\x02op\x07\x12\x02\x02pr\x05\x14\v\x02qo\x03\x02\x02\x02" +
-		"ru\x03\x02\x02\x02sq\x03\x02\x02\x02st\x03\x02\x02\x02tw\x03\x02\x02\x02" +
-		"us\x03\x02\x02\x02vx\x07\x12\x02\x02wv\x03\x02\x02\x02wx\x03\x02\x02\x02" +
-		"xz\x03\x02\x02\x02yn\x03\x02\x02\x02yz\x03\x02\x02\x02z{\x03\x02\x02\x02" +
-		"{|\x07\x13\x02\x02|\x13\x03\x02\x02\x02}~\x058\x1D\x02~\x7F\x07G\x02\x02" +
-		"\x7F\x15\x03\x02\x02\x02\x80\x84\x07\x0E\x02\x02\x81\x83\x05\x18\r\x02" +
-		"\x82\x81\x03\x02\x02\x02\x83\x86\x03\x02\x02\x02\x84\x82\x03\x02\x02\x02" +
-		"\x84\x85\x03\x02\x02\x02\x85\x87\x03\x02\x02\x02\x86\x84\x03\x02\x02\x02" +
-		"\x87\x8A\x07\x0F\x02\x02\x88\x8A\x05\x18\r\x02\x89\x80\x03\x02\x02\x02" +
-		"\x89\x88\x03\x02\x02\x02\x8A\x17\x03\x02\x02\x02\x8B\x93\x05\x1A\x0E\x02" +
-		"\x8C\x93\x05\x1C\x0F\x02\x8D\x93\x05\x1E\x10\x02\x8E\x93\x05 \x11\x02" +
-		"\x8F\x93\x05\"\x12\x02\x90\x93\x05$\x13\x02\x91\x93\x05&\x14\x02\x92\x8B" +
-		"\x03\x02\x02\x02\x92\x8C\x03\x02\x02\x02\x92\x8D\x03\x02\x02\x02\x92\x8E" +
-		"\x03\x02\x02\x02\x92\x8F\x03\x02\x02\x02\x92\x90\x03\x02\x02\x02\x92\x91" +
-		"\x03\x02\x02\x02\x93\x19\x03\x02\x02\x02\x94\x98\x058\x1D\x02\x95\x97" +
-		"\x052\x1A\x02\x96\x95\x03\x02\x02\x02\x97\x9A\x03\x02\x02\x02\x98\x96" +
-		"\x03\x02\x02\x02\x98\x99\x03\x02\x02\x02\x99\x9B\x03\x02\x02\x02\x9A\x98" +
-		"\x03\x02\x02\x02\x9B\x9C\x07G\x02\x02\x9C\x9D\x07\f\x02\x02\x9D\x9E\x05" +
-		"0\x19\x02\x9E\x9F\x07\x04\x02\x02\x9F\x1B\x03\x02\x02\x02\xA0\xA1\x05" +
-		"8\x1D\x02\xA1\xA2\x07G\x02\x02\xA2\xA3\x07\x12\x02\x02\xA3\xA4\x058\x1D" +
-		"\x02\xA4\xA5\x07G\x02\x02\xA5\xA6\x07\f\x02\x02\xA6\xA7\x050\x19\x02\xA7" +
-		"\xA8\x07\x04\x02\x02\xA8\x1D\x03\x02\x02\x02\xA9\xAA\x07G\x02\x02\xAA" +
-		"\xAB\x07\f\x02\x02\xAB\xAC\x050\x19\x02\xAC\xAD\x07\x04\x02\x02\xAD\x1F" +
-		"\x03\x02\x02\x02\xAE\xAF\x07\x14\x02\x02\xAF\xB0\x07\x11\x02\x02\xB0\xB1" +
-		"\x07E\x02\x02\xB1\xB2\x07\b\x02\x02\xB2\xB3\x050\x19\x02\xB3\xB4\x07\x13" +
-		"\x02\x02\xB4\xB5\x07\x04\x02\x02\xB5!\x03\x02\x02\x02\xB6\xB7\x07\x14" +
-		"\x02\x02\xB7\xB8\x07\x11\x02\x02\xB8\xB9\x050\x19\x02\xB9\xBA\x07\x13" +
-		"\x02\x02\xBA\xBB\x07\x04\x02\x02\xBB#\x03\x02\x02\x02\xBC\xBD\x07\x15" +
-		"\x02\x02\xBD\xBE\x07\x11\x02\x02\xBE\xBF\x050\x19\x02\xBF\xC0\x07\x13" +
-		"\x02\x02\xC0\xC3\x05\x16\f\x02\xC1\xC2\x07\x16\x02\x02\xC2\xC4\x05\x16" +
-		"\f\x02\xC3\xC1\x03\x02\x02\x02\xC3\xC4\x03\x02\x02\x02\xC4%\x03\x02\x02" +
-		"\x02\xC5\xC6\x07\x17\x02\x02\xC6\xC7\x05*\x16\x02\xC7\xC8\x07\x04\x02" +
-		"\x02\xC8\'\x03\x02\x02\x02\xC9\xCA\t\x03\x02\x02\xCA)\x03\x02\x02\x02" +
-		"\xCB\xD7\x07\x11\x02\x02\xCC\xD1\x05(\x15\x02\xCD\xCE\x07\x12\x02\x02" +
-		"\xCE\xD0\x05(\x15\x02\xCF\xCD\x03\x02\x02\x02\xD0\xD3\x03\x02\x02\x02" +
-		"\xD1\xCF\x03\x02\x02\x02\xD1\xD2\x03\x02\x02\x02\xD2\xD5\x03\x02\x02\x02" +
-		"\xD3\xD1\x03\x02\x02\x02\xD4\xD6\x07\x12\x02\x02\xD5\xD4\x03\x02\x02\x02" +
-		"\xD5\xD6\x03\x02\x02\x02\xD6\xD8\x03\x02\x02\x02\xD7\xCC\x03\x02\x02\x02" +
-		"\xD7\xD8\x03\x02\x02\x02\xD8\xD9\x03\x02\x02\x02\xD9\xDA\x07\x13\x02\x02" +
-		"\xDA+\x03\x02\x02\x02\xDB\xDC\x07G\x02\x02\xDC\xDD\x05.\x18\x02\xDD-\x03" +
-		"\x02\x02\x02\xDE\xEA\x07\x11\x02\x02\xDF\xE4\x050\x19\x02\xE0\xE1\x07" +
-		"\x12\x02\x02\xE1\xE3\x050\x19\x02\xE2\xE0\x03\x02\x02\x02\xE3\xE6\x03" +
-		"\x02\x02\x02\xE4\xE2\x03\x02\x02\x02\xE4\xE5\x03\x02\x02\x02\xE5\xE8\x03" +
-		"\x02\x02\x02\xE6\xE4\x03\x02\x02\x02\xE7\xE9\x07\x12\x02\x02\xE8\xE7\x03" +
-		"\x02\x02\x02\xE8\xE9\x03\x02\x02\x02\xE9\xEB\x03\x02\x02\x02\xEA\xDF\x03" +
-		"\x02\x02\x02\xEA\xEB\x03\x02\x02\x02\xEB\xEC\x03\x02\x02\x02\xEC\xED\x07" +
-		"\x13\x02\x02\xED/\x03\x02\x02\x02\xEE\xEF\b\x19\x01\x02\xEF\xF0\x07\x11" +
-		"\x02\x02\xF0\xF1\x050\x19\x02\xF1\xF2\x07\x13\x02\x02\xF2\u0124\x03\x02" +
-		"\x02\x02\xF3\xF4\x058\x1D\x02\xF4\xF5\x07\x11\x02\x02\xF5\xF8\x050\x19" +
-		"\x02\xF6\xF7\x07\x12\x02\x02\xF7\xF9\x050\x19\x02\xF8\xF6\x03\x02\x02" +
-		"\x02\xF8\xF9\x03\x02\x02\x02\xF9\xFB\x03\x02\x02\x02\xFA\xFC\x07\x12\x02" +
-		"\x02\xFB\xFA\x03\x02\x02\x02\xFB\xFC\x03\x02\x02\x02\xFC\xFD\x03\x02\x02" +
-		"\x02\xFD\xFE\x07\x13\x02\x02\xFE\u0124\x03\x02\x02\x02\xFF\u0124\x05," +
-		"\x17\x02\u0100\u0101\x07\x18\x02\x02\u0101\u0102\x07G\x02\x02\u0102\u0124" +
-		"\x05.\x18\x02\u0103\u0104\x07\x1B\x02\x02\u0104\u0105\x07\x19\x02\x02" +
-		"\u0105\u0106\x050\x19\x02\u0106\u0107\x07\x1A\x02\x02\u0107\u0108\t\x04" +
-		"\x02\x02\u0108\u0124\x03\x02\x02\x02\u0109\u010A\x07!\x02\x02\u010A\u010B" +
-		"\x07\x19\x02\x02\u010B\u010C\x050\x19\x02\u010C\u010D\x07\x1A\x02\x02" +
-		"\u010D\u010E\t\x05\x02\x02\u010E\u0124\x03\x02\x02\x02\u010F\u0110\t\x06" +
-		"\x02\x02\u0110\u0124\x050\x19\x10\u0111\u011D\x07\x19\x02\x02\u0112\u0117" +
-		"\x050\x19\x02\u0113\u0114\x07\x12\x02\x02\u0114\u0116\x050\x19\x02\u0115" +
-		"\u0113\x03\x02\x02\x02\u0116\u0119\x03\x02\x02\x02\u0117\u0115\x03\x02" +
-		"\x02\x02\u0117\u0118\x03\x02\x02\x02\u0118\u011B\x03\x02\x02\x02\u0119" +
-		"\u0117\x03\x02\x02\x02\u011A\u011C\x07\x12\x02\x02\u011B\u011A\x03\x02" +
-		"\x02\x02\u011B\u011C\x03\x02\x02\x02\u011C\u011E\x03\x02\x02\x02\u011D" +
-		"\u0112\x03\x02\x02\x02\u011D\u011E\x03\x02\x02\x02\u011E\u011F\x03\x02" +
-		"\x02\x02\u011F\u0124\x07\x1A\x02\x02\u0120\u0124\x07F\x02\x02\u0121\u0124" +
-		"\x07G\x02\x02\u0122\u0124\x054\x1B\x02\u0123\xEE\x03\x02\x02\x02\u0123" +
-		"\xF3\x03\x02\x02\x02\u0123\xFF\x03\x02\x02\x02\u0123\u0100\x03\x02\x02" +
-		"\x02\u0123\u0103\x03\x02\x02\x02\u0123\u0109\x03\x02\x02\x02\u0123\u010F" +
-		"\x03\x02\x02\x02\u0123\u0111\x03\x02\x02\x02\u0123\u0120\x03\x02\x02\x02" +
-		"\u0123\u0121\x03\x02\x02\x02\u0123\u0122\x03\x02\x02\x02\u0124\u014E\x03" +
-		"\x02\x02\x02\u0125\u0126\f\x0F\x02\x02\u0126\u0127\t\x07\x02\x02\u0127" +
-		"\u014D\x050\x19\x10\u0128\u0129\f\x0E\x02\x02\u0129\u012A\t\b\x02\x02" +
-		"\u012A\u014D\x050\x19\x0F\u012B\u012C\f\r\x02\x02\u012C\u012D\t\t\x02" +
-		"\x02\u012D\u014D\x050\x19\x0E\u012E\u012F\f\f\x02\x02\u012F\u0130\t\n" +
-		"\x02\x02\u0130\u014D\x050\x19\r\u0131\u0132\f\v\x02\x02\u0132\u0133\x07" +
-		"1\x02\x02\u0133\u014D\x050\x19\f\u0134\u0135\f\n\x02\x02\u0135\u0136\x07" +
-		"\x06\x02\x02\u0136\u014D\x050\x19\v\u0137\u0138\f\t\x02\x02\u0138\u0139" +
-		"\x072\x02\x02\u0139\u014D\x050\x19\n\u013A\u013B\f\b\x02\x02\u013B\u013C" +
-		"\x073\x02\x02\u013C\u014D\x050\x19\t\u013D\u013E\f\x07\x02\x02\u013E\u013F" +
-		"\x074\x02\x02\u013F\u014D\x050\x19\b\u0140\u0141\f\x15\x02\x02\u0141\u0142" +
-		"\x07\x19\x02\x02\u0142\u0143\x07?\x02\x02\u0143\u014D\x07\x1A\x02\x02" +
-		"\u0144\u0145\f\x12\x02\x02\u0145\u014D\t\v\x02\x02\u0146\u0147\f\x11\x02" +
-		"\x02\u0147\u0148\x07(\x02\x02\u0148\u0149\x07\x11\x02\x02\u0149\u014A" +
-		"\x050\x19\x02\u014A\u014B\x07\x13\x02\x02\u014B\u014D\x03\x02\x02\x02" +
-		"\u014C\u0125\x03\x02\x02\x02\u014C\u0128\x03\x02\x02\x02\u014C\u012B\x03" +
-		"\x02\x02\x02\u014C\u012E\x03\x02\x02\x02\u014C\u0131\x03\x02\x02\x02\u014C" +
-		"\u0134\x03\x02\x02\x02\u014C\u0137\x03\x02\x02\x02\u014C\u013A\x03\x02" +
-		"\x02\x02\u014C\u013D\x03\x02\x02\x02\u014C\u0140\x03\x02\x02\x02\u014C" +
-		"\u0144\x03\x02\x02\x02\u014C\u0146\x03\x02\x02\x02\u014D\u0150\x03\x02" +
-		"\x02\x02\u014E\u014C\x03\x02\x02\x02\u014E\u014F\x03\x02\x02\x02\u014F" +
-		"1\x03\x02\x02\x02\u0150\u014E\x03\x02\x02\x02\u0151\u0152\x075\x02\x02" +
-		"\u01523\x03\x02\x02\x02\u0153\u0159\x07=\x02\x02\u0154\u0159\x056\x1C" +
-		"\x02\u0155\u0159\x07B\x02\x02\u0156\u0159\x07C\x02\x02\u0157\u0159\x07" +
-		"D\x02\x02\u0158\u0153\x03\x02\x02\x02\u0158\u0154\x03\x02\x02\x02\u0158" +
-		"\u0155\x03\x02\x02\x02\u0158\u0156\x03\x02\x02\x02\u0158\u0157\x03\x02" +
-		"\x02\x02\u01595\x03\x02\x02\x02\u015A\u015C\x07?\x02\x02\u015B\u015D\x07" +
-		">\x02\x02\u015C\u015B\x03\x02\x02\x02\u015C\u015D\x03\x02\x02\x02\u015D" +
-		"7\x03\x02\x02\x02\u015E\u015F\t\f\x02\x02\u015F9\x03\x02\x02\x02\x1F=" +
-		"LO\\hswy\x84\x89\x92\x98\xC3\xD1\xD5\xD7\xE4\xE8\xEA\xF8\xFB\u0117\u011B" +
-		"\u011D\u0123\u014C\u014E\u0158\u015C";
+		"\x19\x03\x19\x07\x19\u011E\n\x19\f\x19\x0E\x19\u0121\v\x19\x03\x19\x05" +
+		"\x19\u0124\n\x19\x05\x19\u0126\n\x19\x03\x19\x03\x19\x03\x19\x03\x19\x05" +
+		"\x19\u012C\n\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19" +
+		"\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19" +
+		"\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19" +
+		"\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19" +
+		"\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19\x07\x19\u0155\n\x19\f\x19\x0E" +
+		"\x19\u0158\v\x19\x03\x1A\x03\x1A\x03\x1B\x03\x1B\x03\x1B\x03\x1B\x03\x1B" +
+		"\x05\x1B\u0161\n\x1B\x03\x1C\x03\x1C\x05\x1C\u0165\n\x1C\x03\x1D\x03\x1D" +
+		"\x03\x1D\x02\x02\x030\x1E\x02\x02\x04\x02\x06\x02\b\x02\n\x02\f\x02\x0E" +
+		"\x02\x10\x02\x12\x02\x14\x02\x16\x02\x18\x02\x1A\x02\x1C\x02\x1E\x02 " +
+		"\x02\"\x02$\x02&\x02(\x02*\x02,\x02.\x020\x022\x024\x026\x028\x02\x02" +
+		"\r\x03\x02\x06\f\x07\x02==??BBDDGG\x03\x02\x1C \x04\x02\x1C \"%\x03\x02" +
+		")*\x03\x02+-\x04\x02**..\x03\x02\b\v\x03\x02/0\x03\x02&\'\x04\x026;@@" +
+		"\x02\u0186\x02=\x03\x02\x02\x02\x04C\x03\x02\x02\x02\x06H\x03\x02\x02" +
+		"\x02\bJ\x03\x02\x02\x02\nO\x03\x02\x02\x02\fS\x03\x02\x02\x02\x0EU\x03" +
+		"\x02\x02\x02\x10a\x03\x02\x02\x02\x12m\x03\x02\x02\x02\x14}\x03\x02\x02" +
+		"\x02\x16\x89\x03\x02\x02\x02\x18\x92\x03\x02\x02\x02\x1A\x94\x03\x02\x02" +
+		"\x02\x1C\xA0\x03\x02\x02\x02\x1E\xA9\x03\x02\x02\x02 \xAE\x03\x02\x02" +
+		"\x02\"\xBA\x03\x02\x02\x02$\xC4\x03\x02\x02\x02&\xCD\x03\x02\x02\x02(" +
+		"\xD1\x03\x02\x02\x02*\xD3\x03\x02\x02\x02,\xE3\x03\x02\x02\x02.\xE6\x03" +
+		"\x02\x02\x020\u012B\x03\x02\x02\x022\u0159\x03\x02\x02\x024\u0160\x03" +
+		"\x02\x02\x026\u0162\x03\x02\x02\x028\u0166\x03\x02\x02\x02:<\x05\x04\x03" +
+		"\x02;:\x03\x02\x02\x02<?\x03\x02\x02\x02=;\x03\x02\x02\x02=>\x03\x02\x02" +
+		"\x02>@\x03\x02\x02\x02?=\x03\x02\x02\x02@A\x05\x0E\b\x02AB\x07\x02\x02" +
+		"\x03B\x03\x03\x02\x02\x02CD\x07\x03\x02\x02DE\x05\x06\x04\x02EF\x05\b" +
+		"\x05\x02FG\x07\x04\x02\x02G\x05\x03\x02\x02\x02HI\x07\x05\x02\x02I\x07" +
+		"\x03\x02\x02\x02JL\x05\n\x06\x02KM\x05\n\x06\x02LK\x03\x02\x02\x02LM\x03" +
+		"\x02\x02\x02M\t\x03\x02\x02\x02NP\x05\f\x07\x02ON\x03\x02\x02\x02OP\x03" +
+		"\x02\x02\x02PQ\x03\x02\x02\x02QR\x07<\x02\x02R\v\x03\x02\x02\x02ST\t\x02" +
+		"\x02\x02T\r\x03\x02\x02\x02UV\x07\r\x02\x02VW\x07G\x02\x02WX\x05\x12\n" +
+		"\x02X\\\x07\x0E\x02\x02Y[\x05\x10\t\x02ZY\x03\x02\x02\x02[^\x03\x02\x02" +
+		"\x02\\Z\x03\x02\x02\x02\\]\x03\x02\x02\x02]_\x03\x02\x02\x02^\\\x03\x02" +
+		"\x02\x02_`\x07\x0F\x02\x02`\x0F\x03\x02\x02\x02ab\x07\x10\x02\x02bc\x07" +
+		"G\x02\x02cd\x05\x12\n\x02dh\x07\x0E\x02\x02eg\x05\x18\r\x02fe\x03\x02" +
+		"\x02\x02gj\x03\x02\x02\x02hf\x03\x02\x02\x02hi\x03\x02\x02\x02ik\x03\x02" +
+		"\x02\x02jh\x03\x02\x02\x02kl\x07\x0F\x02\x02l\x11\x03\x02\x02\x02my\x07" +
+		"\x11\x02\x02ns\x05\x14\v\x02op\x07\x12\x02\x02pr\x05\x14\v\x02qo\x03\x02" +
+		"\x02\x02ru\x03\x02\x02\x02sq\x03\x02\x02\x02st\x03\x02\x02\x02tw\x03\x02" +
+		"\x02\x02us\x03\x02\x02\x02vx\x07\x12\x02\x02wv\x03\x02\x02\x02wx\x03\x02" +
+		"\x02\x02xz\x03\x02\x02\x02yn\x03\x02\x02\x02yz\x03\x02\x02\x02z{\x03\x02" +
+		"\x02\x02{|\x07\x13\x02\x02|\x13\x03\x02\x02\x02}~\x058\x1D\x02~\x7F\x07" +
+		"G\x02\x02\x7F\x15\x03\x02\x02\x02\x80\x84\x07\x0E\x02\x02\x81\x83\x05" +
+		"\x18\r\x02\x82\x81\x03\x02\x02\x02\x83\x86\x03\x02\x02\x02\x84\x82\x03" +
+		"\x02\x02\x02\x84\x85\x03\x02\x02\x02\x85\x87\x03\x02\x02\x02\x86\x84\x03" +
+		"\x02\x02\x02\x87\x8A\x07\x0F\x02\x02\x88\x8A\x05\x18\r\x02\x89\x80\x03" +
+		"\x02\x02\x02\x89\x88\x03\x02\x02\x02\x8A\x17\x03\x02\x02\x02\x8B\x93\x05" +
+		"\x1A\x0E\x02\x8C\x93\x05\x1C\x0F\x02\x8D\x93\x05\x1E\x10\x02\x8E\x93\x05" +
+		" \x11\x02\x8F\x93\x05\"\x12\x02\x90\x93\x05$\x13\x02\x91\x93\x05&\x14" +
+		"\x02\x92\x8B\x03\x02\x02\x02\x92\x8C\x03\x02\x02\x02\x92\x8D\x03\x02\x02" +
+		"\x02\x92\x8E\x03\x02\x02\x02\x92\x8F\x03\x02\x02\x02\x92\x90\x03\x02\x02" +
+		"\x02\x92\x91\x03\x02\x02\x02\x93\x19\x03\x02\x02\x02\x94\x98\x058\x1D" +
+		"\x02\x95\x97\x052\x1A\x02\x96\x95\x03\x02\x02\x02\x97\x9A\x03\x02\x02" +
+		"\x02\x98\x96\x03\x02\x02\x02\x98\x99\x03\x02\x02\x02\x99\x9B\x03\x02\x02" +
+		"\x02\x9A\x98\x03\x02\x02\x02\x9B\x9C\x07G\x02\x02\x9C\x9D\x07\f\x02\x02" +
+		"\x9D\x9E\x050\x19\x02\x9E\x9F\x07\x04\x02\x02\x9F\x1B\x03\x02\x02\x02" +
+		"\xA0\xA1\x058\x1D\x02\xA1\xA2\x07G\x02\x02\xA2\xA3\x07\x12\x02\x02\xA3" +
+		"\xA4\x058\x1D\x02\xA4\xA5\x07G\x02\x02\xA5\xA6\x07\f\x02\x02\xA6\xA7\x05" +
+		"0\x19\x02\xA7\xA8\x07\x04\x02\x02\xA8\x1D\x03\x02\x02\x02\xA9\xAA\x07" +
+		"G\x02\x02\xAA\xAB\x07\f\x02\x02\xAB\xAC\x050\x19\x02\xAC\xAD\x07\x04\x02" +
+		"\x02\xAD\x1F\x03\x02\x02\x02\xAE\xAF\x07\x14\x02\x02\xAF\xB0\x07\x11\x02" +
+		"\x02\xB0\xB1\x07E\x02\x02\xB1\xB2\x07\b\x02\x02\xB2\xB5\x050\x19\x02\xB3" +
+		"\xB4\x07\x12\x02\x02\xB4\xB6\x07B\x02\x02\xB5\xB3\x03\x02\x02\x02\xB5" +
+		"\xB6\x03\x02\x02\x02\xB6\xB7\x03\x02\x02\x02\xB7\xB8\x07\x13\x02\x02\xB8" +
+		"\xB9\x07\x04\x02\x02\xB9!\x03\x02\x02\x02\xBA\xBB\x07\x14\x02\x02\xBB" +
+		"\xBC\x07\x11\x02\x02\xBC\xBF\x050\x19\x02\xBD\xBE\x07\x12\x02\x02\xBE" +
+		"\xC0\x07B\x02\x02\xBF\xBD\x03\x02\x02\x02\xBF\xC0\x03\x02\x02\x02\xC0" +
+		"\xC1\x03\x02\x02\x02\xC1\xC2\x07\x13\x02\x02\xC2\xC3\x07\x04\x02\x02\xC3" +
+		"#\x03\x02\x02\x02\xC4\xC5\x07\x15\x02\x02\xC5\xC6\x07\x11\x02\x02\xC6" +
+		"\xC7\x050\x19\x02\xC7\xC8\x07\x13\x02\x02\xC8\xCB\x05\x16\f\x02\xC9\xCA" +
+		"\x07\x16\x02\x02\xCA\xCC\x05\x16\f\x02\xCB\xC9\x03\x02\x02\x02\xCB\xCC" +
+		"\x03\x02\x02\x02\xCC%\x03\x02\x02\x02\xCD\xCE\x07\x17\x02\x02\xCE\xCF" +
+		"\x05*\x16\x02\xCF\xD0\x07\x04\x02\x02\xD0\'\x03\x02\x02\x02\xD1\xD2\t" +
+		"\x03\x02\x02\xD2)\x03\x02\x02\x02\xD3\xDF\x07\x11\x02\x02\xD4\xD9\x05" +
+		"(\x15\x02\xD5\xD6\x07\x12\x02\x02\xD6\xD8\x05(\x15\x02\xD7\xD5\x03\x02" +
+		"\x02\x02\xD8\xDB\x03\x02\x02\x02\xD9\xD7\x03\x02\x02\x02\xD9\xDA\x03\x02" +
+		"\x02\x02\xDA\xDD\x03\x02\x02\x02\xDB\xD9\x03\x02\x02\x02\xDC\xDE\x07\x12" +
+		"\x02\x02\xDD\xDC\x03\x02\x02\x02\xDD\xDE\x03\x02\x02\x02\xDE\xE0\x03\x02" +
+		"\x02\x02\xDF\xD4\x03\x02\x02\x02\xDF\xE0\x03\x02\x02\x02\xE0\xE1\x03\x02" +
+		"\x02\x02\xE1\xE2\x07\x13\x02\x02\xE2+\x03\x02\x02\x02\xE3\xE4\x07G\x02" +
+		"\x02\xE4\xE5\x05.\x18\x02\xE5-\x03\x02\x02\x02\xE6\xF2\x07\x11\x02\x02" +
+		"\xE7\xEC\x050\x19\x02\xE8\xE9\x07\x12\x02\x02\xE9\xEB\x050\x19\x02\xEA" +
+		"\xE8\x03\x02\x02\x02\xEB\xEE\x03\x02\x02\x02\xEC\xEA\x03\x02\x02\x02\xEC" +
+		"\xED\x03\x02\x02\x02\xED\xF0\x03\x02\x02\x02\xEE\xEC\x03\x02\x02\x02\xEF" +
+		"\xF1\x07\x12\x02\x02\xF0\xEF\x03\x02\x02\x02\xF0\xF1\x03\x02\x02\x02\xF1" +
+		"\xF3\x03\x02\x02\x02\xF2\xE7\x03\x02\x02\x02\xF2\xF3\x03\x02\x02\x02\xF3" +
+		"\xF4\x03\x02\x02\x02\xF4\xF5\x07\x13\x02\x02\xF5/\x03\x02\x02\x02\xF6" +
+		"\xF7\b\x19\x01\x02\xF7\xF8\x07\x11\x02\x02\xF8\xF9\x050\x19\x02\xF9\xFA" +
+		"\x07\x13\x02\x02\xFA\u012C\x03\x02\x02\x02\xFB\xFC\x058\x1D\x02\xFC\xFD" +
+		"\x07\x11\x02\x02\xFD\u0100\x050\x19\x02\xFE\xFF\x07\x12\x02\x02\xFF\u0101" +
+		"\x050\x19\x02\u0100\xFE\x03\x02\x02\x02\u0100\u0101\x03\x02\x02\x02\u0101" +
+		"\u0103\x03\x02\x02\x02\u0102\u0104\x07\x12\x02\x02\u0103\u0102\x03\x02" +
+		"\x02\x02\u0103\u0104\x03\x02\x02\x02\u0104\u0105\x03\x02\x02\x02\u0105" +
+		"\u0106\x07\x13\x02\x02\u0106\u012C\x03\x02\x02\x02\u0107\u012C\x05,\x17" +
+		"\x02\u0108\u0109\x07\x18\x02\x02\u0109\u010A\x07G\x02\x02\u010A\u012C" +
+		"\x05.\x18\x02\u010B\u010C\x07\x1B\x02\x02\u010C\u010D\x07\x19\x02\x02" +
+		"\u010D\u010E\x050\x19\x02\u010E\u010F\x07\x1A\x02\x02\u010F\u0110\t\x04" +
+		"\x02\x02\u0110\u012C\x03\x02\x02\x02\u0111\u0112\x07!\x02\x02\u0112\u0113" +
+		"\x07\x19\x02\x02\u0113\u0114\x050\x19\x02\u0114\u0115\x07\x1A\x02\x02" +
+		"\u0115\u0116\t\x05\x02\x02\u0116\u012C\x03\x02\x02\x02\u0117\u0118\t\x06" +
+		"\x02\x02\u0118\u012C\x050\x19\x10\u0119\u0125\x07\x19\x02\x02\u011A\u011F" +
+		"\x050\x19\x02\u011B\u011C\x07\x12\x02\x02\u011C\u011E\x050\x19\x02\u011D" +
+		"\u011B\x03\x02\x02\x02\u011E\u0121\x03\x02\x02\x02\u011F\u011D\x03\x02" +
+		"\x02\x02\u011F\u0120\x03\x02\x02\x02\u0120\u0123\x03\x02\x02\x02\u0121" +
+		"\u011F\x03\x02\x02\x02\u0122\u0124\x07\x12\x02\x02\u0123\u0122\x03\x02" +
+		"\x02\x02\u0123\u0124\x03\x02\x02\x02\u0124\u0126\x03\x02\x02\x02\u0125" +
+		"\u011A\x03\x02\x02\x02\u0125\u0126\x03\x02\x02\x02\u0126\u0127\x03\x02" +
+		"\x02\x02\u0127\u012C\x07\x1A\x02\x02\u0128\u012C\x07F\x02\x02\u0129\u012C" +
+		"\x07G\x02\x02\u012A\u012C\x054\x1B\x02\u012B\xF6\x03\x02\x02\x02\u012B" +
+		"\xFB\x03\x02\x02\x02\u012B\u0107\x03\x02\x02\x02\u012B\u0108\x03\x02\x02" +
+		"\x02\u012B\u010B\x03\x02\x02\x02\u012B\u0111\x03\x02\x02\x02\u012B\u0117" +
+		"\x03\x02\x02\x02\u012B\u0119\x03\x02\x02\x02\u012B\u0128\x03\x02\x02\x02" +
+		"\u012B\u0129\x03\x02\x02\x02\u012B\u012A\x03\x02\x02\x02\u012C\u0156\x03" +
+		"\x02\x02\x02\u012D\u012E\f\x0F\x02\x02\u012E\u012F\t\x07\x02\x02\u012F" +
+		"\u0155\x050\x19\x10\u0130\u0131\f\x0E\x02\x02\u0131\u0132\t\b\x02\x02" +
+		"\u0132\u0155\x050\x19\x0F\u0133\u0134\f\r\x02\x02\u0134\u0135\t\t\x02" +
+		"\x02\u0135\u0155\x050\x19\x0E\u0136\u0137\f\f\x02\x02\u0137\u0138\t\n" +
+		"\x02\x02\u0138\u0155\x050\x19\r\u0139\u013A\f\v\x02\x02\u013A\u013B\x07" +
+		"1\x02\x02\u013B\u0155\x050\x19\f\u013C\u013D\f\n\x02\x02\u013D\u013E\x07" +
+		"\x06\x02\x02\u013E\u0155\x050\x19\v\u013F\u0140\f\t\x02\x02\u0140\u0141" +
+		"\x072\x02\x02\u0141\u0155\x050\x19\n\u0142\u0143\f\b\x02\x02\u0143\u0144" +
+		"\x073\x02\x02\u0144\u0155\x050\x19\t\u0145\u0146\f\x07\x02\x02\u0146\u0147" +
+		"\x074\x02\x02\u0147\u0155\x050\x19\b\u0148\u0149\f\x15\x02\x02\u0149\u014A" +
+		"\x07\x19\x02\x02\u014A\u014B\x07?\x02\x02\u014B\u0155\x07\x1A\x02\x02" +
+		"\u014C\u014D\f\x12\x02\x02\u014D\u0155\t\v\x02\x02\u014E\u014F\f\x11\x02" +
+		"\x02\u014F\u0150\x07(\x02\x02\u0150\u0151\x07\x11\x02\x02\u0151\u0152" +
+		"\x050\x19\x02\u0152\u0153\x07\x13\x02\x02\u0153\u0155\x03\x02\x02\x02" +
+		"\u0154\u012D\x03\x02\x02\x02\u0154\u0130\x03\x02\x02\x02\u0154\u0133\x03" +
+		"\x02\x02\x02\u0154\u0136\x03\x02\x02\x02\u0154\u0139\x03\x02\x02\x02\u0154" +
+		"\u013C\x03\x02\x02\x02\u0154\u013F\x03\x02\x02\x02\u0154\u0142\x03\x02" +
+		"\x02\x02\u0154\u0145\x03\x02\x02\x02\u0154\u0148\x03\x02\x02\x02\u0154" +
+		"\u014C\x03\x02\x02\x02\u0154\u014E\x03\x02\x02\x02\u0155\u0158\x03\x02" +
+		"\x02\x02\u0156\u0154\x03\x02\x02\x02\u0156\u0157\x03\x02\x02\x02\u0157" +
+		"1\x03\x02\x02\x02\u0158\u0156\x03\x02\x02\x02\u0159\u015A\x075\x02\x02" +
+		"\u015A3\x03\x02\x02\x02\u015B\u0161\x07=\x02\x02\u015C\u0161\x056\x1C" +
+		"\x02\u015D\u0161\x07B\x02\x02\u015E\u0161\x07C\x02\x02\u015F\u0161\x07" +
+		"D\x02\x02\u0160\u015B\x03\x02\x02\x02\u0160\u015C\x03\x02\x02\x02\u0160" +
+		"\u015D\x03\x02\x02\x02\u0160\u015E\x03\x02\x02\x02\u0160\u015F\x03\x02" +
+		"\x02\x02\u01615\x03\x02\x02\x02\u0162\u0164\x07?\x02\x02\u0163\u0165\x07" +
+		">\x02\x02\u0164\u0163\x03\x02\x02\x02\u0164\u0165\x03\x02\x02\x02\u0165" +
+		"7\x03\x02\x02\x02\u0166\u0167\t\f\x02\x02\u01679\x03\x02\x02\x02!=LO\\" +
+		"hswy\x84\x89\x92\x98\xB5\xBF\xCB\xD9\xDD\xDF\xEC\xF0\xF2\u0100\u0103\u011F" +
+		"\u0123\u0125\u012B\u0154\u0156\u0160\u0164";
 	public static __ATN: ATN;
 	public static get _ATN(): ATN {
 		if (!CashScriptParser.__ATN) {
@@ -2523,6 +2554,7 @@ export class TimeOpStatementContext extends ParserRuleContext {
 	public expression(): ExpressionContext {
 		return this.getRuleContext(0, ExpressionContext);
 	}
+	public StringLiteral(): TerminalNode | undefined { return this.tryGetToken(CashScriptParser.StringLiteral, 0); }
 	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
 		super(parent, invokingState);
 	}
@@ -2543,6 +2575,7 @@ export class RequireStatementContext extends ParserRuleContext {
 	public expression(): ExpressionContext {
 		return this.getRuleContext(0, ExpressionContext);
 	}
+	public StringLiteral(): TerminalNode | undefined { return this.tryGetToken(CashScriptParser.StringLiteral, 0); }
 	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
 		super(parent, invokingState);
 	}
diff --git a/packages/cashc/test/ast/Location.test.ts b/packages/cashc/test/ast/Location.test.ts
index adc53294..54c51769 100644
--- a/packages/cashc/test/ast/Location.test.ts
+++ b/packages/cashc/test/ast/Location.test.ts
@@ -1,7 +1,6 @@
 import fs from 'fs';
 import { URL } from 'url';
-import { compileString, parseCode } from '../../src/compiler.js';
-import { binToHex, hexToBin, vmNumberToBigInt } from '@bitauth/libauth';
+import { parseCode } from '../../src/compiler.js';
 
 describe('Location', () => {
   it('should retrieve correct text from location', () => {
@@ -13,32 +12,4 @@ describe('Location', () => {
     expect(f.location).toBeDefined();
     expect((f.location!).text(code)).toEqual('function hello(sig s, pubkey pk) {\n        require(checkSig(s, pk));\n    }');
   });
-
-  it('kek', () => {
-    const code = `
-pragma cashscript ^0.9.0;
-
-contract TransferWithTimeout(
-    pubkey sender,
-    pubkey recipient,
-    int timeout
-) {
-    // Require recipient's signature to match
-    function transfer(sig recipientSig) {
-        require(checkSig(recipientSig, recipient));
-    }
-
-    // Require timeout time to be reached and sender's signature to match
-    function timeout(sig senderSig) {
-      console.log(senderSig, "a", senderSig);
-        require(checkSig(senderSig, sender));
-        require(tx.time >= timeout);
-    }
-}
-`;
-    const artifact = compileString(code);
-    console.log(artifact);
-    // console.log(hexToBin(""), `'${binToHex(Uint8Array.from([]))}'`, vmNumberToBigInt(Uint8Array.from([])));
-
-  });
 });
diff --git a/packages/utils/src/artifact.ts b/packages/utils/src/artifact.ts
index 146752ec..98631b3d 100644
--- a/packages/utils/src/artifact.ts
+++ b/packages/utils/src/artifact.ts
@@ -17,6 +17,12 @@ export interface LogEntry {
   data: Array<{ stackIndex: number, type: string } | string>;
 }
 
+export interface RequireMessage {
+  ip: number;
+  line: number;
+  message: string;
+}
+
 export interface Artifact {
   contractName: string;
   constructorInputs: AbiInput[];
@@ -27,6 +33,7 @@ export interface Artifact {
     bytecode: string;
     sourceMap: string;
     logs?: LogEntry[];
+    requireMessages?: RequireMessage[];
   };
   compiler: {
     name: string;

From d58d85f95601247a1b29f328f80434edcb1a424f Mon Sep 17 00:00:00 2001
From: mainnet-pat <mainnet_pat@protonmail.com>
Date: Thu, 23 Nov 2023 20:16:23 +0000
Subject: [PATCH 005/171] Support require messages in libauth debug evaluation
 Transaction class uses libauth template to evaluate and debug transactions
 New MockNetworkProvider class

---
 packages/cashscript/src/LibauthTemplate.ts    |  16 ++-
 packages/cashscript/src/Transaction.ts        |  39 ++++++-
 packages/cashscript/src/index.ts              |   1 +
 packages/cashscript/src/interfaces.ts         |  20 +++-
 .../src/network/MockNetworkProvider.ts        |  52 +++++++++
 packages/cashscript/src/network/index.ts      |   1 +
 packages/cashscript/src/utils.ts              |   7 +-
 .../cashscript/test/LibauthTemplate.test.ts   | 110 ++++++++----------
 .../test/fixture/transfer_with_timeout.json   |   8 --
 9 files changed, 179 insertions(+), 75 deletions(-)
 create mode 100644 packages/cashscript/src/network/MockNetworkProvider.ts

diff --git a/packages/cashscript/src/LibauthTemplate.ts b/packages/cashscript/src/LibauthTemplate.ts
index e158a8d0..8360db88 100644
--- a/packages/cashscript/src/LibauthTemplate.ts
+++ b/packages/cashscript/src/LibauthTemplate.ts
@@ -81,11 +81,13 @@ export const stringify = (any: any, spaces?: number) =>
 export const buildTemplate = async ({
   contract,
   transaction,
+  transactionHex = undefined,
   manglePrivateKeys,
   includeSource = false,
 }: {
   contract: Contract;
   transaction: Transaction;
+  transactionHex?: string;
   manglePrivateKeys?: boolean;
   includeSource?: boolean;
 }): Promise<AuthenticationTemplate> => {
@@ -95,7 +97,7 @@ export const buildTemplate = async ({
     manglePrivateKeys = false;
   }
 
-  const txHex = await transaction.build();
+  const txHex = transactionHex ?? await transaction.build();
 
   const libauthTransaction = decodeTransaction(hexToBin(txHex));
   if (typeof libauthTransaction === "string") {
@@ -539,6 +541,18 @@ export const debugTemplate = (template: AuthenticationTemplate, artifact: Artifa
     });
   }
 
+  const lastState = debugResult[debugResult.length - 1];
+  if (lastState.error) {
+    const requireMessage = (artifact.debug?.requireMessages ?? []).filter(message => message.ip === lastState.ip)[0];
+    if (requireMessage) {
+      throw `${artifact.contractName}.cash:${requireMessage.line} Error in evaluating input index ${lastState.program.inputIndex} with the following message: ${requireMessage.message}.
+${lastState.error}`;
+    } else {
+      throw `Error in evaluating input index ${lastState.program.inputIndex}.
+${lastState.error}`;
+    }
+  }
+
   return debugResult;
 };
 
diff --git a/packages/cashscript/src/Transaction.ts b/packages/cashscript/src/Transaction.ts
index ac9ff58c..698784e0 100644
--- a/packages/cashscript/src/Transaction.ts
+++ b/packages/cashscript/src/Transaction.ts
@@ -3,6 +3,7 @@ import {
   hexToBin,
   decodeTransaction,
   Transaction as LibauthTransaction,
+  AuthenticationTemplate,
 } from '@bitauth/libauth';
 import delay from 'delay';
 import {
@@ -39,6 +40,8 @@ import SignatureTemplate from './SignatureTemplate.js';
 import { P2PKH_INPUT_SIZE } from './constants.js';
 import { TransactionBuilder } from './TransactionBuilder.js';
 import { Contract } from './Contract.js';
+import MockNetworkProvider from './network/MockNetworkProvider.js';
+import { buildTemplate, debugTemplate, evaluateTemplate } from './LibauthTemplate.js';
 
 export class Transaction {
   private inputs: Utxo[] = [];
@@ -169,12 +172,42 @@ export class Transaction {
 
   async send(raw?: true): Promise<TransactionDetails | string> {
     const tx = await this.build();
+    let template: AuthenticationTemplate | undefined;
     try {
+      if (this.contract.provider instanceof MockNetworkProvider) {
+        template = await buildTemplate({
+          contract: this.contract,
+          transaction: this,
+          transactionHex: tx,
+        });
+        evaluateTemplate(template);
+      }
+
       const txid = await this.contract.provider.sendRawTransaction(tx);
       return raw ? await this.getTxDetails(txid, raw) : await this.getTxDetails(txid);
-    } catch (e: any) {
-      const reason = e.error ?? e.message;
-      throw buildError(reason, meep(tx, this.inputs, this.contract.redeemScript));
+    } catch (maybeNodeError: any) {
+      if (!template) {
+        template = await buildTemplate({
+          contract: this.contract,
+          transaction: this,
+        });
+      }
+
+      const reason = maybeNodeError.error ?? maybeNodeError.message ?? maybeNodeError;
+
+      try {
+        debugTemplate(template, this.contract.artifact);
+      } catch (libauthError: any) {
+        if (this.contract.provider instanceof MockNetworkProvider) {
+          throw buildError(libauthError, "");
+        } else {
+          const message = libauthError + `\n\nUnderlying node error: ${reason}`;
+          throw buildError(message, "");
+        }
+      }
+
+      // this must be unreachable
+      throw buildError(reason, "");
     }
   }
 
diff --git a/packages/cashscript/src/index.ts b/packages/cashscript/src/index.ts
index 437daf31..497cde46 100644
--- a/packages/cashscript/src/index.ts
+++ b/packages/cashscript/src/index.ts
@@ -14,4 +14,5 @@ export {
   BitcoinRpcNetworkProvider,
   ElectrumNetworkProvider,
   FullStackNetworkProvider,
+  MockNetworkProvider,
 } from './network/index.js';
diff --git a/packages/cashscript/src/interfaces.ts b/packages/cashscript/src/interfaces.ts
index 6c18365b..38464851 100644
--- a/packages/cashscript/src/interfaces.ts
+++ b/packages/cashscript/src/interfaces.ts
@@ -1,6 +1,7 @@
-import type { Transaction } from '@bitauth/libauth';
+import { bigIntToVmNumber, binToHex, type Transaction } from '@bitauth/libauth';
 import type { NetworkProvider } from './network/index.js';
 import type SignatureTemplate from './SignatureTemplate.js';
+import { sha256 } from '@cashscript/utils';
 
 export interface Utxo {
   txid: string;
@@ -9,6 +10,23 @@ export interface Utxo {
   token?: TokenDetails;
 }
 
+const randomInt = () => BigInt(Math.floor(Math.random() * 10000));
+
+export const randomUtxo = (defaults?: Partial<Utxo>): Utxo => {
+  return {...{
+    txid: binToHex(sha256(bigIntToVmNumber(randomInt()))),
+    vout: Math.floor(Math.random() * 10),
+    satoshis: 10000n + randomInt(),
+  }, ...defaults};
+}
+
+export const randomToken = (defaults?: Partial<TokenDetails>): TokenDetails => {
+  return {...{
+    category: binToHex(sha256(bigIntToVmNumber(randomInt()))),
+    amount: 10000n + randomInt(),
+  }, ...defaults};
+}
+
 export interface UnlockableUtxo extends Utxo {
   unlocker: Unlocker;
   options?: InputOptions;
diff --git a/packages/cashscript/src/network/MockNetworkProvider.ts b/packages/cashscript/src/network/MockNetworkProvider.ts
new file mode 100644
index 00000000..8b0f8611
--- /dev/null
+++ b/packages/cashscript/src/network/MockNetworkProvider.ts
@@ -0,0 +1,52 @@
+import { binToHex, hexToBin } from '@bitauth/libauth';
+import { sha256 } from '@cashscript/utils';
+import { Utxo, Network, randomUtxo } from '../interfaces.js';
+import NetworkProvider from './NetworkProvider.js';
+import { aliceAddress, bobAddress, carolAddress } from '../../test/fixture/vars.js';
+
+export default class MockNetworkProvider implements NetworkProvider {
+  private utxoMap: Record<string, Utxo[]> = {};
+  private transactionMap: Record<string, string> = {};
+  public network: Network = Network.CHIPNET;
+
+  constructor() {
+    for (let i = 0; i < 3; i++) {
+      this.addUtxo(aliceAddress, randomUtxo());
+      this.addUtxo(bobAddress, randomUtxo());
+      this.addUtxo(carolAddress, randomUtxo());
+    }
+  }
+
+  async getUtxos(address: string): Promise<Utxo[]> {
+    return this.utxoMap[address];
+  }
+
+  async getBlockHeight(): Promise<number> {
+    return 1337;
+  }
+
+  async getRawTransaction(txid: string): Promise<string> {
+    return this.transactionMap[txid];
+  }
+
+  async sendRawTransaction(txHex: string): Promise<string> {
+    const transactionBin = hexToBin(txHex);
+
+    const txid = binToHex(sha256(sha256(transactionBin)).reverse());
+    this.transactionMap[txid] = txHex;
+    return txid;
+  }
+
+  addUtxo(address: string, utxo: Utxo): void {
+    if (!this.utxoMap[address]) {
+      this.utxoMap[address] = [];
+    }
+
+    this.utxoMap[address].push(utxo);
+  }
+
+  reset(): void {
+    this.utxoMap = {};
+    this.transactionMap = {};
+  }
+}
diff --git a/packages/cashscript/src/network/index.ts b/packages/cashscript/src/network/index.ts
index 210e5a40..dc6e38cf 100644
--- a/packages/cashscript/src/network/index.ts
+++ b/packages/cashscript/src/network/index.ts
@@ -2,3 +2,4 @@ export { default as NetworkProvider } from './NetworkProvider.js';
 export { default as BitcoinRpcNetworkProvider } from './BitcoinRpcNetworkProvider.js';
 export { default as ElectrumNetworkProvider } from './ElectrumNetworkProvider.js';
 export { default as FullStackNetworkProvider } from './FullStackNetworkProvider.js';
+export { default as MockNetworkProvider } from './MockNetworkProvider.js';
\ No newline at end of file
diff --git a/packages/cashscript/src/utils.ts b/packages/cashscript/src/utils.ts
index 8a7f5b5e..37110ffb 100644
--- a/packages/cashscript/src/utils.ts
+++ b/packages/cashscript/src/utils.ts
@@ -13,6 +13,7 @@ import {
   encodeTransactionOutput,
   isHex,
   bigIntToCompactSize,
+  AuthenticationErrorCommon,
 } from '@bitauth/libauth';
 import {
   encodeInt,
@@ -209,10 +210,14 @@ export function buildError(reason: string, meepStr?: string): FailedTransactionE
     Reason.EVAL_FALSE, Reason.VERIFY, Reason.EQUALVERIFY, Reason.CHECKMULTISIGVERIFY,
     Reason.CHECKSIGVERIFY, Reason.CHECKDATASIGVERIFY, Reason.NUMEQUALVERIFY,
   ];
-  const timeCheck = [Reason.NEGATIVE_LOCKTIME, Reason.UNSATISFIED_LOCKTIME];
+  const timeCheck = [Reason.NEGATIVE_LOCKTIME, Reason.UNSATISFIED_LOCKTIME,
+    AuthenticationErrorCommon.negativeLocktime, AuthenticationErrorCommon.unsatisfiedLocktime,
+  ];
   const sigCheck = [
     Reason.SIG_COUNT, Reason.PUBKEY_COUNT, Reason.SIG_HASHTYPE, Reason.SIG_DER,
     Reason.SIG_HIGH_S, Reason.SIG_NULLFAIL, Reason.SIG_BADLENGTH, Reason.SIG_NONSCHNORR,
+
+    AuthenticationErrorCommon.nonNullSignatureFailure,
   ];
 
   if (toRegExp(require).test(reason)) {
diff --git a/packages/cashscript/test/LibauthTemplate.test.ts b/packages/cashscript/test/LibauthTemplate.test.ts
index 2690d178..98a878f8 100644
--- a/packages/cashscript/test/LibauthTemplate.test.ts
+++ b/packages/cashscript/test/LibauthTemplate.test.ts
@@ -1,4 +1,4 @@
-import { Contract, ElectrumNetworkProvider, Network, SignatureTemplate } from '../src/index.js';
+import { Contract, MockNetworkProvider, Network, SignatureTemplate, Utxo, randomUtxo } from '../src/index.js';
 import artifact from './fixture/transfer_with_timeout.json' assert { type: "json" };
 import { alicePriv, alicePub, bobPriv, bobPub } from './fixture/vars.js';
 import { buildTemplate, debugTemplate, evaluateTemplate, stringify } from '../src/LibauthTemplate.js';
@@ -7,49 +7,6 @@ import { binToHex } from '@bitauth/libauth';
 
 describe(`Libauth template generation tests`, () => {
   test("Test transfer with timeout template", async () => {
-    {
-      const code = `
-      pragma cashscript ^0.9.0;
-      
-      contract TransferWithTimeout(
-          pubkey sender,
-          pubkey recipient,
-          int timeout
-      ) {
-          // Require recipient's signature to match
-          function transfer(sig recipientSig) {
-            console.log(recipientSig, timeout, recipient, sender, 1, "A");
-              require(checkSig(recipientSig, recipient));
-          }
-
-          // Require timeout time to be reached and sender's signature to match
-          function timeout(sig senderSig) {
-
-              require(checkSig(senderSig, sender));
-              require(tx.time >= timeout);
-          }
-      }
-      `;
-          const artifact = compileString(code);
-
-      const provider = new ElectrumNetworkProvider(Network.CHIPNET);
-      const contract = new Contract(artifact, [alicePub, bobPub, 100000n], { provider });
-      console.log(binToHex(alicePub), binToHex(bobPub));
-
-      const transaction = contract.functions.transfer(new SignatureTemplate(bobPriv)).to(contract.address, 10000n);
-      const template = await buildTemplate({
-        contract,
-        transaction,
-        manglePrivateKeys: false
-      });
-
-      console.log(stringify(template));
-      debugTemplate(template, artifact);
-
-
-      // expect(evaluateTemplate(template)).toBe(true);
-    }
-
     // {
     //   const code = `
     //   pragma cashscript ^0.9.0;
@@ -61,13 +18,13 @@ describe(`Libauth template generation tests`, () => {
     //   ) {
     //       // Require recipient's signature to match
     //       function transfer(sig recipientSig) {
+    //         console.log(recipientSig, timeout, recipient, sender, 1, "A");
     //           require(checkSig(recipientSig, recipient));
     //       }
 
     //       // Require timeout time to be reached and sender's signature to match
     //       function timeout(sig senderSig) {
 
-    //         console.log(senderSig, "a", sender, timeout, 0x00, 123, true, );
     //           require(checkSig(senderSig, sender));
     //           require(tx.time >= timeout);
     //       }
@@ -76,34 +33,65 @@ describe(`Libauth template generation tests`, () => {
     //       const artifact = compileString(code);
 
     //   const provider = new ElectrumNetworkProvider(Network.CHIPNET);
-    //   const contract = new Contract(artifact, [alicePub, bobPub, 2000000n], { provider });
-
+    //   const contract = new Contract(artifact, [alicePub, bobPub, 100000n], { provider });
     //   console.log(binToHex(alicePub), binToHex(bobPub));
 
-    //   const transaction = contract.functions.timeout(new SignatureTemplate(alicePriv)).to(contract.address, 10000n);
+    //   const transaction = contract.functions.transfer(new SignatureTemplate(bobPriv)).to(contract.address, 10000n);
     //   const template = await buildTemplate({
     //     contract,
     //     transaction,
     //     manglePrivateKeys: false
     //   });
 
+    //   console.log(stringify(template));
     //   debugTemplate(template, artifact);
 
-    //   // expect(debugTemplate(template)).toBe(false);
+
+    //   // expect(evaluateTemplate(template)).toBe(true);
     // }
 
-    // const failingTemplate = (await contract.runFunctionFromStrings({
-    //   action: "buildTemplate",
-    //   function: "transfer",
-    //   arguments: [alice.getPublicKeyCompressed(), charlie.toString()],
-    //   to: {
-    //     to: charlie.getDepositAddress(),
-    //     amount: 7000n,
-    //   },
-    //   time: 215,
-    //   utxoIds: contractUtxos.map(toUtxoId),
-    // } as CashscriptTransactionI)) as AuthenticationTemplate;
+    {
+      const code = `
+      pragma cashscript ^0.9.0;
+
+      contract TransferWithTimeout(
+          pubkey sender,
+          pubkey recipient,
+          int timeout
+      ) {
+          // Require recipient's signature to match
+          function transfer(sig recipientSig) {
+              require(checkSig(recipientSig, recipient));
+          }
+
+          // Require timeout time to be reached and sender's signature to match
+          function timeout(sig senderSig) {
+              // require(checkSig(senderSig, sender), "lol");
+              // require(checkSig(senderSig, sender));
+              require(senderSig == senderSig);
+              require(sender == sender);
+              require(tx.time >= timeout);
+          }
+      }
+      `;
+      const artifact = compileString(code);
+
+      // const provider = new ElectrumNetworkProvider(Network.CHIPNET);
+      const provider = new MockNetworkProvider();
+      const contract = new Contract(artifact, [alicePub, bobPub, 2000000n], { provider });
+      provider.addUtxo(contract.address, randomUtxo());
 
-    // expect(() => evaluateTemplate(failingTemplate)).toThrow();
+      const transaction = contract.functions.timeout(new SignatureTemplate(alicePriv)).to(contract.address, 1000n);
+      const template = await buildTemplate({
+        contract,
+        transaction,
+        manglePrivateKeys: false
+      });
+
+      // debugTemplate(template, artifact);
+      await transaction.send();
+
+      // expect(debugTemplate(template)).toBe(false);
+    }
   });
 });
\ No newline at end of file
diff --git a/packages/cashscript/test/fixture/transfer_with_timeout.json b/packages/cashscript/test/fixture/transfer_with_timeout.json
index cb1bf2b0..2a986023 100644
--- a/packages/cashscript/test/fixture/transfer_with_timeout.json
+++ b/packages/cashscript/test/fixture/transfer_with_timeout.json
@@ -36,14 +36,6 @@
   ],
   "bytecode": "OP_3 OP_PICK OP_0 OP_NUMEQUAL OP_IF OP_4 OP_ROLL OP_ROT OP_CHECKSIG OP_NIP OP_NIP OP_NIP OP_ELSE OP_3 OP_ROLL OP_1 OP_NUMEQUALVERIFY OP_3 OP_ROLL OP_SWAP OP_CHECKSIGVERIFY OP_SWAP OP_CHECKLOCKTIMEVERIFY OP_2DROP OP_1 OP_ENDIF",
   "source": "\npragma cashscript ^0.8.0;\n\ncontract TransferWithTimeout(\n  pubkey sender,\n  pubkey recipient,\n  int timeout\n) {\n  // Require recipient's signature to match\n  function transfer(sig recipientSig) {\n    require(checkSig(recipientSig, recipient));\n  }\n\n  // Require timeout time to be reached and sender's signature to match\n  function timeout(sig senderSig) {\n    require(checkSig(senderSig, sender));\n    require(tx.time >= timeout);\n  }\n}\n",
-  "debug": {
-    "bytecode": "OP_3 OP_PICK OP_0 OP_NUMEQUAL OP_IF OP_4 OP_ROLL OP_2 OP_ROLL OP_CHECKSIG OP_NIP OP_NIP OP_NIP OP_ELSE OP_3 OP_ROLL OP_1 OP_NUMEQUAL OP_VERIFY OP_3 OP_ROLL OP_1 OP_ROLL OP_CHECKSIG OP_VERIFY OP_1 OP_ROLL OP_CHECKLOCKTIMEVERIFY OP_DROP OP_1 OP_NIP OP_ENDIF",
-    "sourceMap": "10:2:12:3;;;;;11:21:11:33;;:35::44;;:12::45;10:2:12:3:1;;;;15::18::0;;;;;16:21:16:30;;:32::38;;:12::39;:4::41;17:23:17:30;;:4::32;;15:2:18:3:1;;",
-    "logs": [
-      { "ip": 18, "line": 14, "data": [{ "stackIndex": 3, "type": "sig" }, "lol"] },
-      { "ip": 18, "line": 14, "data": ["Lol"] }
-    ]
-  },
   "compiler": {
     "name": "cashc",
     "version": "0.8.0-next.0"

From bb919ea659ed219dde0f59fdd41479e4684f2006 Mon Sep 17 00:00:00 2001
From: mainnet-pat <mainnet_pat@protonmail.com>
Date: Fri, 24 Nov 2023 08:45:20 +0000
Subject: [PATCH 006/171] Transform most tests to be compatible with
 MockNetworkProvider

---
 packages/cashscript/src/LibauthTemplate.ts    |  7 +++--
 packages/cashscript/src/Transaction.ts        |  2 ++
 packages/cashscript/src/interfaces.ts         | 15 ++++++++--
 .../src/network/MockNetworkProvider.ts        |  2 +-
 packages/cashscript/src/utils.ts              | 12 +++++---
 .../cashscript/test/e2e/Announcement.test.ts  | 28 ++++++++++++++-----
 packages/cashscript/test/e2e/BigInt.test.ts   | 26 +++++++++++++----
 .../cashscript/test/e2e/HodlVault.test.ts     | 17 +++++++++--
 packages/cashscript/test/e2e/Mecenas.test.ts  | 27 ++++++++++++++----
 .../cashscript/test/e2e/P2PKH-tokens.test.ts  | 15 ++++++++--
 packages/cashscript/test/e2e/P2PKH.test.ts    | 24 ++++++++--------
 .../test/e2e/TransferWithTimeout.test.ts      | 24 +++++++++++++---
 packages/cashscript/test/e2e/misc.test.ts     |  8 ++++--
 .../cashscript/test/e2e/old/Mecenas.test.ts   |  6 ++++
 packages/cashscript/test/e2e/old/misc.test.ts |  6 ++++
 .../test/fixture/transfer_with_timeout.json   |  2 +-
 16 files changed, 168 insertions(+), 53 deletions(-)

diff --git a/packages/cashscript/src/LibauthTemplate.ts b/packages/cashscript/src/LibauthTemplate.ts
index 8360db88..9f45a693 100644
--- a/packages/cashscript/src/LibauthTemplate.ts
+++ b/packages/cashscript/src/LibauthTemplate.ts
@@ -17,6 +17,7 @@ import {
   createVirtualMachineBCHCHIPs,
   binToBase64,
   utf8ToBin,
+  isHex,
 } from "@bitauth/libauth";
 import { deflate } from "pako";
 import {
@@ -131,9 +132,9 @@ export const buildTemplate = async ({
     contract.artifact.debug ?
       formatLibauthScript(asmToScript(contract.artifact.debug.bytecode), contract.artifact.debug?.sourceMap!, contract.artifact.source).split("\n") :
       contract.artifact.bytecode.split(" ").map((val) => {
-        try {
-          return `<0x${BigInt("0x" + val).toString(16)}>`;
-        } catch {
+        if (isHex(val)) {
+          return `<0x${val}>`
+        } else {
           return val;
         }
       });
diff --git a/packages/cashscript/src/Transaction.ts b/packages/cashscript/src/Transaction.ts
index 698784e0..a3764ac2 100644
--- a/packages/cashscript/src/Transaction.ts
+++ b/packages/cashscript/src/Transaction.ts
@@ -179,6 +179,7 @@ export class Transaction {
           contract: this.contract,
           transaction: this,
           transactionHex: tx,
+          manglePrivateKeys: false,
         });
         evaluateTemplate(template);
       }
@@ -190,6 +191,7 @@ export class Transaction {
         template = await buildTemplate({
           contract: this.contract,
           transaction: this,
+          manglePrivateKeys: false,
         });
       }
 
diff --git a/packages/cashscript/src/interfaces.ts b/packages/cashscript/src/interfaces.ts
index 38464851..2ab6021d 100644
--- a/packages/cashscript/src/interfaces.ts
+++ b/packages/cashscript/src/interfaces.ts
@@ -1,4 +1,4 @@
-import { bigIntToVmNumber, binToHex, type Transaction } from '@bitauth/libauth';
+import { bigIntToVmNumber, binToHex, NonFungibleTokenCapability, type Transaction } from '@bitauth/libauth';
 import type { NetworkProvider } from './network/index.js';
 import type SignatureTemplate from './SignatureTemplate.js';
 import { sha256 } from '@cashscript/utils';
@@ -16,7 +16,7 @@ export const randomUtxo = (defaults?: Partial<Utxo>): Utxo => {
   return {...{
     txid: binToHex(sha256(bigIntToVmNumber(randomInt()))),
     vout: Math.floor(Math.random() * 10),
-    satoshis: 10000n + randomInt(),
+    satoshis: 20000n + randomInt(),
   }, ...defaults};
 }
 
@@ -27,6 +27,17 @@ export const randomToken = (defaults?: Partial<TokenDetails>): TokenDetails => {
   }, ...defaults};
 }
 
+export const randomNFT = (defaults?: Partial<TokenDetails>): TokenDetails => {
+  return {...{
+    category: binToHex(sha256(bigIntToVmNumber(randomInt()))),
+    amount: 0n,
+    nft: {
+      commitment: binToHex(sha256(bigIntToVmNumber(randomInt()))).slice(0, 8),
+      capability: NonFungibleTokenCapability.none
+    }
+  }, ...defaults};
+}
+
 export interface UnlockableUtxo extends Utxo {
   unlocker: Unlocker;
   options?: InputOptions;
diff --git a/packages/cashscript/src/network/MockNetworkProvider.ts b/packages/cashscript/src/network/MockNetworkProvider.ts
index 8b0f8611..334b6104 100644
--- a/packages/cashscript/src/network/MockNetworkProvider.ts
+++ b/packages/cashscript/src/network/MockNetworkProvider.ts
@@ -22,7 +22,7 @@ export default class MockNetworkProvider implements NetworkProvider {
   }
 
   async getBlockHeight(): Promise<number> {
-    return 1337;
+    return 133700;
   }
 
   async getRawTransaction(txid: string): Promise<string> {
diff --git a/packages/cashscript/src/utils.ts b/packages/cashscript/src/utils.ts
index 37110ffb..bef07503 100644
--- a/packages/cashscript/src/utils.ts
+++ b/packages/cashscript/src/utils.ts
@@ -209,15 +209,19 @@ export function buildError(reason: string, meepStr?: string): FailedTransactionE
   const require = [
     Reason.EVAL_FALSE, Reason.VERIFY, Reason.EQUALVERIFY, Reason.CHECKMULTISIGVERIFY,
     Reason.CHECKSIGVERIFY, Reason.CHECKDATASIGVERIFY, Reason.NUMEQUALVERIFY,
+
+    AuthenticationErrorCommon.failedVerify
   ];
-  const timeCheck = [Reason.NEGATIVE_LOCKTIME, Reason.UNSATISFIED_LOCKTIME,
-    AuthenticationErrorCommon.negativeLocktime, AuthenticationErrorCommon.unsatisfiedLocktime,
+  const timeCheck = [
+    Reason.NEGATIVE_LOCKTIME, Reason.UNSATISFIED_LOCKTIME,
+
+    AuthenticationErrorCommon.negativeLocktime, AuthenticationErrorCommon.unsatisfiedLocktime
   ];
   const sigCheck = [
     Reason.SIG_COUNT, Reason.PUBKEY_COUNT, Reason.SIG_HASHTYPE, Reason.SIG_DER,
     Reason.SIG_HIGH_S, Reason.SIG_NULLFAIL, Reason.SIG_BADLENGTH, Reason.SIG_NONSCHNORR,
 
-    AuthenticationErrorCommon.nonNullSignatureFailure,
+    AuthenticationErrorCommon.nonNullSignatureFailure
   ];
 
   if (toRegExp(require).test(reason)) {
@@ -235,7 +239,7 @@ export function buildError(reason: string, meepStr?: string): FailedTransactionE
   return new FailedTransactionError(reason, meepStr);
 }
 
-function toRegExp(reasons: string[]): RegExp {
+export function toRegExp(reasons: string[]): RegExp {
   return new RegExp(reasons.join('|').replace(/\(/g, '\\(').replace(/\)/g, '\\)'));
 }
 
diff --git a/packages/cashscript/test/e2e/Announcement.test.ts b/packages/cashscript/test/e2e/Announcement.test.ts
index 41a49b35..15bf7f48 100644
--- a/packages/cashscript/test/e2e/Announcement.test.ts
+++ b/packages/cashscript/test/e2e/Announcement.test.ts
@@ -1,18 +1,20 @@
-import { Contract, ElectrumNetworkProvider, Network } from '../../src/index.js';
+import { Contract, ElectrumNetworkProvider, MockNetworkProvider, Network, randomUtxo } from '../../src/index.js';
 import { getTxOutputs } from '../test-util.js';
 import { FailedRequireError, Reason } from '../../src/Errors.js';
-import { createOpReturnOutput, utxoComparator } from '../../src/utils.js';
+import { createOpReturnOutput, toRegExp, utxoComparator } from '../../src/utils.js';
 import { aliceAddress } from '../fixture/vars.js';
 import artifact from '../fixture/announcement.json' assert { type: "json" };
+import { AuthenticationErrorCommon } from '@bitauth/libauth';
 
 describe('Announcement', () => {
   let announcement: Contract;
   const minerFee = 1000n;
 
   beforeAll(() => {
-    const provider = new ElectrumNetworkProvider(Network.CHIPNET);
+    const provider = process.env.TESTS_USE_MOCKNET ? new MockNetworkProvider() : new ElectrumNetworkProvider(Network.CHIPNET);
     announcement = new Contract(artifact, [], { provider });
     console.log(announcement.address);
+    (provider as any).addUtxo?.(announcement.address, randomUtxo());
   });
 
   describe('send', () => {
@@ -37,7 +39,10 @@ describe('Announcement', () => {
 
       // then
       await expect(txPromise).rejects.toThrow(FailedRequireError);
-      await expect(txPromise).rejects.toThrow(Reason.NUMEQUALVERIFY);
+      await expect(txPromise).rejects.toThrow(toRegExp([
+        Reason.NUMEQUALVERIFY,
+        AuthenticationErrorCommon.failedVerify,
+      ]));
     });
 
     it('should fail when trying to announce incorrect announcement', async () => {
@@ -59,7 +64,10 @@ describe('Announcement', () => {
 
       // then
       await expect(txPromise).rejects.toThrow(FailedRequireError);
-      await expect(txPromise).rejects.toThrow(Reason.EQUALVERIFY);
+      await expect(txPromise).rejects.toThrow(toRegExp([
+        Reason.EQUALVERIFY,
+        AuthenticationErrorCommon.failedVerify,
+      ]));
     });
 
     it('should fail when sending incorrect amount of change', async () => {
@@ -81,7 +89,10 @@ describe('Announcement', () => {
 
       // then
       await expect(txPromise).rejects.toThrow(FailedRequireError);
-      await expect(txPromise).rejects.toThrow(Reason.NUMEQUALVERIFY);
+      await expect(txPromise).rejects.toThrow(toRegExp([
+        Reason.NUMEQUALVERIFY,
+        AuthenticationErrorCommon.failedVerify,
+      ]));
     });
 
     it('should fail when sending the correct change amount to an incorrect address', async () => {
@@ -105,7 +116,10 @@ describe('Announcement', () => {
 
       // then
       await expect(txPromise).rejects.toThrow(FailedRequireError);
-      await expect(txPromise).rejects.toThrow(Reason.EQUALVERIFY);
+      await expect(txPromise).rejects.toThrow(toRegExp([
+        Reason.EQUALVERIFY,
+        AuthenticationErrorCommon.failedVerify,
+      ]));
     });
 
     it('should succeed when announcing correct announcement', async () => {
diff --git a/packages/cashscript/test/e2e/BigInt.test.ts b/packages/cashscript/test/e2e/BigInt.test.ts
index 00a35d74..c027ccd4 100644
--- a/packages/cashscript/test/e2e/BigInt.test.ts
+++ b/packages/cashscript/test/e2e/BigInt.test.ts
@@ -1,13 +1,17 @@
 import {
   Contract,
-  ElectrumNetworkProvider,
+  MockNetworkProvider,
   FailedRequireError,
   FailedTransactionError,
-  Network,
   Reason,
+  randomUtxo,
+  ElectrumNetworkProvider,
+  Network,
 } from '../../src/index.js';
 import { getTxOutputs } from '../test-util.js';
 import artifact from '../fixture/bigint.json' assert { type: "json" };
+import { AuthenticationErrorCommon } from '@bitauth/libauth';
+import { toRegExp } from '../../src/utils.js';
 
 describe('BigInt', () => {
   let bigintContract: Contract;
@@ -15,9 +19,10 @@ describe('BigInt', () => {
   const MAX_INT64 = BigInt('9223372036854775807');
 
   beforeAll(() => {
-    const provider = new ElectrumNetworkProvider(Network.CHIPNET);
+    const provider = process.env.TESTS_USE_MOCKNET ? new MockNetworkProvider() : new ElectrumNetworkProvider(Network.CHIPNET);
     bigintContract = new Contract(artifact, [], { provider });
     console.log(bigintContract.address);
+    (provider as any).addUtxo?.(bigintContract.address, randomUtxo());
   });
 
   describe('proofOfBigInt', () => {
@@ -34,7 +39,10 @@ describe('BigInt', () => {
 
       // then
       await expect(txPromise).rejects.toThrow(FailedRequireError);
-      await expect(txPromise).rejects.toThrow(Reason.VERIFY);
+      await expect(txPromise).rejects.toThrow(toRegExp([
+        Reason.VERIFY,
+        AuthenticationErrorCommon.failedVerify,
+      ]));
     });
 
     it('should fail when providing numbers that overflow 64 bits when multiplied', async () => {
@@ -50,7 +58,10 @@ describe('BigInt', () => {
 
       // then
       await expect(txPromise).rejects.toThrow(FailedTransactionError);
-      await expect(txPromise).rejects.toThrow(Reason.INVALID_NUMBER_RANGE);
+      await expect(txPromise).rejects.toThrow(toRegExp([
+        Reason.INVALID_NUMBER_RANGE,
+        AuthenticationErrorCommon.overflowsVmNumberRange,
+      ]));
     });
 
     it('should fail when providing a number that does not fit within 64 bits', async () => {
@@ -66,7 +77,10 @@ describe('BigInt', () => {
 
       // then
       await expect(txPromise).rejects.toThrow(FailedTransactionError);
-      await expect(txPromise).rejects.toThrow(Reason.INVALID_NUMBER_RANGE);
+      await expect(txPromise).rejects.toThrow(toRegExp([
+        Reason.INVALID_NUMBER_RANGE,
+        AuthenticationErrorCommon.invalidVmNumber,
+      ]));
     });
 
     it('should succeed when providing a number within 32b < x < 64b', async () => {
diff --git a/packages/cashscript/test/e2e/HodlVault.test.ts b/packages/cashscript/test/e2e/HodlVault.test.ts
index 8a1ce51a..866a5f50 100644
--- a/packages/cashscript/test/e2e/HodlVault.test.ts
+++ b/packages/cashscript/test/e2e/HodlVault.test.ts
@@ -1,6 +1,8 @@
 import {
   Contract,
   SignatureTemplate,
+  MockNetworkProvider,
+  randomUtxo,
   ElectrumNetworkProvider,
   Network,
 } from '../../src/index.js';
@@ -13,14 +15,17 @@ import {
 import { getTxOutputs } from '../test-util.js';
 import { FailedRequireError, Reason } from '../../src/Errors.js';
 import artifact from '../fixture/hodl_vault.json' assert { type: "json" };
+import { AuthenticationErrorCommon } from '@bitauth/libauth';
+import { toRegExp } from '../../src/utils.js';
 
 describe('HodlVault', () => {
   let hodlVault: Contract;
 
   beforeAll(() => {
-    const provider = new ElectrumNetworkProvider(Network.CHIPNET);
+    const provider = process.env.TESTS_USE_MOCKNET ? new MockNetworkProvider() : new ElectrumNetworkProvider(Network.CHIPNET);
     hodlVault = new Contract(artifact, [alicePub, oraclePub, 99000n, 30000n], { provider });
     console.log(hodlVault.address);
+    (provider as any).addUtxo?.(hodlVault.address, randomUtxo());
   });
 
   describe('send', () => {
@@ -40,7 +45,10 @@ describe('HodlVault', () => {
 
       // then
       await expect(txPromise).rejects.toThrow(FailedRequireError);
-      await expect(txPromise).rejects.toThrow(Reason.VERIFY);
+      await expect(txPromise).rejects.toThrow(toRegExp([
+        Reason.VERIFY,
+        AuthenticationErrorCommon.failedVerify,
+      ]));
     });
 
     it('should fail when price is too low', async () => {
@@ -58,7 +66,10 @@ describe('HodlVault', () => {
 
       // then
       await expect(txPromise).rejects.toThrow(FailedRequireError);
-      await expect(txPromise).rejects.toThrow(Reason.VERIFY);
+      await expect(txPromise).rejects.toThrow(toRegExp([
+        Reason.VERIFY,
+        AuthenticationErrorCommon.failedVerify,
+      ]));
     });
 
     it('should succeed when price is high enough', async () => {
diff --git a/packages/cashscript/test/e2e/Mecenas.test.ts b/packages/cashscript/test/e2e/Mecenas.test.ts
index a0984b8e..29f29255 100644
--- a/packages/cashscript/test/e2e/Mecenas.test.ts
+++ b/packages/cashscript/test/e2e/Mecenas.test.ts
@@ -1,4 +1,4 @@
-import { Contract, ElectrumNetworkProvider, Network } from '../../src/index.js';
+import { Contract, ElectrumNetworkProvider, MockNetworkProvider, Network, randomUtxo } from '../../src/index.js';
 import {
   alicePkh,
   bobPkh,
@@ -8,6 +8,8 @@ import {
 import { getTxOutputs } from '../test-util.js';
 import { FailedRequireError, Reason } from '../../src/Errors.js';
 import artifact from '../fixture/mecenas.json' assert { type: "json" };
+import { AuthenticationErrorCommon } from '@bitauth/libauth';
+import { toRegExp } from '../../src/utils.js';
 
 // Mecenas has tx.age check omitted for testing
 describe('Mecenas', () => {
@@ -16,9 +18,10 @@ describe('Mecenas', () => {
   const minerFee = 1000n;
 
   beforeAll(() => {
-    const provider = new ElectrumNetworkProvider(Network.CHIPNET);
+    const provider = process.env.TESTS_USE_MOCKNET ? new MockNetworkProvider() : new ElectrumNetworkProvider(Network.CHIPNET);
     mecenas = new Contract(artifact, [alicePkh, bobPkh, pledge], { provider });
     console.log(mecenas.address);
+    (provider as any).addUtxo?.(mecenas.address, randomUtxo());
   });
 
   describe('send', () => {
@@ -36,7 +39,10 @@ describe('Mecenas', () => {
 
       // then
       await expect(txPromise).rejects.toThrow(FailedRequireError);
-      await expect(txPromise).rejects.toThrow(Reason.NUMEQUALVERIFY);
+      await expect(txPromise).rejects.toThrow(toRegExp([
+        Reason.NUMEQUALVERIFY,
+        AuthenticationErrorCommon.failedVerify,
+      ]));
     });
 
     it('should fail when trying to send to wrong person', async () => {
@@ -53,7 +59,10 @@ describe('Mecenas', () => {
 
       // then
       await expect(txPromise).rejects.toThrow(FailedRequireError);
-      await expect(txPromise).rejects.toThrow(Reason.EQUALVERIFY);
+      await expect(txPromise).rejects.toThrow(toRegExp([
+        Reason.VERIFY,
+        AuthenticationErrorCommon.failedVerify,
+      ]));
     });
 
     it('should fail when trying to send to multiple people', async () => {
@@ -71,7 +80,10 @@ describe('Mecenas', () => {
 
       // then
       await expect(txPromise).rejects.toThrow(FailedRequireError);
-      await expect(txPromise).rejects.toThrow(Reason.EQUALVERIFY);
+      await expect(txPromise).rejects.toThrow(toRegExp([
+        Reason.VERIFY,
+        AuthenticationErrorCommon.failedVerify,
+      ]));
     });
 
     it('should fail when sending incorrect amount of change', async () => {
@@ -88,7 +100,10 @@ describe('Mecenas', () => {
 
       // then
       await expect(txPromise).rejects.toThrow(FailedRequireError);
-      await expect(txPromise).rejects.toThrow(Reason.NUMEQUALVERIFY);
+      await expect(txPromise).rejects.toThrow(toRegExp([
+        Reason.NUMEQUALVERIFY,
+        AuthenticationErrorCommon.failedVerify,
+      ]));
     });
 
     it('should succeed when sending pledge to receiver', async () => {
diff --git a/packages/cashscript/test/e2e/P2PKH-tokens.test.ts b/packages/cashscript/test/e2e/P2PKH-tokens.test.ts
index b33f7610..584d2dde 100644
--- a/packages/cashscript/test/e2e/P2PKH-tokens.test.ts
+++ b/packages/cashscript/test/e2e/P2PKH-tokens.test.ts
@@ -1,20 +1,29 @@
-import { Contract, SignatureTemplate, ElectrumNetworkProvider } from '../../src/index.js';
+import { Contract, SignatureTemplate, ElectrumNetworkProvider, MockNetworkProvider } from '../../src/index.js';
 import {
   alicePkh,
   alicePub,
   alicePriv,
 } from '../fixture/vars.js';
 import { getTxOutputs } from '../test-util.js';
-import { Network, TokenDetails, Utxo } from '../../src/interfaces.js';
+import { Network, TokenDetails, Utxo, randomNFT, randomToken, randomUtxo } from '../../src/interfaces.js';
 import artifact from '../fixture/p2pkh.json' assert { type: "json" };
 
 describe('P2PKH-tokens', () => {
   let p2pkhInstance: Contract;
 
   beforeAll(() => {
-    const provider = new ElectrumNetworkProvider(Network.CHIPNET);
+    const provider = process.env.TESTS_USE_MOCKNET ? new MockNetworkProvider() : new ElectrumNetworkProvider(Network.CHIPNET);
     p2pkhInstance = new Contract(artifact, [alicePkh], { provider });
     console.log(p2pkhInstance.tokenAddress);
+    (provider as any).addUtxo?.(p2pkhInstance.address, randomUtxo());
+    (provider as any).addUtxo?.(p2pkhInstance.address, randomUtxo());
+    (provider as any).addUtxo?.(p2pkhInstance.address, randomUtxo({vout: 0}));
+    (provider as any).addUtxo?.(p2pkhInstance.address, randomUtxo({satoshis: 1000n, token: randomToken()}));
+    (provider as any).addUtxo?.(p2pkhInstance.address, randomUtxo({satoshis: 1000n, token: randomToken()}));
+    (provider as any).addUtxo?.(p2pkhInstance.address, randomUtxo({satoshis: 1000n, token: randomNFT()}));
+    (provider as any).addUtxo?.(p2pkhInstance.address, randomUtxo({satoshis: 1000n, token: randomNFT()}));
+    (provider as any).addUtxo?.(p2pkhInstance.address, randomUtxo({satoshis: 1000n, token: {...randomNFT(), ...randomToken()}}));
+    (provider as any).addUtxo?.(p2pkhInstance.address, randomUtxo({satoshis: 1000n, token: {...randomToken(), ...randomNFT()}}));
   });
 
   describe('send (tokens)', () => {
diff --git a/packages/cashscript/test/e2e/P2PKH.test.ts b/packages/cashscript/test/e2e/P2PKH.test.ts
index c23ebb8e..c9b4006f 100644
--- a/packages/cashscript/test/e2e/P2PKH.test.ts
+++ b/packages/cashscript/test/e2e/P2PKH.test.ts
@@ -1,5 +1,5 @@
-import { binToHex } from '@bitauth/libauth';
-import { Contract, SignatureTemplate, ElectrumNetworkProvider } from '../../src/index.js';
+import { AuthenticationErrorCommon, binToHex } from '@bitauth/libauth';
+import { Contract, SignatureTemplate, MockNetworkProvider, ElectrumNetworkProvider } from '../../src/index.js';
 import {
   bobAddress,
   bobPub,
@@ -8,19 +8,22 @@ import {
   alicePriv,
 } from '../fixture/vars.js';
 import { getTxOutputs } from '../test-util.js';
-import { Network, Utxo } from '../../src/interfaces.js';
-import { createOpReturnOutput, utxoComparator } from '../../src/utils.js';
+import { Network, Utxo, randomUtxo } from '../../src/interfaces.js';
+import { createOpReturnOutput, toRegExp, utxoComparator } from '../../src/utils.js';
 import { FailedSigCheckError, Reason } from '../../src/Errors.js';
 import artifact from '../fixture/p2pkh.json' assert { type: "json" };
 
 describe('P2PKH-no-tokens', () => {
   let p2pkhInstance: Contract;
 
+  const provider = process.env.TESTS_USE_MOCKNET ? new MockNetworkProvider() : new ElectrumNetworkProvider(Network.CHIPNET);
+
   beforeAll(() => {
-    const provider = new ElectrumNetworkProvider(Network.CHIPNET);
     // Note: We instantiate the contract with bobPkh to avoid mempool conflicts with other (P2PKH tokens) tests
     p2pkhInstance = new Contract(artifact, [bobPkh], { provider });
     console.log(p2pkhInstance.tokenAddress);
+    (provider as any).addUtxo?.(p2pkhInstance.address, randomUtxo({ satoshis: 10000000n }));
+    (provider as any).addUtxo?.(p2pkhInstance.address, randomUtxo({ satoshis: 10000000n }));
   });
 
   describe('send', () => {
@@ -37,7 +40,10 @@ describe('P2PKH-no-tokens', () => {
 
       // then
       await expect(txPromise).rejects.toThrow(FailedSigCheckError);
-      await expect(txPromise).rejects.toThrow(Reason.SIG_NULLFAIL);
+      await expect(txPromise).rejects.toThrow(toRegExp([
+        Reason.SIG_NULLFAIL,
+        AuthenticationErrorCommon.nonNullSignatureFailure
+      ]));
     });
 
     it('should succeed when using correct function arguments', async () => {
@@ -164,7 +170,7 @@ describe('P2PKH-no-tokens', () => {
       const amount = 10000n;
 
       const contractUtxos = await p2pkhInstance.getUtxos();
-      const bobUtxos = await getAddressUtxos(bobAddress);
+      const bobUtxos = await provider.getUtxos(bobAddress);
 
       // when
       const tx = await p2pkhInstance.functions
@@ -184,10 +190,6 @@ describe('P2PKH-no-tokens', () => {
   });
 });
 
-async function getAddressUtxos(address: string): Promise<Utxo[]> {
-  return new ElectrumNetworkProvider(Network.CHIPNET).getUtxos(address);
-}
-
 function gatherUtxos(
   utxos: Utxo[],
   options?: { amount?: bigint, fees?: bigint },
diff --git a/packages/cashscript/test/e2e/TransferWithTimeout.test.ts b/packages/cashscript/test/e2e/TransferWithTimeout.test.ts
index 3cad74f7..d8153746 100644
--- a/packages/cashscript/test/e2e/TransferWithTimeout.test.ts
+++ b/packages/cashscript/test/e2e/TransferWithTimeout.test.ts
@@ -3,6 +3,8 @@ import {
   SignatureTemplate,
   ElectrumNetworkProvider,
   Network,
+  MockNetworkProvider,
+  randomUtxo,
 } from '../../src/index.js';
 import {
   alicePriv, alicePub, bobPriv, bobPub,
@@ -10,17 +12,22 @@ import {
 import { getTxOutputs } from '../test-util.js';
 import { FailedSigCheckError, Reason, FailedTimeCheckError } from '../../src/Errors.js';
 import artifact from '../fixture/transfer_with_timeout.json' assert { type: "json" };
+import { toRegExp } from '../../src/utils.js';
+import { AuthenticationErrorCommon } from '@bitauth/libauth';
 
 describe('TransferWithTimeout', () => {
   let twtInstancePast: Contract;
   let twtInstanceFuture: Contract;
 
   beforeAll(() => {
-    const provider = new ElectrumNetworkProvider(Network.CHIPNET);
+    const provider = process.env.TESTS_USE_MOCKNET ? new MockNetworkProvider() : new ElectrumNetworkProvider(Network.CHIPNET);
     twtInstancePast = new Contract(artifact, [alicePub, bobPub, 100000n], { provider });
     twtInstanceFuture = new Contract(artifact, [alicePub, bobPub, 2000000n], { provider });
     console.log(twtInstancePast.address);
     console.log(twtInstanceFuture.address);
+
+    (provider as any).addUtxo?.(twtInstancePast.address, randomUtxo());
+    (provider as any).addUtxo?.(twtInstanceFuture.address, randomUtxo());
   });
 
   describe('send', () => {
@@ -37,7 +44,10 @@ describe('TransferWithTimeout', () => {
 
       // then
       await expect(txPromise).rejects.toThrow(FailedSigCheckError);
-      await expect(txPromise).rejects.toThrow(Reason.SIG_NULLFAIL);
+      await expect(txPromise).rejects.toThrow(toRegExp([
+        Reason.SIG_NULLFAIL,
+        AuthenticationErrorCommon.nonNullSignatureFailure
+      ]));
     });
 
     it('should fail when using incorrect function arguments to timeout', async () => {
@@ -53,7 +63,10 @@ describe('TransferWithTimeout', () => {
 
       // then
       await expect(txPromise).rejects.toThrow(FailedSigCheckError);
-      await expect(txPromise).rejects.toThrow(Reason.SIG_NULLFAIL);
+      await expect(txPromise).rejects.toThrow(toRegExp([
+        Reason.SIG_NULLFAIL,
+        AuthenticationErrorCommon.nonNullSignatureFailure
+      ]));
     });
 
     it('should fail when timeout is called before timeout block', async () => {
@@ -69,7 +82,10 @@ describe('TransferWithTimeout', () => {
 
       // then
       await expect(txPromise).rejects.toThrow(FailedTimeCheckError);
-      await expect(txPromise).rejects.toThrow(Reason.UNSATISFIED_LOCKTIME);
+      await expect(txPromise).rejects.toThrow(toRegExp([
+        Reason.UNSATISFIED_LOCKTIME,
+        AuthenticationErrorCommon.unsatisfiedLocktime
+      ]));
     });
 
     it('should succeed when transfer is called after timeout block', async () => {
diff --git a/packages/cashscript/test/e2e/misc.test.ts b/packages/cashscript/test/e2e/misc.test.ts
index b5961b45..8c71ef42 100644
--- a/packages/cashscript/test/e2e/misc.test.ts
+++ b/packages/cashscript/test/e2e/misc.test.ts
@@ -1,14 +1,15 @@
-import { Contract, ElectrumNetworkProvider, Network } from '../../src/index.js';
+import { Contract, MockNetworkProvider, ElectrumNetworkProvider, randomUtxo, Network } from '../../src/index.js';
 import { getTxOutputs } from '../test-util.js';
 import artifact from '../fixture/simple_covenant.json' assert { type: "json" };
 
 describe('Simple Covenant', () => {
-  const provider = new ElectrumNetworkProvider(Network.CHIPNET);
+  const provider = process.env.TESTS_USE_MOCKNET ? new MockNetworkProvider() : new ElectrumNetworkProvider(Network.CHIPNET);
   let covenant: Contract;
 
   beforeAll(() => {
     covenant = new Contract(artifact, [], { provider });
     console.log(covenant.address);
+    (provider as any).addUtxo?.(covenant.address, randomUtxo());
   });
 
   describe('send', () => {
@@ -27,6 +28,9 @@ describe('Simple Covenant', () => {
 
     it('should succeed with bip68 relative timelock', async () => {
       // given
+      const provider = new ElectrumNetworkProvider(Network.CHIPNET);
+      const covenant = new Contract(artifact, [], { provider });
+
       const to = covenant.address;
       const amount = 1000n;
 
diff --git a/packages/cashscript/test/e2e/old/Mecenas.test.ts b/packages/cashscript/test/e2e/old/Mecenas.test.ts
index 9f197c24..e6265596 100644
--- a/packages/cashscript/test/e2e/old/Mecenas.test.ts
+++ b/packages/cashscript/test/e2e/old/Mecenas.test.ts
@@ -17,6 +17,8 @@ import { getTxOutputs } from '../../test-util.js';
 import { FailedRequireError, Reason } from '../../../src/Errors.js';
 import artifact from '../../fixture/old/mecenas.json' assert { type: "json" };
 
+if (!process.env.TESTS_USE_MOCKNET) {
+
 // Mecenas has tx.age check omitted for testing
 describe('v0.6.0 - Mecenas', () => {
   let mecenas: Contract;
@@ -101,3 +103,7 @@ describe('v0.6.0 - Mecenas', () => {
     });
   });
 });
+
+} else {
+  test.skip('skip', () => {});
+}
\ No newline at end of file
diff --git a/packages/cashscript/test/e2e/old/misc.test.ts b/packages/cashscript/test/e2e/old/misc.test.ts
index 95bc9cb2..bafde66d 100644
--- a/packages/cashscript/test/e2e/old/misc.test.ts
+++ b/packages/cashscript/test/e2e/old/misc.test.ts
@@ -16,6 +16,8 @@ import { getTxOutputs } from '../../test-util.js';
 import simpleCovenantArtifact from '../../fixture/old/simple_covenant.json' assert { type: "json" };
 import mecenasBorderArtifact from '../../fixture/old/mecenas_border.json' assert { type: "json" };
 
+if (!process.env.TESTS_USE_MOCKNET) {
+
 describe('v0.6.0 - Simple Covenant', () => {
   let covenant: Contract;
 
@@ -73,3 +75,7 @@ describe('v0.6.0 - Bytecode VarInt Border Mecenas', () => {
     expect(txOutputs).toEqual(expect.arrayContaining([{ to, amount }]));
   });
 });
+
+} else {
+  test.skip('skip', () => {});
+}
\ No newline at end of file
diff --git a/packages/cashscript/test/fixture/transfer_with_timeout.json b/packages/cashscript/test/fixture/transfer_with_timeout.json
index 2a986023..5ffb7dc9 100644
--- a/packages/cashscript/test/fixture/transfer_with_timeout.json
+++ b/packages/cashscript/test/fixture/transfer_with_timeout.json
@@ -35,7 +35,7 @@
     }
   ],
   "bytecode": "OP_3 OP_PICK OP_0 OP_NUMEQUAL OP_IF OP_4 OP_ROLL OP_ROT OP_CHECKSIG OP_NIP OP_NIP OP_NIP OP_ELSE OP_3 OP_ROLL OP_1 OP_NUMEQUALVERIFY OP_3 OP_ROLL OP_SWAP OP_CHECKSIGVERIFY OP_SWAP OP_CHECKLOCKTIMEVERIFY OP_2DROP OP_1 OP_ENDIF",
-  "source": "\npragma cashscript ^0.8.0;\n\ncontract TransferWithTimeout(\n  pubkey sender,\n  pubkey recipient,\n  int timeout\n) {\n  // Require recipient's signature to match\n  function transfer(sig recipientSig) {\n    require(checkSig(recipientSig, recipient));\n  }\n\n  // Require timeout time to be reached and sender's signature to match\n  function timeout(sig senderSig) {\n    require(checkSig(senderSig, sender));\n    require(tx.time >= timeout);\n  }\n}\n",
+  "source": "contract TransferWithTimeout(\n    pubkey sender,\n    pubkey recipient,\n    int timeout\n) {\n    // Require recipient's signature to match\n    function transfer(sig recipientSig) {\n        require(checkSig(recipientSig, recipient));\n    }\n\n    // Require timeout time to be reached and sender's signature to match\n    function timeout(sig senderSig) {\n        require(checkSig(senderSig, sender));\n        require(tx.time >= timeout);\n    }\n}\n",
   "compiler": {
     "name": "cashc",
     "version": "0.8.0-next.0"

From 3e25a35068c6549c1184a2e20e1920bf499393ac Mon Sep 17 00:00:00 2001
From: mainnet-pat <mainnet_pat@protonmail.com>
Date: Sat, 25 Nov 2023 13:30:42 +0000
Subject: [PATCH 007/171] Fix traversal op_endif location assignment

---
 packages/cashc/src/generation/GenerateTargetTraversal.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/cashc/src/generation/GenerateTargetTraversal.ts b/packages/cashc/src/generation/GenerateTargetTraversal.ts
index d1c21e60..763cccd7 100644
--- a/packages/cashc/src/generation/GenerateTargetTraversal.ts
+++ b/packages/cashc/src/generation/GenerateTargetTraversal.ts
@@ -163,7 +163,7 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
         return f;
       });
       for (let i = 0; i < node.functions.length - 1; i += 1) {
-        this.emit(Op.OP_ENDIF, node.functions[i+1].location!, 1);
+        this.emit(Op.OP_ENDIF, node.location!, 1);
       }
     }
 

From 3b1db55ee1972bddadceaa2a7fc9ec3be9a9e881 Mon Sep 17 00:00:00 2001
From: mainnet-pat <mainnet_pat@protonmail.com>
Date: Sat, 25 Nov 2023 13:31:58 +0000
Subject: [PATCH 008/171] Move randomUtxo, randomToken and randomNFT to utils

---
 packages/cashscript/src/interfaces.ts         | 28 ----------------
 packages/cashscript/src/utils.ts              | 33 +++++++++++++++++++
 .../cashscript/test/e2e/Announcement.test.ts  |  4 +--
 packages/cashscript/test/e2e/BigInt.test.ts   |  4 +--
 .../cashscript/test/e2e/HodlVault.test.ts     |  3 +-
 packages/cashscript/test/e2e/Mecenas.test.ts  |  4 +--
 .../cashscript/test/e2e/P2PKH-tokens.test.ts  |  3 +-
 packages/cashscript/test/e2e/P2PKH.test.ts    |  4 +--
 .../test/e2e/TransferWithTimeout.test.ts      |  3 +-
 packages/cashscript/test/e2e/misc.test.ts     |  3 +-
 10 files changed, 47 insertions(+), 42 deletions(-)

diff --git a/packages/cashscript/src/interfaces.ts b/packages/cashscript/src/interfaces.ts
index 2ab6021d..805bbaac 100644
--- a/packages/cashscript/src/interfaces.ts
+++ b/packages/cashscript/src/interfaces.ts
@@ -10,34 +10,6 @@ export interface Utxo {
   token?: TokenDetails;
 }
 
-const randomInt = () => BigInt(Math.floor(Math.random() * 10000));
-
-export const randomUtxo = (defaults?: Partial<Utxo>): Utxo => {
-  return {...{
-    txid: binToHex(sha256(bigIntToVmNumber(randomInt()))),
-    vout: Math.floor(Math.random() * 10),
-    satoshis: 20000n + randomInt(),
-  }, ...defaults};
-}
-
-export const randomToken = (defaults?: Partial<TokenDetails>): TokenDetails => {
-  return {...{
-    category: binToHex(sha256(bigIntToVmNumber(randomInt()))),
-    amount: 10000n + randomInt(),
-  }, ...defaults};
-}
-
-export const randomNFT = (defaults?: Partial<TokenDetails>): TokenDetails => {
-  return {...{
-    category: binToHex(sha256(bigIntToVmNumber(randomInt()))),
-    amount: 0n,
-    nft: {
-      commitment: binToHex(sha256(bigIntToVmNumber(randomInt()))).slice(0, 8),
-      capability: NonFungibleTokenCapability.none
-    }
-  }, ...defaults};
-}
-
 export interface UnlockableUtxo extends Utxo {
   unlocker: Unlocker;
   options?: InputOptions;
diff --git a/packages/cashscript/src/utils.ts b/packages/cashscript/src/utils.ts
index bef07503..1ba437b2 100644
--- a/packages/cashscript/src/utils.ts
+++ b/packages/cashscript/src/utils.ts
@@ -14,11 +14,14 @@ import {
   isHex,
   bigIntToCompactSize,
   AuthenticationErrorCommon,
+  NonFungibleTokenCapability,
+  bigIntToVmNumber,
 } from '@bitauth/libauth';
 import {
   encodeInt,
   hash160,
   hash256,
+  sha256,
   Op,
   Script,
   scriptToBytecode,
@@ -28,6 +31,7 @@ import {
   Output,
   Network,
   LibauthOutput,
+  TokenDetails,
 } from './interfaces.js';
 import { VERSION_SIZE, LOCKTIME_SIZE } from './constants.js';
 import {
@@ -338,3 +342,32 @@ function getPushDataOpcode(data: Uint8Array): Uint8Array {
   if (byteLength < 256) return Uint8Array.from([0x4c, byteLength]);
   throw Error('Pushdata too large');
 }
+
+
+const randomInt = () => BigInt(Math.floor(Math.random() * 10000));
+
+export const randomUtxo = (defaults?: Partial<Utxo>): Utxo => {
+  return {...{
+    txid: binToHex(sha256(bigIntToVmNumber(randomInt()))),
+    vout: Math.floor(Math.random() * 10),
+    satoshis: 20000n + randomInt(),
+  }, ...defaults};
+}
+
+export const randomToken = (defaults?: Partial<TokenDetails>): TokenDetails => {
+  return {...{
+    category: binToHex(sha256(bigIntToVmNumber(randomInt()))),
+    amount: 10000n + randomInt(),
+  }, ...defaults};
+}
+
+export const randomNFT = (defaults?: Partial<TokenDetails>): TokenDetails => {
+  return {...{
+    category: binToHex(sha256(bigIntToVmNumber(randomInt()))),
+    amount: 0n,
+    nft: {
+      commitment: binToHex(sha256(bigIntToVmNumber(randomInt()))).slice(0, 8),
+      capability: NonFungibleTokenCapability.none
+    }
+  }, ...defaults};
+}
diff --git a/packages/cashscript/test/e2e/Announcement.test.ts b/packages/cashscript/test/e2e/Announcement.test.ts
index 15bf7f48..9b5082ac 100644
--- a/packages/cashscript/test/e2e/Announcement.test.ts
+++ b/packages/cashscript/test/e2e/Announcement.test.ts
@@ -1,7 +1,7 @@
-import { Contract, ElectrumNetworkProvider, MockNetworkProvider, Network, randomUtxo } from '../../src/index.js';
+import { Contract, ElectrumNetworkProvider, MockNetworkProvider, Network } from '../../src/index.js';
 import { getTxOutputs } from '../test-util.js';
 import { FailedRequireError, Reason } from '../../src/Errors.js';
-import { createOpReturnOutput, toRegExp, utxoComparator } from '../../src/utils.js';
+import { createOpReturnOutput, randomUtxo, toRegExp, utxoComparator } from '../../src/utils.js';
 import { aliceAddress } from '../fixture/vars.js';
 import artifact from '../fixture/announcement.json' assert { type: "json" };
 import { AuthenticationErrorCommon } from '@bitauth/libauth';
diff --git a/packages/cashscript/test/e2e/BigInt.test.ts b/packages/cashscript/test/e2e/BigInt.test.ts
index c027ccd4..cabeba25 100644
--- a/packages/cashscript/test/e2e/BigInt.test.ts
+++ b/packages/cashscript/test/e2e/BigInt.test.ts
@@ -4,14 +4,14 @@ import {
   FailedRequireError,
   FailedTransactionError,
   Reason,
-  randomUtxo,
   ElectrumNetworkProvider,
   Network,
 } from '../../src/index.js';
 import { getTxOutputs } from '../test-util.js';
 import artifact from '../fixture/bigint.json' assert { type: "json" };
 import { AuthenticationErrorCommon } from '@bitauth/libauth';
-import { toRegExp } from '../../src/utils.js';
+import { randomUtxo, toRegExp } from '../../src/utils.js';
+import { aliceAddress, bobAddress } from '../fixture/vars.js';
 
 describe('BigInt', () => {
   let bigintContract: Contract;
diff --git a/packages/cashscript/test/e2e/HodlVault.test.ts b/packages/cashscript/test/e2e/HodlVault.test.ts
index 866a5f50..909cadf4 100644
--- a/packages/cashscript/test/e2e/HodlVault.test.ts
+++ b/packages/cashscript/test/e2e/HodlVault.test.ts
@@ -2,7 +2,6 @@ import {
   Contract,
   SignatureTemplate,
   MockNetworkProvider,
-  randomUtxo,
   ElectrumNetworkProvider,
   Network,
 } from '../../src/index.js';
@@ -16,7 +15,7 @@ import { getTxOutputs } from '../test-util.js';
 import { FailedRequireError, Reason } from '../../src/Errors.js';
 import artifact from '../fixture/hodl_vault.json' assert { type: "json" };
 import { AuthenticationErrorCommon } from '@bitauth/libauth';
-import { toRegExp } from '../../src/utils.js';
+import { randomUtxo, toRegExp } from '../../src/utils.js';
 
 describe('HodlVault', () => {
   let hodlVault: Contract;
diff --git a/packages/cashscript/test/e2e/Mecenas.test.ts b/packages/cashscript/test/e2e/Mecenas.test.ts
index 29f29255..2adfa391 100644
--- a/packages/cashscript/test/e2e/Mecenas.test.ts
+++ b/packages/cashscript/test/e2e/Mecenas.test.ts
@@ -1,4 +1,4 @@
-import { Contract, ElectrumNetworkProvider, MockNetworkProvider, Network, randomUtxo } from '../../src/index.js';
+import { Contract, ElectrumNetworkProvider, MockNetworkProvider, Network } from '../../src/index.js';
 import {
   alicePkh,
   bobPkh,
@@ -9,7 +9,7 @@ import { getTxOutputs } from '../test-util.js';
 import { FailedRequireError, Reason } from '../../src/Errors.js';
 import artifact from '../fixture/mecenas.json' assert { type: "json" };
 import { AuthenticationErrorCommon } from '@bitauth/libauth';
-import { toRegExp } from '../../src/utils.js';
+import { randomUtxo, toRegExp } from '../../src/utils.js';
 
 // Mecenas has tx.age check omitted for testing
 describe('Mecenas', () => {
diff --git a/packages/cashscript/test/e2e/P2PKH-tokens.test.ts b/packages/cashscript/test/e2e/P2PKH-tokens.test.ts
index 584d2dde..0969ff1e 100644
--- a/packages/cashscript/test/e2e/P2PKH-tokens.test.ts
+++ b/packages/cashscript/test/e2e/P2PKH-tokens.test.ts
@@ -5,8 +5,9 @@ import {
   alicePriv,
 } from '../fixture/vars.js';
 import { getTxOutputs } from '../test-util.js';
-import { Network, TokenDetails, Utxo, randomNFT, randomToken, randomUtxo } from '../../src/interfaces.js';
+import { Network, TokenDetails, Utxo } from '../../src/interfaces.js';
 import artifact from '../fixture/p2pkh.json' assert { type: "json" };
+import { randomUtxo, randomToken, randomNFT } from 'cashscript/src/utils.js';
 
 describe('P2PKH-tokens', () => {
   let p2pkhInstance: Contract;
diff --git a/packages/cashscript/test/e2e/P2PKH.test.ts b/packages/cashscript/test/e2e/P2PKH.test.ts
index c9b4006f..d8f59544 100644
--- a/packages/cashscript/test/e2e/P2PKH.test.ts
+++ b/packages/cashscript/test/e2e/P2PKH.test.ts
@@ -8,8 +8,8 @@ import {
   alicePriv,
 } from '../fixture/vars.js';
 import { getTxOutputs } from '../test-util.js';
-import { Network, Utxo, randomUtxo } from '../../src/interfaces.js';
-import { createOpReturnOutput, toRegExp, utxoComparator } from '../../src/utils.js';
+import { Network, Utxo } from '../../src/interfaces.js';
+import { createOpReturnOutput, randomUtxo, toRegExp, utxoComparator } from '../../src/utils.js';
 import { FailedSigCheckError, Reason } from '../../src/Errors.js';
 import artifact from '../fixture/p2pkh.json' assert { type: "json" };
 
diff --git a/packages/cashscript/test/e2e/TransferWithTimeout.test.ts b/packages/cashscript/test/e2e/TransferWithTimeout.test.ts
index d8153746..2d629d7f 100644
--- a/packages/cashscript/test/e2e/TransferWithTimeout.test.ts
+++ b/packages/cashscript/test/e2e/TransferWithTimeout.test.ts
@@ -4,7 +4,6 @@ import {
   ElectrumNetworkProvider,
   Network,
   MockNetworkProvider,
-  randomUtxo,
 } from '../../src/index.js';
 import {
   alicePriv, alicePub, bobPriv, bobPub,
@@ -12,7 +11,7 @@ import {
 import { getTxOutputs } from '../test-util.js';
 import { FailedSigCheckError, Reason, FailedTimeCheckError } from '../../src/Errors.js';
 import artifact from '../fixture/transfer_with_timeout.json' assert { type: "json" };
-import { toRegExp } from '../../src/utils.js';
+import { randomUtxo, toRegExp } from '../../src/utils.js';
 import { AuthenticationErrorCommon } from '@bitauth/libauth';
 
 describe('TransferWithTimeout', () => {
diff --git a/packages/cashscript/test/e2e/misc.test.ts b/packages/cashscript/test/e2e/misc.test.ts
index 8c71ef42..67228637 100644
--- a/packages/cashscript/test/e2e/misc.test.ts
+++ b/packages/cashscript/test/e2e/misc.test.ts
@@ -1,6 +1,7 @@
-import { Contract, MockNetworkProvider, ElectrumNetworkProvider, randomUtxo, Network } from '../../src/index.js';
+import { Contract, MockNetworkProvider, ElectrumNetworkProvider, Network } from '../../src/index.js';
 import { getTxOutputs } from '../test-util.js';
 import artifact from '../fixture/simple_covenant.json' assert { type: "json" };
+import { randomUtxo } from 'cashscript/src/utils.js';
 
 describe('Simple Covenant', () => {
   const provider = process.env.TESTS_USE_MOCKNET ? new MockNetworkProvider() : new ElectrumNetworkProvider(Network.CHIPNET);

From bbe96a7308d928097120364aa89a4116596fba04 Mon Sep 17 00:00:00 2001
From: mainnet-pat <mainnet_pat@protonmail.com>
Date: Sat, 25 Nov 2023 13:32:27 +0000
Subject: [PATCH 009/171] Add jest extensions

---
 packages/cashscript/jest.setup.js          |   5 +
 packages/cashscript/test/JestExtensions.ts | 105 +++++++++++++++++++++
 packages/cashscript/tsconfig.build.json    |   5 +
 3 files changed, 115 insertions(+)
 create mode 100644 packages/cashscript/test/JestExtensions.ts

diff --git a/packages/cashscript/jest.setup.js b/packages/cashscript/jest.setup.js
index 108ef23e..167fbc8c 100644
--- a/packages/cashscript/jest.setup.js
+++ b/packages/cashscript/jest.setup.js
@@ -1,3 +1,8 @@
 import { jest } from '@jest/globals';
+import { inspect } from 'util';
+inspect.defaultOptions.depth = 10;
 
 jest.setTimeout(50000);
+
+globalThis.jest = jest;
+
diff --git a/packages/cashscript/test/JestExtensions.ts b/packages/cashscript/test/JestExtensions.ts
new file mode 100644
index 00000000..1ff6b428
--- /dev/null
+++ b/packages/cashscript/test/JestExtensions.ts
@@ -0,0 +1,105 @@
+import { MatcherContext  } from '@jest/expect';
+import { Transaction } from '../src/index.js';
+import { ExpectationResult, SyncExpectationResult } from 'expect';
+import { printExpected, printReceived, matcherHint } from "jest-matcher-utils"
+
+export {};
+
+declare global {
+  namespace jest {
+    interface Matchers<R> {
+      toLog(value: RegExp | string): Promise<void>;
+      toFailRequireWith(value: RegExp | string): Promise<void>;
+    }
+  }
+}
+
+expect.extend({ async toLog(
+  this: MatcherContext,
+  transaction: Transaction,
+  match: RegExp | string
+): Promise<SyncExpectationResult> {
+  const spyOnLoggerError = jest.spyOn(console, 'log');
+
+  // silence actual stdout output
+  spyOnLoggerError.mockImplementation(() => {});
+  await transaction.debug();
+  let message: string = "";
+
+  const failMessage = (received: string, expected: RegExp | string) => () => `${matcherHint(
+".toLog",
+"received",
+"expected"
+)}
+
+Expected: ${printExpected(expected)}
+Received: ${printReceived(received)}`;
+
+  try {
+    expect(spyOnLoggerError).toBeCalledWith(expect.stringMatching(match));
+  } catch (error) {
+    message = error as any;
+  }
+
+  const received = spyOnLoggerError.mock.calls[0][0];
+  spyOnLoggerError.mockClear();
+
+  return {
+    message: failMessage(received, match),
+    pass: !message
+  }
+ }
+});
+
+expect.extend({ async toFailRequireWith(
+  this: MatcherContext,
+  transaction: Transaction,
+  match: RegExp | string
+): Promise<SyncExpectationResult> {
+  let message: string = "";
+  let failMessage: any = () => {};
+
+  try {
+    await transaction.debug();
+    failMessage = (_received: string, _expected: RegExp | string) => () => `${matcherHint(
+".toFailRequireWith",
+undefined,
+""
+)}
+
+Contract function did not fail a require statement`;
+  } catch (error) {
+    message = error as any;
+  }
+
+  // // should not have failed
+  if (this.isNot) {
+    return {
+      message: () => `${matcherHint(
+".toFailRequireWith",
+"received",
+"",
+{isNot: true}
+)}`,
+      pass: false
+    }
+  }
+
+  if (message) {
+    try {
+      expect(message).toMatch(match);
+      message = "";
+    } catch (error: any) {
+      message = error.message;
+      failMessage = (_received: string, _expected: RegExp | string) => () => message.replace('.toMatch', '.toFailRequireWith');
+    }
+  }
+
+  return {
+    message: failMessage(message, match),
+    pass: !message
+  }
+ }
+});
+
+// revertedWith
\ No newline at end of file
diff --git a/packages/cashscript/tsconfig.build.json b/packages/cashscript/tsconfig.build.json
index 942c36bf..48a56f11 100644
--- a/packages/cashscript/tsconfig.build.json
+++ b/packages/cashscript/tsconfig.build.json
@@ -7,5 +7,10 @@
 
   "include": [
     "src/**/*",
+    "test/JestExtensions.ts",
+  ],
+
+  "exclude": [
+    "test/fixture"
   ],
 }

From d99b1a32f5704fd6ca477535cdfb79d393805304 Mon Sep 17 00:00:00 2001
From: mainnet-pat <mainnet_pat@protonmail.com>
Date: Sat, 25 Nov 2023 13:32:58 +0000
Subject: [PATCH 010/171] Remove reference to vars.ts from mock provider

---
 packages/cashscript/src/network/MockNetworkProvider.ts | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/cashscript/src/network/MockNetworkProvider.ts b/packages/cashscript/src/network/MockNetworkProvider.ts
index 334b6104..dfeb53da 100644
--- a/packages/cashscript/src/network/MockNetworkProvider.ts
+++ b/packages/cashscript/src/network/MockNetworkProvider.ts
@@ -1,8 +1,13 @@
 import { binToHex, hexToBin } from '@bitauth/libauth';
 import { sha256 } from '@cashscript/utils';
-import { Utxo, Network, randomUtxo } from '../interfaces.js';
+import { Utxo, Network } from '../interfaces.js';
 import NetworkProvider from './NetworkProvider.js';
-import { aliceAddress, bobAddress, carolAddress } from '../../test/fixture/vars.js';
+import { randomUtxo } from '../utils.js';
+
+// redeclare the addresses from vars.ts instead of importing them
+const aliceAddress = "bchtest:qpgjmwev3spwlwkgmyjrr2s2cvlkkzlewq62mzgjnp";
+const bobAddress = "bchtest:qz6q5gqnxdldkr07xpls5474mmzmlesd6qnux4skuc";
+const carolAddress = "bchtest:qqsr7nqwe6rq5crj63gy5gdqchpnwmguusmr7tfmsj";
 
 export default class MockNetworkProvider implements NetworkProvider {
   private utxoMap: Record<string, Utxo[]> = {};

From 1a2ef7908392b2dab6efdff7219bf9aea25ca204 Mon Sep 17 00:00:00 2001
From: mainnet-pat <mainnet_pat@protonmail.com>
Date: Sat, 25 Nov 2023 13:33:31 +0000
Subject: [PATCH 011/171] Implement require and log tests

---
 packages/cashscript/src/LibauthTemplate.ts    |   5 +-
 packages/cashscript/src/Transaction.ts        |  12 +-
 .../cashscript/test/LibauthTemplate.test.ts   | 169 +++++++++---------
 3 files changed, 100 insertions(+), 86 deletions(-)

diff --git a/packages/cashscript/src/LibauthTemplate.ts b/packages/cashscript/src/LibauthTemplate.ts
index 9f45a693..a8027747 100644
--- a/packages/cashscript/src/LibauthTemplate.ts
+++ b/packages/cashscript/src/LibauthTemplate.ts
@@ -128,7 +128,7 @@ export const buildTemplate = async ({
   const zip = (a: any[], b: any[]) =>
     Array.from(Array(Math.max(b.length, a.length)), (_, i) => [a[i], b[i]]);
 
-  const formattedBytecode = 
+  const formattedBytecode =
     contract.artifact.debug ?
       formatLibauthScript(asmToScript(contract.artifact.debug.bytecode), contract.artifact.debug?.sourceMap!, contract.artifact.source).split("\n") :
       contract.artifact.bytecode.split(" ").map((val) => {
@@ -540,6 +540,9 @@ export const debugTemplate = (template: AuthenticationTemplate, artifact: Artifa
 
       line += ` ${value}`;
     });
+
+    // actual log, do not delete :)
+    console.log(line);
   }
 
   const lastState = debugResult[debugResult.length - 1];
diff --git a/packages/cashscript/src/Transaction.ts b/packages/cashscript/src/Transaction.ts
index a3764ac2..85992502 100644
--- a/packages/cashscript/src/Transaction.ts
+++ b/packages/cashscript/src/Transaction.ts
@@ -41,7 +41,7 @@ import { P2PKH_INPUT_SIZE } from './constants.js';
 import { TransactionBuilder } from './TransactionBuilder.js';
 import { Contract } from './Contract.js';
 import MockNetworkProvider from './network/MockNetworkProvider.js';
-import { buildTemplate, debugTemplate, evaluateTemplate } from './LibauthTemplate.js';
+import { buildTemplate, debugTemplate, evaluateTemplate, getBitauthUri } from './LibauthTemplate.js';
 
 export class Transaction {
   private inputs: Utxo[] = [];
@@ -213,6 +213,16 @@ export class Transaction {
     }
   }
 
+  // method to debug the transaction with libauth VM, throws upon evaluation error
+  async debug() {
+    const template = await buildTemplate({
+      contract: this.contract,
+      transaction: this,
+      manglePrivateKeys: false,
+    });
+    return debugTemplate(template, this.contract.artifact);
+  }
+
   private async getTxDetails(txid: string): Promise<TransactionDetails>
   private async getTxDetails(txid: string, raw: true): Promise<string>;
 
diff --git a/packages/cashscript/test/LibauthTemplate.test.ts b/packages/cashscript/test/LibauthTemplate.test.ts
index 98a878f8..36dd1aee 100644
--- a/packages/cashscript/test/LibauthTemplate.test.ts
+++ b/packages/cashscript/test/LibauthTemplate.test.ts
@@ -1,97 +1,98 @@
-import { Contract, MockNetworkProvider, Network, SignatureTemplate, Utxo, randomUtxo } from '../src/index.js';
-import artifact from './fixture/transfer_with_timeout.json' assert { type: "json" };
+import { Contract, MockNetworkProvider, SignatureTemplate } from '../src/index.js';
 import { alicePriv, alicePub, bobPriv, bobPub } from './fixture/vars.js';
-import { buildTemplate, debugTemplate, evaluateTemplate, stringify } from '../src/LibauthTemplate.js';
 import { compileString } from 'cashc';
-import { binToHex } from '@bitauth/libauth';
+import "./JestExtensions.js";
+import { randomUtxo } from '../src/utils.js';
 
 describe(`Libauth template generation tests`, () => {
-  test("Test transfer with timeout template", async () => {
-    // {
-    //   const code = `
-    //   pragma cashscript ^0.9.0;
-      
-    //   contract TransferWithTimeout(
-    //       pubkey sender,
-    //       pubkey recipient,
-    //       int timeout
-    //   ) {
-    //       // Require recipient's signature to match
-    //       function transfer(sig recipientSig) {
-    //         console.log(recipientSig, timeout, recipient, sender, 1, "A");
-    //           require(checkSig(recipientSig, recipient));
-    //       }
-
-    //       // Require timeout time to be reached and sender's signature to match
-    //       function timeout(sig senderSig) {
-
-    //           require(checkSig(senderSig, sender));
-    //           require(tx.time >= timeout);
-    //       }
-    //   }
-    //   `;
-    //       const artifact = compileString(code);
-
-    //   const provider = new ElectrumNetworkProvider(Network.CHIPNET);
-    //   const contract = new Contract(artifact, [alicePub, bobPub, 100000n], { provider });
-    //   console.log(binToHex(alicePub), binToHex(bobPub));
-
-    //   const transaction = contract.functions.transfer(new SignatureTemplate(bobPriv)).to(contract.address, 10000n);
-    //   const template = await buildTemplate({
-    //     contract,
-    //     transaction,
-    //     manglePrivateKeys: false
-    //   });
-
-    //   console.log(stringify(template));
-    //   debugTemplate(template, artifact);
-
-
-    //   // expect(evaluateTemplate(template)).toBe(true);
-    // }
+  it('should log console statements', async () => {
+    const code = `
+    pragma cashscript ^0.9.0;
 
+    contract TransferWithTimeout(
+        pubkey sender,
+        pubkey recipient,
+        int timeout
+    ) {
+        // Require recipient's signature to match
+        function transfer(sig recipientSig) {
+            bytes2 beef = 0xbeef;
+            console.log(recipientSig, timeout, recipient, sender, beef, 1, "test", true);
+            require(beef != 0xfeed);
+            require(checkSig(recipientSig, recipient));
+        }
+
+        // Require timeout time to be reached and sender's signature to match
+        function timeout(sig senderSig) {
+            require(checkSig(senderSig, sender));
+            require(tx.time >= timeout);
+        }
+    }
+    `;
+    const artifact = compileString(code);
+
+    const provider = new MockNetworkProvider();
+    const contract = new Contract(artifact, [alicePub, bobPub, 100000n], { provider });
+    provider.addUtxo(contract.address, randomUtxo());
+
+    const transaction = contract.functions.transfer(new SignatureTemplate(bobPriv)).to(contract.address, 10000n);
+
+    await (expect(transaction)).toLog(/0x[0-9a-f]{130} 100000 0x[0-9a-f]{66} 0x[0-9a-f]{66} 0xbeef 1 test true/);
+    await (expect(transaction)).toLog("beef");
+  });
+
+  it('should check for failed requires', async () => {
+    const code = `
+    pragma cashscript ^0.9.0;
+
+    contract TransferWithTimeout(
+        pubkey sender,
+        pubkey recipient,
+        int timeout
+    ) {
+        // Require recipient's signature to match
+        function transfer(sig recipientSig) {
+            require(checkSig(recipientSig, recipient));
+        }
+
+        // Require timeout time to be reached and sender's signature to match
+        function timeout(sig senderSig) {
+            require(checkSig(senderSig, sender), "sigcheck custom fail");
+            require(tx.time >= timeout);
+        }
+
+        function timeout2(sig senderSig) {
+            require(tx.time >= timeout, "timecheck custom fail");
+            require(checkSig(senderSig, sender));
+        }
+    }
+    `;
+
+    const artifact = compileString(code);
+
+    const provider = new MockNetworkProvider();
     {
-      const code = `
-      pragma cashscript ^0.9.0;
-
-      contract TransferWithTimeout(
-          pubkey sender,
-          pubkey recipient,
-          int timeout
-      ) {
-          // Require recipient's signature to match
-          function transfer(sig recipientSig) {
-              require(checkSig(recipientSig, recipient));
-          }
-
-          // Require timeout time to be reached and sender's signature to match
-          function timeout(sig senderSig) {
-              // require(checkSig(senderSig, sender), "lol");
-              // require(checkSig(senderSig, sender));
-              require(senderSig == senderSig);
-              require(sender == sender);
-              require(tx.time >= timeout);
-          }
-      }
-      `;
-      const artifact = compileString(code);
-
-      // const provider = new ElectrumNetworkProvider(Network.CHIPNET);
-      const provider = new MockNetworkProvider();
       const contract = new Contract(artifact, [alicePub, bobPub, 2000000n], { provider });
       provider.addUtxo(contract.address, randomUtxo());
 
-      const transaction = contract.functions.timeout(new SignatureTemplate(alicePriv)).to(contract.address, 1000n);
-      const template = await buildTemplate({
-        contract,
-        transaction,
-        manglePrivateKeys: false
-      });
+      const transaction = contract.functions.timeout(new SignatureTemplate(bobPriv)).to(contract.address, 1000n);
+      await expect(transaction).toFailRequireWith(/sigcheck custom fail/);
+    }
+
+    {
+      const contract = new Contract(artifact, [alicePub, bobPub, 1000000n], { provider });
+      provider.addUtxo(contract.address, randomUtxo());
 
-      // debugTemplate(template, artifact);
-      await transaction.send();
+      const transaction = contract.functions.timeout2(new SignatureTemplate(alicePriv)).to(contract.address, 1000n);
+      await expect(transaction).toFailRequireWith(/timecheck custom fail/);
+    }
+
+    {
+      const contract = new Contract(artifact, [alicePub, bobPub, 2000000n], { provider });
+      provider.addUtxo(contract.address, randomUtxo());
 
-      // expect(debugTemplate(template)).toBe(false);
+      const transaction = contract.functions.transfer(new SignatureTemplate(bobPriv)).to(contract.address, 1000n);
+      await expect(transaction).not.toFailRequireWith(/timecheck custom fail/);
     }
   });
-});
\ No newline at end of file
+});

From ac1fbaaed2333b875d1b9e133e8da6f2b055702d Mon Sep 17 00:00:00 2001
From: mainnet-pat <mainnet_pat@protonmail.com>
Date: Sat, 25 Nov 2023 18:14:06 +0000
Subject: [PATCH 012/171] meepStr -> debugStr, cleanup

---
 packages/cashscript/src/Errors.ts          |  4 ++--
 packages/cashscript/src/LibauthTemplate.ts |  8 ++++----
 packages/cashscript/src/Transaction.ts     | 14 +++++---------
 packages/cashscript/src/interfaces.ts      |  3 +--
 packages/cashscript/src/utils.ts           | 16 +++++-----------
 packages/cashscript/test/JestExtensions.ts |  6 ++----
 6 files changed, 19 insertions(+), 32 deletions(-)

diff --git a/packages/cashscript/src/Errors.ts b/packages/cashscript/src/Errors.ts
index 41216319..229885a4 100644
--- a/packages/cashscript/src/Errors.ts
+++ b/packages/cashscript/src/Errors.ts
@@ -19,8 +19,8 @@ export class TokensToNonTokenAddressError extends Error {
 }
 
 export class FailedTransactionError extends Error {
-  constructor(public reason: string, public meep?: string) {
-    super(`Transaction failed with reason: ${reason}${meep ? `\n${meep}` : ''}`);
+  constructor(public reason: string, public debugStr?: string) {
+    super(`Transaction failed with reason: ${reason}${debugStr ? `\n\n${debugStr}` : ''}`);
   }
 }
 
diff --git a/packages/cashscript/src/LibauthTemplate.ts b/packages/cashscript/src/LibauthTemplate.ts
index a8027747..0fcc4cc2 100644
--- a/packages/cashscript/src/LibauthTemplate.ts
+++ b/packages/cashscript/src/LibauthTemplate.ts
@@ -79,6 +79,9 @@ export const stringify = (any: any, spaces?: number) =>
     spaces
   );
 
+const zip = (a: any[], b: any[]) =>
+  Array.from(Array(Math.max(b.length, a.length)), (_, i) => [a[i], b[i]]);
+
 export const buildTemplate = async ({
   contract,
   transaction,
@@ -125,10 +128,7 @@ export const buildTemplate = async ({
     (val) => isUtxoP2PKH(val)
   ).length;
 
-  const zip = (a: any[], b: any[]) =>
-    Array.from(Array(Math.max(b.length, a.length)), (_, i) => [a[i], b[i]]);
-
-  const formattedBytecode =
+    const formattedBytecode =
     contract.artifact.debug ?
       formatLibauthScript(asmToScript(contract.artifact.debug.bytecode), contract.artifact.debug?.sourceMap!, contract.artifact.source).split("\n") :
       contract.artifact.bytecode.split(" ").map((val) => {
diff --git a/packages/cashscript/src/Transaction.ts b/packages/cashscript/src/Transaction.ts
index 85992502..ac43915e 100644
--- a/packages/cashscript/src/Transaction.ts
+++ b/packages/cashscript/src/Transaction.ts
@@ -23,7 +23,6 @@ import {
   Unlocker,
 } from './interfaces.js';
 import {
-  meep,
   createInputScript,
   getInputSize,
   createOpReturnOutput,
@@ -197,19 +196,21 @@ export class Transaction {
 
       const reason = maybeNodeError.error ?? maybeNodeError.message ?? maybeNodeError;
 
+      const biatuthUri = getBitauthUri(template);
+
       try {
         debugTemplate(template, this.contract.artifact);
       } catch (libauthError: any) {
         if (this.contract.provider instanceof MockNetworkProvider) {
-          throw buildError(libauthError, "");
+          throw buildError(libauthError, biatuthUri);
         } else {
           const message = libauthError + `\n\nUnderlying node error: ${reason}`;
-          throw buildError(message, "");
+          throw buildError(message, biatuthUri);
         }
       }
 
       // this must be unreachable
-      throw buildError(reason, "");
+      throw buildError(reason, biatuthUri);
     }
   }
 
@@ -245,11 +246,6 @@ export class Transaction {
     throw new Error('Could not retrieve transaction details for over 10 minutes');
   }
 
-  async meep(): Promise<string> {
-    const tx = await this.build();
-    return meep(tx, this.inputs, this.contract.redeemScript);
-  }
-
   private async setInputsAndOutputs(): Promise<void> {
     if (this.outputs.length === 0) {
       throw Error('Attempted to build a transaction without outputs');
diff --git a/packages/cashscript/src/interfaces.ts b/packages/cashscript/src/interfaces.ts
index 805bbaac..757b9d00 100644
--- a/packages/cashscript/src/interfaces.ts
+++ b/packages/cashscript/src/interfaces.ts
@@ -1,7 +1,6 @@
-import { bigIntToVmNumber, binToHex, NonFungibleTokenCapability, type Transaction } from '@bitauth/libauth';
+import { type Transaction } from '@bitauth/libauth';
 import type { NetworkProvider } from './network/index.js';
 import type SignatureTemplate from './SignatureTemplate.js';
-import { sha256 } from '@cashscript/utils';
 
 export interface Utxo {
   txid: string;
diff --git a/packages/cashscript/src/utils.ts b/packages/cashscript/src/utils.ts
index 1ba437b2..cfa6055f 100644
--- a/packages/cashscript/src/utils.ts
+++ b/packages/cashscript/src/utils.ts
@@ -209,7 +209,7 @@ export function createSighashPreimage(
   return sighashPreimage;
 }
 
-export function buildError(reason: string, meepStr?: string): FailedTransactionError {
+export function buildError(reason: string, debugStr?: string): FailedTransactionError {
   const require = [
     Reason.EVAL_FALSE, Reason.VERIFY, Reason.EQUALVERIFY, Reason.CHECKMULTISIGVERIFY,
     Reason.CHECKSIGVERIFY, Reason.CHECKDATASIGVERIFY, Reason.NUMEQUALVERIFY,
@@ -229,30 +229,24 @@ export function buildError(reason: string, meepStr?: string): FailedTransactionE
   ];
 
   if (toRegExp(require).test(reason)) {
-    return new FailedRequireError(reason, meepStr);
+    return new FailedRequireError(reason, debugStr);
   }
 
   if (toRegExp(timeCheck).test(reason)) {
-    return new FailedTimeCheckError(reason, meepStr);
+    return new FailedTimeCheckError(reason, debugStr);
   }
 
   if (toRegExp(sigCheck).test(reason)) {
-    return new FailedSigCheckError(reason, meepStr);
+    return new FailedSigCheckError(reason, debugStr);
   }
 
-  return new FailedTransactionError(reason, meepStr);
+  return new FailedTransactionError(reason, debugStr);
 }
 
 export function toRegExp(reasons: string[]): RegExp {
   return new RegExp(reasons.join('|').replace(/\(/g, '\\(').replace(/\)/g, '\\)'));
 }
 
-// ////////// MISC ////////////////////////////////////////////////////////////
-export function meep(tx: any, utxos: Utxo[], script: Script): string {
-  const scriptPubkey = binToHex(scriptToLockingBytecode(script, 'p2sh20'));
-  return `meep debug --tx=${tx} --idx=0 --amt=${utxos[0].satoshis} --pkscript=${scriptPubkey}`;
-}
-
 export function scriptToAddress(script: Script, network: string, addressType: 'p2sh20' | 'p2sh32', tokenSupport: boolean): string {
   const lockingBytecode = scriptToLockingBytecode(script, addressType);
   const prefix = getNetworkPrefix(network);
diff --git a/packages/cashscript/test/JestExtensions.ts b/packages/cashscript/test/JestExtensions.ts
index 1ff6b428..4fb153e1 100644
--- a/packages/cashscript/test/JestExtensions.ts
+++ b/packages/cashscript/test/JestExtensions.ts
@@ -1,6 +1,6 @@
 import { MatcherContext  } from '@jest/expect';
 import { Transaction } from '../src/index.js';
-import { ExpectationResult, SyncExpectationResult } from 'expect';
+import { SyncExpectationResult } from 'expect';
 import { printExpected, printReceived, matcherHint } from "jest-matcher-utils"
 
 export {};
@@ -72,7 +72,7 @@ Contract function did not fail a require statement`;
     message = error as any;
   }
 
-  // // should not have failed
+  // should not have failed
   if (this.isNot) {
     return {
       message: () => `${matcherHint(
@@ -101,5 +101,3 @@ Contract function did not fail a require statement`;
   }
  }
 });
-
-// revertedWith
\ No newline at end of file

From cdc945eef84627d2cfc23330935eb32301615e21 Mon Sep 17 00:00:00 2001
From: mainnet-pat <mainnet_pat@protonmail.com>
Date: Sat, 25 Nov 2023 18:37:58 +0000
Subject: [PATCH 013/171] Lint

---
 packages/cashscript/src/LibauthTemplate.ts    |  38 +++--
 packages/cashscript/src/Transaction.ts        |   9 +-
 .../src/network/MockNetworkProvider.ts        |   8 +-
 packages/cashscript/src/network/index.ts      |   2 +-
 packages/cashscript/src/utils.ts              |  40 ++---
 packages/cashscript/test/JestExtensions.ts    | 145 ++++++++--------
 .../cashscript/test/LibauthTemplate.test.ts   |  12 +-
 .../cashscript/test/e2e/Announcement.test.ts  |  14 +-
 packages/cashscript/test/e2e/BigInt.test.ts   |   7 +-
 .../cashscript/test/e2e/HodlVault.test.ts     |   6 +-
 packages/cashscript/test/e2e/Mecenas.test.ts  |  10 +-
 .../cashscript/test/e2e/P2PKH-tokens.test.ts  |  42 +++--
 packages/cashscript/test/e2e/P2PKH.test.ts    |  14 +-
 .../test/e2e/TransferWithTimeout.test.ts      |  12 +-
 packages/cashscript/test/e2e/misc.test.ts     |  12 +-
 .../cashscript/test/e2e/old/Mecenas.test.ts   | 156 +++++++++---------
 packages/cashscript/test/e2e/old/misc.test.ts |  90 +++++-----
 17 files changed, 337 insertions(+), 280 deletions(-)

diff --git a/packages/cashscript/src/LibauthTemplate.ts b/packages/cashscript/src/LibauthTemplate.ts
index 0fcc4cc2..9314bd53 100644
--- a/packages/cashscript/src/LibauthTemplate.ts
+++ b/packages/cashscript/src/LibauthTemplate.ts
@@ -18,6 +18,7 @@ import {
   binToBase64,
   utf8ToBin,
   isHex,
+  AuthenticationProgramStateBCHCHIPs,
 } from "@bitauth/libauth";
 import { deflate } from "pako";
 import {
@@ -33,7 +34,7 @@ import SignatureTemplate from "./SignatureTemplate.js";
 import { Transaction } from "./Transaction.js";
 
 // all bitauth variables must be in snake case
-function snake_case(str: string) {
+const snakeCase = (str: string): string => {
   return (
     str &&
     str
@@ -44,7 +45,7 @@ function snake_case(str: string) {
       .join("_")
   );
 }
-const merge = (array: any) =>
+const merge = (array: any): any =>
   array.reduce(
     (prev: any, cur: any) => ({
       ...prev,
@@ -64,7 +65,7 @@ const encodeArgument = (
 };
 
 // stringify version which can serialize otherwise unsupported types
-export const stringify = (any: any, spaces?: number) =>
+export const stringify = (any: any, spaces?: number): string =>
   JSON.stringify(
     any,
     (_, v) => {
@@ -105,7 +106,7 @@ export const buildTemplate = async ({
 
   const libauthTransaction = decodeTransaction(hexToBin(txHex));
   if (typeof libauthTransaction === "string") {
-    throw libauthTransaction;
+    throw Error(libauthTransaction);
   }
 
   const constructorInputs = contract.artifact.constructorInputs
@@ -176,14 +177,14 @@ export const buildTemplate = async ({
             },
           },
           ...constructorInputs.map((input) => ({
-            [snake_case(input.name)]: {
+            [snakeCase(input.name)]: {
               description: `"${input.name}" parameter of this contract`,
               name: input.name,
               type: "WalletData",
             },
           })),
           ...functionInputs.map((input) => ({
-            [snake_case(input.name)]: {
+            [snakeCase(input.name)]: {
               description: `"${input.name}" parameter of function "${func.name}"`,
               name: input.name,
               type: input.type === PrimitiveType.SIG ? "Key" : "WalletData",
@@ -202,7 +203,7 @@ export const buildTemplate = async ({
                 const hex = binToHex(arg as Uint8Array);
                 const result = hex.length ? `0x${hex}` : hex;
                 return {
-                  [snake_case(input.name)]: result,
+                  [snakeCase(input.name)]: result,
                 };
               }),
             { function_index: functionIndex.toString() },
@@ -215,7 +216,7 @@ export const buildTemplate = async ({
               );
               const result = hex.length ? `0x${hex}` : hex;
               return {
-                [snake_case(input.name)]: result,
+                [snakeCase(input.name)]: result,
               };
             }),
           ]),
@@ -235,7 +236,7 @@ export const buildTemplate = async ({
                 .filter(([input]) => input.type === PrimitiveType.SIG)
                 .map(([input, arg]) => {
                   return {
-                    [snake_case(input.name)]: binToHex(
+                    [snakeCase(input.name)]: binToHex(
                       manglePrivateKeys
                         ? (arg as SignatureTemplate)
                             .getPublicKey()
@@ -399,10 +400,10 @@ export const buildTemplate = async ({
           ...(functionInputs.length
             ? zip(functionInputs, args).map(([input, arg]) =>
                 input.type === PrimitiveType.SIG
-                  ? `<${snake_case(
+                  ? `<${snakeCase(
                       input.name
                     )}.schnorr_signature.all_outputs> // ${input.type}`
-                  : `<${snake_case(input.name)}> // ${input.type} = <${
+                  : `<${snakeCase(input.name)}> // ${input.type} = <${
                       "0x" + binToHex(arg)
                     }>`
               )
@@ -430,7 +431,7 @@ export const buildTemplate = async ({
                   contractParameters[index],
                   constructorInputs[index].type
                 ) as Uint8Array;
-                return `<${snake_case(input.name)}> // ${
+                return `<${snakeCase(input.name)}> // ${
                   input.type === "bytes" ? "bytes" + encoded.length : input.type
                 } = <${"0x" + binToHex(encoded)}>`;
               })
@@ -462,8 +463,8 @@ export const buildTemplate = async ({
   } as AuthenticationTemplate;
 };
 
-export const getBitauthUri = (template: AuthenticationTemplate) => {
-  const base64toBase64Url = (base64: string) =>
+export const getBitauthUri = (template: AuthenticationTemplate): string => {
+  const base64toBase64Url = (base64: string): string =>
     base64.replace(/\+/g, "-").replace(/\//g, "_");
   const payload = base64toBase64Url(
     binToBase64(deflate(utf8ToBin(stringify(template))))
@@ -472,7 +473,7 @@ export const getBitauthUri = (template: AuthenticationTemplate) => {
 };
 
 // internal util. instantiates the virtual machine and compiles the template into a program
-const createProgram = (template: AuthenticationTemplate) => {
+const createProgram = (template: AuthenticationTemplate): any => {
   const configuration = authenticationTemplateToCompilerConfiguration(template);
   const vm = createVirtualMachineBCHCHIPs();
   const compiler = createCompiler(configuration);
@@ -495,7 +496,7 @@ const createProgram = (template: AuthenticationTemplate) => {
 }
 
 // evaluates the fully defined template, throws upon error
-export const evaluateTemplate = (template: AuthenticationTemplate) => {
+export const evaluateTemplate = (template: AuthenticationTemplate): boolean => {
   const { vm, program } = createProgram(template);
 
   const verifyResult = vm.verify(program);
@@ -506,8 +507,10 @@ export const evaluateTemplate = (template: AuthenticationTemplate) => {
   return verifyResult;
 };
 
+export type DebugResult = AuthenticationProgramStateBCHCHIPs[];
+
 // debugs the template, optionally logging the execution data
-export const debugTemplate = (template: AuthenticationTemplate, artifact: Artifact) => {
+export const debugTemplate = (template: AuthenticationTemplate, artifact: Artifact): DebugResult  => {
   const { vm, program } = createProgram(template);
 
   const debugResult = vm.debug(program);
@@ -559,4 +562,3 @@ ${lastState.error}`;
 
   return debugResult;
 };
-
diff --git a/packages/cashscript/src/Transaction.ts b/packages/cashscript/src/Transaction.ts
index ac43915e..6db9bd15 100644
--- a/packages/cashscript/src/Transaction.ts
+++ b/packages/cashscript/src/Transaction.ts
@@ -40,7 +40,10 @@ import { P2PKH_INPUT_SIZE } from './constants.js';
 import { TransactionBuilder } from './TransactionBuilder.js';
 import { Contract } from './Contract.js';
 import MockNetworkProvider from './network/MockNetworkProvider.js';
-import { buildTemplate, debugTemplate, evaluateTemplate, getBitauthUri } from './LibauthTemplate.js';
+import {
+  DebugResult,
+  buildTemplate, debugTemplate, evaluateTemplate, getBitauthUri,
+} from './LibauthTemplate.js';
 
 export class Transaction {
   private inputs: Utxo[] = [];
@@ -204,7 +207,7 @@ export class Transaction {
         if (this.contract.provider instanceof MockNetworkProvider) {
           throw buildError(libauthError, biatuthUri);
         } else {
-          const message = libauthError + `\n\nUnderlying node error: ${reason}`;
+          const message = `${libauthError}\n\nUnderlying node error: ${reason}`;
           throw buildError(message, biatuthUri);
         }
       }
@@ -215,7 +218,7 @@ export class Transaction {
   }
 
   // method to debug the transaction with libauth VM, throws upon evaluation error
-  async debug() {
+  async debug(): Promise<DebugResult> {
     const template = await buildTemplate({
       contract: this.contract,
       transaction: this,
diff --git a/packages/cashscript/src/network/MockNetworkProvider.ts b/packages/cashscript/src/network/MockNetworkProvider.ts
index dfeb53da..ed260b2d 100644
--- a/packages/cashscript/src/network/MockNetworkProvider.ts
+++ b/packages/cashscript/src/network/MockNetworkProvider.ts
@@ -5,9 +5,9 @@ import NetworkProvider from './NetworkProvider.js';
 import { randomUtxo } from '../utils.js';
 
 // redeclare the addresses from vars.ts instead of importing them
-const aliceAddress = "bchtest:qpgjmwev3spwlwkgmyjrr2s2cvlkkzlewq62mzgjnp";
-const bobAddress = "bchtest:qz6q5gqnxdldkr07xpls5474mmzmlesd6qnux4skuc";
-const carolAddress = "bchtest:qqsr7nqwe6rq5crj63gy5gdqchpnwmguusmr7tfmsj";
+const aliceAddress = 'bchtest:qpgjmwev3spwlwkgmyjrr2s2cvlkkzlewq62mzgjnp';
+const bobAddress = 'bchtest:qz6q5gqnxdldkr07xpls5474mmzmlesd6qnux4skuc';
+const carolAddress = 'bchtest:qqsr7nqwe6rq5crj63gy5gdqchpnwmguusmr7tfmsj';
 
 export default class MockNetworkProvider implements NetworkProvider {
   private utxoMap: Record<string, Utxo[]> = {};
@@ -15,7 +15,7 @@ export default class MockNetworkProvider implements NetworkProvider {
   public network: Network = Network.CHIPNET;
 
   constructor() {
-    for (let i = 0; i < 3; i++) {
+    for (let i = 0; i < 3; i += 1) {
       this.addUtxo(aliceAddress, randomUtxo());
       this.addUtxo(bobAddress, randomUtxo());
       this.addUtxo(carolAddress, randomUtxo());
diff --git a/packages/cashscript/src/network/index.ts b/packages/cashscript/src/network/index.ts
index dc6e38cf..6feb6217 100644
--- a/packages/cashscript/src/network/index.ts
+++ b/packages/cashscript/src/network/index.ts
@@ -2,4 +2,4 @@ export { default as NetworkProvider } from './NetworkProvider.js';
 export { default as BitcoinRpcNetworkProvider } from './BitcoinRpcNetworkProvider.js';
 export { default as ElectrumNetworkProvider } from './ElectrumNetworkProvider.js';
 export { default as FullStackNetworkProvider } from './FullStackNetworkProvider.js';
-export { default as MockNetworkProvider } from './MockNetworkProvider.js';
\ No newline at end of file
+export { default as MockNetworkProvider } from './MockNetworkProvider.js';
diff --git a/packages/cashscript/src/utils.ts b/packages/cashscript/src/utils.ts
index cfa6055f..a35f64b9 100644
--- a/packages/cashscript/src/utils.ts
+++ b/packages/cashscript/src/utils.ts
@@ -214,18 +214,18 @@ export function buildError(reason: string, debugStr?: string): FailedTransaction
     Reason.EVAL_FALSE, Reason.VERIFY, Reason.EQUALVERIFY, Reason.CHECKMULTISIGVERIFY,
     Reason.CHECKSIGVERIFY, Reason.CHECKDATASIGVERIFY, Reason.NUMEQUALVERIFY,
 
-    AuthenticationErrorCommon.failedVerify
+    AuthenticationErrorCommon.failedVerify,
   ];
   const timeCheck = [
     Reason.NEGATIVE_LOCKTIME, Reason.UNSATISFIED_LOCKTIME,
 
-    AuthenticationErrorCommon.negativeLocktime, AuthenticationErrorCommon.unsatisfiedLocktime
+    AuthenticationErrorCommon.negativeLocktime, AuthenticationErrorCommon.unsatisfiedLocktime,
   ];
   const sigCheck = [
     Reason.SIG_COUNT, Reason.PUBKEY_COUNT, Reason.SIG_HASHTYPE, Reason.SIG_DER,
     Reason.SIG_HIGH_S, Reason.SIG_NULLFAIL, Reason.SIG_BADLENGTH, Reason.SIG_NONSCHNORR,
 
-    AuthenticationErrorCommon.nonNullSignatureFailure
+    AuthenticationErrorCommon.nonNullSignatureFailure,
   ];
 
   if (toRegExp(require).test(reason)) {
@@ -337,31 +337,33 @@ function getPushDataOpcode(data: Uint8Array): Uint8Array {
   throw Error('Pushdata too large');
 }
 
+const randomInt = (): bigint => BigInt(Math.floor(Math.random() * 10000));
 
-const randomInt = () => BigInt(Math.floor(Math.random() * 10000));
-
-export const randomUtxo = (defaults?: Partial<Utxo>): Utxo => {
-  return {...{
+export const randomUtxo = (defaults?: Partial<Utxo>): Utxo => ({
+  ...{
     txid: binToHex(sha256(bigIntToVmNumber(randomInt()))),
     vout: Math.floor(Math.random() * 10),
     satoshis: 20000n + randomInt(),
-  }, ...defaults};
-}
+  },
+  ...defaults,
+});
 
-export const randomToken = (defaults?: Partial<TokenDetails>): TokenDetails => {
-  return {...{
+export const randomToken = (defaults?: Partial<TokenDetails>): TokenDetails => ({
+  ...{
     category: binToHex(sha256(bigIntToVmNumber(randomInt()))),
     amount: 10000n + randomInt(),
-  }, ...defaults};
-}
+  },
+  ...defaults,
+});
 
-export const randomNFT = (defaults?: Partial<TokenDetails>): TokenDetails => {
-  return {...{
+export const randomNFT = (defaults?: Partial<TokenDetails>): TokenDetails => ({
+  ...{
     category: binToHex(sha256(bigIntToVmNumber(randomInt()))),
     amount: 0n,
     nft: {
       commitment: binToHex(sha256(bigIntToVmNumber(randomInt()))).slice(0, 8),
-      capability: NonFungibleTokenCapability.none
-    }
-  }, ...defaults};
-}
+      capability: NonFungibleTokenCapability.none,
+    },
+  },
+  ...defaults,
+});
diff --git a/packages/cashscript/test/JestExtensions.ts b/packages/cashscript/test/JestExtensions.ts
index 4fb153e1..94437951 100644
--- a/packages/cashscript/test/JestExtensions.ts
+++ b/packages/cashscript/test/JestExtensions.ts
@@ -1,12 +1,13 @@
-import { MatcherContext  } from '@jest/expect';
-import { Transaction } from '../src/index.js';
+import { MatcherContext } from '@jest/expect';
 import { SyncExpectationResult } from 'expect';
-import { printExpected, printReceived, matcherHint } from "jest-matcher-utils"
+import { printExpected, printReceived, matcherHint } from 'jest-matcher-utils';
+import { Transaction } from '../src/index.js';
 
 export {};
 
 declare global {
   namespace jest {
+    // eslint-disable-next-line
     interface Matchers<R> {
       toLog(value: RegExp | string): Promise<void>;
       toFailRequireWith(value: RegExp | string): Promise<void>;
@@ -14,90 +15,92 @@ declare global {
   }
 }
 
-expect.extend({ async toLog(
-  this: MatcherContext,
-  transaction: Transaction,
-  match: RegExp | string
-): Promise<SyncExpectationResult> {
-  const spyOnLoggerError = jest.spyOn(console, 'log');
+expect.extend({
+  async toLog(
+    this: MatcherContext,
+    transaction: Transaction,
+    match: RegExp | string,
+  ): Promise<SyncExpectationResult> {
+    const spyOnLoggerError = jest.spyOn(console, 'log');
 
-  // silence actual stdout output
-  spyOnLoggerError.mockImplementation(() => {});
-  await transaction.debug();
-  let message: string = "";
+    // silence actual stdout output
+    spyOnLoggerError.mockImplementation(() => {});
+    await transaction.debug();
+    let message: string = '';
 
-  const failMessage = (received: string, expected: RegExp | string) => () => `${matcherHint(
-".toLog",
-"received",
-"expected"
-)}
+    const failMessage = (received: string, expected: RegExp | string) => () => `${matcherHint(
+      '.toLog',
+      'received',
+      'expected',
+    )}
 
 Expected: ${printExpected(expected)}
 Received: ${printReceived(received)}`;
 
-  try {
-    expect(spyOnLoggerError).toBeCalledWith(expect.stringMatching(match));
-  } catch (error) {
-    message = error as any;
-  }
+    try {
+      expect(spyOnLoggerError).toBeCalledWith(expect.stringMatching(match));
+    } catch (error) {
+      message = error as any;
+    }
 
-  const received = spyOnLoggerError.mock.calls[0][0];
-  spyOnLoggerError.mockClear();
+    const received = spyOnLoggerError.mock.calls[0][0];
+    spyOnLoggerError.mockClear();
 
-  return {
-    message: failMessage(received, match),
-    pass: !message
-  }
- }
+    return {
+      message: failMessage(received, match),
+      pass: !message,
+    };
+  },
 });
 
-expect.extend({ async toFailRequireWith(
-  this: MatcherContext,
-  transaction: Transaction,
-  match: RegExp | string
-): Promise<SyncExpectationResult> {
-  let message: string = "";
-  let failMessage: any = () => {};
+expect.extend({
+  async toFailRequireWith(
+    this: MatcherContext,
+    transaction: Transaction,
+    match: RegExp | string,
+  ): Promise<SyncExpectationResult> {
+    let message: string = '';
+    let failMessage: any = () => {};
 
-  try {
-    await transaction.debug();
-    failMessage = (_received: string, _expected: RegExp | string) => () => `${matcherHint(
-".toFailRequireWith",
-undefined,
-""
-)}
+    try {
+      await transaction.debug();
+      failMessage = () => () => `${matcherHint(
+        '.toFailRequireWith',
+        undefined,
+        '',
+      )}
 
 Contract function did not fail a require statement`;
-  } catch (error) {
-    message = error as any;
-  }
+    } catch (error) {
+      message = error as any;
+    }
 
-  // should not have failed
-  if (this.isNot) {
-    return {
-      message: () => `${matcherHint(
-".toFailRequireWith",
-"received",
-"",
-{isNot: true}
-)}`,
-      pass: false
+    // should not have failed
+    if (this.isNot) {
+      return {
+        message: () => `${matcherHint(
+          '.toFailRequireWith',
+          'received',
+          '',
+          { isNot: true },
+        )}`,
+        pass: false,
+      };
     }
-  }
 
-  if (message) {
-    try {
-      expect(message).toMatch(match);
-      message = "";
-    } catch (error: any) {
-      message = error.message;
-      failMessage = (_received: string, _expected: RegExp | string) => () => message.replace('.toMatch', '.toFailRequireWith');
+    if (message) {
+      try {
+        expect(message).toMatch(match);
+        message = '';
+      } catch (error: any) {
+        message = error.message;
+        failMessage = () => () => message.replace('.toMatch', '.toFailRequireWith');
+      }
     }
-  }
 
-  return {
-    message: failMessage(message, match),
-    pass: !message
-  }
- }
+    return {
+      message: failMessage(message, match),
+      pass: !message,
+    };
+  },
 });
diff --git a/packages/cashscript/test/LibauthTemplate.test.ts b/packages/cashscript/test/LibauthTemplate.test.ts
index 36dd1aee..f4f0b978 100644
--- a/packages/cashscript/test/LibauthTemplate.test.ts
+++ b/packages/cashscript/test/LibauthTemplate.test.ts
@@ -1,10 +1,12 @@
-import { Contract, MockNetworkProvider, SignatureTemplate } from '../src/index.js';
-import { alicePriv, alicePub, bobPriv, bobPub } from './fixture/vars.js';
 import { compileString } from 'cashc';
-import "./JestExtensions.js";
+import { Contract, MockNetworkProvider, SignatureTemplate } from '../src/index.js';
+import {
+  alicePriv, alicePub, bobPriv, bobPub,
+} from './fixture/vars.js';
+import './JestExtensions.js';
 import { randomUtxo } from '../src/utils.js';
 
-describe(`Libauth template generation tests`, () => {
+describe('Libauth template generation tests', () => {
   it('should log console statements', async () => {
     const code = `
     pragma cashscript ^0.9.0;
@@ -38,7 +40,7 @@ describe(`Libauth template generation tests`, () => {
     const transaction = contract.functions.transfer(new SignatureTemplate(bobPriv)).to(contract.address, 10000n);
 
     await (expect(transaction)).toLog(/0x[0-9a-f]{130} 100000 0x[0-9a-f]{66} 0x[0-9a-f]{66} 0xbeef 1 test true/);
-    await (expect(transaction)).toLog("beef");
+    await (expect(transaction)).toLog('beef');
   });
 
   it('should check for failed requires', async () => {
diff --git a/packages/cashscript/test/e2e/Announcement.test.ts b/packages/cashscript/test/e2e/Announcement.test.ts
index 9b5082ac..a097510f 100644
--- a/packages/cashscript/test/e2e/Announcement.test.ts
+++ b/packages/cashscript/test/e2e/Announcement.test.ts
@@ -1,17 +1,23 @@
-import { Contract, ElectrumNetworkProvider, MockNetworkProvider, Network } from '../../src/index.js';
+import { AuthenticationErrorCommon } from '@bitauth/libauth';
+import {
+  Contract, ElectrumNetworkProvider, MockNetworkProvider, Network,
+} from '../../src/index.js';
 import { getTxOutputs } from '../test-util.js';
 import { FailedRequireError, Reason } from '../../src/Errors.js';
-import { createOpReturnOutput, randomUtxo, toRegExp, utxoComparator } from '../../src/utils.js';
+import {
+  createOpReturnOutput, randomUtxo, toRegExp, utxoComparator,
+} from '../../src/utils.js';
 import { aliceAddress } from '../fixture/vars.js';
 import artifact from '../fixture/announcement.json' assert { type: "json" };
-import { AuthenticationErrorCommon } from '@bitauth/libauth';
 
 describe('Announcement', () => {
   let announcement: Contract;
   const minerFee = 1000n;
 
   beforeAll(() => {
-    const provider = process.env.TESTS_USE_MOCKNET ? new MockNetworkProvider() : new ElectrumNetworkProvider(Network.CHIPNET);
+    const provider = process.env.TESTS_USE_MOCKNET
+      ? new MockNetworkProvider()
+      : new ElectrumNetworkProvider(Network.CHIPNET);
     announcement = new Contract(artifact, [], { provider });
     console.log(announcement.address);
     (provider as any).addUtxo?.(announcement.address, randomUtxo());
diff --git a/packages/cashscript/test/e2e/BigInt.test.ts b/packages/cashscript/test/e2e/BigInt.test.ts
index cabeba25..7fbe1fa0 100644
--- a/packages/cashscript/test/e2e/BigInt.test.ts
+++ b/packages/cashscript/test/e2e/BigInt.test.ts
@@ -1,3 +1,4 @@
+import { AuthenticationErrorCommon } from '@bitauth/libauth';
 import {
   Contract,
   MockNetworkProvider,
@@ -9,9 +10,7 @@ import {
 } from '../../src/index.js';
 import { getTxOutputs } from '../test-util.js';
 import artifact from '../fixture/bigint.json' assert { type: "json" };
-import { AuthenticationErrorCommon } from '@bitauth/libauth';
 import { randomUtxo, toRegExp } from '../../src/utils.js';
-import { aliceAddress, bobAddress } from '../fixture/vars.js';
 
 describe('BigInt', () => {
   let bigintContract: Contract;
@@ -19,7 +18,9 @@ describe('BigInt', () => {
   const MAX_INT64 = BigInt('9223372036854775807');
 
   beforeAll(() => {
-    const provider = process.env.TESTS_USE_MOCKNET ? new MockNetworkProvider() : new ElectrumNetworkProvider(Network.CHIPNET);
+    const provider = process.env.TESTS_USE_MOCKNET
+      ? new MockNetworkProvider()
+      : new ElectrumNetworkProvider(Network.CHIPNET);
     bigintContract = new Contract(artifact, [], { provider });
     console.log(bigintContract.address);
     (provider as any).addUtxo?.(bigintContract.address, randomUtxo());
diff --git a/packages/cashscript/test/e2e/HodlVault.test.ts b/packages/cashscript/test/e2e/HodlVault.test.ts
index 909cadf4..0711a695 100644
--- a/packages/cashscript/test/e2e/HodlVault.test.ts
+++ b/packages/cashscript/test/e2e/HodlVault.test.ts
@@ -1,3 +1,4 @@
+import { AuthenticationErrorCommon } from '@bitauth/libauth';
 import {
   Contract,
   SignatureTemplate,
@@ -14,14 +15,15 @@ import {
 import { getTxOutputs } from '../test-util.js';
 import { FailedRequireError, Reason } from '../../src/Errors.js';
 import artifact from '../fixture/hodl_vault.json' assert { type: "json" };
-import { AuthenticationErrorCommon } from '@bitauth/libauth';
 import { randomUtxo, toRegExp } from '../../src/utils.js';
 
 describe('HodlVault', () => {
   let hodlVault: Contract;
 
   beforeAll(() => {
-    const provider = process.env.TESTS_USE_MOCKNET ? new MockNetworkProvider() : new ElectrumNetworkProvider(Network.CHIPNET);
+    const provider = process.env.TESTS_USE_MOCKNET
+      ? new MockNetworkProvider()
+      : new ElectrumNetworkProvider(Network.CHIPNET);
     hodlVault = new Contract(artifact, [alicePub, oraclePub, 99000n, 30000n], { provider });
     console.log(hodlVault.address);
     (provider as any).addUtxo?.(hodlVault.address, randomUtxo());
diff --git a/packages/cashscript/test/e2e/Mecenas.test.ts b/packages/cashscript/test/e2e/Mecenas.test.ts
index 2adfa391..158c08b5 100644
--- a/packages/cashscript/test/e2e/Mecenas.test.ts
+++ b/packages/cashscript/test/e2e/Mecenas.test.ts
@@ -1,4 +1,7 @@
-import { Contract, ElectrumNetworkProvider, MockNetworkProvider, Network } from '../../src/index.js';
+import { AuthenticationErrorCommon } from '@bitauth/libauth';
+import {
+  Contract, ElectrumNetworkProvider, MockNetworkProvider, Network,
+} from '../../src/index.js';
 import {
   alicePkh,
   bobPkh,
@@ -8,7 +11,6 @@ import {
 import { getTxOutputs } from '../test-util.js';
 import { FailedRequireError, Reason } from '../../src/Errors.js';
 import artifact from '../fixture/mecenas.json' assert { type: "json" };
-import { AuthenticationErrorCommon } from '@bitauth/libauth';
 import { randomUtxo, toRegExp } from '../../src/utils.js';
 
 // Mecenas has tx.age check omitted for testing
@@ -18,7 +20,9 @@ describe('Mecenas', () => {
   const minerFee = 1000n;
 
   beforeAll(() => {
-    const provider = process.env.TESTS_USE_MOCKNET ? new MockNetworkProvider() : new ElectrumNetworkProvider(Network.CHIPNET);
+    const provider = process.env.TESTS_USE_MOCKNET
+      ? new MockNetworkProvider()
+      : new ElectrumNetworkProvider(Network.CHIPNET);
     mecenas = new Contract(artifact, [alicePkh, bobPkh, pledge], { provider });
     console.log(mecenas.address);
     (provider as any).addUtxo?.(mecenas.address, randomUtxo());
diff --git a/packages/cashscript/test/e2e/P2PKH-tokens.test.ts b/packages/cashscript/test/e2e/P2PKH-tokens.test.ts
index 0969ff1e..e280a30b 100644
--- a/packages/cashscript/test/e2e/P2PKH-tokens.test.ts
+++ b/packages/cashscript/test/e2e/P2PKH-tokens.test.ts
@@ -1,4 +1,7 @@
-import { Contract, SignatureTemplate, ElectrumNetworkProvider, MockNetworkProvider } from '../../src/index.js';
+import { randomUtxo, randomToken, randomNFT } from 'cashscript/src/utils.js';
+import {
+  Contract, SignatureTemplate, ElectrumNetworkProvider, MockNetworkProvider,
+} from '../../src/index.js';
 import {
   alicePkh,
   alicePub,
@@ -7,24 +10,43 @@ import {
 import { getTxOutputs } from '../test-util.js';
 import { Network, TokenDetails, Utxo } from '../../src/interfaces.js';
 import artifact from '../fixture/p2pkh.json' assert { type: "json" };
-import { randomUtxo, randomToken, randomNFT } from 'cashscript/src/utils.js';
 
 describe('P2PKH-tokens', () => {
   let p2pkhInstance: Contract;
 
   beforeAll(() => {
-    const provider = process.env.TESTS_USE_MOCKNET ? new MockNetworkProvider() : new ElectrumNetworkProvider(Network.CHIPNET);
+    const provider = process.env.TESTS_USE_MOCKNET
+      ? new MockNetworkProvider()
+      : new ElectrumNetworkProvider(Network.CHIPNET);
     p2pkhInstance = new Contract(artifact, [alicePkh], { provider });
     console.log(p2pkhInstance.tokenAddress);
     (provider as any).addUtxo?.(p2pkhInstance.address, randomUtxo());
     (provider as any).addUtxo?.(p2pkhInstance.address, randomUtxo());
-    (provider as any).addUtxo?.(p2pkhInstance.address, randomUtxo({vout: 0}));
-    (provider as any).addUtxo?.(p2pkhInstance.address, randomUtxo({satoshis: 1000n, token: randomToken()}));
-    (provider as any).addUtxo?.(p2pkhInstance.address, randomUtxo({satoshis: 1000n, token: randomToken()}));
-    (provider as any).addUtxo?.(p2pkhInstance.address, randomUtxo({satoshis: 1000n, token: randomNFT()}));
-    (provider as any).addUtxo?.(p2pkhInstance.address, randomUtxo({satoshis: 1000n, token: randomNFT()}));
-    (provider as any).addUtxo?.(p2pkhInstance.address, randomUtxo({satoshis: 1000n, token: {...randomNFT(), ...randomToken()}}));
-    (provider as any).addUtxo?.(p2pkhInstance.address, randomUtxo({satoshis: 1000n, token: {...randomToken(), ...randomNFT()}}));
+    (provider as any).addUtxo?.(p2pkhInstance.address, randomUtxo({ vout: 0 }));
+    (provider as any).addUtxo?.(p2pkhInstance.address, randomUtxo({
+      satoshis: 1000n,
+      token: randomToken(),
+    }));
+    (provider as any).addUtxo?.(p2pkhInstance.address, randomUtxo({
+      satoshis: 1000n,
+      token: randomToken(),
+    }));
+    (provider as any).addUtxo?.(p2pkhInstance.address, randomUtxo({
+      satoshis: 1000n,
+      token: randomNFT(),
+    }));
+    (provider as any).addUtxo?.(p2pkhInstance.address, randomUtxo({
+      satoshis: 1000n,
+      token: randomNFT(),
+    }));
+    (provider as any).addUtxo?.(p2pkhInstance.address, randomUtxo({
+      satoshis: 1000n,
+      token: { ...randomNFT(), ...randomToken() },
+    }));
+    (provider as any).addUtxo?.(p2pkhInstance.address, randomUtxo({
+      satoshis: 1000n,
+      token: { ...randomToken(), ...randomNFT() },
+    }));
   });
 
   describe('send (tokens)', () => {
diff --git a/packages/cashscript/test/e2e/P2PKH.test.ts b/packages/cashscript/test/e2e/P2PKH.test.ts
index d8f59544..e7b562ef 100644
--- a/packages/cashscript/test/e2e/P2PKH.test.ts
+++ b/packages/cashscript/test/e2e/P2PKH.test.ts
@@ -1,5 +1,7 @@
 import { AuthenticationErrorCommon, binToHex } from '@bitauth/libauth';
-import { Contract, SignatureTemplate, MockNetworkProvider, ElectrumNetworkProvider } from '../../src/index.js';
+import {
+  Contract, SignatureTemplate, MockNetworkProvider, ElectrumNetworkProvider,
+} from '../../src/index.js';
 import {
   bobAddress,
   bobPub,
@@ -9,14 +11,18 @@ import {
 } from '../fixture/vars.js';
 import { getTxOutputs } from '../test-util.js';
 import { Network, Utxo } from '../../src/interfaces.js';
-import { createOpReturnOutput, randomUtxo, toRegExp, utxoComparator } from '../../src/utils.js';
+import {
+  createOpReturnOutput, randomUtxo, toRegExp, utxoComparator,
+} from '../../src/utils.js';
 import { FailedSigCheckError, Reason } from '../../src/Errors.js';
 import artifact from '../fixture/p2pkh.json' assert { type: "json" };
 
 describe('P2PKH-no-tokens', () => {
   let p2pkhInstance: Contract;
 
-  const provider = process.env.TESTS_USE_MOCKNET ? new MockNetworkProvider() : new ElectrumNetworkProvider(Network.CHIPNET);
+  const provider = process.env.TESTS_USE_MOCKNET
+    ? new MockNetworkProvider()
+    : new ElectrumNetworkProvider(Network.CHIPNET);
 
   beforeAll(() => {
     // Note: We instantiate the contract with bobPkh to avoid mempool conflicts with other (P2PKH tokens) tests
@@ -42,7 +48,7 @@ describe('P2PKH-no-tokens', () => {
       await expect(txPromise).rejects.toThrow(FailedSigCheckError);
       await expect(txPromise).rejects.toThrow(toRegExp([
         Reason.SIG_NULLFAIL,
-        AuthenticationErrorCommon.nonNullSignatureFailure
+        AuthenticationErrorCommon.nonNullSignatureFailure,
       ]));
     });
 
diff --git a/packages/cashscript/test/e2e/TransferWithTimeout.test.ts b/packages/cashscript/test/e2e/TransferWithTimeout.test.ts
index 2d629d7f..89f667bc 100644
--- a/packages/cashscript/test/e2e/TransferWithTimeout.test.ts
+++ b/packages/cashscript/test/e2e/TransferWithTimeout.test.ts
@@ -1,3 +1,4 @@
+import { AuthenticationErrorCommon } from '@bitauth/libauth';
 import {
   Contract,
   SignatureTemplate,
@@ -12,14 +13,15 @@ import { getTxOutputs } from '../test-util.js';
 import { FailedSigCheckError, Reason, FailedTimeCheckError } from '../../src/Errors.js';
 import artifact from '../fixture/transfer_with_timeout.json' assert { type: "json" };
 import { randomUtxo, toRegExp } from '../../src/utils.js';
-import { AuthenticationErrorCommon } from '@bitauth/libauth';
 
 describe('TransferWithTimeout', () => {
   let twtInstancePast: Contract;
   let twtInstanceFuture: Contract;
 
   beforeAll(() => {
-    const provider = process.env.TESTS_USE_MOCKNET ? new MockNetworkProvider() : new ElectrumNetworkProvider(Network.CHIPNET);
+    const provider = process.env.TESTS_USE_MOCKNET
+      ? new MockNetworkProvider()
+      : new ElectrumNetworkProvider(Network.CHIPNET);
     twtInstancePast = new Contract(artifact, [alicePub, bobPub, 100000n], { provider });
     twtInstanceFuture = new Contract(artifact, [alicePub, bobPub, 2000000n], { provider });
     console.log(twtInstancePast.address);
@@ -45,7 +47,7 @@ describe('TransferWithTimeout', () => {
       await expect(txPromise).rejects.toThrow(FailedSigCheckError);
       await expect(txPromise).rejects.toThrow(toRegExp([
         Reason.SIG_NULLFAIL,
-        AuthenticationErrorCommon.nonNullSignatureFailure
+        AuthenticationErrorCommon.nonNullSignatureFailure,
       ]));
     });
 
@@ -64,7 +66,7 @@ describe('TransferWithTimeout', () => {
       await expect(txPromise).rejects.toThrow(FailedSigCheckError);
       await expect(txPromise).rejects.toThrow(toRegExp([
         Reason.SIG_NULLFAIL,
-        AuthenticationErrorCommon.nonNullSignatureFailure
+        AuthenticationErrorCommon.nonNullSignatureFailure,
       ]));
     });
 
@@ -83,7 +85,7 @@ describe('TransferWithTimeout', () => {
       await expect(txPromise).rejects.toThrow(FailedTimeCheckError);
       await expect(txPromise).rejects.toThrow(toRegExp([
         Reason.UNSATISFIED_LOCKTIME,
-        AuthenticationErrorCommon.unsatisfiedLocktime
+        AuthenticationErrorCommon.unsatisfiedLocktime,
       ]));
     });
 
diff --git a/packages/cashscript/test/e2e/misc.test.ts b/packages/cashscript/test/e2e/misc.test.ts
index 67228637..a7808fdb 100644
--- a/packages/cashscript/test/e2e/misc.test.ts
+++ b/packages/cashscript/test/e2e/misc.test.ts
@@ -1,10 +1,14 @@
-import { Contract, MockNetworkProvider, ElectrumNetworkProvider, Network } from '../../src/index.js';
+import { randomUtxo } from 'cashscript/src/utils.js';
+import {
+  Contract, MockNetworkProvider, ElectrumNetworkProvider, Network,
+} from '../../src/index.js';
 import { getTxOutputs } from '../test-util.js';
 import artifact from '../fixture/simple_covenant.json' assert { type: "json" };
-import { randomUtxo } from 'cashscript/src/utils.js';
 
 describe('Simple Covenant', () => {
-  const provider = process.env.TESTS_USE_MOCKNET ? new MockNetworkProvider() : new ElectrumNetworkProvider(Network.CHIPNET);
+  const provider = process.env.TESTS_USE_MOCKNET
+    ? new MockNetworkProvider()
+    : new ElectrumNetworkProvider(Network.CHIPNET);
   let covenant: Contract;
 
   beforeAll(() => {
@@ -29,7 +33,9 @@ describe('Simple Covenant', () => {
 
     it('should succeed with bip68 relative timelock', async () => {
       // given
+      // eslint-disable-next-line
       const provider = new ElectrumNetworkProvider(Network.CHIPNET);
+      // eslint-disable-next-line
       const covenant = new Contract(artifact, [], { provider });
 
       const to = covenant.address;
diff --git a/packages/cashscript/test/e2e/old/Mecenas.test.ts b/packages/cashscript/test/e2e/old/Mecenas.test.ts
index e6265596..9cae052b 100644
--- a/packages/cashscript/test/e2e/old/Mecenas.test.ts
+++ b/packages/cashscript/test/e2e/old/Mecenas.test.ts
@@ -18,92 +18,90 @@ import { FailedRequireError, Reason } from '../../../src/Errors.js';
 import artifact from '../../fixture/old/mecenas.json' assert { type: "json" };
 
 if (!process.env.TESTS_USE_MOCKNET) {
-
 // Mecenas has tx.age check omitted for testing
-describe('v0.6.0 - Mecenas', () => {
-  let mecenas: Contract;
-  const pledge = 10000n;
-  const minerFee = 1000n;
-
-  beforeAll(() => {
-    const provider = new ElectrumNetworkProvider(Network.CHIPNET);
-    const addressType = 'p2sh20';
-    mecenas = new Contract(artifact, [alicePkh, bobPkh, pledge], { provider, addressType });
-    console.log(mecenas.address);
-  });
-
-  describe('send', () => {
-    it('should fail when trying to send more than pledge', async () => {
-      // given
-      const to = aliceAddress;
-      const amount = pledge + 10n;
-
-      // when
-      const txPromise = mecenas.functions
-        .receive(alicePub, new SignatureTemplate(alicePriv, HashType.SIGHASH_ALL))
-        .to(to, amount)
-        .withHardcodedFee(minerFee)
-        .send();
-
-      // then
-      await expect(txPromise).rejects.toThrow(FailedRequireError);
-      await expect(txPromise).rejects.toThrow(Reason.EQUALVERIFY);
+  describe('v0.6.0 - Mecenas', () => {
+    let mecenas: Contract;
+    const pledge = 10000n;
+    const minerFee = 1000n;
+
+    beforeAll(() => {
+      const provider = new ElectrumNetworkProvider(Network.CHIPNET);
+      const addressType = 'p2sh20';
+      mecenas = new Contract(artifact, [alicePkh, bobPkh, pledge], { provider, addressType });
+      console.log(mecenas.address);
     });
 
-    it('should fail when trying to send to wrong person', async () => {
+    describe('send', () => {
+      it('should fail when trying to send more than pledge', async () => {
       // given
-      const to = bobAddress;
-      const amount = pledge;
-
-      // when
-      const txPromise = mecenas.functions
-        .receive(alicePub, new SignatureTemplate(alicePriv, HashType.SIGHASH_ALL))
-        .to(to, amount)
-        .withHardcodedFee(minerFee)
-        .send();
-
-      // then
-      await expect(txPromise).rejects.toThrow(FailedRequireError);
-      await expect(txPromise).rejects.toThrow(Reason.EQUALVERIFY);
-    });
-
-    it('should fail when trying to send to multiple people', async () => {
+        const to = aliceAddress;
+        const amount = pledge + 10n;
+
+        // when
+        const txPromise = mecenas.functions
+          .receive(alicePub, new SignatureTemplate(alicePriv, HashType.SIGHASH_ALL))
+          .to(to, amount)
+          .withHardcodedFee(minerFee)
+          .send();
+
+        // then
+        await expect(txPromise).rejects.toThrow(FailedRequireError);
+        await expect(txPromise).rejects.toThrow(Reason.EQUALVERIFY);
+      });
+
+      it('should fail when trying to send to wrong person', async () => {
       // given
-      const to = aliceAddress;
-      const amount = pledge;
-
-      // when
-      const txPromise = mecenas.functions
-        .receive(alicePub, new SignatureTemplate(alicePriv, HashType.SIGHASH_ALL))
-        .to(to, amount)
-        .to(to, amount)
-        .withHardcodedFee(minerFee)
-        .send();
-
-      // then
-      await expect(txPromise).rejects.toThrow(FailedRequireError);
-      await expect(txPromise).rejects.toThrow(Reason.EQUALVERIFY);
-    });
-
-    it('should succeed when sending pledge to receiver', async () => {
+        const to = bobAddress;
+        const amount = pledge;
+
+        // when
+        const txPromise = mecenas.functions
+          .receive(alicePub, new SignatureTemplate(alicePriv, HashType.SIGHASH_ALL))
+          .to(to, amount)
+          .withHardcodedFee(minerFee)
+          .send();
+
+        // then
+        await expect(txPromise).rejects.toThrow(FailedRequireError);
+        await expect(txPromise).rejects.toThrow(Reason.EQUALVERIFY);
+      });
+
+      it('should fail when trying to send to multiple people', async () => {
       // given
-      const to = aliceAddress;
-      const amount = pledge;
-
-      // when
-      const tx = await mecenas.functions
-        .receive(alicePub, new SignatureTemplate(alicePriv, HashType.SIGHASH_ALL))
-        .to(to, amount)
-        .withHardcodedFee(minerFee)
-        .send();
-
-      // then
-      const txOutputs = getTxOutputs(tx);
-      expect(txOutputs).toEqual(expect.arrayContaining([{ to, amount }]));
+        const to = aliceAddress;
+        const amount = pledge;
+
+        // when
+        const txPromise = mecenas.functions
+          .receive(alicePub, new SignatureTemplate(alicePriv, HashType.SIGHASH_ALL))
+          .to(to, amount)
+          .to(to, amount)
+          .withHardcodedFee(minerFee)
+          .send();
+
+        // then
+        await expect(txPromise).rejects.toThrow(FailedRequireError);
+        await expect(txPromise).rejects.toThrow(Reason.EQUALVERIFY);
+      });
+
+      it('should succeed when sending pledge to receiver', async () => {
+      // given
+        const to = aliceAddress;
+        const amount = pledge;
+
+        // when
+        const tx = await mecenas.functions
+          .receive(alicePub, new SignatureTemplate(alicePriv, HashType.SIGHASH_ALL))
+          .to(to, amount)
+          .withHardcodedFee(minerFee)
+          .send();
+
+        // then
+        const txOutputs = getTxOutputs(tx);
+        expect(txOutputs).toEqual(expect.arrayContaining([{ to, amount }]));
+      });
     });
   });
-});
-
 } else {
   test.skip('skip', () => {});
-}
\ No newline at end of file
+}
diff --git a/packages/cashscript/test/e2e/old/misc.test.ts b/packages/cashscript/test/e2e/old/misc.test.ts
index bafde66d..23c2adb7 100644
--- a/packages/cashscript/test/e2e/old/misc.test.ts
+++ b/packages/cashscript/test/e2e/old/misc.test.ts
@@ -17,65 +17,63 @@ import simpleCovenantArtifact from '../../fixture/old/simple_covenant.json' asse
 import mecenasBorderArtifact from '../../fixture/old/mecenas_border.json' assert { type: "json" };
 
 if (!process.env.TESTS_USE_MOCKNET) {
+  describe('v0.6.0 - Simple Covenant', () => {
+    let covenant: Contract;
 
-describe('v0.6.0 - Simple Covenant', () => {
-  let covenant: Contract;
-
-  beforeAll(() => {
-    const provider = new ElectrumNetworkProvider(Network.CHIPNET);
-    const addressType = 'p2sh20';
-    covenant = new Contract(simpleCovenantArtifact, [], { provider, addressType });
-    console.log(covenant.address);
-  });
+    beforeAll(() => {
+      const provider = new ElectrumNetworkProvider(Network.CHIPNET);
+      const addressType = 'p2sh20';
+      covenant = new Contract(simpleCovenantArtifact, [], { provider, addressType });
+      console.log(covenant.address);
+    });
 
-  describe('send', () => {
-    it('should succeed', async () => {
+    describe('send', () => {
+      it('should succeed', async () => {
       // given
-      const to = covenant.address;
-      const amount = 1000n;
+        const to = covenant.address;
+        const amount = 1000n;
 
-      // when
-      const tx = await covenant.functions
-        .spend(alicePub, new SignatureTemplate(alicePriv, HashType.SIGHASH_ALL))
-        .to(to, amount)
-        .send();
+        // when
+        const tx = await covenant.functions
+          .spend(alicePub, new SignatureTemplate(alicePriv, HashType.SIGHASH_ALL))
+          .to(to, amount)
+          .send();
 
-      // then
-      const txOutputs = getTxOutputs(tx);
-      expect(txOutputs).toEqual(expect.arrayContaining([{ to, amount }]));
+        // then
+        const txOutputs = getTxOutputs(tx);
+        expect(txOutputs).toEqual(expect.arrayContaining([{ to, amount }]));
+      });
     });
   });
-});
 
-describe('v0.6.0 - Bytecode VarInt Border Mecenas', () => {
-  let mecenas: Contract;
-  const pledge = 10000n;
+  describe('v0.6.0 - Bytecode VarInt Border Mecenas', () => {
+    let mecenas: Contract;
+    const pledge = 10000n;
 
-  beforeAll(() => {
-    const provider = new ElectrumNetworkProvider(Network.CHIPNET);
-    const addressType = 'p2sh20';
-    mecenas = new Contract(mecenasBorderArtifact, [alicePkh, bobPkh, pledge], { provider, addressType });
-    console.log(mecenas.address);
-  });
+    beforeAll(() => {
+      const provider = new ElectrumNetworkProvider(Network.CHIPNET);
+      const addressType = 'p2sh20';
+      mecenas = new Contract(mecenasBorderArtifact, [alicePkh, bobPkh, pledge], { provider, addressType });
+      console.log(mecenas.address);
+    });
 
-  it('should succeed when sending pledge to receiver', async () => {
+    it('should succeed when sending pledge to receiver', async () => {
     // given
-    const to = aliceAddress;
-    const amount = pledge;
+      const to = aliceAddress;
+      const amount = pledge;
 
-    // when
-    const tx = await mecenas.functions
-      .receive(alicePub, new SignatureTemplate(alicePriv, HashType.SIGHASH_ALL))
-      .to(to, amount)
-      .withHardcodedFee(1000n)
-      .send();
+      // when
+      const tx = await mecenas.functions
+        .receive(alicePub, new SignatureTemplate(alicePriv, HashType.SIGHASH_ALL))
+        .to(to, amount)
+        .withHardcodedFee(1000n)
+        .send();
 
-    // then
-    const txOutputs = getTxOutputs(tx);
-    expect(txOutputs).toEqual(expect.arrayContaining([{ to, amount }]));
+      // then
+      const txOutputs = getTxOutputs(tx);
+      expect(txOutputs).toEqual(expect.arrayContaining([{ to, amount }]));
+    });
   });
-});
-
 } else {
   test.skip('skip', () => {});
-}
\ No newline at end of file
+}

From 4cd29784dc33d872caa67e120e474e4393494fea Mon Sep 17 00:00:00 2001
From: mainnet-pat <mainnet_pat@protonmail.com>
Date: Sat, 25 Nov 2023 18:48:52 +0000
Subject: [PATCH 014/171] Lint LibauthTemplate

---
 packages/cashscript/src/LibauthTemplate.ts | 416 +++++++++++----------
 1 file changed, 212 insertions(+), 204 deletions(-)

diff --git a/packages/cashscript/src/LibauthTemplate.ts b/packages/cashscript/src/LibauthTemplate.ts
index 9314bd53..c5bbf1d7 100644
--- a/packages/cashscript/src/LibauthTemplate.ts
+++ b/packages/cashscript/src/LibauthTemplate.ts
@@ -1,5 +1,6 @@
-import { Contract } from "./Contract.js";
-import { AbiFunction, Artifact, PrimitiveType, asmToScript, decodeBool, decodeInt, decodeString, formatLibauthScript } from "@cashscript/utils";
+import {
+  AbiFunction, Artifact, PrimitiveType, asmToScript, decodeBool, decodeInt, decodeString, formatLibauthScript,
+} from '@cashscript/utils';
 import {
   hash160,
   hexToBin,
@@ -19,8 +20,12 @@ import {
   utf8ToBin,
   isHex,
   AuthenticationProgramStateBCHCHIPs,
-} from "@bitauth/libauth";
-import { deflate } from "pako";
+  AuthenticationProgramCommon,
+  AuthenticationVirtualMachine,
+  ResolvedTransactionCommon,
+} from '@bitauth/libauth';
+import { deflate } from 'pako';
+import { Contract } from './Contract.js';
 import {
   UtxoP2PKH,
   LibauthOutput,
@@ -28,35 +33,32 @@ import {
   Network,
   Utxo,
   isUtxoP2PKH,
-} from "../src/interfaces.js";
-import { Argument, encodeArgument as csEncodeArgument } from "./Argument.js";
-import SignatureTemplate from "./SignatureTemplate.js";
-import { Transaction } from "./Transaction.js";
+} from '../src/interfaces.js';
+import { Argument, encodeArgument as csEncodeArgument } from './Argument.js';
+import SignatureTemplate from './SignatureTemplate.js';
+import { Transaction } from './Transaction.js';
 
 // all bitauth variables must be in snake case
-const snakeCase = (str: string): string => {
-  return (
-    str &&
-    str
+const snakeCase = (str: string): string => (
+  str
+    && str
       .match(
-        /[A-Z]{2,}(?=[A-Z][a-z]+[0-9]*|\b)|[A-Z]?[a-z]+[0-9]*|[A-Z]|[0-9]+/g
+        /[A-Z]{2,}(?=[A-Z][a-z]+[0-9]*|\b)|[A-Z]?[a-z]+[0-9]*|[A-Z]|[0-9]+/g,
       )!
       .map((s) => s.toLowerCase())
-      .join("_")
-  );
-}
-const merge = (array: any): any =>
-  array.reduce(
-    (prev: any, cur: any) => ({
-      ...prev,
-      ...{ [Object.keys(cur)[0]]: cur[Object.keys(cur)[0]] },
-    }),
-    {}
-  );
+      .join('_')
+);
+const merge = (array: any): any => array.reduce(
+  (prev: any, cur: any) => ({
+    ...prev,
+    ...{ [Object.keys(cur)[0]]: cur[Object.keys(cur)[0]] },
+  }),
+  {},
+);
 
 const encodeArgument = (
   argument: Argument,
-  typeStr: string
+  typeStr: string,
 ): Uint8Array | SignatureTemplate => {
   if (typeStr === PrimitiveType.INT && argument === 0n) {
     return Uint8Array.from([0]);
@@ -65,23 +67,21 @@ const encodeArgument = (
 };
 
 // stringify version which can serialize otherwise unsupported types
-export const stringify = (any: any, spaces?: number): string =>
-  JSON.stringify(
-    any,
-    (_, v) => {
-      if (typeof v === "bigint") {
-        return `${v.toString()}`;
-      }
-      if (v instanceof Uint8Array) {
-        return `${binToHex(v)}`;
-      }
-      return v;
-    },
-    spaces
-  );
+export const stringify = (any: any, spaces?: number): string => JSON.stringify(
+  any,
+  (_, v) => {
+    if (typeof v === 'bigint') {
+      return `${v.toString()}`;
+    }
+    if (v instanceof Uint8Array) {
+      return `${binToHex(v)}`;
+    }
+    return v;
+  },
+  spaces,
+);
 
-const zip = (a: any[], b: any[]) =>
-  Array.from(Array(Math.max(b.length, a.length)), (_, i) => [a[i], b[i]]);
+const zip = (a: any[], b: any[]): any[] => Array.from(Array(Math.max(b.length, a.length)), (_, i) => [a[i], b[i]]);
 
 export const buildTemplate = async ({
   contract,
@@ -105,7 +105,7 @@ export const buildTemplate = async ({
   const txHex = transactionHex ?? await transaction.build();
 
   const libauthTransaction = decodeTransaction(hexToBin(txHex));
-  if (typeof libauthTransaction === "string") {
+  if (typeof libauthTransaction === 'string') {
     throw Error(libauthTransaction);
   }
 
@@ -117,7 +117,7 @@ export const buildTemplate = async ({
   const abiFunction = (transaction as any).abiFunction as AbiFunction;
   const funcName = abiFunction.name;
   const functionIndex = contract.artifact.abi.findIndex(
-    (val) => val.name === funcName
+    (val) => val.name === funcName,
   )!;
   const func: AbiFunction = contract.artifact.abi[functionIndex];
   const functionInputs = func.inputs.slice().reverse();
@@ -126,68 +126,66 @@ export const buildTemplate = async ({
     .reverse();
 
   const hasSignatureTemplates = ((transaction as any).inputs as Utxo[]).filter(
-    (val) => isUtxoP2PKH(val)
+    (val) => isUtxoP2PKH(val),
   ).length;
 
-    const formattedBytecode =
-    contract.artifact.debug ?
-      formatLibauthScript(asmToScript(contract.artifact.debug.bytecode), contract.artifact.debug?.sourceMap!, contract.artifact.source).split("\n") :
-      contract.artifact.bytecode.split(" ").map((val) => {
-        if (isHex(val)) {
-          return `<0x${val}>`
-        } else {
-          return val;
-        }
-      });
+  const formattedBytecode = contract.artifact.debug
+    ? formatLibauthScript(asmToScript(contract.artifact.debug.bytecode), contract.artifact.debug?.sourceMap!, contract.artifact.source).split('\n')
+    : contract.artifact.bytecode.split(' ').map((val) => {
+      if (isHex(val)) {
+        return `<0x${val}>`;
+      }
+      return val;
+    });
 
   return {
-    $schema: "https://ide.bitauth.com/authentication-template-v0.schema.json",
+    $schema: 'https://ide.bitauth.com/authentication-template-v0.schema.json',
     description: `Imported from cashscript${
-      includeSource ? contract.artifact.source : ""
+      includeSource ? contract.artifact.source : ''
     }`,
     name: contract.artifact.contractName,
     entities: {
       parameters: {
-        description: "Contract creation and function parameters",
-        name: "parameters",
+        description: 'Contract creation and function parameters',
+        name: 'parameters',
         scripts: [
-          "lock",
-          "unlock_lock",
+          'lock',
+          'unlock_lock',
           ...(hasSignatureTemplates
-            ? ["p2pkh_placeholder_lock", "p2pkh_placeholder_unlock"]
+            ? ['p2pkh_placeholder_lock', 'p2pkh_placeholder_unlock']
             : []),
         ],
         variables: merge([
           ...(hasSignatureTemplates
             ? [
-                {
-                  placeholder_key: {
-                    description: "placeholder_key",
-                    name: "placeholder_key",
-                    type: "Key",
-                  },
+              {
+                placeholder_key: {
+                  description: 'placeholder_key',
+                  name: 'placeholder_key',
+                  type: 'Key',
                 },
-              ]
+              },
+            ]
             : []),
           {
             function_index: {
-              description: "Script function index to execute",
-              name: "function_index",
-              type: "WalletData",
+              description: 'Script function index to execute',
+              name: 'function_index',
+              type: 'WalletData',
             },
           },
           ...constructorInputs.map((input) => ({
             [snakeCase(input.name)]: {
               description: `"${input.name}" parameter of this contract`,
               name: input.name,
-              type: "WalletData",
+              type: 'WalletData',
             },
           })),
           ...functionInputs.map((input) => ({
             [snakeCase(input.name)]: {
               description: `"${input.name}" parameter of function "${func.name}"`,
               name: input.name,
-              type: input.type === PrimitiveType.SIG ? "Key" : "WalletData",
+              type: input.type === PrimitiveType.SIG ? 'Key' : 'WalletData',
             },
           })),
         ]),
@@ -211,8 +209,8 @@ export const buildTemplate = async ({
               const hex = binToHex(
                 encodeArgument(
                   contractParameters[index],
-                  constructorInputs[index].type
-                ) as Uint8Array
+                  constructorInputs[index].type,
+                ) as Uint8Array,
               );
               const result = hex.length ? `0x${hex}` : hex;
               return {
@@ -226,31 +224,29 @@ export const buildTemplate = async ({
             privateKeys: merge([
               ...(hasSignatureTemplates
                 ? [
-                    {
-                      placeholder_key:
-                        "<Uint8Array: 0x0000000000000000000000000000000000000000000000000000000000000000>",
-                    },
-                  ]
+                  {
+                    placeholder_key:
+                        '<Uint8Array: 0x0000000000000000000000000000000000000000000000000000000000000000>',
+                  },
+                ]
                 : []),
               ...zip(functionInputs, args)
                 .filter(([input]) => input.type === PrimitiveType.SIG)
-                .map(([input, arg]) => {
-                  return {
-                    [snakeCase(input.name)]: binToHex(
-                      manglePrivateKeys
-                        ? (arg as SignatureTemplate)
-                            .getPublicKey()
-                            .slice(0, 32)
-                            .slice(0, 32)
-                        : (arg as SignatureTemplate | any).privateKey
-                    ),
-                  };
-                }),
+                .map(([input, arg]) => ({
+                  [snakeCase(input.name)]: binToHex(
+                    manglePrivateKeys
+                      ? (arg as SignatureTemplate)
+                        .getPublicKey()
+                        .slice(0, 32)
+                        .slice(0, 32)
+                      : (arg as SignatureTemplate | any).privateKey,
+                  ),
+                })),
             ]),
           },
         },
         transaction: [libauthTransaction].map((val: TransactionBCH) => {
-          const result = {} as AuthenticationTemplateScenario["transaction"];
+          const result = {} as AuthenticationTemplateScenario['transaction'];
           let inputSlotInserted = false;
           result!.inputs = val!.inputs!.map((input, index) => {
             const csInput = (transaction as any).inputs[index] as Utxo;
@@ -258,17 +254,17 @@ export const buildTemplate = async ({
             let unlockingBytecode = {};
             if (signable) {
               unlockingBytecode = {
-                script: "p2pkh_placeholder_unlock",
+                script: 'p2pkh_placeholder_unlock',
                 overrides: {
                   keys: {
                     privateKeys: {
                       placeholder_key: binToHex(
                         manglePrivateKeys
                           ? (csInput as UtxoP2PKH).template
-                              .getPublicKey()
-                              .slice(0, 32)
+                            .getPublicKey()
+                            .slice(0, 32)
                           : ((csInput as UtxoP2PKH).template as any)
-                              .privateKey
+                            .privateKey,
                       ),
                     },
                   },
@@ -276,8 +272,9 @@ export const buildTemplate = async ({
               };
             } else {
               // assume it is our contract's input
+              // eslint-disable-next-line
               if (!inputSlotInserted) {
-                unlockingBytecode = ["slot"];
+                unlockingBytecode = ['slot'];
                 inputSlotInserted = true;
               }
             }
@@ -288,7 +285,7 @@ export const buildTemplate = async ({
                   ? binToHex(input.outpointTransactionHash)
                   : input.outpointTransactionHash,
               sequenceNumber: input.sequenceNumber,
-              unlockingBytecode: unlockingBytecode,
+              unlockingBytecode,
             } as AuthenticationTemplateScenarioInput;
           });
           result!.locktime = val?.locktime;
@@ -296,8 +293,8 @@ export const buildTemplate = async ({
           result!.outputs = val?.outputs?.map(
             (output: LibauthOutput, index) => {
               const csOutput = (transaction as any).outputs[index] as Output;
-              let lockingBytecode: any = output.lockingBytecode;
-              if (typeof csOutput.to === "string") {
+              let { lockingBytecode }: any = output;
+              if (typeof csOutput.to === 'string') {
                 if (
                   [
                     contract.address,
@@ -310,20 +307,20 @@ export const buildTemplate = async ({
                     if (isUtxoP2PKH(csInput)) {
                       const inputPkh = hash160(csInput.template.getPublicKey());
                       if (
-                        binToHex(output.lockingBytecode).slice(6, 46) ===
-                        binToHex(inputPkh)
+                        binToHex(output.lockingBytecode).slice(6, 46)
+                        === binToHex(inputPkh)
                       ) {
                         lockingBytecode = {
-                          script: "p2pkh_placeholder_lock",
+                          script: 'p2pkh_placeholder_lock',
                           overrides: {
                             keys: {
                               privateKeys: {
                                 placeholder_key: binToHex(
                                   manglePrivateKeys
                                     ? csInput.template
-                                        .getPublicKey()
-                                        .slice(0, 32)
-                                    : (csInput.template as any).privateKey
+                                      .getPublicKey()
+                                      .slice(0, 32)
+                                    : (csInput.template as any).privateKey,
                                 ),
                               },
                             },
@@ -342,138 +339,145 @@ export const buildTemplate = async ({
                 token: output.token,
                 valueSatoshis: Number(output.valueSatoshis),
               } as AuthenticationTemplateScenarioTransactionOutput;
-            }
+            },
           );
           result!.version = libauthTransaction.version;
           return result;
-        })[0] as AuthenticationTemplateScenario["transaction"],
+        })[0] as AuthenticationTemplateScenario['transaction'],
         sourceOutputs: [transaction].map((val: Transaction) => {
           let inputSlotInserted = false;
           return ((val as any).inputs as Utxo[]).map(
-          (_, index) => {
-            const result = {} as
+            (_, index) => {
+              const result = {} as
               | AuthenticationTemplateScenarioSourceOutput
               | any;
-            const csInput = (transaction as any).inputs[index] as Utxo;
-            const signable = isUtxoP2PKH(csInput);
-            let unlockingBytecode = {};
-            if (signable) {
-              unlockingBytecode = {
-                script: "p2pkh_placeholder_lock",
-                overrides: {
-                  keys: {
-                    privateKeys: {
-                      placeholder_key: binToHex(
-                        manglePrivateKeys
-                          ? csInput.template.getPublicKey().slice(0, 32)
-                          : (csInput.template as any).privateKey
-                      ),
+              const csInput = (transaction as any).inputs[index] as Utxo;
+              const signable = isUtxoP2PKH(csInput);
+              let unlockingBytecode = {};
+              if (signable) {
+                unlockingBytecode = {
+                  script: 'p2pkh_placeholder_lock',
+                  overrides: {
+                    keys: {
+                      privateKeys: {
+                        placeholder_key: binToHex(
+                          manglePrivateKeys
+                            ? csInput.template.getPublicKey().slice(0, 32)
+                            : (csInput.template as any).privateKey,
+                        ),
+                      },
                     },
                   },
-                },
-              } as AuthenticationTemplateScenarioBytecode;
-            } else {
-              // assume it is our contract's input
-              if (!inputSlotInserted) {
-                unlockingBytecode = ["slot"];
-                inputSlotInserted = true;
+                } as AuthenticationTemplateScenarioBytecode;
+              } else {
+                // assume it is our contract's input
+                // eslint-disable-next-line
+                if (!inputSlotInserted) {
+                  unlockingBytecode = ['slot'];
+                  inputSlotInserted = true;
+                }
               }
-            }
 
-            result.lockingBytecode = unlockingBytecode;
-            result.valueSatoshis = Number(csInput.satoshis);
-            result.token = csInput.token;
-            return result;
-          });
+              result.lockingBytecode = unlockingBytecode;
+              result.valueSatoshis = Number(csInput.satoshis);
+              result.token = csInput.token;
+              return result;
+            },
+          );
         })[0],
         description:
-          "An example evaluation where this script execution passes.",
-        name: "Evaluate",
+          'An example evaluation where this script execution passes.',
+        name: 'Evaluate',
       },
     },
     scripts: {
       unlock_lock: {
-        passes: ["evaluate_function"],
-        name: "unlock",
+        passes: ['evaluate_function'],
+        name: 'unlock',
         script: [
           `// "${func.name}" function parameters`,
           ...(functionInputs.length
-            ? zip(functionInputs, args).map(([input, arg]) =>
-                input.type === PrimitiveType.SIG
-                  ? `<${snakeCase(
-                      input.name
-                    )}.schnorr_signature.all_outputs> // ${input.type}`
-                  : `<${snakeCase(input.name)}> // ${input.type} = <${
-                      "0x" + binToHex(arg)
-                    }>`
-              )
-            : ["// none"]),
-          "",
+            ? zip(functionInputs, args).map(([input, arg]) => (input.type === PrimitiveType.SIG
+              ? `<${snakeCase(
+                input.name,
+              )}.schnorr_signature.all_outputs> // ${input.type}`
+              : `<${snakeCase(input.name)}> // ${input.type} = <${
+                `0x${binToHex(arg)}`
+              }>`))
+            : ['// none']),
+          '',
 
           ...(contract.artifact.abi.length > 1
             ? [
-                "// function index in contract",
-                `<function_index> // int = <${functionIndex.toString()}>`,
-                "",
-              ]
+              '// function index in contract',
+              `<function_index> // int = <${functionIndex.toString()}>`,
+              '',
+            ]
             : []),
-        ].join("\n"),
-        unlocks: "lock",
+        ].join('\n'),
+        unlocks: 'lock',
       },
       lock: {
-        lockingType: "p2sh20",
-        name: "lock",
+        lockingType: 'p2sh20',
+        name: 'lock',
         script: [
           `// "${contract.artifact.contractName}" contract constructor parameters`,
           ...(constructorInputs.length
             ? constructorInputs.map((input, index) => {
-                const encoded = encodeArgument(
-                  contractParameters[index],
-                  constructorInputs[index].type
-                ) as Uint8Array;
-                return `<${snakeCase(input.name)}> // ${
-                  input.type === "bytes" ? "bytes" + encoded.length : input.type
-                } = <${"0x" + binToHex(encoded)}>`;
-              })
-            : ["// none"]),
-          "",
-          "// bytecode",
+              const encoded = encodeArgument(
+                contractParameters[index],
+                constructorInputs[index].type,
+              ) as Uint8Array;
+              return `<${snakeCase(input.name)}> // ${
+                input.type === 'bytes' ? `bytes${encoded.length}` : input.type
+              } = <${`0x${binToHex(encoded)}`}>`;
+            })
+            : ['// none']),
+          '',
+          '// bytecode',
           ...formattedBytecode,
-        ].join("\n"),
+        ].join('\n'),
       },
       ...(hasSignatureTemplates
         ? {
-            p2pkh_placeholder_unlock: {
-              name: "p2pkh_placeholder_unlock",
-              script:
-                "<placeholder_key.schnorr_signature.all_outputs>\n<placeholder_key.public_key>",
-              unlocks: "p2pkh_placeholder_lock",
-            },
-            p2pkh_placeholder_lock: {
-              lockingType: "standard",
-              name: "p2pkh_placeholder_lock",
-              script:
-                "OP_DUP\nOP_HASH160 <$(<placeholder_key.public_key> OP_HASH160\n)> OP_EQUALVERIFY\nOP_CHECKSIG",
-            },
-          }
+          p2pkh_placeholder_unlock: {
+            name: 'p2pkh_placeholder_unlock',
+            script:
+                '<placeholder_key.schnorr_signature.all_outputs>\n<placeholder_key.public_key>',
+            unlocks: 'p2pkh_placeholder_lock',
+          },
+          p2pkh_placeholder_lock: {
+            lockingType: 'standard',
+            name: 'p2pkh_placeholder_lock',
+            script:
+                'OP_DUP\nOP_HASH160 <$(<placeholder_key.public_key> OP_HASH160\n)> OP_EQUALVERIFY\nOP_CHECKSIG',
+          },
+        }
         : {}),
     },
-    supported: ["BCH_SPEC"],
+    supported: ['BCH_SPEC'],
     version: 0,
   } as AuthenticationTemplate;
 };
 
 export const getBitauthUri = (template: AuthenticationTemplate): string => {
-  const base64toBase64Url = (base64: string): string =>
-    base64.replace(/\+/g, "-").replace(/\//g, "_");
+  const base64toBase64Url = (base64: string): string => base64.replace(/\+/g, '-').replace(/\//g, '_');
   const payload = base64toBase64Url(
-    binToBase64(deflate(utf8ToBin(stringify(template))))
+    binToBase64(deflate(utf8ToBin(stringify(template)))),
   );
   return `https://ide.bitauth.com/import-template/${payload}`;
 };
 
+type VM = AuthenticationVirtualMachine<
+ResolvedTransactionCommon,
+AuthenticationProgramCommon,
+AuthenticationProgramStateBCHCHIPs
+>;
+type Program = AuthenticationProgramCommon;
+type CreateProgramResult = { vm: VM, program: Program };
+
 // internal util. instantiates the virtual machine and compiles the template into a program
-const createProgram = (template: AuthenticationTemplate): any => {
+const createProgram = (template: AuthenticationTemplate): CreateProgramResult => {
   const configuration = authenticationTemplateToCompilerConfiguration(template);
   const vm = createVirtualMachineBCHCHIPs();
   const compiler = createCompiler(configuration);
@@ -481,26 +485,28 @@ const createProgram = (template: AuthenticationTemplate): any => {
   const scenarioGeneration = compiler.generateScenario({
     debug: true,
     lockingScriptId: undefined,
-    unlockingScriptId: "unlock_lock",
-    scenarioId: "evaluate_function",
+    unlockingScriptId: 'unlock_lock',
+    scenarioId: 'evaluate_function',
   });
 
   if (
-    typeof scenarioGeneration === "string" ||
-    typeof scenarioGeneration.scenario === "string"
+    typeof scenarioGeneration === 'string'
+    || typeof scenarioGeneration.scenario === 'string'
   ) {
+    // eslint-disable-next-line
     throw scenarioGeneration;
   }
 
   return { vm, program: scenarioGeneration.scenario.program };
-}
+};
 
 // evaluates the fully defined template, throws upon error
 export const evaluateTemplate = (template: AuthenticationTemplate): boolean => {
   const { vm, program } = createProgram(template);
 
   const verifyResult = vm.verify(program);
-  if (typeof verifyResult === "string") {
+  if (typeof verifyResult === 'string') {
+    // eslint-disable-next-line
     throw verifyResult;
   }
 
@@ -510,21 +516,21 @@ export const evaluateTemplate = (template: AuthenticationTemplate): boolean => {
 export type DebugResult = AuthenticationProgramStateBCHCHIPs[];
 
 // debugs the template, optionally logging the execution data
-export const debugTemplate = (template: AuthenticationTemplate, artifact: Artifact): DebugResult  => {
+export const debugTemplate = (template: AuthenticationTemplate, artifact: Artifact): DebugResult => {
   const { vm, program } = createProgram(template);
 
   const debugResult = vm.debug(program);
 
   for (const log of artifact.debug?.logs ?? []) {
-    const state = debugResult.find(state => state.ip === log.ip)!;
+    const { stack } = debugResult.find((state: AuthenticationProgramStateBCHCHIPs) => state.ip === log.ip)!;
 
-    let line = `${artifact.contractName}.cash:${log.line}`
-    log.data.forEach(element => {
+    let line = `${artifact.contractName}.cash:${log.line}`;
+    log.data.forEach((element) => {
       let value: any;
-      if (typeof element === "string") {
+      if (typeof element === 'string') {
         value = element;
       } else {
-        const stackItem = state.stack.slice().reverse()[element.stackIndex];
+        const stackItem = stack.slice().reverse()[element.stackIndex];
         switch (element.type) {
           case PrimitiveType.BOOL:
             value = decodeBool(stackItem);
@@ -550,11 +556,13 @@ export const debugTemplate = (template: AuthenticationTemplate, artifact: Artifa
 
   const lastState = debugResult[debugResult.length - 1];
   if (lastState.error) {
-    const requireMessage = (artifact.debug?.requireMessages ?? []).filter(message => message.ip === lastState.ip)[0];
+    const requireMessage = (artifact.debug?.requireMessages ?? []).filter((message) => message.ip === lastState.ip)[0];
     if (requireMessage) {
+      // eslint-disable-next-line
       throw `${artifact.contractName}.cash:${requireMessage.line} Error in evaluating input index ${lastState.program.inputIndex} with the following message: ${requireMessage.message}.
 ${lastState.error}`;
     } else {
+      // eslint-disable-next-line
       throw `Error in evaluating input index ${lastState.program.inputIndex}.
 ${lastState.error}`;
     }

From e7d03d87f92c2e13404a713ea871ebbafc87737b Mon Sep 17 00:00:00 2001
From: mainnet-pat <mainnet_pat@protonmail.com>
Date: Sat, 25 Nov 2023 19:03:09 +0000
Subject: [PATCH 015/171] Lint

---
 packages/cashscript/src/LibauthTemplate.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/cashscript/src/LibauthTemplate.ts b/packages/cashscript/src/LibauthTemplate.ts
index c5bbf1d7..0050e6ab 100644
--- a/packages/cashscript/src/LibauthTemplate.ts
+++ b/packages/cashscript/src/LibauthTemplate.ts
@@ -117,7 +117,7 @@ export const buildTemplate = async ({
   const abiFunction = (transaction as any).abiFunction as AbiFunction;
   const funcName = abiFunction.name;
   const functionIndex = contract.artifact.abi.findIndex(
-    (val) => val.name === funcName,
+    (abiFunction) => abiFunction.name === funcName,
   )!;
   const func: AbiFunction = contract.artifact.abi[functionIndex];
   const functionInputs = func.inputs.slice().reverse();
@@ -126,16 +126,16 @@ export const buildTemplate = async ({
     .reverse();
 
   const hasSignatureTemplates = ((transaction as any).inputs as Utxo[]).filter(
-    (val) => isUtxoP2PKH(val),
+    (input) => isUtxoP2PKH(input),
   ).length;
 
   const formattedBytecode = contract.artifact.debug
     ? formatLibauthScript(asmToScript(contract.artifact.debug.bytecode), contract.artifact.debug?.sourceMap!, contract.artifact.source).split('\n')
-    : contract.artifact.bytecode.split(' ').map((val) => {
-      if (isHex(val)) {
-        return `<0x${val}>`;
+    : contract.artifact.bytecode.split(' ').map((asmElement) => {
+      if (isHex(asmElement)) {
+        return `<0x${asmElement}>`;
       }
-      return val;
+      return asmElement;
     });
 
   return {

From f38b631742377ad211f864f1ecdc64d449c0e7f9 Mon Sep 17 00:00:00 2001
From: mainnet-pat <mainnet_pat@protonmail.com>
Date: Sat, 25 Nov 2023 19:03:18 +0000
Subject: [PATCH 016/171] Lint cashc

---
 packages/cashc/src/artifact/Artifact.ts       | 24 +++++++++--------
 packages/cashc/src/ast/AST.ts                 |  1 -
 packages/cashc/src/compiler.ts                |  2 +-
 .../src/generation/GenerateTargetTraversal.ts | 26 +++++++++----------
 .../src/semantic/SymbolTableTraversal.ts      |  6 ++---
 5 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/packages/cashc/src/artifact/Artifact.ts b/packages/cashc/src/artifact/Artifact.ts
index 340161c4..65204da8 100644
--- a/packages/cashc/src/artifact/Artifact.ts
+++ b/packages/cashc/src/artifact/Artifact.ts
@@ -1,18 +1,20 @@
-import { Artifact, LogEntry, RequireMessage, Script, scriptToAsm } from '@cashscript/utils';
+import {
+  Artifact, LogEntry, RequireMessage, Script, scriptToAsm,
+} from '@cashscript/utils';
 import { version } from '../index.js';
 import { Ast } from '../ast/AST.js';
 
 export function generateArtifact(
-    ast: Ast,
+  ast: Ast,
+  script: Script,
+  source: string,
+  debug: {
     script: Script,
-    source: string,
-    debug: {
-      script: Script,
-      sourceMap: string,
-      logs: LogEntry[],
-      requireMessages: RequireMessage[],
-    }
-  ): Artifact {
+    sourceMap: string,
+    logs: LogEntry[],
+    requireMessages: RequireMessage[],
+  },
+): Artifact {
   const { contract } = ast;
 
   const constructorInputs = contract.parameters
@@ -50,7 +52,7 @@ export function generateArtifact(
 }
 
 // strip verbose debug info from artifact for production use
-export function stripArtifact(artifact: Artifact): Omit<Artifact, "debug"> {
+export function stripArtifact(artifact: Artifact): Omit<Artifact, 'debug'> {
   delete artifact.debug;
   return artifact;
 }
diff --git a/packages/cashc/src/ast/AST.ts b/packages/cashc/src/ast/AST.ts
index 2aaf8450..3250bfe1 100644
--- a/packages/cashc/src/ast/AST.ts
+++ b/packages/cashc/src/ast/AST.ts
@@ -366,7 +366,6 @@ export class ConsoleStatementNode extends Node {
   }
 }
 
-
 export class ConsoleParameterNode extends Node {
   constructor(
     public message?: string,
diff --git a/packages/cashc/src/compiler.ts b/packages/cashc/src/compiler.ts
index 038f2eb5..3621a5ee 100644
--- a/packages/cashc/src/compiler.ts
+++ b/packages/cashc/src/compiler.ts
@@ -1,4 +1,4 @@
-import { Artifact, generateSourceMap, optimiseBytecode } from '@cashscript/utils';
+import { Artifact, optimiseBytecode } from '@cashscript/utils';
 import { ANTLRInputStream, CommonTokenStream } from 'antlr4ts';
 import fs, { PathLike } from 'fs';
 import { generateArtifact } from './artifact/Artifact.js';
diff --git a/packages/cashc/src/generation/GenerateTargetTraversal.ts b/packages/cashc/src/generation/GenerateTargetTraversal.ts
index 763cccd7..6f2b06fb 100644
--- a/packages/cashc/src/generation/GenerateTargetTraversal.ts
+++ b/packages/cashc/src/generation/GenerateTargetTraversal.ts
@@ -14,7 +14,7 @@ import {
   LocationI,
   LocationData,
   LogEntry,
-  RequireMessage
+  RequireMessage,
 } from '@cashscript/utils';
 import {
   ContractNode,
@@ -78,8 +78,8 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
 
   private emit(op: OpOrData | OpOrData[], location: LocationI, positionHint?: number): void {
     if (Array.isArray(op)) {
-      op.forEach(val => this.output.push(val as Op));
-      op.forEach(_ => this.locationData.push([location, positionHint]));
+      op.forEach((element) => this.output.push(element as Op));
+      op.forEach(() => this.locationData.push([location, positionHint]));
     } else {
       this.output.push(op);
       this.locationData.push([location, positionHint]);
@@ -275,7 +275,7 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
       this.requireMessages.push({
         ip: this.output.length + this.constructorParameterCount - 1,
         line: node.location!.start.line,
-        message: node.message
+        message: node.message,
       });
     }
 
@@ -293,7 +293,7 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
       this.requireMessages.push({
         ip: this.output.length + this.constructorParameterCount - 1,
         line: node.location!.start.line,
-        message: node.message
+        message: node.message,
       });
     }
 
@@ -550,7 +550,7 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
     // instruction pointer is the count of emitted opcodes + number of constructor data pushes
     const ip = this.output.length + this.constructorParameterCount;
 
-    const line = node.location!.start.line;
+    const { line } = node.location!.start;
 
     // check if log entry exists for the instruction pointer, create if not
     let index = this.consoleLogs.findIndex((entry: LogEntry) => entry.ip === ip);
@@ -558,17 +558,17 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
       index = this.consoleLogs.push({
         ip,
         line,
-        data: []
+        data: [],
       }) - 1;
-    };
+    }
 
     node.parameters.forEach((parameter: ConsoleParameterNode) => {
       if (parameter.identifier) {
         // we look for all symbols with identifier name
         // then take the first which is declared in the nearest code block
-        const symbol = this.logSymbols.
-          filter(symbol => symbol.name === parameter.identifier).
-          sort((a, b) => b.definition?.location?.start.line! - a.definition?.location?.start.line!)[0];
+        const symbol = this.logSymbols
+          .filter((logSymbol) => logSymbol.name === parameter.identifier)
+          .sort((a, b) => b.definition?.location?.start.line! - a.definition?.location?.start.line!)[0];
 
         if (!symbol) {
           throw new ParseError(`Undefined reference to symbol ${parameter.identifier} at ${parameter.location?.start}`);
@@ -577,8 +577,8 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
         const stackIndex = this.getStackIndex(parameter.identifier);
         this.consoleLogs[index].data.push({
           stackIndex,
-          type: typeof symbol.type === "string" ? symbol.type : symbol.toString(),
-        })
+          type: typeof symbol.type === 'string' ? symbol.type : symbol.toString(),
+        });
       } else if (parameter.message) {
         this.consoleLogs[index].data.push(parameter.message);
       }
diff --git a/packages/cashc/src/semantic/SymbolTableTraversal.ts b/packages/cashc/src/semantic/SymbolTableTraversal.ts
index 36c91502..5e5fd5cc 100644
--- a/packages/cashc/src/semantic/SymbolTableTraversal.ts
+++ b/packages/cashc/src/semantic/SymbolTableTraversal.ts
@@ -174,9 +174,9 @@ export default class SymbolTableTraversal extends AstTraversal {
   visitConsoleStatement(node: ConsoleStatementNode): ConsoleStatementNode {
     // there might be same-name symbols in different code scopes
     // so we collect all symbols with their location, which will be analyzed later
-    const symbols = node.parameters.
-      map(parameter => this.symbolTables[0].get(parameter.identifier!)!).
-      filter(symbol => symbol);
+    const symbols = node.parameters
+      .map((parameter) => this.symbolTables[0].get(parameter.identifier!)!)
+      .filter((symbol) => symbol);
 
     this.logSymbols.push(...symbols);
     return node;

From 60d307a41ed4820ff713ba8c8967f971c32c6fe1 Mon Sep 17 00:00:00 2001
From: mainnet-pat <mainnet_pat@protonmail.com>
Date: Sat, 25 Nov 2023 19:08:11 +0000
Subject: [PATCH 017/171] Lint utils

---
 packages/utils/src/libauth.ts         |  44 ++++----
 packages/utils/src/sourceMap.ts       |  24 +++--
 packages/utils/test/libauth.test.ts   |  15 ++-
 packages/utils/test/sourceMap.test.ts | 149 +++++++++++++-------------
 4 files changed, 120 insertions(+), 112 deletions(-)

diff --git a/packages/utils/src/libauth.ts b/packages/utils/src/libauth.ts
index ba94482a..09593448 100644
--- a/packages/utils/src/libauth.ts
+++ b/packages/utils/src/libauth.ts
@@ -1,46 +1,54 @@
-import { binToHex } from "@bitauth/libauth";
-import { Script, Op } from "./script.js";
-import { sourceMapToLocationData } from "./sourceMap.js";
+import { binToHex } from '@bitauth/libauth';
+import { Script, Op } from './script.js';
+import { sourceMapToLocationData } from './sourceMap.js';
 
 export function formatLibauthScript(bytecode: Script, souceMap: string, sourceCode: string): string {
-  const lineMap: {[line: string]: Script} = {} as any;
+  const lineMap: { [line: string]: Script } = {} as any;
 
   const locationData = sourceMapToLocationData(souceMap);
 
   const map = locationData.map(([location, positionHint], index) => {
     const op = bytecode[index];
-    return [op, Object.keys(Op)[Object.values(Op).indexOf(op as Op)], positionHint ? location?.end.line : op === Op.OP_ENDIF || op === Op.OP_ELSE || op === Op.OP_NIP || op === Op.OP_CHECKLOCKTIMEVERIFY ? location?.end.line : location?.start.line];
+    return [
+      op,
+      Object.keys(Op)[Object.values(Op).indexOf(op as Op)],
+      // eslint-disable-next-line
+      positionHint
+        ? location?.end.line
+        : (op === Op.OP_ENDIF || op === Op.OP_ELSE || op === Op.OP_NIP || op === Op.OP_CHECKLOCKTIMEVERIFY
+          ? location?.end.line
+          : location?.start.line),
+    ];
   });
 
-  map.forEach(([op, _, line]) => {
+  map.forEach(([op, , line]) => {
     if (!lineMap[line as string]) {
       lineMap[line as string] = [];
     }
     lineMap[line as string].push(op as any);
   });
 
-  const opCodeMap: {[key: string]: string} = {};
+  const opCodeMap: { [key: string]: string } = {};
   for (const [key, value] of Object.entries(lineMap)) {
-    opCodeMap[key] = value.map(val => {
-      if (val instanceof Uint8Array) {
-        if (val.length == 0) {
-          return "OP_0";
-        } else {
-          return `<0x${binToHex(val)}>`;
+    opCodeMap[key] = value.map((asmElement) => {
+      if (asmElement instanceof Uint8Array) {
+        if (asmElement.length === 0) {
+          return 'OP_0';
         }
+        return `<0x${binToHex(asmElement)}>`;
       }
-      return Object.keys(Op)[Object.values(Op).indexOf(val)]
-    }).join(" ");
+      return Object.keys(Op)[Object.values(Op).indexOf(asmElement)];
+    }).join(' ');
   }
 
   const split = sourceCode.split('\n');
 
-  const maxCodeLength = Math.max(...split.map(val => val.length));
-  const maxBytecodeLength = Math.max(...Object.values(opCodeMap).map(val => val.length));
+  const maxCodeLength = Math.max(...split.map((val) => val.length));
+  const maxBytecodeLength = Math.max(...Object.values(opCodeMap).map((val) => val.length));
 
   const result = split.map((line, index) => {
     const opCodes = opCodeMap[index + 1];
-    return `${(opCodes ? opCodes : "").padEnd(maxBytecodeLength)} /* ${line.padEnd(maxCodeLength)} */`;
+    return `${(opCodes || '').padEnd(maxBytecodeLength)} /* ${line.padEnd(maxCodeLength)} */`;
   }).join('\n');
 
   return result;
diff --git a/packages/utils/src/sourceMap.ts b/packages/utils/src/sourceMap.ts
index 4a6bb39d..6a640c1e 100644
--- a/packages/utils/src/sourceMap.ts
+++ b/packages/utils/src/sourceMap.ts
@@ -16,8 +16,10 @@ export type LocationData = Array<[location: LocationI, positionHint?: number]>;
  *
  * `sl:sc:el:ec:h`
  *
- * Where `sl` is the start line, `sc` - start column, `el` - end line, and `ec` - end column of the range in the source file.
- * `h` is the position hint denoting where to place the instruction - at the beginning of the parent AST block or at the end.
+ * Where `sl` is the start line, `sc` - start column, `el` - end line, and `ec` - end column
+ * of the range in the source file.
+ * `h` is the position hint denoting where to place the instruction - at the beginning of the parent AST block
+ * or at the end.
  * `h` is used with AST blocks, instructions of which surround children blocks, like function declarations and
  * if-then-else blocks.
  *
@@ -63,22 +65,22 @@ export function generateSourceMap(locationData: LocationData): string {
       result += prevStartLineString;
     }
 
-    result += ":";
+    result += ':';
     if (prevStartColumnString) {
       result += prevStartColumnString;
     }
 
-    result += ":";
+    result += ':';
     if (prevEndLineString) {
       result += prevEndLineString;
     }
 
-    result += ":";
+    result += ':';
     if (prevEndColumnString) {
       result += prevEndColumnString;
     }
 
-    result += ":";
+    result += ':';
     if (prevHintString) {
       result += prevHintString;
     }
@@ -93,9 +95,9 @@ export const sourceMapToLocationData = (sourceMap: string): LocationData => {
   let prevStartColumn = 0;
   let prevEndLine = 0;
   let prevEndColumn = 0;
-  let prevHint: any = undefined;
+  let prevHint: any;
 
-  return sourceMap.split(";").map((entry: string) => {
+  return sourceMap.split(';').map((entry: string) => {
     const val = entry.split(':');
     const startLine = val[0] ? Number(val[0]) : prevStartLine; prevStartLine = startLine;
     const startColumn = val[1] ? Number(val[1]) : prevStartColumn; prevStartColumn = startColumn;
@@ -106,9 +108,9 @@ export const sourceMapToLocationData = (sourceMap: string): LocationData => {
     return [
       {
         start: { line: startLine, column: startColumn },
-        end: { line: endLine, column: endColumn }
+        end: { line: endLine, column: endColumn },
       },
-      ...(hint ? [hint] : [])
+      ...(hint ? [hint] : []),
     ] as any;
   });
-}
\ No newline at end of file
+};
diff --git a/packages/utils/test/libauth.test.ts b/packages/utils/test/libauth.test.ts
index 237c98a5..5aec1bed 100644
--- a/packages/utils/test/libauth.test.ts
+++ b/packages/utils/test/libauth.test.ts
@@ -1,11 +1,11 @@
-import { asmToScript } from "../src/index.js";
-import { formatLibauthScript } from "../src/libauth.js";
+import { asmToScript } from '../src/index.js';
+import { formatLibauthScript } from '../src/libauth.js';
 
-it(`test formatting libauth input`, () => {
-  const code = "OP_3 OP_PICK OP_0 OP_NUMEQUAL OP_IF OP_5 OP_ROLL OP_5 OP_PICK OP_CHECKSIG OP_VERIFY OP_4 OP_ROLL OP_HASH160 OP_2 OP_ROLL OP_EQUAL OP_NIP OP_NIP OP_NIP OP_ELSE OP_3 OP_ROLL OP_1 OP_NUMEQUAL OP_VERIFY OP_0 OP_PICK deadbeef OP_EQUAL OP_VERIFY OP_2 OP_PICK OP_3 OP_PICK OP_NUMEQUAL OP_VERIFY OP_4 OP_PICK OP_5 OP_PICK OP_EQUAL OP_VERIFY OP_3 OP_PICK OP_4 OP_PICK OP_EQUAL OP_VERIFY OP_4 OP_ROLL OP_4 OP_PICK OP_CHECKSIG OP_VERIFY OP_3 OP_ROLL OP_HASH160 OP_1 OP_ROLL OP_EQUAL OP_VERIFY OP_1 OP_ROLL OP_CHECKLOCKTIMEVERIFY OP_DROP OP_1 OP_NIP OP_ENDIF";
+it('test formatting libauth input', () => {
+  const code = 'OP_3 OP_PICK OP_0 OP_NUMEQUAL OP_IF OP_5 OP_ROLL OP_5 OP_PICK OP_CHECKSIG OP_VERIFY OP_4 OP_ROLL OP_HASH160 OP_2 OP_ROLL OP_EQUAL OP_NIP OP_NIP OP_NIP OP_ELSE OP_3 OP_ROLL OP_1 OP_NUMEQUAL OP_VERIFY OP_0 OP_PICK deadbeef OP_EQUAL OP_VERIFY OP_2 OP_PICK OP_3 OP_PICK OP_NUMEQUAL OP_VERIFY OP_4 OP_PICK OP_5 OP_PICK OP_EQUAL OP_VERIFY OP_3 OP_PICK OP_4 OP_PICK OP_EQUAL OP_VERIFY OP_4 OP_ROLL OP_4 OP_PICK OP_CHECKSIG OP_VERIFY OP_3 OP_ROLL OP_HASH160 OP_1 OP_ROLL OP_EQUAL OP_VERIFY OP_1 OP_ROLL OP_CHECKLOCKTIMEVERIFY OP_DROP OP_1 OP_NIP OP_ENDIF';
   const bytecode = asmToScript(code);
-  const sourceMap = "3:2:6:3;;;;;4:21:4:22;;:24::33;;:12::34;:4::36;5:20:5:29;;:12::30;:34::46;;:12;3:2:6:3:1;;;;8::16::0;;;;;9:12:9:21;;:25::35;:12;:4::37;10:12:10:19;;:23::30;;:12;:4::32;11:12:11:13;;:17::18;;:12;:4::20;12:12:12:21;;:25::34;;:12;:4::36;13:21:13:22;;:24::33;;:12::34;:4::36;14:20:14:29;;:12::30;:34::43;;:12;:4::45;15:23:15:30;;:4::32;;8:2:16:3:1;;";
-  const sourceCode =`
+  const sourceMap = '3:2:6:3;;;;;4:21:4:22;;:24::33;;:12::34;:4::36;5:20:5:29;;:12::30;:34::46;;:12;3:2:6:3:1;;;;8::16::0;;;;;9:12:9:21;;:25::35;:12;:4::37;10:12:10:19;;:23::30;;:12;:4::32;11:12:11:13;;:17::18;;:12;:4::20;12:12:12:21;;:25::34;;:12;:4::36;13:21:13:22;;:24::33;;:12::34;:4::36;14:20:14:29;;:12::30;:34::43;;:12;:4::45;15:23:15:30;;:4::32;;8:2:16:3:1;;';
+  const sourceCode = `
 contract TransferWithTimeout(bytes20 senderPkh, bytes20 recipientPkh, int timeout) {
   function transfer(pubkey signingPk, sig s) {
     require(checkSig(s, signingPk));
@@ -24,8 +24,7 @@ contract TransferWithTimeout(bytes20 senderPkh, bytes20 recipientPkh, int timeou
 }`;
 
   const formatted = formatLibauthScript(bytecode, sourceMap, sourceCode);
-  const result =
-`
+  const result = `
                                                         /*                                                                                      */
                                                         /* contract TransferWithTimeout(bytes20 senderPkh, bytes20 recipientPkh, int timeout) { */
 OP_3 OP_PICK OP_0 OP_NUMEQUAL OP_IF                     /*   function transfer(pubkey signingPk, sig s) {                                       */
diff --git a/packages/utils/test/sourceMap.test.ts b/packages/utils/test/sourceMap.test.ts
index 873178a2..b25444b7 100644
--- a/packages/utils/test/sourceMap.test.ts
+++ b/packages/utils/test/sourceMap.test.ts
@@ -1,82 +1,81 @@
-import { LocationData, generateSourceMap, sourceMapToLocationData } from "../src/index.js";
+import { LocationData, generateSourceMap, sourceMapToLocationData } from '../src/index.js';
 
-it(`test sourcemap generation and decoding`, () => {
-  const locationData =
-  [
-    [ { start: { line: 3, column: 2 }, end: { line: 6, column: 3 } } ],
-    [ { start: { line: 3, column: 2 }, end: { line: 6, column: 3 } } ],
-    [ { start: { line: 3, column: 2 }, end: { line: 6, column: 3 } } ],
-    [ { start: { line: 3, column: 2 }, end: { line: 6, column: 3 } } ],
-    [ { start: { line: 3, column: 2 }, end: { line: 6, column: 3 } } ],
-    [ { start: { line: 4, column: 21 }, end: { line: 4, column: 22 } } ],
-    [ { start: { line: 4, column: 21 }, end: { line: 4, column: 22 } } ],
-    [ { start: { line: 4, column: 24 }, end: { line: 4, column: 33 } } ],
-    [ { start: { line: 4, column: 24 }, end: { line: 4, column: 33 } } ],
-    [ { start: { line: 4, column: 12 }, end: { line: 4, column: 34 } } ],
-    [ { start: { line: 4, column: 4 }, end: { line: 4, column: 36 } } ],
-    [ { start: { line: 5, column: 20 }, end: { line: 5, column: 29 } } ],
-    [ { start: { line: 5, column: 20 }, end: { line: 5, column: 29 } } ],
-    [ { start: { line: 5, column: 12 }, end: { line: 5, column: 30 } } ],
-    [ { start: { line: 5, column: 34 }, end: { line: 5, column: 46 } } ],
-    [ { start: { line: 5, column: 34 }, end: { line: 5, column: 46 } } ],
-    [ { start: { line: 5, column: 12 }, end: { line: 5, column: 46 } } ],
-    [ { start: { line: 3, column: 2 }, end: { line: 6, column: 3 } }, 1 ],
-    [ { start: { line: 3, column: 2 }, end: { line: 6, column: 3 } }, 1 ],
-    [ { start: { line: 3, column: 2 }, end: { line: 6, column: 3 } }, 1 ],
-    [ { start: { line: 3, column: 2 }, end: { line: 6, column: 3 } }, 1 ],
-    [ { start: { line: 8, column: 2 }, end: { line: 16, column: 3 } } ],
-    [ { start: { line: 8, column: 2 }, end: { line: 16, column: 3 } } ],
-    [ { start: { line: 8, column: 2 }, end: { line: 16, column: 3 } } ],
-    [ { start: { line: 8, column: 2 }, end: { line: 16, column: 3 } } ],
-    [ { start: { line: 8, column: 2 }, end: { line: 16, column: 3 } } ],
-    [ { start: { line: 9, column: 12 }, end: { line: 9, column: 21 } } ],
-    [ { start: { line: 9, column: 12 }, end: { line: 9, column: 21 } } ],
-    [ { start: { line: 9, column: 25 }, end: { line: 9, column: 34 } } ],
-    [ { start: { line: 9, column: 25 }, end: { line: 9, column: 34 } } ],
-    [ { start: { line: 9, column: 12 }, end: { line: 9, column: 34 } } ],
-    [ { start: { line: 9, column: 4 }, end: { line: 9, column: 36 } } ],
-    [ { start: { line: 10, column: 12 }, end: { line: 10, column: 19 } } ],
-    [ { start: { line: 10, column: 12 }, end: { line: 10, column: 19 } } ],
-    [ { start: { line: 10, column: 23 }, end: { line: 10, column: 30 } } ],
-    [ { start: { line: 10, column: 23 }, end: { line: 10, column: 30 } } ],
-    [ { start: { line: 10, column: 12 }, end: { line: 10, column: 30 } } ],
-    [ { start: { line: 10, column: 4 }, end: { line: 10, column: 32 } } ],
-    [ { start: { line: 11, column: 12 }, end: { line: 11, column: 13 } } ],
-    [ { start: { line: 11, column: 12 }, end: { line: 11, column: 13 } } ],
-    [ { start: { line: 11, column: 17 }, end: { line: 11, column: 18 } } ],
-    [ { start: { line: 11, column: 17 }, end: { line: 11, column: 18 } } ],
-    [ { start: { line: 11, column: 12 }, end: { line: 11, column: 18 } } ],
-    [ { start: { line: 11, column: 4 }, end: { line: 11, column: 20 } } ],
-    [ { start: { line: 12, column: 12 }, end: { line: 12, column: 21 } } ],
-    [ { start: { line: 12, column: 12 }, end: { line: 12, column: 21 } } ],
-    [ { start: { line: 12, column: 25 }, end: { line: 12, column: 34 } } ],
-    [ { start: { line: 12, column: 25 }, end: { line: 12, column: 34 } } ],
-    [ { start: { line: 12, column: 12 }, end: { line: 12, column: 34 } } ],
-    [ { start: { line: 12, column: 4 }, end: { line: 12, column: 36 } } ],
-    [ { start: { line: 13, column: 21 }, end: { line: 13, column: 22 } } ],
-    [ { start: { line: 13, column: 21 }, end: { line: 13, column: 22 } } ],
-    [ { start: { line: 13, column: 24 }, end: { line: 13, column: 33 } } ],
-    [ { start: { line: 13, column: 24 }, end: { line: 13, column: 33 } } ],
-    [ { start: { line: 13, column: 12 }, end: { line: 13, column: 34 } } ],
-    [ { start: { line: 13, column: 4 }, end: { line: 13, column: 36 } } ],
-    [ { start: { line: 14, column: 20 }, end: { line: 14, column: 29 } } ],
-    [ { start: { line: 14, column: 20 }, end: { line: 14, column: 29 } } ],
-    [ { start: { line: 14, column: 12 }, end: { line: 14, column: 30 } } ],
-    [ { start: { line: 14, column: 34 }, end: { line: 14, column: 43 } } ],
-    [ { start: { line: 14, column: 34 }, end: { line: 14, column: 43 } } ],
-    [ { start: { line: 14, column: 12 }, end: { line: 14, column: 43 } } ],
-    [ { start: { line: 14, column: 4 }, end: { line: 14, column: 45 } } ],
-    [ { start: { line: 15, column: 23 }, end: { line: 15, column: 30 } } ],
-    [ { start: { line: 15, column: 23 }, end: { line: 15, column: 30 } } ],
-    [ { start: { line: 15, column: 4 }, end: { line: 15, column: 32 } } ],
-    [ { start: { line: 15, column: 4 }, end: { line: 15, column: 32 } } ],
-    [ { start: { line: 15, column: 4 }, end: { line: 15, column: 32 } }, 1 ],
-    [ { start: { line: 8, column: 2 }, end: { line: 16, column: 3 } }, 1 ],
-    [ { start: { line: 8, column: 2 }, end: { line: 16, column: 3 } }, 1 ]
+it('test sourcemap generation and decoding', () => {
+  const locationData = [
+    [{ start: { line: 3, column: 2 }, end: { line: 6, column: 3 } }],
+    [{ start: { line: 3, column: 2 }, end: { line: 6, column: 3 } }],
+    [{ start: { line: 3, column: 2 }, end: { line: 6, column: 3 } }],
+    [{ start: { line: 3, column: 2 }, end: { line: 6, column: 3 } }],
+    [{ start: { line: 3, column: 2 }, end: { line: 6, column: 3 } }],
+    [{ start: { line: 4, column: 21 }, end: { line: 4, column: 22 } }],
+    [{ start: { line: 4, column: 21 }, end: { line: 4, column: 22 } }],
+    [{ start: { line: 4, column: 24 }, end: { line: 4, column: 33 } }],
+    [{ start: { line: 4, column: 24 }, end: { line: 4, column: 33 } }],
+    [{ start: { line: 4, column: 12 }, end: { line: 4, column: 34 } }],
+    [{ start: { line: 4, column: 4 }, end: { line: 4, column: 36 } }],
+    [{ start: { line: 5, column: 20 }, end: { line: 5, column: 29 } }],
+    [{ start: { line: 5, column: 20 }, end: { line: 5, column: 29 } }],
+    [{ start: { line: 5, column: 12 }, end: { line: 5, column: 30 } }],
+    [{ start: { line: 5, column: 34 }, end: { line: 5, column: 46 } }],
+    [{ start: { line: 5, column: 34 }, end: { line: 5, column: 46 } }],
+    [{ start: { line: 5, column: 12 }, end: { line: 5, column: 46 } }],
+    [{ start: { line: 3, column: 2 }, end: { line: 6, column: 3 } }, 1],
+    [{ start: { line: 3, column: 2 }, end: { line: 6, column: 3 } }, 1],
+    [{ start: { line: 3, column: 2 }, end: { line: 6, column: 3 } }, 1],
+    [{ start: { line: 3, column: 2 }, end: { line: 6, column: 3 } }, 1],
+    [{ start: { line: 8, column: 2 }, end: { line: 16, column: 3 } }],
+    [{ start: { line: 8, column: 2 }, end: { line: 16, column: 3 } }],
+    [{ start: { line: 8, column: 2 }, end: { line: 16, column: 3 } }],
+    [{ start: { line: 8, column: 2 }, end: { line: 16, column: 3 } }],
+    [{ start: { line: 8, column: 2 }, end: { line: 16, column: 3 } }],
+    [{ start: { line: 9, column: 12 }, end: { line: 9, column: 21 } }],
+    [{ start: { line: 9, column: 12 }, end: { line: 9, column: 21 } }],
+    [{ start: { line: 9, column: 25 }, end: { line: 9, column: 34 } }],
+    [{ start: { line: 9, column: 25 }, end: { line: 9, column: 34 } }],
+    [{ start: { line: 9, column: 12 }, end: { line: 9, column: 34 } }],
+    [{ start: { line: 9, column: 4 }, end: { line: 9, column: 36 } }],
+    [{ start: { line: 10, column: 12 }, end: { line: 10, column: 19 } }],
+    [{ start: { line: 10, column: 12 }, end: { line: 10, column: 19 } }],
+    [{ start: { line: 10, column: 23 }, end: { line: 10, column: 30 } }],
+    [{ start: { line: 10, column: 23 }, end: { line: 10, column: 30 } }],
+    [{ start: { line: 10, column: 12 }, end: { line: 10, column: 30 } }],
+    [{ start: { line: 10, column: 4 }, end: { line: 10, column: 32 } }],
+    [{ start: { line: 11, column: 12 }, end: { line: 11, column: 13 } }],
+    [{ start: { line: 11, column: 12 }, end: { line: 11, column: 13 } }],
+    [{ start: { line: 11, column: 17 }, end: { line: 11, column: 18 } }],
+    [{ start: { line: 11, column: 17 }, end: { line: 11, column: 18 } }],
+    [{ start: { line: 11, column: 12 }, end: { line: 11, column: 18 } }],
+    [{ start: { line: 11, column: 4 }, end: { line: 11, column: 20 } }],
+    [{ start: { line: 12, column: 12 }, end: { line: 12, column: 21 } }],
+    [{ start: { line: 12, column: 12 }, end: { line: 12, column: 21 } }],
+    [{ start: { line: 12, column: 25 }, end: { line: 12, column: 34 } }],
+    [{ start: { line: 12, column: 25 }, end: { line: 12, column: 34 } }],
+    [{ start: { line: 12, column: 12 }, end: { line: 12, column: 34 } }],
+    [{ start: { line: 12, column: 4 }, end: { line: 12, column: 36 } }],
+    [{ start: { line: 13, column: 21 }, end: { line: 13, column: 22 } }],
+    [{ start: { line: 13, column: 21 }, end: { line: 13, column: 22 } }],
+    [{ start: { line: 13, column: 24 }, end: { line: 13, column: 33 } }],
+    [{ start: { line: 13, column: 24 }, end: { line: 13, column: 33 } }],
+    [{ start: { line: 13, column: 12 }, end: { line: 13, column: 34 } }],
+    [{ start: { line: 13, column: 4 }, end: { line: 13, column: 36 } }],
+    [{ start: { line: 14, column: 20 }, end: { line: 14, column: 29 } }],
+    [{ start: { line: 14, column: 20 }, end: { line: 14, column: 29 } }],
+    [{ start: { line: 14, column: 12 }, end: { line: 14, column: 30 } }],
+    [{ start: { line: 14, column: 34 }, end: { line: 14, column: 43 } }],
+    [{ start: { line: 14, column: 34 }, end: { line: 14, column: 43 } }],
+    [{ start: { line: 14, column: 12 }, end: { line: 14, column: 43 } }],
+    [{ start: { line: 14, column: 4 }, end: { line: 14, column: 45 } }],
+    [{ start: { line: 15, column: 23 }, end: { line: 15, column: 30 } }],
+    [{ start: { line: 15, column: 23 }, end: { line: 15, column: 30 } }],
+    [{ start: { line: 15, column: 4 }, end: { line: 15, column: 32 } }],
+    [{ start: { line: 15, column: 4 }, end: { line: 15, column: 32 } }],
+    [{ start: { line: 15, column: 4 }, end: { line: 15, column: 32 } }, 1],
+    [{ start: { line: 8, column: 2 }, end: { line: 16, column: 3 } }, 1],
+    [{ start: { line: 8, column: 2 }, end: { line: 16, column: 3 } }, 1],
   ] as LocationData;
 
   const sourceMap = generateSourceMap(locationData);
-  const expected = "3:2:6:3;;;;;4:21:4:22;;:24::33;;:12::34;:4::36;5:20:5:29;;:12::30;:34::46;;:12;3:2:6:3:1;;;;8::16::0;;;;;9:12:9:21;;:25::35;:12;:4::37;10:12:10:19;;:23::30;;:12;:4::32;11:12:11:13;;:17::18;;:12;:4::20;12:12:12:21;;:25::34;;:12;:4::36;13:21:13:22;;:24::33;;:12::34;:4::36;14:20:14:29;;:12::30;:34::43;;:12;:4::45;15:23:15:30;;:4::32;;8:2:16:3:1;;";
+  const expected = '3:2:6:3;;;;;4:21:4:22;;:24::33;;:12::34;:4::36;5:20:5:29;;:12::30;:34::46;;:12;3:2:6:3:1;;;;8::16::0;;;;;9:12:9:21;;:25::35;:12;:4::37;10:12:10:19;;:23::30;;:12;:4::32;11:12:11:13;;:17::18;;:12;:4::20;12:12:12:21;;:25::34;;:12;:4::36;13:21:13:22;;:24::33;;:12::34;:4::36;14:20:14:29;;:12::30;:34::43;;:12;:4::45;15:23:15:30;;:4::32;;8:2:16:3:1;;';
   expect(sourceMap).toBe(expected);
 
   const full = sourceMapToLocationData(sourceMap);

From ff58448081a79465a564b480cdeb696bce61569a Mon Sep 17 00:00:00 2001
From: mainnet-pat <mainnet_pat@protonmail.com>
Date: Sun, 26 Nov 2023 06:28:58 +0000
Subject: [PATCH 018/171] debug.bytecode is now a compact hex string

---
 packages/cashc/src/artifact/Artifact.ts    |  5 +++--
 packages/cashscript/src/LibauthTemplate.ts |  7 +++++--
 packages/utils/src/artifact.ts             | 20 ++++++++++----------
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/packages/cashc/src/artifact/Artifact.ts b/packages/cashc/src/artifact/Artifact.ts
index 65204da8..a5161b6f 100644
--- a/packages/cashc/src/artifact/Artifact.ts
+++ b/packages/cashc/src/artifact/Artifact.ts
@@ -1,8 +1,9 @@
 import {
-  Artifact, LogEntry, RequireMessage, Script, scriptToAsm,
+  Artifact, LogEntry, RequireMessage, Script, scriptToAsm, scriptToBytecode,
 } from '@cashscript/utils';
 import { version } from '../index.js';
 import { Ast } from '../ast/AST.js';
+import { binToHex } from '@bitauth/libauth';
 
 export function generateArtifact(
   ast: Ast,
@@ -29,7 +30,7 @@ export function generateArtifact(
   }));
 
   const bytecode = scriptToAsm(script);
-  const debugBytecode = scriptToAsm(debug.script);
+  const debugBytecode = binToHex(scriptToBytecode(debug.script));
 
   return {
     contractName: contract.name,
diff --git a/packages/cashscript/src/LibauthTemplate.ts b/packages/cashscript/src/LibauthTemplate.ts
index 0050e6ab..a5e055b7 100644
--- a/packages/cashscript/src/LibauthTemplate.ts
+++ b/packages/cashscript/src/LibauthTemplate.ts
@@ -1,5 +1,5 @@
 import {
-  AbiFunction, Artifact, PrimitiveType, asmToScript, decodeBool, decodeInt, decodeString, formatLibauthScript,
+  AbiFunction, Artifact, PrimitiveType, asmToScript, bytecodeToScript, decodeBool, decodeInt, decodeString, formatLibauthScript,
 } from '@cashscript/utils';
 import {
   hash160,
@@ -130,7 +130,10 @@ export const buildTemplate = async ({
   ).length;
 
   const formattedBytecode = contract.artifact.debug
-    ? formatLibauthScript(asmToScript(contract.artifact.debug.bytecode), contract.artifact.debug?.sourceMap!, contract.artifact.source).split('\n')
+    ? formatLibauthScript(
+        bytecodeToScript(hexToBin(contract.artifact.debug.bytecode)),
+        contract.artifact.debug?.sourceMap!,
+        contract.artifact.source).split('\n')
     : contract.artifact.bytecode.split(' ').map((asmElement) => {
       if (isHex(asmElement)) {
         return `<0x${asmElement}>`;
diff --git a/packages/utils/src/artifact.ts b/packages/utils/src/artifact.ts
index 98631b3d..97ef690d 100644
--- a/packages/utils/src/artifact.ts
+++ b/packages/utils/src/artifact.ts
@@ -12,15 +12,15 @@ export interface AbiFunction {
 }
 
 export interface LogEntry {
-  ip: number;
-  line: number;
-  data: Array<{ stackIndex: number, type: string } | string>;
+  ip: number; // instruction pointer
+  line: number; // line in the source code
+  data: Array<{ stackIndex: number, type: string } | string>; // data to be logged
 }
 
 export interface RequireMessage {
-  ip: number;
-  line: number;
-  message: string;
+  ip: number; // instruction pointer
+  line: number; // line in the source code
+  message: string; // custom message for failing `require` statement
 }
 
 export interface Artifact {
@@ -30,10 +30,10 @@ export interface Artifact {
   bytecode: string;
   source: string;
   debug?: {
-    bytecode: string;
-    sourceMap: string;
-    logs?: LogEntry[];
-    requireMessages?: RequireMessage[];
+    bytecode: string; // unlike `bytecode` property above, this is a hex-encoded binary string
+    sourceMap: string; // see documentation for `generateSourceMap`
+    logs: LogEntry[]; // log entries generated from `console.log` statements
+    requireMessages: RequireMessage[]; // messages for failing `require` statements
   };
   compiler: {
     name: string;

From 9c6686d14278da8704a778395cfcdffd9e0e3e0a Mon Sep 17 00:00:00 2001
From: mainnet-pat <mainnet_pat@protonmail.com>
Date: Sun, 26 Nov 2023 09:28:30 +0000
Subject: [PATCH 019/171] Fix tests

---
 packages/cashscript/test/e2e/P2PKH-tokens.test.ts | 2 +-
 packages/cashscript/test/e2e/misc.test.ts         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/cashscript/test/e2e/P2PKH-tokens.test.ts b/packages/cashscript/test/e2e/P2PKH-tokens.test.ts
index e280a30b..ccbab965 100644
--- a/packages/cashscript/test/e2e/P2PKH-tokens.test.ts
+++ b/packages/cashscript/test/e2e/P2PKH-tokens.test.ts
@@ -1,4 +1,4 @@
-import { randomUtxo, randomToken, randomNFT } from 'cashscript/src/utils.js';
+import { randomUtxo, randomToken, randomNFT } from '../../src/utils.js';
 import {
   Contract, SignatureTemplate, ElectrumNetworkProvider, MockNetworkProvider,
 } from '../../src/index.js';
diff --git a/packages/cashscript/test/e2e/misc.test.ts b/packages/cashscript/test/e2e/misc.test.ts
index a7808fdb..79e281c7 100644
--- a/packages/cashscript/test/e2e/misc.test.ts
+++ b/packages/cashscript/test/e2e/misc.test.ts
@@ -1,4 +1,4 @@
-import { randomUtxo } from 'cashscript/src/utils.js';
+import { randomUtxo } from '../../src/utils.js';
 import {
   Contract, MockNetworkProvider, ElectrumNetworkProvider, Network,
 } from '../../src/index.js';

From 0379c304f554bc4aead232e7551251f2b12cfcbc Mon Sep 17 00:00:00 2001
From: mainnet-pat <mainnet_pat@protonmail.com>
Date: Sun, 26 Nov 2023 17:55:32 +0000
Subject: [PATCH 020/171] Add extensive sourcemap tests, fix generate traversal
 issues

---
 .../src/generation/GenerateTargetTraversal.ts | 21 +++----
 packages/cashc/test/ast/Location.test.ts      | 58 ++++++++++++++++++-
 .../cashscript/test/LibauthTemplate.test.ts   | 22 +++++++
 packages/utils/src/libauth.ts                 | 20 +++++--
 tsconfig.build.json                           |  4 +-
 5 files changed, 107 insertions(+), 18 deletions(-)

diff --git a/packages/cashc/src/generation/GenerateTargetTraversal.ts b/packages/cashc/src/generation/GenerateTargetTraversal.ts
index 6f2b06fb..5bc1ea2f 100644
--- a/packages/cashc/src/generation/GenerateTargetTraversal.ts
+++ b/packages/cashc/src/generation/GenerateTargetTraversal.ts
@@ -197,7 +197,7 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
       // we add it back to the stack
       this.pushToStack('(value)');
     } else {
-      this.emit(finalOp, location!);
+      this.emit(finalOp, location!, 1);
 
       // At this point there is no verification value left on the stack:
       //  - scoped stack is cleared inside branch ended by OP_ENDIF
@@ -267,8 +267,9 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
   }
 
   visitTimeOp(node: TimeOpNode): Node {
+    // const countBefore = this.output.length;
     node.expression = this.visit(node.expression);
-    this.emit(compileTimeOp(node.timeOp), node.location!);
+    this.emit(compileTimeOp(node.timeOp), node.location!, 1);
 
     // add debug require message
     if (node.message) {
@@ -286,7 +287,7 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
   visitRequire(node: RequireNode): Node {
     node.expression = this.visit(node.expression);
 
-    this.emit(Op.OP_VERIFY, node.location!);
+    this.emit(Op.OP_VERIFY, node.location!, 1);
 
     // add debug require message
     if (node.message) {
@@ -343,7 +344,7 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
       this.popFromStack();
     }
 
-    this.emit(compileCast(node.expression.type as PrimitiveType, node.type), node.location!);
+    this.emit(compileCast(node.expression.type as PrimitiveType, node.type), node.location!, 1);
     this.popFromStack();
     this.pushToStack('(value)');
     return node;
@@ -356,7 +357,7 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
 
     node.parameters = this.visitList(node.parameters);
 
-    this.emit(compileGlobalFunction(node.identifier.name as GlobalFunction), node.location!);
+    this.emit(compileGlobalFunction(node.identifier.name as GlobalFunction), node.location!, 1);
     this.popFromStack(node.parameters.length);
     this.pushToStack('(value)');
 
@@ -367,7 +368,7 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
     this.emit(encodeBool(false), node.location!);
     this.pushToStack('(value)');
     node.parameters = this.visitList(node.parameters);
-    this.emit(Op.OP_CHECKMULTISIG, node.location!);
+    this.emit(Op.OP_CHECKMULTISIG, node.location!, 1);
     const sigs = node.parameters[0] as ArrayNode;
     const pks = node.parameters[1] as ArrayNode;
     this.popFromStack(sigs.elements.length + pks.elements.length + 3);
@@ -459,10 +460,10 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
     node.tuple = this.visit(node.tuple);
 
     if (node.index === 0) {
-      this.emit(Op.OP_DROP, node.location!);
+      this.emit(Op.OP_DROP, node.location!, 1);
       this.popFromStack();
     } else if (node.index === 1) {
-      this.emit(Op.OP_NIP, node.location!);
+      this.emit(Op.OP_NIP, node.location!, 1);
       this.nipFromStack();
     }
 
@@ -473,7 +474,7 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
     node.left = this.visit(node.left);
     node.right = this.visit(node.right);
     const isNumeric = resultingType(node.left.type, node.right.type) === PrimitiveType.INT;
-    this.emit(compileBinaryOp(node.operator, isNumeric), node.location!);
+    this.emit(compileBinaryOp(node.operator, isNumeric), node.location!, 1);
     this.popFromStack(2);
     this.pushToStack('(value)');
     if (node.operator === BinaryOperator.SPLIT) this.pushToStack('(value)');
@@ -496,7 +497,7 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
 
   visitArray(node: ArrayNode): Node {
     node.elements = this.visitList(node.elements);
-    this.emit(encodeInt(BigInt(node.elements.length)), node.location!);
+    this.emit(encodeInt(BigInt(node.elements.length)), node.location!, 1);
     this.pushToStack('(value)');
     return node;
   }
diff --git a/packages/cashc/test/ast/Location.test.ts b/packages/cashc/test/ast/Location.test.ts
index 54c51769..723476d5 100644
--- a/packages/cashc/test/ast/Location.test.ts
+++ b/packages/cashc/test/ast/Location.test.ts
@@ -1,9 +1,11 @@
 import fs from 'fs';
 import { URL } from 'url';
-import { parseCode } from '../../src/compiler.js';
+import { compileString, parseCode } from '../../src/compiler.js';
+import { buildOpCodeMap, bytecodeToAsm, bytecodeToScript, formatLibauthScript } from '@cashscript/utils';
+import { hexToBin } from '@bitauth/libauth';
 
 describe('Location', () => {
-  it('should retrieve correct text from location', () => {
+  it.skip('should retrieve correct text from location', () => {
     const code = fs.readFileSync(new URL('../valid-contract-files/simple_functions.cash', import.meta.url), { encoding: 'utf-8' });
     const ast = parseCode(code);
 
@@ -12,4 +14,56 @@ describe('Location', () => {
     expect(f.location).toBeDefined();
     expect((f.location!).text(code)).toEqual('function hello(sig s, pubkey pk) {\n        require(checkSig(s, pk));\n    }');
   });
+
+  const wrap = (code: string): string => {
+    return `
+contract test() {
+  function test() {
+    require(${code});
+  }
+}`
+  };
+
+  describe('should produce same bytecode', () => {
+    const blocks = [
+      '1 < 1', '1 <= 1', '1 == 1', '1 != 1', '1 > 1', '1 >= 1',
+      '(1 - 1) == 1', '(1 + 1) == 1', '(1 * 1) == 1', '(1 / 1) == 1',
+      '(true && true) == true', '(true || true) == true',
+      '(0x01 & 0x01) == 0x01', '(0x01 | 0x01) == 0x01', '(0x01 ^ 0x01) == 0x01',
+      '"1" + "1" == "1"', '"1" + "1" != "1"', '"11".split(1)[0] == "1"', '"11".split(1)[1] == "1"',
+      '"1".reverse() == "1"', '"1".length == 1', '0x01.length == 1', '-333 == 1',
+      'tx.inputs[0].tokenAmount == 1',
+      'this.activeInputIndex == 1', 'tx.version == 1',
+      'abs(-1) == 1', 'within(1,1,1) == true', 'bytes(sha256(1)) == bytes(0x01)',
+      'checkSig(sig(0x00), pubkey(0x00))', 'checkMultiSig([sig(0x00), sig(0x00)], [pubkey(0x00), pubkey(0x00)])',
+      'checkDataSig(datasig(0x00), 0x00, pubkey(0x00))',
+      'tx.time >= 1', 'tx.age >= 1',
+      'bytes(1) == 0x01', 'int(0x01) == 1',
+    ];
+
+    blocks.forEach(block => {
+      it(`should test ${block}`, () => {
+        {
+          const source = wrap(block);
+          const artifact = compileString(source);
+          const expected = bytecodeToAsm(hexToBin(artifact.debug!.bytecode));
+          const opCodeMap = buildOpCodeMap(bytecodeToScript(hexToBin(artifact.debug!.bytecode)), artifact.debug!.sourceMap);
+
+          const received = Object.values(opCodeMap).join(' ').replaceAll('<0x', '').replaceAll('>', '').replace(/\s+/g, ' ');
+          expect(received).toBe(expected);
+        }
+
+        {
+          // break statements into separate lines, test `hint`
+          const source = wrap(block.replaceAll(' ', '\n').replaceAll(')', '\n)')).replaceAll('(\n)', '()').replace(/\((?!\))/g, '(\n');
+          const artifact = compileString(source);
+          const expected = bytecodeToAsm(hexToBin(artifact.debug!.bytecode));
+          const opCodeMap = buildOpCodeMap(bytecodeToScript(hexToBin(artifact.debug!.bytecode)), artifact.debug!.sourceMap);
+
+          const received = Object.values(opCodeMap).join(' ').replaceAll('<0x', '').replaceAll('>', '').replace(/\s+/g, ' ');
+          expect(received).toBe(expected);
+        }
+      });
+    });
+  });
 });
diff --git a/packages/cashscript/test/LibauthTemplate.test.ts b/packages/cashscript/test/LibauthTemplate.test.ts
index f4f0b978..b90910e1 100644
--- a/packages/cashscript/test/LibauthTemplate.test.ts
+++ b/packages/cashscript/test/LibauthTemplate.test.ts
@@ -7,6 +7,28 @@ import './JestExtensions.js';
 import { randomUtxo } from '../src/utils.js';
 
 describe('Libauth template generation tests', () => {
+  it('should log console statements', async () => {
+    const code = `
+contract Example(string cash) {
+  function test(string script) {
+    require(
+      cash +
+      script ==
+      "cashscript"
+    );
+  }
+}
+`;
+    const artifact = compileString(code);
+
+    const provider = new MockNetworkProvider();
+    const contract = new Contract(artifact, ["cash"], { provider });
+    provider.addUtxo(contract.address, randomUtxo());
+
+    const transaction = contract.functions.test("script").to(contract.address, 10000n);
+    await transaction.debug()
+  });
+
   it('should log console statements', async () => {
     const code = `
     pragma cashscript ^0.9.0;
diff --git a/packages/utils/src/libauth.ts b/packages/utils/src/libauth.ts
index 09593448..c8cdd59f 100644
--- a/packages/utils/src/libauth.ts
+++ b/packages/utils/src/libauth.ts
@@ -2,7 +2,7 @@ import { binToHex } from '@bitauth/libauth';
 import { Script, Op } from './script.js';
 import { sourceMapToLocationData } from './sourceMap.js';
 
-export function formatLibauthScript(bytecode: Script, souceMap: string, sourceCode: string): string {
+function buildLineMap(bytecode: Script, souceMap: string): { [line: string]: Script; } {
   const lineMap: { [line: string]: Script } = {} as any;
 
   const locationData = sourceMapToLocationData(souceMap);
@@ -15,9 +15,9 @@ export function formatLibauthScript(bytecode: Script, souceMap: string, sourceCo
       // eslint-disable-next-line
       positionHint
         ? location?.end.line
-        : (op === Op.OP_ENDIF || op === Op.OP_ELSE || op === Op.OP_NIP || op === Op.OP_CHECKLOCKTIMEVERIFY
-          ? location?.end.line
-          : location?.start.line),
+        // : (op === Op.OP_ENDIF || op === Op.OP_ELSE || op === Op.OP_NIP || op === Op.OP_CHECKLOCKTIMEVERIFY
+        //   ? location?.end.line
+          : location?.start.line,
     ];
   });
 
@@ -28,6 +28,12 @@ export function formatLibauthScript(bytecode: Script, souceMap: string, sourceCo
     lineMap[line as string].push(op as any);
   });
 
+  return lineMap;
+}
+
+export function buildOpCodeMap(bytecode: Script, souceMap: string) {
+  const lineMap = buildLineMap(bytecode, souceMap);
+
   const opCodeMap: { [key: string]: string } = {};
   for (const [key, value] of Object.entries(lineMap)) {
     opCodeMap[key] = value.map((asmElement) => {
@@ -41,6 +47,12 @@ export function formatLibauthScript(bytecode: Script, souceMap: string, sourceCo
     }).join(' ');
   }
 
+  return opCodeMap;
+}
+
+export function formatLibauthScript(bytecode: Script, souceMap: string, sourceCode: string): string {
+  const opCodeMap = buildOpCodeMap(bytecode, souceMap);
+
   const split = sourceCode.split('\n');
 
   const maxCodeLength = Math.max(...split.map((val) => val.length));
diff --git a/tsconfig.build.json b/tsconfig.build.json
index 25fde195..505b5577 100644
--- a/tsconfig.build.json
+++ b/tsconfig.build.json
@@ -1,9 +1,9 @@
 {
   "compilerOptions": {
-    "target": "es2020",
+    "target": "es2021",
     "module": "esnext",
     "declaration": true,
-    "lib": ["es2020", "dom"],
+    "lib": ["es2021", "dom"],
     "types": ["node", "jest"],
     "sourceMap": true,
     "strict": true,

From 0817b03223d74bae5ade25ccac315e5fe130221d Mon Sep 17 00:00:00 2001
From: mainnet-pat <mainnet_pat@protonmail.com>
Date: Mon, 27 Nov 2023 09:07:23 +0000
Subject: [PATCH 021/171] Fix some edge cases for logging data

---
 packages/cashscript/src/LibauthTemplate.ts    | 14 ++++++--
 .../cashscript/test/LibauthTemplate.test.ts   | 35 ++++++++++++++++---
 2 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/packages/cashscript/src/LibauthTemplate.ts b/packages/cashscript/src/LibauthTemplate.ts
index a5e055b7..195542f6 100644
--- a/packages/cashscript/src/LibauthTemplate.ts
+++ b/packages/cashscript/src/LibauthTemplate.ts
@@ -525,7 +525,14 @@ export const debugTemplate = (template: AuthenticationTemplate, artifact: Artifa
   const debugResult = vm.debug(program);
 
   for (const log of artifact.debug?.logs ?? []) {
-    const { stack } = debugResult.find((state: AuthenticationProgramStateBCHCHIPs) => state.ip === log.ip)!;
+    // there might be 2 elements with same instruction pointer, first from unllocking script, second from locking
+    const state = debugResult
+      .filter((state: AuthenticationProgramStateBCHCHIPs) => state.ip === log.ip)!
+      .slice().reverse()[0];
+
+    if (!state) {
+      throw Error(`Instruction pointer ${log.ip} points to a non-existing state of the program`);
+    }
 
     let line = `${artifact.contractName}.cash:${log.line}`;
     log.data.forEach((element) => {
@@ -533,7 +540,10 @@ export const debugTemplate = (template: AuthenticationTemplate, artifact: Artifa
       if (typeof element === 'string') {
         value = element;
       } else {
-        const stackItem = stack.slice().reverse()[element.stackIndex];
+        const stackItem = state.stack.slice().reverse()[element.stackIndex];
+        if (!stackItem) {
+          throw Error(`Stack item at index ${element.stackIndex} not found at instruction pointer ${log.ip}`);
+        }
         switch (element.type) {
           case PrimitiveType.BOOL:
             value = decodeBool(stackItem);
diff --git a/packages/cashscript/test/LibauthTemplate.test.ts b/packages/cashscript/test/LibauthTemplate.test.ts
index b90910e1..160ac9dc 100644
--- a/packages/cashscript/test/LibauthTemplate.test.ts
+++ b/packages/cashscript/test/LibauthTemplate.test.ts
@@ -56,13 +56,38 @@ contract Example(string cash) {
     const artifact = compileString(code);
 
     const provider = new MockNetworkProvider();
-    const contract = new Contract(artifact, [alicePub, bobPub, 100000n], { provider });
-    provider.addUtxo(contract.address, randomUtxo());
 
-    const transaction = contract.functions.transfer(new SignatureTemplate(bobPriv)).to(contract.address, 10000n);
+    {
+      const contract = new Contract(artifact, [alicePub, bobPub, 100000n], { provider });
+      provider.addUtxo(contract.address, randomUtxo());
+
+      const transaction = contract.functions.transfer(new SignatureTemplate(bobPriv)).to(contract.address, 10000n);
+
+      await (expect(transaction)).toLog(/0x[0-9a-f]{130} 100000 0x[0-9a-f]{66} 0x[0-9a-f]{66} 0xbeef 1 test true/);
+      await (expect(transaction)).toLog('beef');
+    }
+
+    const ip = artifact.debug!.logs[0].ip;
+    {
+      artifact.debug!.logs[0].ip = 100;
+      const contract = new Contract(artifact, [alicePub, bobPub, 100000n], { provider });
+      provider.addUtxo(contract.address, randomUtxo());
 
-    await (expect(transaction)).toLog(/0x[0-9a-f]{130} 100000 0x[0-9a-f]{66} 0x[0-9a-f]{66} 0xbeef 1 test true/);
-    await (expect(transaction)).toLog('beef');
+      const transaction = contract.functions.transfer(new SignatureTemplate(bobPriv)).to(contract.address, 10000n);
+
+      await (expect(transaction.debug())).rejects.toThrow(/Instruction pointer 100 points to a non-existing state of the program/);
+    }
+
+    artifact.debug!.logs[0].ip = ip;
+    {
+      (artifact.debug!.logs[0].data[0] as any).stackIndex = 100;
+      const contract = new Contract(artifact, [alicePub, bobPub, 100000n], { provider });
+      provider.addUtxo(contract.address, randomUtxo());
+
+      const transaction = contract.functions.transfer(new SignatureTemplate(bobPriv)).to(contract.address, 10000n);
+
+      await (expect(transaction.debug())).rejects.toThrow(/Stack item at index 100 not found at instruction pointer 9/);
+    }
   });
 
   it('should check for failed requires', async () => {

From 370c29b44a9623701c16ee7d236ad2cc4c2384fc Mon Sep 17 00:00:00 2001
From: mainnet-pat <mainnet_pat@protonmail.com>
Date: Mon, 27 Nov 2023 10:17:42 +0000
Subject: [PATCH 022/171] Add demo testing suite to locally develop and debug
 CashScript contracts Needs to update imports after new release

---
 demo/testing-suite/artifacts/example.json |   46 +
 demo/testing-suite/contracts/example.cash |    6 +
 demo/testing-suite/jest.config.js         |    6 +
 demo/testing-suite/jest.setup.js          |    8 +
 demo/testing-suite/package.json           |   38 +
 demo/testing-suite/src/index.ts           |    0
 demo/testing-suite/tasks/index.ts         |   27 +
 demo/testing-suite/test/example.test.ts   |   21 +
 demo/testing-suite/tsconfig.build.json    |   23 +
 demo/testing-suite/tsconfig.json          |   11 +
 demo/testing-suite/tsconfig.test.json     |   12 +
 demo/testing-suite/yarn.lock              | 2380 +++++++++++++++++++++
 12 files changed, 2578 insertions(+)
 create mode 100644 demo/testing-suite/artifacts/example.json
 create mode 100644 demo/testing-suite/contracts/example.cash
 create mode 100644 demo/testing-suite/jest.config.js
 create mode 100644 demo/testing-suite/jest.setup.js
 create mode 100644 demo/testing-suite/package.json
 create mode 100644 demo/testing-suite/src/index.ts
 create mode 100644 demo/testing-suite/tasks/index.ts
 create mode 100644 demo/testing-suite/test/example.test.ts
 create mode 100644 demo/testing-suite/tsconfig.build.json
 create mode 100644 demo/testing-suite/tsconfig.json
 create mode 100644 demo/testing-suite/tsconfig.test.json
 create mode 100644 demo/testing-suite/yarn.lock

diff --git a/demo/testing-suite/artifacts/example.json b/demo/testing-suite/artifacts/example.json
new file mode 100644
index 00000000..710264fd
--- /dev/null
+++ b/demo/testing-suite/artifacts/example.json
@@ -0,0 +1,46 @@
+{
+  "contractName": "Example",
+  "constructorInputs": [],
+  "abi": [
+    {
+      "name": "test",
+      "inputs": [
+        {
+          "name": "value",
+          "type": "int"
+        }
+      ]
+    }
+  ],
+  "bytecode": "OP_1 OP_NUMEQUAL",
+  "source": "contract Example() {\n  function test(int value) {\n    console.log(value, \"test\");\n    require(value == 1, \"Wrong value passed\");\n  }\n}\n",
+  "debug": {
+    "bytecode": "007a519c",
+    "sourceMap": "4:12:4:17;;:21::22;:12:::1",
+    "logs": [
+      {
+        "ip": 0,
+        "line": 3,
+        "data": [
+          {
+            "stackIndex": 0,
+            "type": "int"
+          },
+          "test"
+        ]
+      }
+    ],
+    "requireMessages": [
+      {
+        "ip": 4,
+        "line": 4,
+        "message": "Wrong value passed"
+      }
+    ]
+  },
+  "compiler": {
+    "name": "cashc",
+    "version": "0.9.2"
+  },
+  "updatedAt": "2023-11-27T09:10:47.313Z"
+}
\ No newline at end of file
diff --git a/demo/testing-suite/contracts/example.cash b/demo/testing-suite/contracts/example.cash
new file mode 100644
index 00000000..3df2d670
--- /dev/null
+++ b/demo/testing-suite/contracts/example.cash
@@ -0,0 +1,6 @@
+contract Example() {
+  function test(int value) {
+    console.log(value, "test");
+    require(value == 1, "Wrong value passed");
+  }
+}
diff --git a/demo/testing-suite/jest.config.js b/demo/testing-suite/jest.config.js
new file mode 100644
index 00000000..97af0a74
--- /dev/null
+++ b/demo/testing-suite/jest.config.js
@@ -0,0 +1,6 @@
+export default {
+  transform: {},
+  roots: ['./dist-test'],
+  testEnvironment: 'jest-environment-node',
+  setupFilesAfterEnv: ['./jest.setup.js'],
+};
diff --git a/demo/testing-suite/jest.setup.js b/demo/testing-suite/jest.setup.js
new file mode 100644
index 00000000..167fbc8c
--- /dev/null
+++ b/demo/testing-suite/jest.setup.js
@@ -0,0 +1,8 @@
+import { jest } from '@jest/globals';
+import { inspect } from 'util';
+inspect.defaultOptions.depth = 10;
+
+jest.setTimeout(50000);
+
+globalThis.jest = jest;
+
diff --git a/demo/testing-suite/package.json b/demo/testing-suite/package.json
new file mode 100644
index 00000000..1ab89e46
--- /dev/null
+++ b/demo/testing-suite/package.json
@@ -0,0 +1,38 @@
+{
+  "name": "testing-suite",
+  "version": "1.0.0",
+  "description": "Example project to develop and test CashScript contracts",
+  "main": "index.js",
+  "type": "module",
+  "author": "mainnet-pat",
+  "license": "MIT",
+  "private": true,
+  "directories": {
+    "lib": "src",
+    "test": "test"
+  },
+  "scripts": {
+    "build": "yarn clean && yarn compile",
+    "build:test": "yarn clean:test && yarn compile:test",
+    "clean": "rm -rf ./dist",
+    "clean:test": "rm -rf ./dist-test",
+    "compile": "tsc -p tsconfig.json && ts-node-esm tasks/index.ts compile",
+    "compile:test": "tsc -p tsconfig.test.json && ts-node-esm tasks/index.ts compile",
+    "lint": "eslint . --ext .ts --ignore-path ../../.eslintignore",
+    "prepare": "yarn build",
+    "prepublishOnly": "yarn test && yarn lint",
+    "pretest": "yarn build:test",
+    "test": "NODE_OPTIONS='--experimental-vm-modules --no-warnings' jest"
+  },
+  "dependencies": {
+    "cashc": "^0.9.2",
+    "cashscript": "^0.9.2"
+  },
+  "devDependencies": {
+    "@jest/globals": "^29.4.1",
+    "@types/jest": "^29.4.1",
+    "jest": "^29.4.1",
+    "ts-node": "^10.9.1",
+    "typescript": "^4.9.5"
+  }
+}
diff --git a/demo/testing-suite/src/index.ts b/demo/testing-suite/src/index.ts
new file mode 100644
index 00000000..e69de29b
diff --git a/demo/testing-suite/tasks/index.ts b/demo/testing-suite/tasks/index.ts
new file mode 100644
index 00000000..1a31a10e
--- /dev/null
+++ b/demo/testing-suite/tasks/index.ts
@@ -0,0 +1,27 @@
+import { compileString } from 'cashc';
+import fs from 'fs';
+import { URL } from 'url';
+import urlJoin from 'url-join';
+
+
+export const compile = () => {
+  const directory = new URL('../contracts', import.meta.url);
+  const result = fs.readdirSync(directory)
+    .filter((fn) => fn.endsWith('.cash'))
+    .map((fn) => ({ fn, contents: fs.readFileSync(new URL(urlJoin(directory.toString(), fn)), { encoding: 'utf-8' }) }));
+
+  result.forEach(({ fn, contents }) => {
+  const artifact = compileString(contents);
+
+    fs.writeFileSync(new URL(`../artifacts/${fn.replace('.cash', '.json')}`, import.meta.url), JSON.stringify(artifact, null, 2));
+  });
+}
+
+switch (process.argv[2]) {
+  case "compile":
+    compile();
+    break;
+  default:
+    console.log("Unknown task");
+    break;
+}
diff --git a/demo/testing-suite/test/example.test.ts b/demo/testing-suite/test/example.test.ts
new file mode 100644
index 00000000..ccf80dbe
--- /dev/null
+++ b/demo/testing-suite/test/example.test.ts
@@ -0,0 +1,21 @@
+import artifact from '../artifacts/example.json' assert { type: "json" };
+import { Contract, MockNetworkProvider } from 'cashscript/dist/src';
+import { randomUtxo } from 'cashscript/dist/src/utils';
+import 'cashscript/dist/test/JestExtensions';
+
+describe("test example contract functions", () => {
+  it("should check for output logs", async () => {
+    const provider = new MockNetworkProvider();
+    const contract = new Contract(artifact, [], { provider });
+    provider.addUtxo(contract.address, randomUtxo());
+
+    artifact.debug.logs[0].ip = 100;
+
+    let transaction = contract.functions.test(0n).to(contract.address, 10000n);
+    await (expect(transaction)).toLog(/0 test/);
+    await (expect(transaction)).toFailRequireWith(/Wrong value passed/);
+
+    transaction = contract.functions.test(1n).to(contract.address, 10000n);
+    await expect(transaction.send()).resolves.not.toThrow();
+  });
+});
diff --git a/demo/testing-suite/tsconfig.build.json b/demo/testing-suite/tsconfig.build.json
new file mode 100644
index 00000000..7de3c82e
--- /dev/null
+++ b/demo/testing-suite/tsconfig.build.json
@@ -0,0 +1,23 @@
+{
+  "compilerOptions": {
+    "target": "es2021",
+    "module": "esnext",
+    "declaration": true,
+    "lib": ["es2021", "dom"],
+    "types": ["node", "jest"],
+    "sourceMap": true,
+    "strict": true,
+    "strictPropertyInitialization": false,
+    "experimentalDecorators": true,
+    "moduleResolution": "node",
+    "resolveJsonModule": true,
+    "esModuleInterop": true,
+    "skipLibCheck": true,
+  },
+  "exclude": [
+    "node_modules",
+    "dist",
+    "**/dist-test",
+    "taksks",
+  ],
+}
diff --git a/demo/testing-suite/tsconfig.json b/demo/testing-suite/tsconfig.json
new file mode 100644
index 00000000..0027ae6c
--- /dev/null
+++ b/demo/testing-suite/tsconfig.json
@@ -0,0 +1,11 @@
+{
+  "extends": "./tsconfig.build.json",
+
+  "compilerOptions": {
+    "outDir": "./dist",
+  },
+
+  "include": [
+    "src/**/*",
+  ],
+}
diff --git a/demo/testing-suite/tsconfig.test.json b/demo/testing-suite/tsconfig.test.json
new file mode 100644
index 00000000..67787860
--- /dev/null
+++ b/demo/testing-suite/tsconfig.test.json
@@ -0,0 +1,12 @@
+{
+  "extends": "./tsconfig.build.json",
+
+  "compilerOptions": {
+    "outDir": "./dist-test",
+  },
+
+  "include": [
+    "src/**/*",
+    "test/**/*",
+  ],
+}
diff --git a/demo/testing-suite/yarn.lock b/demo/testing-suite/yarn.lock
new file mode 100644
index 00000000..b9a989bd
--- /dev/null
+++ b/demo/testing-suite/yarn.lock
@@ -0,0 +1,2380 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+"@ampproject/remapping@^2.2.0":
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.1.tgz#99e8e11851128b8702cd57c33684f1d0f260b630"
+  integrity sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==
+  dependencies:
+    "@jridgewell/gen-mapping" "^0.3.0"
+    "@jridgewell/trace-mapping" "^0.3.9"
+
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.22.13", "@babel/code-frame@^7.23.4":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.23.4.tgz#03ae5af150be94392cb5c7ccd97db5a19a5da6aa"
+  integrity sha512-r1IONyb6Ia+jYR2vvIDhdWdlTGhqbBoFqLTQidzZ4kepUFH15ejXvFHxCVbtl7BOXIudsIubf4E81xeA3h3IXA==
+  dependencies:
+    "@babel/highlight" "^7.23.4"
+    chalk "^2.4.2"
+
+"@babel/compat-data@^7.22.9":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.23.3.tgz#3febd552541e62b5e883a25eb3effd7c7379db11"
+  integrity sha512-BmR4bWbDIoFJmJ9z2cZ8Gmm2MXgEDgjdWgpKmKWUt54UGFJdlj31ECtbaDvCG/qVdG3AQ1SfpZEs01lUFbzLOQ==
+
+"@babel/core@^7.11.6", "@babel/core@^7.12.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.23.3.tgz#5ec09c8803b91f51cc887dedc2654a35852849c9"
+  integrity sha512-Jg+msLuNuCJDyBvFv5+OKOUjWMZgd85bKjbICd3zWrKAo+bJ49HJufi7CQE0q0uR8NGyO6xkCACScNqyjHSZew==
+  dependencies:
+    "@ampproject/remapping" "^2.2.0"
+    "@babel/code-frame" "^7.22.13"
+    "@babel/generator" "^7.23.3"
+    "@babel/helper-compilation-targets" "^7.22.15"
+    "@babel/helper-module-transforms" "^7.23.3"
+    "@babel/helpers" "^7.23.2"
+    "@babel/parser" "^7.23.3"
+    "@babel/template" "^7.22.15"
+    "@babel/traverse" "^7.23.3"
+    "@babel/types" "^7.23.3"
+    convert-source-map "^2.0.0"
+    debug "^4.1.0"
+    gensync "^1.0.0-beta.2"
+    json5 "^2.2.3"
+    semver "^6.3.1"
+
+"@babel/generator@^7.23.3", "@babel/generator@^7.23.4", "@babel/generator@^7.7.2":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.4.tgz#4a41377d8566ec18f807f42962a7f3551de83d1c"
+  integrity sha512-esuS49Cga3HcThFNebGhlgsrVLkvhqvYDTzgjfFFlHJcIfLe5jFmRRfCQ1KuBfc4Jrtn3ndLgKWAKjBE+IraYQ==
+  dependencies:
+    "@babel/types" "^7.23.4"
+    "@jridgewell/gen-mapping" "^0.3.2"
+    "@jridgewell/trace-mapping" "^0.3.17"
+    jsesc "^2.5.1"
+
+"@babel/helper-compilation-targets@^7.22.15":
+  version "7.22.15"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.15.tgz#0698fc44551a26cf29f18d4662d5bf545a6cfc52"
+  integrity sha512-y6EEzULok0Qvz8yyLkCvVX+02ic+By2UdOhylwUOvOn9dvYc9mKICJuuU1n1XBI02YWsNsnrY1kc6DVbjcXbtw==
+  dependencies:
+    "@babel/compat-data" "^7.22.9"
+    "@babel/helper-validator-option" "^7.22.15"
+    browserslist "^4.21.9"
+    lru-cache "^5.1.1"
+    semver "^6.3.1"
+
+"@babel/helper-environment-visitor@^7.22.20":
+  version "7.22.20"
+  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz#96159db61d34a29dba454c959f5ae4a649ba9167"
+  integrity sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==
+
+"@babel/helper-function-name@^7.23.0":
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz#1f9a3cdbd5b2698a670c30d2735f9af95ed52759"
+  integrity sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==
+  dependencies:
+    "@babel/template" "^7.22.15"
+    "@babel/types" "^7.23.0"
+
+"@babel/helper-hoist-variables@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz#c01a007dac05c085914e8fb652b339db50d823bb"
+  integrity sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==
+  dependencies:
+    "@babel/types" "^7.22.5"
+
+"@babel/helper-module-imports@^7.22.15":
+  version "7.22.15"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz#16146307acdc40cc00c3b2c647713076464bdbf0"
+  integrity sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==
+  dependencies:
+    "@babel/types" "^7.22.15"
+
+"@babel/helper-module-transforms@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz#d7d12c3c5d30af5b3c0fcab2a6d5217773e2d0f1"
+  integrity sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==
+  dependencies:
+    "@babel/helper-environment-visitor" "^7.22.20"
+    "@babel/helper-module-imports" "^7.22.15"
+    "@babel/helper-simple-access" "^7.22.5"
+    "@babel/helper-split-export-declaration" "^7.22.6"
+    "@babel/helper-validator-identifier" "^7.22.20"
+
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.8.0":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz#dd7ee3735e8a313b9f7b05a773d892e88e6d7295"
+  integrity sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==
+
+"@babel/helper-simple-access@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz#4938357dc7d782b80ed6dbb03a0fba3d22b1d5de"
+  integrity sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==
+  dependencies:
+    "@babel/types" "^7.22.5"
+
+"@babel/helper-split-export-declaration@^7.22.6":
+  version "7.22.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz#322c61b7310c0997fe4c323955667f18fcefb91c"
+  integrity sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==
+  dependencies:
+    "@babel/types" "^7.22.5"
+
+"@babel/helper-string-parser@^7.23.4":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz#9478c707febcbbe1ddb38a3d91a2e054ae622d83"
+  integrity sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==
+
+"@babel/helper-validator-identifier@^7.22.20":
+  version "7.22.20"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz#c4ae002c61d2879e724581d96665583dbc1dc0e0"
+  integrity sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==
+
+"@babel/helper-validator-option@^7.22.15":
+  version "7.22.15"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.22.15.tgz#694c30dfa1d09a6534cdfcafbe56789d36aba040"
+  integrity sha512-bMn7RmyFjY/mdECUbgn9eoSY4vqvacUnS9i9vGAGttgFWesO6B4CYWA7XlpbWgBt71iv/hfbPlynohStqnu5hA==
+
+"@babel/helpers@^7.23.2":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.23.4.tgz#7d2cfb969aa43222032193accd7329851facf3c1"
+  integrity sha512-HfcMizYz10cr3h29VqyfGL6ZWIjTwWfvYBMsBVGwpcbhNGe3wQ1ZXZRPzZoAHhd9OqHadHqjQ89iVKINXnbzuw==
+  dependencies:
+    "@babel/template" "^7.22.15"
+    "@babel/traverse" "^7.23.4"
+    "@babel/types" "^7.23.4"
+
+"@babel/highlight@^7.23.4":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.23.4.tgz#edaadf4d8232e1a961432db785091207ead0621b"
+  integrity sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.22.20"
+    chalk "^2.4.2"
+    js-tokens "^4.0.0"
+
+"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.22.15", "@babel/parser@^7.23.3", "@babel/parser@^7.23.4":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.4.tgz#409fbe690c333bb70187e2de4021e1e47a026661"
+  integrity sha512-vf3Xna6UEprW+7t6EtOmFpHNAuxw3xqPZghy+brsnusscJRW5BMUzzHZc5ICjULee81WeUV2jjakG09MDglJXQ==
+
+"@babel/plugin-syntax-async-generators@^7.8.4":
+  version "7.8.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d"
+  integrity sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-bigint@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz#4c9a6f669f5d0cdf1b90a1671e9a146be5300cea"
+  integrity sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-class-properties@^7.8.3":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10"
+  integrity sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.12.13"
+
+"@babel/plugin-syntax-import-meta@^7.8.3":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz#ee601348c370fa334d2207be158777496521fd51"
+  integrity sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+
+"@babel/plugin-syntax-json-strings@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a"
+  integrity sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-jsx@^7.7.2":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.23.3.tgz#8f2e4f8a9b5f9aa16067e142c1ac9cd9f810f473"
+  integrity sha512-EB2MELswq55OHUoRZLGg/zC7QWUKfNLpE57m/S2yr1uEneIgsTgrSzXP3NXEsMkVn76OlaVVnzN+ugObuYGwhg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-syntax-logical-assignment-operators@^7.8.3":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699"
+  integrity sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+
+"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9"
+  integrity sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-numeric-separator@^7.8.3":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97"
+  integrity sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+
+"@babel/plugin-syntax-object-rest-spread@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871"
+  integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-optional-catch-binding@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1"
+  integrity sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-optional-chaining@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a"
+  integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-top-level-await@^7.8.3":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz#c1cfdadc35a646240001f06138247b741c34d94c"
+  integrity sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
+"@babel/plugin-syntax-typescript@^7.7.2":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.23.3.tgz#24f460c85dbbc983cd2b9c4994178bcc01df958f"
+  integrity sha512-9EiNjVJOMwCO+43TqoTrgQ8jMwcAd0sWyXi9RPfIsLTj4R2MADDDQXELhffaUx/uJv2AYcxBgPwH6j4TIA4ytQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/template@^7.22.15", "@babel/template@^7.3.3":
+  version "7.22.15"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.15.tgz#09576efc3830f0430f4548ef971dde1350ef2f38"
+  integrity sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==
+  dependencies:
+    "@babel/code-frame" "^7.22.13"
+    "@babel/parser" "^7.22.15"
+    "@babel/types" "^7.22.15"
+
+"@babel/traverse@^7.23.3", "@babel/traverse@^7.23.4":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.4.tgz#c2790f7edf106d059a0098770fe70801417f3f85"
+  integrity sha512-IYM8wSUwunWTB6tFC2dkKZhxbIjHoWemdK+3f8/wq8aKhbUscxD5MX72ubd90fxvFknaLPeGw5ycU84V1obHJg==
+  dependencies:
+    "@babel/code-frame" "^7.23.4"
+    "@babel/generator" "^7.23.4"
+    "@babel/helper-environment-visitor" "^7.22.20"
+    "@babel/helper-function-name" "^7.23.0"
+    "@babel/helper-hoist-variables" "^7.22.5"
+    "@babel/helper-split-export-declaration" "^7.22.6"
+    "@babel/parser" "^7.23.4"
+    "@babel/types" "^7.23.4"
+    debug "^4.1.0"
+    globals "^11.1.0"
+
+"@babel/types@^7.0.0", "@babel/types@^7.20.7", "@babel/types@^7.22.15", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.23.3", "@babel/types@^7.23.4", "@babel/types@^7.3.3":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.4.tgz#7206a1810fc512a7f7f7d4dace4cb4c1c9dbfb8e"
+  integrity sha512-7uIFwVYpoplT5jp/kVv6EF93VaJ8H+Yn5IczYiaAi98ajzjfoZfslet/e0sLh+wVBjb2qqIut1b0S26VSafsSQ==
+  dependencies:
+    "@babel/helper-string-parser" "^7.23.4"
+    "@babel/helper-validator-identifier" "^7.22.20"
+    to-fast-properties "^2.0.0"
+
+"@bcoe/v8-coverage@^0.2.3":
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
+  integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
+
+"@bitauth/libauth@^2.0.0-alpha.8":
+  version "2.0.0-alpha.8"
+  resolved "https://registry.yarnpkg.com/@bitauth/libauth/-/libauth-2.0.0-alpha.8.tgz#352ade2075517f1548e05553e7bb1c5e1023d1fe"
+  integrity sha512-KINAJbzg5pKs+WM8wCjWw6Ct/CeZG1JMrRXsIyPFztjNtwA5eeQL8eFkyquePsf8aZ5peRYK2eFPUDo/1rkg+w==
+
+"@cashscript/utils@^0.9.2":
+  version "0.9.2"
+  resolved "https://registry.yarnpkg.com/@cashscript/utils/-/utils-0.9.2.tgz#9146411902a50f0b7b9a9629d6b57be03ec08c22"
+  integrity sha512-6x8YOg6uVONRB5RfygQtBvtwkbjFAMz2kma5HkC2LUYa3bVdR4hQx3wp0hgXhpdqSQvhlQxJQ3Rtbp3AJdt0dw==
+  dependencies:
+    "@bitauth/libauth" "^2.0.0-alpha.8"
+    hash.js "^1.1.7"
+
+"@cspotcode/source-map-support@^0.8.0":
+  version "0.8.1"
+  resolved "https://registry.yarnpkg.com/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz#00629c35a688e05a88b1cda684fb9d5e73f000a1"
+  integrity sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==
+  dependencies:
+    "@jridgewell/trace-mapping" "0.3.9"
+
+"@istanbuljs/load-nyc-config@^1.0.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz#fd3db1d59ecf7cf121e80650bb86712f9b55eced"
+  integrity sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==
+  dependencies:
+    camelcase "^5.3.1"
+    find-up "^4.1.0"
+    get-package-type "^0.1.0"
+    js-yaml "^3.13.1"
+    resolve-from "^5.0.0"
+
+"@istanbuljs/schema@^0.1.2":
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98"
+  integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==
+
+"@jest/console@^29.7.0":
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/@jest/console/-/console-29.7.0.tgz#cd4822dbdb84529265c5a2bdb529a3c9cc950ffc"
+  integrity sha512-5Ni4CU7XHQi32IJ398EEP4RrB8eV09sXP2ROqD4bksHrnTree52PsxvX8tpL8LvTZ3pFzXyPbNQReSN41CAhOg==
+  dependencies:
+    "@jest/types" "^29.6.3"
+    "@types/node" "*"
+    chalk "^4.0.0"
+    jest-message-util "^29.7.0"
+    jest-util "^29.7.0"
+    slash "^3.0.0"
+
+"@jest/core@^29.7.0":
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/@jest/core/-/core-29.7.0.tgz#b6cccc239f30ff36609658c5a5e2291757ce448f"
+  integrity sha512-n7aeXWKMnGtDA48y8TLWJPJmLmmZ642Ceo78cYWEpiD7FzDgmNDV/GCVRorPABdXLJZ/9wzzgZAlHjXjxDHGsg==
+  dependencies:
+    "@jest/console" "^29.7.0"
+    "@jest/reporters" "^29.7.0"
+    "@jest/test-result" "^29.7.0"
+    "@jest/transform" "^29.7.0"
+    "@jest/types" "^29.6.3"
+    "@types/node" "*"
+    ansi-escapes "^4.2.1"
+    chalk "^4.0.0"
+    ci-info "^3.2.0"
+    exit "^0.1.2"
+    graceful-fs "^4.2.9"
+    jest-changed-files "^29.7.0"
+    jest-config "^29.7.0"
+    jest-haste-map "^29.7.0"
+    jest-message-util "^29.7.0"
+    jest-regex-util "^29.6.3"
+    jest-resolve "^29.7.0"
+    jest-resolve-dependencies "^29.7.0"
+    jest-runner "^29.7.0"
+    jest-runtime "^29.7.0"
+    jest-snapshot "^29.7.0"
+    jest-util "^29.7.0"
+    jest-validate "^29.7.0"
+    jest-watcher "^29.7.0"
+    micromatch "^4.0.4"
+    pretty-format "^29.7.0"
+    slash "^3.0.0"
+    strip-ansi "^6.0.0"
+
+"@jest/environment@^29.7.0":
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-29.7.0.tgz#24d61f54ff1f786f3cd4073b4b94416383baf2a7"
+  integrity sha512-aQIfHDq33ExsN4jP1NWGXhxgQ/wixs60gDiKO+XVMd8Mn0NWPWgc34ZQDTb2jKaUWQ7MuwoitXAsN2XVXNMpAw==
+  dependencies:
+    "@jest/fake-timers" "^29.7.0"
+    "@jest/types" "^29.6.3"
+    "@types/node" "*"
+    jest-mock "^29.7.0"
+
+"@jest/expect-utils@^29.7.0":
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-29.7.0.tgz#023efe5d26a8a70f21677d0a1afc0f0a44e3a1c6"
+  integrity sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==
+  dependencies:
+    jest-get-type "^29.6.3"
+
+"@jest/expect@^29.7.0":
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/@jest/expect/-/expect-29.7.0.tgz#76a3edb0cb753b70dfbfe23283510d3d45432bf2"
+  integrity sha512-8uMeAMycttpva3P1lBHB8VciS9V0XAr3GymPpipdyQXbBcuhkLQOSe8E/p92RyAdToS6ZD1tFkX+CkhoECE0dQ==
+  dependencies:
+    expect "^29.7.0"
+    jest-snapshot "^29.7.0"
+
+"@jest/fake-timers@^29.7.0":
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-29.7.0.tgz#fd91bf1fffb16d7d0d24a426ab1a47a49881a565"
+  integrity sha512-q4DH1Ha4TTFPdxLsqDXK1d3+ioSL7yL5oCMJZgDYm6i+6CygW5E5xVr/D1HdsGxjt1ZWSfUAs9OxSB/BNelWrQ==
+  dependencies:
+    "@jest/types" "^29.6.3"
+    "@sinonjs/fake-timers" "^10.0.2"
+    "@types/node" "*"
+    jest-message-util "^29.7.0"
+    jest-mock "^29.7.0"
+    jest-util "^29.7.0"
+
+"@jest/globals@^29.4.1", "@jest/globals@^29.7.0":
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-29.7.0.tgz#8d9290f9ec47ff772607fa864ca1d5a2efae1d4d"
+  integrity sha512-mpiz3dutLbkW2MNFubUGUEVLkTGiqW6yLVTA+JbP6fI6J5iL9Y0Nlg8k95pcF8ctKwCS7WVxteBs29hhfAotzQ==
+  dependencies:
+    "@jest/environment" "^29.7.0"
+    "@jest/expect" "^29.7.0"
+    "@jest/types" "^29.6.3"
+    jest-mock "^29.7.0"
+
+"@jest/reporters@^29.7.0":
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-29.7.0.tgz#04b262ecb3b8faa83b0b3d321623972393e8f4c7"
+  integrity sha512-DApq0KJbJOEzAFYjHADNNxAE3KbhxQB1y5Kplb5Waqw6zVbuWatSnMjE5gs8FUgEPmNsnZA3NCWl9NG0ia04Pg==
+  dependencies:
+    "@bcoe/v8-coverage" "^0.2.3"
+    "@jest/console" "^29.7.0"
+    "@jest/test-result" "^29.7.0"
+    "@jest/transform" "^29.7.0"
+    "@jest/types" "^29.6.3"
+    "@jridgewell/trace-mapping" "^0.3.18"
+    "@types/node" "*"
+    chalk "^4.0.0"
+    collect-v8-coverage "^1.0.0"
+    exit "^0.1.2"
+    glob "^7.1.3"
+    graceful-fs "^4.2.9"
+    istanbul-lib-coverage "^3.0.0"
+    istanbul-lib-instrument "^6.0.0"
+    istanbul-lib-report "^3.0.0"
+    istanbul-lib-source-maps "^4.0.0"
+    istanbul-reports "^3.1.3"
+    jest-message-util "^29.7.0"
+    jest-util "^29.7.0"
+    jest-worker "^29.7.0"
+    slash "^3.0.0"
+    string-length "^4.0.1"
+    strip-ansi "^6.0.0"
+    v8-to-istanbul "^9.0.1"
+
+"@jest/schemas@^29.6.3":
+  version "29.6.3"
+  resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-29.6.3.tgz#430b5ce8a4e0044a7e3819663305a7b3091c8e03"
+  integrity sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==
+  dependencies:
+    "@sinclair/typebox" "^0.27.8"
+
+"@jest/source-map@^29.6.3":
+  version "29.6.3"
+  resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-29.6.3.tgz#d90ba772095cf37a34a5eb9413f1b562a08554c4"
+  integrity sha512-MHjT95QuipcPrpLM+8JMSzFx6eHp5Bm+4XeFDJlwsvVBjmKNiIAvasGK2fxz2WbGRlnvqehFbh07MMa7n3YJnw==
+  dependencies:
+    "@jridgewell/trace-mapping" "^0.3.18"
+    callsites "^3.0.0"
+    graceful-fs "^4.2.9"
+
+"@jest/test-result@^29.7.0":
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-29.7.0.tgz#8db9a80aa1a097bb2262572686734baed9b1657c"
+  integrity sha512-Fdx+tv6x1zlkJPcWXmMDAG2HBnaR9XPSd5aDWQVsfrZmLVT3lU1cwyxLgRmXR9yrq4NBoEm9BMsfgFzTQAbJYA==
+  dependencies:
+    "@jest/console" "^29.7.0"
+    "@jest/types" "^29.6.3"
+    "@types/istanbul-lib-coverage" "^2.0.0"
+    collect-v8-coverage "^1.0.0"
+
+"@jest/test-sequencer@^29.7.0":
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-29.7.0.tgz#6cef977ce1d39834a3aea887a1726628a6f072ce"
+  integrity sha512-GQwJ5WZVrKnOJuiYiAF52UNUJXgTZx1NHjFSEB0qEMmSZKAkdMoIzw/Cj6x6NF4AvV23AUqDpFzQkN/eYCYTxw==
+  dependencies:
+    "@jest/test-result" "^29.7.0"
+    graceful-fs "^4.2.9"
+    jest-haste-map "^29.7.0"
+    slash "^3.0.0"
+
+"@jest/transform@^29.7.0":
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-29.7.0.tgz#df2dd9c346c7d7768b8a06639994640c642e284c"
+  integrity sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==
+  dependencies:
+    "@babel/core" "^7.11.6"
+    "@jest/types" "^29.6.3"
+    "@jridgewell/trace-mapping" "^0.3.18"
+    babel-plugin-istanbul "^6.1.1"
+    chalk "^4.0.0"
+    convert-source-map "^2.0.0"
+    fast-json-stable-stringify "^2.1.0"
+    graceful-fs "^4.2.9"
+    jest-haste-map "^29.7.0"
+    jest-regex-util "^29.6.3"
+    jest-util "^29.7.0"
+    micromatch "^4.0.4"
+    pirates "^4.0.4"
+    slash "^3.0.0"
+    write-file-atomic "^4.0.2"
+
+"@jest/types@^29.6.3":
+  version "29.6.3"
+  resolved "https://registry.yarnpkg.com/@jest/types/-/types-29.6.3.tgz#1131f8cf634e7e84c5e77bab12f052af585fba59"
+  integrity sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==
+  dependencies:
+    "@jest/schemas" "^29.6.3"
+    "@types/istanbul-lib-coverage" "^2.0.0"
+    "@types/istanbul-reports" "^3.0.0"
+    "@types/node" "*"
+    "@types/yargs" "^17.0.8"
+    chalk "^4.0.0"
+
+"@jridgewell/gen-mapping@^0.3.0", "@jridgewell/gen-mapping@^0.3.2":
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz#7e02e6eb5df901aaedb08514203b096614024098"
+  integrity sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==
+  dependencies:
+    "@jridgewell/set-array" "^1.0.1"
+    "@jridgewell/sourcemap-codec" "^1.4.10"
+    "@jridgewell/trace-mapping" "^0.3.9"
+
+"@jridgewell/resolve-uri@^3.0.3", "@jridgewell/resolve-uri@^3.1.0":
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz#c08679063f279615a3326583ba3a90d1d82cc721"
+  integrity sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==
+
+"@jridgewell/set-array@^1.0.1":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72"
+  integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==
+
+"@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.14":
+  version "1.4.15"
+  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32"
+  integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==
+
+"@jridgewell/trace-mapping@0.3.9":
+  version "0.3.9"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz#6534fd5933a53ba7cbf3a17615e273a0d1273ff9"
+  integrity sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==
+  dependencies:
+    "@jridgewell/resolve-uri" "^3.0.3"
+    "@jridgewell/sourcemap-codec" "^1.4.10"
+
+"@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.18", "@jridgewell/trace-mapping@^0.3.9":
+  version "0.3.20"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.20.tgz#72e45707cf240fa6b081d0366f8265b0cd10197f"
+  integrity sha512-R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q==
+  dependencies:
+    "@jridgewell/resolve-uri" "^3.1.0"
+    "@jridgewell/sourcemap-codec" "^1.4.14"
+
+"@sinclair/typebox@^0.27.8":
+  version "0.27.8"
+  resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.27.8.tgz#6667fac16c436b5434a387a34dedb013198f6e6e"
+  integrity sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==
+
+"@sinonjs/commons@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-3.0.0.tgz#beb434fe875d965265e04722ccfc21df7f755d72"
+  integrity sha512-jXBtWAF4vmdNmZgD5FoKsVLv3rPgDnLgPbU84LIJ3otV44vJlDRokVng5v8NFJdCf/da9legHcKaRuZs4L7faA==
+  dependencies:
+    type-detect "4.0.8"
+
+"@sinonjs/fake-timers@^10.0.2":
+  version "10.3.0"
+  resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz#55fdff1ecab9f354019129daf4df0dd4d923ea66"
+  integrity sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==
+  dependencies:
+    "@sinonjs/commons" "^3.0.0"
+
+"@tsconfig/node10@^1.0.7":
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.9.tgz#df4907fc07a886922637b15e02d4cebc4c0021b2"
+  integrity sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==
+
+"@tsconfig/node12@^1.0.7":
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/@tsconfig/node12/-/node12-1.0.11.tgz#ee3def1f27d9ed66dac6e46a295cffb0152e058d"
+  integrity sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==
+
+"@tsconfig/node14@^1.0.0":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@tsconfig/node14/-/node14-1.0.3.tgz#e4386316284f00b98435bf40f72f75a09dabf6c1"
+  integrity sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==
+
+"@tsconfig/node16@^1.0.2":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.4.tgz#0b92dcc0cc1c81f6f306a381f28e31b1a56536e9"
+  integrity sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==
+
+"@types/babel__core@^7.1.14":
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.20.5.tgz#3df15f27ba85319caa07ba08d0721889bb39c017"
+  integrity sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==
+  dependencies:
+    "@babel/parser" "^7.20.7"
+    "@babel/types" "^7.20.7"
+    "@types/babel__generator" "*"
+    "@types/babel__template" "*"
+    "@types/babel__traverse" "*"
+
+"@types/babel__generator@*":
+  version "7.6.7"
+  resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.7.tgz#a7aebf15c7bc0eb9abd638bdb5c0b8700399c9d0"
+  integrity sha512-6Sfsq+EaaLrw4RmdFWE9Onp63TOUue71AWb4Gpa6JxzgTYtimbM086WnYTy2U67AofR++QKCo08ZP6pwx8YFHQ==
+  dependencies:
+    "@babel/types" "^7.0.0"
+
+"@types/babel__template@*":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.4.4.tgz#5672513701c1b2199bc6dad636a9d7491586766f"
+  integrity sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==
+  dependencies:
+    "@babel/parser" "^7.1.0"
+    "@babel/types" "^7.0.0"
+
+"@types/babel__traverse@*", "@types/babel__traverse@^7.0.6":
+  version "7.20.4"
+  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.20.4.tgz#ec2c06fed6549df8bc0eb4615b683749a4a92e1b"
+  integrity sha512-mSM/iKUk5fDDrEV/e83qY+Cr3I1+Q3qqTuEn++HAWYjEa1+NxZr6CNrcJGf2ZTnq4HoFGC3zaTPZTobCzCFukA==
+  dependencies:
+    "@babel/types" "^7.20.7"
+
+"@types/graceful-fs@^4.1.3":
+  version "4.1.9"
+  resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.9.tgz#2a06bc0f68a20ab37b3e36aa238be6abdf49e8b4"
+  integrity sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ==
+  dependencies:
+    "@types/node" "*"
+
+"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0", "@types/istanbul-lib-coverage@^2.0.1":
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz#7739c232a1fee9b4d3ce8985f314c0c6d33549d7"
+  integrity sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==
+
+"@types/istanbul-lib-report@*":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz#53047614ae72e19fc0401d872de3ae2b4ce350bf"
+  integrity sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==
+  dependencies:
+    "@types/istanbul-lib-coverage" "*"
+
+"@types/istanbul-reports@^3.0.0":
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz#0f03e3d2f670fbdac586e34b433783070cc16f54"
+  integrity sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==
+  dependencies:
+    "@types/istanbul-lib-report" "*"
+
+"@types/jest@^29.4.1":
+  version "29.5.10"
+  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-29.5.10.tgz#a10fc5bab9e426081c12b2ef73d24d4f0c9b7f50"
+  integrity sha512-tE4yxKEphEyxj9s4inideLHktW/x6DwesIwWZ9NN1FKf9zbJYsnhBoA9vrHA/IuIOKwPa5PcFBNV4lpMIOEzyQ==
+  dependencies:
+    expect "^29.0.0"
+    pretty-format "^29.0.0"
+
+"@types/node@*":
+  version "20.10.0"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.10.0.tgz#16ddf9c0a72b832ec4fcce35b8249cf149214617"
+  integrity sha512-D0WfRmU9TQ8I9PFx9Yc+EBHw+vSpIub4IDvQivcp26PtPrdMGAq5SDcpXEo/epqa/DXotVpekHiLNTg3iaKXBQ==
+  dependencies:
+    undici-types "~5.26.4"
+
+"@types/stack-utils@^2.0.0":
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.3.tgz#6209321eb2c1712a7e7466422b8cb1fc0d9dd5d8"
+  integrity sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==
+
+"@types/ws@^7.4.6":
+  version "7.4.7"
+  resolved "https://registry.yarnpkg.com/@types/ws/-/ws-7.4.7.tgz#f7c390a36f7a0679aa69de2d501319f4f8d9b702"
+  integrity sha512-JQbbmxZTZehdc2iszGKs5oC3NFnjeay7mtAWrdt7qNtAVK0g19muApzAy4bm9byz79xa2ZnO/BOBC2R8RC5Lww==
+  dependencies:
+    "@types/node" "*"
+
+"@types/yargs-parser@*":
+  version "21.0.3"
+  resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.3.tgz#815e30b786d2e8f0dcd85fd5bcf5e1a04d008f15"
+  integrity sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==
+
+"@types/yargs@^17.0.8":
+  version "17.0.32"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.32.tgz#030774723a2f7faafebf645f4e5a48371dca6229"
+  integrity sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==
+  dependencies:
+    "@types/yargs-parser" "*"
+
+acorn-walk@^8.1.1:
+  version "8.3.0"
+  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.3.0.tgz#2097665af50fd0cf7a2dfccd2b9368964e66540f"
+  integrity sha512-FS7hV565M5l1R08MXqo8odwMTB02C2UqzB17RVgu9EyuYFBqJZ3/ZY97sQD5FewVu1UyDFc1yztUDrAwT0EypA==
+
+acorn@^8.4.1:
+  version "8.11.2"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.2.tgz#ca0d78b51895be5390a5903c5b3bdcdaf78ae40b"
+  integrity sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==
+
+ansi-escapes@^4.2.1:
+  version "4.3.2"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e"
+  integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==
+  dependencies:
+    type-fest "^0.21.3"
+
+ansi-regex@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
+  integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
+
+ansi-styles@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
+  integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
+  dependencies:
+    color-convert "^1.9.0"
+
+ansi-styles@^4.0.0, ansi-styles@^4.1.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
+  integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
+  dependencies:
+    color-convert "^2.0.1"
+
+ansi-styles@^5.0.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-5.2.0.tgz#07449690ad45777d1924ac2abb2fc8895dba836b"
+  integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==
+
+antlr4ts@^0.5.0-alpha.4:
+  version "0.5.0-alpha.4"
+  resolved "https://registry.yarnpkg.com/antlr4ts/-/antlr4ts-0.5.0-alpha.4.tgz#71702865a87478ed0b40c0709f422cf14d51652a"
+  integrity sha512-WPQDt1B74OfPv/IMS2ekXAKkTZIHl88uMetg6q3OTqgFxZ/dxDXI0EWLyZid/1Pe6hTftyg5N7gel5wNAGxXyQ==
+
+anymatch@^3.0.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e"
+  integrity sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==
+  dependencies:
+    normalize-path "^3.0.0"
+    picomatch "^2.0.4"
+
+arg@^4.1.0:
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089"
+  integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==
+
+argparse@^1.0.7:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
+  integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
+  dependencies:
+    sprintf-js "~1.0.2"
+
+async-mutex@^0.3.1:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/async-mutex/-/async-mutex-0.3.2.tgz#1485eda5bda1b0ec7c8df1ac2e815757ad1831df"
+  integrity sha512-HuTK7E7MT7jZEh1P9GtRW9+aTWiDWWi9InbZ5hjxrnRa39KS4BW04+xLBhYNS2aXhHUIKZSw3gj4Pn1pj+qGAA==
+  dependencies:
+    tslib "^2.3.1"
+
+babel-jest@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-29.7.0.tgz#f4369919225b684c56085998ac63dbd05be020d5"
+  integrity sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==
+  dependencies:
+    "@jest/transform" "^29.7.0"
+    "@types/babel__core" "^7.1.14"
+    babel-plugin-istanbul "^6.1.1"
+    babel-preset-jest "^29.6.3"
+    chalk "^4.0.0"
+    graceful-fs "^4.2.9"
+    slash "^3.0.0"
+
+babel-plugin-istanbul@^6.1.1:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz#fa88ec59232fd9b4e36dbbc540a8ec9a9b47da73"
+  integrity sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@istanbuljs/load-nyc-config" "^1.0.0"
+    "@istanbuljs/schema" "^0.1.2"
+    istanbul-lib-instrument "^5.0.4"
+    test-exclude "^6.0.0"
+
+babel-plugin-jest-hoist@^29.6.3:
+  version "29.6.3"
+  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.6.3.tgz#aadbe943464182a8922c3c927c3067ff40d24626"
+  integrity sha512-ESAc/RJvGTFEzRwOTT4+lNDk/GNHMkKbNzsvT0qKRfDyyYTskxB5rnU2njIDYVxXCBHHEI1c0YwHob3WaYujOg==
+  dependencies:
+    "@babel/template" "^7.3.3"
+    "@babel/types" "^7.3.3"
+    "@types/babel__core" "^7.1.14"
+    "@types/babel__traverse" "^7.0.6"
+
+babel-preset-current-node-syntax@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz#b4399239b89b2a011f9ddbe3e4f401fc40cff73b"
+  integrity sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==
+  dependencies:
+    "@babel/plugin-syntax-async-generators" "^7.8.4"
+    "@babel/plugin-syntax-bigint" "^7.8.3"
+    "@babel/plugin-syntax-class-properties" "^7.8.3"
+    "@babel/plugin-syntax-import-meta" "^7.8.3"
+    "@babel/plugin-syntax-json-strings" "^7.8.3"
+    "@babel/plugin-syntax-logical-assignment-operators" "^7.8.3"
+    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
+    "@babel/plugin-syntax-numeric-separator" "^7.8.3"
+    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
+    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
+    "@babel/plugin-syntax-top-level-await" "^7.8.3"
+
+babel-preset-jest@^29.6.3:
+  version "29.6.3"
+  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-29.6.3.tgz#fa05fa510e7d493896d7b0dd2033601c840f171c"
+  integrity sha512-0B3bhxR6snWXJZtR/RliHTDPRgn1sNHOR0yVtq/IiQFyuOVjFS+wuio/R4gSNkyYmKmJB4wGZv2NZanmKmTnNA==
+  dependencies:
+    babel-plugin-jest-hoist "^29.6.3"
+    babel-preset-current-node-syntax "^1.0.0"
+
+balanced-match@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
+  integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
+
+bip68@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/bip68/-/bip68-1.0.4.tgz#78a95c7a43fad183957995cc2e08d79b0c372c4d"
+  integrity sha512-O1htyufFTYy3EO0JkHg2CLykdXEtV2ssqw47Gq9A0WByp662xpJnMEB9m43LZjsSDjIAOozWRExlFQk2hlV1XQ==
+
+bitcoin-rpc-promise-retry@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/bitcoin-rpc-promise-retry/-/bitcoin-rpc-promise-retry-1.3.0.tgz#28a9f5aa7b5528b0518b0bcccde63e7384e1626b"
+  integrity sha512-xhldBhYwiUNY4spzkXXcU9LEq+nbSKJ5tvYWEUe/XTCe1VYoe8tEb5jJq4MBA2d+5egiUOA+P1QTTYm1FqPtOg==
+  dependencies:
+    bitcoind-rpc "^0.8.0"
+
+bitcoind-rpc@^0.8.0:
+  version "0.8.1"
+  resolved "https://registry.yarnpkg.com/bitcoind-rpc/-/bitcoind-rpc-0.8.1.tgz#11889972e46c346870d26cf680e3a7e3e52b1ff1"
+  integrity sha512-NfhykAT/x/P1SOiog8UzltvTiv6A6d2X5VWJ3UjGeAqFLXv+IYHy+E4fFCBmgQRyIb1EIcyIZK1SVpSOGRHsaw==
+
+brace-expansion@^1.1.7:
+  version "1.1.11"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
+  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
+  dependencies:
+    balanced-match "^1.0.0"
+    concat-map "0.0.1"
+
+braces@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
+  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
+  dependencies:
+    fill-range "^7.0.1"
+
+browserslist@^4.21.9:
+  version "4.22.1"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.22.1.tgz#ba91958d1a59b87dab6fed8dfbcb3da5e2e9c619"
+  integrity sha512-FEVc202+2iuClEhZhrWy6ZiAcRLvNMyYcxZ8raemul1DYVOVdFsbqckWLdsixQZCpJlwe77Z3UTalE7jsjnKfQ==
+  dependencies:
+    caniuse-lite "^1.0.30001541"
+    electron-to-chromium "^1.4.535"
+    node-releases "^2.0.13"
+    update-browserslist-db "^1.0.13"
+
+bser@2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz#e6787da20ece9d07998533cfd9de6f5c38f4bc05"
+  integrity sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==
+  dependencies:
+    node-int64 "^0.4.0"
+
+buffer-from@^1.0.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
+  integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
+
+callsites@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
+  integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
+
+camelcase@^5.3.1:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
+  integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
+
+camelcase@^6.2.0:
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a"
+  integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
+
+caniuse-lite@^1.0.30001541:
+  version "1.0.30001565"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001565.tgz#a528b253c8a2d95d2b415e11d8b9942acc100c4f"
+  integrity sha512-xrE//a3O7TP0vaJ8ikzkD2c2NgcVUvsEe2IvFTntV4Yd1Z9FVzh+gW+enX96L0psrbaFMcVcH2l90xNuGDWc8w==
+
+cashc@^0.9.2:
+  version "0.9.2"
+  resolved "https://registry.yarnpkg.com/cashc/-/cashc-0.9.2.tgz#e001dd392a1a4efe0a3e5ce1cdb0399eb8868c1f"
+  integrity sha512-EQDksXEV9scQtrbSrIIC/XynFtFHtudClxHLFSOp+jSGcwpAsEzsLdMlSDIWO3uQUIcr7dgAoMREZUmRhERV8Q==
+  dependencies:
+    "@bitauth/libauth" "^2.0.0-alpha.8"
+    "@cashscript/utils" "^0.9.2"
+    antlr4ts "^0.5.0-alpha.4"
+    commander "^7.1.0"
+    semver "^7.3.4"
+
+cashscript@^0.9.2:
+  version "0.9.2"
+  resolved "https://registry.yarnpkg.com/cashscript/-/cashscript-0.9.2.tgz#0c9260fdd3c4466ebb582239fc621349a6ee37b1"
+  integrity sha512-IxvcJluRAoWA8ruQXsvOgmDeuyXc4DnwDF2UfU3l6/0fn5HQkLLVhH5hroc/TbExKWQPBEwR3Nql7aTQhPb9vA==
+  dependencies:
+    "@bitauth/libauth" "^2.0.0-alpha.8"
+    "@cashscript/utils" "^0.9.2"
+    bip68 "^1.0.4"
+    bitcoin-rpc-promise-retry "^1.3.0"
+    delay "^5.0.0"
+    electrum-cash "^2.0.10"
+    fast-deep-equal "^3.1.3"
+
+chalk@^2.4.2:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
+  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
+  dependencies:
+    ansi-styles "^3.2.1"
+    escape-string-regexp "^1.0.5"
+    supports-color "^5.3.0"
+
+chalk@^4.0.0:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
+  integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
+  dependencies:
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
+
+char-regex@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf"
+  integrity sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==
+
+ci-info@^3.2.0:
+  version "3.9.0"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.9.0.tgz#4279a62028a7b1f262f3473fc9605f5e218c59b4"
+  integrity sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==
+
+cjs-module-lexer@^1.0.0:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-1.2.3.tgz#6c370ab19f8a3394e318fe682686ec0ac684d107"
+  integrity sha512-0TNiGstbQmCFwt4akjjBg5pLRTSyj/PkWQ1ZoO2zntmg9yLqSRxwEa4iCfQLGjqhiqBfOJa7W/E8wfGrTDmlZQ==
+
+cliui@^8.0.1:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa"
+  integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==
+  dependencies:
+    string-width "^4.2.0"
+    strip-ansi "^6.0.1"
+    wrap-ansi "^7.0.0"
+
+co@^4.6.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
+  integrity sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==
+
+collect-v8-coverage@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz#c0b29bcd33bcd0779a1344c2136051e6afd3d9e9"
+  integrity sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==
+
+color-convert@^1.9.0:
+  version "1.9.3"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
+  integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
+  dependencies:
+    color-name "1.1.3"
+
+color-convert@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
+  integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
+  dependencies:
+    color-name "~1.1.4"
+
+color-name@1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
+  integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==
+
+color-name@~1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
+  integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
+
+commander@^7.1.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7"
+  integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==
+
+concat-map@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+  integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
+
+convert-source-map@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-2.0.0.tgz#4b560f649fc4e918dd0ab75cf4961e8bc882d82a"
+  integrity sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==
+
+create-jest@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/create-jest/-/create-jest-29.7.0.tgz#a355c5b3cb1e1af02ba177fe7afd7feee49a5320"
+  integrity sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==
+  dependencies:
+    "@jest/types" "^29.6.3"
+    chalk "^4.0.0"
+    exit "^0.1.2"
+    graceful-fs "^4.2.9"
+    jest-config "^29.7.0"
+    jest-util "^29.7.0"
+    prompts "^2.0.1"
+
+create-require@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333"
+  integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==
+
+cross-spawn@^7.0.3:
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
+  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
+  dependencies:
+    path-key "^3.1.0"
+    shebang-command "^2.0.0"
+    which "^2.0.1"
+
+debug@^4.1.0, debug@^4.1.1, debug@^4.3.2:
+  version "4.3.4"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
+  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
+  dependencies:
+    ms "2.1.2"
+
+dedent@^1.0.0:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/dedent/-/dedent-1.5.1.tgz#4f3fc94c8b711e9bb2800d185cd6ad20f2a90aff"
+  integrity sha512-+LxW+KLWxu3HW3M2w2ympwtqPrqYRzU8fqi6Fhd18fBALe15blJPI/I4+UHveMVG6lJqB4JNd4UG0S5cnVHwIg==
+
+deepmerge@^4.2.2:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.3.1.tgz#44b5f2147cd3b00d4b56137685966f26fd25dd4a"
+  integrity sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==
+
+delay@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/delay/-/delay-5.0.0.tgz#137045ef1b96e5071060dd5be60bf9334436bd1d"
+  integrity sha512-ReEBKkIfe4ya47wlPYf/gu5ib6yUG0/Aez0JQZQz94kiWtRQvZIQbTiehsnwHvLSWJnQdhVeqYue7Id1dKr0qw==
+
+detect-newline@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651"
+  integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==
+
+diff-sequences@^29.6.3:
+  version "29.6.3"
+  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-29.6.3.tgz#4deaf894d11407c51efc8418012f9e70b84ea921"
+  integrity sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==
+
+diff@^4.0.1:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
+  integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==
+
+electron-to-chromium@^1.4.535:
+  version "1.4.594"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.594.tgz#f69f207fba80735a44a988df42f3f439115d0515"
+  integrity sha512-xT1HVAu5xFn7bDfkjGQi9dNpMqGchUkebwf1GL7cZN32NSwwlHRPMSDJ1KN6HkS0bWUtndbSQZqvpQftKG2uFQ==
+
+electrum-cash@^2.0.10:
+  version "2.0.10"
+  resolved "https://registry.yarnpkg.com/electrum-cash/-/electrum-cash-2.0.10.tgz#0b2831d01b214bff1dfee7b90022f36126cb6945"
+  integrity sha512-xxKXWyDsnUR2pkqzb7r7ANf6yzlHO8+Rkq8HOFkKiH1tF1BJwyh6sDhGAy4lkTv2sU8Uv1em/itYZ5n2Cr6zaA==
+  dependencies:
+    "@types/ws" "^7.4.6"
+    async-mutex "^0.3.1"
+    debug "^4.3.2"
+    isomorphic-ws "^4.0.1"
+    ws "^7.5.2"
+
+emittery@^0.13.1:
+  version "0.13.1"
+  resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.13.1.tgz#c04b8c3457490e0847ae51fced3af52d338e3dad"
+  integrity sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==
+
+emoji-regex@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
+  integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
+
+error-ex@^1.3.1:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
+  integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
+  dependencies:
+    is-arrayish "^0.2.1"
+
+escalade@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
+  integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
+
+escape-string-regexp@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+  integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==
+
+escape-string-regexp@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344"
+  integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==
+
+esprima@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
+  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
+
+execa@^5.0.0:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd"
+  integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==
+  dependencies:
+    cross-spawn "^7.0.3"
+    get-stream "^6.0.0"
+    human-signals "^2.1.0"
+    is-stream "^2.0.0"
+    merge-stream "^2.0.0"
+    npm-run-path "^4.0.1"
+    onetime "^5.1.2"
+    signal-exit "^3.0.3"
+    strip-final-newline "^2.0.0"
+
+exit@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
+  integrity sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==
+
+expect@^29.0.0, expect@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/expect/-/expect-29.7.0.tgz#578874590dcb3214514084c08115d8aee61e11bc"
+  integrity sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==
+  dependencies:
+    "@jest/expect-utils" "^29.7.0"
+    jest-get-type "^29.6.3"
+    jest-matcher-utils "^29.7.0"
+    jest-message-util "^29.7.0"
+    jest-util "^29.7.0"
+
+fast-deep-equal@^3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
+  integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
+
+fast-json-stable-stringify@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
+  integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
+
+fb-watchman@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.2.tgz#e9524ee6b5c77e9e5001af0f85f3adbb8623255c"
+  integrity sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==
+  dependencies:
+    bser "2.1.1"
+
+fill-range@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
+  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+  dependencies:
+    to-regex-range "^5.0.1"
+
+find-up@^4.0.0, find-up@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
+  integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
+  dependencies:
+    locate-path "^5.0.0"
+    path-exists "^4.0.0"
+
+fs.realpath@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
+  integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
+
+fsevents@^2.3.2:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"
+  integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==
+
+function-bind@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c"
+  integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==
+
+gensync@^1.0.0-beta.2:
+  version "1.0.0-beta.2"
+  resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
+  integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
+
+get-caller-file@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
+  integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
+
+get-package-type@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a"
+  integrity sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==
+
+get-stream@^6.0.0:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7"
+  integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==
+
+glob@^7.1.3, glob@^7.1.4:
+  version "7.2.3"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
+  integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.1.1"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+globals@^11.1.0:
+  version "11.12.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
+  integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
+
+graceful-fs@^4.2.9:
+  version "4.2.11"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
+  integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
+
+has-flag@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
+  integrity sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==
+
+has-flag@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
+  integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
+
+hash.js@^1.1.7:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.7.tgz#0babca538e8d4ee4a0f8988d68866537a003cf42"
+  integrity sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==
+  dependencies:
+    inherits "^2.0.3"
+    minimalistic-assert "^1.0.1"
+
+hasown@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.0.tgz#f4c513d454a57b7c7e1650778de226b11700546c"
+  integrity sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==
+  dependencies:
+    function-bind "^1.1.2"
+
+html-escaper@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453"
+  integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==
+
+human-signals@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0"
+  integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==
+
+import-local@^3.0.2:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.1.0.tgz#b4479df8a5fd44f6cdce24070675676063c95cb4"
+  integrity sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==
+  dependencies:
+    pkg-dir "^4.2.0"
+    resolve-cwd "^3.0.0"
+
+imurmurhash@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
+  integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==
+
+inflight@^1.0.4:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+  integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==
+  dependencies:
+    once "^1.3.0"
+    wrappy "1"
+
+inherits@2, inherits@^2.0.3:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
+  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
+
+is-arrayish@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
+  integrity sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==
+
+is-core-module@^2.13.0:
+  version "2.13.1"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.13.1.tgz#ad0d7532c6fea9da1ebdc82742d74525c6273384"
+  integrity sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==
+  dependencies:
+    hasown "^2.0.0"
+
+is-fullwidth-code-point@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
+  integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
+
+is-generator-fn@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz#7d140adc389aaf3011a8f2a2a4cfa6faadffb118"
+  integrity sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==
+
+is-number@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
+  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
+
+is-stream@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"
+  integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==
+
+isexe@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
+  integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
+
+isomorphic-ws@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/isomorphic-ws/-/isomorphic-ws-4.0.1.tgz#55fd4cd6c5e6491e76dc125938dd863f5cd4f2dc"
+  integrity sha512-BhBvN2MBpWTaSHdWRb/bwdZJ1WaehQ2L1KngkCkfLUGF0mAWAT1sQUQacEmQ0jXkFw/czDXPNQSL5u2/Krsz1w==
+
+istanbul-lib-coverage@^3.0.0, istanbul-lib-coverage@^3.2.0:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz#2d166c4b0644d43a39f04bf6c2edd1e585f31756"
+  integrity sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==
+
+istanbul-lib-instrument@^5.0.4:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz#d10c8885c2125574e1c231cacadf955675e1ce3d"
+  integrity sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==
+  dependencies:
+    "@babel/core" "^7.12.3"
+    "@babel/parser" "^7.14.7"
+    "@istanbuljs/schema" "^0.1.2"
+    istanbul-lib-coverage "^3.2.0"
+    semver "^6.3.0"
+
+istanbul-lib-instrument@^6.0.0:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.1.tgz#71e87707e8041428732518c6fb5211761753fbdf"
+  integrity sha512-EAMEJBsYuyyztxMxW3g7ugGPkrZsV57v0Hmv3mm1uQsmB+QnZuepg731CRaIgeUVSdmsTngOkSnauNF8p7FIhA==
+  dependencies:
+    "@babel/core" "^7.12.3"
+    "@babel/parser" "^7.14.7"
+    "@istanbuljs/schema" "^0.1.2"
+    istanbul-lib-coverage "^3.2.0"
+    semver "^7.5.4"
+
+istanbul-lib-report@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz#908305bac9a5bd175ac6a74489eafd0fc2445a7d"
+  integrity sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==
+  dependencies:
+    istanbul-lib-coverage "^3.0.0"
+    make-dir "^4.0.0"
+    supports-color "^7.1.0"
+
+istanbul-lib-source-maps@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz#895f3a709fcfba34c6de5a42939022f3e4358551"
+  integrity sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==
+  dependencies:
+    debug "^4.1.1"
+    istanbul-lib-coverage "^3.0.0"
+    source-map "^0.6.1"
+
+istanbul-reports@^3.1.3:
+  version "3.1.6"
+  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.1.6.tgz#2544bcab4768154281a2f0870471902704ccaa1a"
+  integrity sha512-TLgnMkKg3iTDsQ9PbPTdpfAK2DzjF9mqUG7RMgcQl8oFjad8ob4laGxv5XV5U9MAfx8D6tSJiUyuAwzLicaxlg==
+  dependencies:
+    html-escaper "^2.0.0"
+    istanbul-lib-report "^3.0.0"
+
+jest-changed-files@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-29.7.0.tgz#1c06d07e77c78e1585d020424dedc10d6e17ac3a"
+  integrity sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w==
+  dependencies:
+    execa "^5.0.0"
+    jest-util "^29.7.0"
+    p-limit "^3.1.0"
+
+jest-circus@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-29.7.0.tgz#b6817a45fcc835d8b16d5962d0c026473ee3668a"
+  integrity sha512-3E1nCMgipcTkCocFwM90XXQab9bS+GMsjdpmPrlelaxwD93Ad8iVEjX/vvHPdLPnFf+L40u+5+iutRdA1N9myw==
+  dependencies:
+    "@jest/environment" "^29.7.0"
+    "@jest/expect" "^29.7.0"
+    "@jest/test-result" "^29.7.0"
+    "@jest/types" "^29.6.3"
+    "@types/node" "*"
+    chalk "^4.0.0"
+    co "^4.6.0"
+    dedent "^1.0.0"
+    is-generator-fn "^2.0.0"
+    jest-each "^29.7.0"
+    jest-matcher-utils "^29.7.0"
+    jest-message-util "^29.7.0"
+    jest-runtime "^29.7.0"
+    jest-snapshot "^29.7.0"
+    jest-util "^29.7.0"
+    p-limit "^3.1.0"
+    pretty-format "^29.7.0"
+    pure-rand "^6.0.0"
+    slash "^3.0.0"
+    stack-utils "^2.0.3"
+
+jest-cli@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-29.7.0.tgz#5592c940798e0cae677eec169264f2d839a37995"
+  integrity sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==
+  dependencies:
+    "@jest/core" "^29.7.0"
+    "@jest/test-result" "^29.7.0"
+    "@jest/types" "^29.6.3"
+    chalk "^4.0.0"
+    create-jest "^29.7.0"
+    exit "^0.1.2"
+    import-local "^3.0.2"
+    jest-config "^29.7.0"
+    jest-util "^29.7.0"
+    jest-validate "^29.7.0"
+    yargs "^17.3.1"
+
+jest-config@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-29.7.0.tgz#bcbda8806dbcc01b1e316a46bb74085a84b0245f"
+  integrity sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==
+  dependencies:
+    "@babel/core" "^7.11.6"
+    "@jest/test-sequencer" "^29.7.0"
+    "@jest/types" "^29.6.3"
+    babel-jest "^29.7.0"
+    chalk "^4.0.0"
+    ci-info "^3.2.0"
+    deepmerge "^4.2.2"
+    glob "^7.1.3"
+    graceful-fs "^4.2.9"
+    jest-circus "^29.7.0"
+    jest-environment-node "^29.7.0"
+    jest-get-type "^29.6.3"
+    jest-regex-util "^29.6.3"
+    jest-resolve "^29.7.0"
+    jest-runner "^29.7.0"
+    jest-util "^29.7.0"
+    jest-validate "^29.7.0"
+    micromatch "^4.0.4"
+    parse-json "^5.2.0"
+    pretty-format "^29.7.0"
+    slash "^3.0.0"
+    strip-json-comments "^3.1.1"
+
+jest-diff@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-29.7.0.tgz#017934a66ebb7ecf6f205e84699be10afd70458a"
+  integrity sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==
+  dependencies:
+    chalk "^4.0.0"
+    diff-sequences "^29.6.3"
+    jest-get-type "^29.6.3"
+    pretty-format "^29.7.0"
+
+jest-docblock@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-29.7.0.tgz#8fddb6adc3cdc955c93e2a87f61cfd350d5d119a"
+  integrity sha512-q617Auw3A612guyaFgsbFeYpNP5t2aoUNLwBUbc/0kD1R4t9ixDbyFTHd1nok4epoVFpr7PmeWHrhvuV3XaJ4g==
+  dependencies:
+    detect-newline "^3.0.0"
+
+jest-each@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-29.7.0.tgz#162a9b3f2328bdd991beaabffbb74745e56577d1"
+  integrity sha512-gns+Er14+ZrEoC5fhOfYCY1LOHHr0TI+rQUHZS8Ttw2l7gl+80eHc/gFf2Ktkw0+SIACDTeWvpFcv3B04VembQ==
+  dependencies:
+    "@jest/types" "^29.6.3"
+    chalk "^4.0.0"
+    jest-get-type "^29.6.3"
+    jest-util "^29.7.0"
+    pretty-format "^29.7.0"
+
+jest-environment-node@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-29.7.0.tgz#0b93e111dda8ec120bc8300e6d1fb9576e164376"
+  integrity sha512-DOSwCRqXirTOyheM+4d5YZOrWcdu0LNZ87ewUoywbcb2XR4wKgqiG8vNeYwhjFMbEkfju7wx2GYH0P2gevGvFw==
+  dependencies:
+    "@jest/environment" "^29.7.0"
+    "@jest/fake-timers" "^29.7.0"
+    "@jest/types" "^29.6.3"
+    "@types/node" "*"
+    jest-mock "^29.7.0"
+    jest-util "^29.7.0"
+
+jest-get-type@^29.6.3:
+  version "29.6.3"
+  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-29.6.3.tgz#36f499fdcea197c1045a127319c0481723908fd1"
+  integrity sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==
+
+jest-haste-map@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-29.7.0.tgz#3c2396524482f5a0506376e6c858c3bbcc17b104"
+  integrity sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==
+  dependencies:
+    "@jest/types" "^29.6.3"
+    "@types/graceful-fs" "^4.1.3"
+    "@types/node" "*"
+    anymatch "^3.0.3"
+    fb-watchman "^2.0.0"
+    graceful-fs "^4.2.9"
+    jest-regex-util "^29.6.3"
+    jest-util "^29.7.0"
+    jest-worker "^29.7.0"
+    micromatch "^4.0.4"
+    walker "^1.0.8"
+  optionalDependencies:
+    fsevents "^2.3.2"
+
+jest-leak-detector@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-29.7.0.tgz#5b7ec0dadfdfec0ca383dc9aa016d36b5ea4c728"
+  integrity sha512-kYA8IJcSYtST2BY9I+SMC32nDpBT3J2NvWJx8+JCuCdl/CR1I4EKUJROiP8XtCcxqgTTBGJNdbB1A8XRKbTetw==
+  dependencies:
+    jest-get-type "^29.6.3"
+    pretty-format "^29.7.0"
+
+jest-matcher-utils@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz#ae8fec79ff249fd592ce80e3ee474e83a6c44f12"
+  integrity sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==
+  dependencies:
+    chalk "^4.0.0"
+    jest-diff "^29.7.0"
+    jest-get-type "^29.6.3"
+    pretty-format "^29.7.0"
+
+jest-message-util@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-29.7.0.tgz#8bc392e204e95dfe7564abbe72a404e28e51f7f3"
+  integrity sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==
+  dependencies:
+    "@babel/code-frame" "^7.12.13"
+    "@jest/types" "^29.6.3"
+    "@types/stack-utils" "^2.0.0"
+    chalk "^4.0.0"
+    graceful-fs "^4.2.9"
+    micromatch "^4.0.4"
+    pretty-format "^29.7.0"
+    slash "^3.0.0"
+    stack-utils "^2.0.3"
+
+jest-mock@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-29.7.0.tgz#4e836cf60e99c6fcfabe9f99d017f3fdd50a6347"
+  integrity sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==
+  dependencies:
+    "@jest/types" "^29.6.3"
+    "@types/node" "*"
+    jest-util "^29.7.0"
+
+jest-pnp-resolver@^1.2.2:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz#930b1546164d4ad5937d5540e711d4d38d4cad2e"
+  integrity sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==
+
+jest-regex-util@^29.6.3:
+  version "29.6.3"
+  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-29.6.3.tgz#4a556d9c776af68e1c5f48194f4d0327d24e8a52"
+  integrity sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==
+
+jest-resolve-dependencies@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-29.7.0.tgz#1b04f2c095f37fc776ff40803dc92921b1e88428"
+  integrity sha512-un0zD/6qxJ+S0et7WxeI3H5XSe9lTBBR7bOHCHXkKR6luG5mwDDlIzVQ0V5cZCuoTgEdcdwzTghYkTWfubi+nA==
+  dependencies:
+    jest-regex-util "^29.6.3"
+    jest-snapshot "^29.7.0"
+
+jest-resolve@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-29.7.0.tgz#64d6a8992dd26f635ab0c01e5eef4399c6bcbc30"
+  integrity sha512-IOVhZSrg+UvVAshDSDtHyFCCBUl/Q3AAJv8iZ6ZjnZ74xzvwuzLXid9IIIPgTnY62SJjfuupMKZsZQRsCvxEgA==
+  dependencies:
+    chalk "^4.0.0"
+    graceful-fs "^4.2.9"
+    jest-haste-map "^29.7.0"
+    jest-pnp-resolver "^1.2.2"
+    jest-util "^29.7.0"
+    jest-validate "^29.7.0"
+    resolve "^1.20.0"
+    resolve.exports "^2.0.0"
+    slash "^3.0.0"
+
+jest-runner@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-29.7.0.tgz#809af072d408a53dcfd2e849a4c976d3132f718e"
+  integrity sha512-fsc4N6cPCAahybGBfTRcq5wFR6fpLznMg47sY5aDpsoejOcVYFb07AHuSnR0liMcPTgBsA3ZJL6kFOjPdoNipQ==
+  dependencies:
+    "@jest/console" "^29.7.0"
+    "@jest/environment" "^29.7.0"
+    "@jest/test-result" "^29.7.0"
+    "@jest/transform" "^29.7.0"
+    "@jest/types" "^29.6.3"
+    "@types/node" "*"
+    chalk "^4.0.0"
+    emittery "^0.13.1"
+    graceful-fs "^4.2.9"
+    jest-docblock "^29.7.0"
+    jest-environment-node "^29.7.0"
+    jest-haste-map "^29.7.0"
+    jest-leak-detector "^29.7.0"
+    jest-message-util "^29.7.0"
+    jest-resolve "^29.7.0"
+    jest-runtime "^29.7.0"
+    jest-util "^29.7.0"
+    jest-watcher "^29.7.0"
+    jest-worker "^29.7.0"
+    p-limit "^3.1.0"
+    source-map-support "0.5.13"
+
+jest-runtime@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-29.7.0.tgz#efecb3141cf7d3767a3a0cc8f7c9990587d3d817"
+  integrity sha512-gUnLjgwdGqW7B4LvOIkbKs9WGbn+QLqRQQ9juC6HndeDiezIwhDP+mhMwHWCEcfQ5RUXa6OPnFF8BJh5xegwwQ==
+  dependencies:
+    "@jest/environment" "^29.7.0"
+    "@jest/fake-timers" "^29.7.0"
+    "@jest/globals" "^29.7.0"
+    "@jest/source-map" "^29.6.3"
+    "@jest/test-result" "^29.7.0"
+    "@jest/transform" "^29.7.0"
+    "@jest/types" "^29.6.3"
+    "@types/node" "*"
+    chalk "^4.0.0"
+    cjs-module-lexer "^1.0.0"
+    collect-v8-coverage "^1.0.0"
+    glob "^7.1.3"
+    graceful-fs "^4.2.9"
+    jest-haste-map "^29.7.0"
+    jest-message-util "^29.7.0"
+    jest-mock "^29.7.0"
+    jest-regex-util "^29.6.3"
+    jest-resolve "^29.7.0"
+    jest-snapshot "^29.7.0"
+    jest-util "^29.7.0"
+    slash "^3.0.0"
+    strip-bom "^4.0.0"
+
+jest-snapshot@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-29.7.0.tgz#c2c574c3f51865da1bb329036778a69bf88a6be5"
+  integrity sha512-Rm0BMWtxBcioHr1/OX5YCP8Uov4riHvKPknOGs804Zg9JGZgmIBkbtlxJC/7Z4msKYVbIJtfU+tKb8xlYNfdkw==
+  dependencies:
+    "@babel/core" "^7.11.6"
+    "@babel/generator" "^7.7.2"
+    "@babel/plugin-syntax-jsx" "^7.7.2"
+    "@babel/plugin-syntax-typescript" "^7.7.2"
+    "@babel/types" "^7.3.3"
+    "@jest/expect-utils" "^29.7.0"
+    "@jest/transform" "^29.7.0"
+    "@jest/types" "^29.6.3"
+    babel-preset-current-node-syntax "^1.0.0"
+    chalk "^4.0.0"
+    expect "^29.7.0"
+    graceful-fs "^4.2.9"
+    jest-diff "^29.7.0"
+    jest-get-type "^29.6.3"
+    jest-matcher-utils "^29.7.0"
+    jest-message-util "^29.7.0"
+    jest-util "^29.7.0"
+    natural-compare "^1.4.0"
+    pretty-format "^29.7.0"
+    semver "^7.5.3"
+
+jest-util@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.7.0.tgz#23c2b62bfb22be82b44de98055802ff3710fc0bc"
+  integrity sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==
+  dependencies:
+    "@jest/types" "^29.6.3"
+    "@types/node" "*"
+    chalk "^4.0.0"
+    ci-info "^3.2.0"
+    graceful-fs "^4.2.9"
+    picomatch "^2.2.3"
+
+jest-validate@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-29.7.0.tgz#7bf705511c64da591d46b15fce41400d52147d9c"
+  integrity sha512-ZB7wHqaRGVw/9hST/OuFUReG7M8vKeq0/J2egIGLdvjHCmYqGARhzXmtgi+gVeZ5uXFF219aOc3Ls2yLg27tkw==
+  dependencies:
+    "@jest/types" "^29.6.3"
+    camelcase "^6.2.0"
+    chalk "^4.0.0"
+    jest-get-type "^29.6.3"
+    leven "^3.1.0"
+    pretty-format "^29.7.0"
+
+jest-watcher@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-29.7.0.tgz#7810d30d619c3a62093223ce6bb359ca1b28a2f2"
+  integrity sha512-49Fg7WXkU3Vl2h6LbLtMQ/HyB6rXSIX7SqvBLQmssRBGN9I0PNvPmAmCWSOY6SOvrjhI/F7/bGAv9RtnsPA03g==
+  dependencies:
+    "@jest/test-result" "^29.7.0"
+    "@jest/types" "^29.6.3"
+    "@types/node" "*"
+    ansi-escapes "^4.2.1"
+    chalk "^4.0.0"
+    emittery "^0.13.1"
+    jest-util "^29.7.0"
+    string-length "^4.0.1"
+
+jest-worker@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-29.7.0.tgz#acad073acbbaeb7262bd5389e1bcf43e10058d4a"
+  integrity sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==
+  dependencies:
+    "@types/node" "*"
+    jest-util "^29.7.0"
+    merge-stream "^2.0.0"
+    supports-color "^8.0.0"
+
+jest@^29.4.1:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest/-/jest-29.7.0.tgz#994676fc24177f088f1c5e3737f5697204ff2613"
+  integrity sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==
+  dependencies:
+    "@jest/core" "^29.7.0"
+    "@jest/types" "^29.6.3"
+    import-local "^3.0.2"
+    jest-cli "^29.7.0"
+
+js-tokens@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
+  integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
+
+js-yaml@^3.13.1:
+  version "3.14.1"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
+  integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
+  dependencies:
+    argparse "^1.0.7"
+    esprima "^4.0.0"
+
+jsesc@^2.5.1:
+  version "2.5.2"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
+  integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==
+
+json-parse-even-better-errors@^2.3.0:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
+  integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
+
+json5@^2.2.3:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
+  integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
+
+kleur@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
+  integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==
+
+leven@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2"
+  integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==
+
+lines-and-columns@^1.1.6:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632"
+  integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==
+
+locate-path@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
+  integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==
+  dependencies:
+    p-locate "^4.1.0"
+
+lru-cache@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
+  integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==
+  dependencies:
+    yallist "^3.0.2"
+
+lru-cache@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
+  integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
+  dependencies:
+    yallist "^4.0.0"
+
+make-dir@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-4.0.0.tgz#c3c2307a771277cd9638305f915c29ae741b614e"
+  integrity sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==
+  dependencies:
+    semver "^7.5.3"
+
+make-error@^1.1.1:
+  version "1.3.6"
+  resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
+  integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
+
+makeerror@1.0.12:
+  version "1.0.12"
+  resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.12.tgz#3e5dd2079a82e812e983cc6610c4a2cb0eaa801a"
+  integrity sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==
+  dependencies:
+    tmpl "1.0.5"
+
+merge-stream@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
+  integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
+
+micromatch@^4.0.4:
+  version "4.0.5"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
+  integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
+  dependencies:
+    braces "^3.0.2"
+    picomatch "^2.3.1"
+
+mimic-fn@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
+  integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
+
+minimalistic-assert@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
+  integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
+
+minimatch@^3.0.4, minimatch@^3.1.1:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
+  integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
+  dependencies:
+    brace-expansion "^1.1.7"
+
+ms@2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
+  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
+
+natural-compare@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
+  integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==
+
+node-int64@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
+  integrity sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==
+
+node-releases@^2.0.13:
+  version "2.0.13"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.13.tgz#d5ed1627c23e3461e819b02e57b75e4899b1c81d"
+  integrity sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==
+
+normalize-path@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
+  integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
+
+npm-run-path@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"
+  integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==
+  dependencies:
+    path-key "^3.0.0"
+
+once@^1.3.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+  integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==
+  dependencies:
+    wrappy "1"
+
+onetime@^5.1.2:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e"
+  integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==
+  dependencies:
+    mimic-fn "^2.1.0"
+
+p-limit@^2.2.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
+  integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
+  dependencies:
+    p-try "^2.0.0"
+
+p-limit@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b"
+  integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==
+  dependencies:
+    yocto-queue "^0.1.0"
+
+p-locate@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07"
+  integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==
+  dependencies:
+    p-limit "^2.2.0"
+
+p-try@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
+  integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
+
+parse-json@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd"
+  integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==
+  dependencies:
+    "@babel/code-frame" "^7.0.0"
+    error-ex "^1.3.1"
+    json-parse-even-better-errors "^2.3.0"
+    lines-and-columns "^1.1.6"
+
+path-exists@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
+  integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
+
+path-is-absolute@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+  integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
+
+path-key@^3.0.0, path-key@^3.1.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
+  integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
+
+path-parse@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
+  integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
+
+picocolors@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
+  integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
+
+picomatch@^2.0.4, picomatch@^2.2.3, picomatch@^2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
+  integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
+
+pirates@^4.0.4:
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.6.tgz#3018ae32ecfcff6c29ba2267cbf21166ac1f36b9"
+  integrity sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==
+
+pkg-dir@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3"
+  integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==
+  dependencies:
+    find-up "^4.0.0"
+
+pretty-format@^29.0.0, pretty-format@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-29.7.0.tgz#ca42c758310f365bfa71a0bda0a807160b776812"
+  integrity sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==
+  dependencies:
+    "@jest/schemas" "^29.6.3"
+    ansi-styles "^5.0.0"
+    react-is "^18.0.0"
+
+prompts@^2.0.1:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.2.tgz#7b57e73b3a48029ad10ebd44f74b01722a4cb069"
+  integrity sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==
+  dependencies:
+    kleur "^3.0.3"
+    sisteransi "^1.0.5"
+
+pure-rand@^6.0.0:
+  version "6.0.4"
+  resolved "https://registry.yarnpkg.com/pure-rand/-/pure-rand-6.0.4.tgz#50b737f6a925468679bff00ad20eade53f37d5c7"
+  integrity sha512-LA0Y9kxMYv47GIPJy6MI84fqTd2HmYZI83W/kM/SkKfDlajnZYfmXFTxkbY+xSBPkLJxltMa9hIkmdc29eguMA==
+
+react-is@^18.0.0:
+  version "18.2.0"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b"
+  integrity sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==
+
+require-directory@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
+  integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==
+
+resolve-cwd@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d"
+  integrity sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==
+  dependencies:
+    resolve-from "^5.0.0"
+
+resolve-from@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
+  integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
+
+resolve.exports@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-2.0.2.tgz#f8c934b8e6a13f539e38b7098e2e36134f01e800"
+  integrity sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==
+
+resolve@^1.20.0:
+  version "1.22.8"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d"
+  integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==
+  dependencies:
+    is-core-module "^2.13.0"
+    path-parse "^1.0.7"
+    supports-preserve-symlinks-flag "^1.0.0"
+
+semver@^6.3.0, semver@^6.3.1:
+  version "6.3.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
+  integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
+
+semver@^7.3.4, semver@^7.5.3, semver@^7.5.4:
+  version "7.5.4"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
+  integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
+  dependencies:
+    lru-cache "^6.0.0"
+
+shebang-command@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
+  integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==
+  dependencies:
+    shebang-regex "^3.0.0"
+
+shebang-regex@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
+  integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
+
+signal-exit@^3.0.3, signal-exit@^3.0.7:
+  version "3.0.7"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
+  integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
+
+sisteransi@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed"
+  integrity sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==
+
+slash@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
+  integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
+
+source-map-support@0.5.13:
+  version "0.5.13"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.13.tgz#31b24a9c2e73c2de85066c0feb7d44767ed52932"
+  integrity sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==
+  dependencies:
+    buffer-from "^1.0.0"
+    source-map "^0.6.0"
+
+source-map@^0.6.0, source-map@^0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
+
+sprintf-js@~1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
+  integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==
+
+stack-utils@^2.0.3:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.6.tgz#aaf0748169c02fc33c8232abccf933f54a1cc34f"
+  integrity sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==
+  dependencies:
+    escape-string-regexp "^2.0.0"
+
+string-length@^4.0.1:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/string-length/-/string-length-4.0.2.tgz#a8a8dc7bd5c1a82b9b3c8b87e125f66871b6e57a"
+  integrity sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==
+  dependencies:
+    char-regex "^1.0.2"
+    strip-ansi "^6.0.0"
+
+string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
+strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
+strip-bom@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-4.0.0.tgz#9c3505c1db45bcedca3d9cf7a16f5c5aa3901878"
+  integrity sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==
+
+strip-final-newline@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
+  integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
+
+strip-json-comments@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
+  integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
+
+supports-color@^5.3.0:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
+  integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
+  dependencies:
+    has-flag "^3.0.0"
+
+supports-color@^7.1.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
+  integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
+  dependencies:
+    has-flag "^4.0.0"
+
+supports-color@^8.0.0:
+  version "8.1.1"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c"
+  integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==
+  dependencies:
+    has-flag "^4.0.0"
+
+supports-preserve-symlinks-flag@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09"
+  integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==
+
+test-exclude@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-6.0.0.tgz#04a8698661d805ea6fa293b6cb9e63ac044ef15e"
+  integrity sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==
+  dependencies:
+    "@istanbuljs/schema" "^0.1.2"
+    glob "^7.1.4"
+    minimatch "^3.0.4"
+
+tmpl@1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc"
+  integrity sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==
+
+to-fast-properties@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
+  integrity sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==
+
+to-regex-range@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
+  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
+  dependencies:
+    is-number "^7.0.0"
+
+ts-node@^10.9.1:
+  version "10.9.1"
+  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.9.1.tgz#e73de9102958af9e1f0b168a6ff320e25adcff4b"
+  integrity sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==
+  dependencies:
+    "@cspotcode/source-map-support" "^0.8.0"
+    "@tsconfig/node10" "^1.0.7"
+    "@tsconfig/node12" "^1.0.7"
+    "@tsconfig/node14" "^1.0.0"
+    "@tsconfig/node16" "^1.0.2"
+    acorn "^8.4.1"
+    acorn-walk "^8.1.1"
+    arg "^4.1.0"
+    create-require "^1.1.0"
+    diff "^4.0.1"
+    make-error "^1.1.1"
+    v8-compile-cache-lib "^3.0.1"
+    yn "3.1.1"
+
+tslib@^2.3.1:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae"
+  integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==
+
+type-detect@4.0.8:
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
+  integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==
+
+type-fest@^0.21.3:
+  version "0.21.3"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37"
+  integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==
+
+typescript@^4.9.5:
+  version "4.9.5"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a"
+  integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==
+
+undici-types@~5.26.4:
+  version "5.26.5"
+  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
+  integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
+
+update-browserslist-db@^1.0.13:
+  version "1.0.13"
+  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz#3c5e4f5c083661bd38ef64b6328c26ed6c8248c4"
+  integrity sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==
+  dependencies:
+    escalade "^3.1.1"
+    picocolors "^1.0.0"
+
+v8-compile-cache-lib@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf"
+  integrity sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==
+
+v8-to-istanbul@^9.0.1:
+  version "9.2.0"
+  resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-9.2.0.tgz#2ed7644a245cddd83d4e087b9b33b3e62dfd10ad"
+  integrity sha512-/EH/sDgxU2eGxajKdwLCDmQ4FWq+kpi3uCmBGpw1xJtnAxEjlD8j8PEiGWpCIMIs3ciNAgH0d3TTJiUkYzyZjA==
+  dependencies:
+    "@jridgewell/trace-mapping" "^0.3.12"
+    "@types/istanbul-lib-coverage" "^2.0.1"
+    convert-source-map "^2.0.0"
+
+walker@^1.0.8:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.8.tgz#bd498db477afe573dc04185f011d3ab8a8d7653f"
+  integrity sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==
+  dependencies:
+    makeerror "1.0.12"
+
+which@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
+  integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
+  dependencies:
+    isexe "^2.0.0"
+
+wrap-ansi@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
+wrappy@1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+  integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
+
+write-file-atomic@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-4.0.2.tgz#a9df01ae5b77858a027fd2e80768ee433555fcfd"
+  integrity sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==
+  dependencies:
+    imurmurhash "^0.1.4"
+    signal-exit "^3.0.7"
+
+ws@^7.5.2:
+  version "7.5.9"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.9.tgz#54fa7db29f4c7cec68b1ddd3a89de099942bb591"
+  integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==
+
+y18n@^5.0.5:
+  version "5.0.8"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
+  integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==
+
+yallist@^3.0.2:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
+  integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
+
+yallist@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
+  integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
+
+yargs-parser@^21.1.1:
+  version "21.1.1"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
+  integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==
+
+yargs@^17.3.1:
+  version "17.7.2"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269"
+  integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==
+  dependencies:
+    cliui "^8.0.1"
+    escalade "^3.1.1"
+    get-caller-file "^2.0.5"
+    require-directory "^2.1.1"
+    string-width "^4.2.3"
+    y18n "^5.0.5"
+    yargs-parser "^21.1.1"
+
+yn@3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50"
+  integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==
+
+yocto-queue@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
+  integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==

From f23b2fdfd0aea120d02797d2ea2c695084f14d31 Mon Sep 17 00:00:00 2001
From: mainnet-pat <mainnet_pat@protonmail.com>
Date: Mon, 27 Nov 2023 10:27:29 +0000
Subject: [PATCH 023/171] Small cleanups

---
 demo/testing-suite/artifacts/example.json | 2 +-
 demo/testing-suite/test/example.test.ts   | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/demo/testing-suite/artifacts/example.json b/demo/testing-suite/artifacts/example.json
index 710264fd..80293c74 100644
--- a/demo/testing-suite/artifacts/example.json
+++ b/demo/testing-suite/artifacts/example.json
@@ -42,5 +42,5 @@
     "name": "cashc",
     "version": "0.9.2"
   },
-  "updatedAt": "2023-11-27T09:10:47.313Z"
+  "updatedAt": "2023-11-27T10:26:49.646Z"
 }
\ No newline at end of file
diff --git a/demo/testing-suite/test/example.test.ts b/demo/testing-suite/test/example.test.ts
index ccf80dbe..21a44c0f 100644
--- a/demo/testing-suite/test/example.test.ts
+++ b/demo/testing-suite/test/example.test.ts
@@ -4,13 +4,11 @@ import { randomUtxo } from 'cashscript/dist/src/utils';
 import 'cashscript/dist/test/JestExtensions';
 
 describe("test example contract functions", () => {
-  it("should check for output logs", async () => {
+  it("should check for output logs and error messages", async () => {
     const provider = new MockNetworkProvider();
     const contract = new Contract(artifact, [], { provider });
     provider.addUtxo(contract.address, randomUtxo());
 
-    artifact.debug.logs[0].ip = 100;
-
     let transaction = contract.functions.test(0n).to(contract.address, 10000n);
     await (expect(transaction)).toLog(/0 test/);
     await (expect(transaction)).toFailRequireWith(/Wrong value passed/);

From 05fe97827d8acdceea1708b4ef543f5906cdff82 Mon Sep 17 00:00:00 2001
From: mainnet-pat <mainnet_pat@protonmail.com>
Date: Mon, 27 Nov 2023 10:42:29 +0000
Subject: [PATCH 024/171] Update linter, lint

---
 .eslintrc.cjs                                 |    4 +-
 package.json                                  |   10 +-
 packages/cashc/package.json                   |    2 +-
 packages/cashc/test/ast/Location.test.ts      |   21 +-
 packages/cashscript/package.json              |    2 +-
 packages/cashscript/src/LibauthTemplate.ts    |   13 +-
 packages/cashscript/src/Transaction.ts        |    2 +-
 packages/cashscript/src/TransactionBuilder.ts |    2 +-
 packages/cashscript/test/Contract.test.ts     |   10 +-
 .../cashscript/test/LibauthTemplate.test.ts   |   14 +-
 .../cashscript/test/e2e/Announcement.test.ts  |    2 +-
 packages/cashscript/test/e2e/BigInt.test.ts   |    2 +-
 .../cashscript/test/e2e/FullStack.test.ts     |    2 +-
 .../cashscript/test/e2e/HodlVault.test.ts     |    2 +-
 packages/cashscript/test/e2e/Mecenas.test.ts  |    2 +-
 .../cashscript/test/e2e/P2PKH-tokens.test.ts  |    2 +-
 packages/cashscript/test/e2e/P2PKH.test.ts    |    2 +-
 .../test/e2e/TransferWithTimeout.test.ts      |    2 +-
 packages/cashscript/test/e2e/misc.test.ts     |    2 +-
 .../cashscript/test/e2e/old/Mecenas.test.ts   |    2 +-
 packages/cashscript/test/e2e/old/misc.test.ts |    4 +-
 .../TransactionBuilder.test.ts                |    4 +-
 packages/utils/package.json                   |    2 +-
 packages/utils/src/libauth.ts                 |    9 +-
 packages/utils/src/types.ts                   |    2 +-
 yarn.lock                                     | 1365 ++++++++++++-----
 26 files changed, 1043 insertions(+), 443 deletions(-)

diff --git a/.eslintrc.cjs b/.eslintrc.cjs
index 3ee079db..ec009b1c 100644
--- a/.eslintrc.cjs
+++ b/.eslintrc.cjs
@@ -3,11 +3,11 @@ const path = require('path');
 module.exports = {
   root: true,
   parser: '@typescript-eslint/parser',
-  plugins: ['@typescript-eslint'],
+  plugins: ['@typescript-eslint', 'import'],
   extends: ['airbnb-typescript/base'],
   parserOptions: {
     project: path.join(__dirname, 'tsconfig.json'),
-    ecmaVersion: 2018,  // Allows for the parsing of modern ECMAScript features
+    ecmaVersion: 2021,  // Allows for the parsing of modern ECMAScript features
     sourceType: 'module',  // Allows for the use of imports
     extraFileExtensions: ['.cjs'],
   },
diff --git a/package.json b/package.json
index 13f65ea1..b78cd117 100644
--- a/package.json
+++ b/package.json
@@ -10,15 +10,15 @@
     "@jest/reporters": "^26.6.2",
     "@types/jest": "^29.4.0",
     "@types/node": "^14.14.28",
-    "@typescript-eslint/eslint-plugin": "^4.15.1",
-    "@typescript-eslint/parser": "^4.15.1",
+    "@typescript-eslint/eslint-plugin": "^6.12.0",
+    "@typescript-eslint/parser": "^6.12.0",
     "cashproof": "https://github.com/eyeofpython/cashproof",
     "chalk": "^4.1.0",
     "codecov": "^3.8.1",
     "cspell": "^5.2.4",
-    "eslint": "^7.20.0",
-    "eslint-config-airbnb-typescript": "^12.3.1",
-    "eslint-plugin-import": "^2.22.1",
+    "eslint": "^8.54.0",
+    "eslint-config-airbnb-typescript": "^17.1.0",
+    "eslint-plugin-import": "^2.29.0",
     "lerna": "^3.22.1",
     "ts-node": "^10.9.1",
     "typescript": "^4.9.5"
diff --git a/packages/cashc/package.json b/packages/cashc/package.json
index 80c4d410..b21064e3 100644
--- a/packages/cashc/package.json
+++ b/packages/cashc/package.json
@@ -61,7 +61,7 @@
     "@types/semver": "^7.3.4",
     "antlr4ts-cli": "^0.5.0-alpha.4",
     "cpy-cli": "^4.2.0",
-    "eslint": "^7.20.0",
+    "eslint": "^8.54.0",
     "jest": "^29.4.1",
     "typescript": "^4.1.5",
     "url-join": "^5.0.0"
diff --git a/packages/cashc/test/ast/Location.test.ts b/packages/cashc/test/ast/Location.test.ts
index 723476d5..511eb0f9 100644
--- a/packages/cashc/test/ast/Location.test.ts
+++ b/packages/cashc/test/ast/Location.test.ts
@@ -1,7 +1,7 @@
 import fs from 'fs';
 import { URL } from 'url';
 import { compileString, parseCode } from '../../src/compiler.js';
-import { buildOpCodeMap, bytecodeToAsm, bytecodeToScript, formatLibauthScript } from '@cashscript/utils';
+import { buildOpCodeMap, bytecodeToAsm, bytecodeToScript } from '@cashscript/utils';
 import { hexToBin } from '@bitauth/libauth';
 
 describe('Location', () => {
@@ -21,7 +21,7 @@ contract test() {
   function test() {
     require(${code});
   }
-}`
+}`;
   };
 
   describe('should produce same bytecode', () => {
@@ -47,20 +47,27 @@ contract test() {
           const source = wrap(block);
           const artifact = compileString(source);
           const expected = bytecodeToAsm(hexToBin(artifact.debug!.bytecode));
-          const opCodeMap = buildOpCodeMap(bytecodeToScript(hexToBin(artifact.debug!.bytecode)), artifact.debug!.sourceMap);
+          const opCodeMap = buildOpCodeMap(
+            bytecodeToScript(hexToBin(artifact.debug!.bytecode)), artifact.debug!.sourceMap,
+          );
 
-          const received = Object.values(opCodeMap).join(' ').replaceAll('<0x', '').replaceAll('>', '').replace(/\s+/g, ' ');
+          const received = Object.values(opCodeMap).join(' ')
+            .replaceAll('<0x', '').replaceAll('>', '').replace(/\s+/g, ' ');
           expect(received).toBe(expected);
         }
 
         {
           // break statements into separate lines, test `hint`
-          const source = wrap(block.replaceAll(' ', '\n').replaceAll(')', '\n)')).replaceAll('(\n)', '()').replace(/\((?!\))/g, '(\n');
+          const source = wrap(block.replaceAll(' ', '\n').replaceAll(')', '\n)'))
+            .replaceAll('(\n)', '()').replace(/\((?!\))/g, '(\n');
           const artifact = compileString(source);
           const expected = bytecodeToAsm(hexToBin(artifact.debug!.bytecode));
-          const opCodeMap = buildOpCodeMap(bytecodeToScript(hexToBin(artifact.debug!.bytecode)), artifact.debug!.sourceMap);
+          const opCodeMap = buildOpCodeMap(
+            bytecodeToScript(hexToBin(artifact.debug!.bytecode)), artifact.debug!.sourceMap,
+          );
 
-          const received = Object.values(opCodeMap).join(' ').replaceAll('<0x', '').replaceAll('>', '').replace(/\s+/g, ' ');
+          const received = Object.values(opCodeMap).join(' ')
+            .replaceAll('<0x', '').replaceAll('>', '').replace(/\s+/g, ' ');
           expect(received).toBe(expected);
         }
       });
diff --git a/packages/cashscript/package.json b/packages/cashscript/package.json
index a744d7bd..de7b235d 100644
--- a/packages/cashscript/package.json
+++ b/packages/cashscript/package.json
@@ -57,7 +57,7 @@
     "@psf/bch-js": "^4.15.0",
     "@types/pako": "^2.0.3",
     "bip39": "^3.0.4",
-    "eslint": "^7.20.0",
+    "eslint": "^8.54.0",
     "jest": "^29.4.1",
     "typescript": "^4.1.5"
   },
diff --git a/packages/cashscript/src/LibauthTemplate.ts b/packages/cashscript/src/LibauthTemplate.ts
index 195542f6..4738d0fe 100644
--- a/packages/cashscript/src/LibauthTemplate.ts
+++ b/packages/cashscript/src/LibauthTemplate.ts
@@ -1,5 +1,5 @@
 import {
-  AbiFunction, Artifact, PrimitiveType, asmToScript, bytecodeToScript, decodeBool, decodeInt, decodeString, formatLibauthScript,
+  AbiFunction, Artifact, PrimitiveType, bytecodeToScript, decodeBool, decodeInt, decodeString, formatLibauthScript,
 } from '@cashscript/utils';
 import {
   hash160,
@@ -117,7 +117,7 @@ export const buildTemplate = async ({
   const abiFunction = (transaction as any).abiFunction as AbiFunction;
   const funcName = abiFunction.name;
   const functionIndex = contract.artifact.abi.findIndex(
-    (abiFunction) => abiFunction.name === funcName,
+    (func) => func.name === funcName,
   )!;
   const func: AbiFunction = contract.artifact.abi[functionIndex];
   const functionInputs = func.inputs.slice().reverse();
@@ -131,9 +131,10 @@ export const buildTemplate = async ({
 
   const formattedBytecode = contract.artifact.debug
     ? formatLibauthScript(
-        bytecodeToScript(hexToBin(contract.artifact.debug.bytecode)),
-        contract.artifact.debug?.sourceMap!,
-        contract.artifact.source).split('\n')
+      bytecodeToScript(hexToBin(contract.artifact.debug.bytecode)),
+      contract.artifact.debug?.sourceMap!,
+      contract.artifact.source,
+    ).split('\n')
     : contract.artifact.bytecode.split(' ').map((asmElement) => {
       if (isHex(asmElement)) {
         return `<0x${asmElement}>`;
@@ -527,7 +528,7 @@ export const debugTemplate = (template: AuthenticationTemplate, artifact: Artifa
   for (const log of artifact.debug?.logs ?? []) {
     // there might be 2 elements with same instruction pointer, first from unllocking script, second from locking
     const state = debugResult
-      .filter((state: AuthenticationProgramStateBCHCHIPs) => state.ip === log.ip)!
+      .filter((debugState: AuthenticationProgramStateBCHCHIPs) => debugState.ip === log.ip)!
       .slice().reverse()[0];
 
     if (!state) {
diff --git a/packages/cashscript/src/Transaction.ts b/packages/cashscript/src/Transaction.ts
index 6db9bd15..04954d60 100644
--- a/packages/cashscript/src/Transaction.ts
+++ b/packages/cashscript/src/Transaction.ts
@@ -227,7 +227,7 @@ export class Transaction {
     return debugTemplate(template, this.contract.artifact);
   }
 
-  private async getTxDetails(txid: string): Promise<TransactionDetails>
+  private async getTxDetails(txid: string): Promise<TransactionDetails>;
   private async getTxDetails(txid: string, raw: true): Promise<string>;
 
   private async getTxDetails(txid: string, raw?: true): Promise<TransactionDetails | string> {
diff --git a/packages/cashscript/src/TransactionBuilder.ts b/packages/cashscript/src/TransactionBuilder.ts
index bdc964c6..e242814c 100644
--- a/packages/cashscript/src/TransactionBuilder.ts
+++ b/packages/cashscript/src/TransactionBuilder.ts
@@ -158,7 +158,7 @@ export class TransactionBuilder {
   }
 
   // TODO: see if we can merge with Transaction.ts
-  private async getTxDetails(txid: string): Promise<TransactionDetails>
+  private async getTxDetails(txid: string): Promise<TransactionDetails>;
   private async getTxDetails(txid: string, raw: true): Promise<string>;
   private async getTxDetails(txid: string, raw?: true): Promise<TransactionDetails | string> {
     for (let retries = 0; retries < 1200; retries += 1) {
diff --git a/packages/cashscript/test/Contract.test.ts b/packages/cashscript/test/Contract.test.ts
index 1cde4ee3..ad995a6e 100644
--- a/packages/cashscript/test/Contract.test.ts
+++ b/packages/cashscript/test/Contract.test.ts
@@ -9,11 +9,11 @@ import {
 import {
   alicePkh, alicePriv, alicePub, bobPriv,
 } from './fixture/vars.js';
-import p2pkhArtifact from './fixture/p2pkh.json' assert { type: "json" };
-import twtArtifact from './fixture/transfer_with_timeout.json' assert { type: "json" };
-import hodlVaultArtifact from './fixture/hodl_vault.json' assert { type: "json" };
-import mecenasArtifact from './fixture/mecenas.json' assert { type: "json" };
-import boundedBytesArtifact from './fixture/bounded_bytes.json' assert { type: "json" };
+import p2pkhArtifact from './fixture/p2pkh.json' assert { type: 'json' };
+import twtArtifact from './fixture/transfer_with_timeout.json' assert { type: 'json' };
+import hodlVaultArtifact from './fixture/hodl_vault.json' assert { type: 'json' };
+import mecenasArtifact from './fixture/mecenas.json' assert { type: 'json' };
+import boundedBytesArtifact from './fixture/bounded_bytes.json' assert { type: 'json' };
 
 // This is failing due to limitations between Jest and bigint (https://github.com/facebook/jest/issues/11617)
 // TODO: Fix this somehow by changing the test, or move away from Jest
diff --git a/packages/cashscript/test/LibauthTemplate.test.ts b/packages/cashscript/test/LibauthTemplate.test.ts
index 160ac9dc..2e4d4cec 100644
--- a/packages/cashscript/test/LibauthTemplate.test.ts
+++ b/packages/cashscript/test/LibauthTemplate.test.ts
@@ -22,11 +22,11 @@ contract Example(string cash) {
     const artifact = compileString(code);
 
     const provider = new MockNetworkProvider();
-    const contract = new Contract(artifact, ["cash"], { provider });
+    const contract = new Contract(artifact, ['cash'], { provider });
     provider.addUtxo(contract.address, randomUtxo());
 
-    const transaction = contract.functions.test("script").to(contract.address, 10000n);
-    await transaction.debug()
+    const transaction = contract.functions.test('script').to(contract.address, 10000n);
+    await transaction.debug();
   });
 
   it('should log console statements', async () => {
@@ -75,7 +75,9 @@ contract Example(string cash) {
 
       const transaction = contract.functions.transfer(new SignatureTemplate(bobPriv)).to(contract.address, 10000n);
 
-      await (expect(transaction.debug())).rejects.toThrow(/Instruction pointer 100 points to a non-existing state of the program/);
+      await (expect(transaction.debug())).rejects.toThrow(
+        /Instruction pointer 100 points to a non-existing state of the program/,
+      );
     }
 
     artifact.debug!.logs[0].ip = ip;
@@ -86,7 +88,9 @@ contract Example(string cash) {
 
       const transaction = contract.functions.transfer(new SignatureTemplate(bobPriv)).to(contract.address, 10000n);
 
-      await (expect(transaction.debug())).rejects.toThrow(/Stack item at index 100 not found at instruction pointer 9/);
+      await (expect(transaction.debug())).rejects.toThrow(
+        /Stack item at index 100 not found at instruction pointer 9/,
+      );
     }
   });
 
diff --git a/packages/cashscript/test/e2e/Announcement.test.ts b/packages/cashscript/test/e2e/Announcement.test.ts
index a097510f..0545df21 100644
--- a/packages/cashscript/test/e2e/Announcement.test.ts
+++ b/packages/cashscript/test/e2e/Announcement.test.ts
@@ -8,7 +8,7 @@ import {
   createOpReturnOutput, randomUtxo, toRegExp, utxoComparator,
 } from '../../src/utils.js';
 import { aliceAddress } from '../fixture/vars.js';
-import artifact from '../fixture/announcement.json' assert { type: "json" };
+import artifact from '../fixture/announcement.json' assert { type: 'json' };
 
 describe('Announcement', () => {
   let announcement: Contract;
diff --git a/packages/cashscript/test/e2e/BigInt.test.ts b/packages/cashscript/test/e2e/BigInt.test.ts
index 7fbe1fa0..f5378f67 100644
--- a/packages/cashscript/test/e2e/BigInt.test.ts
+++ b/packages/cashscript/test/e2e/BigInt.test.ts
@@ -9,7 +9,7 @@ import {
   Network,
 } from '../../src/index.js';
 import { getTxOutputs } from '../test-util.js';
-import artifact from '../fixture/bigint.json' assert { type: "json" };
+import artifact from '../fixture/bigint.json' assert { type: 'json' };
 import { randomUtxo, toRegExp } from '../../src/utils.js';
 
 describe('BigInt', () => {
diff --git a/packages/cashscript/test/e2e/FullStack.test.ts b/packages/cashscript/test/e2e/FullStack.test.ts
index dac4e286..0b703bbb 100644
--- a/packages/cashscript/test/e2e/FullStack.test.ts
+++ b/packages/cashscript/test/e2e/FullStack.test.ts
@@ -8,7 +8,7 @@ import {
 } from '../fixture/vars.js';
 import { getTxOutputs } from '../test-util.js';
 import { FailedSigCheckError, Reason } from '../../src/Errors.js';
-import artifact from '../fixture/p2pkh.json' assert { type: "json" };
+import artifact from '../fixture/p2pkh.json' assert { type: 'json' };
 
 describe.skip('P2PKH (using FullStackNetworkProvider)', () => {
   let p2pkhInstance: Contract;
diff --git a/packages/cashscript/test/e2e/HodlVault.test.ts b/packages/cashscript/test/e2e/HodlVault.test.ts
index 0711a695..604e3e6e 100644
--- a/packages/cashscript/test/e2e/HodlVault.test.ts
+++ b/packages/cashscript/test/e2e/HodlVault.test.ts
@@ -14,7 +14,7 @@ import {
 } from '../fixture/vars.js';
 import { getTxOutputs } from '../test-util.js';
 import { FailedRequireError, Reason } from '../../src/Errors.js';
-import artifact from '../fixture/hodl_vault.json' assert { type: "json" };
+import artifact from '../fixture/hodl_vault.json' assert { type: 'json' };
 import { randomUtxo, toRegExp } from '../../src/utils.js';
 
 describe('HodlVault', () => {
diff --git a/packages/cashscript/test/e2e/Mecenas.test.ts b/packages/cashscript/test/e2e/Mecenas.test.ts
index 158c08b5..67efbfcc 100644
--- a/packages/cashscript/test/e2e/Mecenas.test.ts
+++ b/packages/cashscript/test/e2e/Mecenas.test.ts
@@ -10,7 +10,7 @@ import {
 } from '../fixture/vars.js';
 import { getTxOutputs } from '../test-util.js';
 import { FailedRequireError, Reason } from '../../src/Errors.js';
-import artifact from '../fixture/mecenas.json' assert { type: "json" };
+import artifact from '../fixture/mecenas.json' assert { type: 'json' };
 import { randomUtxo, toRegExp } from '../../src/utils.js';
 
 // Mecenas has tx.age check omitted for testing
diff --git a/packages/cashscript/test/e2e/P2PKH-tokens.test.ts b/packages/cashscript/test/e2e/P2PKH-tokens.test.ts
index ccbab965..cd4a06ea 100644
--- a/packages/cashscript/test/e2e/P2PKH-tokens.test.ts
+++ b/packages/cashscript/test/e2e/P2PKH-tokens.test.ts
@@ -9,7 +9,7 @@ import {
 } from '../fixture/vars.js';
 import { getTxOutputs } from '../test-util.js';
 import { Network, TokenDetails, Utxo } from '../../src/interfaces.js';
-import artifact from '../fixture/p2pkh.json' assert { type: "json" };
+import artifact from '../fixture/p2pkh.json' assert { type: 'json' };
 
 describe('P2PKH-tokens', () => {
   let p2pkhInstance: Contract;
diff --git a/packages/cashscript/test/e2e/P2PKH.test.ts b/packages/cashscript/test/e2e/P2PKH.test.ts
index e7b562ef..d6411b86 100644
--- a/packages/cashscript/test/e2e/P2PKH.test.ts
+++ b/packages/cashscript/test/e2e/P2PKH.test.ts
@@ -15,7 +15,7 @@ import {
   createOpReturnOutput, randomUtxo, toRegExp, utxoComparator,
 } from '../../src/utils.js';
 import { FailedSigCheckError, Reason } from '../../src/Errors.js';
-import artifact from '../fixture/p2pkh.json' assert { type: "json" };
+import artifact from '../fixture/p2pkh.json' assert { type: 'json' };
 
 describe('P2PKH-no-tokens', () => {
   let p2pkhInstance: Contract;
diff --git a/packages/cashscript/test/e2e/TransferWithTimeout.test.ts b/packages/cashscript/test/e2e/TransferWithTimeout.test.ts
index 89f667bc..f7ddcf7f 100644
--- a/packages/cashscript/test/e2e/TransferWithTimeout.test.ts
+++ b/packages/cashscript/test/e2e/TransferWithTimeout.test.ts
@@ -11,7 +11,7 @@ import {
 } from '../fixture/vars.js';
 import { getTxOutputs } from '../test-util.js';
 import { FailedSigCheckError, Reason, FailedTimeCheckError } from '../../src/Errors.js';
-import artifact from '../fixture/transfer_with_timeout.json' assert { type: "json" };
+import artifact from '../fixture/transfer_with_timeout.json' assert { type: 'json' };
 import { randomUtxo, toRegExp } from '../../src/utils.js';
 
 describe('TransferWithTimeout', () => {
diff --git a/packages/cashscript/test/e2e/misc.test.ts b/packages/cashscript/test/e2e/misc.test.ts
index 79e281c7..b976e3ed 100644
--- a/packages/cashscript/test/e2e/misc.test.ts
+++ b/packages/cashscript/test/e2e/misc.test.ts
@@ -3,7 +3,7 @@ import {
   Contract, MockNetworkProvider, ElectrumNetworkProvider, Network,
 } from '../../src/index.js';
 import { getTxOutputs } from '../test-util.js';
-import artifact from '../fixture/simple_covenant.json' assert { type: "json" };
+import artifact from '../fixture/simple_covenant.json' assert { type: 'json' };
 
 describe('Simple Covenant', () => {
   const provider = process.env.TESTS_USE_MOCKNET
diff --git a/packages/cashscript/test/e2e/old/Mecenas.test.ts b/packages/cashscript/test/e2e/old/Mecenas.test.ts
index 9cae052b..46f30850 100644
--- a/packages/cashscript/test/e2e/old/Mecenas.test.ts
+++ b/packages/cashscript/test/e2e/old/Mecenas.test.ts
@@ -15,7 +15,7 @@ import {
 } from '../../fixture/vars.js';
 import { getTxOutputs } from '../../test-util.js';
 import { FailedRequireError, Reason } from '../../../src/Errors.js';
-import artifact from '../../fixture/old/mecenas.json' assert { type: "json" };
+import artifact from '../../fixture/old/mecenas.json' assert { type: 'json' };
 
 if (!process.env.TESTS_USE_MOCKNET) {
 // Mecenas has tx.age check omitted for testing
diff --git a/packages/cashscript/test/e2e/old/misc.test.ts b/packages/cashscript/test/e2e/old/misc.test.ts
index 23c2adb7..2aed7ad3 100644
--- a/packages/cashscript/test/e2e/old/misc.test.ts
+++ b/packages/cashscript/test/e2e/old/misc.test.ts
@@ -13,8 +13,8 @@ import {
   alicePriv,
 } from '../../fixture/vars.js';
 import { getTxOutputs } from '../../test-util.js';
-import simpleCovenantArtifact from '../../fixture/old/simple_covenant.json' assert { type: "json" };
-import mecenasBorderArtifact from '../../fixture/old/mecenas_border.json' assert { type: "json" };
+import simpleCovenantArtifact from '../../fixture/old/simple_covenant.json' assert { type: 'json' };
+import mecenasBorderArtifact from '../../fixture/old/mecenas_border.json' assert { type: 'json' };
 
 if (!process.env.TESTS_USE_MOCKNET) {
   describe('v0.6.0 - Simple Covenant', () => {
diff --git a/packages/cashscript/test/e2e/transaction-builder/TransactionBuilder.test.ts b/packages/cashscript/test/e2e/transaction-builder/TransactionBuilder.test.ts
index 48465ea1..4d6887f6 100644
--- a/packages/cashscript/test/e2e/transaction-builder/TransactionBuilder.test.ts
+++ b/packages/cashscript/test/e2e/transaction-builder/TransactionBuilder.test.ts
@@ -11,8 +11,8 @@ import {
 } from '../../fixture/vars.js';
 import { Network, Utxo } from '../../../src/interfaces.js';
 import { utxoComparator, calculateDust } from '../../../src/utils.js';
-import p2pkhArtifact from '../../fixture/p2pkh.json' assert { type: "json" };
-import twtArtifact from '../../fixture/transfer_with_timeout.json' assert { type: "json" };
+import p2pkhArtifact from '../../fixture/p2pkh.json' assert { type: 'json' };
+import twtArtifact from '../../fixture/transfer_with_timeout.json' assert { type: 'json' };
 import { TransactionBuilder } from '../../../src/TransactionBuilder.js';
 import { getTxOutputs } from '../../test-util.js';
 
diff --git a/packages/utils/package.json b/packages/utils/package.json
index 2eece0bf..764fcad8 100644
--- a/packages/utils/package.json
+++ b/packages/utils/package.json
@@ -45,7 +45,7 @@
   },
   "devDependencies": {
     "@jest/globals": "^29.4.1",
-    "eslint": "^7.20.0",
+    "eslint": "^8.54.0",
     "jest": "^29.4.1",
     "typescript": "^4.1.5"
   },
diff --git a/packages/utils/src/libauth.ts b/packages/utils/src/libauth.ts
index c8cdd59f..0874fa73 100644
--- a/packages/utils/src/libauth.ts
+++ b/packages/utils/src/libauth.ts
@@ -12,12 +12,7 @@ function buildLineMap(bytecode: Script, souceMap: string): { [line: string]: Scr
     return [
       op,
       Object.keys(Op)[Object.values(Op).indexOf(op as Op)],
-      // eslint-disable-next-line
-      positionHint
-        ? location?.end.line
-        // : (op === Op.OP_ENDIF || op === Op.OP_ELSE || op === Op.OP_NIP || op === Op.OP_CHECKLOCKTIMEVERIFY
-        //   ? location?.end.line
-          : location?.start.line,
+      positionHint ? location?.end.line : location?.start.line,
     ];
   });
 
@@ -31,7 +26,7 @@ function buildLineMap(bytecode: Script, souceMap: string): { [line: string]: Scr
   return lineMap;
 }
 
-export function buildOpCodeMap(bytecode: Script, souceMap: string) {
+export function buildOpCodeMap(bytecode: Script, souceMap: string): { [key: string]: string; } {
   const lineMap = buildLineMap(bytecode, souceMap);
 
   const opCodeMap: { [key: string]: string } = {};
diff --git a/packages/utils/src/types.ts b/packages/utils/src/types.ts
index a8dc334c..d5a9e426 100644
--- a/packages/utils/src/types.ts
+++ b/packages/utils/src/types.ts
@@ -47,7 +47,7 @@ export enum PrimitiveType {
   ANY = 'any',
 }
 
-const ExplicitlyCastableTo: { [key in PrimitiveType]: PrimitiveType[]} = {
+const ExplicitlyCastableTo: { [key in PrimitiveType]: PrimitiveType[] } = {
   [PrimitiveType.INT]: [PrimitiveType.INT, PrimitiveType.BOOL],
   [PrimitiveType.BOOL]: [PrimitiveType.BOOL, PrimitiveType.INT],
   [PrimitiveType.STRING]: [PrimitiveType.STRING],
diff --git a/yarn.lock b/yarn.lock
index b77cd314..1ec56a07 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,6 +2,11 @@
 # yarn lockfile v1
 
 
+"@aashutoshrathi/word-wrap@^1.2.3":
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz#bd9154aec9983f77b3a034ecaa015c2e4201f6cf"
+  integrity sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==
+
 "@ampproject/remapping@^2.1.0":
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.0.tgz#56c133824780de3174aed5ab6834f3026790154d"
@@ -10,13 +15,6 @@
     "@jridgewell/gen-mapping" "^0.1.0"
     "@jridgewell/trace-mapping" "^0.3.9"
 
-"@babel/code-frame@7.12.11":
-  version "7.12.11"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f"
-  integrity sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==
-  dependencies:
-    "@babel/highlight" "^7.10.4"
-
 "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.4.tgz#168da1a36e90da68ae8d49c0f1b48c7c6249213a"
@@ -718,22 +716,38 @@
   dependencies:
     "@jridgewell/trace-mapping" "0.3.9"
 
-"@eslint/eslintrc@^0.3.0":
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.3.0.tgz#d736d6963d7003b6514e6324bec9c602ac340318"
-  integrity sha512-1JTKgrOKAHVivSvOYw+sJOunkBjUOvjqWk1DPja7ZFhIS2mX/4EgTT8M7eTK9jrKhL/FvXXEbQwIs3pg1xp3dg==
+"@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.4.0":
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz#a23514e8fb9af1269d5f7788aa556798d61c6b59"
+  integrity sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==
+  dependencies:
+    eslint-visitor-keys "^3.3.0"
+
+"@eslint-community/regexpp@^4.5.1", "@eslint-community/regexpp@^4.6.1":
+  version "4.10.0"
+  resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.10.0.tgz#548f6de556857c8bb73bbee70c35dc82a2e74d63"
+  integrity sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==
+
+"@eslint/eslintrc@^2.1.3":
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.3.tgz#797470a75fe0fbd5a53350ee715e85e87baff22d"
+  integrity sha512-yZzuIG+jnVu6hNSzFEN07e8BxF3uAzYtQb6uDkaYZLo6oYZDCq454c5kB8zxnzfCYyP4MIuyBn10L0DqwujTmA==
   dependencies:
     ajv "^6.12.4"
-    debug "^4.1.1"
-    espree "^7.3.0"
-    globals "^12.1.0"
-    ignore "^4.0.6"
+    debug "^4.3.2"
+    espree "^9.6.0"
+    globals "^13.19.0"
+    ignore "^5.2.0"
     import-fresh "^3.2.1"
-    js-yaml "^3.13.1"
-    lodash "^4.17.20"
-    minimatch "^3.0.4"
+    js-yaml "^4.1.0"
+    minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
+"@eslint/js@8.54.0":
+  version "8.54.0"
+  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.54.0.tgz#4fab9a2ff7860082c304f750e94acd644cf984cf"
+  integrity sha512-ut5V+D+fOoWPgGGNj83GGjnntO39xDy6DWxO0wb7Jp3DcMX0TfIqdzHF85VTQkerdyGmuuMD9AKAo5KiNlf/AQ==
+
 "@evocateur/libnpmaccess@^3.1.2":
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/@evocateur/libnpmaccess/-/libnpmaccess-3.1.2.tgz#ecf7f6ce6b004e9f942b098d92200be4a4b1c845"
@@ -808,6 +822,25 @@
     unique-filename "^1.1.1"
     which "^1.3.1"
 
+"@humanwhocodes/config-array@^0.11.13":
+  version "0.11.13"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.13.tgz#075dc9684f40a531d9b26b0822153c1e832ee297"
+  integrity sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ==
+  dependencies:
+    "@humanwhocodes/object-schema" "^2.0.1"
+    debug "^4.1.1"
+    minimatch "^3.0.5"
+
+"@humanwhocodes/module-importer@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c"
+  integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==
+
+"@humanwhocodes/object-schema@^2.0.1":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.1.tgz#e5211452df060fa8522b55c7b3c0c4d1981cb044"
+  integrity sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==
+
 "@istanbuljs/load-nyc-config@^1.0.0":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz#fd3db1d59ecf7cf121e80650bb86712f9b55eced"
@@ -1900,11 +1933,24 @@
     "@nodelib/fs.stat" "2.0.4"
     run-parallel "^1.1.9"
 
+"@nodelib/fs.scandir@2.1.5":
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
+  integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==
+  dependencies:
+    "@nodelib/fs.stat" "2.0.5"
+    run-parallel "^1.1.9"
+
 "@nodelib/fs.stat@2.0.4", "@nodelib/fs.stat@^2.0.2":
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz#a3f2dd61bab43b8db8fa108a121cfffe4c676655"
   integrity sha512-IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q==
 
+"@nodelib/fs.stat@2.0.5":
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b"
+  integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==
+
 "@nodelib/fs.stat@^1.1.2":
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b"
@@ -1918,6 +1964,14 @@
     "@nodelib/fs.scandir" "2.1.4"
     fastq "^1.6.0"
 
+"@nodelib/fs.walk@^1.2.8":
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a"
+  integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==
+  dependencies:
+    "@nodelib/fs.scandir" "2.1.5"
+    fastq "^1.6.0"
+
 "@octokit/auth-token@^2.4.0":
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/@octokit/auth-token/-/auth-token-2.4.2.tgz#10d0ae979b100fa6b72fa0e8e63e27e6d0dbff8a"
@@ -2262,10 +2316,10 @@
     expect "^29.0.0"
     pretty-format "^29.0.0"
 
-"@types/json-schema@^7.0.3":
-  version "7.0.5"
-  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.5.tgz#dcce4430e64b443ba8945f0290fb564ad5bac6dd"
-  integrity sha512-7+2BITlgjgDhH0vvwZU/HZJVyk+2XUlvxXe8dFMedNX/aMkaOq++rMAFXc0tM7ij15QaWlbdQASBR9dihi+bDQ==
+"@types/json-schema@^7.0.12":
+  version "7.0.15"
+  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841"
+  integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==
 
 "@types/json5@^0.0.29":
   version "0.0.29"
@@ -2337,6 +2391,11 @@
   resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.4.tgz#43d7168fec6fa0988bb1a513a697b29296721afb"
   integrity sha512-+nVsLKlcUCeMzD2ufHEYuJ9a2ovstb6Dp52A5VsoKxDXgvE051XgHI/33I1EymwkRGQkwnA0LkhnUzituGs4EQ==
 
+"@types/semver@^7.5.0":
+  version "7.5.6"
+  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.6.tgz#c65b2bfce1bec346582c07724e3f8c1017a20339"
+  integrity sha512-dn1l8LaMea/IjDoHNd9J52uBbInB796CDffS6VdIxvqYCPSG0V0DzHp76GpaWnlhg88uYyPbXCDIowa86ybd5A==
+
 "@types/stack-utils@^2.0.0":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.0.tgz#7036640b4e21cc2f259ae826ce843d277dad8cff"
@@ -2368,75 +2427,95 @@
   dependencies:
     "@types/yargs-parser" "*"
 
-"@typescript-eslint/eslint-plugin@^4.15.1":
-  version "4.15.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.15.1.tgz#835f64aa0a403e5e9e64c10ceaf8d05c3f015180"
-  integrity sha512-yW2epMYZSpNJXZy22Biu+fLdTG8Mn6b22kR3TqblVk50HGNV8Zya15WAXuQCr8tKw4Qf1BL4QtI6kv6PCkLoJw==
-  dependencies:
-    "@typescript-eslint/experimental-utils" "4.15.1"
-    "@typescript-eslint/scope-manager" "4.15.1"
-    debug "^4.1.1"
-    functional-red-black-tree "^1.0.1"
-    lodash "^4.17.15"
-    regexpp "^3.0.0"
-    semver "^7.3.2"
-    tsutils "^3.17.1"
-
-"@typescript-eslint/experimental-utils@4.15.1":
-  version "4.15.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.15.1.tgz#d744d1ac40570a84b447f7aa1b526368afd17eec"
-  integrity sha512-9LQRmOzBRI1iOdJorr4jEnQhadxK4c9R2aEAsm7WE/7dq8wkKD1suaV0S/JucTL8QlYUPU1y2yjqg+aGC0IQBQ==
-  dependencies:
-    "@types/json-schema" "^7.0.3"
-    "@typescript-eslint/scope-manager" "4.15.1"
-    "@typescript-eslint/types" "4.15.1"
-    "@typescript-eslint/typescript-estree" "4.15.1"
-    eslint-scope "^5.0.0"
-    eslint-utils "^2.0.0"
-
-"@typescript-eslint/parser@^4.15.1", "@typescript-eslint/parser@^4.4.1":
-  version "4.15.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.15.1.tgz#4c91a0602733db63507e1dbf13187d6c71a153c4"
-  integrity sha512-V8eXYxNJ9QmXi5ETDguB7O9diAXlIyS+e3xzLoP/oVE4WCAjssxLIa0mqCLsCGXulYJUfT+GV70Jv1vHsdKwtA==
-  dependencies:
-    "@typescript-eslint/scope-manager" "4.15.1"
-    "@typescript-eslint/types" "4.15.1"
-    "@typescript-eslint/typescript-estree" "4.15.1"
-    debug "^4.1.1"
-
-"@typescript-eslint/scope-manager@4.15.1":
-  version "4.15.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.15.1.tgz#f6511eb38def2a8a6be600c530c243bbb56ac135"
-  integrity sha512-ibQrTFcAm7yG4C1iwpIYK7vDnFg+fKaZVfvyOm3sNsGAerKfwPVFtYft5EbjzByDJ4dj1WD8/34REJfw/9wdVA==
-  dependencies:
-    "@typescript-eslint/types" "4.15.1"
-    "@typescript-eslint/visitor-keys" "4.15.1"
-
-"@typescript-eslint/types@4.15.1":
-  version "4.15.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.15.1.tgz#da702f544ef1afae4bc98da699eaecd49cf31c8c"
-  integrity sha512-iGsaUyWFyLz0mHfXhX4zO6P7O3sExQpBJ2dgXB0G5g/8PRVfBBsmQIc3r83ranEQTALLR3Vko/fnCIVqmH+mPw==
-
-"@typescript-eslint/typescript-estree@4.15.1":
-  version "4.15.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.15.1.tgz#fa9a9ff88b4a04d901ddbe5b248bc0a00cd610be"
-  integrity sha512-z8MN3CicTEumrWAEB2e2CcoZa3KP9+SMYLIA2aM49XW3cWIaiVSOAGq30ffR5XHxRirqE90fgLw3e6WmNx5uNw==
-  dependencies:
-    "@typescript-eslint/types" "4.15.1"
-    "@typescript-eslint/visitor-keys" "4.15.1"
-    debug "^4.1.1"
-    globby "^11.0.1"
-    is-glob "^4.0.1"
-    semver "^7.3.2"
-    tsutils "^3.17.1"
-
-"@typescript-eslint/visitor-keys@4.15.1":
-  version "4.15.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.15.1.tgz#c76abbf2a3be8a70ed760f0e5756bf62de5865dd"
-  integrity sha512-tYzaTP9plooRJY8eNlpAewTOqtWW/4ff/5wBjNVaJ0S0wC4Gpq/zDVRTJa5bq2v1pCNQ08xxMCndcvR+h7lMww==
-  dependencies:
-    "@typescript-eslint/types" "4.15.1"
-    eslint-visitor-keys "^2.0.0"
+"@typescript-eslint/eslint-plugin@^6.12.0":
+  version "6.12.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.12.0.tgz#2a647d278bb48bf397fef07ba0507612ff9dd812"
+  integrity sha512-XOpZ3IyJUIV1b15M7HVOpgQxPPF7lGXgsfcEIu3yDxFPaf/xZKt7s9QO/pbk7vpWQyVulpJbu4E5LwpZiQo4kA==
+  dependencies:
+    "@eslint-community/regexpp" "^4.5.1"
+    "@typescript-eslint/scope-manager" "6.12.0"
+    "@typescript-eslint/type-utils" "6.12.0"
+    "@typescript-eslint/utils" "6.12.0"
+    "@typescript-eslint/visitor-keys" "6.12.0"
+    debug "^4.3.4"
+    graphemer "^1.4.0"
+    ignore "^5.2.4"
+    natural-compare "^1.4.0"
+    semver "^7.5.4"
+    ts-api-utils "^1.0.1"
+
+"@typescript-eslint/parser@^6.12.0":
+  version "6.12.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.12.0.tgz#9fb21ed7d88065a4a2ee21eb80b8578debb8217c"
+  integrity sha512-s8/jNFPKPNRmXEnNXfuo1gemBdVmpQsK1pcu+QIvuNJuhFzGrpD7WjOcvDc/+uEdfzSYpNu7U/+MmbScjoQ6vg==
+  dependencies:
+    "@typescript-eslint/scope-manager" "6.12.0"
+    "@typescript-eslint/types" "6.12.0"
+    "@typescript-eslint/typescript-estree" "6.12.0"
+    "@typescript-eslint/visitor-keys" "6.12.0"
+    debug "^4.3.4"
+
+"@typescript-eslint/scope-manager@6.12.0":
+  version "6.12.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.12.0.tgz#5833a16dbe19cfbad639d4d33bcca5e755c7044b"
+  integrity sha512-5gUvjg+XdSj8pcetdL9eXJzQNTl3RD7LgUiYTl8Aabdi8hFkaGSYnaS6BLc0BGNaDH+tVzVwmKtWvu0jLgWVbw==
+  dependencies:
+    "@typescript-eslint/types" "6.12.0"
+    "@typescript-eslint/visitor-keys" "6.12.0"
+
+"@typescript-eslint/type-utils@6.12.0":
+  version "6.12.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.12.0.tgz#968f7c95162808d69950ab5dff710ad730e58287"
+  integrity sha512-WWmRXxhm1X8Wlquj+MhsAG4dU/Blvf1xDgGaYCzfvStP2NwPQh6KBvCDbiOEvaE0filhranjIlK/2fSTVwtBng==
+  dependencies:
+    "@typescript-eslint/typescript-estree" "6.12.0"
+    "@typescript-eslint/utils" "6.12.0"
+    debug "^4.3.4"
+    ts-api-utils "^1.0.1"
+
+"@typescript-eslint/types@6.12.0":
+  version "6.12.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.12.0.tgz#ffc5297bcfe77003c8b7b545b51c2505748314ac"
+  integrity sha512-MA16p/+WxM5JG/F3RTpRIcuOghWO30//VEOvzubM8zuOOBYXsP+IfjoCXXiIfy2Ta8FRh9+IO9QLlaFQUU+10Q==
+
+"@typescript-eslint/typescript-estree@6.12.0":
+  version "6.12.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.12.0.tgz#764ccc32598549e5b48ec99e3b85f89b1385310c"
+  integrity sha512-vw9E2P9+3UUWzhgjyyVczLWxZ3GuQNT7QpnIY3o5OMeLO/c8oHljGc8ZpryBMIyympiAAaKgw9e5Hl9dCWFOYw==
+  dependencies:
+    "@typescript-eslint/types" "6.12.0"
+    "@typescript-eslint/visitor-keys" "6.12.0"
+    debug "^4.3.4"
+    globby "^11.1.0"
+    is-glob "^4.0.3"
+    semver "^7.5.4"
+    ts-api-utils "^1.0.1"
+
+"@typescript-eslint/utils@6.12.0":
+  version "6.12.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.12.0.tgz#c6ce8c06fe9b0212620e5674a2036f6f8f611754"
+  integrity sha512-LywPm8h3tGEbgfyjYnu3dauZ0U7R60m+miXgKcZS8c7QALO9uWJdvNoP+duKTk2XMWc7/Q3d/QiCuLN9X6SWyQ==
+  dependencies:
+    "@eslint-community/eslint-utils" "^4.4.0"
+    "@types/json-schema" "^7.0.12"
+    "@types/semver" "^7.5.0"
+    "@typescript-eslint/scope-manager" "6.12.0"
+    "@typescript-eslint/types" "6.12.0"
+    "@typescript-eslint/typescript-estree" "6.12.0"
+    semver "^7.5.4"
+
+"@typescript-eslint/visitor-keys@6.12.0":
+  version "6.12.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.12.0.tgz#5877950de42a0f3344261b7a1eee15417306d7e9"
+  integrity sha512-rg3BizTZHF1k3ipn8gfrzDXXSFKyOEB5zxYXInQ6z0hUvmQlhaZQzK+YmHmNViMA9HzW5Q9+bPPt90bU6GQwyw==
+  dependencies:
+    "@typescript-eslint/types" "6.12.0"
+    eslint-visitor-keys "^3.4.1"
+
+"@ungap/structured-clone@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406"
+  integrity sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==
 
 "@uppy/companion-client@^1.5.3":
   version "1.5.3"
@@ -2524,10 +2603,10 @@ acorn-jsx@^3.0.0:
   dependencies:
     acorn "^3.0.4"
 
-acorn-jsx@^5.3.1:
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz#fc8661e11b7ac1539c47dbfea2e72b3af34d267b"
-  integrity sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==
+acorn-jsx@^5.3.2:
+  version "5.3.2"
+  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
+  integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
 
 acorn-walk@^8.1.1:
   version "8.2.0"
@@ -2544,16 +2623,16 @@ acorn@^5.5.0:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.4.tgz#3e8d8a9947d0599a1796d10225d7432f4a4acf5e"
   integrity sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==
 
-acorn@^7.4.0:
-  version "7.4.1"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
-  integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
-
 acorn@^8.4.1:
   version "8.8.2"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.2.tgz#1b2f25db02af965399b9776b0c2c391276d37c4a"
   integrity sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==
 
+acorn@^8.9.0:
+  version "8.11.2"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.2.tgz#ca0d78b51895be5390a5903c5b3bdcdaf78ae40b"
+  integrity sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==
+
 after@0.8.2:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f"
@@ -2623,7 +2702,7 @@ ajv@^5.2.3, ajv@^5.3.0:
     fast-json-stable-stringify "^2.0.0"
     json-schema-traverse "^0.3.0"
 
-ajv@^6.10.0, ajv@^6.12.3:
+ajv@^6.12.3:
   version "6.12.4"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.4.tgz#0614facc4522127fa713445c6bfd3ebd376e2234"
   integrity sha512-eienB2c9qVQs2KWexhkrdMLVDoIQCz5KSeLxwg9Lzk4DOfBtIK9PQwwufcsn1jjGuf9WZmqPMbGxOzfcuphJCQ==
@@ -2643,21 +2722,6 @@ ajv@^6.12.4:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
-ajv@^7.0.2:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-7.1.0.tgz#f982ea7933dc7f1012eae9eec5a86687d805421b"
-  integrity sha512-svS9uILze/cXbH0z2myCK2Brqprx/+JJYK5pHicT/GQiBfzzhUVAIT6MwqJg8y4xV/zoGsUeuPuwtoiKSGE15g==
-  dependencies:
-    fast-deep-equal "^3.1.1"
-    json-schema-traverse "^1.0.0"
-    require-from-string "^2.0.2"
-    uri-js "^4.2.2"
-
-ansi-colors@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
-  integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==
-
 ansi-escapes@^3.0.0, ansi-escapes@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"
@@ -2793,6 +2857,11 @@ argparse@^1.0.7:
   dependencies:
     sprintf-js "~1.0.2"
 
+argparse@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
+  integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
+
 argv@0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/argv/-/argv-0.0.2.tgz#ecbd16f8949b157183711b1bda334f37840185ab"
@@ -2813,6 +2882,14 @@ arr-union@^3.1.0:
   resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
   integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=
 
+array-buffer-byte-length@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz#fabe8bc193fea865f317fe7807085ee0dee5aead"
+  integrity sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==
+  dependencies:
+    call-bind "^1.0.2"
+    is-array-buffer "^3.0.1"
+
 array-differ@^2.0.3:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-2.1.0.tgz#4b9c1c3f14b906757082925769e8ab904f4801b1"
@@ -2842,6 +2919,17 @@ array-includes@^3.1.1:
     es-abstract "^1.17.0"
     is-string "^1.0.5"
 
+array-includes@^3.1.7:
+  version "3.1.7"
+  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.7.tgz#8cd2e01b26f7a3086cbc87271593fe921c62abda"
+  integrity sha512-dlcsNBIiWhPkHdOEEKnehA+RNUWDc4UqFtnIXU4uuYDPtA4LDkr7qip2p0VvFAEXNDr0yWZ9PJyIRiGjRLQzwQ==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
+    get-intrinsic "^1.2.1"
+    is-string "^1.0.7"
+
 array-timsort@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/array-timsort/-/array-timsort-1.0.3.tgz#3c9e4199e54fb2b9c3fe5976396a21614ef0d926"
@@ -2869,13 +2957,49 @@ array-unique@^0.3.2:
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
   integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
 
-array.prototype.flat@^1.2.3:
+array.prototype.findlastindex@^1.2.3:
   version "1.2.3"
-  resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz#0de82b426b0318dbfdb940089e38b043d37f6c7b"
-  integrity sha512-gBlRZV0VSmfPIeWfuuy56XZMvbVfbEUnOXUvt3F/eUUUSyzlgLxhEX4YAEpxNAogRGehPSnfXyPtYyKAhkzQhQ==
+  resolved "https://registry.yarnpkg.com/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.3.tgz#b37598438f97b579166940814e2c0493a4f50207"
+  integrity sha512-LzLoiOMAxvy+Gd3BAq3B7VeIgPdo+Q8hthvKtXybMvRV0jrXfJM/t8mw7nNlpEcVlVUnCnM2KSX4XU5HmpodOA==
   dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.0-next.1"
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
+    es-shim-unscopables "^1.0.0"
+    get-intrinsic "^1.2.1"
+
+array.prototype.flat@^1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz#1476217df8cff17d72ee8f3ba06738db5b387d18"
+  integrity sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
+    es-shim-unscopables "^1.0.0"
+
+array.prototype.flatmap@^1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz#c9a7c6831db8e719d6ce639190146c24bbd3e527"
+  integrity sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
+    es-shim-unscopables "^1.0.0"
+
+arraybuffer.prototype.slice@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.2.tgz#98bd561953e3e74bb34938e77647179dfe6e9f12"
+  integrity sha512-yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw==
+  dependencies:
+    array-buffer-byte-length "^1.0.0"
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
+    get-intrinsic "^1.2.1"
+    is-array-buffer "^3.0.2"
+    is-shared-array-buffer "^1.0.2"
 
 arraybuffer.slice@~0.0.7:
   version "0.0.7"
@@ -2924,11 +3048,6 @@ assign-symbols@^1.0.0:
   resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
   integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
 
-astral-regex@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31"
-  integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==
-
 async-limiter@~1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd"
@@ -2968,6 +3087,11 @@ available-typed-arrays@^1.0.0, available-typed-arrays@^1.0.2:
   dependencies:
     array-filter "^1.0.0"
 
+available-typed-arrays@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7"
+  integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==
+
 aws-sign2@~0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
@@ -3468,6 +3592,15 @@ call-bind@^1.0.0:
     function-bind "^1.1.1"
     get-intrinsic "^1.0.2"
 
+call-bind@^1.0.2, call-bind@^1.0.4, call-bind@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.5.tgz#6fa2b7845ce0ea49bf4d8b9ef64727a2c2e2e513"
+  integrity sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==
+  dependencies:
+    function-bind "^1.1.2"
+    get-intrinsic "^1.2.1"
+    set-function-length "^1.1.1"
+
 call-me-maybe@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/call-me-maybe/-/call-me-maybe-1.0.1.tgz#26d208ea89e37b5cbde60250a15f031c16a4d66b"
@@ -3946,11 +4079,6 @@ confusing-browser-globals@^1.0.10:
   resolved "https://registry.yarnpkg.com/confusing-browser-globals/-/confusing-browser-globals-1.0.10.tgz#30d1e7f3d1b882b25ec4933d1d1adac353d20a59"
   integrity sha512-gNld/3lySHwuhaVluJUKLePYirM3QNCKzVxqAdhJII9/WXKVX5PURzMVJspS1jTslSqjeuG4KMVTSouit5YPHA==
 
-confusing-browser-globals@^1.0.9:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/confusing-browser-globals/-/confusing-browser-globals-1.0.9.tgz#72bc13b483c0276801681871d4898516f8f54fdd"
-  integrity sha512-KbS1Y0jMtyPgIxjO7ZzMAuUpAKMt1SzCL9fsrKsX6b0zJPTaT0SiSPmewwVZg9UAO83HVIlEhZF84LIjZ0lmAw==
-
 console-control-strings@^1.0.0, console-control-strings@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
@@ -4324,7 +4452,7 @@ debug@3.1.0, debug@~3.1.0:
   dependencies:
     ms "2.0.0"
 
-debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@~4.1.0:
+debug@4, debug@^4.1.0, debug@^4.1.1, debug@~4.1.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
   integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
@@ -4345,7 +4473,14 @@ debug@^3.1.0:
   dependencies:
     ms "^2.1.1"
 
-debug@^4.3.2:
+debug@^3.2.7:
+  version "3.2.7"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
+  integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
+  dependencies:
+    ms "^2.1.1"
+
+debug@^4.3.2, debug@^4.3.4:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
   integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
@@ -4429,6 +4564,15 @@ defaults@^1.0.3:
   dependencies:
     clone "^1.0.2"
 
+define-data-property@^1.0.1, define-data-property@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.1.tgz#c35f7cd0ab09883480d12ac5cb213715587800b3"
+  integrity sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==
+  dependencies:
+    get-intrinsic "^1.2.1"
+    gopd "^1.0.1"
+    has-property-descriptors "^1.0.0"
+
 define-properties@^1.1.2, define-properties@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
@@ -4436,6 +4580,15 @@ define-properties@^1.1.2, define-properties@^1.1.3:
   dependencies:
     object-keys "^1.0.12"
 
+define-properties@^1.1.4, define-properties@^1.2.0:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.1.tgz#10781cc616eb951a80a034bafcaa7377f6af2b6c"
+  integrity sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==
+  dependencies:
+    define-data-property "^1.0.1"
+    has-property-descriptors "^1.0.0"
+    object-keys "^1.1.1"
+
 define-property@^0.2.5:
   version "0.2.5"
   resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
@@ -4735,13 +4888,6 @@ engine.io@~3.4.0:
     engine.io-parser "~2.2.0"
     ws "^7.1.2"
 
-enquirer@^2.3.5:
-  version "2.3.6"
-  resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d"
-  integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==
-  dependencies:
-    ansi-colors "^4.1.1"
-
 env-paths@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.0.tgz#cdca557dc009152917d6166e2febe1f039685e43"
@@ -4799,6 +4945,51 @@ es-abstract@^1.18.0-next.0:
     string.prototype.trimend "^1.0.1"
     string.prototype.trimstart "^1.0.1"
 
+es-abstract@^1.22.1:
+  version "1.22.3"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.22.3.tgz#48e79f5573198de6dee3589195727f4f74bc4f32"
+  integrity sha512-eiiY8HQeYfYH2Con2berK+To6GrK2RxbPawDkGq4UiCQQfZHb6wX9qQqkbpPqaxQFcl8d9QzZqo0tGE0VcrdwA==
+  dependencies:
+    array-buffer-byte-length "^1.0.0"
+    arraybuffer.prototype.slice "^1.0.2"
+    available-typed-arrays "^1.0.5"
+    call-bind "^1.0.5"
+    es-set-tostringtag "^2.0.1"
+    es-to-primitive "^1.2.1"
+    function.prototype.name "^1.1.6"
+    get-intrinsic "^1.2.2"
+    get-symbol-description "^1.0.0"
+    globalthis "^1.0.3"
+    gopd "^1.0.1"
+    has-property-descriptors "^1.0.0"
+    has-proto "^1.0.1"
+    has-symbols "^1.0.3"
+    hasown "^2.0.0"
+    internal-slot "^1.0.5"
+    is-array-buffer "^3.0.2"
+    is-callable "^1.2.7"
+    is-negative-zero "^2.0.2"
+    is-regex "^1.1.4"
+    is-shared-array-buffer "^1.0.2"
+    is-string "^1.0.7"
+    is-typed-array "^1.1.12"
+    is-weakref "^1.0.2"
+    object-inspect "^1.13.1"
+    object-keys "^1.1.1"
+    object.assign "^4.1.4"
+    regexp.prototype.flags "^1.5.1"
+    safe-array-concat "^1.0.1"
+    safe-regex-test "^1.0.0"
+    string.prototype.trim "^1.2.8"
+    string.prototype.trimend "^1.0.7"
+    string.prototype.trimstart "^1.0.7"
+    typed-array-buffer "^1.0.0"
+    typed-array-byte-length "^1.0.0"
+    typed-array-byte-offset "^1.0.0"
+    typed-array-length "^1.0.4"
+    unbox-primitive "^1.0.2"
+    which-typed-array "^1.1.13"
+
 es-get-iterator@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/es-get-iterator/-/es-get-iterator-1.1.0.tgz#bb98ad9d6d63b31aacdc8f89d5d0ee57bcb5b4c8"
@@ -4812,6 +5003,22 @@ es-get-iterator@^1.1.0:
     is-string "^1.0.5"
     isarray "^2.0.5"
 
+es-set-tostringtag@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.0.2.tgz#11f7cc9f63376930a5f20be4915834f4bc74f9c9"
+  integrity sha512-BuDyupZt65P9D2D2vA/zqcI3G5xRsklm5N3xCwuiy+/vKy8i0ifdsQP1sLgO4tZDSCaQUSnmC48khknGMV3D2Q==
+  dependencies:
+    get-intrinsic "^1.2.2"
+    has-tostringtag "^1.0.0"
+    hasown "^2.0.0"
+
+es-shim-unscopables@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz#1f6942e71ecc7835ed1c8a83006d8771a63a3763"
+  integrity sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==
+  dependencies:
+    hasown "^2.0.0"
+
 es-to-primitive@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
@@ -4863,41 +5070,27 @@ escape-string-regexp@^2.0.0:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344"
   integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==
 
-eslint-config-airbnb-base@^14.2.0:
-  version "14.2.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-airbnb-base/-/eslint-config-airbnb-base-14.2.0.tgz#fe89c24b3f9dc8008c9c0d0d88c28f95ed65e9c4"
-  integrity sha512-Snswd5oC6nJaevs3nZoLSTvGJBvzTfnBqOIArkf3cbyTyq9UD79wOk8s+RiL6bhca0p/eRO6veczhf6A/7Jy8Q==
-  dependencies:
-    confusing-browser-globals "^1.0.9"
-    object.assign "^4.1.0"
-    object.entries "^1.1.2"
+escape-string-regexp@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
+  integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
 
-eslint-config-airbnb-base@^14.2.1:
-  version "14.2.1"
-  resolved "https://registry.yarnpkg.com/eslint-config-airbnb-base/-/eslint-config-airbnb-base-14.2.1.tgz#8a2eb38455dc5a312550193b319cdaeef042cd1e"
-  integrity sha512-GOrQyDtVEc1Xy20U7vsB2yAoB4nBlfH5HZJeatRXHleO+OS5Ot+MWij4Dpltw4/DyIkqUfqz1epfhVR5XWWQPA==
+eslint-config-airbnb-base@^15.0.0:
+  version "15.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-airbnb-base/-/eslint-config-airbnb-base-15.0.0.tgz#6b09add90ac79c2f8d723a2580e07f3925afd236"
+  integrity sha512-xaX3z4ZZIcFLvh2oUNvcX5oEofXda7giYmuplVxoOg5A7EXJMrUyqRgR+mhDhPK8LZ4PttFOBvCYDbX3sUoUig==
   dependencies:
     confusing-browser-globals "^1.0.10"
     object.assign "^4.1.2"
-    object.entries "^1.1.2"
-
-eslint-config-airbnb-typescript@^12.3.1:
-  version "12.3.1"
-  resolved "https://registry.yarnpkg.com/eslint-config-airbnb-typescript/-/eslint-config-airbnb-typescript-12.3.1.tgz#83ab40d76402c208eb08516260d1d6fac8f8acbc"
-  integrity sha512-ql/Pe6/hppYuRp4m3iPaHJqkBB7dgeEmGPQ6X0UNmrQOfTF+dXw29/ZjU2kQ6RDoLxaxOA+Xqv07Vbef6oVTWw==
-  dependencies:
-    "@typescript-eslint/parser" "^4.4.1"
-    eslint-config-airbnb "^18.2.0"
-    eslint-config-airbnb-base "^14.2.0"
+    object.entries "^1.1.5"
+    semver "^6.3.0"
 
-eslint-config-airbnb@^18.2.0:
-  version "18.2.1"
-  resolved "https://registry.yarnpkg.com/eslint-config-airbnb/-/eslint-config-airbnb-18.2.1.tgz#b7fe2b42f9f8173e825b73c8014b592e449c98d9"
-  integrity sha512-glZNDEZ36VdlZWoxn/bUR1r/sdFKPd1mHPbqUtkctgNG4yT2DLLtJ3D+yCV+jzZCc2V1nBVkmdknOJBZ5Hc0fg==
+eslint-config-airbnb-typescript@^17.1.0:
+  version "17.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-airbnb-typescript/-/eslint-config-airbnb-typescript-17.1.0.tgz#fda960eee4a510f092a9a1c139035ac588937ddc"
+  integrity sha512-GPxI5URre6dDpJ0CtcthSZVBAfI+Uw7un5OYNVxP2EYi3H81Jw701yFP7AU+/vCE7xBtFmjge7kfhhk4+RAiig==
   dependencies:
-    eslint-config-airbnb-base "^14.2.1"
-    object.assign "^4.1.2"
-    object.entries "^1.1.2"
+    eslint-config-airbnb-base "^15.0.0"
 
 eslint-config-standard-jsx@5.0.0:
   version "5.0.0"
@@ -4909,7 +5102,7 @@ eslint-config-standard@11.0.0:
   resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-11.0.0.tgz#87ee0d3c9d95382dc761958cbb23da9eea31e0ba"
   integrity sha512-oDdENzpViEe5fwuRCWla7AXQd++/oyIp8zP+iP9jiUPG6NBj3SHgdgtl/kTn00AjeN+1HNvavTKmYbMo+xMOlw==
 
-eslint-import-resolver-node@^0.3.1, eslint-import-resolver-node@^0.3.4:
+eslint-import-resolver-node@^0.3.1:
   version "0.3.4"
   resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz#85ffa81942c25012d8231096ddf679c03042c717"
   integrity sha512-ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA==
@@ -4917,7 +5110,16 @@ eslint-import-resolver-node@^0.3.1, eslint-import-resolver-node@^0.3.4:
     debug "^2.6.9"
     resolve "^1.13.1"
 
-eslint-module-utils@^2.1.1, eslint-module-utils@^2.6.0:
+eslint-import-resolver-node@^0.3.9:
+  version "0.3.9"
+  resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz#d4eaac52b8a2e7c3cd1903eb00f7e053356118ac"
+  integrity sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==
+  dependencies:
+    debug "^3.2.7"
+    is-core-module "^2.13.0"
+    resolve "^1.22.4"
+
+eslint-module-utils@^2.1.1:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz#579ebd094f56af7797d19c9866c9c9486629bfa6"
   integrity sha512-6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA==
@@ -4925,24 +5127,35 @@ eslint-module-utils@^2.1.1, eslint-module-utils@^2.6.0:
     debug "^2.6.9"
     pkg-dir "^2.0.0"
 
-eslint-plugin-import@^2.22.1:
-  version "2.22.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.22.1.tgz#0896c7e6a0cf44109a2d97b95903c2bb689d7702"
-  integrity sha512-8K7JjINHOpH64ozkAhpT3sd+FswIZTfMZTjdx052pnWrgRCVfp8op9tbjpAk3DdUeI/Ba4C8OjdC0r90erHEOw==
+eslint-module-utils@^2.8.0:
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz#e439fee65fc33f6bba630ff621efc38ec0375c49"
+  integrity sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==
   dependencies:
-    array-includes "^3.1.1"
-    array.prototype.flat "^1.2.3"
-    contains-path "^0.1.0"
-    debug "^2.6.9"
-    doctrine "1.5.0"
-    eslint-import-resolver-node "^0.3.4"
-    eslint-module-utils "^2.6.0"
-    has "^1.0.3"
-    minimatch "^3.0.4"
-    object.values "^1.1.1"
-    read-pkg-up "^2.0.0"
-    resolve "^1.17.0"
-    tsconfig-paths "^3.9.0"
+    debug "^3.2.7"
+
+eslint-plugin-import@^2.29.0:
+  version "2.29.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.29.0.tgz#8133232e4329ee344f2f612885ac3073b0b7e155"
+  integrity sha512-QPOO5NO6Odv5lpoTkddtutccQjysJuFxoPS7fAHO+9m9udNHvTCPSAMW9zGAYj8lAIdr40I8yPCdUYrncXtrwg==
+  dependencies:
+    array-includes "^3.1.7"
+    array.prototype.findlastindex "^1.2.3"
+    array.prototype.flat "^1.3.2"
+    array.prototype.flatmap "^1.3.2"
+    debug "^3.2.7"
+    doctrine "^2.1.0"
+    eslint-import-resolver-node "^0.3.9"
+    eslint-module-utils "^2.8.0"
+    hasown "^2.0.0"
+    is-core-module "^2.13.1"
+    is-glob "^4.0.3"
+    minimatch "^3.1.2"
+    object.fromentries "^2.0.7"
+    object.groupby "^1.0.1"
+    object.values "^1.1.7"
+    semver "^6.3.1"
+    tsconfig-paths "^3.14.2"
 
 eslint-plugin-import@~2.9.0:
   version "2.9.0"
@@ -4998,81 +5211,67 @@ eslint-scope@^3.7.1:
     esrecurse "^4.1.0"
     estraverse "^4.1.1"
 
-eslint-scope@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.0.tgz#d0f971dfe59c69e0cada684b23d49dbf82600ce5"
-  integrity sha512-iiGRvtxWqgtx5m8EyQUJihBloE4EnYeGE/bz1wSPwJE6tZuJUtHlhqDM4Xj2ukE8Dyy1+HCZ4hE0fzIVMzb58w==
-  dependencies:
-    esrecurse "^4.1.0"
-    estraverse "^4.1.1"
-
-eslint-scope@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
-  integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
+eslint-scope@^7.2.2:
+  version "7.2.2"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.2.tgz#deb4f92563390f32006894af62a22dba1c46423f"
+  integrity sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==
   dependencies:
     esrecurse "^4.3.0"
-    estraverse "^4.1.1"
-
-eslint-utils@^2.0.0, eslint-utils@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27"
-  integrity sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==
-  dependencies:
-    eslint-visitor-keys "^1.1.0"
+    estraverse "^5.2.0"
 
-eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0:
+eslint-visitor-keys@^1.0.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e"
   integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==
 
-eslint-visitor-keys@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8"
-  integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==
-
-eslint@^7.20.0:
-  version "7.20.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.20.0.tgz#db07c4ca4eda2e2316e7aa57ac7fc91ec550bdc7"
-  integrity sha512-qGi0CTcOGP2OtCQBgWZlQjcTuP0XkIpYFj25XtRTQSHC+umNnp7UMshr2G8SLsRFYDdAPFeHOsiteadmMH02Yw==
-  dependencies:
-    "@babel/code-frame" "7.12.11"
-    "@eslint/eslintrc" "^0.3.0"
-    ajv "^6.10.0"
+eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4.3:
+  version "3.4.3"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800"
+  integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==
+
+eslint@^8.54.0:
+  version "8.54.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.54.0.tgz#588e0dd4388af91a2e8fa37ea64924074c783537"
+  integrity sha512-NY0DfAkM8BIZDVl6PgSa1ttZbx3xHgJzSNJKYcQglem6CppHyMhRIQkBVSSMaSRnLhig3jsDbEzOjwCVt4AmmA==
+  dependencies:
+    "@eslint-community/eslint-utils" "^4.2.0"
+    "@eslint-community/regexpp" "^4.6.1"
+    "@eslint/eslintrc" "^2.1.3"
+    "@eslint/js" "8.54.0"
+    "@humanwhocodes/config-array" "^0.11.13"
+    "@humanwhocodes/module-importer" "^1.0.1"
+    "@nodelib/fs.walk" "^1.2.8"
+    "@ungap/structured-clone" "^1.2.0"
+    ajv "^6.12.4"
     chalk "^4.0.0"
     cross-spawn "^7.0.2"
-    debug "^4.0.1"
+    debug "^4.3.2"
     doctrine "^3.0.0"
-    enquirer "^2.3.5"
-    eslint-scope "^5.1.1"
-    eslint-utils "^2.1.0"
-    eslint-visitor-keys "^2.0.0"
-    espree "^7.3.1"
-    esquery "^1.4.0"
+    escape-string-regexp "^4.0.0"
+    eslint-scope "^7.2.2"
+    eslint-visitor-keys "^3.4.3"
+    espree "^9.6.1"
+    esquery "^1.4.2"
     esutils "^2.0.2"
-    file-entry-cache "^6.0.0"
-    functional-red-black-tree "^1.0.1"
-    glob-parent "^5.0.0"
-    globals "^12.1.0"
-    ignore "^4.0.6"
-    import-fresh "^3.0.0"
+    fast-deep-equal "^3.1.3"
+    file-entry-cache "^6.0.1"
+    find-up "^5.0.0"
+    glob-parent "^6.0.2"
+    globals "^13.19.0"
+    graphemer "^1.4.0"
+    ignore "^5.2.0"
     imurmurhash "^0.1.4"
     is-glob "^4.0.0"
-    js-yaml "^3.13.1"
+    is-path-inside "^3.0.3"
+    js-yaml "^4.1.0"
     json-stable-stringify-without-jsonify "^1.0.1"
     levn "^0.4.1"
-    lodash "^4.17.20"
-    minimatch "^3.0.4"
+    lodash.merge "^4.6.2"
+    minimatch "^3.1.2"
     natural-compare "^1.4.0"
-    optionator "^0.9.1"
-    progress "^2.0.0"
-    regexpp "^3.1.0"
-    semver "^7.2.1"
-    strip-ansi "^6.0.0"
-    strip-json-comments "^3.1.0"
-    table "^6.0.4"
+    optionator "^0.9.3"
+    strip-ansi "^6.0.1"
     text-table "^0.2.0"
-    v8-compile-cache "^2.0.3"
 
 eslint@~4.18.0:
   version "4.18.2"
@@ -5125,14 +5324,14 @@ espree@^3.5.2:
     acorn "^5.5.0"
     acorn-jsx "^3.0.0"
 
-espree@^7.3.0, espree@^7.3.1:
-  version "7.3.1"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz#f2df330b752c6f55019f8bd89b7660039c1bbbb6"
-  integrity sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==
+espree@^9.6.0, espree@^9.6.1:
+  version "9.6.1"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-9.6.1.tgz#a2a17b8e434690a5432f2f8018ce71d331a48c6f"
+  integrity sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==
   dependencies:
-    acorn "^7.4.0"
-    acorn-jsx "^5.3.1"
-    eslint-visitor-keys "^1.3.0"
+    acorn "^8.9.0"
+    acorn-jsx "^5.3.2"
+    eslint-visitor-keys "^3.4.1"
 
 esprima@^4.0.0, esprima@^4.0.1:
   version "4.0.1"
@@ -5146,10 +5345,10 @@ esquery@^1.0.0:
   dependencies:
     estraverse "^5.1.0"
 
-esquery@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5"
-  integrity sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==
+esquery@^1.4.2:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.5.0.tgz#6ce17738de8577694edd7361c57182ac8cb0db0b"
+  integrity sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==
   dependencies:
     estraverse "^5.1.0"
 
@@ -5352,22 +5551,21 @@ fast-glob@^2.2.6:
     merge2 "^1.2.3"
     micromatch "^3.1.10"
 
-fast-glob@^3.1.1:
-  version "3.2.5"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.5.tgz#7939af2a656de79a4f1901903ee8adcaa7cb9661"
-  integrity sha512-2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg==
+fast-glob@^3.2.11:
+  version "3.2.12"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz#7f39ec99c2e6ab030337142da9e0c18f37afae80"
+  integrity sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==
   dependencies:
     "@nodelib/fs.stat" "^2.0.2"
     "@nodelib/fs.walk" "^1.2.3"
-    glob-parent "^5.1.0"
+    glob-parent "^5.1.2"
     merge2 "^1.3.0"
-    micromatch "^4.0.2"
-    picomatch "^2.2.1"
+    micromatch "^4.0.4"
 
-fast-glob@^3.2.11:
-  version "3.2.12"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz#7f39ec99c2e6ab030337142da9e0c18f37afae80"
-  integrity sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==
+fast-glob@^3.2.9:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.2.tgz#a904501e57cfdd2ffcded45e99a54fef55e46129"
+  integrity sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==
   dependencies:
     "@nodelib/fs.stat" "^2.0.2"
     "@nodelib/fs.walk" "^1.2.3"
@@ -5424,10 +5622,10 @@ file-entry-cache@^2.0.0:
     flat-cache "^1.2.1"
     object-assign "^4.0.1"
 
-file-entry-cache@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.0.tgz#7921a89c391c6d93efec2169ac6bf300c527ea0a"
-  integrity sha512-fqoO76jZ3ZnYrXLDRxBR1YvOvc0k844kcOg40bgsPrE25LAb/PDqTY+ho64Xh2c8ZXgIKldchCFHczG2UVRcWA==
+file-entry-cache@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027"
+  integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==
   dependencies:
     flat-cache "^3.0.4"
 
@@ -5651,11 +5849,31 @@ function-bind@^1.1.1:
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
   integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
 
+function-bind@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c"
+  integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==
+
+function.prototype.name@^1.1.6:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.6.tgz#cdf315b7d90ee77a4c6ee216c3c3362da07533fd"
+  integrity sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
+    functions-have-names "^1.2.3"
+
 functional-red-black-tree@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
   integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=
 
+functions-have-names@^1.2.3:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
+  integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==
+
 gauge@~2.7.3:
   version "2.7.4"
   resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
@@ -5704,6 +5922,16 @@ get-intrinsic@^1.0.2:
     has "^1.0.3"
     has-symbols "^1.0.1"
 
+get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@^1.2.0, get-intrinsic@^1.2.1, get-intrinsic@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.2.tgz#281b7622971123e1ef4b3c90fd7539306da93f3b"
+  integrity sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==
+  dependencies:
+    function-bind "^1.1.2"
+    has-proto "^1.0.1"
+    has-symbols "^1.0.3"
+    hasown "^2.0.0"
+
 get-package-type@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a"
@@ -5752,6 +5980,14 @@ get-stream@^6.0.0:
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7"
   integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==
 
+get-symbol-description@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz#7fdb81c900101fbd564dd5f1a30af5aadc1e58d6"
+  integrity sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==
+  dependencies:
+    call-bind "^1.0.2"
+    get-intrinsic "^1.1.1"
+
 get-value@^2.0.3, get-value@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
@@ -5826,7 +6062,7 @@ glob-parent@^3.1.0:
     is-glob "^3.1.0"
     path-dirname "^1.0.0"
 
-glob-parent@^5.0.0, glob-parent@^5.1.0:
+glob-parent@^5.0.0:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz#b6c1ef417c4e5663ea498f1c45afac6916bbc229"
   integrity sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==
@@ -5840,6 +6076,13 @@ glob-parent@^5.1.2:
   dependencies:
     is-glob "^4.0.1"
 
+glob-parent@^6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3"
+  integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==
+  dependencies:
+    is-glob "^4.0.3"
+
 glob-to-regexp@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
@@ -5869,23 +6112,30 @@ globals@^11.0.1, globals@^11.1.0:
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
-globals@^12.1.0:
-  version "12.4.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-12.4.0.tgz#a18813576a41b00a24a97e7f815918c2e19925f8"
-  integrity sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==
+globals@^13.19.0:
+  version "13.23.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-13.23.0.tgz#ef31673c926a0976e1f61dab4dca57e0c0a8af02"
+  integrity sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==
   dependencies:
-    type-fest "^0.8.1"
+    type-fest "^0.20.2"
+
+globalthis@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.3.tgz#5852882a52b80dc301b0660273e1ed082f0b6ccf"
+  integrity sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==
+  dependencies:
+    define-properties "^1.1.3"
 
-globby@^11.0.1:
-  version "11.0.2"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.2.tgz#1af538b766a3b540ebfb58a32b2e2d5897321d83"
-  integrity sha512-2ZThXDvvV8fYFRVIxnrMQBipZQDr7MxKAmQK1vujaj9/7eF0efG7BPUKJ7jP7G5SLF37xKDXvO4S/KKLj/Z0og==
+globby@^11.1.0:
+  version "11.1.0"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b"
+  integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==
   dependencies:
     array-union "^2.1.0"
     dir-glob "^3.0.1"
-    fast-glob "^3.1.1"
-    ignore "^5.1.4"
-    merge2 "^1.3.0"
+    fast-glob "^3.2.9"
+    ignore "^5.2.0"
+    merge2 "^1.4.1"
     slash "^3.0.0"
 
 globby@^13.1.1:
@@ -5913,6 +6163,13 @@ globby@^9.2.0:
     pify "^4.0.1"
     slash "^2.0.0"
 
+gopd@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c"
+  integrity sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==
+  dependencies:
+    get-intrinsic "^1.1.3"
+
 graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.2:
   version "4.2.4"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
@@ -5923,6 +6180,11 @@ graceful-fs@^4.2.4, graceful-fs@^4.2.9:
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
   integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
 
+graphemer@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/graphemer/-/graphemer-1.4.0.tgz#fb2f1d55e0e3a1849aeffc90c4fa0dd53a0e66c6"
+  integrity sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==
+
 growly@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"
@@ -5965,6 +6227,11 @@ has-ansi@^2.0.0:
   dependencies:
     ansi-regex "^2.0.0"
 
+has-bigints@^1.0.1, has-bigints@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.2.tgz#0871bd3e3d51626f6ca0966668ba35d5602d6eaa"
+  integrity sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==
+
 has-binary2@~1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/has-binary2/-/has-binary2-1.0.3.tgz#7776ac627f3ea77250cfc332dab7ddf5e4f5d11d"
@@ -5992,11 +6259,35 @@ has-own-prop@^2.0.0:
   resolved "https://registry.yarnpkg.com/has-own-prop/-/has-own-prop-2.0.0.tgz#f0f95d58f65804f5d218db32563bb85b8e0417af"
   integrity sha512-Pq0h+hvsVm6dDEa8x82GnLSYHOzNDt7f0ddFa3FqcQlgzEiptPqL+XrOJNavjOzSYiYWIrgeVYYgGlLmnxwilQ==
 
+has-property-descriptors@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz#52ba30b6c5ec87fd89fa574bc1c39125c6f65340"
+  integrity sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg==
+  dependencies:
+    get-intrinsic "^1.2.2"
+
+has-proto@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.1.tgz#1885c1305538958aff469fef37937c22795408e0"
+  integrity sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==
+
 has-symbols@^1.0.0, has-symbols@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8"
   integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==
 
+has-symbols@^1.0.2, has-symbols@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8"
+  integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==
+
+has-tostringtag@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25"
+  integrity sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==
+  dependencies:
+    has-symbols "^1.0.2"
+
 has-unicode@^2.0.0, has-unicode@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
@@ -6065,6 +6356,13 @@ hasha@^5.0.0:
     is-stream "^2.0.0"
     type-fest "^0.8.0"
 
+hasown@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.0.tgz#f4c513d454a57b7c7e1650778de226b11700546c"
+  integrity sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==
+  dependencies:
+    function-bind "^1.1.2"
+
 hmac-drbg@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
@@ -6186,21 +6484,21 @@ ignore@^3.0.9, ignore@^3.3.3, ignore@^3.3.6:
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043"
   integrity sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==
 
-ignore@^4.0.3, ignore@^4.0.6:
+ignore@^4.0.3:
   version "4.0.6"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
   integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
 
-ignore@^5.1.4:
-  version "5.1.8"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57"
-  integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==
-
 ignore@^5.2.0:
   version "5.2.4"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324"
   integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==
 
+ignore@^5.2.4:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.0.tgz#67418ae40d34d6999c95ff56016759c718c82f78"
+  integrity sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg==
+
 import-fresh@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-2.0.0.tgz#d81355c15612d386c61f9ddd3922d4304822a546"
@@ -6209,14 +6507,6 @@ import-fresh@^2.0.0:
     caller-path "^2.0.0"
     resolve-from "^3.0.0"
 
-import-fresh@^3.0.0:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz#633ff618506e793af5ac91bf48b72677e15cbe66"
-  integrity sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==
-  dependencies:
-    parent-module "^1.0.0"
-    resolve-from "^4.0.0"
-
 import-fresh@^3.2.1:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
@@ -6354,6 +6644,15 @@ inquirer@^6.2.0:
     strip-ansi "^5.1.0"
     through "^2.3.6"
 
+internal-slot@^1.0.5:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.6.tgz#37e756098c4911c5e912b8edbf71ed3aa116f930"
+  integrity sha512-Xj6dv+PsbtwyPpEflsejS+oIZxmMlV44zAhG479uYu89MsjcYOhCFnNyKrkJrihbsiasQyY0afoCl/9BLR65bg==
+  dependencies:
+    get-intrinsic "^1.2.2"
+    hasown "^2.0.0"
+    side-channel "^1.0.4"
+
 ip@1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
@@ -6378,6 +6677,15 @@ is-arguments@^1.0.4:
   resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.0.4.tgz#3faf966c7cba0ff437fb31f6250082fcf0448cf3"
   integrity sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==
 
+is-array-buffer@^3.0.1, is-array-buffer@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.2.tgz#f2653ced8412081638ecb0ebbd0c41c6e0aecbbe"
+  integrity sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==
+  dependencies:
+    call-bind "^1.0.2"
+    get-intrinsic "^1.2.0"
+    is-typed-array "^1.1.10"
+
 is-arrayish@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
@@ -6388,11 +6696,26 @@ is-bigint@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.0.tgz#73da8c33208d00f130e9b5e15d23eac9215601c4"
   integrity sha512-t5mGUXC/xRheCK431ylNiSkGGpBp8bHENBcENTkDT6ppwPzEVxNGZRvgvmOEfbWkFhA7D2GEuE2mmQTr78sl2g==
 
+is-bigint@^1.0.1:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3"
+  integrity sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==
+  dependencies:
+    has-bigints "^1.0.1"
+
 is-boolean-object@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.0.1.tgz#10edc0900dd127697a92f6f9807c7617d68ac48e"
   integrity sha512-TqZuVwa/sppcrhUCAYkGBk7w0yxfQQnxq28fjkO53tnK9FQXmdwz2JS5+GjsWQ6RByES1K40nI+yDic5c9/aAQ==
 
+is-boolean-object@^1.1.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719"
+  integrity sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==
+  dependencies:
+    call-bind "^1.0.2"
+    has-tostringtag "^1.0.0"
+
 is-buffer@^1.1.5:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
@@ -6403,6 +6726,11 @@ is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.0:
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.0.tgz#83336560b54a38e35e3a2df7afd0454d691468bb"
   integrity sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw==
 
+is-callable@^1.2.7:
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055"
+  integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==
+
 is-ci@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c"
@@ -6410,6 +6738,13 @@ is-ci@^2.0.0:
   dependencies:
     ci-info "^2.0.0"
 
+is-core-module@^2.13.0, is-core-module@^2.13.1:
+  version "2.13.1"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.13.1.tgz#ad0d7532c6fea9da1ebdc82742d74525c6273384"
+  integrity sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==
+  dependencies:
+    hasown "^2.0.0"
+
 is-core-module@^2.5.0, is-core-module@^2.9.0:
   version "2.11.0"
   resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.11.0.tgz#ad4cb3e3863e814523c96f3f58d26cc570ff0144"
@@ -6527,6 +6862,13 @@ is-glob@^4.0.0, is-glob@^4.0.1:
   dependencies:
     is-extglob "^2.1.1"
 
+is-glob@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
+  integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
+  dependencies:
+    is-extglob "^2.1.1"
+
 is-map@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.1.tgz#520dafc4307bb8ebc33b813de5ce7c9400d644a1"
@@ -6544,11 +6886,23 @@ is-negative-zero@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.0.tgz#9553b121b0fac28869da9ed459e20c7543788461"
   integrity sha1-lVOxIbD6wohp2p7UWeIMdUN4hGE=
 
+is-negative-zero@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150"
+  integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==
+
 is-number-object@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.4.tgz#36ac95e741cf18b283fc1ddf5e83da798e3ec197"
   integrity sha512-zohwelOAur+5uXtk8O3GPQ1eAcu4ZX3UwxQhUlfFFMNpUd83gXgjbhJh6HmB6LUNV/ieOLQuDwJO3dWJosUeMw==
 
+is-number-object@^1.0.4:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.7.tgz#59d50ada4c45251784e9904f5246c742f07a42fc"
+  integrity sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==
+  dependencies:
+    has-tostringtag "^1.0.0"
+
 is-number@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
@@ -6571,6 +6925,11 @@ is-obj@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982"
   integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==
 
+is-path-inside@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
+  integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==
+
 is-plain-obj@^1.0.0, is-plain-obj@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
@@ -6595,6 +6954,14 @@ is-regex@^1.0.5, is-regex@^1.1.0, is-regex@^1.1.1:
   dependencies:
     has-symbols "^1.0.1"
 
+is-regex@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958"
+  integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==
+  dependencies:
+    call-bind "^1.0.2"
+    has-tostringtag "^1.0.0"
+
 is-resolvable@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88"
@@ -6605,6 +6972,13 @@ is-set@^2.0.1:
   resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.1.tgz#d1604afdab1724986d30091575f54945da7e5f43"
   integrity sha512-eJEzOtVyenDs1TMzSQ3kU3K+E0GUS9sno+F0OBT97xsgcJsF9nXMBtkT9/kut5JEpM7oL7X/0qxR17K3mcwIAA==
 
+is-shared-array-buffer@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz#8f259c573b60b6a32d4058a1a07430c0a7344c79"
+  integrity sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==
+  dependencies:
+    call-bind "^1.0.2"
+
 is-ssh@^1.3.0:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/is-ssh/-/is-ssh-1.3.2.tgz#a4b82ab63d73976fd8263cceee27f99a88bdae2b"
@@ -6627,6 +7001,13 @@ is-string@^1.0.4, is-string@^1.0.5:
   resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz#40493ed198ef3ff477b8c7f92f644ec82a5cd3a6"
   integrity sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==
 
+is-string@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd"
+  integrity sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==
+  dependencies:
+    has-tostringtag "^1.0.0"
+
 is-symbol@^1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz#38e1014b9e6329be0de9d24a414fd7441ec61937"
@@ -6634,6 +7015,13 @@ is-symbol@^1.0.2:
   dependencies:
     has-symbols "^1.0.1"
 
+is-symbol@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c"
+  integrity sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==
+  dependencies:
+    has-symbols "^1.0.2"
+
 is-text-path@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-text-path/-/is-text-path-1.0.1.tgz#4e1aa0fb51bfbcb3e92688001397202c1775b66e"
@@ -6641,6 +7029,13 @@ is-text-path@^1.0.1:
   dependencies:
     text-extensions "^1.0.0"
 
+is-typed-array@^1.1.10, is-typed-array@^1.1.12, is-typed-array@^1.1.9:
+  version "1.1.12"
+  resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.12.tgz#d0bab5686ef4a76f7a73097b95470ab199c57d4a"
+  integrity sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==
+  dependencies:
+    which-typed-array "^1.1.11"
+
 is-typed-array@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.3.tgz#a4ff5a5e672e1a55f99c7f54e59597af5c1df04d"
@@ -6666,6 +7061,13 @@ is-weakmap@^2.0.1:
   resolved "https://registry.yarnpkg.com/is-weakmap/-/is-weakmap-2.0.1.tgz#5008b59bdc43b698201d18f62b37b2ca243e8cf2"
   integrity sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==
 
+is-weakref@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2"
+  integrity sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==
+  dependencies:
+    call-bind "^1.0.2"
+
 is-weakset@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/is-weakset/-/is-weakset-2.0.1.tgz#e9a0af88dbd751589f5e50d80f4c98b780884f83"
@@ -7341,6 +7743,13 @@ js-yaml@3.14.0, js-yaml@^3.13.1, js-yaml@^3.9.1:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
+js-yaml@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
+  integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
+  dependencies:
+    argparse "^2.0.1"
+
 jsbn@~0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
@@ -7371,11 +7780,6 @@ json-schema-traverse@^0.4.1:
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
   integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
 
-json-schema-traverse@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2"
-  integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==
-
 json-schema@0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
@@ -7391,10 +7795,10 @@ json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1:
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
   integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
 
-json5@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
-  integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==
+json5@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.2.tgz#63d98d60f21b313b77c4d6da18bfa69d80e1d593"
+  integrity sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==
   dependencies:
     minimist "^1.2.0"
 
@@ -7677,6 +8081,11 @@ lodash.ismatch@^4.4.0:
   resolved "https://registry.yarnpkg.com/lodash.ismatch/-/lodash.ismatch-4.4.0.tgz#756cb5150ca3ba6f11085a78849645f188f85f37"
   integrity sha1-dWy1FQyjum8RCFp4hJZF8Yj4Xzc=
 
+lodash.merge@^4.6.2:
+  version "4.6.2"
+  resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
+  integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
+
 lodash.set@^4.3.2:
   version "4.3.2"
   resolved "https://registry.yarnpkg.com/lodash.set/-/lodash.set-4.3.2.tgz#d8757b1da807dde24816b0d6a84bea1a76230b23"
@@ -7725,7 +8134,7 @@ lodash.uniqby@4.5.0:
     lodash._baseiteratee "~4.7.0"
     lodash._baseuniq "~4.6.0"
 
-lodash@^4.17.12, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.4, lodash@^4.2.1, lodash@^4.3.0:
+lodash@^4.17.12, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.4, lodash@^4.2.1, lodash@^4.3.0:
   version "4.17.20"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
   integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==
@@ -8031,6 +8440,13 @@ minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4:
   dependencies:
     brace-expansion "^1.1.7"
 
+minimatch@^3.0.5, minimatch@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
+  integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
+  dependencies:
+    brace-expansion "^1.1.7"
+
 minimist-options@4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619"
@@ -8053,7 +8469,7 @@ minimist@^1.1.0, minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.5:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
   integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
 
-minimist@^1.1.1:
+minimist@^1.1.1, minimist@^1.2.6:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
   integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
@@ -8493,6 +8909,11 @@ object-copy@^0.1.0:
     define-property "^0.2.5"
     kind-of "^3.0.3"
 
+object-inspect@^1.13.1, object-inspect@^1.9.0:
+  version "1.13.1"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.1.tgz#b96c6109324ccfef6b12216a956ca4dc2ff94bc2"
+  integrity sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==
+
 object-inspect@^1.7.0, object-inspect@^1.8.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.8.0.tgz#df807e5ecf53a609cc6bfe93eac3cc7be5b3a9d0"
@@ -8538,14 +8959,33 @@ object.assign@^4.1.2:
     has-symbols "^1.0.1"
     object-keys "^1.1.1"
 
-object.entries@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.2.tgz#bc73f00acb6b6bb16c203434b10f9a7e797d3add"
-  integrity sha512-BQdB9qKmb/HyNdMNWVr7O3+z5MUIx3aiegEIJqjMBbBf0YT9RRxTJSim4mzFqtyr7PDAHigq0N9dO0m0tRakQA==
+object.assign@^4.1.4:
+  version "4.1.4"
+  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.4.tgz#9673c7c7c351ab8c4d0b516f4343ebf4dfb7799f"
+  integrity sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==
   dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.5"
-    has "^1.0.3"
+    call-bind "^1.0.2"
+    define-properties "^1.1.4"
+    has-symbols "^1.0.3"
+    object-keys "^1.1.1"
+
+object.entries@^1.1.5:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.7.tgz#2b47760e2a2e3a752f39dd874655c61a7f03c131"
+  integrity sha512-jCBs/0plmPsOnrKAfFQXRG2NFjlhZgjjcBLSmTnEhU8U6vVTsVe8ANeQJCHTl3gSsI4J+0emOoCgoKlmQPMgmA==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
+
+object.fromentries@^2.0.7:
+  version "2.0.7"
+  resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.7.tgz#71e95f441e9a0ea6baf682ecaaf37fa2a8d7e616"
+  integrity sha512-UPbPHML6sL8PI/mOqPwsH4G6iyXcCGzLin8KvEPenOZN5lpCNBZZQ+V62vdjB1mQHrmqGQt5/OJzemUA+KJmEA==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
 
 object.getownpropertydescriptors@^2.0.3:
   version "2.1.0"
@@ -8555,6 +8995,16 @@ object.getownpropertydescriptors@^2.0.3:
     define-properties "^1.1.3"
     es-abstract "^1.17.0-next.1"
 
+object.groupby@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/object.groupby/-/object.groupby-1.0.1.tgz#d41d9f3c8d6c778d9cbac86b4ee9f5af103152ee"
+  integrity sha512-HqaQtqLnp/8Bn4GL16cj+CUYbnpe1bh0TtEaWvybszDG4tgxCJuRpV8VGuvNaI1fAnI4lUJzDG55MXcOH4JZcQ==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
+    get-intrinsic "^1.2.1"
+
 object.pick@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
@@ -8562,15 +9012,14 @@ object.pick@^1.3.0:
   dependencies:
     isobject "^3.0.1"
 
-object.values@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.1.tgz#68a99ecde356b7e9295a3c5e0ce31dc8c953de5e"
-  integrity sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA==
+object.values@^1.1.7:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.7.tgz#617ed13272e7e1071b43973aa1655d9291b8442a"
+  integrity sha512-aU6xnDFYT3x17e/f0IiiwlGPTy2jzMySGfUB4fq6z7CV8l85CWHDk5ErhyhpfDHhrOMwGFhSQkhMGHaIotA6Ng==
   dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.0-next.1"
-    function-bind "^1.1.1"
-    has "^1.0.3"
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
 
 octokit-pagination-methods@^1.1.0:
   version "1.1.0"
@@ -8610,17 +9059,17 @@ optionator@^0.8.2:
     type-check "~0.3.2"
     word-wrap "~1.2.3"
 
-optionator@^0.9.1:
-  version "0.9.1"
-  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499"
-  integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==
+optionator@^0.9.3:
+  version "0.9.3"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.3.tgz#007397d44ed1872fdc6ed31360190f81814e2c64"
+  integrity sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==
   dependencies:
+    "@aashutoshrathi/word-wrap" "^1.2.3"
     deep-is "^0.1.3"
     fast-levenshtein "^2.0.6"
     levn "^0.4.1"
     prelude-ls "^1.2.1"
     type-check "^0.4.0"
-    word-wrap "^1.2.3"
 
 os-homedir@^1.0.0:
   version "1.0.2"
@@ -8992,7 +9441,7 @@ picocolors@^1.0.0:
   resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
   integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
 
-picomatch@^2.0.4, picomatch@^2.0.5, picomatch@^2.2.1:
+picomatch@^2.0.4, picomatch@^2.0.5:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
   integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==
@@ -9531,10 +9980,14 @@ regexp.prototype.flags@^1.3.0:
     define-properties "^1.1.3"
     es-abstract "^1.17.0-next.1"
 
-regexpp@^3.0.0, regexpp@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz#206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2"
-  integrity sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==
+regexp.prototype.flags@^1.5.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz#90ce989138db209f81492edd734183ce99f9677e"
+  integrity sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    set-function-name "^2.0.0"
 
 release-zalgo@^1.0.0:
   version "1.0.0"
@@ -9601,11 +10054,6 @@ require-directory@^2.1.1:
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
   integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
 
-require-from-string@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909"
-  integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==
-
 require-main-filename@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
@@ -9691,6 +10139,15 @@ resolve@^1.18.1, resolve@^1.20.0:
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 
+resolve@^1.22.4:
+  version "1.22.8"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d"
+  integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==
+  dependencies:
+    is-core-module "^2.13.0"
+    path-parse "^1.0.7"
+    supports-preserve-symlinks-flag "^1.0.0"
+
 restore-cursor@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
@@ -9798,6 +10255,16 @@ rxjs@^6.4.0:
   dependencies:
     tslib "^1.9.0"
 
+safe-array-concat@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.0.1.tgz#91686a63ce3adbea14d61b14c99572a8ff84754c"
+  integrity sha512-6XbUAseYE2KtOuGueyeobCySj9L4+66Tn6KQMOPQJrAJEowYKW/YR/MGJZl7FdydUdaFu4LYyDZjxf4/Nmo23Q==
+  dependencies:
+    call-bind "^1.0.2"
+    get-intrinsic "^1.2.1"
+    has-symbols "^1.0.3"
+    isarray "^2.0.5"
+
 safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@~5.2.0:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
@@ -9808,6 +10275,15 @@ safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
   integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
+safe-regex-test@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.0.0.tgz#793b874d524eb3640d1873aad03596db2d4f2295"
+  integrity sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==
+  dependencies:
+    call-bind "^1.0.2"
+    get-intrinsic "^1.1.3"
+    is-regex "^1.1.4"
+
 safe-regex@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
@@ -9871,18 +10347,23 @@ semver@^6.0.0, semver@^6.2.0, semver@^6.3.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
-semver@^7.2.1, semver@^7.3.4:
-  version "7.3.4"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97"
-  integrity sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==
-  dependencies:
-    lru-cache "^6.0.0"
+semver@^6.3.1:
+  version "6.3.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
+  integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
 semver@^7.3.2:
   version "7.3.2"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938"
   integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==
 
+semver@^7.3.4:
+  version "7.3.4"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97"
+  integrity sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==
+  dependencies:
+    lru-cache "^6.0.0"
+
 semver@^7.3.5:
   version "7.3.8"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798"
@@ -9890,11 +10371,37 @@ semver@^7.3.5:
   dependencies:
     lru-cache "^6.0.0"
 
+semver@^7.5.4:
+  version "7.5.4"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
+  integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
+  dependencies:
+    lru-cache "^6.0.0"
+
 set-blocking@^2.0.0, set-blocking@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
   integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
 
+set-function-length@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.1.1.tgz#4bc39fafb0307224a33e106a7d35ca1218d659ed"
+  integrity sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ==
+  dependencies:
+    define-data-property "^1.1.1"
+    get-intrinsic "^1.2.1"
+    gopd "^1.0.1"
+    has-property-descriptors "^1.0.0"
+
+set-function-name@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/set-function-name/-/set-function-name-2.0.1.tgz#12ce38b7954310b9f61faa12701620a0c882793a"
+  integrity sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==
+  dependencies:
+    define-data-property "^1.0.1"
+    functions-have-names "^1.2.3"
+    has-property-descriptors "^1.0.0"
+
 set-value@^2.0.0, set-value@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b"
@@ -9957,6 +10464,15 @@ side-channel@^1.0.2:
     es-abstract "^1.18.0-next.0"
     object-inspect "^1.8.0"
 
+side-channel@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf"
+  integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==
+  dependencies:
+    call-bind "^1.0.0"
+    get-intrinsic "^1.0.2"
+    object-inspect "^1.9.0"
+
 signal-exit@^3.0.0, signal-exit@^3.0.2:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c"
@@ -9994,15 +10510,6 @@ slice-ansi@1.0.0:
   dependencies:
     is-fullwidth-code-point "^2.0.0"
 
-slice-ansi@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz#500e8dd0fd55b05815086255b3195adf2a45fe6b"
-  integrity sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==
-  dependencies:
-    ansi-styles "^4.0.0"
-    astral-regex "^2.0.0"
-    is-fullwidth-code-point "^3.0.0"
-
 slide@^1.1.6:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"
@@ -10381,6 +10888,15 @@ string.prototype.trim@^1.2.1:
     es-abstract "^1.17.0-next.1"
     function-bind "^1.1.1"
 
+string.prototype.trim@^1.2.8:
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz#f9ac6f8af4bd55ddfa8895e6aea92a96395393bd"
+  integrity sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
+
 string.prototype.trimend@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz#85812a6b847ac002270f5808146064c995fb6913"
@@ -10389,6 +10905,15 @@ string.prototype.trimend@^1.0.1:
     define-properties "^1.1.3"
     es-abstract "^1.17.5"
 
+string.prototype.trimend@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.7.tgz#1bb3afc5008661d73e2dc015cd4853732d6c471e"
+  integrity sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
+
 string.prototype.trimstart@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz#14af6d9f34b053f7cfc89b72f8f2ee14b9039a54"
@@ -10397,6 +10922,15 @@ string.prototype.trimstart@^1.0.1:
     define-properties "^1.1.3"
     es-abstract "^1.17.5"
 
+string.prototype.trimstart@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.7.tgz#d4cdb44b83a4737ffbac2d406e405d43d0184298"
+  integrity sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
+
 string_decoder@^1.1.1:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
@@ -10499,7 +11033,7 @@ strip-indent@^4.0.0:
   dependencies:
     min-indent "^1.0.1"
 
-strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
+strip-json-comments@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
   integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
@@ -10581,16 +11115,6 @@ table@4.0.2:
     slice-ansi "1.0.0"
     string-width "^2.1.1"
 
-table@^6.0.4:
-  version "6.0.7"
-  resolved "https://registry.yarnpkg.com/table/-/table-6.0.7.tgz#e45897ffbcc1bcf9e8a87bf420f2c9e5a7a52a34"
-  integrity sha512-rxZevLGTUzWna/qBLObOe16kB2RTnnbhciwgPbMMlazz1yZGVEgnZK762xyVdVznhqxrfCeBMmMkgOOaPwjH7g==
-  dependencies:
-    ajv "^7.0.2"
-    lodash "^4.17.20"
-    slice-ansi "^4.0.0"
-    string-width "^4.2.0"
-
 tape@*:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/tape/-/tape-5.0.1.tgz#0d70ce90a586387c4efda4393e72872672a416a3"
@@ -10818,6 +11342,11 @@ trim-off-newlines@^1.0.0:
   resolved "https://registry.yarnpkg.com/trim-off-newlines/-/trim-off-newlines-1.0.1.tgz#9f9ba9d9efa8764c387698bcbfeb2c848f11adb3"
   integrity sha1-n5up2e+odkw4dpi8v+sshI8RrbM=
 
+ts-api-utils@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.0.3.tgz#f12c1c781d04427313dbac808f453f050e54a331"
+  integrity sha512-wNMeqtMz5NtwpT/UZGY5alT+VoKdSsOOP/kqHFcUW1P/VRhH2wJ48+DN2WwUliNbQ976ETwDL0Ifd2VVvgonvg==
+
 ts-node@^10.9.1:
   version "10.9.1"
   resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.9.1.tgz#e73de9102958af9e1f0b168a6ff320e25adcff4b"
@@ -10837,17 +11366,17 @@ ts-node@^10.9.1:
     v8-compile-cache-lib "^3.0.1"
     yn "3.1.1"
 
-tsconfig-paths@^3.9.0:
-  version "3.9.0"
-  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz#098547a6c4448807e8fcb8eae081064ee9a3c90b"
-  integrity sha512-dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw==
+tsconfig-paths@^3.14.2:
+  version "3.14.2"
+  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz#6e32f1f79412decd261f92d633a9dc1cfa99f088"
+  integrity sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g==
   dependencies:
     "@types/json5" "^0.0.29"
-    json5 "^1.0.1"
-    minimist "^1.2.0"
+    json5 "^1.0.2"
+    minimist "^1.2.6"
     strip-bom "^3.0.0"
 
-tslib@^1.8.1, tslib@^1.9.0:
+tslib@^1.9.0:
   version "1.13.0"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz#c881e13cc7015894ed914862d276436fa9a47043"
   integrity sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==
@@ -10857,13 +11386,6 @@ tslib@^2.3.1:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae"
   integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==
 
-tsutils@^3.17.1:
-  version "3.17.1"
-  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.17.1.tgz#ed719917f11ca0dee586272b2ac49e015a2dd759"
-  integrity sha512-kzeQ5B8H3w60nFY2g8cJIuH7JDpsALXySGtwGJ0p2LSjLgay3NdIpqq5SoOBe46bKDW2iq25irHCr8wjomUS2g==
-  dependencies:
-    tslib "^1.8.1"
-
 tunnel-agent@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
@@ -10917,6 +11439,11 @@ type-fest@^0.13.1:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.13.1.tgz#0172cb5bce80b0bd542ea348db50c7e21834d934"
   integrity sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==
 
+type-fest@^0.20.2:
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
+  integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==
+
 type-fest@^0.3.0:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.3.1.tgz#63d00d204e059474fe5e1b7c011112bbd1dc29e1"
@@ -10937,6 +11464,45 @@ type-fest@^1.0.1, type-fest@^1.2.1, type-fest@^1.2.2:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-1.4.0.tgz#e9fb813fe3bf1744ec359d55d1affefa76f14be1"
   integrity sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==
 
+typed-array-buffer@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz#18de3e7ed7974b0a729d3feecb94338d1472cd60"
+  integrity sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==
+  dependencies:
+    call-bind "^1.0.2"
+    get-intrinsic "^1.2.1"
+    is-typed-array "^1.1.10"
+
+typed-array-byte-length@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz#d787a24a995711611fb2b87a4052799517b230d0"
+  integrity sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==
+  dependencies:
+    call-bind "^1.0.2"
+    for-each "^0.3.3"
+    has-proto "^1.0.1"
+    is-typed-array "^1.1.10"
+
+typed-array-byte-offset@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz#cbbe89b51fdef9cd6aaf07ad4707340abbc4ea0b"
+  integrity sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==
+  dependencies:
+    available-typed-arrays "^1.0.5"
+    call-bind "^1.0.2"
+    for-each "^0.3.3"
+    has-proto "^1.0.1"
+    is-typed-array "^1.1.10"
+
+typed-array-length@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/typed-array-length/-/typed-array-length-1.0.4.tgz#89d83785e5c4098bec72e08b319651f0eac9c1bb"
+  integrity sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==
+  dependencies:
+    call-bind "^1.0.2"
+    for-each "^0.3.3"
+    is-typed-array "^1.1.9"
+
 typedarray-to-buffer@^3.1.5:
   version "3.1.5"
   resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080"
@@ -10979,6 +11545,16 @@ umask@^1.1.0:
   resolved "https://registry.yarnpkg.com/umask/-/umask-1.1.0.tgz#f29cebf01df517912bb58ff9c4e50fde8e33320d"
   integrity sha1-8pzr8B31F5ErtY/5xOUP3o4zMg0=
 
+unbox-primitive@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.2.tgz#29032021057d5e6cdbd08c5129c226dff8ed6f9e"
+  integrity sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==
+  dependencies:
+    call-bind "^1.0.2"
+    has-bigints "^1.0.2"
+    has-symbols "^1.0.3"
+    which-boxed-primitive "^1.0.2"
+
 union-value@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847"
@@ -11132,11 +11708,6 @@ v8-compile-cache-lib@^3.0.1:
   resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf"
   integrity sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==
 
-v8-compile-cache@^2.0.3:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.1.1.tgz#54bc3cdd43317bca91e35dcaf305b1a7237de745"
-  integrity sha512-8OQ9CL+VWyt3JStj7HX7/ciTL2V3Rl1Wf5OL+SNTm0yK1KvtReVulksyeRnCANHHuUxHlQig+JJDlUhBt1NQDQ==
-
 v8-to-istanbul@^7.0.0:
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-7.1.2.tgz#30898d1a7fa0c84d225a2c1434fb958f290883c1"
@@ -11230,6 +11801,17 @@ which-boxed-primitive@^1.0.1:
     is-string "^1.0.4"
     is-symbol "^1.0.2"
 
+which-boxed-primitive@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6"
+  integrity sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==
+  dependencies:
+    is-bigint "^1.0.1"
+    is-boolean-object "^1.1.0"
+    is-number-object "^1.0.4"
+    is-string "^1.0.5"
+    is-symbol "^1.0.3"
+
 which-collection@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/which-collection/-/which-collection-1.0.1.tgz#70eab71ebbbd2aefaf32f917082fc62cdcb70906"
@@ -11245,6 +11827,17 @@ which-module@^2.0.0:
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
   integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
 
+which-typed-array@^1.1.11, which-typed-array@^1.1.13:
+  version "1.1.13"
+  resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.13.tgz#870cd5be06ddb616f504e7b039c4c24898184d36"
+  integrity sha512-P5Nra0qjSncduVPEAr7xhoF5guty49ArDTwzJ/yNuPIbZppyRxFQsRCWrocxIY+CnMVG+qfbU2FmDKyvSGClow==
+  dependencies:
+    available-typed-arrays "^1.0.5"
+    call-bind "^1.0.4"
+    for-each "^0.3.3"
+    gopd "^1.0.1"
+    has-tostringtag "^1.0.0"
+
 which-typed-array@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.2.tgz#e5f98e56bda93e3dac196b01d47c1156679c00b2"
@@ -11297,7 +11890,7 @@ windows-release@^3.1.0:
   dependencies:
     execa "^1.0.0"
 
-word-wrap@^1.2.3, word-wrap@~1.2.3:
+word-wrap@~1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
   integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==

From 0f3789cfa3085d4afed6805524c2f5da1349df31 Mon Sep 17 00:00:00 2001
From: mainnet-pat <mainnet_pat@protonmail.com>
Date: Mon, 27 Nov 2023 10:54:03 +0000
Subject: [PATCH 025/171] Update source map tests

---
 packages/utils/test/sourceMap.test.ts | 111 ++++++++++----------------
 1 file changed, 40 insertions(+), 71 deletions(-)

diff --git a/packages/utils/test/sourceMap.test.ts b/packages/utils/test/sourceMap.test.ts
index b25444b7..deb7ab56 100644
--- a/packages/utils/test/sourceMap.test.ts
+++ b/packages/utils/test/sourceMap.test.ts
@@ -2,80 +2,49 @@ import { LocationData, generateSourceMap, sourceMapToLocationData } from '../src
 
 it('test sourcemap generation and decoding', () => {
   const locationData = [
-    [{ start: { line: 3, column: 2 }, end: { line: 6, column: 3 } }],
-    [{ start: { line: 3, column: 2 }, end: { line: 6, column: 3 } }],
-    [{ start: { line: 3, column: 2 }, end: { line: 6, column: 3 } }],
-    [{ start: { line: 3, column: 2 }, end: { line: 6, column: 3 } }],
-    [{ start: { line: 3, column: 2 }, end: { line: 6, column: 3 } }],
-    [{ start: { line: 4, column: 21 }, end: { line: 4, column: 22 } }],
-    [{ start: { line: 4, column: 21 }, end: { line: 4, column: 22 } }],
-    [{ start: { line: 4, column: 24 }, end: { line: 4, column: 33 } }],
-    [{ start: { line: 4, column: 24 }, end: { line: 4, column: 33 } }],
-    [{ start: { line: 4, column: 12 }, end: { line: 4, column: 34 } }],
-    [{ start: { line: 4, column: 4 }, end: { line: 4, column: 36 } }],
-    [{ start: { line: 5, column: 20 }, end: { line: 5, column: 29 } }],
-    [{ start: { line: 5, column: 20 }, end: { line: 5, column: 29 } }],
-    [{ start: { line: 5, column: 12 }, end: { line: 5, column: 30 } }],
-    [{ start: { line: 5, column: 34 }, end: { line: 5, column: 46 } }],
-    [{ start: { line: 5, column: 34 }, end: { line: 5, column: 46 } }],
-    [{ start: { line: 5, column: 12 }, end: { line: 5, column: 46 } }],
-    [{ start: { line: 3, column: 2 }, end: { line: 6, column: 3 } }, 1],
-    [{ start: { line: 3, column: 2 }, end: { line: 6, column: 3 } }, 1],
-    [{ start: { line: 3, column: 2 }, end: { line: 6, column: 3 } }, 1],
-    [{ start: { line: 3, column: 2 }, end: { line: 6, column: 3 } }, 1],
-    [{ start: { line: 8, column: 2 }, end: { line: 16, column: 3 } }],
-    [{ start: { line: 8, column: 2 }, end: { line: 16, column: 3 } }],
-    [{ start: { line: 8, column: 2 }, end: { line: 16, column: 3 } }],
-    [{ start: { line: 8, column: 2 }, end: { line: 16, column: 3 } }],
-    [{ start: { line: 8, column: 2 }, end: { line: 16, column: 3 } }],
-    [{ start: { line: 9, column: 12 }, end: { line: 9, column: 21 } }],
-    [{ start: { line: 9, column: 12 }, end: { line: 9, column: 21 } }],
-    [{ start: { line: 9, column: 25 }, end: { line: 9, column: 34 } }],
-    [{ start: { line: 9, column: 25 }, end: { line: 9, column: 34 } }],
-    [{ start: { line: 9, column: 12 }, end: { line: 9, column: 34 } }],
-    [{ start: { line: 9, column: 4 }, end: { line: 9, column: 36 } }],
-    [{ start: { line: 10, column: 12 }, end: { line: 10, column: 19 } }],
-    [{ start: { line: 10, column: 12 }, end: { line: 10, column: 19 } }],
-    [{ start: { line: 10, column: 23 }, end: { line: 10, column: 30 } }],
-    [{ start: { line: 10, column: 23 }, end: { line: 10, column: 30 } }],
-    [{ start: { line: 10, column: 12 }, end: { line: 10, column: 30 } }],
-    [{ start: { line: 10, column: 4 }, end: { line: 10, column: 32 } }],
-    [{ start: { line: 11, column: 12 }, end: { line: 11, column: 13 } }],
-    [{ start: { line: 11, column: 12 }, end: { line: 11, column: 13 } }],
-    [{ start: { line: 11, column: 17 }, end: { line: 11, column: 18 } }],
-    [{ start: { line: 11, column: 17 }, end: { line: 11, column: 18 } }],
-    [{ start: { line: 11, column: 12 }, end: { line: 11, column: 18 } }],
-    [{ start: { line: 11, column: 4 }, end: { line: 11, column: 20 } }],
-    [{ start: { line: 12, column: 12 }, end: { line: 12, column: 21 } }],
-    [{ start: { line: 12, column: 12 }, end: { line: 12, column: 21 } }],
-    [{ start: { line: 12, column: 25 }, end: { line: 12, column: 34 } }],
-    [{ start: { line: 12, column: 25 }, end: { line: 12, column: 34 } }],
-    [{ start: { line: 12, column: 12 }, end: { line: 12, column: 34 } }],
-    [{ start: { line: 12, column: 4 }, end: { line: 12, column: 36 } }],
-    [{ start: { line: 13, column: 21 }, end: { line: 13, column: 22 } }],
-    [{ start: { line: 13, column: 21 }, end: { line: 13, column: 22 } }],
-    [{ start: { line: 13, column: 24 }, end: { line: 13, column: 33 } }],
-    [{ start: { line: 13, column: 24 }, end: { line: 13, column: 33 } }],
-    [{ start: { line: 13, column: 12 }, end: { line: 13, column: 34 } }],
-    [{ start: { line: 13, column: 4 }, end: { line: 13, column: 36 } }],
-    [{ start: { line: 14, column: 20 }, end: { line: 14, column: 29 } }],
-    [{ start: { line: 14, column: 20 }, end: { line: 14, column: 29 } }],
-    [{ start: { line: 14, column: 12 }, end: { line: 14, column: 30 } }],
-    [{ start: { line: 14, column: 34 }, end: { line: 14, column: 43 } }],
-    [{ start: { line: 14, column: 34 }, end: { line: 14, column: 43 } }],
-    [{ start: { line: 14, column: 12 }, end: { line: 14, column: 43 } }],
-    [{ start: { line: 14, column: 4 }, end: { line: 14, column: 45 } }],
-    [{ start: { line: 15, column: 23 }, end: { line: 15, column: 30 } }],
-    [{ start: { line: 15, column: 23 }, end: { line: 15, column: 30 } }],
-    [{ start: { line: 15, column: 4 }, end: { line: 15, column: 32 } }],
-    [{ start: { line: 15, column: 4 }, end: { line: 15, column: 32 } }],
-    [{ start: { line: 15, column: 4 }, end: { line: 15, column: 32 } }, 1],
-    [{ start: { line: 8, column: 2 }, end: { line: 16, column: 3 } }, 1],
-    [{ start: { line: 8, column: 2 }, end: { line: 16, column: 3 } }, 1],
+    [{ start: { line: 10, column: 8 }, end: { line: 15, column: 9 } } ],
+    [{ start: { line: 10, column: 8 }, end: { line: 15, column: 9 } } ],
+    [{ start: { line: 10, column: 8 }, end: { line: 15, column: 9 } } ],
+    [{ start: { line: 10, column: 8 }, end: { line: 15, column: 9 } } ],
+    [{ start: { line: 10, column: 8 }, end: { line: 15, column: 9 } } ],
+    [{ start: { line: 11, column: 26 }, end: { line: 11, column: 32 } } ],
+    [{ start: { line: 13, column: 20 }, end: { line: 13, column: 24 } } ],
+    [{ start: { line: 13, column: 20 }, end: { line: 13, column: 24 } } ],
+    [{ start: { line: 13, column: 28 }, end: { line: 13, column: 34 } } ],
+    [{ start: { line: 13, column: 20 }, end: { line: 13, column: 34 } }, 1 ],
+    [{ start: { line: 13, column: 20 }, end: { line: 13, column: 34 } }, 1 ],
+    [{ start: { line: 13, column: 12 }, end: { line: 13, column: 36 } }, 1 ],
+    [{ start: { line: 14, column: 29 }, end: { line: 14, column: 41 } } ],
+    [{ start: { line: 14, column: 29 }, end: { line: 14, column: 41 } } ],
+    [{ start: { line: 14, column: 43 }, end: { line: 14, column: 52 } } ],
+    [{ start: { line: 14, column: 43 }, end: { line: 14, column: 52 } } ],
+    [{ start: { line: 14, column: 20 }, end: { line: 14, column: 53 } }, 1 ],
+    [{ start: { line: 10, column: 8 }, end: { line: 15, column: 9 } }, 1 ],
+    [{ start: { line: 10, column: 8 }, end: { line: 15, column: 9 } }, 1 ],
+    [{ start: { line: 10, column: 8 }, end: { line: 15, column: 9 } }, 1 ],
+    [{ start: { line: 10, column: 8 }, end: { line: 15, column: 9 } }, 1 ],
+    [{ start: { line: 18, column: 8 }, end: { line: 21, column: 9 } } ],
+    [{ start: { line: 18, column: 8 }, end: { line: 21, column: 9 } } ],
+    [{ start: { line: 18, column: 8 }, end: { line: 21, column: 9 } } ],
+    [{ start: { line: 18, column: 8 }, end: { line: 21, column: 9 } } ],
+    [{ start: { line: 18, column: 8 }, end: { line: 21, column: 9 } } ],
+    [{ start: { line: 19, column: 29 }, end: { line: 19, column: 38 } } ],
+    [{ start: { line: 19, column: 29 }, end: { line: 19, column: 38 } } ],
+    [{ start: { line: 19, column: 40 }, end: { line: 19, column: 46 } } ],
+    [{ start: { line: 19, column: 40 }, end: { line: 19, column: 46 } } ],
+    [{ start: { line: 19, column: 20 }, end: { line: 19, column: 47 } }, 1 ],
+    [{ start: { line: 19, column: 12 }, end: { line: 19, column: 49 } }, 1 ],
+    [{ start: { line: 20, column: 31 }, end: { line: 20, column: 38 } } ],
+    [{ start: { line: 20, column: 31 }, end: { line: 20, column: 38 } } ],
+    [{ start: { line: 20, column: 12 }, end: { line: 20, column: 40 } }, 1 ],
+    [{ start: { line: 20, column: 12 }, end: { line: 20, column: 40 } }, 1 ],
+    [{ start: { line: 18, column: 8 }, end: { line: 21, column: 9 } }, 1 ],
+    [{ start: { line: 18, column: 8 }, end: { line: 21, column: 9 } }, 1 ],
+    [{ start: { line: 4, column: 4 }, end: { line: 22, column: 5 } }, 1 ]
   ] as LocationData;
 
   const sourceMap = generateSourceMap(locationData);
-  const expected = '3:2:6:3;;;;;4:21:4:22;;:24::33;;:12::34;:4::36;5:20:5:29;;:12::30;:34::46;;:12;3:2:6:3:1;;;;8::16::0;;;;;9:12:9:21;;:25::35;:12;:4::37;10:12:10:19;;:23::30;;:12;:4::32;11:12:11:13;;:17::18;;:12;:4::20;12:12:12:21;;:25::34;;:12;:4::36;13:21:13:22;;:24::33;;:12::34;:4::36;14:20:14:29;;:12::30;:34::43;;:12;:4::45;15:23:15:30;;:4::32;;8:2:16:3:1;;';
+  const expected = '10:8:15:9;;;;;11:26:11:32;13:20:13:24;;:28::34;:20:::1;;:12::36;14:29:14:41:0;;:43::52;;:20::53:1;10:8:15:9;;;;18::21::0;;;;;19:29:19:38;;:40::46;;:20::47:1;:12::49;20:31:20:38:0;;:12::40:1;;18:8:21:9;;4:4:22:5';
   expect(sourceMap).toBe(expected);
 
   const full = sourceMapToLocationData(sourceMap);

From f726c552f0702b13c428631da7db457dda900a71 Mon Sep 17 00:00:00 2001
From: mainnet-pat <mainnet_pat@protonmail.com>
Date: Mon, 27 Nov 2023 11:24:01 +0000
Subject: [PATCH 026/171] Cleanup libauth tests

---
 .../cashscript/test/LibauthTemplate.test.ts   | 22 -------------------
 1 file changed, 22 deletions(-)

diff --git a/packages/cashscript/test/LibauthTemplate.test.ts b/packages/cashscript/test/LibauthTemplate.test.ts
index 2e4d4cec..a933d53a 100644
--- a/packages/cashscript/test/LibauthTemplate.test.ts
+++ b/packages/cashscript/test/LibauthTemplate.test.ts
@@ -7,28 +7,6 @@ import './JestExtensions.js';
 import { randomUtxo } from '../src/utils.js';
 
 describe('Libauth template generation tests', () => {
-  it('should log console statements', async () => {
-    const code = `
-contract Example(string cash) {
-  function test(string script) {
-    require(
-      cash +
-      script ==
-      "cashscript"
-    );
-  }
-}
-`;
-    const artifact = compileString(code);
-
-    const provider = new MockNetworkProvider();
-    const contract = new Contract(artifact, ['cash'], { provider });
-    provider.addUtxo(contract.address, randomUtxo());
-
-    const transaction = contract.functions.test('script').to(contract.address, 10000n);
-    await transaction.debug();
-  });
-
   it('should log console statements', async () => {
     const code = `
     pragma cashscript ^0.9.0;

From df6a902828c46b8fbc9006716c44b7df8b54cc51 Mon Sep 17 00:00:00 2001
From: mainnet-pat <mainnet_pat@protonmail.com>
Date: Mon, 27 Nov 2023 12:17:49 +0000
Subject: [PATCH 027/171] Update documentation

---
 website/docs/basics/getting-started.md |  4 ++
 website/docs/language/artifacts.md     | 18 ++++++
 website/docs/releases/release-notes.md | 28 +++++++++
 website/docs/sdk/debugging.md          | 86 ++++++++++++++++++++++++++
 website/sidebars.js                    |  1 +
 5 files changed, 137 insertions(+)
 create mode 100644 website/docs/sdk/debugging.md

diff --git a/website/docs/basics/getting-started.md b/website/docs/basics/getting-started.md
index bbc39fa8..b51d42a3 100644
--- a/website/docs/basics/getting-started.md
+++ b/website/docs/basics/getting-started.md
@@ -85,3 +85,7 @@ console.log(timeoutDetails);
 :::tip
 Read more about the JavaScript SDK in the [SDK documentation](/docs/sdk/instantiation).
 :::
+
+:::tip
+Read more about CashScript contract development and testing suite in the [Debug tools](/docs/sdk/debugging).
+:::
\ No newline at end of file
diff --git a/website/docs/language/artifacts.md b/website/docs/language/artifacts.md
index 41e0756a..4117696a 100644
--- a/website/docs/language/artifacts.md
+++ b/website/docs/language/artifacts.md
@@ -20,6 +20,12 @@ interface Artifact {
     name: string // Compiler used to compile this contract
     version: string // Compiler version used to compile this contract
   }
+  debug?: {
+    bytecode: string // unlike `bytecode` property above, this is a hex-encoded binary string
+    sourceMap: string // see documentation for `generateSourceMap`
+    logs: LogEntry[] // log entries generated from `console.log` statements
+    requireMessages: RequireMessage[] // messages for failing `require` statements
+  }
   updatedAt: string // Last datetime this artifact was updated (in ISO format)
 }
 
@@ -32,4 +38,16 @@ interface AbiFunction {
   name: string // Function name
   inputs: AbiInput[] // Function inputs / parameters
 }
+
+interface LogEntry {
+  ip: number; // instruction pointer
+  line: number; // line in the source code
+  data: Array<{ stackIndex: number, type: string } | string>; // data to be logged
+}
+
+interface RequireMessage {
+  ip: number; // instruction pointer
+  line: number; // line in the source code
+  message: string; // custom message for failing `require` statement
+}
 ```
diff --git a/website/docs/releases/release-notes.md b/website/docs/releases/release-notes.md
index 148ee32d..65fcec94 100644
--- a/website/docs/releases/release-notes.md
+++ b/website/docs/releases/release-notes.md
@@ -2,6 +2,34 @@
 title: Release Notes
 ---
 
+## v0.9.3
+
+#### cashc compiler
+- compiler code was extended to understand:
+  * `console.log()` statements, debug only
+  * extended require syntax `require(expression, message)`, debug only
+- compiler now outputs the debug information into artifact:
+  * log messages
+  * failed require messages
+  * unoptimized contract bytecode for debugging
+  * sourcemap to map emitted VM instructions to CashScript source code
+
+
+#### CashScript SDK
+
+- Add MockNetworkProvider to simulate network interaction
+- Add libauth template creation
+- Add support for transaction evaluation and debugging using libauth templates
+- Add extended Jest utilities specifically crafted for CashScript:
+  * await expect(transaction).toLog(message)
+  * await expect(transaction).toFailRequireWith(message)
+- Meep tool got replaced with libauth template debug evaluation
+
+#### Demo
+
+- A new demo toolkit was added for everyone to bootstrap the contract creation and
+  debugging environment similar to `hardat` on Ethereum. See `demo/testing-suite` path.
+
 ## v0.9.2
 
 #### CashScript SDK
diff --git a/website/docs/sdk/debugging.md b/website/docs/sdk/debugging.md
new file mode 100644
index 00000000..44e2b452
--- /dev/null
+++ b/website/docs/sdk/debugging.md
@@ -0,0 +1,86 @@
+---
+title: Debug tools
+---
+
+To speed up the contract development and ensure the contract quality and security, CashScript takes advantage of deep integration with libauth. It allows for local transacaction evaluation, without actual interaction with BitcoinCash network of nodes.
+
+For a quick start, all beginners should check out the demo toolkit allowing to bootstrap the contract creation and debugging environment similar to `hardat` on Ethereum. See [`demo/testing-suite`](https://github.com/CashScript/cashscript/tree/master/demo/testing-suite) project path.
+
+### MockNetworkProvider
+
+`MockNetworkProvider` allows to set up the testing environment for the contract under test. It allows the developer to add inputs with well-defined parameters of an `Utxo` class, or randomized set of properties.
+
+```ts
+const provider = new MockNetworkProvider();
+provider.addUtxo(contract.address, { vout: 0, txid: "ab...", satoshis: 10000n });
+
+provider.addUtxo(aliceAddress, randomUtxo({
+  satoshis: 1000n,
+  token: { ...randomNFT(), ...randomToken() },
+}));
+```
+
+Note, that `MockNetworkProvider` does not evaluate the transactions, but blindly accept them to later report them back upon a user query. It does not "consume" the utxos upon transaction acceptance, developers should control utxo set themselves to ensure the proper behaviour.
+
+### Transaction class extensions
+
+If a CashScript transaction is being built and sent with `MockNetworkProvider` it will be evaluated with libauth and if it fails the evaluation the debug information about the failure reasons will be presented to the developer.
+
+If it is sent with any other provider such as `ElectrumNetworkProvider` and the remote will reject failing transaction, the transaction will be evaluated in debug mode with libauth and information about the failure reasons will be presented to the developer.
+
+If you wish to take advantage of the BitAuth IDE to debug your failing transaction in a visual way you can use `await transaction.bitauthUri()` helper function.
+
+:::caution
+It is unsafe to debug transactions on mainnet as private keys will be exposed to BitAuth IDE and transmitted over the network.
+:::
+
+### Jest testing extensions
+
+Taking advantage of local transaction evaluation and debug source maps, it is possible to record some contract metadata such as `console.log` statements or debug messages attached to failing `require` statemets:
+
+#### console.log
+
+`console.log` is a special CashScript statement which allows to output some valuable information hinting at contract behaviour. Any primitive data type literals can be logged, such as integers, bools, strings, hex literals, byte types, including sigs, pubkeys, etc. In addition it supports logging the variable values.
+
+:::tip
+Logging is only available in debug evaluation of a transaction, it has no effect in production.
+:::
+
+#### require
+
+`require` syntax got extended with optional debug messages which will appear upon debug evaluation of the transaction, when this require statement fails.
+
+:::tip
+`require` with custom error message is only available in debug evaluation of a transaction, it has no effect in production.
+:::
+
+
+### Example
+
+Example contract:
+```solidity
+contract Example() {
+  function test(int value) {
+    console.log(value, "test");
+    require(value == 1, "Wrong value passed");
+  }
+}
+```
+
+Example contract debug evaluation:
+```ts
+import artifact from '../artifacts/example.json' assert { type: "json" };
+import { Contract, MockNetworkProvider, randomUtxo } from 'cashscript';
+import 'cashscript/dist/test/JestExtensions';
+
+const provider = new MockNetworkProvider();
+const contract = new Contract(artifact, [], { provider });
+provider.addUtxo(contract.address, randomUtxo());
+
+let transaction = contract.functions.test(0n).to(contract.address, 10000n);
+await (expect(transaction)).toLog(/0 test/);
+await (expect(transaction)).toFailRequireWith(/Wrong value passed/);
+
+transaction = contract.functions.test(1n).to(contract.address, 10000n);
+await expect(transaction.send()).resolves.not.toThrow();
+```
diff --git a/website/sidebars.js b/website/sidebars.js
index 1bf76d59..86261508 100755
--- a/website/sidebars.js
+++ b/website/sidebars.js
@@ -31,6 +31,7 @@ module.exports = {
         'sdk/transactions',
         'sdk/transactions-advanced',
         'sdk/examples',
+        'sdk/debugging',
       ],
     },
     {

From 0a2cd7d547edf724e090231caf53b07ddafde08c Mon Sep 17 00:00:00 2001
From: mainnet-pat <mainnet_pat@protonmail.com>
Date: Mon, 27 Nov 2023 12:18:15 +0000
Subject: [PATCH 028/171] Add bitauthUri utility to Transaction class

---
 packages/cashscript/src/Transaction.ts | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/packages/cashscript/src/Transaction.ts b/packages/cashscript/src/Transaction.ts
index 04954d60..0a04ad8f 100644
--- a/packages/cashscript/src/Transaction.ts
+++ b/packages/cashscript/src/Transaction.ts
@@ -227,6 +227,15 @@ export class Transaction {
     return debugTemplate(template, this.contract.artifact);
   }
 
+  async bitauthUri(): Promise<string> {
+    const template = await buildTemplate({
+      contract: this.contract,
+      transaction: this,
+      manglePrivateKeys: false,
+    });
+    return getBitauthUri(template);
+  }
+
   private async getTxDetails(txid: string): Promise<TransactionDetails>;
   private async getTxDetails(txid: string, raw: true): Promise<string>;
 

From b3896add44c844e0465944501733394470d1985e Mon Sep 17 00:00:00 2001
From: mainnet-pat <mainnet_pat@protonmail.com>
Date: Mon, 27 Nov 2023 13:02:25 +0000
Subject: [PATCH 029/171] Export random utils from cashscript

---
 demo/testing-suite/test/example.test.ts | 3 +--
 package.json                            | 3 ++-
 packages/cashscript/src/index.ts        | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/demo/testing-suite/test/example.test.ts b/demo/testing-suite/test/example.test.ts
index 21a44c0f..a30cbbe2 100644
--- a/demo/testing-suite/test/example.test.ts
+++ b/demo/testing-suite/test/example.test.ts
@@ -1,6 +1,5 @@
 import artifact from '../artifacts/example.json' assert { type: "json" };
-import { Contract, MockNetworkProvider } from 'cashscript/dist/src';
-import { randomUtxo } from 'cashscript/dist/src/utils';
+import { Contract, MockNetworkProvider, randomUtxo } from 'cashscript/dist/src';
 import 'cashscript/dist/test/JestExtensions';
 
 describe("test example contract functions", () => {
diff --git a/package.json b/package.json
index b78cd117..d9ba8647 100644
--- a/package.json
+++ b/package.json
@@ -37,6 +37,7 @@
     "postinstall": "lerna bootstrap && lerna run build --ignore cashscript-examples",
     "spellcheck": "cspell lint '**' --no-progress --must-find-files",
     "update-version": "ts-node-esm update-version.ts",
-    "publish-all": "lerna publish from-package"
+    "publish-all": "lerna publish from-package",
+    "build": "lerna run build"
   }
 }
diff --git a/packages/cashscript/src/index.ts b/packages/cashscript/src/index.ts
index 497cde46..f485f4bf 100644
--- a/packages/cashscript/src/index.ts
+++ b/packages/cashscript/src/index.ts
@@ -16,3 +16,4 @@ export {
   FullStackNetworkProvider,
   MockNetworkProvider,
 } from './network/index.js';
+export { randomUtxo, randomToken, randomNFT } from './utils.js';

From bbb03335cccf2edcabe6767f318b804860720295 Mon Sep 17 00:00:00 2001
From: mainnet-pat <mainnet_pat@protonmail.com>
Date: Mon, 27 Nov 2023 13:03:42 +0000
Subject: [PATCH 030/171] Lint

---
 packages/utils/test/sourceMap.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/utils/test/sourceMap.test.ts b/packages/utils/test/sourceMap.test.ts
index deb7ab56..4e16c75f 100644
--- a/packages/utils/test/sourceMap.test.ts
+++ b/packages/utils/test/sourceMap.test.ts
@@ -40,7 +40,7 @@ it('test sourcemap generation and decoding', () => {
     [{ start: { line: 20, column: 12 }, end: { line: 20, column: 40 } }, 1 ],
     [{ start: { line: 18, column: 8 }, end: { line: 21, column: 9 } }, 1 ],
     [{ start: { line: 18, column: 8 }, end: { line: 21, column: 9 } }, 1 ],
-    [{ start: { line: 4, column: 4 }, end: { line: 22, column: 5 } }, 1 ]
+    [{ start: { line: 4, column: 4 }, end: { line: 22, column: 5 } }, 1 ],
   ] as LocationData;
 
   const sourceMap = generateSourceMap(locationData);

From 5b84d0a2d897b8cb76dc6d746b0ab73f05d873fd Mon Sep 17 00:00:00 2001
From: mainnet-pat <mainnet_pat@protonmail.com>
Date: Mon, 27 Nov 2023 13:07:57 +0000
Subject: [PATCH 031/171] Add forgotten import in documentation

---
 website/docs/sdk/debugging.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/website/docs/sdk/debugging.md b/website/docs/sdk/debugging.md
index 44e2b452..27610cc1 100644
--- a/website/docs/sdk/debugging.md
+++ b/website/docs/sdk/debugging.md
@@ -11,6 +11,8 @@ For a quick start, all beginners should check out the demo toolkit allowing to b
 `MockNetworkProvider` allows to set up the testing environment for the contract under test. It allows the developer to add inputs with well-defined parameters of an `Utxo` class, or randomized set of properties.
 
 ```ts
+import { MockNetworkProvider, randomUtxo } from 'cashscript/dist/src';
+
 const provider = new MockNetworkProvider();
 provider.addUtxo(contract.address, { vout: 0, txid: "ab...", satoshis: 10000n });
 

From 6788ac9db2035123c427ad8008c06debf5969b5d Mon Sep 17 00:00:00 2001
From: mainnet-pat <mainnet_pat@protonmail.com>
Date: Mon, 27 Nov 2023 13:10:12 +0000
Subject: [PATCH 032/171] Update versions

---
 demo/testing-suite/package.json  | 6 +++---
 examples/package.json            | 6 +++---
 packages/cashc/package.json      | 4 ++--
 packages/cashc/src/index.ts      | 2 +-
 packages/cashscript/package.json | 4 ++--
 packages/utils/package.json      | 2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/demo/testing-suite/package.json b/demo/testing-suite/package.json
index 1ab89e46..bff4660e 100644
--- a/demo/testing-suite/package.json
+++ b/demo/testing-suite/package.json
@@ -1,6 +1,6 @@
 {
   "name": "testing-suite",
-  "version": "1.0.0",
+  "version": "0.10.0",
   "description": "Example project to develop and test CashScript contracts",
   "main": "index.js",
   "type": "module",
@@ -25,8 +25,8 @@
     "test": "NODE_OPTIONS='--experimental-vm-modules --no-warnings' jest"
   },
   "dependencies": {
-    "cashc": "^0.9.2",
-    "cashscript": "^0.9.2"
+    "cashc": "^0.10.0",
+    "cashscript": "^0.10.0"
   },
   "devDependencies": {
     "@jest/globals": "^29.4.1",
diff --git a/examples/package.json b/examples/package.json
index 2bb2f73b..0b6948d5 100644
--- a/examples/package.json
+++ b/examples/package.json
@@ -1,7 +1,7 @@
 {
   "name": "cashscript-examples",
   "private": true,
-  "version": "0.9.2",
+  "version": "0.10.0",
   "description": "Usage examples of the CashScript SDK",
   "main": "p2pkh.js",
   "type": "module",
@@ -11,8 +11,8 @@
     "@bitauth/libauth": "^2.0.0-alpha.8",
     "@types/node": "^12.7.8",
     "bip39": "^3.0.4",
-    "cashc": "^0.9.2",
-    "cashscript": "^0.9.2",
+    "cashc": "^0.10.0",
+    "cashscript": "^0.10.0",
     "typescript": "^4.9.5"
   }
 }
diff --git a/packages/cashc/package.json b/packages/cashc/package.json
index b21064e3..6d003d88 100644
--- a/packages/cashc/package.json
+++ b/packages/cashc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cashc",
-  "version": "0.9.2",
+  "version": "0.10.0",
   "description": "Compile Bitcoin Cash contracts to Bitcoin Cash Script or artifacts",
   "keywords": [
     "bitcoin",
@@ -50,7 +50,7 @@
   },
   "dependencies": {
     "@bitauth/libauth": "^2.0.0-alpha.8",
-    "@cashscript/utils": "^0.9.2",
+    "@cashscript/utils": "^0.10.0",
     "antlr4ts": "^0.5.0-alpha.4",
     "commander": "^7.1.0",
     "semver": "^7.3.4"
diff --git a/packages/cashc/src/index.ts b/packages/cashc/src/index.ts
index 57902d13..72b37416 100644
--- a/packages/cashc/src/index.ts
+++ b/packages/cashc/src/index.ts
@@ -2,4 +2,4 @@ export * from './Errors.js';
 export * as utils from '@cashscript/utils';
 export { compileFile, compileString } from './compiler.js';
 
-export const version = '0.9.2';
+export const version = '0.10.0';
diff --git a/packages/cashscript/package.json b/packages/cashscript/package.json
index de7b235d..80c8ad73 100644
--- a/packages/cashscript/package.json
+++ b/packages/cashscript/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cashscript",
-  "version": "0.9.2",
+  "version": "0.10.0",
   "description": "Easily write and interact with Bitcoin Cash contracts",
   "keywords": [
     "bitcoin cash",
@@ -44,7 +44,7 @@
   },
   "dependencies": {
     "@bitauth/libauth": "^2.0.0-alpha.8",
-    "@cashscript/utils": "^0.9.2",
+    "@cashscript/utils": "^0.10.0",
     "bip68": "^1.0.4",
     "bitcoin-rpc-promise-retry": "^1.3.0",
     "delay": "^5.0.0",
diff --git a/packages/utils/package.json b/packages/utils/package.json
index 764fcad8..baa2c347 100644
--- a/packages/utils/package.json
+++ b/packages/utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cashscript/utils",
-  "version": "0.9.2",
+  "version": "0.10.0",
   "description": "CashScript utilities and types",
   "keywords": [
     "bitcoin cash",

From 8bab42d8f73dd1c26909110b8486776035697695 Mon Sep 17 00:00:00 2001
From: mainnet-pat <mainnet_pat@protonmail.com>
Date: Mon, 27 Nov 2023 14:07:11 +0000
Subject: [PATCH 033/171] Fix version in release notes

---
 website/docs/releases/release-notes.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/docs/releases/release-notes.md b/website/docs/releases/release-notes.md
index 65fcec94..9a3043e7 100644
--- a/website/docs/releases/release-notes.md
+++ b/website/docs/releases/release-notes.md
@@ -2,7 +2,7 @@
 title: Release Notes
 ---
 
-## v0.9.3
+## v0.10.0
 
 #### cashc compiler
 - compiler code was extended to understand:

From 9983dbfdbf5f6ad7c4ed972b47d64a1fc47ffda5 Mon Sep 17 00:00:00 2001
From: mainnet-pat <mainnet_pat@protonmail.com>
Date: Mon, 27 Nov 2023 16:42:04 +0000
Subject: [PATCH 034/171] Handle edge case of final require verify being
 dropped and unsuccessful evaluation due to other checks

---
 demo/testing-suite/artifacts/example.json     |  4 +--
 packages/cashscript/src/LibauthTemplate.ts    | 32 ++++++++++++++++++-
 packages/cashscript/test/JestExtensions.ts    |  4 ++-
 .../cashscript/test/LibauthTemplate.test.ts   | 16 ++++++++--
 4 files changed, 50 insertions(+), 6 deletions(-)

diff --git a/demo/testing-suite/artifacts/example.json b/demo/testing-suite/artifacts/example.json
index 80293c74..49eda7e4 100644
--- a/demo/testing-suite/artifacts/example.json
+++ b/demo/testing-suite/artifacts/example.json
@@ -40,7 +40,7 @@
   },
   "compiler": {
     "name": "cashc",
-    "version": "0.9.2"
+    "version": "0.10.0"
   },
-  "updatedAt": "2023-11-27T10:26:49.646Z"
+  "updatedAt": "2023-11-27T16:35:30.467Z"
 }
\ No newline at end of file
diff --git a/packages/cashscript/src/LibauthTemplate.ts b/packages/cashscript/src/LibauthTemplate.ts
index 4738d0fe..1644efda 100644
--- a/packages/cashscript/src/LibauthTemplate.ts
+++ b/packages/cashscript/src/LibauthTemplate.ts
@@ -1,5 +1,5 @@
 import {
-  AbiFunction, Artifact, PrimitiveType, bytecodeToScript, decodeBool, decodeInt, decodeString, formatLibauthScript,
+  AbiFunction, Artifact, Op, PrimitiveType, bytecodeToScript, decodeBool, decodeInt, decodeString, formatLibauthScript,
 } from '@cashscript/utils';
 import {
   hash160,
@@ -23,6 +23,7 @@ import {
   AuthenticationProgramCommon,
   AuthenticationVirtualMachine,
   ResolvedTransactionCommon,
+  AuthenticationErrorCommon,
 } from '@bitauth/libauth';
 import { deflate } from 'pako';
 import { Contract } from './Contract.js';
@@ -37,6 +38,7 @@ import {
 import { Argument, encodeArgument as csEncodeArgument } from './Argument.js';
 import SignatureTemplate from './SignatureTemplate.js';
 import { Transaction } from './Transaction.js';
+import { toRegExp } from './utils.js';
 
 // all bitauth variables must be in snake case
 const snakeCase = (str: string): string => (
@@ -580,6 +582,34 @@ ${lastState.error}`;
       throw `Error in evaluating input index ${lastState.program.inputIndex}.
 ${lastState.error}`;
     }
+  } else {
+    // one last pass of verifications not covered by the above debugging
+    // checks for removed final verify
+    const evaluationResult = vm.verify(program);
+
+    if (typeof evaluationResult === 'string' && toRegExp([
+      AuthenticationErrorCommon.requiresCleanStack,
+      AuthenticationErrorCommon.nonEmptyControlStack,
+      AuthenticationErrorCommon.unsuccessfulEvaluation,
+    ]).test(evaluationResult)) {
+      const lastMessage = artifact.debug?.requireMessages.sort((a, b) => b.ip - a.ip)[0];
+      if (!lastMessage) {
+        // eslint-disable-next-line
+        throw evaluationResult;
+      }
+
+      const instructionsLeft = lastState.instructions.slice(lastMessage.ip);
+      if (instructionsLeft.length === 0
+          || instructionsLeft.every(instruction => [Op.OP_NIP, Op.OP_ENDIF].includes(instruction.opcode))
+      ) {
+        // eslint-disable-next-line
+        throw `${artifact.contractName}.cash:${lastMessage.line} Error in evaluating input index ${lastState.program.inputIndex} with the following message: ${lastMessage.message}.
+${evaluationResult.replace(/Error in evaluating input index \d: /, '')}`;
+      }
+
+      // eslint-disable-next-line
+      throw evaluationResult;
+    }
   }
 
   return debugResult;
diff --git a/packages/cashscript/test/JestExtensions.ts b/packages/cashscript/test/JestExtensions.ts
index 94437951..76e0185b 100644
--- a/packages/cashscript/test/JestExtensions.ts
+++ b/packages/cashscript/test/JestExtensions.ts
@@ -25,7 +25,9 @@ expect.extend({
 
     // silence actual stdout output
     spyOnLoggerError.mockImplementation(() => {});
-    await transaction.debug();
+    try {
+      await transaction.debug();
+    } catch {}
     let message: string = '';
 
     const failMessage = (received: string, expected: RegExp | string) => () => `${matcherHint(
diff --git a/packages/cashscript/test/LibauthTemplate.test.ts b/packages/cashscript/test/LibauthTemplate.test.ts
index a933d53a..19ad5986 100644
--- a/packages/cashscript/test/LibauthTemplate.test.ts
+++ b/packages/cashscript/test/LibauthTemplate.test.ts
@@ -9,7 +9,7 @@ import { randomUtxo } from '../src/utils.js';
 describe('Libauth template generation tests', () => {
   it('should log console statements', async () => {
     const code = `
-    pragma cashscript ^0.9.0;
+    pragma cashscript ^0.10.0;
 
     contract TransferWithTimeout(
         pubkey sender,
@@ -74,7 +74,7 @@ describe('Libauth template generation tests', () => {
 
   it('should check for failed requires', async () => {
     const code = `
-    pragma cashscript ^0.9.0;
+    pragma cashscript ^0.10.0;
 
     contract TransferWithTimeout(
         pubkey sender,
@@ -96,6 +96,10 @@ describe('Libauth template generation tests', () => {
             require(tx.time >= timeout, "timecheck custom fail");
             require(checkSig(senderSig, sender));
         }
+
+        function test(int a) {
+          require(a == 1, "dropped last verify fail");
+        }
     }
     `;
 
@@ -125,5 +129,13 @@ describe('Libauth template generation tests', () => {
       const transaction = contract.functions.transfer(new SignatureTemplate(bobPriv)).to(contract.address, 1000n);
       await expect(transaction).not.toFailRequireWith(/timecheck custom fail/);
     }
+
+    {
+      const contract = new Contract(artifact, [alicePub, bobPub, 2000000n], { provider });
+      provider.addUtxo(contract.address, randomUtxo());
+
+      const transaction = contract.functions.test(0n).to(contract.address, 1000n);
+      await expect(transaction).toFailRequireWith(/dropped last verify fail/);
+    }
   });
 });

From 72c5816899587f6762ee84e6a28b2be53576b0f2 Mon Sep 17 00:00:00 2001
From: mainnet-pat <mainnet_pat@protonmail.com>
Date: Wed, 29 Nov 2023 11:41:40 +0000
Subject: [PATCH 035/171] Add logging of the stack contents upon debug
 evaluation error

---
 packages/cashscript/src/LibauthTemplate.ts       | 9 ++++++---
 packages/cashscript/test/LibauthTemplate.test.ts | 2 ++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/packages/cashscript/src/LibauthTemplate.ts b/packages/cashscript/src/LibauthTemplate.ts
index 1644efda..91c0db27 100644
--- a/packages/cashscript/src/LibauthTemplate.ts
+++ b/packages/cashscript/src/LibauthTemplate.ts
@@ -592,10 +592,13 @@ ${lastState.error}`;
       AuthenticationErrorCommon.nonEmptyControlStack,
       AuthenticationErrorCommon.unsuccessfulEvaluation,
     ]).test(evaluationResult)) {
+      const stackContents = lastState.stack.map(item => `0x${binToHex(item)}`).join(", ");
+      const stackContentsMessage = `\nStack contents after evaluation: ${lastState.stack.length ? stackContents : "empty"}`;
+
       const lastMessage = artifact.debug?.requireMessages.sort((a, b) => b.ip - a.ip)[0];
       if (!lastMessage) {
         // eslint-disable-next-line
-        throw evaluationResult;
+        throw evaluationResult + stackContentsMessage;
       }
 
       const instructionsLeft = lastState.instructions.slice(lastMessage.ip);
@@ -604,11 +607,11 @@ ${lastState.error}`;
       ) {
         // eslint-disable-next-line
         throw `${artifact.contractName}.cash:${lastMessage.line} Error in evaluating input index ${lastState.program.inputIndex} with the following message: ${lastMessage.message}.
-${evaluationResult.replace(/Error in evaluating input index \d: /, '')}`;
+${evaluationResult.replace(/Error in evaluating input index \d: /, '')}` + stackContentsMessage;
       }
 
       // eslint-disable-next-line
-      throw evaluationResult;
+      throw evaluationResult + stackContentsMessage;
     }
   }
 
diff --git a/packages/cashscript/test/LibauthTemplate.test.ts b/packages/cashscript/test/LibauthTemplate.test.ts
index 19ad5986..9eb9cd8f 100644
--- a/packages/cashscript/test/LibauthTemplate.test.ts
+++ b/packages/cashscript/test/LibauthTemplate.test.ts
@@ -136,6 +136,8 @@ describe('Libauth template generation tests', () => {
 
       const transaction = contract.functions.test(0n).to(contract.address, 1000n);
       await expect(transaction).toFailRequireWith(/dropped last verify fail/);
+
+      await expect(transaction.send()).rejects.toThrow(/Stack contents after evaluation: 0x/);
     }
   });
 });

From ad876fcff886db5864e6ecfeed55e5d6ec92ee14 Mon Sep 17 00:00:00 2001
From: mainnet-pat <mainnet_pat@protonmail.com>
Date: Wed, 29 Nov 2023 11:44:24 +0000
Subject: [PATCH 036/171] Lint

---
 packages/cashscript/src/LibauthTemplate.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/cashscript/src/LibauthTemplate.ts b/packages/cashscript/src/LibauthTemplate.ts
index 91c0db27..bc6e1d27 100644
--- a/packages/cashscript/src/LibauthTemplate.ts
+++ b/packages/cashscript/src/LibauthTemplate.ts
@@ -592,8 +592,8 @@ ${lastState.error}`;
       AuthenticationErrorCommon.nonEmptyControlStack,
       AuthenticationErrorCommon.unsuccessfulEvaluation,
     ]).test(evaluationResult)) {
-      const stackContents = lastState.stack.map(item => `0x${binToHex(item)}`).join(", ");
-      const stackContentsMessage = `\nStack contents after evaluation: ${lastState.stack.length ? stackContents : "empty"}`;
+      const stackContents = lastState.stack.map(item => `0x${binToHex(item)}`).join(', ');
+      const stackContentsMessage = `\nStack contents after evaluation: ${lastState.stack.length ? stackContents : 'empty'}`;
 
       const lastMessage = artifact.debug?.requireMessages.sort((a, b) => b.ip - a.ip)[0];
       if (!lastMessage) {

From d86735d63caf0a192e5272d7ee922b65c3526148 Mon Sep 17 00:00:00 2001
From: mainnet-pat <mainnet_pat@protonmail.com>
Date: Thu, 7 Dec 2023 06:58:04 +0000
Subject: [PATCH 037/171] Expose some private fields to be public to avoid
 casting to any Refactor buildTemplate to not use contract, includeSource and
 manglePrivateKeys

---
 packages/cashscript/src/LibauthTemplate.ts   | 61 +++++---------------
 packages/cashscript/src/SignatureTemplate.ts |  2 +-
 packages/cashscript/src/Transaction.ts       | 19 ++----
 3 files changed, 22 insertions(+), 60 deletions(-)

diff --git a/packages/cashscript/src/LibauthTemplate.ts b/packages/cashscript/src/LibauthTemplate.ts
index bc6e1d27..317ec946 100644
--- a/packages/cashscript/src/LibauthTemplate.ts
+++ b/packages/cashscript/src/LibauthTemplate.ts
@@ -86,24 +86,13 @@ export const stringify = (any: any, spaces?: number): string => JSON.stringify(
 const zip = (a: any[], b: any[]): any[] => Array.from(Array(Math.max(b.length, a.length)), (_, i) => [a[i], b[i]]);
 
 export const buildTemplate = async ({
-  contract,
   transaction,
-  transactionHex = undefined,
-  manglePrivateKeys,
-  includeSource = false,
+  transactionHex = undefined, // set this argument to prevent unnecessary call `transaction.build()`
 }: {
-  contract: Contract;
   transaction: Transaction;
   transactionHex?: string;
-  manglePrivateKeys?: boolean;
-  includeSource?: boolean;
 }): Promise<AuthenticationTemplate> => {
-  if (manglePrivateKeys === undefined && contract.provider.network !== Network.REGTEST) {
-    manglePrivateKeys = true;
-  } else {
-    manglePrivateKeys = false;
-  }
-
+  const contract = transaction.contract;
   const txHex = transactionHex ?? await transaction.build();
 
   const libauthTransaction = decodeTransaction(hexToBin(txHex));
@@ -116,18 +105,16 @@ export const buildTemplate = async ({
     .reverse();
   const contractParameters = contract.constructorArgs.slice().reverse();
 
-  const abiFunction = (transaction as any).abiFunction as AbiFunction;
+  const abiFunction = transaction.abiFunction;
   const funcName = abiFunction.name;
   const functionIndex = contract.artifact.abi.findIndex(
     (func) => func.name === funcName,
   )!;
   const func: AbiFunction = contract.artifact.abi[functionIndex];
   const functionInputs = func.inputs.slice().reverse();
-  const args = ((transaction as any).args as (Uint8Array | SignatureTemplate)[])
-    .slice()
-    .reverse();
+  const args = transaction.args.slice().reverse();
 
-  const hasSignatureTemplates = ((transaction as any).inputs as Utxo[]).filter(
+  const hasSignatureTemplates = transaction.inputs.filter(
     (input) => isUtxoP2PKH(input),
   ).length;
 
@@ -146,9 +133,7 @@ export const buildTemplate = async ({
 
   return {
     $schema: 'https://ide.bitauth.com/authentication-template-v0.schema.json',
-    description: `Imported from cashscript${
-      includeSource ? contract.artifact.source : ''
-    }`,
+    description: `Imported from cashscript`,
     name: contract.artifact.contractName,
     entities: {
       parameters: {
@@ -240,12 +225,7 @@ export const buildTemplate = async ({
                 .filter(([input]) => input.type === PrimitiveType.SIG)
                 .map(([input, arg]) => ({
                   [snakeCase(input.name)]: binToHex(
-                    manglePrivateKeys
-                      ? (arg as SignatureTemplate)
-                        .getPublicKey()
-                        .slice(0, 32)
-                        .slice(0, 32)
-                      : (arg as SignatureTemplate | any).privateKey,
+                    (arg as SignatureTemplate).privateKey,
                   ),
                 })),
             ]),
@@ -255,7 +235,7 @@ export const buildTemplate = async ({
           const result = {} as AuthenticationTemplateScenario['transaction'];
           let inputSlotInserted = false;
           result!.inputs = val!.inputs!.map((input, index) => {
-            const csInput = (transaction as any).inputs[index] as Utxo;
+            const csInput = transaction.inputs[index] as Utxo;
             const signable = isUtxoP2PKH(csInput);
             let unlockingBytecode = {};
             if (signable) {
@@ -265,12 +245,7 @@ export const buildTemplate = async ({
                   keys: {
                     privateKeys: {
                       placeholder_key: binToHex(
-                        manglePrivateKeys
-                          ? (csInput as UtxoP2PKH).template
-                            .getPublicKey()
-                            .slice(0, 32)
-                          : ((csInput as UtxoP2PKH).template as any)
-                            .privateKey,
+                          (csInput as UtxoP2PKH).template.privateKey,
                       ),
                     },
                   },
@@ -298,7 +273,7 @@ export const buildTemplate = async ({
 
           result!.outputs = val?.outputs?.map(
             (output: LibauthOutput, index) => {
-              const csOutput = (transaction as any).outputs[index] as Output;
+              const csOutput = transaction.outputs[index];
               let { lockingBytecode }: any = output;
               if (typeof csOutput.to === 'string') {
                 if (
@@ -309,7 +284,7 @@ export const buildTemplate = async ({
                 ) {
                   lockingBytecode = {};
                 } else {
-                  for (const csInput of (transaction as any).inputs as Utxo[]) {
+                  for (const csInput of transaction.inputs) {
                     if (isUtxoP2PKH(csInput)) {
                       const inputPkh = hash160(csInput.template.getPublicKey());
                       if (
@@ -322,11 +297,7 @@ export const buildTemplate = async ({
                             keys: {
                               privateKeys: {
                                 placeholder_key: binToHex(
-                                  manglePrivateKeys
-                                    ? csInput.template
-                                      .getPublicKey()
-                                      .slice(0, 32)
-                                    : (csInput.template as any).privateKey,
+                                  csInput.template.privateKey,
                                 ),
                               },
                             },
@@ -352,12 +323,12 @@ export const buildTemplate = async ({
         })[0] as AuthenticationTemplateScenario['transaction'],
         sourceOutputs: [transaction].map((val: Transaction) => {
           let inputSlotInserted = false;
-          return ((val as any).inputs as Utxo[]).map(
+          return val.inputs.map(
             (_, index) => {
               const result = {} as
               | AuthenticationTemplateScenarioSourceOutput
               | any;
-              const csInput = (transaction as any).inputs[index] as Utxo;
+              const csInput = transaction.inputs[index] as Utxo;
               const signable = isUtxoP2PKH(csInput);
               let unlockingBytecode = {};
               if (signable) {
@@ -367,9 +338,7 @@ export const buildTemplate = async ({
                     keys: {
                       privateKeys: {
                         placeholder_key: binToHex(
-                          manglePrivateKeys
-                            ? csInput.template.getPublicKey().slice(0, 32)
-                            : (csInput.template as any).privateKey,
+                          csInput.template.privateKey,
                         ),
                       },
                     },
diff --git a/packages/cashscript/src/SignatureTemplate.ts b/packages/cashscript/src/SignatureTemplate.ts
index d5c9eec7..9879bde8 100644
--- a/packages/cashscript/src/SignatureTemplate.ts
+++ b/packages/cashscript/src/SignatureTemplate.ts
@@ -9,7 +9,7 @@ import {
 import { createSighashPreimage, publicKeyToP2PKHLockingBytecode } from './utils.js';
 
 export default class SignatureTemplate {
-  private privateKey: Uint8Array;
+  public privateKey: Uint8Array;
 
   constructor(
     signer: Keypair | Uint8Array | string,
diff --git a/packages/cashscript/src/Transaction.ts b/packages/cashscript/src/Transaction.ts
index 0a04ad8f..749dbfe2 100644
--- a/packages/cashscript/src/Transaction.ts
+++ b/packages/cashscript/src/Transaction.ts
@@ -46,8 +46,8 @@ import {
 } from './LibauthTemplate.js';
 
 export class Transaction {
-  private inputs: Utxo[] = [];
-  private outputs: Output[] = [];
+  public inputs: Utxo[] = [];
+  public outputs: Output[] = [];
 
   private sequence = 0xfffffffe;
   private locktime: number;
@@ -57,10 +57,10 @@ export class Transaction {
   private tokenChange: boolean = true;
 
   constructor(
-    private contract: Contract,
+    public contract: Contract,
     private unlocker: Unlocker,
-    private abiFunction: AbiFunction,
-    private args: (Uint8Array | SignatureTemplate)[],
+    public abiFunction: AbiFunction,
+    public args: (Uint8Array | SignatureTemplate)[],
     private selector?: number,
   ) {}
 
@@ -178,10 +178,8 @@ export class Transaction {
     try {
       if (this.contract.provider instanceof MockNetworkProvider) {
         template = await buildTemplate({
-          contract: this.contract,
           transaction: this,
           transactionHex: tx,
-          manglePrivateKeys: false,
         });
         evaluateTemplate(template);
       }
@@ -191,9 +189,8 @@ export class Transaction {
     } catch (maybeNodeError: any) {
       if (!template) {
         template = await buildTemplate({
-          contract: this.contract,
           transaction: this,
-          manglePrivateKeys: false,
+          transactionHex: tx,
         });
       }
 
@@ -220,18 +217,14 @@ export class Transaction {
   // method to debug the transaction with libauth VM, throws upon evaluation error
   async debug(): Promise<DebugResult> {
     const template = await buildTemplate({
-      contract: this.contract,
       transaction: this,
-      manglePrivateKeys: false,
     });
     return debugTemplate(template, this.contract.artifact);
   }
 
   async bitauthUri(): Promise<string> {
     const template = await buildTemplate({
-      contract: this.contract,
       transaction: this,
-      manglePrivateKeys: false,
     });
     return getBitauthUri(template);
   }

From 64082fbfb6ce1bf3f4deed1c9b9605eee227cdb7 Mon Sep 17 00:00:00 2001
From: mainnet-pat <mainnet_pat@protonmail.com>
Date: Thu, 7 Dec 2023 07:19:06 +0000
Subject: [PATCH 038/171] Minor refactor of template generation, propagate
 p2sh20 or p2sh32 to the template

---
 packages/cashscript/src/Contract.ts        |  2 +-
 packages/cashscript/src/LibauthTemplate.ts | 74 +++++++++++-----------
 2 files changed, 39 insertions(+), 37 deletions(-)

diff --git a/packages/cashscript/src/Contract.ts b/packages/cashscript/src/Contract.ts
index 56311bc7..3e2e3355 100644
--- a/packages/cashscript/src/Contract.ts
+++ b/packages/cashscript/src/Contract.ts
@@ -35,7 +35,7 @@ export class Contract {
 
   redeemScript: Script;
   public provider: NetworkProvider;
-  private addressType: 'p2sh20' | 'p2sh32';
+  public addressType: 'p2sh20' | 'p2sh32';
 
   constructor(
     public artifact: Artifact,
diff --git a/packages/cashscript/src/LibauthTemplate.ts b/packages/cashscript/src/LibauthTemplate.ts
index 317ec946..f75f5820 100644
--- a/packages/cashscript/src/LibauthTemplate.ts
+++ b/packages/cashscript/src/LibauthTemplate.ts
@@ -121,7 +121,7 @@ export const buildTemplate = async ({
   const formattedBytecode = contract.artifact.debug
     ? formatLibauthScript(
       bytecodeToScript(hexToBin(contract.artifact.debug.bytecode)),
-      contract.artifact.debug?.sourceMap!,
+      contract.artifact.debug.sourceMap,
       contract.artifact.source,
     ).split('\n')
     : contract.artifact.bytecode.split(' ').map((asmElement) => {
@@ -131,10 +131,15 @@ export const buildTemplate = async ({
       return asmElement;
     });
 
-  return {
+  const template = {
     $schema: 'https://ide.bitauth.com/authentication-template-v0.schema.json',
     description: `Imported from cashscript`,
     name: contract.artifact.contractName,
+    supported: ['BCH_SPEC'],
+    version: 0,
+  } as AuthenticationTemplate;
+
+  return {...template,
     entities: {
       parameters: {
         description: 'Contract creation and function parameters',
@@ -147,17 +152,13 @@ export const buildTemplate = async ({
             : []),
         ],
         variables: merge([
-          ...(hasSignatureTemplates
-            ? [
-              {
-                placeholder_key: {
-                  description: 'placeholder_key',
-                  name: 'placeholder_key',
-                  type: 'Key',
-                },
-              },
-            ]
-            : []),
+          ...functionInputs.map((input) => ({
+            [snakeCase(input.name)]: {
+              description: `"${input.name}" parameter of function "${func.name}"`,
+              name: input.name,
+              type: input.type === PrimitiveType.SIG ? 'Key' : 'WalletData',
+            },
+          })),
           {
             function_index: {
               description: 'Script function index to execute',
@@ -172,13 +173,17 @@ export const buildTemplate = async ({
               type: 'WalletData',
             },
           })),
-          ...functionInputs.map((input) => ({
-            [snakeCase(input.name)]: {
-              description: `"${input.name}" parameter of function "${func.name}"`,
-              name: input.name,
-              type: input.type === PrimitiveType.SIG ? 'Key' : 'WalletData',
-            },
-          })),
+          ...(hasSignatureTemplates
+            ? [
+              {
+                placeholder_key: {
+                  description: 'placeholder_key',
+                  name: 'placeholder_key',
+                  type: 'Key',
+                },
+              },
+            ]
+            : []),
         ]),
       },
     },
@@ -213,6 +218,13 @@ export const buildTemplate = async ({
           currentBlockTime: Math.round(+new Date() / 1000),
           keys: {
             privateKeys: merge([
+              ...zip(functionInputs, args)
+                .filter(([input]) => input.type === PrimitiveType.SIG)
+                .map(([input, arg]) => ({
+                  [snakeCase(input.name)]: binToHex(
+                    (arg as SignatureTemplate).privateKey,
+                  ),
+                })),
               ...(hasSignatureTemplates
                 ? [
                   {
@@ -221,20 +233,13 @@ export const buildTemplate = async ({
                   },
                 ]
                 : []),
-              ...zip(functionInputs, args)
-                .filter(([input]) => input.type === PrimitiveType.SIG)
-                .map(([input, arg]) => ({
-                  [snakeCase(input.name)]: binToHex(
-                    (arg as SignatureTemplate).privateKey,
-                  ),
-                })),
             ]),
           },
         },
         transaction: [libauthTransaction].map((val: TransactionBCH) => {
-          const result = {} as AuthenticationTemplateScenario['transaction'];
+          const result = ({} as AuthenticationTemplateScenario['transaction'])!;
           let inputSlotInserted = false;
-          result!.inputs = val!.inputs!.map((input, index) => {
+          result.inputs = val.inputs.map((input, index) => {
             const csInput = transaction.inputs[index] as Utxo;
             const signable = isUtxoP2PKH(csInput);
             let unlockingBytecode = {};
@@ -269,9 +274,9 @@ export const buildTemplate = async ({
               unlockingBytecode,
             } as AuthenticationTemplateScenarioInput;
           });
-          result!.locktime = val?.locktime;
+          result.locktime = val.locktime;
 
-          result!.outputs = val?.outputs?.map(
+          result.outputs = val.outputs.map(
             (output: LibauthOutput, index) => {
               const csOutput = transaction.outputs[index];
               let { lockingBytecode }: any = output;
@@ -318,7 +323,7 @@ export const buildTemplate = async ({
               } as AuthenticationTemplateScenarioTransactionOutput;
             },
           );
-          result!.version = libauthTransaction.version;
+          result.version = val.version;
           return result;
         })[0] as AuthenticationTemplateScenario['transaction'],
         sourceOutputs: [transaction].map((val: Transaction) => {
@@ -381,7 +386,6 @@ export const buildTemplate = async ({
               }>`))
             : ['// none']),
           '',
-
           ...(contract.artifact.abi.length > 1
             ? [
               '// function index in contract',
@@ -393,7 +397,7 @@ export const buildTemplate = async ({
         unlocks: 'lock',
       },
       lock: {
-        lockingType: 'p2sh20',
+        lockingType: transaction.contract.addressType,
         name: 'lock',
         script: [
           `// "${contract.artifact.contractName}" contract constructor parameters`,
@@ -430,8 +434,6 @@ export const buildTemplate = async ({
         }
         : {}),
     },
-    supported: ['BCH_SPEC'],
-    version: 0,
   } as AuthenticationTemplate;
 };
 

From ccb71822a6ae066d312223d6bd01e59e0ba5bc9f Mon Sep 17 00:00:00 2001
From: mainnet-pat <mainnet_pat@protonmail.com>
Date: Thu, 7 Dec 2023 09:17:50 +0000
Subject: [PATCH 039/171] Finish refactor and documentation

---
 packages/cashscript/src/LibauthTemplate.ts | 607 +++++++++++----------
 packages/cashscript/src/Transaction.ts     |   8 +-
 2 files changed, 322 insertions(+), 293 deletions(-)

diff --git a/packages/cashscript/src/LibauthTemplate.ts b/packages/cashscript/src/LibauthTemplate.ts
index f75f5820..159d4fa6 100644
--- a/packages/cashscript/src/LibauthTemplate.ts
+++ b/packages/cashscript/src/LibauthTemplate.ts
@@ -4,10 +4,8 @@ import {
 import {
   hash160,
   hexToBin,
-  AuthenticationTemplateScenarioBytecode,
   AuthenticationTemplateScenarioTransactionOutput,
   AuthenticationTemplateScenario,
-  AuthenticationTemplateScenarioSourceOutput,
   decodeTransaction,
   binToHex,
   AuthenticationTemplate,
@@ -24,14 +22,12 @@ import {
   AuthenticationVirtualMachine,
   ResolvedTransactionCommon,
   AuthenticationErrorCommon,
+  AuthenticationTemplateScenarioOutput,
 } from '@bitauth/libauth';
 import { deflate } from 'pako';
-import { Contract } from './Contract.js';
 import {
   UtxoP2PKH,
   LibauthOutput,
-  Output,
-  Network,
   Utxo,
   isUtxoP2PKH,
 } from '../src/interfaces.js';
@@ -85,6 +81,153 @@ export const stringify = (any: any, spaces?: number): string => JSON.stringify(
 
 const zip = (a: any[], b: any[]): any[] => Array.from(Array(Math.max(b.length, a.length)), (_, i) => [a[i], b[i]]);
 
+const createScenarioTransaction = (libauthTransaction: TransactionBCH, csTransaction: Transaction) => {
+  const contract = csTransaction.contract;
+  const result = ({} as AuthenticationTemplateScenario['transaction'])!;
+
+  // only one 'slot' is allowed, otherwise {} must be used
+  let inputSlotInserted = false;
+  result.inputs = libauthTransaction.inputs.map((input, index) => {
+    const csInput = csTransaction.inputs[index] as Utxo;
+    const signable = isUtxoP2PKH(csInput);
+    let unlockingBytecode = {};
+    if (signable) {
+      unlockingBytecode = {
+        script: 'p2pkh_placeholder_unlock',
+        overrides: {
+          keys: {
+            privateKeys: {
+              placeholder_key: binToHex(
+                  (csInput as UtxoP2PKH).template.privateKey,
+              ),
+            },
+          },
+        },
+      };
+    } else {
+      // assume it is our contract's input
+      // eslint-disable-next-line
+      if (!inputSlotInserted) {
+        unlockingBytecode = ['slot'];
+        inputSlotInserted = true;
+      }
+    }
+    return {
+      outpointIndex: input.outpointIndex,
+      outpointTransactionHash:
+        input.outpointTransactionHash instanceof Uint8Array
+          ? binToHex(input.outpointTransactionHash)
+          : input.outpointTransactionHash,
+      sequenceNumber: input.sequenceNumber,
+      unlockingBytecode,
+    } as AuthenticationTemplateScenarioInput;
+  });
+  result.locktime = libauthTransaction.locktime;
+
+  result.outputs = libauthTransaction.outputs.map(
+    (output: LibauthOutput, index) => {
+      const csOutput = csTransaction.outputs[index];
+      let { lockingBytecode }: any = output;
+      if (typeof csOutput.to === 'string') {
+        if (
+          [
+            contract.address,
+            contract.tokenAddress,
+          ].includes(csOutput.to)
+        ) {
+          lockingBytecode = {};
+        } else {
+          for (const csInput of csTransaction.inputs) {
+            if (isUtxoP2PKH(csInput)) {
+              const inputPkh = hash160(csInput.template.getPublicKey());
+              if (
+                binToHex(output.lockingBytecode).slice(6, 46)
+                === binToHex(inputPkh)
+              ) {
+                lockingBytecode = {
+                  script: 'p2pkh_placeholder_lock',
+                  overrides: {
+                    keys: {
+                      privateKeys: {
+                        placeholder_key: binToHex(
+                          csInput.template.privateKey,
+                        ),
+                      },
+                    },
+                  },
+                };
+              }
+            }
+          }
+        }
+      }
+      return {
+        lockingBytecode:
+          lockingBytecode instanceof Uint8Array
+            ? binToHex(lockingBytecode)
+            : lockingBytecode,
+        token: output.token,
+        valueSatoshis: Number(output.valueSatoshis),
+      } as AuthenticationTemplateScenarioTransactionOutput;
+    },
+  );
+  result.version = libauthTransaction.version;
+  return result;
+}
+
+const createScenarioSourceOutputs = (csTransaction: Transaction) => {
+    // only one 'slot' is allowed, otherwise {} must be used
+  let inputSlotInserted = false;
+  return csTransaction.inputs.map(
+    (csInput) => {
+      const signable = isUtxoP2PKH(csInput);
+      let lockingBytecode = {} as AuthenticationTemplateScenarioOutput<true>["lockingBytecode"];
+      if (signable) {
+        lockingBytecode = {
+          script: 'p2pkh_placeholder_lock',
+          overrides: {
+            keys: {
+              privateKeys: {
+                placeholder_key: binToHex(
+                  csInput.template.privateKey,
+                ),
+              },
+            },
+          },
+        };
+      } else {
+        // assume it is our contract's input
+        // eslint-disable-next-line
+        if (!inputSlotInserted) {
+          lockingBytecode = ['slot'];
+          inputSlotInserted = true;
+        }
+      }
+
+      const result = {
+        lockingBytecode: lockingBytecode,
+        valueSatoshis: Number(csInput.satoshis),
+      } as AuthenticationTemplateScenarioOutput<true>;
+
+      if (csInput.token) {
+        result.token = {
+          amount: csInput.token.amount.toString(),
+          category: csInput.token.category,
+        }
+
+        if (csInput.token.nft) {
+          result.token.nft = {
+            capability: csInput.token.nft.capability,
+            commitment: csInput.token.nft.commitment
+          }
+        }
+      }
+
+      return result;
+    },
+  );
+}
+
 export const buildTemplate = async ({
   transaction,
   transactionHex = undefined, // set this argument to prevent unnecessary call `transaction.build()`
@@ -139,302 +282,188 @@ export const buildTemplate = async ({
     version: 0,
   } as AuthenticationTemplate;
 
-  return {...template,
-    entities: {
-      parameters: {
-        description: 'Contract creation and function parameters',
-        name: 'parameters',
-        scripts: [
-          'lock',
-          'unlock_lock',
-          ...(hasSignatureTemplates
-            ? ['p2pkh_placeholder_lock', 'p2pkh_placeholder_unlock']
-            : []),
-        ],
-        variables: merge([
-          ...functionInputs.map((input) => ({
-            [snakeCase(input.name)]: {
-              description: `"${input.name}" parameter of function "${func.name}"`,
-              name: input.name,
-              type: input.type === PrimitiveType.SIG ? 'Key' : 'WalletData',
-            },
-          })),
-          {
-            function_index: {
-              description: 'Script function index to execute',
-              name: 'function_index',
-              type: 'WalletData',
-            },
+  // declaration of template variables and their types
+  template.entities = {
+    parameters: {
+      description: 'Contract creation and function parameters',
+      name: 'parameters',
+      scripts: [
+        'lock',
+        'unlock_lock',
+      ],
+      variables: merge([
+        ...functionInputs.map((input) => ({
+          [snakeCase(input.name)]: {
+            description: `"${input.name}" parameter of function "${func.name}"`,
+            name: input.name,
+            type: input.type === PrimitiveType.SIG ? 'Key' : 'WalletData',
           },
-          ...constructorInputs.map((input) => ({
-            [snakeCase(input.name)]: {
-              description: `"${input.name}" parameter of this contract`,
-              name: input.name,
-              type: 'WalletData',
-            },
-          })),
-          ...(hasSignatureTemplates
-            ? [
-              {
-                placeholder_key: {
-                  description: 'placeholder_key',
-                  name: 'placeholder_key',
-                  type: 'Key',
-                },
-              },
-            ]
-            : []),
-        ]),
+        })),
+        {
+          function_index: {
+            description: 'Script function index to execute',
+            name: 'function_index',
+            type: 'WalletData',
+          },
+        },
+        ...constructorInputs.map((input) => ({
+          [snakeCase(input.name)]: {
+            description: `"${input.name}" parameter of this contract`,
+            name: input.name,
+            type: 'WalletData',
+          },
+        })),
+      ]),
+    }
+  };
+
+  // add extra variables for the p2pkh utxos spent together with our contract
+  if (hasSignatureTemplates) {
+    template.entities.parameters.scripts!.push('p2pkh_placeholder_lock', 'p2pkh_placeholder_unlock');
+    template.entities.parameters.variables = {
+      ...template.entities.parameters.variables,
+      placeholder_key: {
+        description: 'placeholder_key',
+        name: 'placeholder_key',
+        type: 'Key',
       },
-    },
-    scenarios: {
-      evaluate_function: {
-        data: {
-          bytecode: merge([
-            ...zip(functionInputs, args)
-              .filter(([input]) => input.type !== PrimitiveType.SIG)
-              .map(([input, arg]) => {
-                const hex = binToHex(arg as Uint8Array);
-                const result = hex.length ? `0x${hex}` : hex;
-                return {
-                  [snakeCase(input.name)]: result,
-                };
-              }),
-            { function_index: functionIndex.toString() },
-            ...constructorInputs.map((input, index) => {
-              const hex = binToHex(
-                encodeArgument(
-                  contractParameters[index],
-                  constructorInputs[index].type,
-                ) as Uint8Array,
-              );
+    }
+  }
+
+  template.scenarios = {
+    // single scenario to spend out transaction under test given the CashScript parameters provided
+    evaluate_function: {
+      name: 'Evaluate',
+      description: 'An example evaluation where this script execution passes.',
+      data: {
+        // encode values for the variables defined above in `entities` property
+        bytecode: merge([
+          ...zip(functionInputs, args)
+            .filter(([input]) => input.type !== PrimitiveType.SIG)
+            .map(([input, arg]) => {
+              const hex = binToHex(arg as Uint8Array);
               const result = hex.length ? `0x${hex}` : hex;
               return {
                 [snakeCase(input.name)]: result,
               };
             }),
+          { function_index: functionIndex.toString() },
+          ...constructorInputs.map((input, index) => {
+            const hex = binToHex(
+              encodeArgument(
+                contractParameters[index],
+                constructorInputs[index].type,
+              ) as Uint8Array,
+            );
+            const result = hex.length ? `0x${hex}` : hex;
+            return {
+              [snakeCase(input.name)]: result,
+            };
+          }),
+        ]),
+        currentBlockHeight: 2,
+        currentBlockTime: Math.round(+new Date() / 1000),
+        keys: {
+          privateKeys: merge([
+            ...zip(functionInputs, args)
+              .filter(([input]) => input.type === PrimitiveType.SIG)
+              .map(([input, arg]) => ({
+                [snakeCase(input.name)]: binToHex(
+                  (arg as SignatureTemplate).privateKey,
+                ),
+              })),
+            ...(hasSignatureTemplates
+              ? [
+                {
+                  // placeholder will be replaced by a key for each respective P2PKH input spent
+                  placeholder_key:
+                      '<Uint8Array: 0x0000000000000000000000000000000000000000000000000000000000000000>',
+                },
+              ]
+              : []),
           ]),
-          currentBlockHeight: 2,
-          currentBlockTime: Math.round(+new Date() / 1000),
-          keys: {
-            privateKeys: merge([
-              ...zip(functionInputs, args)
-                .filter(([input]) => input.type === PrimitiveType.SIG)
-                .map(([input, arg]) => ({
-                  [snakeCase(input.name)]: binToHex(
-                    (arg as SignatureTemplate).privateKey,
-                  ),
-                })),
-              ...(hasSignatureTemplates
-                ? [
-                  {
-                    placeholder_key:
-                        '<Uint8Array: 0x0000000000000000000000000000000000000000000000000000000000000000>',
-                  },
-                ]
-                : []),
-            ]),
-          },
         },
-        transaction: [libauthTransaction].map((val: TransactionBCH) => {
-          const result = ({} as AuthenticationTemplateScenario['transaction'])!;
-          let inputSlotInserted = false;
-          result.inputs = val.inputs.map((input, index) => {
-            const csInput = transaction.inputs[index] as Utxo;
-            const signable = isUtxoP2PKH(csInput);
-            let unlockingBytecode = {};
-            if (signable) {
-              unlockingBytecode = {
-                script: 'p2pkh_placeholder_unlock',
-                overrides: {
-                  keys: {
-                    privateKeys: {
-                      placeholder_key: binToHex(
-                          (csInput as UtxoP2PKH).template.privateKey,
-                      ),
-                    },
-                  },
-                },
-              };
-            } else {
-              // assume it is our contract's input
-              // eslint-disable-next-line
-              if (!inputSlotInserted) {
-                unlockingBytecode = ['slot'];
-                inputSlotInserted = true;
-              }
-            }
-            return {
-              outpointIndex: input.outpointIndex,
-              outpointTransactionHash:
-                input.outpointTransactionHash instanceof Uint8Array
-                  ? binToHex(input.outpointTransactionHash)
-                  : input.outpointTransactionHash,
-              sequenceNumber: input.sequenceNumber,
-              unlockingBytecode,
-            } as AuthenticationTemplateScenarioInput;
-          });
-          result.locktime = val.locktime;
-
-          result.outputs = val.outputs.map(
-            (output: LibauthOutput, index) => {
-              const csOutput = transaction.outputs[index];
-              let { lockingBytecode }: any = output;
-              if (typeof csOutput.to === 'string') {
-                if (
-                  [
-                    contract.address,
-                    contract.tokenAddress,
-                  ].includes(csOutput.to)
-                ) {
-                  lockingBytecode = {};
-                } else {
-                  for (const csInput of transaction.inputs) {
-                    if (isUtxoP2PKH(csInput)) {
-                      const inputPkh = hash160(csInput.template.getPublicKey());
-                      if (
-                        binToHex(output.lockingBytecode).slice(6, 46)
-                        === binToHex(inputPkh)
-                      ) {
-                        lockingBytecode = {
-                          script: 'p2pkh_placeholder_lock',
-                          overrides: {
-                            keys: {
-                              privateKeys: {
-                                placeholder_key: binToHex(
-                                  csInput.template.privateKey,
-                                ),
-                              },
-                            },
-                          },
-                        };
-                      }
-                    }
-                  }
-                }
-              }
-              return {
-                lockingBytecode:
-                  lockingBytecode instanceof Uint8Array
-                    ? binToHex(lockingBytecode)
-                    : lockingBytecode,
-                token: output.token,
-                valueSatoshis: Number(output.valueSatoshis),
-              } as AuthenticationTemplateScenarioTransactionOutput;
-            },
-          );
-          result.version = val.version;
-          return result;
-        })[0] as AuthenticationTemplateScenario['transaction'],
-        sourceOutputs: [transaction].map((val: Transaction) => {
-          let inputSlotInserted = false;
-          return val.inputs.map(
-            (_, index) => {
-              const result = {} as
-              | AuthenticationTemplateScenarioSourceOutput
-              | any;
-              const csInput = transaction.inputs[index] as Utxo;
-              const signable = isUtxoP2PKH(csInput);
-              let unlockingBytecode = {};
-              if (signable) {
-                unlockingBytecode = {
-                  script: 'p2pkh_placeholder_lock',
-                  overrides: {
-                    keys: {
-                      privateKeys: {
-                        placeholder_key: binToHex(
-                          csInput.template.privateKey,
-                        ),
-                      },
-                    },
-                  },
-                } as AuthenticationTemplateScenarioBytecode;
-              } else {
-                // assume it is our contract's input
-                // eslint-disable-next-line
-                if (!inputSlotInserted) {
-                  unlockingBytecode = ['slot'];
-                  inputSlotInserted = true;
-                }
-              }
-
-              result.lockingBytecode = unlockingBytecode;
-              result.valueSatoshis = Number(csInput.satoshis);
-              result.token = csInput.token;
-              return result;
-            },
-          );
-        })[0],
-        description:
-          'An example evaluation where this script execution passes.',
-        name: 'Evaluate',
       },
+      transaction: createScenarioTransaction(libauthTransaction, transaction),
+      sourceOutputs: createScenarioSourceOutputs(transaction),
     },
-    scripts: {
-      unlock_lock: {
-        passes: ['evaluate_function'],
-        name: 'unlock',
-        script: [
-          `// "${func.name}" function parameters`,
-          ...(functionInputs.length
-            ? zip(functionInputs, args).map(([input, arg]) => (input.type === PrimitiveType.SIG
-              ? `<${snakeCase(
-                input.name,
-              )}.schnorr_signature.all_outputs> // ${input.type}`
-              : `<${snakeCase(input.name)}> // ${input.type} = <${
-                `0x${binToHex(arg)}`
-              }>`))
-            : ['// none']),
-          '',
-          ...(contract.artifact.abi.length > 1
-            ? [
-              '// function index in contract',
-              `<function_index> // int = <${functionIndex.toString()}>`,
-              '',
-            ]
-            : []),
-        ].join('\n'),
-        unlocks: 'lock',
-      },
-      lock: {
-        lockingType: transaction.contract.addressType,
-        name: 'lock',
-        script: [
-          `// "${contract.artifact.contractName}" contract constructor parameters`,
-          ...(constructorInputs.length
-            ? constructorInputs.map((input, index) => {
-              const encoded = encodeArgument(
-                contractParameters[index],
-                constructorInputs[index].type,
-              ) as Uint8Array;
-              return `<${snakeCase(input.name)}> // ${
-                input.type === 'bytes' ? `bytes${encoded.length}` : input.type
-              } = <${`0x${binToHex(encoded)}`}>`;
-            })
-            : ['// none']),
-          '',
-          '// bytecode',
-          ...formattedBytecode,
-        ].join('\n'),
-      },
-      ...(hasSignatureTemplates
-        ? {
-          p2pkh_placeholder_unlock: {
-            name: 'p2pkh_placeholder_unlock',
-            script:
-                '<placeholder_key.schnorr_signature.all_outputs>\n<placeholder_key.public_key>',
-            unlocks: 'p2pkh_placeholder_lock',
-          },
-          p2pkh_placeholder_lock: {
-            lockingType: 'standard',
-            name: 'p2pkh_placeholder_lock',
-            script:
-                'OP_DUP\nOP_HASH160 <$(<placeholder_key.public_key> OP_HASH160\n)> OP_EQUALVERIFY\nOP_CHECKSIG',
-          },
-        }
-        : {}),
+  };
+
+  // definition of locking scripts and unlocking scripts with their respective bytecode
+  template.scripts = {
+    unlock_lock: {
+      // this unlocking script must pass our only scenario
+      passes: ['evaluate_function'],
+      name: 'unlock',
+      // unlocking script contains the CashScript function parameters and function selector
+      // we output these values as pushdata, comment will contain the type and the value of the variable
+      // example: '<timeout> // int = <0xa08601>'
+      script: [
+        `// "${func.name}" function parameters`,
+        ...(functionInputs.length
+          ? zip(functionInputs, args).map(([input, arg]) => (input.type === PrimitiveType.SIG
+            ? `<${snakeCase(
+              input.name,
+            )}.schnorr_signature.all_outputs> // ${input.type}`
+            : `<${snakeCase(input.name)}> // ${input.type} = <${
+              `0x${binToHex(arg)}`
+            }>`))
+          : ['// none']),
+        '',
+        ...(contract.artifact.abi.length > 1
+          ? [
+            '// function index in contract',
+            `<function_index> // int = <${functionIndex.toString()}>`,
+            '',
+          ]
+          : []),
+      ].join('\n'),
+      unlocks: 'lock',
     },
-  } as AuthenticationTemplate;
+    lock: {
+      lockingType: "p2sh20", //transaction.contract.addressType,
+      name: 'lock',
+      // locking script contains the CashScript contract parameters followed by the contract opcodes
+      // we output these values as pushdata, comment will contain the type and the value of the variable
+      // example: '<timeout> // int = <0xa08601>'
+      script: [
+        `// "${contract.artifact.contractName}" contract constructor parameters`,
+        ...(constructorInputs.length
+          ? constructorInputs.map((input, index) => {
+            const encoded = encodeArgument(
+              contractParameters[index],
+              constructorInputs[index].type,
+            ) as Uint8Array;
+            return `<${snakeCase(input.name)}> // ${
+              input.type === 'bytes' ? `bytes${encoded.length}` : input.type
+            } = <${`0x${binToHex(encoded)}`}>`;
+          })
+          : ['// none']),
+        '',
+        '// bytecode',
+        ...formattedBytecode,
+      ].join('\n'),
+    },
+  };
+
+  // add extra unlocking and locking script for P2PKH inputs spent alongside our contract
+  // this is needed for correct cross-referrences in the template
+  if (hasSignatureTemplates) {
+    template.scripts.p2pkh_placeholder_unlock = {
+      name: 'p2pkh_placeholder_unlock',
+      script:
+          '<placeholder_key.schnorr_signature.all_outputs>\n<placeholder_key.public_key>',
+      unlocks: 'p2pkh_placeholder_lock',
+    };
+    template.scripts.p2pkh_placeholder_lock = {
+      lockingType: 'standard',
+      name: 'p2pkh_placeholder_lock',
+      script:
+          'OP_DUP\nOP_HASH160 <$(<placeholder_key.public_key> OP_HASH160\n)> OP_EQUALVERIFY\nOP_CHECKSIG',
+    };
+  }
+
+  return template;
 };
 
 export const getBitauthUri = (template: AuthenticationTemplate): string => {
diff --git a/packages/cashscript/src/Transaction.ts b/packages/cashscript/src/Transaction.ts
index 749dbfe2..62b69b61 100644
--- a/packages/cashscript/src/Transaction.ts
+++ b/packages/cashscript/src/Transaction.ts
@@ -196,21 +196,21 @@ export class Transaction {
 
       const reason = maybeNodeError.error ?? maybeNodeError.message ?? maybeNodeError;
 
-      const biatuthUri = getBitauthUri(template);
+      const bitauthUri = getBitauthUri(template);
 
       try {
         debugTemplate(template, this.contract.artifact);
       } catch (libauthError: any) {
         if (this.contract.provider instanceof MockNetworkProvider) {
-          throw buildError(libauthError, biatuthUri);
+          throw buildError(libauthError, bitauthUri);
         } else {
           const message = `${libauthError}\n\nUnderlying node error: ${reason}`;
-          throw buildError(message, biatuthUri);
+          throw buildError(message, bitauthUri);
         }
       }
 
       // this must be unreachable
-      throw buildError(reason, biatuthUri);
+      throw buildError(reason, bitauthUri);
     }
   }
 

From 66aaaf94fbff6726b770bcdd5d01b495d028d96d Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Wed, 13 Dec 2023 11:29:26 +0100
Subject: [PATCH 040/171] Move demo/testing-suite to examples/testing-suite

---
 {demo => examples}/testing-suite/artifacts/example.json | 0
 {demo => examples}/testing-suite/contracts/example.cash | 0
 {demo => examples}/testing-suite/jest.config.js         | 0
 {demo => examples}/testing-suite/jest.setup.js          | 0
 {demo => examples}/testing-suite/package.json           | 0
 {demo => examples}/testing-suite/src/index.ts           | 0
 {demo => examples}/testing-suite/tasks/index.ts         | 0
 {demo => examples}/testing-suite/test/example.test.ts   | 0
 {demo => examples}/testing-suite/tsconfig.build.json    | 0
 {demo => examples}/testing-suite/tsconfig.json          | 0
 {demo => examples}/testing-suite/tsconfig.test.json     | 0
 {demo => examples}/testing-suite/yarn.lock              | 0
 website/docs/releases/release-notes.md                  | 2 +-
 website/docs/sdk/debugging.md                           | 2 +-
 14 files changed, 2 insertions(+), 2 deletions(-)
 rename {demo => examples}/testing-suite/artifacts/example.json (100%)
 rename {demo => examples}/testing-suite/contracts/example.cash (100%)
 rename {demo => examples}/testing-suite/jest.config.js (100%)
 rename {demo => examples}/testing-suite/jest.setup.js (100%)
 rename {demo => examples}/testing-suite/package.json (100%)
 rename {demo => examples}/testing-suite/src/index.ts (100%)
 rename {demo => examples}/testing-suite/tasks/index.ts (100%)
 rename {demo => examples}/testing-suite/test/example.test.ts (100%)
 rename {demo => examples}/testing-suite/tsconfig.build.json (100%)
 rename {demo => examples}/testing-suite/tsconfig.json (100%)
 rename {demo => examples}/testing-suite/tsconfig.test.json (100%)
 rename {demo => examples}/testing-suite/yarn.lock (100%)

diff --git a/demo/testing-suite/artifacts/example.json b/examples/testing-suite/artifacts/example.json
similarity index 100%
rename from demo/testing-suite/artifacts/example.json
rename to examples/testing-suite/artifacts/example.json
diff --git a/demo/testing-suite/contracts/example.cash b/examples/testing-suite/contracts/example.cash
similarity index 100%
rename from demo/testing-suite/contracts/example.cash
rename to examples/testing-suite/contracts/example.cash
diff --git a/demo/testing-suite/jest.config.js b/examples/testing-suite/jest.config.js
similarity index 100%
rename from demo/testing-suite/jest.config.js
rename to examples/testing-suite/jest.config.js
diff --git a/demo/testing-suite/jest.setup.js b/examples/testing-suite/jest.setup.js
similarity index 100%
rename from demo/testing-suite/jest.setup.js
rename to examples/testing-suite/jest.setup.js
diff --git a/demo/testing-suite/package.json b/examples/testing-suite/package.json
similarity index 100%
rename from demo/testing-suite/package.json
rename to examples/testing-suite/package.json
diff --git a/demo/testing-suite/src/index.ts b/examples/testing-suite/src/index.ts
similarity index 100%
rename from demo/testing-suite/src/index.ts
rename to examples/testing-suite/src/index.ts
diff --git a/demo/testing-suite/tasks/index.ts b/examples/testing-suite/tasks/index.ts
similarity index 100%
rename from demo/testing-suite/tasks/index.ts
rename to examples/testing-suite/tasks/index.ts
diff --git a/demo/testing-suite/test/example.test.ts b/examples/testing-suite/test/example.test.ts
similarity index 100%
rename from demo/testing-suite/test/example.test.ts
rename to examples/testing-suite/test/example.test.ts
diff --git a/demo/testing-suite/tsconfig.build.json b/examples/testing-suite/tsconfig.build.json
similarity index 100%
rename from demo/testing-suite/tsconfig.build.json
rename to examples/testing-suite/tsconfig.build.json
diff --git a/demo/testing-suite/tsconfig.json b/examples/testing-suite/tsconfig.json
similarity index 100%
rename from demo/testing-suite/tsconfig.json
rename to examples/testing-suite/tsconfig.json
diff --git a/demo/testing-suite/tsconfig.test.json b/examples/testing-suite/tsconfig.test.json
similarity index 100%
rename from demo/testing-suite/tsconfig.test.json
rename to examples/testing-suite/tsconfig.test.json
diff --git a/demo/testing-suite/yarn.lock b/examples/testing-suite/yarn.lock
similarity index 100%
rename from demo/testing-suite/yarn.lock
rename to examples/testing-suite/yarn.lock
diff --git a/website/docs/releases/release-notes.md b/website/docs/releases/release-notes.md
index 9a3043e7..afdc5d04 100644
--- a/website/docs/releases/release-notes.md
+++ b/website/docs/releases/release-notes.md
@@ -28,7 +28,7 @@ title: Release Notes
 #### Demo
 
 - A new demo toolkit was added for everyone to bootstrap the contract creation and
-  debugging environment similar to `hardat` on Ethereum. See `demo/testing-suite` path.
+  debugging environment similar to `hardat` on Ethereum. See `examples/testing-suite` path.
 
 ## v0.9.2
 
diff --git a/website/docs/sdk/debugging.md b/website/docs/sdk/debugging.md
index 27610cc1..8fb82e8a 100644
--- a/website/docs/sdk/debugging.md
+++ b/website/docs/sdk/debugging.md
@@ -4,7 +4,7 @@ title: Debug tools
 
 To speed up the contract development and ensure the contract quality and security, CashScript takes advantage of deep integration with libauth. It allows for local transacaction evaluation, without actual interaction with BitcoinCash network of nodes.
 
-For a quick start, all beginners should check out the demo toolkit allowing to bootstrap the contract creation and debugging environment similar to `hardat` on Ethereum. See [`demo/testing-suite`](https://github.com/CashScript/cashscript/tree/master/demo/testing-suite) project path.
+For a quick start, all beginners should check out the demo toolkit allowing to bootstrap the contract creation and debugging environment similar to `hardat` on Ethereum. See [`examples/testing-suite`](https://github.com/CashScript/cashscript/tree/master/examples/testing-suite) project path.
 
 ### MockNetworkProvider
 

From 4549058ab8f381095ed849ad3b7f28f634838557 Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Wed, 13 Dec 2023 11:53:22 +0100
Subject: [PATCH 041/171] Update docs for debugging tools

---
 website/docs/language/contracts.md     | 15 +++++-
 website/docs/language/grammar.md       | 27 ++++++++--
 website/docs/releases/release-notes.md | 33 +++++--------
 website/docs/sdk/debugging.md          | 68 +++++++++++++++-----------
 website/docs/sdk/instantiation.md      |  7 +++
 website/docs/sdk/transactions.md       | 12 +++++
 website/sidebars.js                    |  2 +-
 7 files changed, 108 insertions(+), 56 deletions(-)

diff --git a/website/docs/language/contracts.md b/website/docs/language/contracts.md
index a3888337..3e31a86d 100644
--- a/website/docs/language/contracts.md
+++ b/website/docs/language/contracts.md
@@ -61,13 +61,19 @@ CashScript functions are made up of a collection of statements that determine wh
 ### require()
 The most important statement of CashScript contracts is the `require` statement. This statement takes a boolean expression and checks that it evaluates to `true`. If it evaluates to `false` instead, the transaction fails. This statement is used to ensure that the requirements are met to spend money from the contract.
 
+The `require` statement can also take an optional error message as a second argument. This can be used to provide more information about why the transaction failed when running the transaction in debug mode. You can read more about debugging in the [debugging guide](/docs/sdk/debugging).
+
+:::note
+The error message in a `require` statement is only available in debug evaluation of a transaction, so the error message has no impact on the compiled bytecode or regular (non-debug) execution.
+:::
+
 #### Example
 ```solidity
 pragma cashscript ^0.9.0;
 
 contract P2PKH(bytes20 pkh) {
     function spend(pubkey pk, sig s) {
-        require(hash160(pk) == pkh);
+        require(hash160(pk) == pkh, "Public Key does not match");
         require(checkSig(s, pk));
     }
 }
@@ -123,6 +129,13 @@ contract OneOfTwo(bytes20 pkh1, bytes32 hash1, bytes20 pkh2, bytes32 hash2) {
 }
 ```
 
+### console.log()
+The `console.log` statement can be used to log values during debug evaluation of a transaction. Any variables or primitive values (such as ints, strings, bytes, etc) can be logged. You can read more about debugging in the [debugging guide](/docs/sdk/debugging).
+
+:::note
+Logging is only available in debug evaluation of a transaction, but has no impact on the compiled bytecode or regular (non-debug) execution.
+:::
+
 ## Comments
 Comments can be added anywhere in the contract file. Comment semantics are similar to languages like JavaScript or C. This means that single-line comments can be added with `// ...`, while multiline comments can be added with `/* ... */`.
 
diff --git a/website/docs/language/grammar.md b/website/docs/language/grammar.md
index 37b64b02..04743e05 100644
--- a/website/docs/language/grammar.md
+++ b/website/docs/language/grammar.md
@@ -58,10 +58,11 @@ statement
     | timeOpStatement
     | requireStatement
     | ifStatement
+    | consoleStatement
     ;
 
 variableDefinition
-    : typeName modifier? Identifier '=' expression ';'
+    : typeName modifier* Identifier '=' expression ';'
     ;
 
 tupleAssignment
@@ -73,17 +74,33 @@ assignStatement
     ;
 
 timeOpStatement
-    : 'require' '(' TxVar '>=' expression ')' ';'
+    : 'require' '(' TxVar '>=' expression (',' StringLiteral)? ')' ';'
     ;
 
 requireStatement
-    : 'require' '(' expression ')' ';'
+    : 'require' '(' expression (',' StringLiteral)? ')' ';'
     ;
 
 ifStatement
     : 'if' '(' expression ')' ifBlock=block ('else' elseBlock=block)?
     ;
 
+consoleStatement
+    : 'console.log' consoleParameterList ';'
+    ;
+
+consoleParameter
+    : Identifier
+    | StringLiteral
+    | NumberLiteral
+    | HexLiteral
+    | BooleanLiteral
+    ;
+
+consoleParameterList
+    : '(' (consoleParameter (',' consoleParameter)* ','?)? ')'
+    ;
+
 functionCall
     : Identifier expressionList // Only built-in functions are accepted
     ;
@@ -98,8 +115,8 @@ expression
     | functionCall # FunctionCallExpression
     | 'new' Identifier expressionList #Instantiation
     | expression '[' index=NumberLiteral ']' # TupleIndexOp
-    | scope='tx.outputs' '[' expression ']' op=('.value' | '.lockingBytecode') # UnaryIntrospectionOp
-    | scope='tx.inputs' '[' expression ']' op=('.value' | '.lockingBytecode' | '.outpointTransactionHash' | '.outpointIndex' | '.unlockingBytecode' | '.sequenceNumber') # UnaryIntrospectionOp
+    | scope='tx.outputs' '[' expression ']' op=('.value' | '.lockingBytecode' | '.tokenCategory' | '.nftCommitment' | '.tokenAmount') # UnaryIntrospectionOp
+    | scope='tx.inputs' '[' expression ']' op=('.value' | '.lockingBytecode' | '.outpointTransactionHash' | '.outpointIndex' | '.unlockingBytecode' | '.sequenceNumber' | '.tokenCategory' | '.nftCommitment' | '.tokenAmount') # UnaryIntrospectionOp
     | expression op=('.reverse()' | '.length') # UnaryOp
     | left=expression op='.split' '(' right=expression ')' # BinaryOp
     | op=('!' | '-') expression # UnaryOp
diff --git a/website/docs/releases/release-notes.md b/website/docs/releases/release-notes.md
index afdc5d04..b86bf81c 100644
--- a/website/docs/releases/release-notes.md
+++ b/website/docs/releases/release-notes.md
@@ -5,30 +5,21 @@ title: Release Notes
 ## v0.10.0
 
 #### cashc compiler
-- compiler code was extended to understand:
-  * `console.log()` statements, debug only
-  * extended require syntax `require(expression, message)`, debug only
-- compiler now outputs the debug information into artifact:
-  * log messages
-  * failed require messages
-  * unoptimized contract bytecode for debugging
-  * sourcemap to map emitted VM instructions to CashScript source code
-
+- :sparkles: Add `console.log()` statements for debugging.
+- :sparkles: Extend `require()` statements to allow custom error messages for debugging.
+- :hammer_and_wrench: Update artifact format to allow for new debugging features.
 
 #### CashScript SDK
+- :sparkles: Add `MockNetworkProvider` to simulate network interaction for debugging and testing.
+- :sparkles: Add support for transaction evaluation and debugging using libauth templates.
+- :sparkles: Add extended Jest utilities specifically crafted for CashScript:
+  * `await expect(transaction).toLog(message)`
+  * `await expect(transaction).toFailRequireWith(message)`
+- :sparkles: Output BitAuth IDE URI for debugging when transaction is rejected.
 
-- Add MockNetworkProvider to simulate network interaction
-- Add libauth template creation
-- Add support for transaction evaluation and debugging using libauth templates
-- Add extended Jest utilities specifically crafted for CashScript:
-  * await expect(transaction).toLog(message)
-  * await expect(transaction).toFailRequireWith(message)
-- Meep tool got replaced with libauth template debug evaluation
-
-#### Demo
+We also added a new example project with a full testing suite to demonstrate the new debugging features under `examples/testing-suite`.
 
-- A new demo toolkit was added for everyone to bootstrap the contract creation and
-  debugging environment similar to `hardat` on Ethereum. See `examples/testing-suite` path.
+Thanks [mainnet_pat](https://twitter.com/mainnet_pat) for the contributions!
 
 ## v0.9.2
 
@@ -38,7 +29,7 @@ title: Release Notes
 - :bug: Fix off-by-one fee calculation error with transactions that have many outputs.
 - :bug: Fix bug where no error was thrown when invalid NFT commitment or token category were provided.
 - :hammer_and_wrench: Export all interfaces from CashScript's `interfaces.ts`.
-- :hammer_and_wrench: Merge duplicate code between Transaction.ts and TransactionBuilder.ts
+- :hammer_and_wrench: Merge duplicate code between Transaction.ts and TransactionBuilder.ts.
 
 ## v0.9.1
 
diff --git a/website/docs/sdk/debugging.md b/website/docs/sdk/debugging.md
index 8fb82e8a..9c009e37 100644
--- a/website/docs/sdk/debugging.md
+++ b/website/docs/sdk/debugging.md
@@ -1,17 +1,19 @@
 ---
-title: Debug tools
+title: Debugging & Testing
 ---
 
-To speed up the contract development and ensure the contract quality and security, CashScript takes advantage of deep integration with libauth. It allows for local transacaction evaluation, without actual interaction with BitcoinCash network of nodes.
+To speed up contract development and ensure contract quality and security, CashScript takes advantage of deep integration with libauth. This allows for local transaction evaluation without actual interaction with the Bitcoin Cash network. For a quick start, you can check out [our testing-suite example]((https://github.com/CashScript/cashscript/tree/master/examples/testing-suite)) that demonstrates a full development and testing environment for CashScript contracts, similar to Hardhat on Ethereum.
 
-For a quick start, all beginners should check out the demo toolkit allowing to bootstrap the contract creation and debugging environment similar to `hardat` on Ethereum. See [`examples/testing-suite`](https://github.com/CashScript/cashscript/tree/master/examples/testing-suite) project path.
+:::caution
+The CashScript debugging tools only work with the [Simple Transaction Builder](/docs/sdk/transactions). We plan to extend the debugging tools to work with the [Advanced Transaction Builder](/docs/sdk/transactions-advanced) in the future.
+:::
 
-### MockNetworkProvider
+## MockNetworkProvider
 
-`MockNetworkProvider` allows to set up the testing environment for the contract under test. It allows the developer to add inputs with well-defined parameters of an `Utxo` class, or randomized set of properties.
+The `MockNetworkProvider` is a special network provider that allows you to evaluate transactions locally without interacting with the Bitcoin Cash network. This is useful when writing automated tests for your contracts, or when debugging your contract locally. By default, it generates some random mock UTXOs for the contract address, but you can also add your own UTXOs to the provider.
 
 ```ts
-import { MockNetworkProvider, randomUtxo } from 'cashscript/dist/src';
+import { MockNetworkProvider, randomUtxo, randomToken, randomNFT } from 'cashscript';
 
 const provider = new MockNetworkProvider();
 provider.addUtxo(contract.address, { vout: 0, txid: "ab...", satoshis: 10000n });
@@ -22,55 +24,65 @@ provider.addUtxo(aliceAddress, randomUtxo({
 }));
 ```
 
-Note, that `MockNetworkProvider` does not evaluate the transactions, but blindly accept them to later report them back upon a user query. It does not "consume" the utxos upon transaction acceptance, developers should control utxo set themselves to ensure the proper behaviour.
+:::note
+The `MockNetworkProvider` only evaluates the transactions locally, so any UTXOs added to a transaction still count as "unspent", even after mocking a `sendTransaction` using the provider.
+:::
 
-### Transaction class extensions
+## Transaction evaluation
 
-If a CashScript transaction is being built and sent with `MockNetworkProvider` it will be evaluated with libauth and if it fails the evaluation the debug information about the failure reasons will be presented to the developer.
+If a CashScript transaction is sent using any network provider and is rejected by the network (or the `MockNetworkProvider`), the transaction will be evaluated locally using libauth to provide failure reasons and debug information in addition to the failure reason communicated by the network.
 
-If it is sent with any other provider such as `ElectrumNetworkProvider` and the remote will reject failing transaction, the transaction will be evaluated in debug mode with libauth and information about the failure reasons will be presented to the developer.
+It is possible to export the transaction for step-by-step debugging in the BitAuth IDE. This will allow you to inspect the transaction in detail, and see exactly why the transaction failed. To do so, you can call the `bitauthUri()` function on the transaction. This will return a URI that can be opened in the BitAuth IDE. This URI is also displayed in the console whenever a transaction fails.
 
-If you wish to take advantage of the BitAuth IDE to debug your failing transaction in a visual way you can use `await transaction.bitauthUri()` helper function.
+```ts
+const transaction = contract.functions.exampleFunction(0n).to(contract.address, 10000n);
+const uri = await transaction.bitauthUri();
+```
 
 :::caution
 It is unsafe to debug transactions on mainnet as private keys will be exposed to BitAuth IDE and transmitted over the network.
 :::
 
-### Jest testing extensions
+## Automated testing
 
-Taking advantage of local transaction evaluation and debug source maps, it is possible to record some contract metadata such as `console.log` statements or debug messages attached to failing `require` statemets:
+With local transaction evaluation and debugging, it is possible to write efficient automated tests for CashScript contracts and test specific contract behaviour and check `console.log` values and `require` error messages.
 
-#### console.log
+### Logging values
 
-`console.log` is a special CashScript statement which allows to output some valuable information hinting at contract behaviour. Any primitive data type literals can be logged, such as integers, bools, strings, hex literals, byte types, including sigs, pubkeys, etc. In addition it supports logging the variable values.
+You can log values during debug evaluation using the `console.log` statement. Any variables or primitive values (such as ints, strings, bytes, etc) can be logged.
 
-:::tip
-Logging is only available in debug evaluation of a transaction, it has no effect in production.
+:::note
+Logging is only available in debug evaluation of a transaction, but has no impact on the compiled bytecode or regular (non-debug) execution.
 :::
 
-#### require
+### Error messages
 
-`require` syntax got extended with optional debug messages which will appear upon debug evaluation of the transaction, when this require statement fails.
+The `require` statement accepts an optional error message as a second argument. If the condition in the require statement is not met during debug evaluation, the error message is returned. This allows you to write automated tests that check for specific error messages.
 
-:::tip
-`require` with custom error message is only available in debug evaluation of a transaction, it has no effect in production.
+:::note
+Similar to `console.log`, the error message in a `require` statement is only available in debug evaluation of a transaction, so the error message has no impact on the compiled bytecode or regular (non-debug) execution.
 :::
 
+### Jest extension
+
+To make writing automated tests for CashScript contracts easier, we provide a Jest extension that enables easy testing of `console.log` values and `require` error messages. To use the extension, you can import it from `cashscript/dist/test/JestExtensions`.
+
+:::tip
+If you're using a different testing framework, you can test for `console.log` values by spying on the console output, and test for `require` error messages by asserting that an error is thrown with a specific error message.
+:::
 
 ### Example
 
-Example contract:
-```solidity
+```solidity title="Example contract"
 contract Example() {
-  function test(int value) {
+  function exampleFunction(int value) {
     console.log(value, "test");
     require(value == 1, "Wrong value passed");
   }
 }
 ```
 
-Example contract debug evaluation:
-```ts
+```ts title="Example test file"
 import artifact from '../artifacts/example.json' assert { type: "json" };
 import { Contract, MockNetworkProvider, randomUtxo } from 'cashscript';
 import 'cashscript/dist/test/JestExtensions';
@@ -79,10 +91,10 @@ const provider = new MockNetworkProvider();
 const contract = new Contract(artifact, [], { provider });
 provider.addUtxo(contract.address, randomUtxo());
 
-let transaction = contract.functions.test(0n).to(contract.address, 10000n);
+let transaction = contract.functions.exampleFunction(0n).to(contract.address, 10000n);
 await (expect(transaction)).toLog(/0 test/);
 await (expect(transaction)).toFailRequireWith(/Wrong value passed/);
 
-transaction = contract.functions.test(1n).to(contract.address, 10000n);
+transaction = contract.functions.exampleFunction(1n).to(contract.address, 10000n);
 await expect(transaction.send()).resolves.not.toThrow();
 ```
diff --git a/website/docs/sdk/instantiation.md b/website/docs/sdk/instantiation.md
index 496955dd..0f7dfe0c 100644
--- a/website/docs/sdk/instantiation.md
+++ b/website/docs/sdk/instantiation.md
@@ -245,6 +245,13 @@ The BitcoinRpcNetworkProvider does not currently support CashTokens. If you want
 const provider = new BitcoinRpcNetworkProvider('mainnet', 'http://localhost:8332');
 ```
 
+### MockNetworkProvider
+```ts
+new MockNetworkProvider()
+```
+
+The `MockNetworkProvider` is a special network provider that allows you to evaluate transactions locally without interacting with the Bitcoin Cash network. This is useful when writing automated tests for your contracts, or when debugging your contract locally. You can read more about the `MockNetworkProvider` and debugging in the [debugging guide](/docs/sdk/debugging).
+
 ### Custom NetworkProviders
 A big strength of the NetworkProvider setup is that it allows you to implement custom providers. So if new BCH libraries are created in the future, it is simple to use them with CashScript. This also potentially enables the CashScript SDK to be used with other (partially) compatible networks, such as BTC or BSV.
 
diff --git a/website/docs/sdk/transactions.md b/website/docs/sdk/transactions.md
index b97112d0..43d36c52 100644
--- a/website/docs/sdk/transactions.md
+++ b/website/docs/sdk/transactions.md
@@ -242,6 +242,18 @@ const txHex = await instance.functions
   .build()
 ```
 
+### debug() & bitauthUri()
+
+If you want to debug a transaction locally instead of sending it to the network, you can call the `debug()` function on the transaction. This will return intermediate values and the final result of the transaction. It will also show any logged values and `require` error messages.
+
+If you prefer a lower-level debugging experience, you can call the `bitauthUri()` function on the transaction. This will return a URI that can be opened in the BitAuth IDE. This URI is also displayed in the console whenever a transaction fails.
+
+You can read more about debugging transactions [here](/docs/sdk/debugging).
+
+:::caution
+It is unsafe to debug transactions on mainnet as private keys will be exposed to BitAuth IDE and transmitted over the network.
+:::
+
 ## Transaction errors
 Transactions can fail for a number of reasons. Most of these are related to the execution of the smart contract (e.g. wrong parameters or a bug in the contract code). But errors can also occur because of other reasons (e.g. a fee that's too low or the same transaction already exists in the mempool). To facilitate error handling in your applications, the CashScript SDK provides an enum of different *reasons* for a failure.
 
diff --git a/website/sidebars.js b/website/sidebars.js
index 86261508..8df02acb 100755
--- a/website/sidebars.js
+++ b/website/sidebars.js
@@ -30,8 +30,8 @@ module.exports = {
         'sdk/instantiation',
         'sdk/transactions',
         'sdk/transactions-advanced',
-        'sdk/examples',
         'sdk/debugging',
+        'sdk/examples',
       ],
     },
     {

From b613b9993eb8765e85a8a987f48e18b31d23ee7c Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Wed, 13 Dec 2023 11:54:43 +0100
Subject: [PATCH 042/171] Change version to include -next tag

---
 examples/package.json            | 6 +++---
 packages/cashc/package.json      | 4 ++--
 packages/cashc/src/index.ts      | 2 +-
 packages/cashscript/package.json | 4 ++--
 packages/utils/package.json      | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/examples/package.json b/examples/package.json
index 0b6948d5..0383e4ac 100644
--- a/examples/package.json
+++ b/examples/package.json
@@ -1,7 +1,7 @@
 {
   "name": "cashscript-examples",
   "private": true,
-  "version": "0.10.0",
+  "version": "0.10.0-next.0",
   "description": "Usage examples of the CashScript SDK",
   "main": "p2pkh.js",
   "type": "module",
@@ -11,8 +11,8 @@
     "@bitauth/libauth": "^2.0.0-alpha.8",
     "@types/node": "^12.7.8",
     "bip39": "^3.0.4",
-    "cashc": "^0.10.0",
-    "cashscript": "^0.10.0",
+    "cashc": "^0.10.0-next.0",
+    "cashscript": "^0.10.0-next.0",
     "typescript": "^4.9.5"
   }
 }
diff --git a/packages/cashc/package.json b/packages/cashc/package.json
index 6d003d88..f6509938 100644
--- a/packages/cashc/package.json
+++ b/packages/cashc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cashc",
-  "version": "0.10.0",
+  "version": "0.10.0-next.0",
   "description": "Compile Bitcoin Cash contracts to Bitcoin Cash Script or artifacts",
   "keywords": [
     "bitcoin",
@@ -50,7 +50,7 @@
   },
   "dependencies": {
     "@bitauth/libauth": "^2.0.0-alpha.8",
-    "@cashscript/utils": "^0.10.0",
+    "@cashscript/utils": "^0.10.0-next.0",
     "antlr4ts": "^0.5.0-alpha.4",
     "commander": "^7.1.0",
     "semver": "^7.3.4"
diff --git a/packages/cashc/src/index.ts b/packages/cashc/src/index.ts
index 72b37416..28b8f48e 100644
--- a/packages/cashc/src/index.ts
+++ b/packages/cashc/src/index.ts
@@ -2,4 +2,4 @@ export * from './Errors.js';
 export * as utils from '@cashscript/utils';
 export { compileFile, compileString } from './compiler.js';
 
-export const version = '0.10.0';
+export const version = '0.10.0-next.0';
diff --git a/packages/cashscript/package.json b/packages/cashscript/package.json
index 80c8ad73..d17f0464 100644
--- a/packages/cashscript/package.json
+++ b/packages/cashscript/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cashscript",
-  "version": "0.10.0",
+  "version": "0.10.0-next.0",
   "description": "Easily write and interact with Bitcoin Cash contracts",
   "keywords": [
     "bitcoin cash",
@@ -44,7 +44,7 @@
   },
   "dependencies": {
     "@bitauth/libauth": "^2.0.0-alpha.8",
-    "@cashscript/utils": "^0.10.0",
+    "@cashscript/utils": "^0.10.0-next.0",
     "bip68": "^1.0.4",
     "bitcoin-rpc-promise-retry": "^1.3.0",
     "delay": "^5.0.0",
diff --git a/packages/utils/package.json b/packages/utils/package.json
index baa2c347..9eb99c0d 100644
--- a/packages/utils/package.json
+++ b/packages/utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cashscript/utils",
-  "version": "0.10.0",
+  "version": "0.10.0-next.0",
   "description": "CashScript utilities and types",
   "keywords": [
     "bitcoin cash",

From 8354f906e2ead2c516f2c4e278f3d27db1ef0e74 Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Wed, 13 Dec 2023 12:04:37 +0100
Subject: [PATCH 043/171] Fix failing tests

---
 packages/cashc/test/ast/Location.test.ts               | 10 ++++++++--
 .../test/compiler/VersionError/out_of_range_1.cash     |  2 +-
 packages/cashc/test/generation/fixtures.ts             |  7 +++++++
 packages/cashc/test/generation/generation.test.ts      |  3 ++-
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/packages/cashc/test/ast/Location.test.ts b/packages/cashc/test/ast/Location.test.ts
index 511eb0f9..17c824f7 100644
--- a/packages/cashc/test/ast/Location.test.ts
+++ b/packages/cashc/test/ast/Location.test.ts
@@ -5,7 +5,7 @@ import { buildOpCodeMap, bytecodeToAsm, bytecodeToScript } from '@cashscript/uti
 import { hexToBin } from '@bitauth/libauth';
 
 describe('Location', () => {
-  it.skip('should retrieve correct text from location', () => {
+  it('should retrieve correct text from location', () => {
     const code = fs.readFileSync(new URL('../valid-contract-files/simple_functions.cash', import.meta.url), { encoding: 'utf-8' });
     const ast = parseCode(code);
 
@@ -45,19 +45,25 @@ contract test() {
       it(`should test ${block}`, () => {
         {
           const source = wrap(block);
+
+          // Compile the source code using regular CashScript compilation
           const artifact = compileString(source);
           const expected = bytecodeToAsm(hexToBin(artifact.debug!.bytecode));
+
+          // Generate the opCodeMap from the source code
           const opCodeMap = buildOpCodeMap(
             bytecodeToScript(hexToBin(artifact.debug!.bytecode)), artifact.debug!.sourceMap,
           );
 
+          // Convert the opCodeMap to CashScript bytecode to make sure that the generated opcode map matches the
+          // bytecode generated by CashScript
           const received = Object.values(opCodeMap).join(' ')
             .replaceAll('<0x', '').replaceAll('>', '').replace(/\s+/g, ' ');
           expect(received).toBe(expected);
         }
 
+        // Repeat the tests with the source code modified to test the position hint functionality
         {
-          // break statements into separate lines, test `hint`
           const source = wrap(block.replaceAll(' ', '\n').replaceAll(')', '\n)'))
             .replaceAll('(\n)', '()').replace(/\((?!\))/g, '(\n');
           const artifact = compileString(source);
diff --git a/packages/cashc/test/compiler/VersionError/out_of_range_1.cash b/packages/cashc/test/compiler/VersionError/out_of_range_1.cash
index fc8ade29..86835e97 100644
--- a/packages/cashc/test/compiler/VersionError/out_of_range_1.cash
+++ b/packages/cashc/test/compiler/VersionError/out_of_range_1.cash
@@ -1,4 +1,4 @@
-pragma cashscript >=0.10.0 <0.11.0;
+pragma cashscript >=0.20.0 <0.21.0;
 
 contract Test() {
     function hello(sig s, pubkey pk) {
diff --git a/packages/cashc/test/generation/fixtures.ts b/packages/cashc/test/generation/fixtures.ts
index 87e6271a..9e52f3d2 100644
--- a/packages/cashc/test/generation/fixtures.ts
+++ b/packages/cashc/test/generation/fixtures.ts
@@ -20,6 +20,13 @@ export const fixtures: Fixture[] = [
         'OP_OVER OP_HASH160 OP_EQUALVERIFY '
         // require(checkSig(s, pk))
         + 'OP_CHECKSIG',
+      // TODO: Add debug info to all fixtures
+      // debug: {
+      //   bytecode: "5179a9517a8769517a517aac",
+      //   logs: [],
+      //   requireMessages: [],
+      //   sourceMap: "3:24:3:26;;:16::27:1;:31::34:0;;:16:::1;:8::36;4:25:4:26:0;;:28::30;;:16::31:1",
+      // },
       source: fs.readFileSync(new URL('../valid-contract-files/p2pkh.cash', import.meta.url), { encoding: 'utf-8' }),
       compiler: {
         name: 'cashc',
diff --git a/packages/cashc/test/generation/generation.test.ts b/packages/cashc/test/generation/generation.test.ts
index f3511186..7d9d0934 100644
--- a/packages/cashc/test/generation/generation.test.ts
+++ b/packages/cashc/test/generation/generation.test.ts
@@ -6,12 +6,13 @@
 import { URL } from 'url';
 import { compileFile } from '../../src/index.js';
 import { fixtures } from './fixtures.js';
+import { stripArtifact } from '../../src/artifact/Artifact.js';
 
 describe('Code generation & target code optimisation', () => {
   fixtures.forEach((fixture) => {
     it(`should compile ${fixture.fn} to correct Script and artifact`, () => {
       const artifact = compileFile(new URL(`../valid-contract-files/${fixture.fn}`, import.meta.url));
-      expect(artifact).toEqual({ ...fixture.artifact, updatedAt: expect.any(String) });
+      expect(stripArtifact(artifact)).toEqual({ ...fixture.artifact, updatedAt: expect.any(String) });
     });
   });
 });

From cbd3e83b2b7de56faebf0c8ee860482e3739f3d5 Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Wed, 13 Dec 2023 12:06:05 +0100
Subject: [PATCH 044/171] Update broken link

---
 website/docs/sdk/debugging.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/docs/sdk/debugging.md b/website/docs/sdk/debugging.md
index 9c009e37..1ed4120a 100644
--- a/website/docs/sdk/debugging.md
+++ b/website/docs/sdk/debugging.md
@@ -2,7 +2,7 @@
 title: Debugging & Testing
 ---
 
-To speed up contract development and ensure contract quality and security, CashScript takes advantage of deep integration with libauth. This allows for local transaction evaluation without actual interaction with the Bitcoin Cash network. For a quick start, you can check out [our testing-suite example]((https://github.com/CashScript/cashscript/tree/master/examples/testing-suite)) that demonstrates a full development and testing environment for CashScript contracts, similar to Hardhat on Ethereum.
+To speed up contract development and ensure contract quality and security, CashScript takes advantage of deep integration with libauth. This allows for local transaction evaluation without actual interaction with the Bitcoin Cash network. For a quick start, you can check out [our testing-suite example]((https://github.com/CashScript/cashscript/tree/next/examples/testing-suite)) that demonstrates a full development and testing environment for CashScript contracts, similar to Hardhat on Ethereum.
 
 :::caution
 The CashScript debugging tools only work with the [Simple Transaction Builder](/docs/sdk/transactions). We plan to extend the debugging tools to work with the [Advanced Transaction Builder](/docs/sdk/transactions-advanced) in the future.

From b77e6dffc9e4466c7ffe0993b08e6af2856a8e4e Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Wed, 13 Dec 2023 12:13:29 +0100
Subject: [PATCH 045/171] Fix broken link again

---
 website/docs/sdk/debugging.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/docs/sdk/debugging.md b/website/docs/sdk/debugging.md
index 1ed4120a..547553d7 100644
--- a/website/docs/sdk/debugging.md
+++ b/website/docs/sdk/debugging.md
@@ -2,7 +2,7 @@
 title: Debugging & Testing
 ---
 
-To speed up contract development and ensure contract quality and security, CashScript takes advantage of deep integration with libauth. This allows for local transaction evaluation without actual interaction with the Bitcoin Cash network. For a quick start, you can check out [our testing-suite example]((https://github.com/CashScript/cashscript/tree/next/examples/testing-suite)) that demonstrates a full development and testing environment for CashScript contracts, similar to Hardhat on Ethereum.
+To speed up contract development and ensure contract quality and security, CashScript takes advantage of deep integration with libauth. This allows for local transaction evaluation without actual interaction with the Bitcoin Cash network. For a quick start, you can check out [our testing-suite example](https://github.com/CashScript/cashscript/tree/next/examples/testing-suite) that demonstrates a full development and testing environment for CashScript contracts, similar to Hardhat on Ethereum.
 
 :::caution
 The CashScript debugging tools only work with the [Simple Transaction Builder](/docs/sdk/transactions). We plan to extend the debugging tools to work with the [Advanced Transaction Builder](/docs/sdk/transactions-advanced) in the future.

From 4033e8fa191f38bbef46e06bc1a6c3af5f654505 Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Wed, 20 Dec 2023 11:22:49 +0100
Subject: [PATCH 046/171] Fix linting

---
 examples/package.json                         |  4 ++
 examples/testing-suite/artifacts/example.json |  4 +-
 examples/testing-suite/tasks/index.ts         | 11 ++--
 examples/testing-suite/test/example.test.ts   | 10 +--
 examples/testing-suite/yarn.lock              | 34 ++++++----
 packages/cashscript/src/LibauthTemplate.ts    | 30 ++++-----
 yarn.lock                                     | 64 +++++++++++++++++++
 7 files changed, 114 insertions(+), 43 deletions(-)

diff --git a/examples/package.json b/examples/package.json
index 0383e4ac..e839702d 100644
--- a/examples/package.json
+++ b/examples/package.json
@@ -7,12 +7,16 @@
   "type": "module",
   "author": "Rosco Kalis <rosco@bitcoin.com>",
   "license": "MIT",
+  "scripts": {
+    "lint": "eslint . --ext .ts --ignore-path ../.eslintignore"
+  },
   "dependencies": {
     "@bitauth/libauth": "^2.0.0-alpha.8",
     "@types/node": "^12.7.8",
     "bip39": "^3.0.4",
     "cashc": "^0.10.0-next.0",
     "cashscript": "^0.10.0-next.0",
+    "eslint": "^8.56.0",
     "typescript": "^4.9.5"
   }
 }
diff --git a/examples/testing-suite/artifacts/example.json b/examples/testing-suite/artifacts/example.json
index 49eda7e4..50b4db3d 100644
--- a/examples/testing-suite/artifacts/example.json
+++ b/examples/testing-suite/artifacts/example.json
@@ -40,7 +40,7 @@
   },
   "compiler": {
     "name": "cashc",
-    "version": "0.10.0"
+    "version": "0.10.0-next.0"
   },
-  "updatedAt": "2023-11-27T16:35:30.467Z"
+  "updatedAt": "2023-12-13T15:04:57.625Z"
 }
\ No newline at end of file
diff --git a/examples/testing-suite/tasks/index.ts b/examples/testing-suite/tasks/index.ts
index 1a31a10e..e04ce9cf 100644
--- a/examples/testing-suite/tasks/index.ts
+++ b/examples/testing-suite/tasks/index.ts
@@ -3,25 +3,24 @@ import fs from 'fs';
 import { URL } from 'url';
 import urlJoin from 'url-join';
 
-
-export const compile = () => {
+export const compile = (): void => {
   const directory = new URL('../contracts', import.meta.url);
   const result = fs.readdirSync(directory)
     .filter((fn) => fn.endsWith('.cash'))
     .map((fn) => ({ fn, contents: fs.readFileSync(new URL(urlJoin(directory.toString(), fn)), { encoding: 'utf-8' }) }));
 
   result.forEach(({ fn, contents }) => {
-  const artifact = compileString(contents);
+    const artifact = compileString(contents);
 
     fs.writeFileSync(new URL(`../artifacts/${fn.replace('.cash', '.json')}`, import.meta.url), JSON.stringify(artifact, null, 2));
   });
-}
+};
 
 switch (process.argv[2]) {
-  case "compile":
+  case 'compile':
     compile();
     break;
   default:
-    console.log("Unknown task");
+    console.log('Unknown task');
     break;
 }
diff --git a/examples/testing-suite/test/example.test.ts b/examples/testing-suite/test/example.test.ts
index a30cbbe2..1ab83f28 100644
--- a/examples/testing-suite/test/example.test.ts
+++ b/examples/testing-suite/test/example.test.ts
@@ -1,9 +1,9 @@
-import artifact from '../artifacts/example.json' assert { type: "json" };
-import { Contract, MockNetworkProvider, randomUtxo } from 'cashscript/dist/src';
-import 'cashscript/dist/test/JestExtensions';
+import artifact from '../artifacts/example.json' assert { type: 'json' };
+import { Contract, MockNetworkProvider, randomUtxo } from 'cashscript';
+import 'cashscript/dist/test/JestExtensions.js';
 
-describe("test example contract functions", () => {
-  it("should check for output logs and error messages", async () => {
+describe('test example contract functions', () => {
+  it('should check for output logs and error messages', async () => {
     const provider = new MockNetworkProvider();
     const contract = new Contract(artifact, [], { provider });
     provider.addUtxo(contract.address, randomUtxo());
diff --git a/examples/testing-suite/yarn.lock b/examples/testing-suite/yarn.lock
index b9a989bd..d43fdd4a 100644
--- a/examples/testing-suite/yarn.lock
+++ b/examples/testing-suite/yarn.lock
@@ -302,10 +302,10 @@
   resolved "https://registry.yarnpkg.com/@bitauth/libauth/-/libauth-2.0.0-alpha.8.tgz#352ade2075517f1548e05553e7bb1c5e1023d1fe"
   integrity sha512-KINAJbzg5pKs+WM8wCjWw6Ct/CeZG1JMrRXsIyPFztjNtwA5eeQL8eFkyquePsf8aZ5peRYK2eFPUDo/1rkg+w==
 
-"@cashscript/utils@^0.9.2":
-  version "0.9.2"
-  resolved "https://registry.yarnpkg.com/@cashscript/utils/-/utils-0.9.2.tgz#9146411902a50f0b7b9a9629d6b57be03ec08c22"
-  integrity sha512-6x8YOg6uVONRB5RfygQtBvtwkbjFAMz2kma5HkC2LUYa3bVdR4hQx3wp0hgXhpdqSQvhlQxJQ3Rtbp3AJdt0dw==
+"@cashscript/utils@^0.10.0-next.0":
+  version "0.10.0-next.0"
+  resolved "https://registry.yarnpkg.com/@cashscript/utils/-/utils-0.10.0-next.0.tgz#d8a47c2e9b18840678e62c58c3190afb86794f9a"
+  integrity sha512-cqTniDARlZqqThMTd33LtwSFhRdVe15tTq1K4Zs0gYFgBcT1l40B3P57szN+2gXsffGmN77I33IXv+wPoObcDg==
   dependencies:
     "@bitauth/libauth" "^2.0.0-alpha.8"
     hash.js "^1.1.7"
@@ -914,29 +914,30 @@ caniuse-lite@^1.0.30001541:
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001565.tgz#a528b253c8a2d95d2b415e11d8b9942acc100c4f"
   integrity sha512-xrE//a3O7TP0vaJ8ikzkD2c2NgcVUvsEe2IvFTntV4Yd1Z9FVzh+gW+enX96L0psrbaFMcVcH2l90xNuGDWc8w==
 
-cashc@^0.9.2:
-  version "0.9.2"
-  resolved "https://registry.yarnpkg.com/cashc/-/cashc-0.9.2.tgz#e001dd392a1a4efe0a3e5ce1cdb0399eb8868c1f"
-  integrity sha512-EQDksXEV9scQtrbSrIIC/XynFtFHtudClxHLFSOp+jSGcwpAsEzsLdMlSDIWO3uQUIcr7dgAoMREZUmRhERV8Q==
+cashc@^0.10.0:
+  version "0.10.0-next.0"
+  resolved "https://registry.yarnpkg.com/cashc/-/cashc-0.10.0-next.0.tgz#ba8f803abca77ad1ac629cfa3e794fa691906c81"
+  integrity sha512-PeOiU/5u+MyugcICuzb1aD5TitVRKbXD/4cBz9WNR7PCjdMX+3NpYDZi0Ql61YrcHP1s4z8a3Xw+w4FKcCL5LQ==
   dependencies:
     "@bitauth/libauth" "^2.0.0-alpha.8"
-    "@cashscript/utils" "^0.9.2"
+    "@cashscript/utils" "^0.10.0-next.0"
     antlr4ts "^0.5.0-alpha.4"
     commander "^7.1.0"
     semver "^7.3.4"
 
-cashscript@^0.9.2:
-  version "0.9.2"
-  resolved "https://registry.yarnpkg.com/cashscript/-/cashscript-0.9.2.tgz#0c9260fdd3c4466ebb582239fc621349a6ee37b1"
-  integrity sha512-IxvcJluRAoWA8ruQXsvOgmDeuyXc4DnwDF2UfU3l6/0fn5HQkLLVhH5hroc/TbExKWQPBEwR3Nql7aTQhPb9vA==
+cashscript@^0.10.0:
+  version "0.10.0-next.0"
+  resolved "https://registry.yarnpkg.com/cashscript/-/cashscript-0.10.0-next.0.tgz#6959a5d0872660094e10a77fb59a8aec52ead3bf"
+  integrity sha512-ph6gmsLA7q7birLyFIE6gAAS4QRnA5Msa+T4Dx5sxLoQERIUHn8nJ8w/QjE1+UdcwimK43YV6fwaEVRXYm0UZQ==
   dependencies:
     "@bitauth/libauth" "^2.0.0-alpha.8"
-    "@cashscript/utils" "^0.9.2"
+    "@cashscript/utils" "^0.10.0-next.0"
     bip68 "^1.0.4"
     bitcoin-rpc-promise-retry "^1.3.0"
     delay "^5.0.0"
     electrum-cash "^2.0.10"
     fast-deep-equal "^3.1.3"
+    pako "^2.1.0"
 
 chalk@^2.4.2:
   version "2.4.2"
@@ -1964,6 +1965,11 @@ p-try@^2.0.0:
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
   integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
 
+pako@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/pako/-/pako-2.1.0.tgz#266cc37f98c7d883545d11335c00fbd4062c9a86"
+  integrity sha512-w+eufiZ1WuJYgPXbV/PO3NCMEc3xqylkKHzp8bxp1uW4qaSNQUkwmLLEc3kKsfz8lpV1F8Ht3U1Cm+9Srog2ug==
+
 parse-json@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd"
diff --git a/packages/cashscript/src/LibauthTemplate.ts b/packages/cashscript/src/LibauthTemplate.ts
index 159d4fa6..0259b8a8 100644
--- a/packages/cashscript/src/LibauthTemplate.ts
+++ b/packages/cashscript/src/LibauthTemplate.ts
@@ -81,7 +81,7 @@ export const stringify = (any: any, spaces?: number): string => JSON.stringify(
 
 const zip = (a: any[], b: any[]): any[] => Array.from(Array(Math.max(b.length, a.length)), (_, i) => [a[i], b[i]]);
 
-const createScenarioTransaction = (libauthTransaction: TransactionBCH, csTransaction: Transaction) => {
+const createScenarioTransaction = (libauthTransaction: TransactionBCH, csTransaction: Transaction): AuthenticationTemplateScenario['transaction'] => {
   const contract = csTransaction.contract;
   const result = ({} as AuthenticationTemplateScenario['transaction'])!;
 
@@ -97,9 +97,7 @@ const createScenarioTransaction = (libauthTransaction: TransactionBCH, csTransac
         overrides: {
           keys: {
             privateKeys: {
-              placeholder_key: binToHex(
-                  (csInput as UtxoP2PKH).template.privateKey,
-              ),
+              placeholder_key: binToHex((csInput as UtxoP2PKH).template.privateKey),
             },
           },
         },
@@ -173,15 +171,15 @@ const createScenarioTransaction = (libauthTransaction: TransactionBCH, csTransac
   );
   result.version = libauthTransaction.version;
   return result;
-}
+};
 
-const createScenarioSourceOutputs = (csTransaction: Transaction) => {
-    // only one 'slot' is allowed, otherwise {} must be used
+const createScenarioSourceOutputs = (csTransaction: Transaction): Array<AuthenticationTemplateScenarioOutput<true>> => {
+  // only one 'slot' is allowed, otherwise {} must be used
   let inputSlotInserted = false;
   return csTransaction.inputs.map(
     (csInput) => {
       const signable = isUtxoP2PKH(csInput);
-      let lockingBytecode = {} as AuthenticationTemplateScenarioOutput<true>["lockingBytecode"];
+      let lockingBytecode = {} as AuthenticationTemplateScenarioOutput<true>['lockingBytecode'];
       if (signable) {
         lockingBytecode = {
           script: 'p2pkh_placeholder_lock',
@@ -213,20 +211,20 @@ const createScenarioSourceOutputs = (csTransaction: Transaction) => {
         result.token = {
           amount: csInput.token.amount.toString(),
           category: csInput.token.category,
-        }
+        };
 
         if (csInput.token.nft) {
           result.token.nft = {
             capability: csInput.token.nft.capability,
-            commitment: csInput.token.nft.commitment
-          }
+            commitment: csInput.token.nft.commitment,
+          };
         }
       }
 
       return result;
     },
   );
-}
+};
 
 export const buildTemplate = async ({
   transaction,
@@ -276,7 +274,7 @@ export const buildTemplate = async ({
 
   const template = {
     $schema: 'https://ide.bitauth.com/authentication-template-v0.schema.json',
-    description: `Imported from cashscript`,
+    description: 'Imported from cashscript',
     name: contract.artifact.contractName,
     supported: ['BCH_SPEC'],
     version: 0,
@@ -314,7 +312,7 @@ export const buildTemplate = async ({
           },
         })),
       ]),
-    }
+    },
   };
 
   // add extra variables for the p2pkh utxos spent together with our contract
@@ -327,7 +325,7 @@ export const buildTemplate = async ({
         name: 'placeholder_key',
         type: 'Key',
       },
-    }
+    };
   }
 
   template.scenarios = {
@@ -421,7 +419,7 @@ export const buildTemplate = async ({
       unlocks: 'lock',
     },
     lock: {
-      lockingType: "p2sh20", //transaction.contract.addressType,
+      lockingType: 'p2sh20', //transaction.contract.addressType,
       name: 'lock',
       // locking script contains the CashScript contract parameters followed by the contract opcodes
       // we output these values as pushdata, comment will contain the type and the value of the variable
diff --git a/yarn.lock b/yarn.lock
index 1ec56a07..735c413f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -743,11 +743,31 @@
     minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
+"@eslint/eslintrc@^2.1.4":
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.4.tgz#388a269f0f25c1b6adc317b5a2c55714894c70ad"
+  integrity sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==
+  dependencies:
+    ajv "^6.12.4"
+    debug "^4.3.2"
+    espree "^9.6.0"
+    globals "^13.19.0"
+    ignore "^5.2.0"
+    import-fresh "^3.2.1"
+    js-yaml "^4.1.0"
+    minimatch "^3.1.2"
+    strip-json-comments "^3.1.1"
+
 "@eslint/js@8.54.0":
   version "8.54.0"
   resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.54.0.tgz#4fab9a2ff7860082c304f750e94acd644cf984cf"
   integrity sha512-ut5V+D+fOoWPgGGNj83GGjnntO39xDy6DWxO0wb7Jp3DcMX0TfIqdzHF85VTQkerdyGmuuMD9AKAo5KiNlf/AQ==
 
+"@eslint/js@8.56.0":
+  version "8.56.0"
+  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.56.0.tgz#ef20350fec605a7f7035a01764731b2de0f3782b"
+  integrity sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A==
+
 "@evocateur/libnpmaccess@^3.1.2":
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/@evocateur/libnpmaccess/-/libnpmaccess-3.1.2.tgz#ecf7f6ce6b004e9f942b098d92200be4a4b1c845"
@@ -5273,6 +5293,50 @@ eslint@^8.54.0:
     strip-ansi "^6.0.1"
     text-table "^0.2.0"
 
+eslint@^8.56.0:
+  version "8.56.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.56.0.tgz#4957ce8da409dc0809f99ab07a1b94832ab74b15"
+  integrity sha512-Go19xM6T9puCOWntie1/P997aXxFsOi37JIHRWI514Hc6ZnaHGKY9xFhrU65RT6CcBEzZoGG1e6Nq+DT04ZtZQ==
+  dependencies:
+    "@eslint-community/eslint-utils" "^4.2.0"
+    "@eslint-community/regexpp" "^4.6.1"
+    "@eslint/eslintrc" "^2.1.4"
+    "@eslint/js" "8.56.0"
+    "@humanwhocodes/config-array" "^0.11.13"
+    "@humanwhocodes/module-importer" "^1.0.1"
+    "@nodelib/fs.walk" "^1.2.8"
+    "@ungap/structured-clone" "^1.2.0"
+    ajv "^6.12.4"
+    chalk "^4.0.0"
+    cross-spawn "^7.0.2"
+    debug "^4.3.2"
+    doctrine "^3.0.0"
+    escape-string-regexp "^4.0.0"
+    eslint-scope "^7.2.2"
+    eslint-visitor-keys "^3.4.3"
+    espree "^9.6.1"
+    esquery "^1.4.2"
+    esutils "^2.0.2"
+    fast-deep-equal "^3.1.3"
+    file-entry-cache "^6.0.1"
+    find-up "^5.0.0"
+    glob-parent "^6.0.2"
+    globals "^13.19.0"
+    graphemer "^1.4.0"
+    ignore "^5.2.0"
+    imurmurhash "^0.1.4"
+    is-glob "^4.0.0"
+    is-path-inside "^3.0.3"
+    js-yaml "^4.1.0"
+    json-stable-stringify-without-jsonify "^1.0.1"
+    levn "^0.4.1"
+    lodash.merge "^4.6.2"
+    minimatch "^3.1.2"
+    natural-compare "^1.4.0"
+    optionator "^0.9.3"
+    strip-ansi "^6.0.1"
+    text-table "^0.2.0"
+
 eslint@~4.18.0:
   version "4.18.2"
   resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.18.2.tgz#0f81267ad1012e7d2051e186a9004cc2267b8d45"

From 79dd175bd4e44100a3665b600db8194ee960a7b2 Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Wed, 3 Jan 2024 10:16:11 +0100
Subject: [PATCH 047/171] Refactor formatBitAuthScript util function + update
 tests

---
 packages/cashc/test/ast/Location.test.ts      |  6 +-
 packages/cashscript/src/LibauthTemplate.ts    |  4 +-
 packages/utils/src/libauth.ts                 | 78 +++++++----------
 packages/utils/src/script.ts                  | 32 ++++++-
 .../utils/test/fixtures/libauth.fixture.ts    | 86 +++++++++++++++++++
 packages/utils/test/libauth.test.ts           | 63 +++++---------
 6 files changed, 173 insertions(+), 96 deletions(-)
 create mode 100644 packages/utils/test/fixtures/libauth.fixture.ts

diff --git a/packages/cashc/test/ast/Location.test.ts b/packages/cashc/test/ast/Location.test.ts
index 17c824f7..23ff9248 100644
--- a/packages/cashc/test/ast/Location.test.ts
+++ b/packages/cashc/test/ast/Location.test.ts
@@ -1,7 +1,7 @@
 import fs from 'fs';
 import { URL } from 'url';
 import { compileString, parseCode } from '../../src/compiler.js';
-import { buildOpCodeMap, bytecodeToAsm, bytecodeToScript } from '@cashscript/utils';
+import { buildLineToAsmMap, bytecodeToAsm, bytecodeToScript } from '@cashscript/utils';
 import { hexToBin } from '@bitauth/libauth';
 
 describe('Location', () => {
@@ -51,7 +51,7 @@ contract test() {
           const expected = bytecodeToAsm(hexToBin(artifact.debug!.bytecode));
 
           // Generate the opCodeMap from the source code
-          const opCodeMap = buildOpCodeMap(
+          const opCodeMap = buildLineToAsmMap(
             bytecodeToScript(hexToBin(artifact.debug!.bytecode)), artifact.debug!.sourceMap,
           );
 
@@ -68,7 +68,7 @@ contract test() {
             .replaceAll('(\n)', '()').replace(/\((?!\))/g, '(\n');
           const artifact = compileString(source);
           const expected = bytecodeToAsm(hexToBin(artifact.debug!.bytecode));
-          const opCodeMap = buildOpCodeMap(
+          const opCodeMap = buildLineToAsmMap(
             bytecodeToScript(hexToBin(artifact.debug!.bytecode)), artifact.debug!.sourceMap,
           );
 
diff --git a/packages/cashscript/src/LibauthTemplate.ts b/packages/cashscript/src/LibauthTemplate.ts
index 0259b8a8..4e16aa40 100644
--- a/packages/cashscript/src/LibauthTemplate.ts
+++ b/packages/cashscript/src/LibauthTemplate.ts
@@ -1,5 +1,5 @@
 import {
-  AbiFunction, Artifact, Op, PrimitiveType, bytecodeToScript, decodeBool, decodeInt, decodeString, formatLibauthScript,
+  AbiFunction, Artifact, Op, PrimitiveType, bytecodeToScript, decodeBool, decodeInt, decodeString, formatBitAuthScript,
 } from '@cashscript/utils';
 import {
   hash160,
@@ -260,7 +260,7 @@ export const buildTemplate = async ({
   ).length;
 
   const formattedBytecode = contract.artifact.debug
-    ? formatLibauthScript(
+    ? formatBitAuthScript(
       bytecodeToScript(hexToBin(contract.artifact.debug.bytecode)),
       contract.artifact.debug.sourceMap,
       contract.artifact.source,
diff --git a/packages/utils/src/libauth.ts b/packages/utils/src/libauth.ts
index 0874fa73..3f17c9ae 100644
--- a/packages/utils/src/libauth.ts
+++ b/packages/utils/src/libauth.ts
@@ -1,62 +1,46 @@
-import { binToHex } from '@bitauth/libauth';
-import { Script, Op } from './script.js';
+import { Script, scriptToBitAuthAsm } from './script.js';
 import { sourceMapToLocationData } from './sourceMap.js';
 
-function buildLineMap(bytecode: Script, souceMap: string): { [line: string]: Script; } {
-  const lineMap: { [line: string]: Script } = {} as any;
+export type LineToOpcodesMap = Record<string, Script>;
+export type LineToAsmMap = Record<string, string>;
 
+export function buildLineToOpcodesMap(bytecode: Script, souceMap: string): LineToOpcodesMap {
   const locationData = sourceMapToLocationData(souceMap);
 
-  const map = locationData.map(([location, positionHint], index) => {
-    const op = bytecode[index];
-    return [
-      op,
-      Object.keys(Op)[Object.values(Op).indexOf(op as Op)],
-      positionHint ? location?.end.line : location?.start.line,
-    ];
-  });
-
-  map.forEach(([op, , line]) => {
-    if (!lineMap[line as string]) {
-      lineMap[line as string] = [];
-    }
-    lineMap[line as string].push(op as any);
-  });
+  return locationData.reduce<LineToOpcodesMap>((lineToOpcodeMap, [location, positionHint], index) => {
+    const opcode = bytecode[index];
+    const line = positionHint ? location?.end.line : location?.start.line;
 
-  return lineMap;
+    return {
+      ...lineToOpcodeMap,
+      [line]: [...(lineToOpcodeMap[line] || []), opcode],
+    };
+  }, {});
 }
 
-export function buildOpCodeMap(bytecode: Script, souceMap: string): { [key: string]: string; } {
-  const lineMap = buildLineMap(bytecode, souceMap);
-
-  const opCodeMap: { [key: string]: string } = {};
-  for (const [key, value] of Object.entries(lineMap)) {
-    opCodeMap[key] = value.map((asmElement) => {
-      if (asmElement instanceof Uint8Array) {
-        if (asmElement.length === 0) {
-          return 'OP_0';
-        }
-        return `<0x${binToHex(asmElement)}>`;
-      }
-      return Object.keys(Op)[Object.values(Op).indexOf(asmElement)];
-    }).join(' ');
-  }
-
-  return opCodeMap;
+export function buildLineToAsmMap(bytecode: Script, souceMap: string): LineToAsmMap {
+  const lineToOpcodesMap = buildLineToOpcodesMap(bytecode, souceMap);
+
+  return Object.fromEntries(
+    Object.entries(lineToOpcodesMap).map(([lineNumber, opcodeList]) => [lineNumber, scriptToBitAuthAsm(opcodeList)]),
+  );
 }
 
-export function formatLibauthScript(bytecode: Script, souceMap: string, sourceCode: string): string {
-  const opCodeMap = buildOpCodeMap(bytecode, souceMap);
+export function formatBitAuthScript(bytecode: Script, souceMap: string, sourceCode: string): string {
+  const lineToAsmMap = buildLineToAsmMap(bytecode, souceMap);
+
+  const sourceCodeLines = sourceCode.split('\n');
 
-  const split = sourceCode.split('\n');
+  const sourceCodeLineLengths = sourceCodeLines.map((line) => line.length);
+  const bytecodeLineLengths = Object.values(lineToAsmMap).map((line) => line.length);
 
-  const maxCodeLength = Math.max(...split.map((val) => val.length));
-  const maxBytecodeLength = Math.max(...Object.values(opCodeMap).map((val) => val.length));
+  const maxSourceCodeLength = Math.max(...sourceCodeLineLengths);
+  const maxBytecodeLength = Math.max(...bytecodeLineLengths);
 
-  const result = split.map((line, index) => {
-    const opCodes = opCodeMap[index + 1];
-    return `${(opCodes || '').padEnd(maxBytecodeLength)} /* ${line.padEnd(maxCodeLength)} */`;
-  }).join('\n');
+  const annotatedAsmLines = sourceCodeLines.map((line, index) => {
+    const lineAsm = lineToAsmMap[index + 1];
+    return `${(lineAsm || '').padEnd(maxBytecodeLength)} /* ${line.padEnd(maxSourceCodeLength)} */`;
+  });
 
-  return result;
+  return annotatedAsmLines.join('\n');
 }
diff --git a/packages/utils/src/script.ts b/packages/utils/src/script.ts
index 63f300bd..638c7e77 100644
--- a/packages/utils/src/script.ts
+++ b/packages/utils/src/script.ts
@@ -19,10 +19,21 @@ export function scriptToAsm(script: Script): string {
   return bytecodeToAsm(scriptToBytecode(script));
 }
 
+// TODO: See note at bytecodeToAsm
+export function scriptToBitAuthAsm(script: Script): string {
+  return bytecodeToBitAuthAsm(scriptToBytecode(script));
+}
+
+// TODO: Figure out why OP_0 is decoded to an empty Uint8Array (while e.g. OP_3 is just OP_3)
 export function asmToScript(asm: string): Script {
   return bytecodeToScript(asmToBytecode(asm));
 }
 
+// asmToBytecode also works for BitAuth ASM
+export function bitAuthAsmToScript(asm: string): Script {
+  return asmToScript(asm);
+}
+
 export function scriptToBytecode(script: Script): Uint8Array {
   // Convert the script elements to AuthenticationInstructions
   const instructions = script.map((opOrData) => {
@@ -59,7 +70,9 @@ export function asmToBytecode(asm: string): Uint8Array {
       return { opcode: Op[token as keyof typeof Op] };
     }
 
-    return decodeAuthenticationInstructions(encodeDataPush(hexToBin(token)))[0];
+    const data = token.replace(/<|>/g, '').replace(/^0x/, '');
+
+    return decodeAuthenticationInstructions(encodeDataPush(hexToBin(data)))[0];
   });
 
   // Convert the AuthenticationInstructions to bytecode
@@ -81,6 +94,23 @@ export function bytecodeToAsm(bytecode: Uint8Array): string {
   return asm;
 }
 
+// TODO: If we decide to change the ASM / artifact format, we can remove this function and merge it
+// with bytecodeToAsm
+export function bytecodeToBitAuthAsm(bytecode: Uint8Array): string {
+  // Convert the bytecode to libauth's ASM format
+  let asm = 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\w*)/g, ' \<$2\>');
+
+  // Remove any duplicate whitespace
+  asm = asm.replace(/\s+/g, ' ').trim();
+
+  return asm;
+}
+
 export function countOpcodes(script: Script): number {
   return script
     .filter((opOrData) => typeof opOrData === 'number')
diff --git a/packages/utils/test/fixtures/libauth.fixture.ts b/packages/utils/test/fixtures/libauth.fixture.ts
new file mode 100644
index 00000000..ab6c7d92
--- /dev/null
+++ b/packages/utils/test/fixtures/libauth.fixture.ts
@@ -0,0 +1,86 @@
+import { LineToAsmMap, LineToOpcodesMap } from '@cashscript/utils';
+import { Op } from '../../src/script.js';
+
+export interface Fixture {
+  name: string;
+  sourceCode: string;
+  asmBytecode: string;
+  sourceMap: string;
+  expectedLineToOpcodeMap: LineToOpcodesMap;
+  expectedLineToAsmMap: LineToAsmMap;
+  expectedBitAuthScript: string;
+}
+
+export const fixtures: Fixture[] = [
+  {
+    name: 'TransferWithTimeout',
+    sourceCode: `
+contract TransferWithTimeout(bytes20 senderPkh, bytes20 recipientPkh, int timeout) {
+  function transfer(pubkey signingPk, sig s) {
+    require(checkSig(s, signingPk));
+    require(hash160(signingPk) == recipientPkh);
+  }
+
+  function timeout(pubkey signingPk, sig s) {
+    require(senderPkh == 0xdeadbeef);
+    require(timeout == timeout);
+    require(s == s);
+    require(signingPk == signingPk);
+    require(checkSig(s, signingPk));
+    require(hash160(signingPk) == senderPkh);
+    require(tx.time >= timeout);
+  }
+}`,
+    asmBytecode: 'OP_3 OP_PICK OP_0 OP_NUMEQUAL OP_IF OP_5 OP_ROLL OP_5 OP_PICK OP_CHECKSIG OP_VERIFY OP_4 OP_ROLL OP_HASH160 OP_2 OP_ROLL OP_EQUAL OP_NIP OP_NIP OP_NIP OP_ELSE OP_3 OP_ROLL OP_1 OP_NUMEQUAL OP_VERIFY OP_0 OP_PICK deadbeef OP_EQUAL OP_VERIFY OP_2 OP_PICK OP_3 OP_PICK OP_NUMEQUAL OP_VERIFY OP_4 OP_PICK OP_5 OP_PICK OP_EQUAL OP_VERIFY OP_3 OP_PICK OP_4 OP_PICK OP_EQUAL OP_VERIFY OP_4 OP_ROLL OP_4 OP_PICK OP_CHECKSIG OP_VERIFY OP_3 OP_ROLL OP_HASH160 OP_1 OP_ROLL OP_EQUAL OP_VERIFY OP_1 OP_ROLL OP_CHECKLOCKTIMEVERIFY OP_DROP OP_1 OP_NIP OP_ENDIF',
+    sourceMap: '3:2:6:3;;;;;4:21:4:22;;:24::33;;:12::34;:4::36;5:20:5:29;;:12::30;:34::46;;:12;3:2:6:3:1;;;;8::16::0;;;;;9:12:9:21;;:25::35;:12;:4::37;10:12:10:19;;:23::30;;:12;:4::32;11:12:11:13;;:17::18;;:12;:4::20;12:12:12:21;;:25::34;;:12;:4::36;13:21:13:22;;:24::33;;:12::34;:4::36;14:20:14:29;;:12::30;:34::43;;:12;:4::45;15:23:15:30;;:4::32;;8:2:16:3:1;;',
+    expectedLineToOpcodeMap: {
+      3: [Op.OP_3, Op.OP_PICK, new Uint8Array([]), Op.OP_NUMEQUAL, Op.OP_IF],
+      4: [Op.OP_5, Op.OP_ROLL, Op.OP_5, Op.OP_PICK, Op.OP_CHECKSIG, Op.OP_VERIFY],
+      5: [Op.OP_4, Op.OP_ROLL, Op.OP_HASH160, Op.OP_2, Op.OP_ROLL, Op.OP_EQUAL],
+      6: [Op.OP_NIP, Op.OP_NIP, Op.OP_NIP, Op.OP_ELSE],
+      8: [Op.OP_3, Op.OP_ROLL, Op.OP_1, Op.OP_NUMEQUAL, Op.OP_VERIFY],
+      9: [new Uint8Array([]), Op.OP_PICK, new Uint8Array([0xde, 0xad, 0xbe, 0xef]), Op.OP_EQUAL, Op.OP_VERIFY],
+      10: [Op.OP_2, Op.OP_PICK, Op.OP_3, Op.OP_PICK, Op.OP_NUMEQUAL, Op.OP_VERIFY],
+      11: [Op.OP_4, Op.OP_PICK, Op.OP_5, Op.OP_PICK, Op.OP_EQUAL, Op.OP_VERIFY],
+      12: [Op.OP_3, Op.OP_PICK, Op.OP_4, Op.OP_PICK, Op.OP_EQUAL, Op.OP_VERIFY],
+      13: [Op.OP_4, Op.OP_ROLL, Op.OP_4, Op.OP_PICK, Op.OP_CHECKSIG, Op.OP_VERIFY],
+      14: [Op.OP_3, Op.OP_ROLL, Op.OP_HASH160, Op.OP_1, Op.OP_ROLL, Op.OP_EQUAL, Op.OP_VERIFY],
+      15: [Op.OP_1, Op.OP_ROLL, Op.OP_CHECKLOCKTIMEVERIFY, Op.OP_DROP],
+      16: [Op.OP_1, Op.OP_NIP, Op.OP_ENDIF],
+    },
+    expectedLineToAsmMap: {
+      3: 'OP_3 OP_PICK OP_0 OP_NUMEQUAL OP_IF',
+      4: 'OP_5 OP_ROLL OP_5 OP_PICK OP_CHECKSIG OP_VERIFY',
+      5: 'OP_4 OP_ROLL OP_HASH160 OP_2 OP_ROLL OP_EQUAL',
+      6: 'OP_NIP OP_NIP OP_NIP OP_ELSE',
+      8: 'OP_3 OP_ROLL OP_1 OP_NUMEQUAL OP_VERIFY',
+      9: 'OP_0 OP_PICK <0xdeadbeef> OP_EQUAL OP_VERIFY',
+      10: 'OP_2 OP_PICK OP_3 OP_PICK OP_NUMEQUAL OP_VERIFY',
+      11: 'OP_4 OP_PICK OP_5 OP_PICK OP_EQUAL OP_VERIFY',
+      12: 'OP_3 OP_PICK OP_4 OP_PICK OP_EQUAL OP_VERIFY',
+      13: 'OP_4 OP_ROLL OP_4 OP_PICK OP_CHECKSIG OP_VERIFY',
+      14: 'OP_3 OP_ROLL OP_HASH160 OP_1 OP_ROLL OP_EQUAL OP_VERIFY',
+      15: 'OP_1 OP_ROLL OP_CHECKLOCKTIMEVERIFY OP_DROP',
+      16: 'OP_1 OP_NIP OP_ENDIF',
+    },
+    expectedBitAuthScript: `
+                                                        /*                                                                                      */
+                                                        /* contract TransferWithTimeout(bytes20 senderPkh, bytes20 recipientPkh, int timeout) { */
+OP_3 OP_PICK OP_0 OP_NUMEQUAL OP_IF                     /*   function transfer(pubkey signingPk, sig s) {                                       */
+OP_5 OP_ROLL OP_5 OP_PICK OP_CHECKSIG OP_VERIFY         /*     require(checkSig(s, signingPk));                                                 */
+OP_4 OP_ROLL OP_HASH160 OP_2 OP_ROLL OP_EQUAL           /*     require(hash160(signingPk) == recipientPkh);                                     */
+OP_NIP OP_NIP OP_NIP OP_ELSE                            /*   }                                                                                  */
+                                                        /*                                                                                      */
+OP_3 OP_ROLL OP_1 OP_NUMEQUAL OP_VERIFY                 /*   function timeout(pubkey signingPk, sig s) {                                        */
+OP_0 OP_PICK <0xdeadbeef> OP_EQUAL OP_VERIFY            /*     require(senderPkh == 0xdeadbeef);                                                */
+OP_2 OP_PICK OP_3 OP_PICK OP_NUMEQUAL OP_VERIFY         /*     require(timeout == timeout);                                                     */
+OP_4 OP_PICK OP_5 OP_PICK OP_EQUAL OP_VERIFY            /*     require(s == s);                                                                 */
+OP_3 OP_PICK OP_4 OP_PICK OP_EQUAL OP_VERIFY            /*     require(signingPk == signingPk);                                                 */
+OP_4 OP_ROLL OP_4 OP_PICK OP_CHECKSIG OP_VERIFY         /*     require(checkSig(s, signingPk));                                                 */
+OP_3 OP_ROLL OP_HASH160 OP_1 OP_ROLL OP_EQUAL OP_VERIFY /*     require(hash160(signingPk) == senderPkh);                                        */
+OP_1 OP_ROLL OP_CHECKLOCKTIMEVERIFY OP_DROP             /*     require(tx.time >= timeout);                                                     */
+OP_1 OP_NIP OP_ENDIF                                    /*   }                                                                                  */
+                                                        /* }                                                                                    */
+`.replace(/^\n+/, '').replace(/\n+$/, ''),
+  },
+];
diff --git a/packages/utils/test/libauth.test.ts b/packages/utils/test/libauth.test.ts
index 5aec1bed..2719098f 100644
--- a/packages/utils/test/libauth.test.ts
+++ b/packages/utils/test/libauth.test.ts
@@ -1,47 +1,24 @@
-import { asmToScript } from '../src/index.js';
-import { formatLibauthScript } from '../src/libauth.js';
+import { asmToScript } from '../src/script.js';
+import { buildLineToOpcodesMap, buildLineToAsmMap, formatBitAuthScript } from '../src/libauth.js';
+import { fixtures } from './fixtures/libauth.fixture.js';
 
-it('test formatting libauth input', () => {
-  const code = 'OP_3 OP_PICK OP_0 OP_NUMEQUAL OP_IF OP_5 OP_ROLL OP_5 OP_PICK OP_CHECKSIG OP_VERIFY OP_4 OP_ROLL OP_HASH160 OP_2 OP_ROLL OP_EQUAL OP_NIP OP_NIP OP_NIP OP_ELSE OP_3 OP_ROLL OP_1 OP_NUMEQUAL OP_VERIFY OP_0 OP_PICK deadbeef OP_EQUAL OP_VERIFY OP_2 OP_PICK OP_3 OP_PICK OP_NUMEQUAL OP_VERIFY OP_4 OP_PICK OP_5 OP_PICK OP_EQUAL OP_VERIFY OP_3 OP_PICK OP_4 OP_PICK OP_EQUAL OP_VERIFY OP_4 OP_ROLL OP_4 OP_PICK OP_CHECKSIG OP_VERIFY OP_3 OP_ROLL OP_HASH160 OP_1 OP_ROLL OP_EQUAL OP_VERIFY OP_1 OP_ROLL OP_CHECKLOCKTIMEVERIFY OP_DROP OP_1 OP_NIP OP_ENDIF';
-  const bytecode = asmToScript(code);
-  const sourceMap = '3:2:6:3;;;;;4:21:4:22;;:24::33;;:12::34;:4::36;5:20:5:29;;:12::30;:34::46;;:12;3:2:6:3:1;;;;8::16::0;;;;;9:12:9:21;;:25::35;:12;:4::37;10:12:10:19;;:23::30;;:12;:4::32;11:12:11:13;;:17::18;;:12;:4::20;12:12:12:21;;:25::34;;:12;:4::36;13:21:13:22;;:24::33;;:12::34;:4::36;14:20:14:29;;:12::30;:34::43;;:12;:4::45;15:23:15:30;;:4::32;;8:2:16:3:1;;';
-  const sourceCode = `
-contract TransferWithTimeout(bytes20 senderPkh, bytes20 recipientPkh, int timeout) {
-  function transfer(pubkey signingPk, sig s) {
-    require(checkSig(s, signingPk));
-    require(hash160(signingPk) == recipientPkh);
-  }
+describe('Libauth Script formatting', () => {
 
-  function timeout(pubkey signingPk, sig s) {
-    require(senderPkh == 0xdeadbeef);
-    require(timeout == timeout);
-    require(s == s);
-    require(signingPk == signingPk);
-    require(checkSig(s, signingPk));
-    require(hash160(signingPk) == senderPkh);
-    require(tx.time >= timeout);
-  }
-}`;
+  fixtures.forEach((fixture) => {
+    describe(fixture.name, () => {
+      const scriptBytecode = asmToScript(fixture.asmBytecode);
 
-  const formatted = formatLibauthScript(bytecode, sourceMap, sourceCode);
-  const result = `
-                                                        /*                                                                                      */
-                                                        /* contract TransferWithTimeout(bytes20 senderPkh, bytes20 recipientPkh, int timeout) { */
-OP_3 OP_PICK OP_0 OP_NUMEQUAL OP_IF                     /*   function transfer(pubkey signingPk, sig s) {                                       */
-OP_5 OP_ROLL OP_5 OP_PICK OP_CHECKSIG OP_VERIFY         /*     require(checkSig(s, signingPk));                                                 */
-OP_4 OP_ROLL OP_HASH160 OP_2 OP_ROLL OP_EQUAL           /*     require(hash160(signingPk) == recipientPkh);                                     */
-OP_NIP OP_NIP OP_NIP OP_ELSE                            /*   }                                                                                  */
-                                                        /*                                                                                      */
-OP_3 OP_ROLL OP_1 OP_NUMEQUAL OP_VERIFY                 /*   function timeout(pubkey signingPk, sig s) {                                        */
-OP_0 OP_PICK <0xdeadbeef> OP_EQUAL OP_VERIFY            /*     require(senderPkh == 0xdeadbeef);                                                */
-OP_2 OP_PICK OP_3 OP_PICK OP_NUMEQUAL OP_VERIFY         /*     require(timeout == timeout);                                                     */
-OP_4 OP_PICK OP_5 OP_PICK OP_EQUAL OP_VERIFY            /*     require(s == s);                                                                 */
-OP_3 OP_PICK OP_4 OP_PICK OP_EQUAL OP_VERIFY            /*     require(signingPk == signingPk);                                                 */
-OP_4 OP_ROLL OP_4 OP_PICK OP_CHECKSIG OP_VERIFY         /*     require(checkSig(s, signingPk));                                                 */
-OP_3 OP_ROLL OP_HASH160 OP_1 OP_ROLL OP_EQUAL OP_VERIFY /*     require(hash160(signingPk) == senderPkh);                                        */
-OP_1 OP_ROLL OP_CHECKLOCKTIMEVERIFY OP_DROP             /*     require(tx.time >= timeout);                                                     */
-OP_1 OP_NIP OP_ENDIF                                    /*   }                                                                                  */
-                                                        /* }                                                                                    */
-`.replace(/^\n+/, '').replace(/\n+$/, '');
-  expect(formatted).toBe(result);
+      it('should build a line-to-opcodes map', () => {
+        expect(buildLineToOpcodesMap(scriptBytecode, fixture.sourceMap)).toEqual(fixture.expectedLineToOpcodeMap);
+      });
+
+      it('should build a line-to-asm map', () => {
+        expect(buildLineToAsmMap(scriptBytecode, fixture.sourceMap)).toEqual(fixture.expectedLineToAsmMap);
+      });
+
+      it('should format script as debugging output for BitAuth IDE', () => {
+        expect(formatBitAuthScript(scriptBytecode, fixture.sourceMap, fixture.sourceCode)).toBe(fixture.expectedBitAuthScript);
+      });
+    });
+  });
 });

From b5f74daa36efd55ab4f3c3db372d6d5ac2329b51 Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Wed, 3 Jan 2024 10:17:06 +0100
Subject: [PATCH 048/171] Rename libauth utils to bitauth-script

---
 packages/utils/src/{libauth.ts => bitauth-script.ts}          | 0
 packages/utils/src/index.ts                                   | 2 +-
 .../utils/test/{libauth.test.ts => bitauth-script.test.ts}    | 4 ++--
 .../{libauth.fixture.ts => bitauth-script.fixture.ts}         | 0
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename packages/utils/src/{libauth.ts => bitauth-script.ts} (100%)
 rename packages/utils/test/{libauth.test.ts => bitauth-script.test.ts} (89%)
 rename packages/utils/test/fixtures/{libauth.fixture.ts => bitauth-script.fixture.ts} (100%)

diff --git a/packages/utils/src/libauth.ts b/packages/utils/src/bitauth-script.ts
similarity index 100%
rename from packages/utils/src/libauth.ts
rename to packages/utils/src/bitauth-script.ts
diff --git a/packages/utils/src/index.ts b/packages/utils/src/index.ts
index 63ade3dd..0ae88884 100644
--- a/packages/utils/src/index.ts
+++ b/packages/utils/src/index.ts
@@ -4,4 +4,4 @@ export * from './hash.js';
 export * from './script.js';
 export * from './types.js';
 export * from './sourceMap.js';
-export * from './libauth.js';
+export * from './bitauth-script.js';
diff --git a/packages/utils/test/libauth.test.ts b/packages/utils/test/bitauth-script.test.ts
similarity index 89%
rename from packages/utils/test/libauth.test.ts
rename to packages/utils/test/bitauth-script.test.ts
index 2719098f..290c5ff8 100644
--- a/packages/utils/test/libauth.test.ts
+++ b/packages/utils/test/bitauth-script.test.ts
@@ -1,6 +1,6 @@
 import { asmToScript } from '../src/script.js';
-import { buildLineToOpcodesMap, buildLineToAsmMap, formatBitAuthScript } from '../src/libauth.js';
-import { fixtures } from './fixtures/libauth.fixture.js';
+import { buildLineToOpcodesMap, buildLineToAsmMap, formatBitAuthScript } from '../src/bitauth-script.js';
+import { fixtures } from './fixtures/bitauth-script.fixture.js';
 
 describe('Libauth Script formatting', () => {
 
diff --git a/packages/utils/test/fixtures/libauth.fixture.ts b/packages/utils/test/fixtures/bitauth-script.fixture.ts
similarity index 100%
rename from packages/utils/test/fixtures/libauth.fixture.ts
rename to packages/utils/test/fixtures/bitauth-script.fixture.ts

From 770e4fbac39c8bf51f1ac36f84a76c1f92e972e8 Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Wed, 3 Jan 2024 10:29:18 +0100
Subject: [PATCH 049/171] Update source map tests

---
 packages/utils/src/bitauth-script.ts          |  2 +-
 packages/utils/src/index.ts                   |  2 +-
 .../utils/src/{sourceMap.ts => source-map.ts} |  0
 packages/utils/test/bitauth-script.test.ts    |  4 +-
 .../utils/test/fixtures/source-map.fixture.ts | 55 +++++++++++++++++++
 packages/utils/test/source-map.test.ts        | 18 ++++++
 packages/utils/test/sourceMap.test.ts         | 52 ------------------
 7 files changed, 77 insertions(+), 56 deletions(-)
 rename packages/utils/src/{sourceMap.ts => source-map.ts} (100%)
 create mode 100644 packages/utils/test/fixtures/source-map.fixture.ts
 create mode 100644 packages/utils/test/source-map.test.ts
 delete mode 100644 packages/utils/test/sourceMap.test.ts

diff --git a/packages/utils/src/bitauth-script.ts b/packages/utils/src/bitauth-script.ts
index 3f17c9ae..a9d47b9c 100644
--- a/packages/utils/src/bitauth-script.ts
+++ b/packages/utils/src/bitauth-script.ts
@@ -1,5 +1,5 @@
 import { Script, scriptToBitAuthAsm } from './script.js';
-import { sourceMapToLocationData } from './sourceMap.js';
+import { sourceMapToLocationData } from './source-map.js';
 
 export type LineToOpcodesMap = Record<string, Script>;
 export type LineToAsmMap = Record<string, string>;
diff --git a/packages/utils/src/index.ts b/packages/utils/src/index.ts
index 0ae88884..616354ab 100644
--- a/packages/utils/src/index.ts
+++ b/packages/utils/src/index.ts
@@ -3,5 +3,5 @@ export * from './data.js';
 export * from './hash.js';
 export * from './script.js';
 export * from './types.js';
-export * from './sourceMap.js';
+export * from './source-map.js';
 export * from './bitauth-script.js';
diff --git a/packages/utils/src/sourceMap.ts b/packages/utils/src/source-map.ts
similarity index 100%
rename from packages/utils/src/sourceMap.ts
rename to packages/utils/src/source-map.ts
diff --git a/packages/utils/test/bitauth-script.test.ts b/packages/utils/test/bitauth-script.test.ts
index 290c5ff8..fda79864 100644
--- a/packages/utils/test/bitauth-script.test.ts
+++ b/packages/utils/test/bitauth-script.test.ts
@@ -3,7 +3,6 @@ import { buildLineToOpcodesMap, buildLineToAsmMap, formatBitAuthScript } from '.
 import { fixtures } from './fixtures/bitauth-script.fixture.js';
 
 describe('Libauth Script formatting', () => {
-
   fixtures.forEach((fixture) => {
     describe(fixture.name, () => {
       const scriptBytecode = asmToScript(fixture.asmBytecode);
@@ -17,7 +16,8 @@ describe('Libauth Script formatting', () => {
       });
 
       it('should format script as debugging output for BitAuth IDE', () => {
-        expect(formatBitAuthScript(scriptBytecode, fixture.sourceMap, fixture.sourceCode)).toBe(fixture.expectedBitAuthScript);
+        expect(formatBitAuthScript(scriptBytecode, fixture.sourceMap, fixture.sourceCode))
+          .toBe(fixture.expectedBitAuthScript);
       });
     });
   });
diff --git a/packages/utils/test/fixtures/source-map.fixture.ts b/packages/utils/test/fixtures/source-map.fixture.ts
new file mode 100644
index 00000000..c93aeede
--- /dev/null
+++ b/packages/utils/test/fixtures/source-map.fixture.ts
@@ -0,0 +1,55 @@
+import { LocationData } from '../../src/source-map.js';
+
+export interface Fixture {
+  name: string;
+  locationData: LocationData;
+  sourceMap: string;
+}
+
+export const fixtures: Fixture[] = [
+  {
+    name: 'Basic Test',
+    locationData: [
+      [{ start: { line: 10, column: 8 }, end: { line: 15, column: 9 } } ],
+      [{ start: { line: 10, column: 8 }, end: { line: 15, column: 9 } } ],
+      [{ start: { line: 10, column: 8 }, end: { line: 15, column: 9 } } ],
+      [{ start: { line: 10, column: 8 }, end: { line: 15, column: 9 } } ],
+      [{ start: { line: 10, column: 8 }, end: { line: 15, column: 9 } } ],
+      [{ start: { line: 11, column: 26 }, end: { line: 11, column: 32 } } ],
+      [{ start: { line: 13, column: 20 }, end: { line: 13, column: 24 } } ],
+      [{ start: { line: 13, column: 20 }, end: { line: 13, column: 24 } } ],
+      [{ start: { line: 13, column: 28 }, end: { line: 13, column: 34 } } ],
+      [{ start: { line: 13, column: 20 }, end: { line: 13, column: 34 } }, 1 ],
+      [{ start: { line: 13, column: 20 }, end: { line: 13, column: 34 } }, 1 ],
+      [{ start: { line: 13, column: 12 }, end: { line: 13, column: 36 } }, 1 ],
+      [{ start: { line: 14, column: 29 }, end: { line: 14, column: 41 } } ],
+      [{ start: { line: 14, column: 29 }, end: { line: 14, column: 41 } } ],
+      [{ start: { line: 14, column: 43 }, end: { line: 14, column: 52 } } ],
+      [{ start: { line: 14, column: 43 }, end: { line: 14, column: 52 } } ],
+      [{ start: { line: 14, column: 20 }, end: { line: 14, column: 53 } }, 1 ],
+      [{ start: { line: 10, column: 8 }, end: { line: 15, column: 9 } }, 1 ],
+      [{ start: { line: 10, column: 8 }, end: { line: 15, column: 9 } }, 1 ],
+      [{ start: { line: 10, column: 8 }, end: { line: 15, column: 9 } }, 1 ],
+      [{ start: { line: 10, column: 8 }, end: { line: 15, column: 9 } }, 1 ],
+      [{ start: { line: 18, column: 8 }, end: { line: 21, column: 9 } } ],
+      [{ start: { line: 18, column: 8 }, end: { line: 21, column: 9 } } ],
+      [{ start: { line: 18, column: 8 }, end: { line: 21, column: 9 } } ],
+      [{ start: { line: 18, column: 8 }, end: { line: 21, column: 9 } } ],
+      [{ start: { line: 18, column: 8 }, end: { line: 21, column: 9 } } ],
+      [{ start: { line: 19, column: 29 }, end: { line: 19, column: 38 } } ],
+      [{ start: { line: 19, column: 29 }, end: { line: 19, column: 38 } } ],
+      [{ start: { line: 19, column: 40 }, end: { line: 19, column: 46 } } ],
+      [{ start: { line: 19, column: 40 }, end: { line: 19, column: 46 } } ],
+      [{ start: { line: 19, column: 20 }, end: { line: 19, column: 47 } }, 1 ],
+      [{ start: { line: 19, column: 12 }, end: { line: 19, column: 49 } }, 1 ],
+      [{ start: { line: 20, column: 31 }, end: { line: 20, column: 38 } } ],
+      [{ start: { line: 20, column: 31 }, end: { line: 20, column: 38 } } ],
+      [{ start: { line: 20, column: 12 }, end: { line: 20, column: 40 } }, 1 ],
+      [{ start: { line: 20, column: 12 }, end: { line: 20, column: 40 } }, 1 ],
+      [{ start: { line: 18, column: 8 }, end: { line: 21, column: 9 } }, 1 ],
+      [{ start: { line: 18, column: 8 }, end: { line: 21, column: 9 } }, 1 ],
+      [{ start: { line: 4, column: 4 }, end: { line: 22, column: 5 } }, 1 ],
+    ],
+    sourceMap: '10:8:15:9;;;;;11:26:11:32;13:20:13:24;;:28::34;:20:::1;;:12::36;14:29:14:41:0;;:43::52;;:20::53:1;10:8:15:9;;;;18::21::0;;;;;19:29:19:38;;:40::46;;:20::47:1;:12::49;20:31:20:38:0;;:12::40:1;;18:8:21:9;;4:4:22:5',
+  },
+];
diff --git a/packages/utils/test/source-map.test.ts b/packages/utils/test/source-map.test.ts
new file mode 100644
index 00000000..9052778a
--- /dev/null
+++ b/packages/utils/test/source-map.test.ts
@@ -0,0 +1,18 @@
+import { generateSourceMap, sourceMapToLocationData } from '../src/index.js';
+import { fixtures } from './fixtures/source-map.fixture.js';
+
+describe('Source map generation', () => {
+  fixtures.forEach((fixture) => {
+    describe(fixture.name, () => {
+      it('should map from location data to source map', () => {
+        const sourceMap = generateSourceMap(fixture.locationData);
+        expect(sourceMap).toBe(fixture.sourceMap);
+      });
+
+      it('should map from source map to location data', () => {
+        const locationData = sourceMapToLocationData(fixture.sourceMap);
+        expect(locationData).toEqual(fixture.locationData);
+      });
+    });
+  });
+});
diff --git a/packages/utils/test/sourceMap.test.ts b/packages/utils/test/sourceMap.test.ts
deleted file mode 100644
index 4e16c75f..00000000
--- a/packages/utils/test/sourceMap.test.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-import { LocationData, generateSourceMap, sourceMapToLocationData } from '../src/index.js';
-
-it('test sourcemap generation and decoding', () => {
-  const locationData = [
-    [{ start: { line: 10, column: 8 }, end: { line: 15, column: 9 } } ],
-    [{ start: { line: 10, column: 8 }, end: { line: 15, column: 9 } } ],
-    [{ start: { line: 10, column: 8 }, end: { line: 15, column: 9 } } ],
-    [{ start: { line: 10, column: 8 }, end: { line: 15, column: 9 } } ],
-    [{ start: { line: 10, column: 8 }, end: { line: 15, column: 9 } } ],
-    [{ start: { line: 11, column: 26 }, end: { line: 11, column: 32 } } ],
-    [{ start: { line: 13, column: 20 }, end: { line: 13, column: 24 } } ],
-    [{ start: { line: 13, column: 20 }, end: { line: 13, column: 24 } } ],
-    [{ start: { line: 13, column: 28 }, end: { line: 13, column: 34 } } ],
-    [{ start: { line: 13, column: 20 }, end: { line: 13, column: 34 } }, 1 ],
-    [{ start: { line: 13, column: 20 }, end: { line: 13, column: 34 } }, 1 ],
-    [{ start: { line: 13, column: 12 }, end: { line: 13, column: 36 } }, 1 ],
-    [{ start: { line: 14, column: 29 }, end: { line: 14, column: 41 } } ],
-    [{ start: { line: 14, column: 29 }, end: { line: 14, column: 41 } } ],
-    [{ start: { line: 14, column: 43 }, end: { line: 14, column: 52 } } ],
-    [{ start: { line: 14, column: 43 }, end: { line: 14, column: 52 } } ],
-    [{ start: { line: 14, column: 20 }, end: { line: 14, column: 53 } }, 1 ],
-    [{ start: { line: 10, column: 8 }, end: { line: 15, column: 9 } }, 1 ],
-    [{ start: { line: 10, column: 8 }, end: { line: 15, column: 9 } }, 1 ],
-    [{ start: { line: 10, column: 8 }, end: { line: 15, column: 9 } }, 1 ],
-    [{ start: { line: 10, column: 8 }, end: { line: 15, column: 9 } }, 1 ],
-    [{ start: { line: 18, column: 8 }, end: { line: 21, column: 9 } } ],
-    [{ start: { line: 18, column: 8 }, end: { line: 21, column: 9 } } ],
-    [{ start: { line: 18, column: 8 }, end: { line: 21, column: 9 } } ],
-    [{ start: { line: 18, column: 8 }, end: { line: 21, column: 9 } } ],
-    [{ start: { line: 18, column: 8 }, end: { line: 21, column: 9 } } ],
-    [{ start: { line: 19, column: 29 }, end: { line: 19, column: 38 } } ],
-    [{ start: { line: 19, column: 29 }, end: { line: 19, column: 38 } } ],
-    [{ start: { line: 19, column: 40 }, end: { line: 19, column: 46 } } ],
-    [{ start: { line: 19, column: 40 }, end: { line: 19, column: 46 } } ],
-    [{ start: { line: 19, column: 20 }, end: { line: 19, column: 47 } }, 1 ],
-    [{ start: { line: 19, column: 12 }, end: { line: 19, column: 49 } }, 1 ],
-    [{ start: { line: 20, column: 31 }, end: { line: 20, column: 38 } } ],
-    [{ start: { line: 20, column: 31 }, end: { line: 20, column: 38 } } ],
-    [{ start: { line: 20, column: 12 }, end: { line: 20, column: 40 } }, 1 ],
-    [{ start: { line: 20, column: 12 }, end: { line: 20, column: 40 } }, 1 ],
-    [{ start: { line: 18, column: 8 }, end: { line: 21, column: 9 } }, 1 ],
-    [{ start: { line: 18, column: 8 }, end: { line: 21, column: 9 } }, 1 ],
-    [{ start: { line: 4, column: 4 }, end: { line: 22, column: 5 } }, 1 ],
-  ] as LocationData;
-
-  const sourceMap = generateSourceMap(locationData);
-  const expected = '10:8:15:9;;;;;11:26:11:32;13:20:13:24;;:28::34;:20:::1;;:12::36;14:29:14:41:0;;:43::52;;:20::53:1;10:8:15:9;;;;18::21::0;;;;;19:29:19:38;;:40::46;;:20::47:1;:12::49;20:31:20:38:0;;:12::40:1;;18:8:21:9;;4:4:22:5';
-  expect(sourceMap).toBe(expected);
-
-  const full = sourceMapToLocationData(sourceMap);
-  expect(full).toEqual(locationData);
-});

From 3428cecdcfabb3c5de81fe56c76de7718b8ff03c Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Wed, 3 Jan 2024 11:14:01 +0100
Subject: [PATCH 050/171] Add test case for Mecenas to source map and bitauth
 script fixtures

---
 .../test/fixtures/bitauth-script.fixture.ts   | 118 ++++++++++++
 .../utils/test/fixtures/source-map.fixture.ts | 176 ++++++++++++++----
 2 files changed, 255 insertions(+), 39 deletions(-)

diff --git a/packages/utils/test/fixtures/bitauth-script.fixture.ts b/packages/utils/test/fixtures/bitauth-script.fixture.ts
index ab6c7d92..63c760be 100644
--- a/packages/utils/test/fixtures/bitauth-script.fixture.ts
+++ b/packages/utils/test/fixtures/bitauth-script.fixture.ts
@@ -1,5 +1,7 @@
+/* eslint-disable max-len */
 import { LineToAsmMap, LineToOpcodesMap } from '@cashscript/utils';
 import { Op } from '../../src/script.js';
+import { hexToBin } from '@bitauth/libauth';
 
 export interface Fixture {
   name: string;
@@ -83,4 +85,120 @@ OP_1 OP_NIP OP_ENDIF                                    /*   }
                                                         /* }                                                                                    */
 `.replace(/^\n+/, '').replace(/\n+$/, ''),
   },
+  {
+    // TODO: These fixtures were copied from the current output of the compiler, but there are some small inaccuracies that we should fix later
+    name: 'Mecenas',
+    sourceCode: `
+pragma cashscript >=0.8.0;
+
+/* This is an unofficial CashScript port of Licho's Mecenas contract. It is
+ * not compatible with Licho's EC plugin, but rather meant as a demonstration
+ * of covenants in CashScript.
+ * The time checking has been removed so it can be tested without time requirements.
+ */
+contract Mecenas(bytes20 recipient, bytes20 funder, int pledge/*, int period */) {
+    function receive() {
+        // require(tx.age >= period);
+
+        // Check that the first output sends to the recipient
+        require(tx.outputs[0].lockingBytecode == new LockingBytecodeP2PKH(recipient));
+
+        int minerFee = 1000;
+        int currentValue = tx.inputs[this.activeInputIndex].value;
+        int changeValue = currentValue - pledge - minerFee;
+
+        // If there is not enough left for *another* pledge after this one, we send the remainder to the recipient
+        // Otherwise we send the remainder to the recipient and the change back to the contract
+        if (changeValue <= pledge + minerFee) {
+            require(tx.outputs[0].value == currentValue - minerFee);
+        } else {
+            require(tx.outputs[0].value == pledge);
+            require(tx.outputs[1].lockingBytecode == tx.inputs[this.activeInputIndex].lockingBytecode);
+            require(tx.outputs[1].value == changeValue);
+        }
+    }
+
+    function reclaim(pubkey pk, sig s) {
+        require(hash160(pk) == funder);
+        require(checkSig(s, pk));
+    }
+}`,
+    asmBytecode: 'OP_3 OP_PICK OP_0 OP_NUMEQUAL OP_IF OP_0 OP_OUTPUTBYTECODE 76a914 OP_2 OP_ROLL OP_CAT 88ac OP_CAT OP_EQUAL OP_VERIFY e803 OP_INPUTINDEX OP_UTXOVALUE OP_0 OP_PICK OP_4 OP_PICK OP_SUB OP_2 OP_PICK OP_SUB OP_0 OP_PICK OP_5 OP_PICK OP_4 OP_PICK OP_ADD OP_LESSTHANOREQUAL OP_IF OP_0 OP_OUTPUTVALUE OP_2 OP_PICK OP_4 OP_PICK OP_SUB OP_NUMEQUAL OP_VERIFY OP_ELSE OP_0 OP_OUTPUTVALUE OP_5 OP_PICK OP_NUMEQUAL OP_VERIFY OP_1 OP_OUTPUTBYTECODE OP_INPUTINDEX OP_UTXOBYTECODE OP_EQUAL OP_VERIFY OP_1 OP_OUTPUTVALUE OP_1 OP_PICK OP_NUMEQUAL OP_VERIFY OP_ENDIF OP_1 OP_NIP OP_NIP OP_NIP OP_NIP OP_NIP OP_NIP OP_ELSE OP_3 OP_ROLL OP_1 OP_NUMEQUAL OP_VERIFY OP_3 OP_PICK OP_HASH160 OP_2 OP_ROLL OP_EQUAL OP_VERIFY OP_3 OP_ROLL OP_3 OP_ROLL OP_CHECKSIG OP_NIP OP_NIP OP_ENDIF',
+    sourceMap: '9:4:28:5;;;;;13:27:13:28;:16::45;:49::84;:74::83;;:49::84;;;:16:::1;:8::86;15:23:15:27:0;16:37:16:58;:27::65;17:26:17:38;;:41::47;;:26:::1;:50::58:0;;:26:::1;21:12:21:23:0;;:27::33;;:36::44;;:27:::1;:12;:46:23:9:0;22:31:22:32;:20::39;:43::55;;:58::66;;:43:::1;:20;:12::68;23:15:27:9;24:31:24:32:0;:20::39;:43::49;;:20:::1;:12::51;25:31:25:32:0;:20::49;:63::84;:53::101;:20:::1;:12::103;26:31:26:32:0;:20::39;:43::54;;:20:::1;:12::56;23:15:27:9;9:4:28:5;;;;;;;;30::33::0;;;;;31:24:31:26;;:16::27:1;:31::37:0;;:16:::1;:8::39;32:25:32:26:0;;:28::30;;:16::31:1;30:4:33:5;;8:0:34:1',
+    expectedLineToOpcodeMap: {
+      9: [Op.OP_3, Op.OP_PICK, new Uint8Array([]), Op.OP_NUMEQUAL, Op.OP_IF],
+      13: [Op.OP_0, Op.OP_OUTPUTBYTECODE, hexToBin('76a914'), Op.OP_2, Op.OP_ROLL, Op.OP_CAT, hexToBin('88ac'), Op.OP_CAT, Op.OP_EQUAL, Op.OP_VERIFY],
+      15: [hexToBin('e803')],
+      16: [Op.OP_INPUTINDEX, Op.OP_UTXOVALUE],
+      17: [Op.OP_0, Op.OP_PICK, Op.OP_4, Op.OP_PICK, Op.OP_SUB, Op.OP_2, Op.OP_PICK, Op.OP_SUB],
+      21: [Op.OP_0, Op.OP_PICK, Op.OP_5, Op.OP_PICK, Op.OP_4, Op.OP_PICK, Op.OP_ADD, Op.OP_LESSTHANOREQUAL, Op.OP_IF],
+      22: [Op.OP_0, Op.OP_OUTPUTVALUE, Op.OP_2, Op.OP_PICK, Op.OP_4, Op.OP_PICK, Op.OP_SUB, Op.OP_NUMEQUAL, Op.OP_VERIFY],
+      24: [Op.OP_0, Op.OP_OUTPUTVALUE, Op.OP_5, Op.OP_PICK, Op.OP_NUMEQUAL, Op.OP_VERIFY],
+      25: [Op.OP_1, Op.OP_OUTPUTBYTECODE, Op.OP_INPUTINDEX, Op.OP_UTXOBYTECODE, Op.OP_EQUAL, Op.OP_VERIFY],
+      26: [Op.OP_1, Op.OP_OUTPUTVALUE, Op.OP_1, Op.OP_PICK, Op.OP_NUMEQUAL, Op.OP_VERIFY],
+      27: [Op.OP_ELSE, Op.OP_ENDIF],
+      28: [Op.OP_1, Op.OP_NIP, Op.OP_NIP, Op.OP_NIP, Op.OP_NIP, Op.OP_NIP, Op.OP_NIP, Op.OP_ELSE],
+      30: [Op.OP_3, Op.OP_ROLL, Op.OP_1, Op.OP_NUMEQUAL, Op.OP_VERIFY],
+      31: [Op.OP_3, Op.OP_PICK, Op.OP_HASH160, Op.OP_2, Op.OP_ROLL, Op.OP_EQUAL, Op.OP_VERIFY],
+      32: [Op.OP_3, Op.OP_ROLL, Op.OP_3, Op.OP_ROLL, Op.OP_CHECKSIG],
+      33: [Op.OP_NIP, Op.OP_NIP],
+      34: [Op.OP_ENDIF],
+    },
+    expectedLineToAsmMap: {
+      9: 'OP_3 OP_PICK OP_0 OP_NUMEQUAL OP_IF',
+      13: 'OP_0 OP_OUTPUTBYTECODE <0x76a914> OP_2 OP_ROLL OP_CAT <0x88ac> OP_CAT OP_EQUAL OP_VERIFY',
+      15: '<0xe803>',
+      16: 'OP_INPUTINDEX OP_UTXOVALUE',
+      17: 'OP_0 OP_PICK OP_4 OP_PICK OP_SUB OP_2 OP_PICK OP_SUB',
+      21: 'OP_0 OP_PICK OP_5 OP_PICK OP_4 OP_PICK OP_ADD OP_LESSTHANOREQUAL OP_IF',
+      22: 'OP_0 OP_OUTPUTVALUE OP_2 OP_PICK OP_4 OP_PICK OP_SUB OP_NUMEQUAL OP_VERIFY',
+      24: 'OP_0 OP_OUTPUTVALUE OP_5 OP_PICK OP_NUMEQUAL OP_VERIFY',
+      25: 'OP_1 OP_OUTPUTBYTECODE OP_INPUTINDEX OP_UTXOBYTECODE OP_EQUAL OP_VERIFY',
+      26: 'OP_1 OP_OUTPUTVALUE OP_1 OP_PICK OP_NUMEQUAL OP_VERIFY',
+      27: 'OP_ELSE OP_ENDIF',
+      28: 'OP_1 OP_NIP OP_NIP OP_NIP OP_NIP OP_NIP OP_NIP OP_ELSE',
+      30: 'OP_3 OP_ROLL OP_1 OP_NUMEQUAL OP_VERIFY',
+      31: 'OP_3 OP_PICK OP_HASH160 OP_2 OP_ROLL OP_EQUAL OP_VERIFY',
+      32: 'OP_3 OP_ROLL OP_3 OP_ROLL OP_CHECKSIG',
+      33: 'OP_NIP OP_NIP',
+      34: 'OP_ENDIF',
+    },
+    expectedBitAuthScript: `
+                                                                                             /*                                                                                                                    */
+                                                                                             /* pragma cashscript >=0.8.0;                                                                                         */
+                                                                                             /*                                                                                                                    */
+                                                                                             /* /* This is an unofficial CashScript port of Licho's Mecenas contract. It is                                        */
+                                                                                             /*  * not compatible with Licho's EC plugin, but rather meant as a demonstration                                      */
+                                                                                             /*  * of covenants in CashScript.                                                                                     */
+                                                                                             /*  * The time checking has been removed so it can be tested without time requirements.                               */
+                                                                                             /*  */                                                                                                                */
+    OP_3 OP_PICK OP_0 OP_NUMEQUAL OP_IF                                                      /* contract Mecenas(bytes20 recipient, bytes20 funder, int pledge/*, int period */) {                                 */
+                                                                                             /*     function receive() {                                                                                           */
+                                                                                             /*         // require(tx.age >= period);                                                                              */
+                                                                                             /*                                                                                                                    */
+    OP_0 OP_OUTPUTBYTECODE <0x76a914> OP_2 OP_ROLL OP_CAT <0x88ac> OP_CAT OP_EQUAL OP_VERIFY /*         // Check that the first output sends to the recipient                                                      */
+                                                                                             /*         require(tx.outputs[0].lockingBytecode == new LockingBytecodeP2PKH(recipient));                             */
+    <0xe803>                                                                                 /*                                                                                                                    */
+    OP_INPUTINDEX OP_UTXOVALUE                                                               /*         int minerFee = 1000;                                                                                       */
+    OP_0 OP_PICK OP_4 OP_PICK OP_SUB OP_2 OP_PICK OP_SUB                                     /*         int currentValue = tx.inputs[this.activeInputIndex].value;                                                 */
+                                                                                             /*         int changeValue = currentValue - pledge - minerFee;                                                        */
+                                                                                             /*                                                                                                                    */
+                                                                                             /*         // If there is not enough left for *another* pledge after this one, we send the remainder to the recipient */
+    OP_0 OP_PICK OP_5 OP_PICK OP_4 OP_PICK OP_ADD OP_LESSTHANOREQUAL OP_IF                   /*         // Otherwise we send the remainder to the recipient and the change back to the contract                    */
+    OP_0 OP_OUTPUTVALUE OP_2 OP_PICK OP_4 OP_PICK OP_SUB OP_NUMEQUAL OP_VERIFY               /*         if (changeValue <= pledge + minerFee) {                                                                    */
+                                                                                             /*             require(tx.outputs[0].value == currentValue - minerFee);                                               */
+    OP_0 OP_OUTPUTVALUE OP_5 OP_PICK OP_NUMEQUAL OP_VERIFY                                   /*         } else {                                                                                                   */
+    OP_1 OP_OUTPUTBYTECODE OP_INPUTINDEX OP_UTXOBYTECODE OP_EQUAL OP_VERIFY                  /*             require(tx.outputs[0].value == pledge);                                                                */
+    OP_1 OP_OUTPUTVALUE OP_1 OP_PICK OP_NUMEQUAL OP_VERIFY                                   /*             require(tx.outputs[1].lockingBytecode == tx.inputs[this.activeInputIndex].lockingBytecode);            */
+    OP_ELSE OP_ENDIF                                                                         /*             require(tx.outputs[1].value == changeValue);                                                           */
+    OP_1 OP_NIP OP_NIP OP_NIP OP_NIP OP_NIP OP_NIP OP_ELSE                                   /*         }                                                                                                          */
+                                                                                             /*     }                                                                                                              */
+    OP_3 OP_ROLL OP_1 OP_NUMEQUAL OP_VERIFY                                                  /*                                                                                                                    */
+    OP_3 OP_PICK OP_HASH160 OP_2 OP_ROLL OP_EQUAL OP_VERIFY                                  /*     function reclaim(pubkey pk, sig s) {                                                                           */
+    OP_3 OP_ROLL OP_3 OP_ROLL OP_CHECKSIG                                                    /*         require(hash160(pk) == funder);                                                                            */
+    OP_NIP OP_NIP                                                                            /*         require(checkSig(s, pk));                                                                                  */
+    OP_ENDIF                                                                                 /*     }                                                                                                              */
+                                                                                             /* }                                                                                                                  */
+`,
+  },
 ];
diff --git a/packages/utils/test/fixtures/source-map.fixture.ts b/packages/utils/test/fixtures/source-map.fixture.ts
index c93aeede..4be047fc 100644
--- a/packages/utils/test/fixtures/source-map.fixture.ts
+++ b/packages/utils/test/fixtures/source-map.fixture.ts
@@ -10,46 +10,144 @@ export const fixtures: Fixture[] = [
   {
     name: 'Basic Test',
     locationData: [
-      [{ start: { line: 10, column: 8 }, end: { line: 15, column: 9 } } ],
-      [{ start: { line: 10, column: 8 }, end: { line: 15, column: 9 } } ],
-      [{ start: { line: 10, column: 8 }, end: { line: 15, column: 9 } } ],
-      [{ start: { line: 10, column: 8 }, end: { line: 15, column: 9 } } ],
-      [{ start: { line: 10, column: 8 }, end: { line: 15, column: 9 } } ],
-      [{ start: { line: 11, column: 26 }, end: { line: 11, column: 32 } } ],
-      [{ start: { line: 13, column: 20 }, end: { line: 13, column: 24 } } ],
-      [{ start: { line: 13, column: 20 }, end: { line: 13, column: 24 } } ],
-      [{ start: { line: 13, column: 28 }, end: { line: 13, column: 34 } } ],
-      [{ start: { line: 13, column: 20 }, end: { line: 13, column: 34 } }, 1 ],
-      [{ start: { line: 13, column: 20 }, end: { line: 13, column: 34 } }, 1 ],
-      [{ start: { line: 13, column: 12 }, end: { line: 13, column: 36 } }, 1 ],
-      [{ start: { line: 14, column: 29 }, end: { line: 14, column: 41 } } ],
-      [{ start: { line: 14, column: 29 }, end: { line: 14, column: 41 } } ],
-      [{ start: { line: 14, column: 43 }, end: { line: 14, column: 52 } } ],
-      [{ start: { line: 14, column: 43 }, end: { line: 14, column: 52 } } ],
-      [{ start: { line: 14, column: 20 }, end: { line: 14, column: 53 } }, 1 ],
-      [{ start: { line: 10, column: 8 }, end: { line: 15, column: 9 } }, 1 ],
-      [{ start: { line: 10, column: 8 }, end: { line: 15, column: 9 } }, 1 ],
-      [{ start: { line: 10, column: 8 }, end: { line: 15, column: 9 } }, 1 ],
-      [{ start: { line: 10, column: 8 }, end: { line: 15, column: 9 } }, 1 ],
-      [{ start: { line: 18, column: 8 }, end: { line: 21, column: 9 } } ],
-      [{ start: { line: 18, column: 8 }, end: { line: 21, column: 9 } } ],
-      [{ start: { line: 18, column: 8 }, end: { line: 21, column: 9 } } ],
-      [{ start: { line: 18, column: 8 }, end: { line: 21, column: 9 } } ],
-      [{ start: { line: 18, column: 8 }, end: { line: 21, column: 9 } } ],
-      [{ start: { line: 19, column: 29 }, end: { line: 19, column: 38 } } ],
-      [{ start: { line: 19, column: 29 }, end: { line: 19, column: 38 } } ],
-      [{ start: { line: 19, column: 40 }, end: { line: 19, column: 46 } } ],
-      [{ start: { line: 19, column: 40 }, end: { line: 19, column: 46 } } ],
-      [{ start: { line: 19, column: 20 }, end: { line: 19, column: 47 } }, 1 ],
-      [{ start: { line: 19, column: 12 }, end: { line: 19, column: 49 } }, 1 ],
-      [{ start: { line: 20, column: 31 }, end: { line: 20, column: 38 } } ],
-      [{ start: { line: 20, column: 31 }, end: { line: 20, column: 38 } } ],
-      [{ start: { line: 20, column: 12 }, end: { line: 20, column: 40 } }, 1 ],
-      [{ start: { line: 20, column: 12 }, end: { line: 20, column: 40 } }, 1 ],
-      [{ start: { line: 18, column: 8 }, end: { line: 21, column: 9 } }, 1 ],
-      [{ start: { line: 18, column: 8 }, end: { line: 21, column: 9 } }, 1 ],
-      [{ start: { line: 4, column: 4 }, end: { line: 22, column: 5 } }, 1 ],
+      [{ start: { line: 10, column: 8 }, end: { line: 15, column: 9 } }],
+      [{ start: { line: 10, column: 8 }, end: { line: 15, column: 9 } }],
+      [{ start: { line: 10, column: 8 }, end: { line: 15, column: 9 } }],
+      [{ start: { line: 10, column: 8 }, end: { line: 15, column: 9 } }],
+      [{ start: { line: 10, column: 8 }, end: { line: 15, column: 9 } }],
+      [{ start: { line: 11, column: 26 }, end: { line: 11, column: 32 } }],
+      [{ start: { line: 13, column: 20 }, end: { line: 13, column: 24 } }],
+      [{ start: { line: 13, column: 20 }, end: { line: 13, column: 24 } }],
+      [{ start: { line: 13, column: 28 }, end: { line: 13, column: 34 } }],
+      [{ start: { line: 13, column: 20 }, end: { line: 13, column: 34 } }, 1],
+      [{ start: { line: 13, column: 20 }, end: { line: 13, column: 34 } }, 1],
+      [{ start: { line: 13, column: 12 }, end: { line: 13, column: 36 } }, 1],
+      [{ start: { line: 14, column: 29 }, end: { line: 14, column: 41 } }],
+      [{ start: { line: 14, column: 29 }, end: { line: 14, column: 41 } }],
+      [{ start: { line: 14, column: 43 }, end: { line: 14, column: 52 } }],
+      [{ start: { line: 14, column: 43 }, end: { line: 14, column: 52 } }],
+      [{ start: { line: 14, column: 20 }, end: { line: 14, column: 53 } }, 1],
+      [{ start: { line: 10, column: 8 }, end: { line: 15, column: 9 } }, 1],
+      [{ start: { line: 10, column: 8 }, end: { line: 15, column: 9 } }, 1],
+      [{ start: { line: 10, column: 8 }, end: { line: 15, column: 9 } }, 1],
+      [{ start: { line: 10, column: 8 }, end: { line: 15, column: 9 } }, 1],
+      [{ start: { line: 18, column: 8 }, end: { line: 21, column: 9 } }],
+      [{ start: { line: 18, column: 8 }, end: { line: 21, column: 9 } }],
+      [{ start: { line: 18, column: 8 }, end: { line: 21, column: 9 } }],
+      [{ start: { line: 18, column: 8 }, end: { line: 21, column: 9 } }],
+      [{ start: { line: 18, column: 8 }, end: { line: 21, column: 9 } }],
+      [{ start: { line: 19, column: 29 }, end: { line: 19, column: 38 } }],
+      [{ start: { line: 19, column: 29 }, end: { line: 19, column: 38 } }],
+      [{ start: { line: 19, column: 40 }, end: { line: 19, column: 46 } }],
+      [{ start: { line: 19, column: 40 }, end: { line: 19, column: 46 } }],
+      [{ start: { line: 19, column: 20 }, end: { line: 19, column: 47 } }, 1],
+      [{ start: { line: 19, column: 12 }, end: { line: 19, column: 49 } }, 1],
+      [{ start: { line: 20, column: 31 }, end: { line: 20, column: 38 } }],
+      [{ start: { line: 20, column: 31 }, end: { line: 20, column: 38 } }],
+      [{ start: { line: 20, column: 12 }, end: { line: 20, column: 40 } }, 1],
+      [{ start: { line: 20, column: 12 }, end: { line: 20, column: 40 } }, 1],
+      [{ start: { line: 18, column: 8 }, end: { line: 21, column: 9 } }, 1],
+      [{ start: { line: 18, column: 8 }, end: { line: 21, column: 9 } }, 1],
+      [{ start: { line: 4, column: 4 }, end: { line: 22, column: 5 } }, 1],
     ],
     sourceMap: '10:8:15:9;;;;;11:26:11:32;13:20:13:24;;:28::34;:20:::1;;:12::36;14:29:14:41:0;;:43::52;;:20::53:1;10:8:15:9;;;;18::21::0;;;;;19:29:19:38;;:40::46;;:20::47:1;:12::49;20:31:20:38:0;;:12::40:1;;18:8:21:9;;4:4:22:5',
   },
+  {
+    name: 'Mecenas',
+    locationData: [
+      [{ start: { line: 9, column: 4 }, end: { line: 28, column: 5 } }],
+      [{ start: { line: 9, column: 4 }, end: { line: 28, column: 5 } }],
+      [{ start: { line: 9, column: 4 }, end: { line: 28, column: 5 } }],
+      [{ start: { line: 9, column: 4 }, end: { line: 28, column: 5 } }],
+      [{ start: { line: 9, column: 4 }, end: { line: 28, column: 5 } }],
+      [{ start: { line: 13, column: 27 }, end: { line: 13, column: 28 } }],
+      [{ start: { line: 13, column: 16 }, end: { line: 13, column: 45 } }],
+      [{ start: { line: 13, column: 49 }, end: { line: 13, column: 84 } }],
+      [{ start: { line: 13, column: 74 }, end: { line: 13, column: 83 } }],
+      [{ start: { line: 13, column: 74 }, end: { line: 13, column: 83 } }],
+      [{ start: { line: 13, column: 49 }, end: { line: 13, column: 84 } }],
+      [{ start: { line: 13, column: 49 }, end: { line: 13, column: 84 } }],
+      [{ start: { line: 13, column: 49 }, end: { line: 13, column: 84 } }],
+      [{ start: { line: 13, column: 16 }, end: { line: 13, column: 84 } }, 1],
+      [{ start: { line: 13, column: 8 }, end: { line: 13, column: 86 } }, 1],
+      [{ start: { line: 15, column: 23 }, end: { line: 15, column: 27 } }],
+      [{ start: { line: 16, column: 37 }, end: { line: 16, column: 58 } }],
+      [{ start: { line: 16, column: 27 }, end: { line: 16, column: 65 } }],
+      [{ start: { line: 17, column: 26 }, end: { line: 17, column: 38 } }],
+      [{ start: { line: 17, column: 26 }, end: { line: 17, column: 38 } }],
+      [{ start: { line: 17, column: 41 }, end: { line: 17, column: 47 } }],
+      [{ start: { line: 17, column: 41 }, end: { line: 17, column: 47 } }],
+      [{ start: { line: 17, column: 26 }, end: { line: 17, column: 47 } }, 1],
+      [{ start: { line: 17, column: 50 }, end: { line: 17, column: 58 } }],
+      [{ start: { line: 17, column: 50 }, end: { line: 17, column: 58 } }],
+      [{ start: { line: 17, column: 26 }, end: { line: 17, column: 58 } }, 1],
+      [{ start: { line: 21, column: 12 }, end: { line: 21, column: 23 } }],
+      [{ start: { line: 21, column: 12 }, end: { line: 21, column: 23 } }],
+      [{ start: { line: 21, column: 27 }, end: { line: 21, column: 33 } }],
+      [{ start: { line: 21, column: 27 }, end: { line: 21, column: 33 } }],
+      [{ start: { line: 21, column: 36 }, end: { line: 21, column: 44 } }],
+      [{ start: { line: 21, column: 36 }, end: { line: 21, column: 44 } }],
+      [{ start: { line: 21, column: 27 }, end: { line: 21, column: 44 } }, 1],
+      [{ start: { line: 21, column: 12 }, end: { line: 21, column: 44 } }, 1],
+      [{ start: { line: 21, column: 46 }, end: { line: 23, column: 9 } }],
+      [{ start: { line: 22, column: 31 }, end: { line: 22, column: 32 } }],
+      [{ start: { line: 22, column: 20 }, end: { line: 22, column: 39 } }],
+      [{ start: { line: 22, column: 43 }, end: { line: 22, column: 55 } }],
+      [{ start: { line: 22, column: 43 }, end: { line: 22, column: 55 } }],
+      [{ start: { line: 22, column: 58 }, end: { line: 22, column: 66 } }],
+      [{ start: { line: 22, column: 58 }, end: { line: 22, column: 66 } }],
+      [{ start: { line: 22, column: 43 }, end: { line: 22, column: 66 } }, 1],
+      [{ start: { line: 22, column: 20 }, end: { line: 22, column: 66 } }, 1],
+      [{ start: { line: 22, column: 12 }, end: { line: 22, column: 68 } }, 1],
+      [{ start: { line: 23, column: 15 }, end: { line: 27, column: 9 } }, 1],
+      [{ start: { line: 24, column: 31 }, end: { line: 24, column: 32 } }],
+      [{ start: { line: 24, column: 20 }, end: { line: 24, column: 39 } }],
+      [{ start: { line: 24, column: 43 }, end: { line: 24, column: 49 } }],
+      [{ start: { line: 24, column: 43 }, end: { line: 24, column: 49 } }],
+      [{ start: { line: 24, column: 20 }, end: { line: 24, column: 49 } }, 1],
+      [{ start: { line: 24, column: 12 }, end: { line: 24, column: 51 } }, 1],
+      [{ start: { line: 25, column: 31 }, end: { line: 25, column: 32 } }],
+      [{ start: { line: 25, column: 20 }, end: { line: 25, column: 49 } }],
+      [{ start: { line: 25, column: 63 }, end: { line: 25, column: 84 } }],
+      [{ start: { line: 25, column: 53 }, end: { line: 25, column: 101 } }],
+      [{ start: { line: 25, column: 20 }, end: { line: 25, column: 101 } }, 1],
+      [{ start: { line: 25, column: 12 }, end: { line: 25, column: 103 } }, 1],
+      [{ start: { line: 26, column: 31 }, end: { line: 26, column: 32 } }],
+      [{ start: { line: 26, column: 20 }, end: { line: 26, column: 39 } }],
+      [{ start: { line: 26, column: 43 }, end: { line: 26, column: 54 } }],
+      [{ start: { line: 26, column: 43 }, end: { line: 26, column: 54 } }],
+      [{ start: { line: 26, column: 20 }, end: { line: 26, column: 54 } }, 1],
+      [{ start: { line: 26, column: 12 }, end: { line: 26, column: 56 } }, 1],
+      [{ start: { line: 23, column: 15 }, end: { line: 27, column: 9 } }, 1],
+      [{ start: { line: 9, column: 4 }, end: { line: 28, column: 5 } }, 1],
+      [{ start: { line: 9, column: 4 }, end: { line: 28, column: 5 } }, 1],
+      [{ start: { line: 9, column: 4 }, end: { line: 28, column: 5 } }, 1],
+      [{ start: { line: 9, column: 4 }, end: { line: 28, column: 5 } }, 1],
+      [{ start: { line: 9, column: 4 }, end: { line: 28, column: 5 } }, 1],
+      [{ start: { line: 9, column: 4 }, end: { line: 28, column: 5 } }, 1],
+      [{ start: { line: 9, column: 4 }, end: { line: 28, column: 5 } }, 1],
+      [{ start: { line: 9, column: 4 }, end: { line: 28, column: 5 } }, 1],
+      [{ start: { line: 30, column: 4 }, end: { line: 33, column: 5 } }],
+      [{ start: { line: 30, column: 4 }, end: { line: 33, column: 5 } }],
+      [{ start: { line: 30, column: 4 }, end: { line: 33, column: 5 } }],
+      [{ start: { line: 30, column: 4 }, end: { line: 33, column: 5 } }],
+      [{ start: { line: 30, column: 4 }, end: { line: 33, column: 5 } }],
+      [{ start: { line: 31, column: 24 }, end: { line: 31, column: 26 } }],
+      [{ start: { line: 31, column: 24 }, end: { line: 31, column: 26 } }],
+      [{ start: { line: 31, column: 16 }, end: { line: 31, column: 27 } }, 1],
+      [{ start: { line: 31, column: 31 }, end: { line: 31, column: 37 } }],
+      [{ start: { line: 31, column: 31 }, end: { line: 31, column: 37 } }],
+      [{ start: { line: 31, column: 16 }, end: { line: 31, column: 37 } }, 1],
+      [{ start: { line: 31, column: 8 }, end: { line: 31, column: 39 } }, 1],
+      [{ start: { line: 32, column: 25 }, end: { line: 32, column: 26 } }],
+      [{ start: { line: 32, column: 25 }, end: { line: 32, column: 26 } }],
+      [{ start: { line: 32, column: 28 }, end: { line: 32, column: 30 } }],
+      [{ start: { line: 32, column: 28 }, end: { line: 32, column: 30 } }],
+      [{ start: { line: 32, column: 16 }, end: { line: 32, column: 31 } }, 1],
+      [{ start: { line: 30, column: 4 }, end: { line: 33, column: 5 } }, 1],
+      [{ start: { line: 30, column: 4 }, end: { line: 33, column: 5 } }, 1],
+      [{ start: { line: 8, column: 0 }, end: { line: 34, column: 1 } }, 1],
+    ],
+    sourceMap: '9:4:28:5;;;;;13:27:13:28;:16::45;:49::84;:74::83;;:49::84;;;:16:::1;:8::86;15:23:15:27:0;16:37:16:58;:27::65;17:26:17:38;;:41::47;;:26:::1;:50::58:0;;:26:::1;21:12:21:23:0;;:27::33;;:36::44;;:27:::1;:12;:46:23:9:0;22:31:22:32;:20::39;:43::55;;:58::66;;:43:::1;:20;:12::68;23:15:27:9;24:31:24:32:0;:20::39;:43::49;;:20:::1;:12::51;25:31:25:32:0;:20::49;:63::84;:53::101;:20:::1;:12::103;26:31:26:32:0;:20::39;:43::54;;:20:::1;:12::56;23:15:27:9;9:4:28:5;;;;;;;;30::33::0;;;;;31:24:31:26;;:16::27:1;:31::37:0;;:16:::1;:8::39;32:25:32:26:0;;:28::30;;:16::31:1;30:4:33:5;;8:0:34:1',
+  },
 ];

From ad0f611d37c7b41a09d73a07913ed6795edbbb0a Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Wed, 3 Jan 2024 11:36:08 +0100
Subject: [PATCH 051/171] Update generation fixtures to include debug output

---
 packages/cashc/test/generation/fixtures.ts    | 132 +++++++++++++++++-
 .../cashc/test/generation/generation.test.ts  |   3 +-
 .../valid-contract-files/debug_messages.cash  |   6 +
 3 files changed, 132 insertions(+), 9 deletions(-)
 create mode 100644 packages/cashc/test/valid-contract-files/debug_messages.cash

diff --git a/packages/cashc/test/generation/fixtures.ts b/packages/cashc/test/generation/fixtures.ts
index 9e52f3d2..e6d4749b 100644
--- a/packages/cashc/test/generation/fixtures.ts
+++ b/packages/cashc/test/generation/fixtures.ts
@@ -20,13 +20,12 @@ export const fixtures: Fixture[] = [
         'OP_OVER OP_HASH160 OP_EQUALVERIFY '
         // require(checkSig(s, pk))
         + 'OP_CHECKSIG',
-      // TODO: Add debug info to all fixtures
-      // debug: {
-      //   bytecode: "5179a9517a8769517a517aac",
-      //   logs: [],
-      //   requireMessages: [],
-      //   sourceMap: "3:24:3:26;;:16::27:1;:31::34:0;;:16:::1;:8::36;4:25:4:26:0;;:28::30;;:16::31:1",
-      // },
+      debug: {
+        bytecode: '5179a9517a8769517a517aac',
+        logs: [],
+        requireMessages: [],
+        sourceMap: '3:24:3:26;;:16::27:1;:31::34:0;;:16:::1;:8::36;4:25:4:26:0;;:28::30;;:16::31:1',
+      },
       source: fs.readFileSync(new URL('../valid-contract-files/p2pkh.cash', import.meta.url), { encoding: 'utf-8' }),
       compiler: {
         name: 'cashc',
@@ -57,6 +56,12 @@ export const fixtures: Fixture[] = [
         // require(checkSig(s, pk))
         + 'OP_ROT OP_ROT OP_CHECKSIG '
         + 'OP_NIP',
+      debug: {
+        bytecode: '5a54940114517a529793007a517aa0690b48656c6c6f20576f726c640079527a7e5279a6517aa68769527a527aac77',
+        logs: [],
+        requireMessages: [],
+        sourceMap: '3:25:3:27;:30::31;:25:::1;4:30:4:32:0;:35::45;;:48::49;:35:::1;:30;5:16:5:31:0;;:34::35;;:16:::1;:8::37;7:20:7:33:0;8:13:8:15;;:18::19;;:13:::1;10:26:10:28:0;;:16::29:1;:43::45:0;;:33::46:1;:16;:8::48;11:25:11:26:0;;:28::30;;:16::31:1;2:4:12:5',
+      },
       source: fs.readFileSync(new URL('../valid-contract-files/reassignment.cash', import.meta.url), { encoding: 'utf-8' }),
       compiler: {
         name: 'cashc',
@@ -93,6 +98,12 @@ export const fixtures: Fixture[] = [
         // require(d == y)
         + 'OP_3 OP_ROLL OP_NUMEQUAL '
         + 'OP_NIP OP_NIP OP_NIP',
+      debug: {
+        bytecode: '527954799300795479940079537a52949c6300795579935479517993527a757c00795279a0697567007954799c69680079547a93007a537a9c777777',
+        logs: [],
+        requireMessages: [],
+        sourceMap: '3:16:3:17;;:20::21;;:16:::1;4:12:4:13:0;;:16::17;;:12:::1;5::5:13:0;;:17::18;;:21::22;:17:::1;:12;:24:9:9:0;6:20:6:21;;:24::25;;:20:::1;7:16:7:17:0;;:20::21;;:16:::1;:12::22:0;;;;8:20:8:21;;:24::25;;:20:::1;:12::27;5:8:11:9:0;9:15:::1;10:20:10:21:0;;:25::26;;:20:::1;:12::28;9:15:11:9;12:12:12:13:0;;:16::17;;:12:::1;13:16:13::0;;:21::22;;:16:::1;2:4:14:5;;',
+      },
       source: fs.readFileSync(new URL('../valid-contract-files/if_statement.cash', import.meta.url), { encoding: 'utf-8' }),
       compiler: {
         name: 'cashc',
@@ -123,6 +134,12 @@ export const fixtures: Fixture[] = [
         // require(tx.time >= timeout)
         + 'OP_SWAP OP_CHECKLOCKTIMEVERIFY OP_2DROP OP_1 '
         + 'OP_ENDIF',
+      debug: {
+        bytecode: '5379009c63547a527aac77777767537a519c69537a517aac69517ab175517768',
+        logs: [],
+        requireMessages: [],
+        sourceMap: '6:4:8:5;;;;;7:25:7:37;;:39::48;;:16::49:1;6:4:8:5;;;;10::13::0;;;;;11:25:11:34;;:36::42;;:16::43:1;:8::45;12:27:12:34:0;;:8::36:1;;10:4:13:5;;1:0:14:1',
+      },
       source: fs.readFileSync(new URL('../valid-contract-files/multifunction.cash', import.meta.url), { encoding: 'utf-8' }),
       compiler: {
         name: 'cashc',
@@ -184,6 +201,12 @@ export const fixtures: Fixture[] = [
         // require(d == y)
         + 'OP_2SWAP OP_NUMEQUAL '
         + 'OP_NIP OP_NIP OP_ENDIF',
+      debug: {
+        bytecode: '5279009c63537955799300795579940079537a9c6300795679935579517993527a757c00795279a06975675479517a75680079557a93007a537a9c69517777777767527a519c695279007952930079537a9c6300795479930079527993527a757c00795279a0697568537a007a537a9c777768',
+        logs: [],
+        requireMessages: [],
+        sourceMap: '2:4:14:5;;;;;3:16:3:17;;:20::21;;:16:::1;4:12:4:13:0;;:16::17;;:12:::1;5::5:13:0;;:17::18;;:12:::1;:20:9:9:0;6::6:21;;:24::25;;:20:::1;7:16:7:17:0;;:20::21;;:16:::1;:12::22:0;;;;8:20:8:21;;:24::25;;:20:::1;:12::27;5:8:11:9:0;9:15:::1;10:16:10:17:0;;:12::18;;;9:15:11:9:1;12:12:12:13:0;;:16::17;;:12:::1;13:16:13::0;;:21::22;;:16:::1;:8::24;2:4:14:5;;;;;;16::26::0;;;;;17:16:17:17;;18:12:18:13;;:16::17;:12:::1;19::19:13:0;;:17::18;;:12:::1;:20:23:9:0;20::20:21;;:24::25;;:20:::1;21:16:21:17:0;;:20::21;;:16:::1;:12::22:0;;;;22:20:22:21;;:24::25;;:20:::1;:12::27;19:8:23:9:0;:20:::1;24:12:24:13:0;;25:16:25:17;;:21::22;;:16:::1;16:4:26:5;;1:0:27:1',
+      },
       source: fs.readFileSync(new URL('../valid-contract-files/multifunction_if_statements.cash', import.meta.url), { encoding: 'utf-8' }),
       compiler: {
         name: 'cashc',
@@ -201,6 +224,12 @@ export const fixtures: Fixture[] = [
       bytecode:
         // require(checkMultiSig([s1, s2], [pk1, pk2, pk3]))
         'OP_0 OP_2ROT OP_SWAP OP_2 OP_2ROT OP_SWAP OP_6 OP_ROLL OP_3 OP_CHECKMULTISIG',
+      debug: {
+        bytecode: '00547a557a52547a557a567a53ae',
+        logs: [],
+        requireMessages: [],
+        sourceMap: '3:12:3:52;:27::29;;:31::33;;:26::34:1;:37::40:0;;:42::45;;:47::50;;:36::51:1;:12::52',
+      },
       source: fs.readFileSync(new URL('../valid-contract-files/2_of_3_multisig.cash', import.meta.url), { encoding: 'utf-8' }),
       compiler: {
         name: 'cashc',
@@ -222,6 +251,12 @@ export const fixtures: Fixture[] = [
         + 'OP_2DUP OP_EQUAL OP_NOT OP_VERIFY '
         // bytes x = b.split(b.length / 2)[1]
         + 'OP_SWAP OP_4 OP_SPLIT OP_DROP OP_EQUAL OP_NOT',
+      debug: {
+        bytecode: '00795179827752967f7700795279879169517a547f75517a8791',
+        logs: [],
+        requireMessages: [],
+        sourceMap: '3:18:3:19;;:26::27;;:::34;;:37::38;:26:::1;:18::39;:::42;4:16:4:17:0;;:21::22;;:16:::1;;:8::24;5:16:5:17:0;;:24::25;:16::26:1;:::29;:33::34:0;;:16:::1;',
+      },
       source: fs.readFileSync(new URL('../valid-contract-files/split_size.cash', import.meta.url), { encoding: 'utf-8' }),
       compiler: {
         name: 'cashc',
@@ -241,6 +276,12 @@ export const fixtures: Fixture[] = [
         'OP_DUP OP_RIPEMD160 OP_0 OP_HASH160 OP_EQUAL OP_1 OP_NOT OP_EQUALVERIFY '
         // require(checkSig(s, pk));
         + 'OP_CHECKSIG',
+      debug: {
+        bytecode: '0079a600a98751918769517a517aac',
+        logs: [],
+        requireMessages: [],
+        sourceMap: '3:33:3:35;;:17::37:1;:49::51:0;:41::52:1;:17;:57::61:0;:56;:17:::1;:8::64;4:25:4:26:0;;:28::30;;:16::31:1',
+      },
       source: fs.readFileSync(new URL('../valid-contract-files/cast_hash_checksig.cash', import.meta.url), { encoding: 'utf-8' }),
       compiler: {
         name: 'cashc',
@@ -286,6 +327,12 @@ export const fixtures: Fixture[] = [
         + 'OP_3 OP_ROLL OP_4 OP_ROLL OP_3 OP_ROLL OP_CHECKDATASIGVERIFY '
         // require(checkSig(ownerSig, ownerPk));
         + 'OP_CHECKSIG',
+      debug: {
+        bytecode: '5679547f517a81517a815179557aa269517ab175007a537aa269537a547a537aba69517a517aac',
+        logs: [],
+        requireMessages: [],
+        sourceMap: '14:49:14:62;;:69::70;:49::71:1;15:30:15:44:0;;:26::45:1;16:24:16:32:0;;:20::33:1;19:16:19:27:0;;:31::39;;:16:::1;:8::41;20:27:20:38:0;;:8::40:1;;23:16:23:21:0;;:25::36;;:16:::1;:8::38;27:12:27:21:0;;28::28:25;;29::29:20;;26:16:30:9:1;:8::11;31:25:31:33:0;;:35::42;;:16::43:1',
+      },
       source: fs.readFileSync(new URL('../valid-contract-files/hodl_vault.cash', import.meta.url), { encoding: 'utf-8' }),
       compiler: {
         name: 'cashc',
@@ -312,6 +359,12 @@ export const fixtures: Fixture[] = [
         // require(a > b + c + d + e + f);
         + 'OP_2ROT OP_5 OP_ROLL OP_ADD OP_4 OP_ROLL OP_ADD '
         + 'OP_3 OP_ROLL OP_ADD OP_ROT OP_ADD OP_GREATERTHAN',
+      debug: {
+        bytecode: '5152535455565579539f6353567a757c6b7c6b7c6b7c6b7c6c6c6c6c68557a557a557a93547a93537a93527a93a0',
+        logs: [],
+        requireMessages: [],
+        sourceMap: '3:16:3:17;4::4;5::5;6::6;7::7;8::8;10:12:10:13;;:16::17;:12:::1;:19:12:9:0;11:16:11:17;:12::18;;;;;;;;;;;;;;;;10:19:12:9:1;14:16:14:17:0;;:20::21;;:24::25;;:20:::1;:28::29:0;;:20:::1;:32::33:0;;:20:::1;:36::37:0;;:20:::1;:16',
+      },
       source: fs.readFileSync(new URL('../valid-contract-files/deep_replace.cash', import.meta.url), { encoding: 'utf-8' }),
       compiler: {
         name: 'cashc',
@@ -327,6 +380,12 @@ export const fixtures: Fixture[] = [
       constructorInputs: [],
       abi: [{ name: 'spend', inputs: [{ name: 'b', type: 'bytes4' }, { name: 'i', type: 'int' }] }],
       bytecode: 'OP_SWAP OP_4 OP_NUM2BIN OP_EQUAL', // require(b == bytes4(i))
+      debug: {
+        bytecode: '007a517a548087',
+        logs: [],
+        requireMessages: [],
+        sourceMap: '3:16:3:17;;:28::29;;:21::30:1;;:16',
+      },
       source: fs.readFileSync(new URL('../valid-contract-files/bounded_bytes.cash', import.meta.url), { encoding: 'utf-8' }),
       compiler: {
         name: 'cashc',
@@ -351,6 +410,12 @@ export const fixtures: Fixture[] = [
         'OP_TXVERSION OP_NUMEQUALVERIFY '
         // require(tx.bytecode == 0x00)
         + 'OP_ACTIVEBYTECODE 00 OP_EQUAL',
+      debug: {
+        bytecode: 'c2517a9c69c1010087',
+        logs: [],
+        requireMessages: [],
+        sourceMap: '3:16:3:26;:30::45;;:16:::1;:8::47;4:16:4:35:0;:39::43;:16:::1',
+      },
       source: fs.readFileSync(new URL('../valid-contract-files/covenant.cash', import.meta.url), { encoding: 'utf-8' }),
       compiler: {
         name: 'cashc',
@@ -406,6 +471,12 @@ export const fixtures: Fixture[] = [
         + 'OP_0 OP_OUTPUTTOKENCOMMITMENT 00 OP_EQUALVERIFY '
         // require(tx.outputs[0].tokenAmount == 100);
         + 'OP_0 OP_OUTPUTTOKENAMOUNT 64 OP_NUMEQUAL',
+      debug: {
+        bytecode: 'c2529c69c5009c69c3519c69c4519c69c0009c69c18277022c019c6900c60210279c6900c782770210279c6900c8200000000000000000000000000000000000000000000000000000000000000000876900c9009c6900ca827701649c6900cb009c6900cc0210279c6900cd827701649c6900ce200000000000000000000000000000000000000000000000000000000000000000876900cf0100876900d001649c6900d1200000000000000000000000000000000000000000000000000000000000000000876900d20100876900d301649c',
+        logs: [],
+        requireMessages: [],
+        sourceMap: '3:16:3:26;:30::31;:16:::1;:8::33;4:16:4:27:0;:31::32;:16:::1;:8::34;5:16:5:32:0;:36::37;:16:::1;:8::39;6:16:6:33:0;:37::38;:16:::1;:8::40;7:16:7:37:0;:41::42;:16:::1;:8::44;8:16:8:35:0;:::42;;:46::49;:16:::1;:8::51;9:26:9:27:0;:16::34;:38::43;:16:::1;:8::45;10:26:10:27:0;:16::44;:::51;;:55::60;:16:::1;:8::62;11:26:11:27:0;:16::52;:56::121;:16:::1;:8::123;12:26:12:27:0;:16::42;:46::47;:16:::1;:8::49;13:26:13:27:0;:16::46;:::53;;:57::60;:16:::1;:8::62;14:26:14:27:0;:16::43;:47::48;:16:::1;:8::50;15:27:15:28:0;:16::35;:39::44;:16:::1;:8::46;16:27:16:28:0;:16::45;:::52;;:56::59;:16:::1;:8::61;17:26:17:27:0;:16::42;:46::111;:16:::1;:8::113;18:26:18:27:0;:16::42;:46::50;:16:::1;:8::52;19:26:19:27:0;:16::40;:44::47;:16:::1;:8::49;20:27:20:28:0;:16::43;:47::112;:16:::1;:8::114;21:27:21:28:0;:16::43;:47::51;:16:::1;:8::53;22:27:22:28:0;:16::41;:45::48;:16:::1',
+      },
       source: fs.readFileSync(new URL('../valid-contract-files/covenant_all_fields.cash', import.meta.url), { encoding: 'utf-8' }),
       compiler: {
         name: 'cashc',
@@ -465,6 +536,12 @@ export const fixtures: Fixture[] = [
         + 'OP_4 OP_ROLL OP_4 OP_ROLL OP_CHECKSIG '
         // Cleanup
         + 'OP_NIP OP_NIP OP_NIP OP_ENDIF',
+      debug: {
+        bytecode: '5479009c63537ab27500cd0376a914527a7e0288ac7e876902e803c0c6007954799452799400795579547993a16300cc52795479949c696700cc55799c6951cdc0c7876951cc51799c69685177777777777767547a519c695479a9527a8769547a547aac77777768',
+        logs: [],
+        requireMessages: [],
+        sourceMap: '2:4:21:5;;;;;3:26:3:32;;:8::34:1;;6:27:6:28:0;:16::45;:49::84;:74::83;;:49::84;;;:16:::1;:8::86;8:23:8:27:0;9:37:9:58;:27::65;10:26:10:38;;:41::47;;:26:::1;:50::58:0;;:26:::1;14:12:14:23:0;;:27::33;;:36::44;;:27:::1;:12;:46:16:9:0;15:31:15:32;:20::39;:43::55;;:58::66;;:43:::1;:20;:12::68;16:15:20:9;17:31:17:32:0;:20::39;:43::49;;:20:::1;:12::51;18:31:18:32:0;:20::49;:63::84;:53::101;:20:::1;:12::103;19:31:19:32:0;:20::39;:43::54;;:20:::1;:12::56;16:15:20:9;2:4:21:5;;;;;;;;23::26::0;;;;;24:24:24:26;;:16::27:1;:31::37:0;;:16:::1;:8::39;25:25:25:26:0;;:28::30;;:16::31:1;23:4:26:5;;;1:0:27:1',
+      },
       source: fs.readFileSync(new URL('../valid-contract-files/mecenas.cash', import.meta.url), { encoding: 'utf-8' }),
       compiler: {
         name: 'cashc',
@@ -504,6 +581,12 @@ export const fixtures: Fixture[] = [
         + 'OP_1 OP_OUTPUTVALUE OP_OVER OP_NUMEQUALVERIFY OP_ENDIF '
         // Stack clean-up
         + 'OP_DROP OP_1',
+      debug: {
+        bytecode: '016a026d02827c7e7e4c624120636f6e7472616374206d6179206e6f7420696e6a75726520612068756d616e206265696e67206f722c207468726f75676820696e616374696f6e2c20616c6c6f7720612068756d616e206265696e6720746f20636f6d6520746f206861726d2e8276014ba063014c7c7e687c7e7e00cc009c6900cd517a876902e803c0c65179940079527aa26351cdc0c7876951cc51799c69685177',
+        logs: [],
+        requireMessages: [],
+        sourceMap: '10:29:13:10;11:12:11:18;;;;;12:18:12:118;:12::119;;;;;;;;;;;;16:27:16:28;:16::35;:39::40;:16:::1;:8::42;17:27:17:28:0;:16::45;:49::61;;:16:::1;:8::63;21:23:21:27:0;22:37:22:58;:27::65;:68::76;;:27:::1;23:12:23:24:0;;:28::36;;:12:::1;:38:26:9:0;24:31:24:32;:20::49;:63::84;:53::101;:20:::1;:12::103;25:31:25:32:0;:20::39;:43::55;;:20:::1;:12::57;23:38:26:9;8:4:27:5;',
+      },
       source: fs.readFileSync(new URL('../valid-contract-files/announcement.cash', import.meta.url), { encoding: 'utf-8' }),
       compiler: {
         name: 'cashc',
@@ -521,6 +604,12 @@ export const fixtures: Fixture[] = [
         { name: 'spend', inputs: [{ name: 'palindrome', type: 'string' }] },
       ],
       bytecode: 'OP_DUP OP_REVERSEBYTES OP_EQUAL',
+      debug: {
+        bytecode: '0079bc517a87',
+        logs: [],
+        requireMessages: [],
+        sourceMap: '3:16:3:26;;:::36;:40::50;;:16:::1',
+      },
       source: fs.readFileSync(new URL('../valid-contract-files/p2palindrome.cash', import.meta.url), { encoding: 'utf-8' }),
       compiler: {
         name: 'cashc',
@@ -538,6 +627,12 @@ export const fixtures: Fixture[] = [
         { name: 'spend', inputs: [{ name: 'size', type: 'int' }] },
       ],
       bytecode: 'OP_10 OP_SWAP OP_NUM2BIN OP_BIN2NUM OP_10 OP_NUMEQUAL',
+      debug: {
+        bytecode: '5a517a80007a815a9c',
+        logs: [],
+        requireMessages: [],
+        sourceMap: '3:28:3:30;:32::36;;:22::37;4:20:4:25;;:16::26:1;:30::32:0;:16:::1',
+      },
       source: fs.readFileSync(new URL('../valid-contract-files/num2bin_variable.cash', import.meta.url), { encoding: 'utf-8' }),
       compiler: {
         name: 'cashc',
@@ -546,4 +641,27 @@ export const fixtures: Fixture[] = [
       updatedAt: '',
     },
   },
+  {
+    fn: 'debug_messages.cash',
+    artifact: {
+      contractName: 'DebugMessages',
+      constructorInputs: [],
+      abi: [
+        { name: 'spend', inputs: [{ name: 'value', type: 'int' }] },
+      ],
+      bytecode: 'OP_1 OP_NUMEQUAL',
+      debug: {
+        bytecode: '007a519c',
+        logs: [{ data: [{ stackIndex: 0, type: 'int' }, 'test'], ip: 0, line: 3 }],
+        requireMessages: [{ ip: 4, line: 4, message: 'Wrong value passed' }],
+        sourceMap: '4:12:4:17;;:21::22;:12:::1',
+      },
+      source: fs.readFileSync(new URL('../valid-contract-files/debug_messages.cash', import.meta.url), { encoding: 'utf-8' }),
+      compiler: {
+        name: 'cashc',
+        version,
+      },
+      updatedAt: '',
+    },
+  },
 ];
diff --git a/packages/cashc/test/generation/generation.test.ts b/packages/cashc/test/generation/generation.test.ts
index 7d9d0934..f3511186 100644
--- a/packages/cashc/test/generation/generation.test.ts
+++ b/packages/cashc/test/generation/generation.test.ts
@@ -6,13 +6,12 @@
 import { URL } from 'url';
 import { compileFile } from '../../src/index.js';
 import { fixtures } from './fixtures.js';
-import { stripArtifact } from '../../src/artifact/Artifact.js';
 
 describe('Code generation & target code optimisation', () => {
   fixtures.forEach((fixture) => {
     it(`should compile ${fixture.fn} to correct Script and artifact`, () => {
       const artifact = compileFile(new URL(`../valid-contract-files/${fixture.fn}`, import.meta.url));
-      expect(stripArtifact(artifact)).toEqual({ ...fixture.artifact, updatedAt: expect.any(String) });
+      expect(artifact).toEqual({ ...fixture.artifact, updatedAt: expect.any(String) });
     });
   });
 });
diff --git a/packages/cashc/test/valid-contract-files/debug_messages.cash b/packages/cashc/test/valid-contract-files/debug_messages.cash
new file mode 100644
index 00000000..fcb88c7b
--- /dev/null
+++ b/packages/cashc/test/valid-contract-files/debug_messages.cash
@@ -0,0 +1,6 @@
+contract DebugMessages() {
+  function spend(int value) {
+    console.log(value, "test");
+    require(value == 1, "Wrong value passed");
+  }
+}

From 8b574dbe5208a1504187915aa5a7a0917e61048e Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Wed, 3 Jan 2024 12:01:59 +0100
Subject: [PATCH 052/171] Add AST test cases for debug messages

---
 packages/cashc/src/ast/AST.ts            |  1 +
 packages/cashc/test/ast/Location.test.ts |  8 +++---
 packages/cashc/test/ast/fixtures.ts      | 31 ++++++++++++++++++++++++
 3 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/packages/cashc/src/ast/AST.ts b/packages/cashc/src/ast/AST.ts
index 3250bfe1..b12081dd 100644
--- a/packages/cashc/src/ast/AST.ts
+++ b/packages/cashc/src/ast/AST.ts
@@ -366,6 +366,7 @@ export class ConsoleStatementNode extends Node {
   }
 }
 
+// TODO: Couldn't we just use existing nodes for this? e.g. IdentifierNode + StringLiteralNode etc.
 export class ConsoleParameterNode extends Node {
   constructor(
     public message?: string,
diff --git a/packages/cashc/test/ast/Location.test.ts b/packages/cashc/test/ast/Location.test.ts
index 23ff9248..b99557d1 100644
--- a/packages/cashc/test/ast/Location.test.ts
+++ b/packages/cashc/test/ast/Location.test.ts
@@ -24,7 +24,7 @@ contract test() {
 }`;
   };
 
-  describe('should produce same bytecode', () => {
+  describe('Line to ASM map generation', () => {
     const blocks = [
       '1 < 1', '1 <= 1', '1 == 1', '1 != 1', '1 > 1', '1 >= 1',
       '(1 - 1) == 1', '(1 + 1) == 1', '(1 * 1) == 1', '(1 / 1) == 1',
@@ -42,7 +42,7 @@ contract test() {
     ];
 
     blocks.forEach(block => {
-      it(`should test ${block}`, () => {
+      it(`it should generate the same bytecode using line-to-asm map as the regular compiler for: ${block}`, () => {
         {
           const source = wrap(block);
 
@@ -50,12 +50,12 @@ contract test() {
           const artifact = compileString(source);
           const expected = bytecodeToAsm(hexToBin(artifact.debug!.bytecode));
 
-          // Generate the opCodeMap from the source code
+          // Generate the line-to-asm map from the source code
           const opCodeMap = buildLineToAsmMap(
             bytecodeToScript(hexToBin(artifact.debug!.bytecode)), artifact.debug!.sourceMap,
           );
 
-          // Convert the opCodeMap to CashScript bytecode to make sure that the generated opcode map matches the
+          // Convert the line-to-asm map to CashScript bytecode to make sure that the generated opcode map matches the
           // bytecode generated by CashScript
           const received = Object.values(opCodeMap).join(' ')
             .replaceAll('<0x', '').replaceAll('>', '').replace(/\s+/g, ' ');
diff --git a/packages/cashc/test/ast/fixtures.ts b/packages/cashc/test/ast/fixtures.ts
index 14593cd2..34d0933a 100644
--- a/packages/cashc/test/ast/fixtures.ts
+++ b/packages/cashc/test/ast/fixtures.ts
@@ -24,6 +24,8 @@ import {
   HexLiteralNode,
   UnaryOpNode,
   InstantiationNode,
+  ConsoleStatementNode,
+  ConsoleParameterNode,
 } from '../../src/ast/AST.js';
 import { BinaryOperator, NullaryOperator, UnaryOperator } from '../../src/ast/Operator.js';
 import { Class, TimeOp } from '../../src/ast/Globals.js';
@@ -887,4 +889,33 @@ export const fixtures: Fixture[] = [
       ),
     ),
   },
+  {
+    fn: 'debug_messages.cash',
+    ast: new SourceFileNode(
+      new ContractNode(
+        'DebugMessages',
+        [],
+        [
+          new FunctionDefinitionNode(
+            'spend',
+            [new ParameterNode(PrimitiveType.INT, 'value')],
+            new BlockNode([
+              new ConsoleStatementNode([
+                new ConsoleParameterNode(undefined, 'value'),
+                new ConsoleParameterNode('test'),
+              ]),
+              new RequireNode(
+                new BinaryOpNode(
+                  new IdentifierNode('value'),
+                  BinaryOperator.EQ,
+                  new IntLiteralNode(1n),
+                ),
+                'Wrong value passed',
+              ),
+            ]),
+          ),
+        ],
+      ),
+    ),
+  },
 ];

From dc566a7b379926e26df626435a5f6966d234f25c Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Wed, 10 Jan 2024 10:20:00 +0100
Subject: [PATCH 053/171] Move the JestExtensions file into the src directory

---
 packages/cashscript/{ => src}/test/JestExtensions.ts | 2 +-
 packages/cashscript/test/LibauthTemplate.test.ts     | 2 +-
 packages/cashscript/tsconfig.build.json              | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)
 rename packages/cashscript/{ => src}/test/JestExtensions.ts (98%)

diff --git a/packages/cashscript/test/JestExtensions.ts b/packages/cashscript/src/test/JestExtensions.ts
similarity index 98%
rename from packages/cashscript/test/JestExtensions.ts
rename to packages/cashscript/src/test/JestExtensions.ts
index 76e0185b..7d4de86a 100644
--- a/packages/cashscript/test/JestExtensions.ts
+++ b/packages/cashscript/src/test/JestExtensions.ts
@@ -1,7 +1,7 @@
 import { MatcherContext } from '@jest/expect';
 import { SyncExpectationResult } from 'expect';
 import { printExpected, printReceived, matcherHint } from 'jest-matcher-utils';
-import { Transaction } from '../src/index.js';
+import { Transaction } from '../index.js';
 
 export {};
 
diff --git a/packages/cashscript/test/LibauthTemplate.test.ts b/packages/cashscript/test/LibauthTemplate.test.ts
index 9eb9cd8f..20d57139 100644
--- a/packages/cashscript/test/LibauthTemplate.test.ts
+++ b/packages/cashscript/test/LibauthTemplate.test.ts
@@ -3,7 +3,7 @@ import { Contract, MockNetworkProvider, SignatureTemplate } from '../src/index.j
 import {
   alicePriv, alicePub, bobPriv, bobPub,
 } from './fixture/vars.js';
-import './JestExtensions.js';
+import '../src/test/JestExtensions.js';
 import { randomUtxo } from '../src/utils.js';
 
 describe('Libauth template generation tests', () => {
diff --git a/packages/cashscript/tsconfig.build.json b/packages/cashscript/tsconfig.build.json
index 48a56f11..e4239e0e 100644
--- a/packages/cashscript/tsconfig.build.json
+++ b/packages/cashscript/tsconfig.build.json
@@ -7,7 +7,6 @@
 
   "include": [
     "src/**/*",
-    "test/JestExtensions.ts",
   ],
 
   "exclude": [

From a79bb34d39e535b40b81b14dd3414d5b7cd0fa3c Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Wed, 10 Jan 2024 10:21:47 +0100
Subject: [PATCH 054/171] Bump version to 0.10.0-next.1

---
 examples/package.json            | 6 +++---
 packages/cashc/package.json      | 4 ++--
 packages/cashc/src/index.ts      | 2 +-
 packages/cashscript/package.json | 4 ++--
 packages/utils/package.json      | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/examples/package.json b/examples/package.json
index e839702d..4c8e350a 100644
--- a/examples/package.json
+++ b/examples/package.json
@@ -1,7 +1,7 @@
 {
   "name": "cashscript-examples",
   "private": true,
-  "version": "0.10.0-next.0",
+  "version": "0.10.0-next.1",
   "description": "Usage examples of the CashScript SDK",
   "main": "p2pkh.js",
   "type": "module",
@@ -14,8 +14,8 @@
     "@bitauth/libauth": "^2.0.0-alpha.8",
     "@types/node": "^12.7.8",
     "bip39": "^3.0.4",
-    "cashc": "^0.10.0-next.0",
-    "cashscript": "^0.10.0-next.0",
+    "cashc": "^0.10.0-next.1",
+    "cashscript": "^0.10.0-next.1",
     "eslint": "^8.56.0",
     "typescript": "^4.9.5"
   }
diff --git a/packages/cashc/package.json b/packages/cashc/package.json
index f6509938..17039dcd 100644
--- a/packages/cashc/package.json
+++ b/packages/cashc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cashc",
-  "version": "0.10.0-next.0",
+  "version": "0.10.0-next.1",
   "description": "Compile Bitcoin Cash contracts to Bitcoin Cash Script or artifacts",
   "keywords": [
     "bitcoin",
@@ -50,7 +50,7 @@
   },
   "dependencies": {
     "@bitauth/libauth": "^2.0.0-alpha.8",
-    "@cashscript/utils": "^0.10.0-next.0",
+    "@cashscript/utils": "^0.10.0-next.1",
     "antlr4ts": "^0.5.0-alpha.4",
     "commander": "^7.1.0",
     "semver": "^7.3.4"
diff --git a/packages/cashc/src/index.ts b/packages/cashc/src/index.ts
index 28b8f48e..eb8f7e76 100644
--- a/packages/cashc/src/index.ts
+++ b/packages/cashc/src/index.ts
@@ -2,4 +2,4 @@ export * from './Errors.js';
 export * as utils from '@cashscript/utils';
 export { compileFile, compileString } from './compiler.js';
 
-export const version = '0.10.0-next.0';
+export const version = '0.10.0-next.1';
diff --git a/packages/cashscript/package.json b/packages/cashscript/package.json
index d17f0464..3a091e3d 100644
--- a/packages/cashscript/package.json
+++ b/packages/cashscript/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cashscript",
-  "version": "0.10.0-next.0",
+  "version": "0.10.0-next.1",
   "description": "Easily write and interact with Bitcoin Cash contracts",
   "keywords": [
     "bitcoin cash",
@@ -44,7 +44,7 @@
   },
   "dependencies": {
     "@bitauth/libauth": "^2.0.0-alpha.8",
-    "@cashscript/utils": "^0.10.0-next.0",
+    "@cashscript/utils": "^0.10.0-next.1",
     "bip68": "^1.0.4",
     "bitcoin-rpc-promise-retry": "^1.3.0",
     "delay": "^5.0.0",
diff --git a/packages/utils/package.json b/packages/utils/package.json
index 9eb99c0d..b0f49088 100644
--- a/packages/utils/package.json
+++ b/packages/utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cashscript/utils",
-  "version": "0.10.0-next.0",
+  "version": "0.10.0-next.1",
   "description": "CashScript utilities and types",
   "keywords": [
     "bitcoin cash",

From 40c575741c526637ce43b20ec664ac8a0e84d606 Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Wed, 10 Jan 2024 10:27:27 +0100
Subject: [PATCH 055/171] Add DEVELOPMENT.md

---
 DEVELOPMENT.md | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 DEVELOPMENT.md

diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
new file mode 100644
index 00000000..007830f7
--- /dev/null
+++ b/DEVELOPMENT.md
@@ -0,0 +1,7 @@
+We use yarn workspaces + lerna for monorepo management. So to get started, clone this repository and run `yarn` in the root directory to install all dependencies for all packages.
+
+When updating code in one package, you can run `yarn build` in the root directory to build all packages so the changes get propagated to the other packages as well.
+
+### Publishing a release
+
+To publish a new release, we use `yarn update-version 'x.x.x'` in the root directory to bump the version before release, and then `yarn publish-all` in the root directory to publish the release. In case of a tagged release (such as `next`), we use `yarn publish-all --dist-tag <tag name>` to publish the release with the specified tag.

From 1370c6b1b1489b96964b6df4a860709cd73a06cc Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Wed, 10 Jan 2024 10:33:44 +0100
Subject: [PATCH 056/171] Fix tests

---
 packages/utils/test/bitauth-script.test.ts    |  4 +-
 .../test/fixtures/bitauth-script.fixture.ts   | 82 +++++++++----------
 2 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/packages/utils/test/bitauth-script.test.ts b/packages/utils/test/bitauth-script.test.ts
index fda79864..4e74961d 100644
--- a/packages/utils/test/bitauth-script.test.ts
+++ b/packages/utils/test/bitauth-script.test.ts
@@ -16,8 +16,8 @@ describe('Libauth Script formatting', () => {
       });
 
       it('should format script as debugging output for BitAuth IDE', () => {
-        expect(formatBitAuthScript(scriptBytecode, fixture.sourceMap, fixture.sourceCode))
-          .toBe(fixture.expectedBitAuthScript);
+        const expectedBitAuthScript = fixture.expectedBitAuthScript.replace(/^\n+/, '').replace(/\n+$/, '');
+        expect(formatBitAuthScript(scriptBytecode, fixture.sourceMap, fixture.sourceCode)).toBe(expectedBitAuthScript);
       });
     });
   });
diff --git a/packages/utils/test/fixtures/bitauth-script.fixture.ts b/packages/utils/test/fixtures/bitauth-script.fixture.ts
index 63c760be..8bf67016 100644
--- a/packages/utils/test/fixtures/bitauth-script.fixture.ts
+++ b/packages/utils/test/fixtures/bitauth-script.fixture.ts
@@ -127,13 +127,13 @@ contract Mecenas(bytes20 recipient, bytes20 funder, int pledge/*, int period */)
     sourceMap: '9:4:28:5;;;;;13:27:13:28;:16::45;:49::84;:74::83;;:49::84;;;:16:::1;:8::86;15:23:15:27:0;16:37:16:58;:27::65;17:26:17:38;;:41::47;;:26:::1;:50::58:0;;:26:::1;21:12:21:23:0;;:27::33;;:36::44;;:27:::1;:12;:46:23:9:0;22:31:22:32;:20::39;:43::55;;:58::66;;:43:::1;:20;:12::68;23:15:27:9;24:31:24:32:0;:20::39;:43::49;;:20:::1;:12::51;25:31:25:32:0;:20::49;:63::84;:53::101;:20:::1;:12::103;26:31:26:32:0;:20::39;:43::54;;:20:::1;:12::56;23:15:27:9;9:4:28:5;;;;;;;;30::33::0;;;;;31:24:31:26;;:16::27:1;:31::37:0;;:16:::1;:8::39;32:25:32:26:0;;:28::30;;:16::31:1;30:4:33:5;;8:0:34:1',
     expectedLineToOpcodeMap: {
       9: [Op.OP_3, Op.OP_PICK, new Uint8Array([]), Op.OP_NUMEQUAL, Op.OP_IF],
-      13: [Op.OP_0, Op.OP_OUTPUTBYTECODE, hexToBin('76a914'), Op.OP_2, Op.OP_ROLL, Op.OP_CAT, hexToBin('88ac'), Op.OP_CAT, Op.OP_EQUAL, Op.OP_VERIFY],
+      13: [new Uint8Array([]), Op.OP_OUTPUTBYTECODE, hexToBin('76a914'), Op.OP_2, Op.OP_ROLL, Op.OP_CAT, hexToBin('88ac'), Op.OP_CAT, Op.OP_EQUAL, Op.OP_VERIFY],
       15: [hexToBin('e803')],
       16: [Op.OP_INPUTINDEX, Op.OP_UTXOVALUE],
-      17: [Op.OP_0, Op.OP_PICK, Op.OP_4, Op.OP_PICK, Op.OP_SUB, Op.OP_2, Op.OP_PICK, Op.OP_SUB],
-      21: [Op.OP_0, Op.OP_PICK, Op.OP_5, Op.OP_PICK, Op.OP_4, Op.OP_PICK, Op.OP_ADD, Op.OP_LESSTHANOREQUAL, Op.OP_IF],
-      22: [Op.OP_0, Op.OP_OUTPUTVALUE, Op.OP_2, Op.OP_PICK, Op.OP_4, Op.OP_PICK, Op.OP_SUB, Op.OP_NUMEQUAL, Op.OP_VERIFY],
-      24: [Op.OP_0, Op.OP_OUTPUTVALUE, Op.OP_5, Op.OP_PICK, Op.OP_NUMEQUAL, Op.OP_VERIFY],
+      17: [new Uint8Array([]), Op.OP_PICK, Op.OP_4, Op.OP_PICK, Op.OP_SUB, Op.OP_2, Op.OP_PICK, Op.OP_SUB],
+      21: [new Uint8Array([]), Op.OP_PICK, Op.OP_5, Op.OP_PICK, Op.OP_4, Op.OP_PICK, Op.OP_ADD, Op.OP_LESSTHANOREQUAL, Op.OP_IF],
+      22: [new Uint8Array([]), Op.OP_OUTPUTVALUE, Op.OP_2, Op.OP_PICK, Op.OP_4, Op.OP_PICK, Op.OP_SUB, Op.OP_NUMEQUAL, Op.OP_VERIFY],
+      24: [new Uint8Array([]), Op.OP_OUTPUTVALUE, Op.OP_5, Op.OP_PICK, Op.OP_NUMEQUAL, Op.OP_VERIFY],
       25: [Op.OP_1, Op.OP_OUTPUTBYTECODE, Op.OP_INPUTINDEX, Op.OP_UTXOBYTECODE, Op.OP_EQUAL, Op.OP_VERIFY],
       26: [Op.OP_1, Op.OP_OUTPUTVALUE, Op.OP_1, Op.OP_PICK, Op.OP_NUMEQUAL, Op.OP_VERIFY],
       27: [Op.OP_ELSE, Op.OP_ENDIF],
@@ -164,41 +164,41 @@ contract Mecenas(bytes20 recipient, bytes20 funder, int pledge/*, int period */)
       34: 'OP_ENDIF',
     },
     expectedBitAuthScript: `
-                                                                                             /*                                                                                                                    */
-                                                                                             /* pragma cashscript >=0.8.0;                                                                                         */
-                                                                                             /*                                                                                                                    */
-                                                                                             /* /* This is an unofficial CashScript port of Licho's Mecenas contract. It is                                        */
-                                                                                             /*  * not compatible with Licho's EC plugin, but rather meant as a demonstration                                      */
-                                                                                             /*  * of covenants in CashScript.                                                                                     */
-                                                                                             /*  * The time checking has been removed so it can be tested without time requirements.                               */
-                                                                                             /*  */                                                                                                                */
-    OP_3 OP_PICK OP_0 OP_NUMEQUAL OP_IF                                                      /* contract Mecenas(bytes20 recipient, bytes20 funder, int pledge/*, int period */) {                                 */
-                                                                                             /*     function receive() {                                                                                           */
-                                                                                             /*         // require(tx.age >= period);                                                                              */
-                                                                                             /*                                                                                                                    */
-    OP_0 OP_OUTPUTBYTECODE <0x76a914> OP_2 OP_ROLL OP_CAT <0x88ac> OP_CAT OP_EQUAL OP_VERIFY /*         // Check that the first output sends to the recipient                                                      */
-                                                                                             /*         require(tx.outputs[0].lockingBytecode == new LockingBytecodeP2PKH(recipient));                             */
-    <0xe803>                                                                                 /*                                                                                                                    */
-    OP_INPUTINDEX OP_UTXOVALUE                                                               /*         int minerFee = 1000;                                                                                       */
-    OP_0 OP_PICK OP_4 OP_PICK OP_SUB OP_2 OP_PICK OP_SUB                                     /*         int currentValue = tx.inputs[this.activeInputIndex].value;                                                 */
-                                                                                             /*         int changeValue = currentValue - pledge - minerFee;                                                        */
-                                                                                             /*                                                                                                                    */
-                                                                                             /*         // If there is not enough left for *another* pledge after this one, we send the remainder to the recipient */
-    OP_0 OP_PICK OP_5 OP_PICK OP_4 OP_PICK OP_ADD OP_LESSTHANOREQUAL OP_IF                   /*         // Otherwise we send the remainder to the recipient and the change back to the contract                    */
-    OP_0 OP_OUTPUTVALUE OP_2 OP_PICK OP_4 OP_PICK OP_SUB OP_NUMEQUAL OP_VERIFY               /*         if (changeValue <= pledge + minerFee) {                                                                    */
-                                                                                             /*             require(tx.outputs[0].value == currentValue - minerFee);                                               */
-    OP_0 OP_OUTPUTVALUE OP_5 OP_PICK OP_NUMEQUAL OP_VERIFY                                   /*         } else {                                                                                                   */
-    OP_1 OP_OUTPUTBYTECODE OP_INPUTINDEX OP_UTXOBYTECODE OP_EQUAL OP_VERIFY                  /*             require(tx.outputs[0].value == pledge);                                                                */
-    OP_1 OP_OUTPUTVALUE OP_1 OP_PICK OP_NUMEQUAL OP_VERIFY                                   /*             require(tx.outputs[1].lockingBytecode == tx.inputs[this.activeInputIndex].lockingBytecode);            */
-    OP_ELSE OP_ENDIF                                                                         /*             require(tx.outputs[1].value == changeValue);                                                           */
-    OP_1 OP_NIP OP_NIP OP_NIP OP_NIP OP_NIP OP_NIP OP_ELSE                                   /*         }                                                                                                          */
-                                                                                             /*     }                                                                                                              */
-    OP_3 OP_ROLL OP_1 OP_NUMEQUAL OP_VERIFY                                                  /*                                                                                                                    */
-    OP_3 OP_PICK OP_HASH160 OP_2 OP_ROLL OP_EQUAL OP_VERIFY                                  /*     function reclaim(pubkey pk, sig s) {                                                                           */
-    OP_3 OP_ROLL OP_3 OP_ROLL OP_CHECKSIG                                                    /*         require(hash160(pk) == funder);                                                                            */
-    OP_NIP OP_NIP                                                                            /*         require(checkSig(s, pk));                                                                                  */
-    OP_ENDIF                                                                                 /*     }                                                                                                              */
-                                                                                             /* }                                                                                                                  */
-`,
+                                                                                         /*                                                                                                                    */
+                                                                                         /* pragma cashscript >=0.8.0;                                                                                         */
+                                                                                         /*                                                                                                                    */
+                                                                                         /* /* This is an unofficial CashScript port of Licho's Mecenas contract. It is                                        */
+                                                                                         /*  * not compatible with Licho's EC plugin, but rather meant as a demonstration                                      */
+                                                                                         /*  * of covenants in CashScript.                                                                                     */
+                                                                                         /*  * The time checking has been removed so it can be tested without time requirements.                               */
+                                                                                         /*  */                                                                                                                */
+OP_3 OP_PICK OP_0 OP_NUMEQUAL OP_IF                                                      /* contract Mecenas(bytes20 recipient, bytes20 funder, int pledge/*, int period */) {                                 */
+                                                                                         /*     function receive() {                                                                                           */
+                                                                                         /*         // require(tx.age >= period);                                                                              */
+                                                                                         /*                                                                                                                    */
+OP_0 OP_OUTPUTBYTECODE <0x76a914> OP_2 OP_ROLL OP_CAT <0x88ac> OP_CAT OP_EQUAL OP_VERIFY /*         // Check that the first output sends to the recipient                                                      */
+                                                                                         /*         require(tx.outputs[0].lockingBytecode == new LockingBytecodeP2PKH(recipient));                             */
+<0xe803>                                                                                 /*                                                                                                                    */
+OP_INPUTINDEX OP_UTXOVALUE                                                               /*         int minerFee = 1000;                                                                                       */
+OP_0 OP_PICK OP_4 OP_PICK OP_SUB OP_2 OP_PICK OP_SUB                                     /*         int currentValue = tx.inputs[this.activeInputIndex].value;                                                 */
+                                                                                         /*         int changeValue = currentValue - pledge - minerFee;                                                        */
+                                                                                         /*                                                                                                                    */
+                                                                                         /*         // If there is not enough left for *another* pledge after this one, we send the remainder to the recipient */
+OP_0 OP_PICK OP_5 OP_PICK OP_4 OP_PICK OP_ADD OP_LESSTHANOREQUAL OP_IF                   /*         // Otherwise we send the remainder to the recipient and the change back to the contract                    */
+OP_0 OP_OUTPUTVALUE OP_2 OP_PICK OP_4 OP_PICK OP_SUB OP_NUMEQUAL OP_VERIFY               /*         if (changeValue <= pledge + minerFee) {                                                                    */
+                                                                                         /*             require(tx.outputs[0].value == currentValue - minerFee);                                               */
+OP_0 OP_OUTPUTVALUE OP_5 OP_PICK OP_NUMEQUAL OP_VERIFY                                   /*         } else {                                                                                                   */
+OP_1 OP_OUTPUTBYTECODE OP_INPUTINDEX OP_UTXOBYTECODE OP_EQUAL OP_VERIFY                  /*             require(tx.outputs[0].value == pledge);                                                                */
+OP_1 OP_OUTPUTVALUE OP_1 OP_PICK OP_NUMEQUAL OP_VERIFY                                   /*             require(tx.outputs[1].lockingBytecode == tx.inputs[this.activeInputIndex].lockingBytecode);            */
+OP_ELSE OP_ENDIF                                                                         /*             require(tx.outputs[1].value == changeValue);                                                           */
+OP_1 OP_NIP OP_NIP OP_NIP OP_NIP OP_NIP OP_NIP OP_ELSE                                   /*         }                                                                                                          */
+                                                                                         /*     }                                                                                                              */
+OP_3 OP_ROLL OP_1 OP_NUMEQUAL OP_VERIFY                                                  /*                                                                                                                    */
+OP_3 OP_PICK OP_HASH160 OP_2 OP_ROLL OP_EQUAL OP_VERIFY                                  /*     function reclaim(pubkey pk, sig s) {                                                                           */
+OP_3 OP_ROLL OP_3 OP_ROLL OP_CHECKSIG                                                    /*         require(hash160(pk) == funder);                                                                            */
+OP_NIP OP_NIP                                                                            /*         require(checkSig(s, pk));                                                                                  */
+OP_ENDIF                                                                                 /*     }                                                                                                              */
+                                                                                         /* }                                                                                                                  */
+`.replace(/^\n+/, '').replace(/\n+$/, ''),
   },
 ];

From 591f71f3c980f54be3b14ef578889d1c4f4d4d9e Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Wed, 10 Jan 2024 10:50:14 +0100
Subject: [PATCH 057/171] Fix interfaces import

---
 .gitignore                                 | 2 ++
 packages/cashscript/src/LibauthTemplate.ts | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index f2b6e1e1..1945b137 100644
--- a/.gitignore
+++ b/.gitignore
@@ -105,3 +105,5 @@ typings/
 
 # DynamoDB Local files
 .dynamodb/
+
+manual-test.ts
diff --git a/packages/cashscript/src/LibauthTemplate.ts b/packages/cashscript/src/LibauthTemplate.ts
index 4e16aa40..cfc2018e 100644
--- a/packages/cashscript/src/LibauthTemplate.ts
+++ b/packages/cashscript/src/LibauthTemplate.ts
@@ -30,7 +30,7 @@ import {
   LibauthOutput,
   Utxo,
   isUtxoP2PKH,
-} from '../src/interfaces.js';
+} from './interfaces.js';
 import { Argument, encodeArgument as csEncodeArgument } from './Argument.js';
 import SignatureTemplate from './SignatureTemplate.js';
 import { Transaction } from './Transaction.js';

From 61950f8f8d4e62d60ff1bf38c74591286791fe68 Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Wed, 10 Jan 2024 10:53:02 +0100
Subject: [PATCH 058/171] Bump version to 0.10.0-next.2

---
 examples/package.json            | 6 +++---
 packages/cashc/package.json      | 4 ++--
 packages/cashc/src/index.ts      | 2 +-
 packages/cashscript/package.json | 4 ++--
 packages/utils/package.json      | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/examples/package.json b/examples/package.json
index 4c8e350a..a6faa511 100644
--- a/examples/package.json
+++ b/examples/package.json
@@ -1,7 +1,7 @@
 {
   "name": "cashscript-examples",
   "private": true,
-  "version": "0.10.0-next.1",
+  "version": "0.10.0-next.2",
   "description": "Usage examples of the CashScript SDK",
   "main": "p2pkh.js",
   "type": "module",
@@ -14,8 +14,8 @@
     "@bitauth/libauth": "^2.0.0-alpha.8",
     "@types/node": "^12.7.8",
     "bip39": "^3.0.4",
-    "cashc": "^0.10.0-next.1",
-    "cashscript": "^0.10.0-next.1",
+    "cashc": "^0.10.0-next.2",
+    "cashscript": "^0.10.0-next.2",
     "eslint": "^8.56.0",
     "typescript": "^4.9.5"
   }
diff --git a/packages/cashc/package.json b/packages/cashc/package.json
index 17039dcd..b0216a8c 100644
--- a/packages/cashc/package.json
+++ b/packages/cashc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cashc",
-  "version": "0.10.0-next.1",
+  "version": "0.10.0-next.2",
   "description": "Compile Bitcoin Cash contracts to Bitcoin Cash Script or artifacts",
   "keywords": [
     "bitcoin",
@@ -50,7 +50,7 @@
   },
   "dependencies": {
     "@bitauth/libauth": "^2.0.0-alpha.8",
-    "@cashscript/utils": "^0.10.0-next.1",
+    "@cashscript/utils": "^0.10.0-next.2",
     "antlr4ts": "^0.5.0-alpha.4",
     "commander": "^7.1.0",
     "semver": "^7.3.4"
diff --git a/packages/cashc/src/index.ts b/packages/cashc/src/index.ts
index eb8f7e76..4273a82c 100644
--- a/packages/cashc/src/index.ts
+++ b/packages/cashc/src/index.ts
@@ -2,4 +2,4 @@ export * from './Errors.js';
 export * as utils from '@cashscript/utils';
 export { compileFile, compileString } from './compiler.js';
 
-export const version = '0.10.0-next.1';
+export const version = '0.10.0-next.2';
diff --git a/packages/cashscript/package.json b/packages/cashscript/package.json
index 3a091e3d..d85b4006 100644
--- a/packages/cashscript/package.json
+++ b/packages/cashscript/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cashscript",
-  "version": "0.10.0-next.1",
+  "version": "0.10.0-next.2",
   "description": "Easily write and interact with Bitcoin Cash contracts",
   "keywords": [
     "bitcoin cash",
@@ -44,7 +44,7 @@
   },
   "dependencies": {
     "@bitauth/libauth": "^2.0.0-alpha.8",
-    "@cashscript/utils": "^0.10.0-next.1",
+    "@cashscript/utils": "^0.10.0-next.2",
     "bip68": "^1.0.4",
     "bitcoin-rpc-promise-retry": "^1.3.0",
     "delay": "^5.0.0",
diff --git a/packages/utils/package.json b/packages/utils/package.json
index b0f49088..30e6c48c 100644
--- a/packages/utils/package.json
+++ b/packages/utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cashscript/utils",
-  "version": "0.10.0-next.1",
+  "version": "0.10.0-next.2",
   "description": "CashScript utilities and types",
   "keywords": [
     "bitcoin cash",

From 23f2f6fc78f6a911dfe559404be7741aa824e791 Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Wed, 10 Jan 2024 10:55:11 +0100
Subject: [PATCH 059/171] Increase size of 'randomUtxo' for test purposes

---
 packages/cashscript/src/utils.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/cashscript/src/utils.ts b/packages/cashscript/src/utils.ts
index a35f64b9..c9601ad3 100644
--- a/packages/cashscript/src/utils.ts
+++ b/packages/cashscript/src/utils.ts
@@ -343,7 +343,7 @@ export const randomUtxo = (defaults?: Partial<Utxo>): Utxo => ({
   ...{
     txid: binToHex(sha256(bigIntToVmNumber(randomInt()))),
     vout: Math.floor(Math.random() * 10),
-    satoshis: 20000n + randomInt(),
+    satoshis: 100_000n + randomInt(),
   },
   ...defaults,
 });
@@ -351,7 +351,7 @@ export const randomUtxo = (defaults?: Partial<Utxo>): Utxo => ({
 export const randomToken = (defaults?: Partial<TokenDetails>): TokenDetails => ({
   ...{
     category: binToHex(sha256(bigIntToVmNumber(randomInt()))),
-    amount: 10000n + randomInt(),
+    amount: 100_000n + randomInt(),
   },
   ...defaults,
 });

From 112779dc39569d41b28c15828bd179dcf6b7232a Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Thu, 18 Jan 2024 10:28:25 +0100
Subject: [PATCH 060/171] Update libauth to latest stable release

---
 packages/cashc/package.json                |  4 +--
 packages/cashscript/package.json           |  2 +-
 packages/cashscript/src/LibauthTemplate.ts | 40 +++++++++++-----------
 packages/cashscript/src/Transaction.ts     |  4 +--
 packages/cashscript/src/utils.ts           |  4 +--
 packages/utils/package.json                |  2 +-
 yarn.lock                                  |  5 +++
 7 files changed, 33 insertions(+), 28 deletions(-)

diff --git a/packages/cashc/package.json b/packages/cashc/package.json
index b0216a8c..046a9b38 100644
--- a/packages/cashc/package.json
+++ b/packages/cashc/package.json
@@ -49,11 +49,11 @@
     "test": "NODE_OPTIONS='--experimental-vm-modules --no-warnings' jest"
   },
   "dependencies": {
-    "@bitauth/libauth": "^2.0.0-alpha.8",
+    "@bitauth/libauth": "^2.0.0",
     "@cashscript/utils": "^0.10.0-next.2",
     "antlr4ts": "^0.5.0-alpha.4",
     "commander": "^7.1.0",
-    "semver": "^7.3.4"
+    "semver": "^7.5.4"
   },
   "devDependencies": {
     "@jest/globals": "^29.4.1",
diff --git a/packages/cashscript/package.json b/packages/cashscript/package.json
index d85b4006..94587610 100644
--- a/packages/cashscript/package.json
+++ b/packages/cashscript/package.json
@@ -43,7 +43,7 @@
     "test": "NODE_OPTIONS='--experimental-vm-modules --no-warnings' jest"
   },
   "dependencies": {
-    "@bitauth/libauth": "^2.0.0-alpha.8",
+    "@bitauth/libauth": "^2.0.0",
     "@cashscript/utils": "^0.10.0-next.2",
     "bip68": "^1.0.4",
     "bitcoin-rpc-promise-retry": "^1.3.0",
diff --git a/packages/cashscript/src/LibauthTemplate.ts b/packages/cashscript/src/LibauthTemplate.ts
index cfc2018e..57bf0d3f 100644
--- a/packages/cashscript/src/LibauthTemplate.ts
+++ b/packages/cashscript/src/LibauthTemplate.ts
@@ -4,14 +4,14 @@ import {
 import {
   hash160,
   hexToBin,
-  AuthenticationTemplateScenarioTransactionOutput,
-  AuthenticationTemplateScenario,
+  WalletTemplateScenarioTransactionOutput,
+  WalletTemplateScenario,
   decodeTransaction,
   binToHex,
-  AuthenticationTemplate,
-  AuthenticationTemplateScenarioInput,
+  WalletTemplate,
+  WalletTemplateScenarioInput,
   TransactionBCH,
-  authenticationTemplateToCompilerConfiguration,
+  walletTemplateToCompilerConfiguration,
   createCompiler,
   createVirtualMachineBCHCHIPs,
   binToBase64,
@@ -22,7 +22,7 @@ import {
   AuthenticationVirtualMachine,
   ResolvedTransactionCommon,
   AuthenticationErrorCommon,
-  AuthenticationTemplateScenarioOutput,
+  WalletTemplateScenarioOutput,
 } from '@bitauth/libauth';
 import { deflate } from 'pako';
 import {
@@ -81,9 +81,9 @@ export const stringify = (any: any, spaces?: number): string => JSON.stringify(
 
 const zip = (a: any[], b: any[]): any[] => Array.from(Array(Math.max(b.length, a.length)), (_, i) => [a[i], b[i]]);
 
-const createScenarioTransaction = (libauthTransaction: TransactionBCH, csTransaction: Transaction): AuthenticationTemplateScenario['transaction'] => {
+const createScenarioTransaction = (libauthTransaction: TransactionBCH, csTransaction: Transaction): WalletTemplateScenario['transaction'] => {
   const contract = csTransaction.contract;
-  const result = ({} as AuthenticationTemplateScenario['transaction'])!;
+  const result = ({} as WalletTemplateScenario['transaction'])!;
 
   // only one 'slot' is allowed, otherwise {} must be used
   let inputSlotInserted = false;
@@ -118,7 +118,7 @@ const createScenarioTransaction = (libauthTransaction: TransactionBCH, csTransac
           : input.outpointTransactionHash,
       sequenceNumber: input.sequenceNumber,
       unlockingBytecode,
-    } as AuthenticationTemplateScenarioInput;
+    } as WalletTemplateScenarioInput;
   });
   result.locktime = libauthTransaction.locktime;
 
@@ -166,20 +166,20 @@ const createScenarioTransaction = (libauthTransaction: TransactionBCH, csTransac
             : lockingBytecode,
         token: output.token,
         valueSatoshis: Number(output.valueSatoshis),
-      } as AuthenticationTemplateScenarioTransactionOutput;
+      } as WalletTemplateScenarioTransactionOutput;
     },
   );
   result.version = libauthTransaction.version;
   return result;
 };
 
-const createScenarioSourceOutputs = (csTransaction: Transaction): Array<AuthenticationTemplateScenarioOutput<true>> => {
+const createScenarioSourceOutputs = (csTransaction: Transaction): Array<WalletTemplateScenarioOutput<true>> => {
   // only one 'slot' is allowed, otherwise {} must be used
   let inputSlotInserted = false;
   return csTransaction.inputs.map(
     (csInput) => {
       const signable = isUtxoP2PKH(csInput);
-      let lockingBytecode = {} as AuthenticationTemplateScenarioOutput<true>['lockingBytecode'];
+      let lockingBytecode = {} as WalletTemplateScenarioOutput<true>['lockingBytecode'];
       if (signable) {
         lockingBytecode = {
           script: 'p2pkh_placeholder_lock',
@@ -205,7 +205,7 @@ const createScenarioSourceOutputs = (csTransaction: Transaction): Array<Authenti
       const result = {
         lockingBytecode: lockingBytecode,
         valueSatoshis: Number(csInput.satoshis),
-      } as AuthenticationTemplateScenarioOutput<true>;
+      } as WalletTemplateScenarioOutput<true>;
 
       if (csInput.token) {
         result.token = {
@@ -232,7 +232,7 @@ export const buildTemplate = async ({
 }: {
   transaction: Transaction;
   transactionHex?: string;
-}): Promise<AuthenticationTemplate> => {
+}): Promise<WalletTemplate> => {
   const contract = transaction.contract;
   const txHex = transactionHex ?? await transaction.build();
 
@@ -278,7 +278,7 @@ export const buildTemplate = async ({
     name: contract.artifact.contractName,
     supported: ['BCH_SPEC'],
     version: 0,
-  } as AuthenticationTemplate;
+  } as WalletTemplate;
 
   // declaration of template variables and their types
   template.entities = {
@@ -464,7 +464,7 @@ export const buildTemplate = async ({
   return template;
 };
 
-export const getBitauthUri = (template: AuthenticationTemplate): string => {
+export const getBitauthUri = (template: WalletTemplate): string => {
   const base64toBase64Url = (base64: string): string => base64.replace(/\+/g, '-').replace(/\//g, '_');
   const payload = base64toBase64Url(
     binToBase64(deflate(utf8ToBin(stringify(template)))),
@@ -481,8 +481,8 @@ type Program = AuthenticationProgramCommon;
 type CreateProgramResult = { vm: VM, program: Program };
 
 // internal util. instantiates the virtual machine and compiles the template into a program
-const createProgram = (template: AuthenticationTemplate): CreateProgramResult => {
-  const configuration = authenticationTemplateToCompilerConfiguration(template);
+const createProgram = (template: WalletTemplate): CreateProgramResult => {
+  const configuration = walletTemplateToCompilerConfiguration(template);
   const vm = createVirtualMachineBCHCHIPs();
   const compiler = createCompiler(configuration);
 
@@ -505,7 +505,7 @@ const createProgram = (template: AuthenticationTemplate): CreateProgramResult =>
 };
 
 // evaluates the fully defined template, throws upon error
-export const evaluateTemplate = (template: AuthenticationTemplate): boolean => {
+export const evaluateTemplate = (template: WalletTemplate): boolean => {
   const { vm, program } = createProgram(template);
 
   const verifyResult = vm.verify(program);
@@ -520,7 +520,7 @@ export const evaluateTemplate = (template: AuthenticationTemplate): boolean => {
 export type DebugResult = AuthenticationProgramStateBCHCHIPs[];
 
 // debugs the template, optionally logging the execution data
-export const debugTemplate = (template: AuthenticationTemplate, artifact: Artifact): DebugResult => {
+export const debugTemplate = (template: WalletTemplate, artifact: Artifact): DebugResult => {
   const { vm, program } = createProgram(template);
 
   const debugResult = vm.debug(program);
diff --git a/packages/cashscript/src/Transaction.ts b/packages/cashscript/src/Transaction.ts
index 62b69b61..8f4658d3 100644
--- a/packages/cashscript/src/Transaction.ts
+++ b/packages/cashscript/src/Transaction.ts
@@ -3,7 +3,7 @@ import {
   hexToBin,
   decodeTransaction,
   Transaction as LibauthTransaction,
-  AuthenticationTemplate,
+  WalletTemplate,
 } from '@bitauth/libauth';
 import delay from 'delay';
 import {
@@ -174,7 +174,7 @@ export class Transaction {
 
   async send(raw?: true): Promise<TransactionDetails | string> {
     const tx = await this.build();
-    let template: AuthenticationTemplate | undefined;
+    let template: WalletTemplate | undefined;
     try {
       if (this.contract.provider instanceof MockNetworkProvider) {
         template = await buildTemplate({
diff --git a/packages/cashscript/src/utils.ts b/packages/cashscript/src/utils.ts
index c9601ad3..cff75067 100644
--- a/packages/cashscript/src/utils.ts
+++ b/packages/cashscript/src/utils.ts
@@ -12,7 +12,7 @@ import {
   LockingBytecodeType,
   encodeTransactionOutput,
   isHex,
-  bigIntToCompactSize,
+  bigIntToCompactUint,
   AuthenticationErrorCommon,
   NonFungibleTokenCapability,
   bigIntToVmNumber,
@@ -155,7 +155,7 @@ export function getTxSizeWithoutInputs(outputs: Output[]): number {
   let size = VERSION_SIZE + LOCKTIME_SIZE;
   size += outputs.reduce((acc, output) => acc + getOutputSize(output), 0);
   // Add tx-out count (accounting for a potential change output)
-  size += bigIntToCompactSize(BigInt(outputs.length + 1)).byteLength;
+  size += bigIntToCompactUint(BigInt(outputs.length + 1)).byteLength;
 
   return size;
 }
diff --git a/packages/utils/package.json b/packages/utils/package.json
index 30e6c48c..d2ff60f5 100644
--- a/packages/utils/package.json
+++ b/packages/utils/package.json
@@ -40,7 +40,7 @@
     "test": "NODE_OPTIONS='--experimental-vm-modules --no-warnings' jest"
   },
   "dependencies": {
-    "@bitauth/libauth": "^2.0.0-alpha.8",
+    "@bitauth/libauth": "^2.0.0",
     "hash.js": "^1.1.7"
   },
   "devDependencies": {
diff --git a/yarn.lock b/yarn.lock
index 735c413f..6dd2c7f4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -487,6 +487,11 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
+"@bitauth/libauth@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@bitauth/libauth/-/libauth-2.0.0.tgz#200a3c967bf1ab088a9ea17691ee354283aee0a6"
+  integrity sha512-wFnQtnJvz7S7jU7fQuBJzRQrVHk46DELd5s8D0F61bW567bKVVfMLbwNPCs12pzVckueQTlLwCS//I9skGI1zg==
+
 "@bitauth/libauth@^2.0.0-alpha.8":
   version "2.0.0-alpha.8"
   resolved "https://registry.yarnpkg.com/@bitauth/libauth/-/libauth-2.0.0-alpha.8.tgz#352ade2075517f1548e05553e7bb1c5e1023d1fe"

From 5160555ef4c16ed1ea7b50243945236e2f89eae3 Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Thu, 18 Jan 2024 11:07:41 +0100
Subject: [PATCH 061/171] Fix broken postantlr script after ANTLR updates

---
 packages/cashc/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/cashc/package.json b/packages/cashc/package.json
index b7018aee..c7b449c3 100644
--- a/packages/cashc/package.json
+++ b/packages/cashc/package.json
@@ -35,7 +35,7 @@
   },
   "scripts": {
     "antlr": "antlr -Dlanguage=TypeScript -visitor -no-listener src/grammar/CashScript.g4",
-    "postantlr": "find src/grammar -type f -name '*.ts' | xargs sed -i '' 's|\\(import .* \".*/.*\\)\";|\\1\\.js\";|g'",
+    "postantlr": "find src/grammar -type f -name 'CashScriptVisitor.ts' | xargs sed -i '' 's|\\(import .* \".*/.*\\)\";|\\1\\.js\";|g'",
     "build": "yarn clean && yarn compile",
     "build:test": "yarn clean:test && yarn compile:test && cpy './test/**/*.cash' ./dist-test/test",
     "clean": "rm -rf ./dist",

From a42badd523d772fe7212726991a6ef5adec1400b Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Thu, 18 Jan 2024 12:05:26 +0100
Subject: [PATCH 062/171] Refactor of the ConsoleStatementNode and
 ConsoleParameterNode

---
 packages/cashc/src/ast/AST.ts                 |   39 +-
 packages/cashc/src/ast/AstBuilder.ts          |   17 +-
 packages/cashc/src/ast/AstTraversal.ts        |    4 -
 packages/cashc/src/ast/AstVisitor.ts          |    2 -
 packages/cashc/src/compiler.ts                |    5 +-
 .../src/generation/GenerateTargetTraversal.ts |   40 +-
 packages/cashc/src/grammar/CashScript.g4      |   13 +-
 packages/cashc/src/grammar/CashScript.interp  |    3 +-
 .../cashc/src/grammar/CashScriptParser.ts     | 1023 +++++++++--------
 .../cashc/src/grammar/CashScriptVisitor.ts    |    7 +
 .../src/print/OutputSourceCodeTraversal.ts    |   15 +
 .../src/semantic/SymbolTableTraversal.ts      |   13 -
 packages/cashc/test/ast/fixtures.ts           |    5 +-
 .../undefined_variable_in_console_log.cash    |    5 +
 14 files changed, 612 insertions(+), 579 deletions(-)
 create mode 100644 packages/cashc/test/compiler/UndefinedReferenceError/undefined_variable_in_console_log.cash

diff --git a/packages/cashc/src/ast/AST.ts b/packages/cashc/src/ast/AST.ts
index b12081dd..d6acd68a 100644
--- a/packages/cashc/src/ast/AST.ts
+++ b/packages/cashc/src/ast/AST.ts
@@ -4,6 +4,7 @@ import AstVisitor from './AstVisitor.js';
 import { BinaryOperator, NullaryOperator, UnaryOperator } from './Operator.js';
 import { Location } from './Location.js';
 import { SymbolTable, Symbol } from './SymbolTable.js';
+import { binToHex } from '@bitauth/libauth';
 
 export type Ast = SourceFileNode;
 
@@ -97,8 +98,8 @@ export class VariableDefinitionNode extends StatementNode implements Named, Type
 
 export class TupleAssignmentNode extends StatementNode {
   constructor(
-    public var1: { name:string, type:Type },
-    public var2: { name:string, type:Type },
+    public var1: { name: string, type: Type },
+    public var2: { name: string, type: Type },
     public tuple: ExpressionNode,
   ) {
     super();
@@ -299,9 +300,15 @@ export class IdentifierNode extends ExpressionNode implements Named {
   }
 }
 
-export abstract class LiteralNode extends ExpressionNode {}
+export abstract class LiteralNode<T = any> extends ExpressionNode {
+  public value: T;
 
-export class BoolLiteralNode extends LiteralNode {
+  toString(): string {
+    return `${this.value}`;
+  }
+}
+
+export class BoolLiteralNode extends LiteralNode<boolean> {
   constructor(
     public value: boolean,
   ) {
@@ -314,7 +321,7 @@ export class BoolLiteralNode extends LiteralNode {
   }
 }
 
-export class IntLiteralNode extends LiteralNode {
+export class IntLiteralNode extends LiteralNode<bigint> {
   constructor(
     public value: bigint,
   ) {
@@ -327,7 +334,7 @@ export class IntLiteralNode extends LiteralNode {
   }
 }
 
-export class StringLiteralNode extends LiteralNode {
+export class StringLiteralNode extends LiteralNode<string> {
   constructor(
     public value: string,
     public quote: string,
@@ -341,7 +348,7 @@ export class StringLiteralNode extends LiteralNode {
   }
 }
 
-export class HexLiteralNode extends LiteralNode {
+export class HexLiteralNode extends LiteralNode<Uint8Array> {
   constructor(
     public value: Uint8Array,
   ) {
@@ -349,6 +356,10 @@ export class HexLiteralNode extends LiteralNode {
     this.type = new BytesType(value.byteLength);
   }
 
+  toString(): string {
+    return `0x${binToHex(this.value)}`;
+  }
+
   accept<T>(visitor: AstVisitor<T>): T {
     return visitor.visitHexLiteral(this);
   }
@@ -366,16 +377,4 @@ export class ConsoleStatementNode extends Node {
   }
 }
 
-// TODO: Couldn't we just use existing nodes for this? e.g. IdentifierNode + StringLiteralNode etc.
-export class ConsoleParameterNode extends Node {
-  constructor(
-    public message?: string,
-    public identifier?: string,
-  ) {
-    super();
-  }
-
-  accept<T>(visitor: AstVisitor<T>): T {
-    return visitor.visitConsoleParameter(this);
-  }
-}
+export type ConsoleParameterNode = LiteralNode | IdentifierNode;
diff --git a/packages/cashc/src/ast/AstBuilder.ts b/packages/cashc/src/ast/AstBuilder.ts
index 8a51b174..a3510267 100644
--- a/packages/cashc/src/ast/AstBuilder.ts
+++ b/packages/cashc/src/ast/AstBuilder.ts
@@ -65,6 +65,7 @@ import type {
   ConsoleStatementContext,
   ConsoleParameterContext,
   StatementContext,
+  RequireMessageContext,
 } from '../grammar/CashScriptParser.js';
 import CashScriptVisitor from '../grammar/CashScriptVisitor.js';
 import { Location } from './Location.js';
@@ -187,7 +188,7 @@ export default class AstBuilder
 
   visitTimeOpStatement(ctx: TimeOpStatementContext): TimeOpNode {
     const expression = this.visit(ctx.expression());
-    const message = ctx.StringLiteral() ? this.createStringLiteral(ctx as any)?.value : undefined;
+    const message = ctx.requireMessage() ? this.createStringLiteral(ctx.requireMessage()).value : undefined;
     const timeOp = new TimeOpNode(ctx.TxVar().getText() as TimeOp, expression, message);
     timeOp.location = Location.fromCtx(ctx);
 
@@ -196,7 +197,7 @@ export default class AstBuilder
 
   visitRequireStatement(ctx: RequireStatementContext): RequireNode {
     const expression = this.visit(ctx.expression());
-    const message = ctx.StringLiteral() ? this.createStringLiteral(ctx as any)?.value : undefined;
+    const message = ctx.requireMessage() ? this.createStringLiteral(ctx.requireMessage()).value : undefined;
     const require = new RequireNode(expression, message);
     require.location = Location.fromCtx(ctx);
     return require;
@@ -352,7 +353,7 @@ export default class AstBuilder
     return intLiteral;
   }
 
-  createStringLiteral(ctx: LiteralContext): StringLiteralNode {
+  createStringLiteral(ctx: LiteralContext | RequireMessageContext): StringLiteralNode {
     const rawString = ctx.StringLiteral().getText();
     const stringValue = rawString.substring(1, rawString.length - 1);
     const quote = rawString.substring(0, 1);
@@ -392,20 +393,14 @@ export default class AstBuilder
     const parameters = ctx.consoleParameterList()
       .consoleParameter_list()
       .map((p) => this.visit(p) as ConsoleParameterNode);
+
     const node = new ConsoleStatementNode(parameters);
     node.location = Location.fromCtx(ctx);
-
     return node;
   }
 
   visitConsoleParameter(ctx: ConsoleParameterContext): ConsoleParameterNode {
-    let message = (ctx.BooleanLiteral() ?? ctx.HexLiteral() ?? ctx.NumberLiteral() ?? ctx.StringLiteral())?.getText();
-    if (message?.[0] === '"') {
-      message = message.slice(1, -1);
-    }
-    const identifier = ctx.Identifier()?.getText();
-
-    const node = new ConsoleParameterNode(message, identifier);
+    const node = ctx.literal() ? this.createLiteral(ctx.literal()) : new IdentifierNode(ctx.Identifier().getText());
     node.location = Location.fromCtx(ctx);
     return node;
   }
diff --git a/packages/cashc/src/ast/AstTraversal.ts b/packages/cashc/src/ast/AstTraversal.ts
index 15c99829..81e3f340 100644
--- a/packages/cashc/src/ast/AstTraversal.ts
+++ b/packages/cashc/src/ast/AstTraversal.ts
@@ -157,8 +157,4 @@ export default class AstTraversal extends AstVisitor<Node> {
     node.parameters = this.visitList(node.parameters) as ConsoleParameterNode[];
     return node;
   }
-
-  visitConsoleParameter(node: ConsoleParameterNode): Node {
-    return node;
-  }
 }
diff --git a/packages/cashc/src/ast/AstVisitor.ts b/packages/cashc/src/ast/AstVisitor.ts
index e846d3c2..e154b5d1 100644
--- a/packages/cashc/src/ast/AstVisitor.ts
+++ b/packages/cashc/src/ast/AstVisitor.ts
@@ -25,7 +25,6 @@ import {
   TupleAssignmentNode,
   NullaryOpNode,
   ConsoleStatementNode,
-  ConsoleParameterNode,
 } from './AST.js';
 
 export default abstract class AstVisitor<T> {
@@ -54,7 +53,6 @@ export default abstract class AstVisitor<T> {
   abstract visitStringLiteral(node: StringLiteralNode): T;
   abstract visitHexLiteral(node: HexLiteralNode): T;
   abstract visitConsoleStatement(node: ConsoleStatementNode): T;
-  abstract visitConsoleParameter(node: ConsoleParameterNode): T;
 
   visit(node: Node): T {
     return node.accept(this);
diff --git a/packages/cashc/src/compiler.ts b/packages/cashc/src/compiler.ts
index 0701f577..8d8f2192 100644
--- a/packages/cashc/src/compiler.ts
+++ b/packages/cashc/src/compiler.ts
@@ -17,13 +17,12 @@ export function compileString(code: string): Artifact {
   let ast = parseCode(code);
 
   // Semantic analysis
-  const symbolTableTraversal = new SymbolTableTraversal();
-  ast = ast.accept(symbolTableTraversal) as Ast;
+  ast = ast.accept(new SymbolTableTraversal()) as Ast;
   ast = ast.accept(new TypeCheckTraversal()) as Ast;
   ast = ast.accept(new EnsureFinalRequireTraversal()) as Ast;
 
   // Code generation
-  const traversal = new GenerateTargetTraversal(symbolTableTraversal.logSymbols);
+  const traversal = new GenerateTargetTraversal();
   ast = ast.accept(traversal) as Ast;
 
   // Bytecode optimisation
diff --git a/packages/cashc/src/generation/GenerateTargetTraversal.ts b/packages/cashc/src/generation/GenerateTargetTraversal.ts
index 5bc1ea2f..3754ac2f 100644
--- a/packages/cashc/src/generation/GenerateTargetTraversal.ts
+++ b/packages/cashc/src/generation/GenerateTargetTraversal.ts
@@ -57,8 +57,6 @@ import {
   compileUnaryOp,
 } from './utils.js';
 import { Location } from '../ast/Location.js';
-import { ParseError } from '../Errors.js';
-import { Symbol } from '../ast/SymbolTable.js';
 
 export default class GenerateTargetTraversalWithLocation extends AstTraversal {
   private locationData: LocationData = []; // detailed location data needed for sourcemap creation
@@ -72,10 +70,6 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
   private currentFunction: FunctionDefinitionNode;
   private constructorParameterCount: number;
 
-  constructor(private logSymbols: Symbol[]) {
-    super();
-  }
-
   private emit(op: OpOrData | OpOrData[], location: LocationI, positionHint?: number): void {
     if (Array.isArray(op)) {
       op.forEach((element) => this.output.push(element as Op));
@@ -550,38 +544,24 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
   visitConsoleStatement(node: ConsoleStatementNode): Node {
     // instruction pointer is the count of emitted opcodes + number of constructor data pushes
     const ip = this.output.length + this.constructorParameterCount;
-
     const { line } = node.location!.start;
 
+    // TODO: refactor to use a map instead of array (also in the artifact and other places where console logs and
+    // require statements are used)
     // check if log entry exists for the instruction pointer, create if not
     let index = this.consoleLogs.findIndex((entry: LogEntry) => entry.ip === ip);
     if (index === -1) {
-      index = this.consoleLogs.push({
-        ip,
-        line,
-        data: [],
-      }) - 1;
+      index = this.consoleLogs.push({ ip, line, data: [] }) - 1;
     }
 
     node.parameters.forEach((parameter: ConsoleParameterNode) => {
-      if (parameter.identifier) {
-        // we look for all symbols with identifier name
-        // then take the first which is declared in the nearest code block
-        const symbol = this.logSymbols
-          .filter((logSymbol) => logSymbol.name === parameter.identifier)
-          .sort((a, b) => b.definition?.location?.start.line! - a.definition?.location?.start.line!)[0];
-
-        if (!symbol) {
-          throw new ParseError(`Undefined reference to symbol ${parameter.identifier} at ${parameter.location?.start}`);
-        }
-
-        const stackIndex = this.getStackIndex(parameter.identifier);
-        this.consoleLogs[index].data.push({
-          stackIndex,
-          type: typeof symbol.type === 'string' ? symbol.type : symbol.toString(),
-        });
-      } else if (parameter.message) {
-        this.consoleLogs[index].data.push(parameter.message);
+      if (parameter instanceof IdentifierNode) {
+        const symbol = parameter.definition!;
+        const stackIndex = this.getStackIndex(parameter.name);
+        const type = typeof symbol.type === 'string' ? symbol.type : symbol.toString();
+        this.consoleLogs[index].data.push({ stackIndex, type });
+      } else {
+        this.consoleLogs[index].data.push(parameter.toString());
       }
     });
 
diff --git a/packages/cashc/src/grammar/CashScript.g4 b/packages/cashc/src/grammar/CashScript.g4
index a7890d08..bdbdbce6 100644
--- a/packages/cashc/src/grammar/CashScript.g4
+++ b/packages/cashc/src/grammar/CashScript.g4
@@ -68,11 +68,11 @@ assignStatement
     ;
 
 timeOpStatement
-    : 'require' '(' TxVar '>=' expression (',' StringLiteral)? ')' ';'
+    : 'require' '(' TxVar '>=' expression (',' requireMessage)? ')' ';'
     ;
 
 requireStatement
-    : 'require' '(' expression (',' StringLiteral)? ')' ';'
+    : 'require' '(' expression (',' requireMessage)? ')' ';'
     ;
 
 ifStatement
@@ -83,12 +83,13 @@ consoleStatement
     : 'console.log' consoleParameterList ';'
     ;
 
+requireMessage
+    : StringLiteral
+    ;
+
 consoleParameter
     : Identifier
-    | StringLiteral
-    | NumberLiteral
-    | HexLiteral
-    | BooleanLiteral
+    | literal
     ;
 
 consoleParameterList
diff --git a/packages/cashc/src/grammar/CashScript.interp b/packages/cashc/src/grammar/CashScript.interp
index fd6dd5e4..97221ccb 100644
--- a/packages/cashc/src/grammar/CashScript.interp
+++ b/packages/cashc/src/grammar/CashScript.interp
@@ -168,6 +168,7 @@ timeOpStatement
 requireStatement
 ifStatement
 consoleStatement
+requireMessage
 consoleParameter
 consoleParameterList
 functionCall
@@ -180,4 +181,4 @@ typeName
 
 
 atn:
-[4, 1, 72, 359, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2, 4, 7, 4, 2, 5, 7, 5, 2, 6, 7, 6, 2, 7, 7, 7, 2, 8, 7, 8, 2, 9, 7, 9, 2, 10, 7, 10, 2, 11, 7, 11, 2, 12, 7, 12, 2, 13, 7, 13, 2, 14, 7, 14, 2, 15, 7, 15, 2, 16, 7, 16, 2, 17, 7, 17, 2, 18, 7, 18, 2, 19, 7, 19, 2, 20, 7, 20, 2, 21, 7, 21, 2, 22, 7, 22, 2, 23, 7, 23, 2, 24, 7, 24, 2, 25, 7, 25, 2, 26, 7, 26, 2, 27, 7, 27, 1, 0, 5, 0, 58, 8, 0, 10, 0, 12, 0, 61, 9, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 2, 1, 3, 1, 3, 3, 3, 75, 8, 3, 1, 4, 3, 4, 78, 8, 4, 1, 4, 1, 4, 1, 5, 1, 5, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 5, 6, 89, 8, 6, 10, 6, 12, 6, 92, 9, 6, 1, 6, 1, 6, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 5, 7, 101, 8, 7, 10, 7, 12, 7, 104, 9, 7, 1, 7, 1, 7, 1, 8, 1, 8, 1, 8, 1, 8, 5, 8, 112, 8, 8, 10, 8, 12, 8, 115, 9, 8, 1, 8, 3, 8, 118, 8, 8, 3, 8, 120, 8, 8, 1, 8, 1, 8, 1, 9, 1, 9, 1, 9, 1, 10, 1, 10, 5, 10, 129, 8, 10, 10, 10, 12, 10, 132, 9, 10, 1, 10, 1, 10, 3, 10, 136, 8, 10, 1, 11, 1, 11, 1, 11, 1, 11, 1, 11, 1, 11, 1, 11, 3, 11, 145, 8, 11, 1, 12, 1, 12, 5, 12, 149, 8, 12, 10, 12, 12, 12, 152, 9, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 3, 15, 180, 8, 15, 1, 15, 1, 15, 1, 15, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 3, 16, 190, 8, 16, 1, 16, 1, 16, 1, 16, 1, 17, 1, 17, 1, 17, 1, 17, 1, 17, 1, 17, 1, 17, 3, 17, 202, 8, 17, 1, 18, 1, 18, 1, 18, 1, 18, 1, 19, 1, 19, 1, 20, 1, 20, 1, 20, 1, 20, 5, 20, 214, 8, 20, 10, 20, 12, 20, 217, 9, 20, 1, 20, 3, 20, 220, 8, 20, 3, 20, 222, 8, 20, 1, 20, 1, 20, 1, 21, 1, 21, 1, 21, 1, 22, 1, 22, 1, 22, 1, 22, 5, 22, 233, 8, 22, 10, 22, 12, 22, 236, 9, 22, 1, 22, 3, 22, 239, 8, 22, 3, 22, 241, 8, 22, 1, 22, 1, 22, 1, 23, 1, 23, 1, 23, 1, 23, 1, 23, 1, 23, 1, 23, 1, 23, 1, 23, 1, 23, 3, 23, 255, 8, 23, 1, 23, 3, 23, 258, 8, 23, 1, 23, 1, 23, 1, 23, 1, 23, 1, 23, 1, 23, 1, 23, 1, 23, 1, 23, 1, 23, 1, 23, 1, 23, 1, 23, 1, 23, 1, 23, 1, 23, 1, 23, 1, 23, 1, 23, 1, 23, 1, 23, 1, 23, 1, 23, 1, 23, 5, 23, 284, 8, 23, 10, 23, 12, 23, 287, 9, 23, 1, 23, 3, 23, 290, 8, 23, 3, 23, 292, 8, 23, 1, 23, 1, 23, 1, 23, 1, 23, 3, 23, 298, 8, 23, 1, 23, 1, 23, 1, 23, 1, 23, 1, 23, 1, 23, 1, 23, 1, 23, 1, 23, 1, 23, 1, 23, 1, 23, 1, 23, 1, 23, 1, 23, 1, 23, 1, 23, 1, 23, 1, 23, 1, 23, 1, 23, 1, 23, 1, 23, 1, 23, 1, 23, 1, 23, 1, 23, 1, 23, 1, 23, 1, 23, 1, 23, 1, 23, 1, 23, 1, 23, 1, 23, 1, 23, 1, 23, 1, 23, 1, 23, 5, 23, 339, 8, 23, 10, 23, 12, 23, 342, 9, 23, 1, 24, 1, 24, 1, 25, 1, 25, 1, 25, 1, 25, 1, 25, 3, 25, 351, 8, 25, 1, 26, 1, 26, 3, 26, 355, 8, 26, 1, 27, 1, 27, 1, 27, 0, 1, 46, 28, 0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32, 34, 36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 0, 11, 1, 0, 4, 10, 5, 0, 59, 59, 61, 61, 64, 64, 66, 66, 69, 69, 1, 0, 26, 30, 2, 0, 26, 30, 32, 35, 1, 0, 39, 40, 1, 0, 41, 43, 2, 0, 40, 40, 44, 44, 1, 0, 6, 9, 1, 0, 45, 46, 1, 0, 36, 37, 2, 0, 52, 57, 62, 62, 388, 0, 59, 1, 0, 0, 0, 2, 65, 1, 0, 0, 0, 4, 70, 1, 0, 0, 0, 6, 72, 1, 0, 0, 0, 8, 77, 1, 0, 0, 0, 10, 81, 1, 0, 0, 0, 12, 83, 1, 0, 0, 0, 14, 95, 1, 0, 0, 0, 16, 107, 1, 0, 0, 0, 18, 123, 1, 0, 0, 0, 20, 135, 1, 0, 0, 0, 22, 144, 1, 0, 0, 0, 24, 146, 1, 0, 0, 0, 26, 158, 1, 0, 0, 0, 28, 167, 1, 0, 0, 0, 30, 172, 1, 0, 0, 0, 32, 184, 1, 0, 0, 0, 34, 194, 1, 0, 0, 0, 36, 203, 1, 0, 0, 0, 38, 207, 1, 0, 0, 0, 40, 209, 1, 0, 0, 0, 42, 225, 1, 0, 0, 0, 44, 228, 1, 0, 0, 0, 46, 297, 1, 0, 0, 0, 48, 343, 1, 0, 0, 0, 50, 350, 1, 0, 0, 0, 52, 352, 1, 0, 0, 0, 54, 356, 1, 0, 0, 0, 56, 58, 3, 2, 1, 0, 57, 56, 1, 0, 0, 0, 58, 61, 1, 0, 0, 0, 59, 57, 1, 0, 0, 0, 59, 60, 1, 0, 0, 0, 60, 62, 1, 0, 0, 0, 61, 59, 1, 0, 0, 0, 62, 63, 3, 12, 6, 0, 63, 64, 5, 0, 0, 1, 64, 1, 1, 0, 0, 0, 65, 66, 5, 1, 0, 0, 66, 67, 3, 4, 2, 0, 67, 68, 3, 6, 3, 0, 68, 69, 5, 2, 0, 0, 69, 3, 1, 0, 0, 0, 70, 71, 5, 3, 0, 0, 71, 5, 1, 0, 0, 0, 72, 74, 3, 8, 4, 0, 73, 75, 3, 8, 4, 0, 74, 73, 1, 0, 0, 0, 74, 75, 1, 0, 0, 0, 75, 7, 1, 0, 0, 0, 76, 78, 3, 10, 5, 0, 77, 76, 1, 0, 0, 0, 77, 78, 1, 0, 0, 0, 78, 79, 1, 0, 0, 0, 79, 80, 5, 58, 0, 0, 80, 9, 1, 0, 0, 0, 81, 82, 7, 0, 0, 0, 82, 11, 1, 0, 0, 0, 83, 84, 5, 11, 0, 0, 84, 85, 5, 69, 0, 0, 85, 86, 3, 16, 8, 0, 86, 90, 5, 12, 0, 0, 87, 89, 3, 14, 7, 0, 88, 87, 1, 0, 0, 0, 89, 92, 1, 0, 0, 0, 90, 88, 1, 0, 0, 0, 90, 91, 1, 0, 0, 0, 91, 93, 1, 0, 0, 0, 92, 90, 1, 0, 0, 0, 93, 94, 5, 13, 0, 0, 94, 13, 1, 0, 0, 0, 95, 96, 5, 14, 0, 0, 96, 97, 5, 69, 0, 0, 97, 98, 3, 16, 8, 0, 98, 102, 5, 12, 0, 0, 99, 101, 3, 22, 11, 0, 100, 99, 1, 0, 0, 0, 101, 104, 1, 0, 0, 0, 102, 100, 1, 0, 0, 0, 102, 103, 1, 0, 0, 0, 103, 105, 1, 0, 0, 0, 104, 102, 1, 0, 0, 0, 105, 106, 5, 13, 0, 0, 106, 15, 1, 0, 0, 0, 107, 119, 5, 15, 0, 0, 108, 113, 3, 18, 9, 0, 109, 110, 5, 16, 0, 0, 110, 112, 3, 18, 9, 0, 111, 109, 1, 0, 0, 0, 112, 115, 1, 0, 0, 0, 113, 111, 1, 0, 0, 0, 113, 114, 1, 0, 0, 0, 114, 117, 1, 0, 0, 0, 115, 113, 1, 0, 0, 0, 116, 118, 5, 16, 0, 0, 117, 116, 1, 0, 0, 0, 117, 118, 1, 0, 0, 0, 118, 120, 1, 0, 0, 0, 119, 108, 1, 0, 0, 0, 119, 120, 1, 0, 0, 0, 120, 121, 1, 0, 0, 0, 121, 122, 5, 17, 0, 0, 122, 17, 1, 0, 0, 0, 123, 124, 3, 54, 27, 0, 124, 125, 5, 69, 0, 0, 125, 19, 1, 0, 0, 0, 126, 130, 5, 12, 0, 0, 127, 129, 3, 22, 11, 0, 128, 127, 1, 0, 0, 0, 129, 132, 1, 0, 0, 0, 130, 128, 1, 0, 0, 0, 130, 131, 1, 0, 0, 0, 131, 133, 1, 0, 0, 0, 132, 130, 1, 0, 0, 0, 133, 136, 5, 13, 0, 0, 134, 136, 3, 22, 11, 0, 135, 126, 1, 0, 0, 0, 135, 134, 1, 0, 0, 0, 136, 21, 1, 0, 0, 0, 137, 145, 3, 24, 12, 0, 138, 145, 3, 26, 13, 0, 139, 145, 3, 28, 14, 0, 140, 145, 3, 30, 15, 0, 141, 145, 3, 32, 16, 0, 142, 145, 3, 34, 17, 0, 143, 145, 3, 36, 18, 0, 144, 137, 1, 0, 0, 0, 144, 138, 1, 0, 0, 0, 144, 139, 1, 0, 0, 0, 144, 140, 1, 0, 0, 0, 144, 141, 1, 0, 0, 0, 144, 142, 1, 0, 0, 0, 144, 143, 1, 0, 0, 0, 145, 23, 1, 0, 0, 0, 146, 150, 3, 54, 27, 0, 147, 149, 3, 48, 24, 0, 148, 147, 1, 0, 0, 0, 149, 152, 1, 0, 0, 0, 150, 148, 1, 0, 0, 0, 150, 151, 1, 0, 0, 0, 151, 153, 1, 0, 0, 0, 152, 150, 1, 0, 0, 0, 153, 154, 5, 69, 0, 0, 154, 155, 5, 10, 0, 0, 155, 156, 3, 46, 23, 0, 156, 157, 5, 2, 0, 0, 157, 25, 1, 0, 0, 0, 158, 159, 3, 54, 27, 0, 159, 160, 5, 69, 0, 0, 160, 161, 5, 16, 0, 0, 161, 162, 3, 54, 27, 0, 162, 163, 5, 69, 0, 0, 163, 164, 5, 10, 0, 0, 164, 165, 3, 46, 23, 0, 165, 166, 5, 2, 0, 0, 166, 27, 1, 0, 0, 0, 167, 168, 5, 69, 0, 0, 168, 169, 5, 10, 0, 0, 169, 170, 3, 46, 23, 0, 170, 171, 5, 2, 0, 0, 171, 29, 1, 0, 0, 0, 172, 173, 5, 18, 0, 0, 173, 174, 5, 15, 0, 0, 174, 175, 5, 67, 0, 0, 175, 176, 5, 6, 0, 0, 176, 179, 3, 46, 23, 0, 177, 178, 5, 16, 0, 0, 178, 180, 5, 64, 0, 0, 179, 177, 1, 0, 0, 0, 179, 180, 1, 0, 0, 0, 180, 181, 1, 0, 0, 0, 181, 182, 5, 17, 0, 0, 182, 183, 5, 2, 0, 0, 183, 31, 1, 0, 0, 0, 184, 185, 5, 18, 0, 0, 185, 186, 5, 15, 0, 0, 186, 189, 3, 46, 23, 0, 187, 188, 5, 16, 0, 0, 188, 190, 5, 64, 0, 0, 189, 187, 1, 0, 0, 0, 189, 190, 1, 0, 0, 0, 190, 191, 1, 0, 0, 0, 191, 192, 5, 17, 0, 0, 192, 193, 5, 2, 0, 0, 193, 33, 1, 0, 0, 0, 194, 195, 5, 19, 0, 0, 195, 196, 5, 15, 0, 0, 196, 197, 3, 46, 23, 0, 197, 198, 5, 17, 0, 0, 198, 201, 3, 20, 10, 0, 199, 200, 5, 20, 0, 0, 200, 202, 3, 20, 10, 0, 201, 199, 1, 0, 0, 0, 201, 202, 1, 0, 0, 0, 202, 35, 1, 0, 0, 0, 203, 204, 5, 21, 0, 0, 204, 205, 3, 40, 20, 0, 205, 206, 5, 2, 0, 0, 206, 37, 1, 0, 0, 0, 207, 208, 7, 1, 0, 0, 208, 39, 1, 0, 0, 0, 209, 221, 5, 15, 0, 0, 210, 215, 3, 38, 19, 0, 211, 212, 5, 16, 0, 0, 212, 214, 3, 38, 19, 0, 213, 211, 1, 0, 0, 0, 214, 217, 1, 0, 0, 0, 215, 213, 1, 0, 0, 0, 215, 216, 1, 0, 0, 0, 216, 219, 1, 0, 0, 0, 217, 215, 1, 0, 0, 0, 218, 220, 5, 16, 0, 0, 219, 218, 1, 0, 0, 0, 219, 220, 1, 0, 0, 0, 220, 222, 1, 0, 0, 0, 221, 210, 1, 0, 0, 0, 221, 222, 1, 0, 0, 0, 222, 223, 1, 0, 0, 0, 223, 224, 5, 17, 0, 0, 224, 41, 1, 0, 0, 0, 225, 226, 5, 69, 0, 0, 226, 227, 3, 44, 22, 0, 227, 43, 1, 0, 0, 0, 228, 240, 5, 15, 0, 0, 229, 234, 3, 46, 23, 0, 230, 231, 5, 16, 0, 0, 231, 233, 3, 46, 23, 0, 232, 230, 1, 0, 0, 0, 233, 236, 1, 0, 0, 0, 234, 232, 1, 0, 0, 0, 234, 235, 1, 0, 0, 0, 235, 238, 1, 0, 0, 0, 236, 234, 1, 0, 0, 0, 237, 239, 5, 16, 0, 0, 238, 237, 1, 0, 0, 0, 238, 239, 1, 0, 0, 0, 239, 241, 1, 0, 0, 0, 240, 229, 1, 0, 0, 0, 240, 241, 1, 0, 0, 0, 241, 242, 1, 0, 0, 0, 242, 243, 5, 17, 0, 0, 243, 45, 1, 0, 0, 0, 244, 245, 6, 23, -1, 0, 245, 246, 5, 15, 0, 0, 246, 247, 3, 46, 23, 0, 247, 248, 5, 17, 0, 0, 248, 298, 1, 0, 0, 0, 249, 250, 3, 54, 27, 0, 250, 251, 5, 15, 0, 0, 251, 254, 3, 46, 23, 0, 252, 253, 5, 16, 0, 0, 253, 255, 3, 46, 23, 0, 254, 252, 1, 0, 0, 0, 254, 255, 1, 0, 0, 0, 255, 257, 1, 0, 0, 0, 256, 258, 5, 16, 0, 0, 257, 256, 1, 0, 0, 0, 257, 258, 1, 0, 0, 0, 258, 259, 1, 0, 0, 0, 259, 260, 5, 17, 0, 0, 260, 298, 1, 0, 0, 0, 261, 298, 3, 42, 21, 0, 262, 263, 5, 22, 0, 0, 263, 264, 5, 69, 0, 0, 264, 298, 3, 44, 22, 0, 265, 266, 5, 25, 0, 0, 266, 267, 5, 23, 0, 0, 267, 268, 3, 46, 23, 0, 268, 269, 5, 24, 0, 0, 269, 270, 7, 2, 0, 0, 270, 298, 1, 0, 0, 0, 271, 272, 5, 31, 0, 0, 272, 273, 5, 23, 0, 0, 273, 274, 3, 46, 23, 0, 274, 275, 5, 24, 0, 0, 275, 276, 7, 3, 0, 0, 276, 298, 1, 0, 0, 0, 277, 278, 7, 4, 0, 0, 278, 298, 3, 46, 23, 14, 279, 291, 5, 23, 0, 0, 280, 285, 3, 46, 23, 0, 281, 282, 5, 16, 0, 0, 282, 284, 3, 46, 23, 0, 283, 281, 1, 0, 0, 0, 284, 287, 1, 0, 0, 0, 285, 283, 1, 0, 0, 0, 285, 286, 1, 0, 0, 0, 286, 289, 1, 0, 0, 0, 287, 285, 1, 0, 0, 0, 288, 290, 5, 16, 0, 0, 289, 288, 1, 0, 0, 0, 289, 290, 1, 0, 0, 0, 290, 292, 1, 0, 0, 0, 291, 280, 1, 0, 0, 0, 291, 292, 1, 0, 0, 0, 292, 293, 1, 0, 0, 0, 293, 298, 5, 24, 0, 0, 294, 298, 5, 68, 0, 0, 295, 298, 5, 69, 0, 0, 296, 298, 3, 50, 25, 0, 297, 244, 1, 0, 0, 0, 297, 249, 1, 0, 0, 0, 297, 261, 1, 0, 0, 0, 297, 262, 1, 0, 0, 0, 297, 265, 1, 0, 0, 0, 297, 271, 1, 0, 0, 0, 297, 277, 1, 0, 0, 0, 297, 279, 1, 0, 0, 0, 297, 294, 1, 0, 0, 0, 297, 295, 1, 0, 0, 0, 297, 296, 1, 0, 0, 0, 298, 340, 1, 0, 0, 0, 299, 300, 10, 13, 0, 0, 300, 301, 7, 5, 0, 0, 301, 339, 3, 46, 23, 14, 302, 303, 10, 12, 0, 0, 303, 304, 7, 6, 0, 0, 304, 339, 3, 46, 23, 13, 305, 306, 10, 11, 0, 0, 306, 307, 7, 7, 0, 0, 307, 339, 3, 46, 23, 12, 308, 309, 10, 10, 0, 0, 309, 310, 7, 8, 0, 0, 310, 339, 3, 46, 23, 11, 311, 312, 10, 9, 0, 0, 312, 313, 5, 47, 0, 0, 313, 339, 3, 46, 23, 10, 314, 315, 10, 8, 0, 0, 315, 316, 5, 4, 0, 0, 316, 339, 3, 46, 23, 9, 317, 318, 10, 7, 0, 0, 318, 319, 5, 48, 0, 0, 319, 339, 3, 46, 23, 8, 320, 321, 10, 6, 0, 0, 321, 322, 5, 49, 0, 0, 322, 339, 3, 46, 23, 7, 323, 324, 10, 5, 0, 0, 324, 325, 5, 50, 0, 0, 325, 339, 3, 46, 23, 6, 326, 327, 10, 19, 0, 0, 327, 328, 5, 23, 0, 0, 328, 329, 5, 61, 0, 0, 329, 339, 5, 24, 0, 0, 330, 331, 10, 16, 0, 0, 331, 339, 7, 9, 0, 0, 332, 333, 10, 15, 0, 0, 333, 334, 5, 38, 0, 0, 334, 335, 5, 15, 0, 0, 335, 336, 3, 46, 23, 0, 336, 337, 5, 17, 0, 0, 337, 339, 1, 0, 0, 0, 338, 299, 1, 0, 0, 0, 338, 302, 1, 0, 0, 0, 338, 305, 1, 0, 0, 0, 338, 308, 1, 0, 0, 0, 338, 311, 1, 0, 0, 0, 338, 314, 1, 0, 0, 0, 338, 317, 1, 0, 0, 0, 338, 320, 1, 0, 0, 0, 338, 323, 1, 0, 0, 0, 338, 326, 1, 0, 0, 0, 338, 330, 1, 0, 0, 0, 338, 332, 1, 0, 0, 0, 339, 342, 1, 0, 0, 0, 340, 338, 1, 0, 0, 0, 340, 341, 1, 0, 0, 0, 341, 47, 1, 0, 0, 0, 342, 340, 1, 0, 0, 0, 343, 344, 5, 51, 0, 0, 344, 49, 1, 0, 0, 0, 345, 351, 5, 59, 0, 0, 346, 351, 3, 52, 26, 0, 347, 351, 5, 64, 0, 0, 348, 351, 5, 65, 0, 0, 349, 351, 5, 66, 0, 0, 350, 345, 1, 0, 0, 0, 350, 346, 1, 0, 0, 0, 350, 347, 1, 0, 0, 0, 350, 348, 1, 0, 0, 0, 350, 349, 1, 0, 0, 0, 351, 51, 1, 0, 0, 0, 352, 354, 5, 61, 0, 0, 353, 355, 5, 60, 0, 0, 354, 353, 1, 0, 0, 0, 354, 355, 1, 0, 0, 0, 355, 53, 1, 0, 0, 0, 356, 357, 7, 10, 0, 0, 357, 55, 1, 0, 0, 0, 31, 59, 74, 77, 90, 102, 113, 117, 119, 130, 135, 144, 150, 179, 189, 201, 215, 219, 221, 234, 238, 240, 254, 257, 285, 289, 291, 297, 338, 340, 350, 354]
\ No newline at end of file
+[4, 1, 72, 365, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2, 4, 7, 4, 2, 5, 7, 5, 2, 6, 7, 6, 2, 7, 7, 7, 2, 8, 7, 8, 2, 9, 7, 9, 2, 10, 7, 10, 2, 11, 7, 11, 2, 12, 7, 12, 2, 13, 7, 13, 2, 14, 7, 14, 2, 15, 7, 15, 2, 16, 7, 16, 2, 17, 7, 17, 2, 18, 7, 18, 2, 19, 7, 19, 2, 20, 7, 20, 2, 21, 7, 21, 2, 22, 7, 22, 2, 23, 7, 23, 2, 24, 7, 24, 2, 25, 7, 25, 2, 26, 7, 26, 2, 27, 7, 27, 2, 28, 7, 28, 1, 0, 5, 0, 60, 8, 0, 10, 0, 12, 0, 63, 9, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 2, 1, 3, 1, 3, 3, 3, 77, 8, 3, 1, 4, 3, 4, 80, 8, 4, 1, 4, 1, 4, 1, 5, 1, 5, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 5, 6, 91, 8, 6, 10, 6, 12, 6, 94, 9, 6, 1, 6, 1, 6, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 5, 7, 103, 8, 7, 10, 7, 12, 7, 106, 9, 7, 1, 7, 1, 7, 1, 8, 1, 8, 1, 8, 1, 8, 5, 8, 114, 8, 8, 10, 8, 12, 8, 117, 9, 8, 1, 8, 3, 8, 120, 8, 8, 3, 8, 122, 8, 8, 1, 8, 1, 8, 1, 9, 1, 9, 1, 9, 1, 10, 1, 10, 5, 10, 131, 8, 10, 10, 10, 12, 10, 134, 9, 10, 1, 10, 1, 10, 3, 10, 138, 8, 10, 1, 11, 1, 11, 1, 11, 1, 11, 1, 11, 1, 11, 1, 11, 3, 11, 147, 8, 11, 1, 12, 1, 12, 5, 12, 151, 8, 12, 10, 12, 12, 12, 154, 9, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 3, 15, 182, 8, 15, 1, 15, 1, 15, 1, 15, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 3, 16, 192, 8, 16, 1, 16, 1, 16, 1, 16, 1, 17, 1, 17, 1, 17, 1, 17, 1, 17, 1, 17, 1, 17, 3, 17, 204, 8, 17, 1, 18, 1, 18, 1, 18, 1, 18, 1, 19, 1, 19, 1, 20, 1, 20, 3, 20, 214, 8, 20, 1, 21, 1, 21, 1, 21, 1, 21, 5, 21, 220, 8, 21, 10, 21, 12, 21, 223, 9, 21, 1, 21, 3, 21, 226, 8, 21, 3, 21, 228, 8, 21, 1, 21, 1, 21, 1, 22, 1, 22, 1, 22, 1, 23, 1, 23, 1, 23, 1, 23, 5, 23, 239, 8, 23, 10, 23, 12, 23, 242, 9, 23, 1, 23, 3, 23, 245, 8, 23, 3, 23, 247, 8, 23, 1, 23, 1, 23, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 3, 24, 261, 8, 24, 1, 24, 3, 24, 264, 8, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 5, 24, 290, 8, 24, 10, 24, 12, 24, 293, 9, 24, 1, 24, 3, 24, 296, 8, 24, 3, 24, 298, 8, 24, 1, 24, 1, 24, 1, 24, 1, 24, 3, 24, 304, 8, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 5, 24, 345, 8, 24, 10, 24, 12, 24, 348, 9, 24, 1, 25, 1, 25, 1, 26, 1, 26, 1, 26, 1, 26, 1, 26, 3, 26, 357, 8, 26, 1, 27, 1, 27, 3, 27, 361, 8, 27, 1, 28, 1, 28, 1, 28, 0, 1, 48, 29, 0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32, 34, 36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 56, 0, 10, 1, 0, 4, 10, 1, 0, 26, 30, 2, 0, 26, 30, 32, 35, 1, 0, 39, 40, 1, 0, 41, 43, 2, 0, 40, 40, 44, 44, 1, 0, 6, 9, 1, 0, 45, 46, 1, 0, 36, 37, 2, 0, 52, 57, 62, 62, 394, 0, 61, 1, 0, 0, 0, 2, 67, 1, 0, 0, 0, 4, 72, 1, 0, 0, 0, 6, 74, 1, 0, 0, 0, 8, 79, 1, 0, 0, 0, 10, 83, 1, 0, 0, 0, 12, 85, 1, 0, 0, 0, 14, 97, 1, 0, 0, 0, 16, 109, 1, 0, 0, 0, 18, 125, 1, 0, 0, 0, 20, 137, 1, 0, 0, 0, 22, 146, 1, 0, 0, 0, 24, 148, 1, 0, 0, 0, 26, 160, 1, 0, 0, 0, 28, 169, 1, 0, 0, 0, 30, 174, 1, 0, 0, 0, 32, 186, 1, 0, 0, 0, 34, 196, 1, 0, 0, 0, 36, 205, 1, 0, 0, 0, 38, 209, 1, 0, 0, 0, 40, 213, 1, 0, 0, 0, 42, 215, 1, 0, 0, 0, 44, 231, 1, 0, 0, 0, 46, 234, 1, 0, 0, 0, 48, 303, 1, 0, 0, 0, 50, 349, 1, 0, 0, 0, 52, 356, 1, 0, 0, 0, 54, 358, 1, 0, 0, 0, 56, 362, 1, 0, 0, 0, 58, 60, 3, 2, 1, 0, 59, 58, 1, 0, 0, 0, 60, 63, 1, 0, 0, 0, 61, 59, 1, 0, 0, 0, 61, 62, 1, 0, 0, 0, 62, 64, 1, 0, 0, 0, 63, 61, 1, 0, 0, 0, 64, 65, 3, 12, 6, 0, 65, 66, 5, 0, 0, 1, 66, 1, 1, 0, 0, 0, 67, 68, 5, 1, 0, 0, 68, 69, 3, 4, 2, 0, 69, 70, 3, 6, 3, 0, 70, 71, 5, 2, 0, 0, 71, 3, 1, 0, 0, 0, 72, 73, 5, 3, 0, 0, 73, 5, 1, 0, 0, 0, 74, 76, 3, 8, 4, 0, 75, 77, 3, 8, 4, 0, 76, 75, 1, 0, 0, 0, 76, 77, 1, 0, 0, 0, 77, 7, 1, 0, 0, 0, 78, 80, 3, 10, 5, 0, 79, 78, 1, 0, 0, 0, 79, 80, 1, 0, 0, 0, 80, 81, 1, 0, 0, 0, 81, 82, 5, 58, 0, 0, 82, 9, 1, 0, 0, 0, 83, 84, 7, 0, 0, 0, 84, 11, 1, 0, 0, 0, 85, 86, 5, 11, 0, 0, 86, 87, 5, 69, 0, 0, 87, 88, 3, 16, 8, 0, 88, 92, 5, 12, 0, 0, 89, 91, 3, 14, 7, 0, 90, 89, 1, 0, 0, 0, 91, 94, 1, 0, 0, 0, 92, 90, 1, 0, 0, 0, 92, 93, 1, 0, 0, 0, 93, 95, 1, 0, 0, 0, 94, 92, 1, 0, 0, 0, 95, 96, 5, 13, 0, 0, 96, 13, 1, 0, 0, 0, 97, 98, 5, 14, 0, 0, 98, 99, 5, 69, 0, 0, 99, 100, 3, 16, 8, 0, 100, 104, 5, 12, 0, 0, 101, 103, 3, 22, 11, 0, 102, 101, 1, 0, 0, 0, 103, 106, 1, 0, 0, 0, 104, 102, 1, 0, 0, 0, 104, 105, 1, 0, 0, 0, 105, 107, 1, 0, 0, 0, 106, 104, 1, 0, 0, 0, 107, 108, 5, 13, 0, 0, 108, 15, 1, 0, 0, 0, 109, 121, 5, 15, 0, 0, 110, 115, 3, 18, 9, 0, 111, 112, 5, 16, 0, 0, 112, 114, 3, 18, 9, 0, 113, 111, 1, 0, 0, 0, 114, 117, 1, 0, 0, 0, 115, 113, 1, 0, 0, 0, 115, 116, 1, 0, 0, 0, 116, 119, 1, 0, 0, 0, 117, 115, 1, 0, 0, 0, 118, 120, 5, 16, 0, 0, 119, 118, 1, 0, 0, 0, 119, 120, 1, 0, 0, 0, 120, 122, 1, 0, 0, 0, 121, 110, 1, 0, 0, 0, 121, 122, 1, 0, 0, 0, 122, 123, 1, 0, 0, 0, 123, 124, 5, 17, 0, 0, 124, 17, 1, 0, 0, 0, 125, 126, 3, 56, 28, 0, 126, 127, 5, 69, 0, 0, 127, 19, 1, 0, 0, 0, 128, 132, 5, 12, 0, 0, 129, 131, 3, 22, 11, 0, 130, 129, 1, 0, 0, 0, 131, 134, 1, 0, 0, 0, 132, 130, 1, 0, 0, 0, 132, 133, 1, 0, 0, 0, 133, 135, 1, 0, 0, 0, 134, 132, 1, 0, 0, 0, 135, 138, 5, 13, 0, 0, 136, 138, 3, 22, 11, 0, 137, 128, 1, 0, 0, 0, 137, 136, 1, 0, 0, 0, 138, 21, 1, 0, 0, 0, 139, 147, 3, 24, 12, 0, 140, 147, 3, 26, 13, 0, 141, 147, 3, 28, 14, 0, 142, 147, 3, 30, 15, 0, 143, 147, 3, 32, 16, 0, 144, 147, 3, 34, 17, 0, 145, 147, 3, 36, 18, 0, 146, 139, 1, 0, 0, 0, 146, 140, 1, 0, 0, 0, 146, 141, 1, 0, 0, 0, 146, 142, 1, 0, 0, 0, 146, 143, 1, 0, 0, 0, 146, 144, 1, 0, 0, 0, 146, 145, 1, 0, 0, 0, 147, 23, 1, 0, 0, 0, 148, 152, 3, 56, 28, 0, 149, 151, 3, 50, 25, 0, 150, 149, 1, 0, 0, 0, 151, 154, 1, 0, 0, 0, 152, 150, 1, 0, 0, 0, 152, 153, 1, 0, 0, 0, 153, 155, 1, 0, 0, 0, 154, 152, 1, 0, 0, 0, 155, 156, 5, 69, 0, 0, 156, 157, 5, 10, 0, 0, 157, 158, 3, 48, 24, 0, 158, 159, 5, 2, 0, 0, 159, 25, 1, 0, 0, 0, 160, 161, 3, 56, 28, 0, 161, 162, 5, 69, 0, 0, 162, 163, 5, 16, 0, 0, 163, 164, 3, 56, 28, 0, 164, 165, 5, 69, 0, 0, 165, 166, 5, 10, 0, 0, 166, 167, 3, 48, 24, 0, 167, 168, 5, 2, 0, 0, 168, 27, 1, 0, 0, 0, 169, 170, 5, 69, 0, 0, 170, 171, 5, 10, 0, 0, 171, 172, 3, 48, 24, 0, 172, 173, 5, 2, 0, 0, 173, 29, 1, 0, 0, 0, 174, 175, 5, 18, 0, 0, 175, 176, 5, 15, 0, 0, 176, 177, 5, 67, 0, 0, 177, 178, 5, 6, 0, 0, 178, 181, 3, 48, 24, 0, 179, 180, 5, 16, 0, 0, 180, 182, 3, 38, 19, 0, 181, 179, 1, 0, 0, 0, 181, 182, 1, 0, 0, 0, 182, 183, 1, 0, 0, 0, 183, 184, 5, 17, 0, 0, 184, 185, 5, 2, 0, 0, 185, 31, 1, 0, 0, 0, 186, 187, 5, 18, 0, 0, 187, 188, 5, 15, 0, 0, 188, 191, 3, 48, 24, 0, 189, 190, 5, 16, 0, 0, 190, 192, 3, 38, 19, 0, 191, 189, 1, 0, 0, 0, 191, 192, 1, 0, 0, 0, 192, 193, 1, 0, 0, 0, 193, 194, 5, 17, 0, 0, 194, 195, 5, 2, 0, 0, 195, 33, 1, 0, 0, 0, 196, 197, 5, 19, 0, 0, 197, 198, 5, 15, 0, 0, 198, 199, 3, 48, 24, 0, 199, 200, 5, 17, 0, 0, 200, 203, 3, 20, 10, 0, 201, 202, 5, 20, 0, 0, 202, 204, 3, 20, 10, 0, 203, 201, 1, 0, 0, 0, 203, 204, 1, 0, 0, 0, 204, 35, 1, 0, 0, 0, 205, 206, 5, 21, 0, 0, 206, 207, 3, 42, 21, 0, 207, 208, 5, 2, 0, 0, 208, 37, 1, 0, 0, 0, 209, 210, 5, 64, 0, 0, 210, 39, 1, 0, 0, 0, 211, 214, 5, 69, 0, 0, 212, 214, 3, 52, 26, 0, 213, 211, 1, 0, 0, 0, 213, 212, 1, 0, 0, 0, 214, 41, 1, 0, 0, 0, 215, 227, 5, 15, 0, 0, 216, 221, 3, 40, 20, 0, 217, 218, 5, 16, 0, 0, 218, 220, 3, 40, 20, 0, 219, 217, 1, 0, 0, 0, 220, 223, 1, 0, 0, 0, 221, 219, 1, 0, 0, 0, 221, 222, 1, 0, 0, 0, 222, 225, 1, 0, 0, 0, 223, 221, 1, 0, 0, 0, 224, 226, 5, 16, 0, 0, 225, 224, 1, 0, 0, 0, 225, 226, 1, 0, 0, 0, 226, 228, 1, 0, 0, 0, 227, 216, 1, 0, 0, 0, 227, 228, 1, 0, 0, 0, 228, 229, 1, 0, 0, 0, 229, 230, 5, 17, 0, 0, 230, 43, 1, 0, 0, 0, 231, 232, 5, 69, 0, 0, 232, 233, 3, 46, 23, 0, 233, 45, 1, 0, 0, 0, 234, 246, 5, 15, 0, 0, 235, 240, 3, 48, 24, 0, 236, 237, 5, 16, 0, 0, 237, 239, 3, 48, 24, 0, 238, 236, 1, 0, 0, 0, 239, 242, 1, 0, 0, 0, 240, 238, 1, 0, 0, 0, 240, 241, 1, 0, 0, 0, 241, 244, 1, 0, 0, 0, 242, 240, 1, 0, 0, 0, 243, 245, 5, 16, 0, 0, 244, 243, 1, 0, 0, 0, 244, 245, 1, 0, 0, 0, 245, 247, 1, 0, 0, 0, 246, 235, 1, 0, 0, 0, 246, 247, 1, 0, 0, 0, 247, 248, 1, 0, 0, 0, 248, 249, 5, 17, 0, 0, 249, 47, 1, 0, 0, 0, 250, 251, 6, 24, -1, 0, 251, 252, 5, 15, 0, 0, 252, 253, 3, 48, 24, 0, 253, 254, 5, 17, 0, 0, 254, 304, 1, 0, 0, 0, 255, 256, 3, 56, 28, 0, 256, 257, 5, 15, 0, 0, 257, 260, 3, 48, 24, 0, 258, 259, 5, 16, 0, 0, 259, 261, 3, 48, 24, 0, 260, 258, 1, 0, 0, 0, 260, 261, 1, 0, 0, 0, 261, 263, 1, 0, 0, 0, 262, 264, 5, 16, 0, 0, 263, 262, 1, 0, 0, 0, 263, 264, 1, 0, 0, 0, 264, 265, 1, 0, 0, 0, 265, 266, 5, 17, 0, 0, 266, 304, 1, 0, 0, 0, 267, 304, 3, 44, 22, 0, 268, 269, 5, 22, 0, 0, 269, 270, 5, 69, 0, 0, 270, 304, 3, 46, 23, 0, 271, 272, 5, 25, 0, 0, 272, 273, 5, 23, 0, 0, 273, 274, 3, 48, 24, 0, 274, 275, 5, 24, 0, 0, 275, 276, 7, 1, 0, 0, 276, 304, 1, 0, 0, 0, 277, 278, 5, 31, 0, 0, 278, 279, 5, 23, 0, 0, 279, 280, 3, 48, 24, 0, 280, 281, 5, 24, 0, 0, 281, 282, 7, 2, 0, 0, 282, 304, 1, 0, 0, 0, 283, 284, 7, 3, 0, 0, 284, 304, 3, 48, 24, 14, 285, 297, 5, 23, 0, 0, 286, 291, 3, 48, 24, 0, 287, 288, 5, 16, 0, 0, 288, 290, 3, 48, 24, 0, 289, 287, 1, 0, 0, 0, 290, 293, 1, 0, 0, 0, 291, 289, 1, 0, 0, 0, 291, 292, 1, 0, 0, 0, 292, 295, 1, 0, 0, 0, 293, 291, 1, 0, 0, 0, 294, 296, 5, 16, 0, 0, 295, 294, 1, 0, 0, 0, 295, 296, 1, 0, 0, 0, 296, 298, 1, 0, 0, 0, 297, 286, 1, 0, 0, 0, 297, 298, 1, 0, 0, 0, 298, 299, 1, 0, 0, 0, 299, 304, 5, 24, 0, 0, 300, 304, 5, 68, 0, 0, 301, 304, 5, 69, 0, 0, 302, 304, 3, 52, 26, 0, 303, 250, 1, 0, 0, 0, 303, 255, 1, 0, 0, 0, 303, 267, 1, 0, 0, 0, 303, 268, 1, 0, 0, 0, 303, 271, 1, 0, 0, 0, 303, 277, 1, 0, 0, 0, 303, 283, 1, 0, 0, 0, 303, 285, 1, 0, 0, 0, 303, 300, 1, 0, 0, 0, 303, 301, 1, 0, 0, 0, 303, 302, 1, 0, 0, 0, 304, 346, 1, 0, 0, 0, 305, 306, 10, 13, 0, 0, 306, 307, 7, 4, 0, 0, 307, 345, 3, 48, 24, 14, 308, 309, 10, 12, 0, 0, 309, 310, 7, 5, 0, 0, 310, 345, 3, 48, 24, 13, 311, 312, 10, 11, 0, 0, 312, 313, 7, 6, 0, 0, 313, 345, 3, 48, 24, 12, 314, 315, 10, 10, 0, 0, 315, 316, 7, 7, 0, 0, 316, 345, 3, 48, 24, 11, 317, 318, 10, 9, 0, 0, 318, 319, 5, 47, 0, 0, 319, 345, 3, 48, 24, 10, 320, 321, 10, 8, 0, 0, 321, 322, 5, 4, 0, 0, 322, 345, 3, 48, 24, 9, 323, 324, 10, 7, 0, 0, 324, 325, 5, 48, 0, 0, 325, 345, 3, 48, 24, 8, 326, 327, 10, 6, 0, 0, 327, 328, 5, 49, 0, 0, 328, 345, 3, 48, 24, 7, 329, 330, 10, 5, 0, 0, 330, 331, 5, 50, 0, 0, 331, 345, 3, 48, 24, 6, 332, 333, 10, 19, 0, 0, 333, 334, 5, 23, 0, 0, 334, 335, 5, 61, 0, 0, 335, 345, 5, 24, 0, 0, 336, 337, 10, 16, 0, 0, 337, 345, 7, 8, 0, 0, 338, 339, 10, 15, 0, 0, 339, 340, 5, 38, 0, 0, 340, 341, 5, 15, 0, 0, 341, 342, 3, 48, 24, 0, 342, 343, 5, 17, 0, 0, 343, 345, 1, 0, 0, 0, 344, 305, 1, 0, 0, 0, 344, 308, 1, 0, 0, 0, 344, 311, 1, 0, 0, 0, 344, 314, 1, 0, 0, 0, 344, 317, 1, 0, 0, 0, 344, 320, 1, 0, 0, 0, 344, 323, 1, 0, 0, 0, 344, 326, 1, 0, 0, 0, 344, 329, 1, 0, 0, 0, 344, 332, 1, 0, 0, 0, 344, 336, 1, 0, 0, 0, 344, 338, 1, 0, 0, 0, 345, 348, 1, 0, 0, 0, 346, 344, 1, 0, 0, 0, 346, 347, 1, 0, 0, 0, 347, 49, 1, 0, 0, 0, 348, 346, 1, 0, 0, 0, 349, 350, 5, 51, 0, 0, 350, 51, 1, 0, 0, 0, 351, 357, 5, 59, 0, 0, 352, 357, 3, 54, 27, 0, 353, 357, 5, 64, 0, 0, 354, 357, 5, 65, 0, 0, 355, 357, 5, 66, 0, 0, 356, 351, 1, 0, 0, 0, 356, 352, 1, 0, 0, 0, 356, 353, 1, 0, 0, 0, 356, 354, 1, 0, 0, 0, 356, 355, 1, 0, 0, 0, 357, 53, 1, 0, 0, 0, 358, 360, 5, 61, 0, 0, 359, 361, 5, 60, 0, 0, 360, 359, 1, 0, 0, 0, 360, 361, 1, 0, 0, 0, 361, 55, 1, 0, 0, 0, 362, 363, 7, 9, 0, 0, 363, 57, 1, 0, 0, 0, 32, 61, 76, 79, 92, 104, 115, 119, 121, 132, 137, 146, 152, 181, 191, 203, 213, 221, 225, 227, 240, 244, 246, 260, 263, 291, 295, 297, 303, 344, 346, 356, 360]
\ No newline at end of file
diff --git a/packages/cashc/src/grammar/CashScriptParser.ts b/packages/cashc/src/grammar/CashScriptParser.ts
index 88ca96fb..834c589b 100644
--- a/packages/cashc/src/grammar/CashScriptParser.ts
+++ b/packages/cashc/src/grammar/CashScriptParser.ts
@@ -110,104 +110,105 @@ export default class CashScriptParser extends Parser {
 	public static readonly RULE_requireStatement = 16;
 	public static readonly RULE_ifStatement = 17;
 	public static readonly RULE_consoleStatement = 18;
-	public static readonly RULE_consoleParameter = 19;
-	public static readonly RULE_consoleParameterList = 20;
-	public static readonly RULE_functionCall = 21;
-	public static readonly RULE_expressionList = 22;
-	public static readonly RULE_expression = 23;
-	public static readonly RULE_modifier = 24;
-	public static readonly RULE_literal = 25;
-	public static readonly RULE_numberLiteral = 26;
-	public static readonly RULE_typeName = 27;
-	public static readonly literalNames: (string | null)[] = [ null, "'pragma'",
-                                                            "';'", "'cashscript'",
-                                                            "'^'", "'~'",
-                                                            "'>='", "'>'",
-                                                            "'<'", "'<='",
-                                                            "'='", "'contract'",
-                                                            "'{'", "'}'",
-                                                            "'function'",
-                                                            "'('", "','",
-                                                            "')'", "'require'",
-                                                            "'if'", "'else'",
-                                                            "'console.log'",
-                                                            "'new'", "'['",
-                                                            "']'", "'tx.outputs'",
-                                                            "'.value'",
-                                                            "'.lockingBytecode'",
-                                                            "'.tokenCategory'",
-                                                            "'.nftCommitment'",
-                                                            "'.tokenAmount'",
-                                                            "'tx.inputs'",
-                                                            "'.outpointTransactionHash'",
-                                                            "'.outpointIndex'",
-                                                            "'.unlockingBytecode'",
-                                                            "'.sequenceNumber'",
-                                                            "'.reverse()'",
-                                                            "'.length'",
-                                                            "'.split'",
-                                                            "'!'", "'-'",
-                                                            "'*'", "'/'",
-                                                            "'%'", "'+'",
-                                                            "'=='", "'!='",
-                                                            "'&'", "'|'",
-                                                            "'&&'", "'||'",
-                                                            "'constant'",
-                                                            "'int'", "'bool'",
-                                                            "'string'",
-                                                            "'pubkey'",
+	public static readonly RULE_requireMessage = 19;
+	public static readonly RULE_consoleParameter = 20;
+	public static readonly RULE_consoleParameterList = 21;
+	public static readonly RULE_functionCall = 22;
+	public static readonly RULE_expressionList = 23;
+	public static readonly RULE_expression = 24;
+	public static readonly RULE_modifier = 25;
+	public static readonly RULE_literal = 26;
+	public static readonly RULE_numberLiteral = 27;
+	public static readonly RULE_typeName = 28;
+	public static readonly literalNames: (string | null)[] = [ null, "'pragma'", 
+                                                            "';'", "'cashscript'", 
+                                                            "'^'", "'~'", 
+                                                            "'>='", "'>'", 
+                                                            "'<'", "'<='", 
+                                                            "'='", "'contract'", 
+                                                            "'{'", "'}'", 
+                                                            "'function'", 
+                                                            "'('", "','", 
+                                                            "')'", "'require'", 
+                                                            "'if'", "'else'", 
+                                                            "'console.log'", 
+                                                            "'new'", "'['", 
+                                                            "']'", "'tx.outputs'", 
+                                                            "'.value'", 
+                                                            "'.lockingBytecode'", 
+                                                            "'.tokenCategory'", 
+                                                            "'.nftCommitment'", 
+                                                            "'.tokenAmount'", 
+                                                            "'tx.inputs'", 
+                                                            "'.outpointTransactionHash'", 
+                                                            "'.outpointIndex'", 
+                                                            "'.unlockingBytecode'", 
+                                                            "'.sequenceNumber'", 
+                                                            "'.reverse()'", 
+                                                            "'.length'", 
+                                                            "'.split'", 
+                                                            "'!'", "'-'", 
+                                                            "'*'", "'/'", 
+                                                            "'%'", "'+'", 
+                                                            "'=='", "'!='", 
+                                                            "'&'", "'|'", 
+                                                            "'&&'", "'||'", 
+                                                            "'constant'", 
+                                                            "'int'", "'bool'", 
+                                                            "'string'", 
+                                                            "'pubkey'", 
                                                             "'sig'", "'datasig'" ];
-	public static readonly symbolicNames: (string | null)[] = [ null, null,
-                                                             null, null,
-                                                             null, null,
-                                                             null, null,
-                                                             null, null,
-                                                             null, null,
-                                                             null, null,
-                                                             null, null,
-                                                             null, null,
-                                                             null, null,
-                                                             null, null,
-                                                             null, null,
-                                                             null, null,
-                                                             null, null,
-                                                             null, null,
-                                                             null, null,
-                                                             null, null,
-                                                             null, null,
-                                                             null, null,
-                                                             null, null,
-                                                             null, null,
-                                                             null, null,
-                                                             null, null,
-                                                             null, null,
-                                                             null, null,
-                                                             null, null,
-                                                             null, null,
-                                                             null, null,
-                                                             null, null,
-                                                             "VersionLiteral",
-                                                             "BooleanLiteral",
-                                                             "NumberUnit",
-                                                             "NumberLiteral",
-                                                             "Bytes", "Bound",
-                                                             "StringLiteral",
-                                                             "DateLiteral",
-                                                             "HexLiteral",
-                                                             "TxVar", "NullaryOp",
-                                                             "Identifier",
-                                                             "WHITESPACE",
-                                                             "COMMENT",
+	public static readonly symbolicNames: (string | null)[] = [ null, null, 
+                                                             null, null, 
+                                                             null, null, 
+                                                             null, null, 
+                                                             null, null, 
+                                                             null, null, 
+                                                             null, null, 
+                                                             null, null, 
+                                                             null, null, 
+                                                             null, null, 
+                                                             null, null, 
+                                                             null, null, 
+                                                             null, null, 
+                                                             null, null, 
+                                                             null, null, 
+                                                             null, null, 
+                                                             null, null, 
+                                                             null, null, 
+                                                             null, null, 
+                                                             null, null, 
+                                                             null, null, 
+                                                             null, null, 
+                                                             null, null, 
+                                                             null, null, 
+                                                             null, null, 
+                                                             null, null, 
+                                                             null, null, 
+                                                             null, null, 
+                                                             null, null, 
+                                                             "VersionLiteral", 
+                                                             "BooleanLiteral", 
+                                                             "NumberUnit", 
+                                                             "NumberLiteral", 
+                                                             "Bytes", "Bound", 
+                                                             "StringLiteral", 
+                                                             "DateLiteral", 
+                                                             "HexLiteral", 
+                                                             "TxVar", "NullaryOp", 
+                                                             "Identifier", 
+                                                             "WHITESPACE", 
+                                                             "COMMENT", 
                                                              "LINE_COMMENT" ];
 	// tslint:disable:no-trailing-whitespace
 	public static readonly ruleNames: string[] = [
-		"sourceFile", "pragmaDirective", "pragmaName", "pragmaValue", "versionConstraint",
-		"versionOperator", "contractDefinition", "functionDefinition", "parameterList",
-		"parameter", "block", "statement", "variableDefinition", "tupleAssignment",
-		"assignStatement", "timeOpStatement", "requireStatement", "ifStatement",
-		"consoleStatement", "consoleParameter", "consoleParameterList", "functionCall",
-		"expressionList", "expression", "modifier", "literal", "numberLiteral",
-		"typeName",
+		"sourceFile", "pragmaDirective", "pragmaName", "pragmaValue", "versionConstraint", 
+		"versionOperator", "contractDefinition", "functionDefinition", "parameterList", 
+		"parameter", "block", "statement", "variableDefinition", "tupleAssignment", 
+		"assignStatement", "timeOpStatement", "requireStatement", "ifStatement", 
+		"consoleStatement", "requireMessage", "consoleParameter", "consoleParameterList", 
+		"functionCall", "expressionList", "expression", "modifier", "literal", 
+		"numberLiteral", "typeName",
 	];
 	public get grammarFileName(): string { return "CashScript.g4"; }
 	public get literalNames(): (string | null)[] { return CashScriptParser.literalNames; }
@@ -231,23 +232,23 @@ export default class CashScriptParser extends Parser {
 		try {
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 59;
+			this.state = 61;
 			this._errHandler.sync(this);
 			_la = this._input.LA(1);
 			while (_la===1) {
 				{
 				{
-				this.state = 56;
+				this.state = 58;
 				this.pragmaDirective();
 				}
 				}
-				this.state = 61;
+				this.state = 63;
 				this._errHandler.sync(this);
 				_la = this._input.LA(1);
 			}
-			this.state = 62;
+			this.state = 64;
 			this.contractDefinition();
-			this.state = 63;
+			this.state = 65;
 			this.match(CashScriptParser.EOF);
 			}
 		}
@@ -272,13 +273,13 @@ export default class CashScriptParser extends Parser {
 		try {
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 65;
+			this.state = 67;
 			this.match(CashScriptParser.T__0);
-			this.state = 66;
+			this.state = 68;
 			this.pragmaName();
-			this.state = 67;
+			this.state = 69;
 			this.pragmaValue();
-			this.state = 68;
+			this.state = 70;
 			this.match(CashScriptParser.T__1);
 			}
 		}
@@ -303,7 +304,7 @@ export default class CashScriptParser extends Parser {
 		try {
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 70;
+			this.state = 72;
 			this.match(CashScriptParser.T__2);
 			}
 		}
@@ -329,14 +330,14 @@ export default class CashScriptParser extends Parser {
 		try {
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 72;
-			this.versionConstraint();
 			this.state = 74;
+			this.versionConstraint();
+			this.state = 76;
 			this._errHandler.sync(this);
 			_la = this._input.LA(1);
 			if ((((_la) & ~0x1F) === 0 && ((1 << _la) & 2032) !== 0) || _la===58) {
 				{
-				this.state = 73;
+				this.state = 75;
 				this.versionConstraint();
 				}
 			}
@@ -365,17 +366,17 @@ export default class CashScriptParser extends Parser {
 		try {
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 77;
+			this.state = 79;
 			this._errHandler.sync(this);
 			_la = this._input.LA(1);
 			if ((((_la) & ~0x1F) === 0 && ((1 << _la) & 2032) !== 0)) {
 				{
-				this.state = 76;
+				this.state = 78;
 				this.versionOperator();
 				}
 			}
 
-			this.state = 79;
+			this.state = 81;
 			this.match(CashScriptParser.VersionLiteral);
 			}
 		}
@@ -401,7 +402,7 @@ export default class CashScriptParser extends Parser {
 		try {
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 81;
+			this.state = 83;
 			_la = this._input.LA(1);
 			if(!((((_la) & ~0x1F) === 0 && ((1 << _la) & 2032) !== 0))) {
 			this._errHandler.recoverInline(this);
@@ -434,29 +435,29 @@ export default class CashScriptParser extends Parser {
 		try {
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 83;
+			this.state = 85;
 			this.match(CashScriptParser.T__10);
-			this.state = 84;
+			this.state = 86;
 			this.match(CashScriptParser.Identifier);
-			this.state = 85;
+			this.state = 87;
 			this.parameterList();
-			this.state = 86;
+			this.state = 88;
 			this.match(CashScriptParser.T__11);
-			this.state = 90;
+			this.state = 92;
 			this._errHandler.sync(this);
 			_la = this._input.LA(1);
 			while (_la===14) {
 				{
 				{
-				this.state = 87;
+				this.state = 89;
 				this.functionDefinition();
 				}
 				}
-				this.state = 92;
+				this.state = 94;
 				this._errHandler.sync(this);
 				_la = this._input.LA(1);
 			}
-			this.state = 93;
+			this.state = 95;
 			this.match(CashScriptParser.T__12);
 			}
 		}
@@ -482,29 +483,29 @@ export default class CashScriptParser extends Parser {
 		try {
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 95;
+			this.state = 97;
 			this.match(CashScriptParser.T__13);
-			this.state = 96;
+			this.state = 98;
 			this.match(CashScriptParser.Identifier);
-			this.state = 97;
+			this.state = 99;
 			this.parameterList();
-			this.state = 98;
+			this.state = 100;
 			this.match(CashScriptParser.T__11);
-			this.state = 102;
+			this.state = 104;
 			this._errHandler.sync(this);
 			_la = this._input.LA(1);
 			while ((((_la) & ~0x1F) === 0 && ((1 << _la) & 2883584) !== 0) || ((((_la - 52)) & ~0x1F) === 0 && ((1 << (_la - 52)) & 132159) !== 0)) {
 				{
 				{
-				this.state = 99;
+				this.state = 101;
 				this.statement();
 				}
 				}
-				this.state = 104;
+				this.state = 106;
 				this._errHandler.sync(this);
 				_la = this._input.LA(1);
 			}
-			this.state = 105;
+			this.state = 107;
 			this.match(CashScriptParser.T__12);
 			}
 		}
@@ -531,39 +532,39 @@ export default class CashScriptParser extends Parser {
 			let _alt: number;
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 107;
+			this.state = 109;
 			this.match(CashScriptParser.T__14);
-			this.state = 119;
+			this.state = 121;
 			this._errHandler.sync(this);
 			_la = this._input.LA(1);
 			if (((((_la - 52)) & ~0x1F) === 0 && ((1 << (_la - 52)) & 1087) !== 0)) {
 				{
-				this.state = 108;
+				this.state = 110;
 				this.parameter();
-				this.state = 113;
+				this.state = 115;
 				this._errHandler.sync(this);
 				_alt = this._interp.adaptivePredict(this._input, 5, this._ctx);
 				while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
 					if (_alt === 1) {
 						{
 						{
-						this.state = 109;
+						this.state = 111;
 						this.match(CashScriptParser.T__15);
-						this.state = 110;
+						this.state = 112;
 						this.parameter();
 						}
 						}
 					}
-					this.state = 115;
+					this.state = 117;
 					this._errHandler.sync(this);
 					_alt = this._interp.adaptivePredict(this._input, 5, this._ctx);
 				}
-				this.state = 117;
+				this.state = 119;
 				this._errHandler.sync(this);
 				_la = this._input.LA(1);
 				if (_la===16) {
 					{
-					this.state = 116;
+					this.state = 118;
 					this.match(CashScriptParser.T__15);
 					}
 				}
@@ -571,7 +572,7 @@ export default class CashScriptParser extends Parser {
 				}
 			}
 
-			this.state = 121;
+			this.state = 123;
 			this.match(CashScriptParser.T__16);
 			}
 		}
@@ -596,9 +597,9 @@ export default class CashScriptParser extends Parser {
 		try {
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 123;
+			this.state = 125;
 			this.typeName();
-			this.state = 124;
+			this.state = 126;
 			this.match(CashScriptParser.Identifier);
 			}
 		}
@@ -622,29 +623,29 @@ export default class CashScriptParser extends Parser {
 		this.enterRule(localctx, 20, CashScriptParser.RULE_block);
 		let _la: number;
 		try {
-			this.state = 135;
+			this.state = 137;
 			this._errHandler.sync(this);
 			switch (this._input.LA(1)) {
 			case 12:
 				this.enterOuterAlt(localctx, 1);
 				{
-				this.state = 126;
+				this.state = 128;
 				this.match(CashScriptParser.T__11);
-				this.state = 130;
+				this.state = 132;
 				this._errHandler.sync(this);
 				_la = this._input.LA(1);
 				while ((((_la) & ~0x1F) === 0 && ((1 << _la) & 2883584) !== 0) || ((((_la - 52)) & ~0x1F) === 0 && ((1 << (_la - 52)) & 132159) !== 0)) {
 					{
 					{
-					this.state = 127;
+					this.state = 129;
 					this.statement();
 					}
 					}
-					this.state = 132;
+					this.state = 134;
 					this._errHandler.sync(this);
 					_la = this._input.LA(1);
 				}
-				this.state = 133;
+				this.state = 135;
 				this.match(CashScriptParser.T__12);
 				}
 				break;
@@ -661,7 +662,7 @@ export default class CashScriptParser extends Parser {
 			case 69:
 				this.enterOuterAlt(localctx, 2);
 				{
-				this.state = 134;
+				this.state = 136;
 				this.statement();
 				}
 				break;
@@ -688,55 +689,55 @@ export default class CashScriptParser extends Parser {
 		let localctx: StatementContext = new StatementContext(this, this._ctx, this.state);
 		this.enterRule(localctx, 22, CashScriptParser.RULE_statement);
 		try {
-			this.state = 144;
+			this.state = 146;
 			this._errHandler.sync(this);
 			switch ( this._interp.adaptivePredict(this._input, 10, this._ctx) ) {
 			case 1:
 				this.enterOuterAlt(localctx, 1);
 				{
-				this.state = 137;
+				this.state = 139;
 				this.variableDefinition();
 				}
 				break;
 			case 2:
 				this.enterOuterAlt(localctx, 2);
 				{
-				this.state = 138;
+				this.state = 140;
 				this.tupleAssignment();
 				}
 				break;
 			case 3:
 				this.enterOuterAlt(localctx, 3);
 				{
-				this.state = 139;
+				this.state = 141;
 				this.assignStatement();
 				}
 				break;
 			case 4:
 				this.enterOuterAlt(localctx, 4);
 				{
-				this.state = 140;
+				this.state = 142;
 				this.timeOpStatement();
 				}
 				break;
 			case 5:
 				this.enterOuterAlt(localctx, 5);
 				{
-				this.state = 141;
+				this.state = 143;
 				this.requireStatement();
 				}
 				break;
 			case 6:
 				this.enterOuterAlt(localctx, 6);
 				{
-				this.state = 142;
+				this.state = 144;
 				this.ifStatement();
 				}
 				break;
 			case 7:
 				this.enterOuterAlt(localctx, 7);
 				{
-				this.state = 143;
+				this.state = 145;
 				this.consoleStatement();
 				}
 				break;
@@ -764,29 +765,29 @@ export default class CashScriptParser extends Parser {
 		try {
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 146;
+			this.state = 148;
 			this.typeName();
-			this.state = 150;
+			this.state = 152;
 			this._errHandler.sync(this);
 			_la = this._input.LA(1);
 			while (_la===51) {
 				{
 				{
-				this.state = 147;
+				this.state = 149;
 				this.modifier();
 				}
 				}
-				this.state = 152;
+				this.state = 154;
 				this._errHandler.sync(this);
 				_la = this._input.LA(1);
 			}
-			this.state = 153;
+			this.state = 155;
 			this.match(CashScriptParser.Identifier);
-			this.state = 154;
+			this.state = 156;
 			this.match(CashScriptParser.T__9);
-			this.state = 155;
+			this.state = 157;
 			this.expression(0);
-			this.state = 156;
+			this.state = 158;
 			this.match(CashScriptParser.T__1);
 			}
 		}
@@ -811,21 +812,21 @@ export default class CashScriptParser extends Parser {
 		try {
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 158;
+			this.state = 160;
 			this.typeName();
-			this.state = 159;
+			this.state = 161;
 			this.match(CashScriptParser.Identifier);
-			this.state = 160;
+			this.state = 162;
 			this.match(CashScriptParser.T__15);
-			this.state = 161;
+			this.state = 163;
 			this.typeName();
-			this.state = 162;
+			this.state = 164;
 			this.match(CashScriptParser.Identifier);
-			this.state = 163;
+			this.state = 165;
 			this.match(CashScriptParser.T__9);
-			this.state = 164;
+			this.state = 166;
 			this.expression(0);
-			this.state = 165;
+			this.state = 167;
 			this.match(CashScriptParser.T__1);
 			}
 		}
@@ -850,13 +851,13 @@ export default class CashScriptParser extends Parser {
 		try {
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 167;
+			this.state = 169;
 			this.match(CashScriptParser.Identifier);
-			this.state = 168;
+			this.state = 170;
 			this.match(CashScriptParser.T__9);
-			this.state = 169;
+			this.state = 171;
 			this.expression(0);
-			this.state = 170;
+			this.state = 172;
 			this.match(CashScriptParser.T__1);
 			}
 		}
@@ -882,31 +883,31 @@ export default class CashScriptParser extends Parser {
 		try {
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 172;
+			this.state = 174;
 			this.match(CashScriptParser.T__17);
-			this.state = 173;
+			this.state = 175;
 			this.match(CashScriptParser.T__14);
-			this.state = 174;
+			this.state = 176;
 			this.match(CashScriptParser.TxVar);
-			this.state = 175;
+			this.state = 177;
 			this.match(CashScriptParser.T__5);
-			this.state = 176;
+			this.state = 178;
 			this.expression(0);
-			this.state = 179;
+			this.state = 181;
 			this._errHandler.sync(this);
 			_la = this._input.LA(1);
 			if (_la===16) {
 				{
-				this.state = 177;
+				this.state = 179;
 				this.match(CashScriptParser.T__15);
-				this.state = 178;
-				this.match(CashScriptParser.StringLiteral);
+				this.state = 180;
+				this.requireMessage();
 				}
 			}
 
-			this.state = 181;
+			this.state = 183;
 			this.match(CashScriptParser.T__16);
-			this.state = 182;
+			this.state = 184;
 			this.match(CashScriptParser.T__1);
 			}
 		}
@@ -932,27 +933,27 @@ export default class CashScriptParser extends Parser {
 		try {
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 184;
+			this.state = 186;
 			this.match(CashScriptParser.T__17);
-			this.state = 185;
+			this.state = 187;
 			this.match(CashScriptParser.T__14);
-			this.state = 186;
+			this.state = 188;
 			this.expression(0);
-			this.state = 189;
+			this.state = 191;
 			this._errHandler.sync(this);
 			_la = this._input.LA(1);
 			if (_la===16) {
 				{
-				this.state = 187;
+				this.state = 189;
 				this.match(CashScriptParser.T__15);
-				this.state = 188;
-				this.match(CashScriptParser.StringLiteral);
+				this.state = 190;
+				this.requireMessage();
 				}
 			}
 
-			this.state = 191;
+			this.state = 193;
 			this.match(CashScriptParser.T__16);
-			this.state = 192;
+			this.state = 194;
 			this.match(CashScriptParser.T__1);
 			}
 		}
@@ -977,24 +978,24 @@ export default class CashScriptParser extends Parser {
 		try {
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 194;
+			this.state = 196;
 			this.match(CashScriptParser.T__18);
-			this.state = 195;
+			this.state = 197;
 			this.match(CashScriptParser.T__14);
-			this.state = 196;
+			this.state = 198;
 			this.expression(0);
-			this.state = 197;
+			this.state = 199;
 			this.match(CashScriptParser.T__16);
-			this.state = 198;
+			this.state = 200;
 			localctx._ifBlock = this.block();
-			this.state = 201;
+			this.state = 203;
 			this._errHandler.sync(this);
 			switch ( this._interp.adaptivePredict(this._input, 14, this._ctx) ) {
 			case 1:
 				{
-				this.state = 199;
+				this.state = 201;
 				this.match(CashScriptParser.T__19);
-				this.state = 200;
+				this.state = 202;
 				localctx._elseBlock = this.block();
 				}
 				break;
@@ -1022,11 +1023,11 @@ export default class CashScriptParser extends Parser {
 		try {
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 203;
+			this.state = 205;
 			this.match(CashScriptParser.T__20);
-			this.state = 204;
+			this.state = 206;
 			this.consoleParameterList();
-			this.state = 205;
+			this.state = 207;
 			this.match(CashScriptParser.T__1);
 			}
 		}
@@ -1045,22 +1046,58 @@ export default class CashScriptParser extends Parser {
 		return localctx;
 	}
 	// @RuleVersion(0)
-	public consoleParameter(): ConsoleParameterContext {
-		let localctx: ConsoleParameterContext = new ConsoleParameterContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 38, CashScriptParser.RULE_consoleParameter);
-		let _la: number;
+	public requireMessage(): RequireMessageContext {
+		let localctx: RequireMessageContext = new RequireMessageContext(this, this._ctx, this.state);
+		this.enterRule(localctx, 38, CashScriptParser.RULE_requireMessage);
 		try {
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 207;
-			_la = this._input.LA(1);
-			if(!(((((_la - 59)) & ~0x1F) === 0 && ((1 << (_la - 59)) & 1189) !== 0))) {
-			this._errHandler.recoverInline(this);
+			this.state = 209;
+			this.match(CashScriptParser.StringLiteral);
 			}
-			else {
-				this._errHandler.reportMatch(this);
-			    this.consume();
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
 			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return localctx;
+	}
+	// @RuleVersion(0)
+	public consoleParameter(): ConsoleParameterContext {
+		let localctx: ConsoleParameterContext = new ConsoleParameterContext(this, this._ctx, this.state);
+		this.enterRule(localctx, 40, CashScriptParser.RULE_consoleParameter);
+		try {
+			this.state = 213;
+			this._errHandler.sync(this);
+			switch (this._input.LA(1)) {
+			case 69:
+				this.enterOuterAlt(localctx, 1);
+				{
+				this.state = 211;
+				this.match(CashScriptParser.Identifier);
+				}
+				break;
+			case 59:
+			case 61:
+			case 64:
+			case 65:
+			case 66:
+				this.enterOuterAlt(localctx, 2);
+				{
+				this.state = 212;
+				this.literal();
+				}
+				break;
+			default:
+				throw new NoViableAltException(this);
 			}
 		}
 		catch (re) {
@@ -1080,45 +1117,45 @@ export default class CashScriptParser extends Parser {
 	// @RuleVersion(0)
 	public consoleParameterList(): ConsoleParameterListContext {
 		let localctx: ConsoleParameterListContext = new ConsoleParameterListContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 40, CashScriptParser.RULE_consoleParameterList);
+		this.enterRule(localctx, 42, CashScriptParser.RULE_consoleParameterList);
 		let _la: number;
 		try {
 			let _alt: number;
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 209;
+			this.state = 215;
 			this.match(CashScriptParser.T__14);
-			this.state = 221;
+			this.state = 227;
 			this._errHandler.sync(this);
 			_la = this._input.LA(1);
-			if (((((_la - 59)) & ~0x1F) === 0 && ((1 << (_la - 59)) & 1189) !== 0)) {
+			if (((((_la - 59)) & ~0x1F) === 0 && ((1 << (_la - 59)) & 1253) !== 0)) {
 				{
-				this.state = 210;
+				this.state = 216;
 				this.consoleParameter();
-				this.state = 215;
+				this.state = 221;
 				this._errHandler.sync(this);
-				_alt = this._interp.adaptivePredict(this._input, 15, this._ctx);
+				_alt = this._interp.adaptivePredict(this._input, 16, this._ctx);
 				while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
 					if (_alt === 1) {
 						{
 						{
-						this.state = 211;
+						this.state = 217;
 						this.match(CashScriptParser.T__15);
-						this.state = 212;
+						this.state = 218;
 						this.consoleParameter();
 						}
 						}
 					}
-					this.state = 217;
+					this.state = 223;
 					this._errHandler.sync(this);
-					_alt = this._interp.adaptivePredict(this._input, 15, this._ctx);
+					_alt = this._interp.adaptivePredict(this._input, 16, this._ctx);
 				}
-				this.state = 219;
+				this.state = 225;
 				this._errHandler.sync(this);
 				_la = this._input.LA(1);
 				if (_la===16) {
 					{
-					this.state = 218;
+					this.state = 224;
 					this.match(CashScriptParser.T__15);
 					}
 				}
@@ -1126,7 +1163,7 @@ export default class CashScriptParser extends Parser {
 				}
 			}
 
-			this.state = 223;
+			this.state = 229;
 			this.match(CashScriptParser.T__16);
 			}
 		}
@@ -1147,13 +1184,13 @@ export default class CashScriptParser extends Parser {
 	// @RuleVersion(0)
 	public functionCall(): FunctionCallContext {
 		let localctx: FunctionCallContext = new FunctionCallContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 42, CashScriptParser.RULE_functionCall);
+		this.enterRule(localctx, 44, CashScriptParser.RULE_functionCall);
 		try {
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 225;
+			this.state = 231;
 			this.match(CashScriptParser.Identifier);
-			this.state = 226;
+			this.state = 232;
 			this.expressionList();
 			}
 		}
@@ -1174,45 +1211,45 @@ export default class CashScriptParser extends Parser {
 	// @RuleVersion(0)
 	public expressionList(): ExpressionListContext {
 		let localctx: ExpressionListContext = new ExpressionListContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 44, CashScriptParser.RULE_expressionList);
+		this.enterRule(localctx, 46, CashScriptParser.RULE_expressionList);
 		let _la: number;
 		try {
 			let _alt: number;
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 228;
+			this.state = 234;
 			this.match(CashScriptParser.T__14);
-			this.state = 240;
+			this.state = 246;
 			this._errHandler.sync(this);
 			_la = this._input.LA(1);
 			if ((((_la) & ~0x1F) === 0 && ((1 << _la) & 2193653760) !== 0) || ((((_la - 39)) & ~0x1F) === 0 && ((1 << (_la - 39)) & 1859641347) !== 0)) {
 				{
-				this.state = 229;
+				this.state = 235;
 				this.expression(0);
-				this.state = 234;
+				this.state = 240;
 				this._errHandler.sync(this);
-				_alt = this._interp.adaptivePredict(this._input, 18, this._ctx);
+				_alt = this._interp.adaptivePredict(this._input, 19, this._ctx);
 				while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
 					if (_alt === 1) {
 						{
 						{
-						this.state = 230;
+						this.state = 236;
 						this.match(CashScriptParser.T__15);
-						this.state = 231;
+						this.state = 237;
 						this.expression(0);
 						}
 						}
 					}
-					this.state = 236;
+					this.state = 242;
 					this._errHandler.sync(this);
-					_alt = this._interp.adaptivePredict(this._input, 18, this._ctx);
+					_alt = this._interp.adaptivePredict(this._input, 19, this._ctx);
 				}
-				this.state = 238;
+				this.state = 244;
 				this._errHandler.sync(this);
 				_la = this._input.LA(1);
 				if (_la===16) {
 					{
-					this.state = 237;
+					this.state = 243;
 					this.match(CashScriptParser.T__15);
 					}
 				}
@@ -1220,7 +1257,7 @@ export default class CashScriptParser extends Parser {
 				}
 			}
 
-			this.state = 242;
+			this.state = 248;
 			this.match(CashScriptParser.T__16);
 			}
 		}
@@ -1251,27 +1288,27 @@ export default class CashScriptParser extends Parser {
 		let _parentState: number = this.state;
 		let localctx: ExpressionContext = new ExpressionContext(this, this._ctx, _parentState);
 		let _prevctx: ExpressionContext = localctx;
-		let _startState: number = 46;
-		this.enterRecursionRule(localctx, 46, CashScriptParser.RULE_expression, _p);
+		let _startState: number = 48;
+		this.enterRecursionRule(localctx, 48, CashScriptParser.RULE_expression, _p);
 		let _la: number;
 		try {
 			let _alt: number;
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 297;
+			this.state = 303;
 			this._errHandler.sync(this);
-			switch ( this._interp.adaptivePredict(this._input, 26, this._ctx) ) {
+			switch ( this._interp.adaptivePredict(this._input, 27, this._ctx) ) {
 			case 1:
 				{
 				localctx = new ParenthesisedContext(this, localctx);
 				this._ctx = localctx;
 				_prevctx = localctx;
 
-				this.state = 245;
+				this.state = 251;
 				this.match(CashScriptParser.T__14);
-				this.state = 246;
+				this.state = 252;
 				this.expression(0);
-				this.state = 247;
+				this.state = 253;
 				this.match(CashScriptParser.T__16);
 				}
 				break;
@@ -1280,35 +1317,35 @@ export default class CashScriptParser extends Parser {
 				localctx = new CastContext(this, localctx);
 				this._ctx = localctx;
 				_prevctx = localctx;
-				this.state = 249;
+				this.state = 255;
 				this.typeName();
-				this.state = 250;
+				this.state = 256;
 				this.match(CashScriptParser.T__14);
-				this.state = 251;
+				this.state = 257;
 				(localctx as CastContext)._castable = this.expression(0);
-				this.state = 254;
+				this.state = 260;
 				this._errHandler.sync(this);
-				switch ( this._interp.adaptivePredict(this._input, 21, this._ctx) ) {
+				switch ( this._interp.adaptivePredict(this._input, 22, this._ctx) ) {
 				case 1:
 					{
-					this.state = 252;
+					this.state = 258;
 					this.match(CashScriptParser.T__15);
-					this.state = 253;
+					this.state = 259;
 					(localctx as CastContext)._size = this.expression(0);
 					}
 					break;
 				}
-				this.state = 257;
+				this.state = 263;
 				this._errHandler.sync(this);
 				_la = this._input.LA(1);
 				if (_la===16) {
 					{
-					this.state = 256;
+					this.state = 262;
 					this.match(CashScriptParser.T__15);
 					}
 				}
 
-				this.state = 259;
+				this.state = 265;
 				this.match(CashScriptParser.T__16);
 				}
 				break;
@@ -1317,7 +1354,7 @@ export default class CashScriptParser extends Parser {
 				localctx = new FunctionCallExpressionContext(this, localctx);
 				this._ctx = localctx;
 				_prevctx = localctx;
-				this.state = 261;
+				this.state = 267;
 				this.functionCall();
 				}
 				break;
@@ -1326,11 +1363,11 @@ export default class CashScriptParser extends Parser {
 				localctx = new InstantiationContext(this, localctx);
 				this._ctx = localctx;
 				_prevctx = localctx;
-				this.state = 262;
+				this.state = 268;
 				this.match(CashScriptParser.T__21);
-				this.state = 263;
+				this.state = 269;
 				this.match(CashScriptParser.Identifier);
-				this.state = 264;
+				this.state = 270;
 				this.expressionList();
 				}
 				break;
@@ -1339,15 +1376,15 @@ export default class CashScriptParser extends Parser {
 				localctx = new UnaryIntrospectionOpContext(this, localctx);
 				this._ctx = localctx;
 				_prevctx = localctx;
-				this.state = 265;
+				this.state = 271;
 				(localctx as UnaryIntrospectionOpContext)._scope = this.match(CashScriptParser.T__24);
-				this.state = 266;
+				this.state = 272;
 				this.match(CashScriptParser.T__22);
-				this.state = 267;
+				this.state = 273;
 				this.expression(0);
-				this.state = 268;
+				this.state = 274;
 				this.match(CashScriptParser.T__23);
-				this.state = 269;
+				this.state = 275;
 				(localctx as UnaryIntrospectionOpContext)._op = this._input.LT(1);
 				_la = this._input.LA(1);
 				if(!((((_la) & ~0x1F) === 0 && ((1 << _la) & 2080374784) !== 0))) {
@@ -1364,15 +1401,15 @@ export default class CashScriptParser extends Parser {
 				localctx = new UnaryIntrospectionOpContext(this, localctx);
 				this._ctx = localctx;
 				_prevctx = localctx;
-				this.state = 271;
+				this.state = 277;
 				(localctx as UnaryIntrospectionOpContext)._scope = this.match(CashScriptParser.T__30);
-				this.state = 272;
+				this.state = 278;
 				this.match(CashScriptParser.T__22);
-				this.state = 273;
+				this.state = 279;
 				this.expression(0);
-				this.state = 274;
+				this.state = 280;
 				this.match(CashScriptParser.T__23);
-				this.state = 275;
+				this.state = 281;
 				(localctx as UnaryIntrospectionOpContext)._op = this._input.LT(1);
 				_la = this._input.LA(1);
 				if(!(((((_la - 26)) & ~0x1F) === 0 && ((1 << (_la - 26)) & 991) !== 0))) {
@@ -1389,7 +1426,7 @@ export default class CashScriptParser extends Parser {
 				localctx = new UnaryOpContext(this, localctx);
 				this._ctx = localctx;
 				_prevctx = localctx;
-				this.state = 277;
+				this.state = 283;
 				(localctx as UnaryOpContext)._op = this._input.LT(1);
 				_la = this._input.LA(1);
 				if(!(_la===39 || _la===40)) {
@@ -1399,7 +1436,7 @@ export default class CashScriptParser extends Parser {
 					this._errHandler.reportMatch(this);
 				    this.consume();
 				}
-				this.state = 278;
+				this.state = 284;
 				this.expression(14);
 				}
 				break;
@@ -1408,39 +1445,39 @@ export default class CashScriptParser extends Parser {
 				localctx = new ArrayContext(this, localctx);
 				this._ctx = localctx;
 				_prevctx = localctx;
-				this.state = 279;
+				this.state = 285;
 				this.match(CashScriptParser.T__22);
-				this.state = 291;
+				this.state = 297;
 				this._errHandler.sync(this);
 				_la = this._input.LA(1);
 				if ((((_la) & ~0x1F) === 0 && ((1 << _la) & 2193653760) !== 0) || ((((_la - 39)) & ~0x1F) === 0 && ((1 << (_la - 39)) & 1859641347) !== 0)) {
 					{
-					this.state = 280;
+					this.state = 286;
 					this.expression(0);
-					this.state = 285;
+					this.state = 291;
 					this._errHandler.sync(this);
-					_alt = this._interp.adaptivePredict(this._input, 23, this._ctx);
+					_alt = this._interp.adaptivePredict(this._input, 24, this._ctx);
 					while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
 						if (_alt === 1) {
 							{
 							{
-							this.state = 281;
+							this.state = 287;
 							this.match(CashScriptParser.T__15);
-							this.state = 282;
+							this.state = 288;
 							this.expression(0);
 							}
 							}
 						}
-						this.state = 287;
+						this.state = 293;
 						this._errHandler.sync(this);
-						_alt = this._interp.adaptivePredict(this._input, 23, this._ctx);
+						_alt = this._interp.adaptivePredict(this._input, 24, this._ctx);
 					}
-					this.state = 289;
+					this.state = 295;
 					this._errHandler.sync(this);
 					_la = this._input.LA(1);
 					if (_la===16) {
 						{
-						this.state = 288;
+						this.state = 294;
 						this.match(CashScriptParser.T__15);
 						}
 					}
@@ -1448,7 +1485,7 @@ export default class CashScriptParser extends Parser {
 					}
 				}
 
-				this.state = 293;
+				this.state = 299;
 				this.match(CashScriptParser.T__23);
 				}
 				break;
@@ -1457,7 +1494,7 @@ export default class CashScriptParser extends Parser {
 				localctx = new NullaryOpContext(this, localctx);
 				this._ctx = localctx;
 				_prevctx = localctx;
-				this.state = 294;
+				this.state = 300;
 				this.match(CashScriptParser.NullaryOp);
 				}
 				break;
@@ -1466,7 +1503,7 @@ export default class CashScriptParser extends Parser {
 				localctx = new IdentifierContext(this, localctx);
 				this._ctx = localctx;
 				_prevctx = localctx;
-				this.state = 295;
+				this.state = 301;
 				this.match(CashScriptParser.Identifier);
 				}
 				break;
@@ -1475,15 +1512,15 @@ export default class CashScriptParser extends Parser {
 				localctx = new LiteralExpressionContext(this, localctx);
 				this._ctx = localctx;
 				_prevctx = localctx;
-				this.state = 296;
+				this.state = 302;
 				this.literal();
 				}
 				break;
 			}
 			this._ctx.stop = this._input.LT(-1);
-			this.state = 340;
+			this.state = 346;
 			this._errHandler.sync(this);
-			_alt = this._interp.adaptivePredict(this._input, 28, this._ctx);
+			_alt = this._interp.adaptivePredict(this._input, 29, this._ctx);
 			while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
 				if (_alt === 1) {
 					if (this._parseListeners != null) {
@@ -1491,19 +1528,19 @@ export default class CashScriptParser extends Parser {
 					}
 					_prevctx = localctx;
 					{
-					this.state = 338;
+					this.state = 344;
 					this._errHandler.sync(this);
-					switch ( this._interp.adaptivePredict(this._input, 27, this._ctx) ) {
+					switch ( this._interp.adaptivePredict(this._input, 28, this._ctx) ) {
 					case 1:
 						{
 						localctx = new BinaryOpContext(this, new ExpressionContext(this, _parentctx, _parentState));
 						(localctx as BinaryOpContext)._left = _prevctx;
 						this.pushNewRecursionContext(localctx, _startState, CashScriptParser.RULE_expression);
-						this.state = 299;
+						this.state = 305;
 						if (!(this.precpred(this._ctx, 13))) {
 							throw this.createFailedPredicateException("this.precpred(this._ctx, 13)");
 						}
-						this.state = 300;
+						this.state = 306;
 						(localctx as BinaryOpContext)._op = this._input.LT(1);
 						_la = this._input.LA(1);
 						if(!(((((_la - 41)) & ~0x1F) === 0 && ((1 << (_la - 41)) & 7) !== 0))) {
@@ -1513,7 +1550,7 @@ export default class CashScriptParser extends Parser {
 							this._errHandler.reportMatch(this);
 						    this.consume();
 						}
-						this.state = 301;
+						this.state = 307;
 						(localctx as BinaryOpContext)._right = this.expression(14);
 						}
 						break;
@@ -1522,11 +1559,11 @@ export default class CashScriptParser extends Parser {
 						localctx = new BinaryOpContext(this, new ExpressionContext(this, _parentctx, _parentState));
 						(localctx as BinaryOpContext)._left = _prevctx;
 						this.pushNewRecursionContext(localctx, _startState, CashScriptParser.RULE_expression);
-						this.state = 302;
+						this.state = 308;
 						if (!(this.precpred(this._ctx, 12))) {
 							throw this.createFailedPredicateException("this.precpred(this._ctx, 12)");
 						}
-						this.state = 303;
+						this.state = 309;
 						(localctx as BinaryOpContext)._op = this._input.LT(1);
 						_la = this._input.LA(1);
 						if(!(_la===40 || _la===44)) {
@@ -1536,7 +1573,7 @@ export default class CashScriptParser extends Parser {
 							this._errHandler.reportMatch(this);
 						    this.consume();
 						}
-						this.state = 304;
+						this.state = 310;
 						(localctx as BinaryOpContext)._right = this.expression(13);
 						}
 						break;
@@ -1545,11 +1582,11 @@ export default class CashScriptParser extends Parser {
 						localctx = new BinaryOpContext(this, new ExpressionContext(this, _parentctx, _parentState));
 						(localctx as BinaryOpContext)._left = _prevctx;
 						this.pushNewRecursionContext(localctx, _startState, CashScriptParser.RULE_expression);
-						this.state = 305;
+						this.state = 311;
 						if (!(this.precpred(this._ctx, 11))) {
 							throw this.createFailedPredicateException("this.precpred(this._ctx, 11)");
 						}
-						this.state = 306;
+						this.state = 312;
 						(localctx as BinaryOpContext)._op = this._input.LT(1);
 						_la = this._input.LA(1);
 						if(!((((_la) & ~0x1F) === 0 && ((1 << _la) & 960) !== 0))) {
@@ -1559,7 +1596,7 @@ export default class CashScriptParser extends Parser {
 							this._errHandler.reportMatch(this);
 						    this.consume();
 						}
-						this.state = 307;
+						this.state = 313;
 						(localctx as BinaryOpContext)._right = this.expression(12);
 						}
 						break;
@@ -1568,11 +1605,11 @@ export default class CashScriptParser extends Parser {
 						localctx = new BinaryOpContext(this, new ExpressionContext(this, _parentctx, _parentState));
 						(localctx as BinaryOpContext)._left = _prevctx;
 						this.pushNewRecursionContext(localctx, _startState, CashScriptParser.RULE_expression);
-						this.state = 308;
+						this.state = 314;
 						if (!(this.precpred(this._ctx, 10))) {
 							throw this.createFailedPredicateException("this.precpred(this._ctx, 10)");
 						}
-						this.state = 309;
+						this.state = 315;
 						(localctx as BinaryOpContext)._op = this._input.LT(1);
 						_la = this._input.LA(1);
 						if(!(_la===45 || _la===46)) {
@@ -1582,7 +1619,7 @@ export default class CashScriptParser extends Parser {
 							this._errHandler.reportMatch(this);
 						    this.consume();
 						}
-						this.state = 310;
+						this.state = 316;
 						(localctx as BinaryOpContext)._right = this.expression(11);
 						}
 						break;
@@ -1591,13 +1628,13 @@ export default class CashScriptParser extends Parser {
 						localctx = new BinaryOpContext(this, new ExpressionContext(this, _parentctx, _parentState));
 						(localctx as BinaryOpContext)._left = _prevctx;
 						this.pushNewRecursionContext(localctx, _startState, CashScriptParser.RULE_expression);
-						this.state = 311;
+						this.state = 317;
 						if (!(this.precpred(this._ctx, 9))) {
 							throw this.createFailedPredicateException("this.precpred(this._ctx, 9)");
 						}
-						this.state = 312;
+						this.state = 318;
 						(localctx as BinaryOpContext)._op = this.match(CashScriptParser.T__46);
-						this.state = 313;
+						this.state = 319;
 						(localctx as BinaryOpContext)._right = this.expression(10);
 						}
 						break;
@@ -1606,13 +1643,13 @@ export default class CashScriptParser extends Parser {
 						localctx = new BinaryOpContext(this, new ExpressionContext(this, _parentctx, _parentState));
 						(localctx as BinaryOpContext)._left = _prevctx;
 						this.pushNewRecursionContext(localctx, _startState, CashScriptParser.RULE_expression);
-						this.state = 314;
+						this.state = 320;
 						if (!(this.precpred(this._ctx, 8))) {
 							throw this.createFailedPredicateException("this.precpred(this._ctx, 8)");
 						}
-						this.state = 315;
+						this.state = 321;
 						(localctx as BinaryOpContext)._op = this.match(CashScriptParser.T__3);
-						this.state = 316;
+						this.state = 322;
 						(localctx as BinaryOpContext)._right = this.expression(9);
 						}
 						break;
@@ -1621,13 +1658,13 @@ export default class CashScriptParser extends Parser {
 						localctx = new BinaryOpContext(this, new ExpressionContext(this, _parentctx, _parentState));
 						(localctx as BinaryOpContext)._left = _prevctx;
 						this.pushNewRecursionContext(localctx, _startState, CashScriptParser.RULE_expression);
-						this.state = 317;
+						this.state = 323;
 						if (!(this.precpred(this._ctx, 7))) {
 							throw this.createFailedPredicateException("this.precpred(this._ctx, 7)");
 						}
-						this.state = 318;
+						this.state = 324;
 						(localctx as BinaryOpContext)._op = this.match(CashScriptParser.T__47);
-						this.state = 319;
+						this.state = 325;
 						(localctx as BinaryOpContext)._right = this.expression(8);
 						}
 						break;
@@ -1636,13 +1673,13 @@ export default class CashScriptParser extends Parser {
 						localctx = new BinaryOpContext(this, new ExpressionContext(this, _parentctx, _parentState));
 						(localctx as BinaryOpContext)._left = _prevctx;
 						this.pushNewRecursionContext(localctx, _startState, CashScriptParser.RULE_expression);
-						this.state = 320;
+						this.state = 326;
 						if (!(this.precpred(this._ctx, 6))) {
 							throw this.createFailedPredicateException("this.precpred(this._ctx, 6)");
 						}
-						this.state = 321;
+						this.state = 327;
 						(localctx as BinaryOpContext)._op = this.match(CashScriptParser.T__48);
-						this.state = 322;
+						this.state = 328;
 						(localctx as BinaryOpContext)._right = this.expression(7);
 						}
 						break;
@@ -1651,13 +1688,13 @@ export default class CashScriptParser extends Parser {
 						localctx = new BinaryOpContext(this, new ExpressionContext(this, _parentctx, _parentState));
 						(localctx as BinaryOpContext)._left = _prevctx;
 						this.pushNewRecursionContext(localctx, _startState, CashScriptParser.RULE_expression);
-						this.state = 323;
+						this.state = 329;
 						if (!(this.precpred(this._ctx, 5))) {
 							throw this.createFailedPredicateException("this.precpred(this._ctx, 5)");
 						}
-						this.state = 324;
+						this.state = 330;
 						(localctx as BinaryOpContext)._op = this.match(CashScriptParser.T__49);
-						this.state = 325;
+						this.state = 331;
 						(localctx as BinaryOpContext)._right = this.expression(6);
 						}
 						break;
@@ -1665,15 +1702,15 @@ export default class CashScriptParser extends Parser {
 						{
 						localctx = new TupleIndexOpContext(this, new ExpressionContext(this, _parentctx, _parentState));
 						this.pushNewRecursionContext(localctx, _startState, CashScriptParser.RULE_expression);
-						this.state = 326;
+						this.state = 332;
 						if (!(this.precpred(this._ctx, 19))) {
 							throw this.createFailedPredicateException("this.precpred(this._ctx, 19)");
 						}
-						this.state = 327;
+						this.state = 333;
 						this.match(CashScriptParser.T__22);
-						this.state = 328;
+						this.state = 334;
 						(localctx as TupleIndexOpContext)._index = this.match(CashScriptParser.NumberLiteral);
-						this.state = 329;
+						this.state = 335;
 						this.match(CashScriptParser.T__23);
 						}
 						break;
@@ -1681,11 +1718,11 @@ export default class CashScriptParser extends Parser {
 						{
 						localctx = new UnaryOpContext(this, new ExpressionContext(this, _parentctx, _parentState));
 						this.pushNewRecursionContext(localctx, _startState, CashScriptParser.RULE_expression);
-						this.state = 330;
+						this.state = 336;
 						if (!(this.precpred(this._ctx, 16))) {
 							throw this.createFailedPredicateException("this.precpred(this._ctx, 16)");
 						}
-						this.state = 331;
+						this.state = 337;
 						(localctx as UnaryOpContext)._op = this._input.LT(1);
 						_la = this._input.LA(1);
 						if(!(_la===36 || _la===37)) {
@@ -1702,26 +1739,26 @@ export default class CashScriptParser extends Parser {
 						localctx = new BinaryOpContext(this, new ExpressionContext(this, _parentctx, _parentState));
 						(localctx as BinaryOpContext)._left = _prevctx;
 						this.pushNewRecursionContext(localctx, _startState, CashScriptParser.RULE_expression);
-						this.state = 332;
+						this.state = 338;
 						if (!(this.precpred(this._ctx, 15))) {
 							throw this.createFailedPredicateException("this.precpred(this._ctx, 15)");
 						}
-						this.state = 333;
+						this.state = 339;
 						(localctx as BinaryOpContext)._op = this.match(CashScriptParser.T__37);
-						this.state = 334;
+						this.state = 340;
 						this.match(CashScriptParser.T__14);
-						this.state = 335;
+						this.state = 341;
 						(localctx as BinaryOpContext)._right = this.expression(0);
-						this.state = 336;
+						this.state = 342;
 						this.match(CashScriptParser.T__16);
 						}
 						break;
 					}
 					}
 				}
-				this.state = 342;
+				this.state = 348;
 				this._errHandler.sync(this);
-				_alt = this._interp.adaptivePredict(this._input, 28, this._ctx);
+				_alt = this._interp.adaptivePredict(this._input, 29, this._ctx);
 			}
 			}
 		}
@@ -1742,11 +1779,11 @@ export default class CashScriptParser extends Parser {
 	// @RuleVersion(0)
 	public modifier(): ModifierContext {
 		let localctx: ModifierContext = new ModifierContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 48, CashScriptParser.RULE_modifier);
+		this.enterRule(localctx, 50, CashScriptParser.RULE_modifier);
 		try {
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 343;
+			this.state = 349;
 			this.match(CashScriptParser.T__50);
 			}
 		}
@@ -1767,43 +1804,43 @@ export default class CashScriptParser extends Parser {
 	// @RuleVersion(0)
 	public literal(): LiteralContext {
 		let localctx: LiteralContext = new LiteralContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 50, CashScriptParser.RULE_literal);
+		this.enterRule(localctx, 52, CashScriptParser.RULE_literal);
 		try {
-			this.state = 350;
+			this.state = 356;
 			this._errHandler.sync(this);
 			switch (this._input.LA(1)) {
 			case 59:
 				this.enterOuterAlt(localctx, 1);
 				{
-				this.state = 345;
+				this.state = 351;
 				this.match(CashScriptParser.BooleanLiteral);
 				}
 				break;
 			case 61:
 				this.enterOuterAlt(localctx, 2);
 				{
-				this.state = 346;
+				this.state = 352;
 				this.numberLiteral();
 				}
 				break;
 			case 64:
 				this.enterOuterAlt(localctx, 3);
 				{
-				this.state = 347;
+				this.state = 353;
 				this.match(CashScriptParser.StringLiteral);
 				}
 				break;
 			case 65:
 				this.enterOuterAlt(localctx, 4);
 				{
-				this.state = 348;
+				this.state = 354;
 				this.match(CashScriptParser.DateLiteral);
 				}
 				break;
 			case 66:
 				this.enterOuterAlt(localctx, 5);
 				{
-				this.state = 349;
+				this.state = 355;
 				this.match(CashScriptParser.HexLiteral);
 				}
 				break;
@@ -1828,18 +1865,18 @@ export default class CashScriptParser extends Parser {
 	// @RuleVersion(0)
 	public numberLiteral(): NumberLiteralContext {
 		let localctx: NumberLiteralContext = new NumberLiteralContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 52, CashScriptParser.RULE_numberLiteral);
+		this.enterRule(localctx, 54, CashScriptParser.RULE_numberLiteral);
 		try {
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 352;
+			this.state = 358;
 			this.match(CashScriptParser.NumberLiteral);
-			this.state = 354;
+			this.state = 360;
 			this._errHandler.sync(this);
-			switch ( this._interp.adaptivePredict(this._input, 30, this._ctx) ) {
+			switch ( this._interp.adaptivePredict(this._input, 31, this._ctx) ) {
 			case 1:
 				{
-				this.state = 353;
+				this.state = 359;
 				this.match(CashScriptParser.NumberUnit);
 				}
 				break;
@@ -1863,12 +1900,12 @@ export default class CashScriptParser extends Parser {
 	// @RuleVersion(0)
 	public typeName(): TypeNameContext {
 		let localctx: TypeNameContext = new TypeNameContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 54, CashScriptParser.RULE_typeName);
+		this.enterRule(localctx, 56, CashScriptParser.RULE_typeName);
 		let _la: number;
 		try {
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 356;
+			this.state = 362;
 			_la = this._input.LA(1);
 			if(!(((((_la - 52)) & ~0x1F) === 0 && ((1 << (_la - 52)) & 1087) !== 0))) {
 			this._errHandler.recoverInline(this);
@@ -1896,7 +1933,7 @@ export default class CashScriptParser extends Parser {
 
 	public sempred(localctx: RuleContext, ruleIndex: number, predIndex: number): boolean {
 		switch (ruleIndex) {
-		case 23:
+		case 24:
 			return this.expression_sempred(localctx as ExpressionContext, predIndex);
 		}
 		return true;
@@ -1931,126 +1968,127 @@ export default class CashScriptParser extends Parser {
 		return true;
 	}
 
-	public static readonly _serializedATN: number[] = [4,1,72,359,2,0,7,0,2,
+	public static readonly _serializedATN: number[] = [4,1,72,365,2,0,7,0,2,
 	1,7,1,2,2,7,2,2,3,7,3,2,4,7,4,2,5,7,5,2,6,7,6,2,7,7,7,2,8,7,8,2,9,7,9,2,
 	10,7,10,2,11,7,11,2,12,7,12,2,13,7,13,2,14,7,14,2,15,7,15,2,16,7,16,2,17,
 	7,17,2,18,7,18,2,19,7,19,2,20,7,20,2,21,7,21,2,22,7,22,2,23,7,23,2,24,7,
-	24,2,25,7,25,2,26,7,26,2,27,7,27,1,0,5,0,58,8,0,10,0,12,0,61,9,0,1,0,1,
-	0,1,0,1,1,1,1,1,1,1,1,1,1,1,2,1,2,1,3,1,3,3,3,75,8,3,1,4,3,4,78,8,4,1,4,
-	1,4,1,5,1,5,1,6,1,6,1,6,1,6,1,6,5,6,89,8,6,10,6,12,6,92,9,6,1,6,1,6,1,7,
-	1,7,1,7,1,7,1,7,5,7,101,8,7,10,7,12,7,104,9,7,1,7,1,7,1,8,1,8,1,8,1,8,5,
-	8,112,8,8,10,8,12,8,115,9,8,1,8,3,8,118,8,8,3,8,120,8,8,1,8,1,8,1,9,1,9,
-	1,9,1,10,1,10,5,10,129,8,10,10,10,12,10,132,9,10,1,10,1,10,3,10,136,8,10,
-	1,11,1,11,1,11,1,11,1,11,1,11,1,11,3,11,145,8,11,1,12,1,12,5,12,149,8,12,
-	10,12,12,12,152,9,12,1,12,1,12,1,12,1,12,1,12,1,13,1,13,1,13,1,13,1,13,
-	1,13,1,13,1,13,1,13,1,14,1,14,1,14,1,14,1,14,1,15,1,15,1,15,1,15,1,15,1,
-	15,1,15,3,15,180,8,15,1,15,1,15,1,15,1,16,1,16,1,16,1,16,1,16,3,16,190,
-	8,16,1,16,1,16,1,16,1,17,1,17,1,17,1,17,1,17,1,17,1,17,3,17,202,8,17,1,
-	18,1,18,1,18,1,18,1,19,1,19,1,20,1,20,1,20,1,20,5,20,214,8,20,10,20,12,
-	20,217,9,20,1,20,3,20,220,8,20,3,20,222,8,20,1,20,1,20,1,21,1,21,1,21,1,
-	22,1,22,1,22,1,22,5,22,233,8,22,10,22,12,22,236,9,22,1,22,3,22,239,8,22,
-	3,22,241,8,22,1,22,1,22,1,23,1,23,1,23,1,23,1,23,1,23,1,23,1,23,1,23,1,
-	23,3,23,255,8,23,1,23,3,23,258,8,23,1,23,1,23,1,23,1,23,1,23,1,23,1,23,
-	1,23,1,23,1,23,1,23,1,23,1,23,1,23,1,23,1,23,1,23,1,23,1,23,1,23,1,23,1,
-	23,1,23,1,23,5,23,284,8,23,10,23,12,23,287,9,23,1,23,3,23,290,8,23,3,23,
-	292,8,23,1,23,1,23,1,23,1,23,3,23,298,8,23,1,23,1,23,1,23,1,23,1,23,1,23,
-	1,23,1,23,1,23,1,23,1,23,1,23,1,23,1,23,1,23,1,23,1,23,1,23,1,23,1,23,1,
-	23,1,23,1,23,1,23,1,23,1,23,1,23,1,23,1,23,1,23,1,23,1,23,1,23,1,23,1,23,
-	1,23,1,23,1,23,1,23,5,23,339,8,23,10,23,12,23,342,9,23,1,24,1,24,1,25,1,
-	25,1,25,1,25,1,25,3,25,351,8,25,1,26,1,26,3,26,355,8,26,1,27,1,27,1,27,
-	0,1,46,28,0,2,4,6,8,10,12,14,16,18,20,22,24,26,28,30,32,34,36,38,40,42,
-	44,46,48,50,52,54,0,11,1,0,4,10,5,0,59,59,61,61,64,64,66,66,69,69,1,0,26,
-	30,2,0,26,30,32,35,1,0,39,40,1,0,41,43,2,0,40,40,44,44,1,0,6,9,1,0,45,46,
-	1,0,36,37,2,0,52,57,62,62,388,0,59,1,0,0,0,2,65,1,0,0,0,4,70,1,0,0,0,6,
-	72,1,0,0,0,8,77,1,0,0,0,10,81,1,0,0,0,12,83,1,0,0,0,14,95,1,0,0,0,16,107,
-	1,0,0,0,18,123,1,0,0,0,20,135,1,0,0,0,22,144,1,0,0,0,24,146,1,0,0,0,26,
-	158,1,0,0,0,28,167,1,0,0,0,30,172,1,0,0,0,32,184,1,0,0,0,34,194,1,0,0,0,
-	36,203,1,0,0,0,38,207,1,0,0,0,40,209,1,0,0,0,42,225,1,0,0,0,44,228,1,0,
-	0,0,46,297,1,0,0,0,48,343,1,0,0,0,50,350,1,0,0,0,52,352,1,0,0,0,54,356,
-	1,0,0,0,56,58,3,2,1,0,57,56,1,0,0,0,58,61,1,0,0,0,59,57,1,0,0,0,59,60,1,
-	0,0,0,60,62,1,0,0,0,61,59,1,0,0,0,62,63,3,12,6,0,63,64,5,0,0,1,64,1,1,0,
-	0,0,65,66,5,1,0,0,66,67,3,4,2,0,67,68,3,6,3,0,68,69,5,2,0,0,69,3,1,0,0,
-	0,70,71,5,3,0,0,71,5,1,0,0,0,72,74,3,8,4,0,73,75,3,8,4,0,74,73,1,0,0,0,
-	74,75,1,0,0,0,75,7,1,0,0,0,76,78,3,10,5,0,77,76,1,0,0,0,77,78,1,0,0,0,78,
-	79,1,0,0,0,79,80,5,58,0,0,80,9,1,0,0,0,81,82,7,0,0,0,82,11,1,0,0,0,83,84,
-	5,11,0,0,84,85,5,69,0,0,85,86,3,16,8,0,86,90,5,12,0,0,87,89,3,14,7,0,88,
-	87,1,0,0,0,89,92,1,0,0,0,90,88,1,0,0,0,90,91,1,0,0,0,91,93,1,0,0,0,92,90,
-	1,0,0,0,93,94,5,13,0,0,94,13,1,0,0,0,95,96,5,14,0,0,96,97,5,69,0,0,97,98,
-	3,16,8,0,98,102,5,12,0,0,99,101,3,22,11,0,100,99,1,0,0,0,101,104,1,0,0,
-	0,102,100,1,0,0,0,102,103,1,0,0,0,103,105,1,0,0,0,104,102,1,0,0,0,105,106,
-	5,13,0,0,106,15,1,0,0,0,107,119,5,15,0,0,108,113,3,18,9,0,109,110,5,16,
-	0,0,110,112,3,18,9,0,111,109,1,0,0,0,112,115,1,0,0,0,113,111,1,0,0,0,113,
-	114,1,0,0,0,114,117,1,0,0,0,115,113,1,0,0,0,116,118,5,16,0,0,117,116,1,
-	0,0,0,117,118,1,0,0,0,118,120,1,0,0,0,119,108,1,0,0,0,119,120,1,0,0,0,120,
-	121,1,0,0,0,121,122,5,17,0,0,122,17,1,0,0,0,123,124,3,54,27,0,124,125,5,
-	69,0,0,125,19,1,0,0,0,126,130,5,12,0,0,127,129,3,22,11,0,128,127,1,0,0,
-	0,129,132,1,0,0,0,130,128,1,0,0,0,130,131,1,0,0,0,131,133,1,0,0,0,132,130,
-	1,0,0,0,133,136,5,13,0,0,134,136,3,22,11,0,135,126,1,0,0,0,135,134,1,0,
-	0,0,136,21,1,0,0,0,137,145,3,24,12,0,138,145,3,26,13,0,139,145,3,28,14,
-	0,140,145,3,30,15,0,141,145,3,32,16,0,142,145,3,34,17,0,143,145,3,36,18,
-	0,144,137,1,0,0,0,144,138,1,0,0,0,144,139,1,0,0,0,144,140,1,0,0,0,144,141,
-	1,0,0,0,144,142,1,0,0,0,144,143,1,0,0,0,145,23,1,0,0,0,146,150,3,54,27,
-	0,147,149,3,48,24,0,148,147,1,0,0,0,149,152,1,0,0,0,150,148,1,0,0,0,150,
-	151,1,0,0,0,151,153,1,0,0,0,152,150,1,0,0,0,153,154,5,69,0,0,154,155,5,
-	10,0,0,155,156,3,46,23,0,156,157,5,2,0,0,157,25,1,0,0,0,158,159,3,54,27,
-	0,159,160,5,69,0,0,160,161,5,16,0,0,161,162,3,54,27,0,162,163,5,69,0,0,
-	163,164,5,10,0,0,164,165,3,46,23,0,165,166,5,2,0,0,166,27,1,0,0,0,167,168,
-	5,69,0,0,168,169,5,10,0,0,169,170,3,46,23,0,170,171,5,2,0,0,171,29,1,0,
-	0,0,172,173,5,18,0,0,173,174,5,15,0,0,174,175,5,67,0,0,175,176,5,6,0,0,
-	176,179,3,46,23,0,177,178,5,16,0,0,178,180,5,64,0,0,179,177,1,0,0,0,179,
-	180,1,0,0,0,180,181,1,0,0,0,181,182,5,17,0,0,182,183,5,2,0,0,183,31,1,0,
-	0,0,184,185,5,18,0,0,185,186,5,15,0,0,186,189,3,46,23,0,187,188,5,16,0,
-	0,188,190,5,64,0,0,189,187,1,0,0,0,189,190,1,0,0,0,190,191,1,0,0,0,191,
-	192,5,17,0,0,192,193,5,2,0,0,193,33,1,0,0,0,194,195,5,19,0,0,195,196,5,
-	15,0,0,196,197,3,46,23,0,197,198,5,17,0,0,198,201,3,20,10,0,199,200,5,20,
-	0,0,200,202,3,20,10,0,201,199,1,0,0,0,201,202,1,0,0,0,202,35,1,0,0,0,203,
-	204,5,21,0,0,204,205,3,40,20,0,205,206,5,2,0,0,206,37,1,0,0,0,207,208,7,
-	1,0,0,208,39,1,0,0,0,209,221,5,15,0,0,210,215,3,38,19,0,211,212,5,16,0,
-	0,212,214,3,38,19,0,213,211,1,0,0,0,214,217,1,0,0,0,215,213,1,0,0,0,215,
-	216,1,0,0,0,216,219,1,0,0,0,217,215,1,0,0,0,218,220,5,16,0,0,219,218,1,
-	0,0,0,219,220,1,0,0,0,220,222,1,0,0,0,221,210,1,0,0,0,221,222,1,0,0,0,222,
-	223,1,0,0,0,223,224,5,17,0,0,224,41,1,0,0,0,225,226,5,69,0,0,226,227,3,
-	44,22,0,227,43,1,0,0,0,228,240,5,15,0,0,229,234,3,46,23,0,230,231,5,16,
-	0,0,231,233,3,46,23,0,232,230,1,0,0,0,233,236,1,0,0,0,234,232,1,0,0,0,234,
-	235,1,0,0,0,235,238,1,0,0,0,236,234,1,0,0,0,237,239,5,16,0,0,238,237,1,
-	0,0,0,238,239,1,0,0,0,239,241,1,0,0,0,240,229,1,0,0,0,240,241,1,0,0,0,241,
-	242,1,0,0,0,242,243,5,17,0,0,243,45,1,0,0,0,244,245,6,23,-1,0,245,246,5,
-	15,0,0,246,247,3,46,23,0,247,248,5,17,0,0,248,298,1,0,0,0,249,250,3,54,
-	27,0,250,251,5,15,0,0,251,254,3,46,23,0,252,253,5,16,0,0,253,255,3,46,23,
-	0,254,252,1,0,0,0,254,255,1,0,0,0,255,257,1,0,0,0,256,258,5,16,0,0,257,
-	256,1,0,0,0,257,258,1,0,0,0,258,259,1,0,0,0,259,260,5,17,0,0,260,298,1,
-	0,0,0,261,298,3,42,21,0,262,263,5,22,0,0,263,264,5,69,0,0,264,298,3,44,
-	22,0,265,266,5,25,0,0,266,267,5,23,0,0,267,268,3,46,23,0,268,269,5,24,0,
-	0,269,270,7,2,0,0,270,298,1,0,0,0,271,272,5,31,0,0,272,273,5,23,0,0,273,
-	274,3,46,23,0,274,275,5,24,0,0,275,276,7,3,0,0,276,298,1,0,0,0,277,278,
-	7,4,0,0,278,298,3,46,23,14,279,291,5,23,0,0,280,285,3,46,23,0,281,282,5,
-	16,0,0,282,284,3,46,23,0,283,281,1,0,0,0,284,287,1,0,0,0,285,283,1,0,0,
-	0,285,286,1,0,0,0,286,289,1,0,0,0,287,285,1,0,0,0,288,290,5,16,0,0,289,
-	288,1,0,0,0,289,290,1,0,0,0,290,292,1,0,0,0,291,280,1,0,0,0,291,292,1,0,
-	0,0,292,293,1,0,0,0,293,298,5,24,0,0,294,298,5,68,0,0,295,298,5,69,0,0,
-	296,298,3,50,25,0,297,244,1,0,0,0,297,249,1,0,0,0,297,261,1,0,0,0,297,262,
-	1,0,0,0,297,265,1,0,0,0,297,271,1,0,0,0,297,277,1,0,0,0,297,279,1,0,0,0,
-	297,294,1,0,0,0,297,295,1,0,0,0,297,296,1,0,0,0,298,340,1,0,0,0,299,300,
-	10,13,0,0,300,301,7,5,0,0,301,339,3,46,23,14,302,303,10,12,0,0,303,304,
-	7,6,0,0,304,339,3,46,23,13,305,306,10,11,0,0,306,307,7,7,0,0,307,339,3,
-	46,23,12,308,309,10,10,0,0,309,310,7,8,0,0,310,339,3,46,23,11,311,312,10,
-	9,0,0,312,313,5,47,0,0,313,339,3,46,23,10,314,315,10,8,0,0,315,316,5,4,
-	0,0,316,339,3,46,23,9,317,318,10,7,0,0,318,319,5,48,0,0,319,339,3,46,23,
-	8,320,321,10,6,0,0,321,322,5,49,0,0,322,339,3,46,23,7,323,324,10,5,0,0,
-	324,325,5,50,0,0,325,339,3,46,23,6,326,327,10,19,0,0,327,328,5,23,0,0,328,
-	329,5,61,0,0,329,339,5,24,0,0,330,331,10,16,0,0,331,339,7,9,0,0,332,333,
-	10,15,0,0,333,334,5,38,0,0,334,335,5,15,0,0,335,336,3,46,23,0,336,337,5,
-	17,0,0,337,339,1,0,0,0,338,299,1,0,0,0,338,302,1,0,0,0,338,305,1,0,0,0,
-	338,308,1,0,0,0,338,311,1,0,0,0,338,314,1,0,0,0,338,317,1,0,0,0,338,320,
-	1,0,0,0,338,323,1,0,0,0,338,326,1,0,0,0,338,330,1,0,0,0,338,332,1,0,0,0,
-	339,342,1,0,0,0,340,338,1,0,0,0,340,341,1,0,0,0,341,47,1,0,0,0,342,340,
-	1,0,0,0,343,344,5,51,0,0,344,49,1,0,0,0,345,351,5,59,0,0,346,351,3,52,26,
-	0,347,351,5,64,0,0,348,351,5,65,0,0,349,351,5,66,0,0,350,345,1,0,0,0,350,
-	346,1,0,0,0,350,347,1,0,0,0,350,348,1,0,0,0,350,349,1,0,0,0,351,51,1,0,
-	0,0,352,354,5,61,0,0,353,355,5,60,0,0,354,353,1,0,0,0,354,355,1,0,0,0,355,
-	53,1,0,0,0,356,357,7,10,0,0,357,55,1,0,0,0,31,59,74,77,90,102,113,117,119,
-	130,135,144,150,179,189,201,215,219,221,234,238,240,254,257,285,289,291,
-	297,338,340,350,354];
+	24,2,25,7,25,2,26,7,26,2,27,7,27,2,28,7,28,1,0,5,0,60,8,0,10,0,12,0,63,
+	9,0,1,0,1,0,1,0,1,1,1,1,1,1,1,1,1,1,1,2,1,2,1,3,1,3,3,3,77,8,3,1,4,3,4,
+	80,8,4,1,4,1,4,1,5,1,5,1,6,1,6,1,6,1,6,1,6,5,6,91,8,6,10,6,12,6,94,9,6,
+	1,6,1,6,1,7,1,7,1,7,1,7,1,7,5,7,103,8,7,10,7,12,7,106,9,7,1,7,1,7,1,8,1,
+	8,1,8,1,8,5,8,114,8,8,10,8,12,8,117,9,8,1,8,3,8,120,8,8,3,8,122,8,8,1,8,
+	1,8,1,9,1,9,1,9,1,10,1,10,5,10,131,8,10,10,10,12,10,134,9,10,1,10,1,10,
+	3,10,138,8,10,1,11,1,11,1,11,1,11,1,11,1,11,1,11,3,11,147,8,11,1,12,1,12,
+	5,12,151,8,12,10,12,12,12,154,9,12,1,12,1,12,1,12,1,12,1,12,1,13,1,13,1,
+	13,1,13,1,13,1,13,1,13,1,13,1,13,1,14,1,14,1,14,1,14,1,14,1,15,1,15,1,15,
+	1,15,1,15,1,15,1,15,3,15,182,8,15,1,15,1,15,1,15,1,16,1,16,1,16,1,16,1,
+	16,3,16,192,8,16,1,16,1,16,1,16,1,17,1,17,1,17,1,17,1,17,1,17,1,17,3,17,
+	204,8,17,1,18,1,18,1,18,1,18,1,19,1,19,1,20,1,20,3,20,214,8,20,1,21,1,21,
+	1,21,1,21,5,21,220,8,21,10,21,12,21,223,9,21,1,21,3,21,226,8,21,3,21,228,
+	8,21,1,21,1,21,1,22,1,22,1,22,1,23,1,23,1,23,1,23,5,23,239,8,23,10,23,12,
+	23,242,9,23,1,23,3,23,245,8,23,3,23,247,8,23,1,23,1,23,1,24,1,24,1,24,1,
+	24,1,24,1,24,1,24,1,24,1,24,1,24,3,24,261,8,24,1,24,3,24,264,8,24,1,24,
+	1,24,1,24,1,24,1,24,1,24,1,24,1,24,1,24,1,24,1,24,1,24,1,24,1,24,1,24,1,
+	24,1,24,1,24,1,24,1,24,1,24,1,24,1,24,1,24,5,24,290,8,24,10,24,12,24,293,
+	9,24,1,24,3,24,296,8,24,3,24,298,8,24,1,24,1,24,1,24,1,24,3,24,304,8,24,
+	1,24,1,24,1,24,1,24,1,24,1,24,1,24,1,24,1,24,1,24,1,24,1,24,1,24,1,24,1,
+	24,1,24,1,24,1,24,1,24,1,24,1,24,1,24,1,24,1,24,1,24,1,24,1,24,1,24,1,24,
+	1,24,1,24,1,24,1,24,1,24,1,24,1,24,1,24,1,24,1,24,5,24,345,8,24,10,24,12,
+	24,348,9,24,1,25,1,25,1,26,1,26,1,26,1,26,1,26,3,26,357,8,26,1,27,1,27,
+	3,27,361,8,27,1,28,1,28,1,28,0,1,48,29,0,2,4,6,8,10,12,14,16,18,20,22,24,
+	26,28,30,32,34,36,38,40,42,44,46,48,50,52,54,56,0,10,1,0,4,10,1,0,26,30,
+	2,0,26,30,32,35,1,0,39,40,1,0,41,43,2,0,40,40,44,44,1,0,6,9,1,0,45,46,1,
+	0,36,37,2,0,52,57,62,62,394,0,61,1,0,0,0,2,67,1,0,0,0,4,72,1,0,0,0,6,74,
+	1,0,0,0,8,79,1,0,0,0,10,83,1,0,0,0,12,85,1,0,0,0,14,97,1,0,0,0,16,109,1,
+	0,0,0,18,125,1,0,0,0,20,137,1,0,0,0,22,146,1,0,0,0,24,148,1,0,0,0,26,160,
+	1,0,0,0,28,169,1,0,0,0,30,174,1,0,0,0,32,186,1,0,0,0,34,196,1,0,0,0,36,
+	205,1,0,0,0,38,209,1,0,0,0,40,213,1,0,0,0,42,215,1,0,0,0,44,231,1,0,0,0,
+	46,234,1,0,0,0,48,303,1,0,0,0,50,349,1,0,0,0,52,356,1,0,0,0,54,358,1,0,
+	0,0,56,362,1,0,0,0,58,60,3,2,1,0,59,58,1,0,0,0,60,63,1,0,0,0,61,59,1,0,
+	0,0,61,62,1,0,0,0,62,64,1,0,0,0,63,61,1,0,0,0,64,65,3,12,6,0,65,66,5,0,
+	0,1,66,1,1,0,0,0,67,68,5,1,0,0,68,69,3,4,2,0,69,70,3,6,3,0,70,71,5,2,0,
+	0,71,3,1,0,0,0,72,73,5,3,0,0,73,5,1,0,0,0,74,76,3,8,4,0,75,77,3,8,4,0,76,
+	75,1,0,0,0,76,77,1,0,0,0,77,7,1,0,0,0,78,80,3,10,5,0,79,78,1,0,0,0,79,80,
+	1,0,0,0,80,81,1,0,0,0,81,82,5,58,0,0,82,9,1,0,0,0,83,84,7,0,0,0,84,11,1,
+	0,0,0,85,86,5,11,0,0,86,87,5,69,0,0,87,88,3,16,8,0,88,92,5,12,0,0,89,91,
+	3,14,7,0,90,89,1,0,0,0,91,94,1,0,0,0,92,90,1,0,0,0,92,93,1,0,0,0,93,95,
+	1,0,0,0,94,92,1,0,0,0,95,96,5,13,0,0,96,13,1,0,0,0,97,98,5,14,0,0,98,99,
+	5,69,0,0,99,100,3,16,8,0,100,104,5,12,0,0,101,103,3,22,11,0,102,101,1,0,
+	0,0,103,106,1,0,0,0,104,102,1,0,0,0,104,105,1,0,0,0,105,107,1,0,0,0,106,
+	104,1,0,0,0,107,108,5,13,0,0,108,15,1,0,0,0,109,121,5,15,0,0,110,115,3,
+	18,9,0,111,112,5,16,0,0,112,114,3,18,9,0,113,111,1,0,0,0,114,117,1,0,0,
+	0,115,113,1,0,0,0,115,116,1,0,0,0,116,119,1,0,0,0,117,115,1,0,0,0,118,120,
+	5,16,0,0,119,118,1,0,0,0,119,120,1,0,0,0,120,122,1,0,0,0,121,110,1,0,0,
+	0,121,122,1,0,0,0,122,123,1,0,0,0,123,124,5,17,0,0,124,17,1,0,0,0,125,126,
+	3,56,28,0,126,127,5,69,0,0,127,19,1,0,0,0,128,132,5,12,0,0,129,131,3,22,
+	11,0,130,129,1,0,0,0,131,134,1,0,0,0,132,130,1,0,0,0,132,133,1,0,0,0,133,
+	135,1,0,0,0,134,132,1,0,0,0,135,138,5,13,0,0,136,138,3,22,11,0,137,128,
+	1,0,0,0,137,136,1,0,0,0,138,21,1,0,0,0,139,147,3,24,12,0,140,147,3,26,13,
+	0,141,147,3,28,14,0,142,147,3,30,15,0,143,147,3,32,16,0,144,147,3,34,17,
+	0,145,147,3,36,18,0,146,139,1,0,0,0,146,140,1,0,0,0,146,141,1,0,0,0,146,
+	142,1,0,0,0,146,143,1,0,0,0,146,144,1,0,0,0,146,145,1,0,0,0,147,23,1,0,
+	0,0,148,152,3,56,28,0,149,151,3,50,25,0,150,149,1,0,0,0,151,154,1,0,0,0,
+	152,150,1,0,0,0,152,153,1,0,0,0,153,155,1,0,0,0,154,152,1,0,0,0,155,156,
+	5,69,0,0,156,157,5,10,0,0,157,158,3,48,24,0,158,159,5,2,0,0,159,25,1,0,
+	0,0,160,161,3,56,28,0,161,162,5,69,0,0,162,163,5,16,0,0,163,164,3,56,28,
+	0,164,165,5,69,0,0,165,166,5,10,0,0,166,167,3,48,24,0,167,168,5,2,0,0,168,
+	27,1,0,0,0,169,170,5,69,0,0,170,171,5,10,0,0,171,172,3,48,24,0,172,173,
+	5,2,0,0,173,29,1,0,0,0,174,175,5,18,0,0,175,176,5,15,0,0,176,177,5,67,0,
+	0,177,178,5,6,0,0,178,181,3,48,24,0,179,180,5,16,0,0,180,182,3,38,19,0,
+	181,179,1,0,0,0,181,182,1,0,0,0,182,183,1,0,0,0,183,184,5,17,0,0,184,185,
+	5,2,0,0,185,31,1,0,0,0,186,187,5,18,0,0,187,188,5,15,0,0,188,191,3,48,24,
+	0,189,190,5,16,0,0,190,192,3,38,19,0,191,189,1,0,0,0,191,192,1,0,0,0,192,
+	193,1,0,0,0,193,194,5,17,0,0,194,195,5,2,0,0,195,33,1,0,0,0,196,197,5,19,
+	0,0,197,198,5,15,0,0,198,199,3,48,24,0,199,200,5,17,0,0,200,203,3,20,10,
+	0,201,202,5,20,0,0,202,204,3,20,10,0,203,201,1,0,0,0,203,204,1,0,0,0,204,
+	35,1,0,0,0,205,206,5,21,0,0,206,207,3,42,21,0,207,208,5,2,0,0,208,37,1,
+	0,0,0,209,210,5,64,0,0,210,39,1,0,0,0,211,214,5,69,0,0,212,214,3,52,26,
+	0,213,211,1,0,0,0,213,212,1,0,0,0,214,41,1,0,0,0,215,227,5,15,0,0,216,221,
+	3,40,20,0,217,218,5,16,0,0,218,220,3,40,20,0,219,217,1,0,0,0,220,223,1,
+	0,0,0,221,219,1,0,0,0,221,222,1,0,0,0,222,225,1,0,0,0,223,221,1,0,0,0,224,
+	226,5,16,0,0,225,224,1,0,0,0,225,226,1,0,0,0,226,228,1,0,0,0,227,216,1,
+	0,0,0,227,228,1,0,0,0,228,229,1,0,0,0,229,230,5,17,0,0,230,43,1,0,0,0,231,
+	232,5,69,0,0,232,233,3,46,23,0,233,45,1,0,0,0,234,246,5,15,0,0,235,240,
+	3,48,24,0,236,237,5,16,0,0,237,239,3,48,24,0,238,236,1,0,0,0,239,242,1,
+	0,0,0,240,238,1,0,0,0,240,241,1,0,0,0,241,244,1,0,0,0,242,240,1,0,0,0,243,
+	245,5,16,0,0,244,243,1,0,0,0,244,245,1,0,0,0,245,247,1,0,0,0,246,235,1,
+	0,0,0,246,247,1,0,0,0,247,248,1,0,0,0,248,249,5,17,0,0,249,47,1,0,0,0,250,
+	251,6,24,-1,0,251,252,5,15,0,0,252,253,3,48,24,0,253,254,5,17,0,0,254,304,
+	1,0,0,0,255,256,3,56,28,0,256,257,5,15,0,0,257,260,3,48,24,0,258,259,5,
+	16,0,0,259,261,3,48,24,0,260,258,1,0,0,0,260,261,1,0,0,0,261,263,1,0,0,
+	0,262,264,5,16,0,0,263,262,1,0,0,0,263,264,1,0,0,0,264,265,1,0,0,0,265,
+	266,5,17,0,0,266,304,1,0,0,0,267,304,3,44,22,0,268,269,5,22,0,0,269,270,
+	5,69,0,0,270,304,3,46,23,0,271,272,5,25,0,0,272,273,5,23,0,0,273,274,3,
+	48,24,0,274,275,5,24,0,0,275,276,7,1,0,0,276,304,1,0,0,0,277,278,5,31,0,
+	0,278,279,5,23,0,0,279,280,3,48,24,0,280,281,5,24,0,0,281,282,7,2,0,0,282,
+	304,1,0,0,0,283,284,7,3,0,0,284,304,3,48,24,14,285,297,5,23,0,0,286,291,
+	3,48,24,0,287,288,5,16,0,0,288,290,3,48,24,0,289,287,1,0,0,0,290,293,1,
+	0,0,0,291,289,1,0,0,0,291,292,1,0,0,0,292,295,1,0,0,0,293,291,1,0,0,0,294,
+	296,5,16,0,0,295,294,1,0,0,0,295,296,1,0,0,0,296,298,1,0,0,0,297,286,1,
+	0,0,0,297,298,1,0,0,0,298,299,1,0,0,0,299,304,5,24,0,0,300,304,5,68,0,0,
+	301,304,5,69,0,0,302,304,3,52,26,0,303,250,1,0,0,0,303,255,1,0,0,0,303,
+	267,1,0,0,0,303,268,1,0,0,0,303,271,1,0,0,0,303,277,1,0,0,0,303,283,1,0,
+	0,0,303,285,1,0,0,0,303,300,1,0,0,0,303,301,1,0,0,0,303,302,1,0,0,0,304,
+	346,1,0,0,0,305,306,10,13,0,0,306,307,7,4,0,0,307,345,3,48,24,14,308,309,
+	10,12,0,0,309,310,7,5,0,0,310,345,3,48,24,13,311,312,10,11,0,0,312,313,
+	7,6,0,0,313,345,3,48,24,12,314,315,10,10,0,0,315,316,7,7,0,0,316,345,3,
+	48,24,11,317,318,10,9,0,0,318,319,5,47,0,0,319,345,3,48,24,10,320,321,10,
+	8,0,0,321,322,5,4,0,0,322,345,3,48,24,9,323,324,10,7,0,0,324,325,5,48,0,
+	0,325,345,3,48,24,8,326,327,10,6,0,0,327,328,5,49,0,0,328,345,3,48,24,7,
+	329,330,10,5,0,0,330,331,5,50,0,0,331,345,3,48,24,6,332,333,10,19,0,0,333,
+	334,5,23,0,0,334,335,5,61,0,0,335,345,5,24,0,0,336,337,10,16,0,0,337,345,
+	7,8,0,0,338,339,10,15,0,0,339,340,5,38,0,0,340,341,5,15,0,0,341,342,3,48,
+	24,0,342,343,5,17,0,0,343,345,1,0,0,0,344,305,1,0,0,0,344,308,1,0,0,0,344,
+	311,1,0,0,0,344,314,1,0,0,0,344,317,1,0,0,0,344,320,1,0,0,0,344,323,1,0,
+	0,0,344,326,1,0,0,0,344,329,1,0,0,0,344,332,1,0,0,0,344,336,1,0,0,0,344,
+	338,1,0,0,0,345,348,1,0,0,0,346,344,1,0,0,0,346,347,1,0,0,0,347,49,1,0,
+	0,0,348,346,1,0,0,0,349,350,5,51,0,0,350,51,1,0,0,0,351,357,5,59,0,0,352,
+	357,3,54,27,0,353,357,5,64,0,0,354,357,5,65,0,0,355,357,5,66,0,0,356,351,
+	1,0,0,0,356,352,1,0,0,0,356,353,1,0,0,0,356,354,1,0,0,0,356,355,1,0,0,0,
+	357,53,1,0,0,0,358,360,5,61,0,0,359,361,5,60,0,0,360,359,1,0,0,0,360,361,
+	1,0,0,0,361,55,1,0,0,0,362,363,7,9,0,0,363,57,1,0,0,0,32,61,76,79,92,104,
+	115,119,121,132,137,146,152,181,191,203,213,221,225,227,240,244,246,260,
+	263,291,295,297,303,344,346,356,360];
 
 	private static __ATN: ATN;
 	public static get _ATN(): ATN {
@@ -2491,8 +2529,8 @@ export class TimeOpStatementContext extends ParserRuleContext {
 	public expression(): ExpressionContext {
 		return this.getTypedRuleContext(ExpressionContext, 0) as ExpressionContext;
 	}
-	public StringLiteral(): TerminalNode {
-		return this.getToken(CashScriptParser.StringLiteral, 0);
+	public requireMessage(): RequireMessageContext {
+		return this.getTypedRuleContext(RequireMessageContext, 0) as RequireMessageContext;
 	}
     public get ruleIndex(): number {
     	return CashScriptParser.RULE_timeOpStatement;
@@ -2516,8 +2554,8 @@ export class RequireStatementContext extends ParserRuleContext {
 	public expression(): ExpressionContext {
 		return this.getTypedRuleContext(ExpressionContext, 0) as ExpressionContext;
 	}
-	public StringLiteral(): TerminalNode {
-		return this.getToken(CashScriptParser.StringLiteral, 0);
+	public requireMessage(): RequireMessageContext {
+		return this.getTypedRuleContext(RequireMessageContext, 0) as RequireMessageContext;
 	}
     public get ruleIndex(): number {
     	return CashScriptParser.RULE_requireStatement;
@@ -2585,25 +2623,38 @@ export class ConsoleStatementContext extends ParserRuleContext {
 }
 
 
-export class ConsoleParameterContext extends ParserRuleContext {
+export class RequireMessageContext extends ParserRuleContext {
 	constructor(parser?: CashScriptParser, parent?: ParserRuleContext, invokingState?: number) {
 		super(parent, invokingState);
     	this.parser = parser;
 	}
-	public Identifier(): TerminalNode {
-		return this.getToken(CashScriptParser.Identifier, 0);
-	}
 	public StringLiteral(): TerminalNode {
 		return this.getToken(CashScriptParser.StringLiteral, 0);
 	}
-	public NumberLiteral(): TerminalNode {
-		return this.getToken(CashScriptParser.NumberLiteral, 0);
+    public get ruleIndex(): number {
+    	return CashScriptParser.RULE_requireMessage;
 	}
-	public HexLiteral(): TerminalNode {
-		return this.getToken(CashScriptParser.HexLiteral, 0);
+	// @Override
+	public accept<Result>(visitor: CashScriptVisitor<Result>): Result {
+		if (visitor.visitRequireMessage) {
+			return visitor.visitRequireMessage(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
 	}
-	public BooleanLiteral(): TerminalNode {
-		return this.getToken(CashScriptParser.BooleanLiteral, 0);
+}
+
+
+export class ConsoleParameterContext extends ParserRuleContext {
+	constructor(parser?: CashScriptParser, parent?: ParserRuleContext, invokingState?: number) {
+		super(parent, invokingState);
+    	this.parser = parser;
+	}
+	public Identifier(): TerminalNode {
+		return this.getToken(CashScriptParser.Identifier, 0);
+	}
+	public literal(): LiteralContext {
+		return this.getTypedRuleContext(LiteralContext, 0) as LiteralContext;
 	}
     public get ruleIndex(): number {
     	return CashScriptParser.RULE_consoleParameter;
diff --git a/packages/cashc/src/grammar/CashScriptVisitor.ts b/packages/cashc/src/grammar/CashScriptVisitor.ts
index d944d212..c8579759 100644
--- a/packages/cashc/src/grammar/CashScriptVisitor.ts
+++ b/packages/cashc/src/grammar/CashScriptVisitor.ts
@@ -22,6 +22,7 @@ import { TimeOpStatementContext } from "./CashScriptParser.js";
 import { RequireStatementContext } from "./CashScriptParser.js";
 import { IfStatementContext } from "./CashScriptParser.js";
 import { ConsoleStatementContext } from "./CashScriptParser.js";
+import { RequireMessageContext } from "./CashScriptParser.js";
 import { ConsoleParameterContext } from "./CashScriptParser.js";
 import { ConsoleParameterListContext } from "./CashScriptParser.js";
 import { FunctionCallContext } from "./CashScriptParser.js";
@@ -166,6 +167,12 @@ export default class CashScriptVisitor<Result> extends ParseTreeVisitor<Result>
 	 * @return the visitor result
 	 */
 	visitConsoleStatement?: (ctx: ConsoleStatementContext) => Result;
+	/**
+	 * Visit a parse tree produced by `CashScriptParser.requireMessage`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitRequireMessage?: (ctx: RequireMessageContext) => Result;
 	/**
 	 * Visit a parse tree produced by `CashScriptParser.consoleParameter`.
 	 * @param ctx the parse tree
diff --git a/packages/cashc/src/print/OutputSourceCodeTraversal.ts b/packages/cashc/src/print/OutputSourceCodeTraversal.ts
index cc8580d1..1f33ae62 100644
--- a/packages/cashc/src/print/OutputSourceCodeTraversal.ts
+++ b/packages/cashc/src/print/OutputSourceCodeTraversal.ts
@@ -26,6 +26,8 @@ import {
   InstantiationNode,
   TupleAssignmentNode,
   NullaryOpNode,
+  ConsoleStatementNode,
+  ConsoleParameterNode,
 } from '../ast/AST.js';
 import AstTraversal from '../ast/AstTraversal.js';
 
@@ -134,7 +136,13 @@ export default class OutputSourceCodeTraversal extends AstTraversal {
   visitRequire(node: RequireNode): Node {
     this.addOutput('require(', true);
     node.expression = this.visit(node.expression);
+
+    if (node.message) {
+      this.addOutput(`, "${node.message}"`);
+    }
+
     this.addOutput(');\n');
+
     return node;
   }
 
@@ -154,6 +162,13 @@ export default class OutputSourceCodeTraversal extends AstTraversal {
     return node;
   }
 
+  visitConsoleStatement(node: ConsoleStatementNode): Node {
+    this.addOutput('console.log(', true);
+    node.parameters = this.visitCommaList(node.parameters) as ConsoleParameterNode[];
+    this.addOutput(');\n');
+    return node;
+  }
+
   visitBlock(node: BlockNode): Node {
     this.addOutput('{');
     this.outputSymbolTable(node.symbolTable);
diff --git a/packages/cashc/src/semantic/SymbolTableTraversal.ts b/packages/cashc/src/semantic/SymbolTableTraversal.ts
index 5e5fd5cc..3e7f2e92 100644
--- a/packages/cashc/src/semantic/SymbolTableTraversal.ts
+++ b/packages/cashc/src/semantic/SymbolTableTraversal.ts
@@ -12,7 +12,6 @@ import {
   InstantiationNode,
   AssignNode,
   TupleAssignmentNode,
-  ConsoleStatementNode,
 } from '../ast/AST.js';
 import AstTraversal from '../ast/AstTraversal.js';
 import { SymbolTable, Symbol, SymbolType } from '../ast/SymbolTable.js';
@@ -30,7 +29,6 @@ export default class SymbolTableTraversal extends AstTraversal {
   private functionNames: Map<string, boolean> = new Map<string, boolean>();
   private currentFunction: FunctionDefinitionNode;
   private expectedSymbolType: SymbolType = SymbolType.VARIABLE;
-  public logSymbols: Symbol[] = [];
 
   visitContract(node: ContractNode): Node {
     node.symbolTable = new SymbolTable(this.symbolTables[0]);
@@ -170,15 +168,4 @@ export default class SymbolTableTraversal extends AstTraversal {
 
     return node;
   }
-
-  visitConsoleStatement(node: ConsoleStatementNode): ConsoleStatementNode {
-    // there might be same-name symbols in different code scopes
-    // so we collect all symbols with their location, which will be analyzed later
-    const symbols = node.parameters
-      .map((parameter) => this.symbolTables[0].get(parameter.identifier!)!)
-      .filter((symbol) => symbol);
-
-    this.logSymbols.push(...symbols);
-    return node;
-  }
 }
diff --git a/packages/cashc/test/ast/fixtures.ts b/packages/cashc/test/ast/fixtures.ts
index 34d0933a..189a304a 100644
--- a/packages/cashc/test/ast/fixtures.ts
+++ b/packages/cashc/test/ast/fixtures.ts
@@ -25,7 +25,6 @@ import {
   UnaryOpNode,
   InstantiationNode,
   ConsoleStatementNode,
-  ConsoleParameterNode,
 } from '../../src/ast/AST.js';
 import { BinaryOperator, NullaryOperator, UnaryOperator } from '../../src/ast/Operator.js';
 import { Class, TimeOp } from '../../src/ast/Globals.js';
@@ -901,8 +900,8 @@ export const fixtures: Fixture[] = [
             [new ParameterNode(PrimitiveType.INT, 'value')],
             new BlockNode([
               new ConsoleStatementNode([
-                new ConsoleParameterNode(undefined, 'value'),
-                new ConsoleParameterNode('test'),
+                new IdentifierNode('value'),
+                new StringLiteralNode('test', '"'),
               ]),
               new RequireNode(
                 new BinaryOpNode(
diff --git a/packages/cashc/test/compiler/UndefinedReferenceError/undefined_variable_in_console_log.cash b/packages/cashc/test/compiler/UndefinedReferenceError/undefined_variable_in_console_log.cash
new file mode 100644
index 00000000..4f516124
--- /dev/null
+++ b/packages/cashc/test/compiler/UndefinedReferenceError/undefined_variable_in_console_log.cash
@@ -0,0 +1,5 @@
+contract Test() {
+    function hello() {
+        console.log(a, 'hello');
+    }
+}

From 97eb9a3b9c83f5a696f740d18560b73849cb6c02 Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Tue, 23 Jan 2024 09:13:31 +0100
Subject: [PATCH 063/171] Update debug_messages.cash test to be a bit more
 complex

---
 .../src/generation/GenerateTargetTraversal.ts |  1 +
 packages/cashc/test/ast/fixtures.ts           | 22 ++++++++++++++++---
 packages/cashc/test/generation/fixtures.ts    | 10 ++++-----
 .../valid-contract-files/debug_messages.cash  |  4 +++-
 4 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/packages/cashc/src/generation/GenerateTargetTraversal.ts b/packages/cashc/src/generation/GenerateTargetTraversal.ts
index 3754ac2f..ea7701ac 100644
--- a/packages/cashc/src/generation/GenerateTargetTraversal.ts
+++ b/packages/cashc/src/generation/GenerateTargetTraversal.ts
@@ -549,6 +549,7 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
     // TODO: refactor to use a map instead of array (also in the artifact and other places where console logs and
     // require statements are used)
     // check if log entry exists for the instruction pointer, create if not
+    // TODO: Do we really want to merge different console logs at the same instruction pointer?
     let index = this.consoleLogs.findIndex((entry: LogEntry) => entry.ip === ip);
     if (index === -1) {
       index = this.consoleLogs.push({ ip, line, data: [] }) - 1;
diff --git a/packages/cashc/test/ast/fixtures.ts b/packages/cashc/test/ast/fixtures.ts
index 189a304a..20ed93b2 100644
--- a/packages/cashc/test/ast/fixtures.ts
+++ b/packages/cashc/test/ast/fixtures.ts
@@ -899,17 +899,33 @@ export const fixtures: Fixture[] = [
             'spend',
             [new ParameterNode(PrimitiveType.INT, 'value')],
             new BlockNode([
+              new RequireNode(
+                new BinaryOpNode(
+                  new IdentifierNode('value'),
+                  BinaryOperator.EQ,
+                  new IntLiteralNode(1n),
+                ),
+                'Wrong value passed',
+              ),
               new ConsoleStatementNode([
                 new IdentifierNode('value'),
                 new StringLiteralNode('test', '"'),
               ]),
+              new ConsoleStatementNode([
+                new IdentifierNode('value'),
+                new StringLiteralNode('test2', '"'),
+              ]),
               new RequireNode(
                 new BinaryOpNode(
-                  new IdentifierNode('value'),
+                  new BinaryOpNode(
+                    new IdentifierNode('value'),
+                    BinaryOperator.PLUS,
+                    new IntLiteralNode(1n),
+                  ),
                   BinaryOperator.EQ,
-                  new IntLiteralNode(1n),
+                  new IntLiteralNode(2n),
                 ),
-                'Wrong value passed',
+                'Sum doesn\'t work',
               ),
             ]),
           ),
diff --git a/packages/cashc/test/generation/fixtures.ts b/packages/cashc/test/generation/fixtures.ts
index e6d4749b..b8b2a8f7 100644
--- a/packages/cashc/test/generation/fixtures.ts
+++ b/packages/cashc/test/generation/fixtures.ts
@@ -649,12 +649,12 @@ export const fixtures: Fixture[] = [
       abi: [
         { name: 'spend', inputs: [{ name: 'value', type: 'int' }] },
       ],
-      bytecode: 'OP_1 OP_NUMEQUAL',
+      bytecode: 'OP_DUP OP_1 OP_NUMEQUALVERIFY OP_1ADD OP_2 OP_NUMEQUAL',
       debug: {
-        bytecode: '007a519c',
-        logs: [{ data: [{ stackIndex: 0, type: 'int' }, 'test'], ip: 0, line: 3 }],
-        requireMessages: [{ ip: 4, line: 4, message: 'Wrong value passed' }],
-        sourceMap: '4:12:4:17;;:21::22;:12:::1',
+        bytecode: '0079519c69007a5193529c',
+        logs: [{ data: [{ stackIndex: 0, type: 'int' }, 'test', { stackIndex: 0, type: 'int' }, 'test2'], ip: 5, line: 4 }],
+        requireMessages: [{ ip: 4, line: 3, message: 'Wrong value passed' }, { ip: 11, line: 6, message: 'Sum doesn\'t work' }],
+        sourceMap: '3:12:3:17;;:21::22;:12:::1;:4::46;6:12:6:17:0;;:20::21;:12:::1;:25::26:0;:12:::1',
       },
       source: fs.readFileSync(new URL('../valid-contract-files/debug_messages.cash', import.meta.url), { encoding: 'utf-8' }),
       compiler: {
diff --git a/packages/cashc/test/valid-contract-files/debug_messages.cash b/packages/cashc/test/valid-contract-files/debug_messages.cash
index fcb88c7b..92203434 100644
--- a/packages/cashc/test/valid-contract-files/debug_messages.cash
+++ b/packages/cashc/test/valid-contract-files/debug_messages.cash
@@ -1,6 +1,8 @@
 contract DebugMessages() {
   function spend(int value) {
-    console.log(value, "test");
     require(value == 1, "Wrong value passed");
+    console.log(value, "test");
+    console.log(value, "test2");
+    require(value + 1 == 2, "Sum doesn't work");
   }
 }

From 5e7263aa127774f725b4f49feb8fe9151a5c2c21 Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Tue, 23 Jan 2024 09:19:59 +0100
Subject: [PATCH 064/171] Extract DebugInformation type for Artifact + small
 changes to artifact debug generation

---
 packages/cashc/src/artifact/Artifact.ts | 23 +++--------------------
 packages/cashc/src/compiler.ts          | 12 ++++++++----
 packages/utils/src/artifact.ts          | 14 ++++++++------
 3 files changed, 19 insertions(+), 30 deletions(-)

diff --git a/packages/cashc/src/artifact/Artifact.ts b/packages/cashc/src/artifact/Artifact.ts
index a5161b6f..b5e584f6 100644
--- a/packages/cashc/src/artifact/Artifact.ts
+++ b/packages/cashc/src/artifact/Artifact.ts
@@ -1,21 +1,10 @@
 import {
-  Artifact, LogEntry, RequireMessage, Script, scriptToAsm, scriptToBytecode,
+  Artifact, DebugInformation, Script, scriptToAsm,
 } from '@cashscript/utils';
 import { version } from '../index.js';
 import { Ast } from '../ast/AST.js';
-import { binToHex } from '@bitauth/libauth';
 
-export function generateArtifact(
-  ast: Ast,
-  script: Script,
-  source: string,
-  debug: {
-    script: Script,
-    sourceMap: string,
-    logs: LogEntry[],
-    requireMessages: RequireMessage[],
-  },
-): Artifact {
+export function generateArtifact(ast: Ast, script: Script, source: string, debug: DebugInformation): Artifact {
   const { contract } = ast;
 
   const constructorInputs = contract.parameters
@@ -30,7 +19,6 @@ export function generateArtifact(
   }));
 
   const bytecode = scriptToAsm(script);
-  const debugBytecode = binToHex(scriptToBytecode(debug.script));
 
   return {
     contractName: contract.name,
@@ -38,12 +26,7 @@ export function generateArtifact(
     abi,
     bytecode,
     source,
-    debug: {
-      bytecode: debugBytecode,
-      sourceMap: debug.sourceMap,
-      logs: debug.logs,
-      requireMessages: debug.requireMessages,
-    },
+    debug,
     compiler: {
       name: 'cashc',
       version,
diff --git a/packages/cashc/src/compiler.ts b/packages/cashc/src/compiler.ts
index 8d8f2192..4fad313d 100644
--- a/packages/cashc/src/compiler.ts
+++ b/packages/cashc/src/compiler.ts
@@ -1,5 +1,6 @@
 import { CharStream, CommonTokenStream } from 'antlr4';
-import { Artifact, optimiseBytecode } from '@cashscript/utils';
+import { binToHex } from '@bitauth/libauth';
+import { Artifact, optimiseBytecode, scriptToBytecode } from '@cashscript/utils';
 import fs, { PathLike } from 'fs';
 import { generateArtifact } from './artifact/Artifact.js';
 import { Ast } from './ast/AST.js';
@@ -28,12 +29,15 @@ export function compileString(code: string): Artifact {
   // Bytecode optimisation
   const optimisedBytecode = optimiseBytecode(traversal.output);
 
-  return generateArtifact(ast, optimisedBytecode, code, {
-    script: traversal.output,
+  // Attach debug information
+  const debug = {
+    bytecode: binToHex(scriptToBytecode(traversal.output)),
     sourceMap: traversal.souceMap,
     logs: traversal.consoleLogs,
     requireMessages: traversal.requireMessages,
-  });
+  };
+
+  return generateArtifact(ast, optimisedBytecode, code, debug);
 }
 
 export function compileFile(codeFile: PathLike): Artifact {
diff --git a/packages/utils/src/artifact.ts b/packages/utils/src/artifact.ts
index 97ef690d..54952783 100644
--- a/packages/utils/src/artifact.ts
+++ b/packages/utils/src/artifact.ts
@@ -11,6 +11,13 @@ export interface AbiFunction {
   inputs: AbiInput[];
 }
 
+export interface DebugInformation {
+  bytecode: string; // unlike `bytecode` property above, this is a hex-encoded binary string
+  sourceMap: string; // see documentation for `generateSourceMap`
+  logs: LogEntry[]; // log entries generated from `console.log` statements
+  requireMessages: RequireMessage[]; // messages for failing `require` statements
+}
+
 export interface LogEntry {
   ip: number; // instruction pointer
   line: number; // line in the source code
@@ -29,12 +36,7 @@ export interface Artifact {
   abi: AbiFunction[];
   bytecode: string;
   source: string;
-  debug?: {
-    bytecode: string; // unlike `bytecode` property above, this is a hex-encoded binary string
-    sourceMap: string; // see documentation for `generateSourceMap`
-    logs: LogEntry[]; // log entries generated from `console.log` statements
-    requireMessages: RequireMessage[]; // messages for failing `require` statements
-  };
+  debug?: DebugInformation;
   compiler: {
     name: string;
     version: string;

From 51611b70209d5dca506f18cbdbe40454dd4db7ce Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Tue, 23 Jan 2024 09:26:58 +0100
Subject: [PATCH 065/171] Rename souceMap => sourceMap

---
 packages/cashc/src/compiler.ts                       |  2 +-
 .../cashc/src/generation/GenerateTargetTraversal.ts  |  4 ++--
 packages/utils/src/bitauth-script.ts                 | 12 ++++++------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/cashc/src/compiler.ts b/packages/cashc/src/compiler.ts
index 4fad313d..adfde685 100644
--- a/packages/cashc/src/compiler.ts
+++ b/packages/cashc/src/compiler.ts
@@ -32,7 +32,7 @@ export function compileString(code: string): Artifact {
   // Attach debug information
   const debug = {
     bytecode: binToHex(scriptToBytecode(traversal.output)),
-    sourceMap: traversal.souceMap,
+    sourceMap: traversal.sourceMap,
     logs: traversal.consoleLogs,
     requireMessages: traversal.requireMessages,
   };
diff --git a/packages/cashc/src/generation/GenerateTargetTraversal.ts b/packages/cashc/src/generation/GenerateTargetTraversal.ts
index ea7701ac..639d9b70 100644
--- a/packages/cashc/src/generation/GenerateTargetTraversal.ts
+++ b/packages/cashc/src/generation/GenerateTargetTraversal.ts
@@ -60,7 +60,7 @@ import { Location } from '../ast/Location.js';
 
 export default class GenerateTargetTraversalWithLocation extends AstTraversal {
   private locationData: LocationData = []; // detailed location data needed for sourcemap creation
-  souceMap: string;
+  sourceMap: string;
   output: Script = [];
   stack: string[] = [];
   consoleLogs: LogEntry[] = [];
@@ -114,7 +114,7 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
     // Minimally encode output by going Script -> ASM -> Script
     this.output = asmToScript(scriptToAsm(this.output));
 
-    this.souceMap = generateSourceMap(this.locationData);
+    this.sourceMap = generateSourceMap(this.locationData);
 
     return node;
   }
diff --git a/packages/utils/src/bitauth-script.ts b/packages/utils/src/bitauth-script.ts
index a9d47b9c..f0466d4d 100644
--- a/packages/utils/src/bitauth-script.ts
+++ b/packages/utils/src/bitauth-script.ts
@@ -4,8 +4,8 @@ import { sourceMapToLocationData } from './source-map.js';
 export type LineToOpcodesMap = Record<string, Script>;
 export type LineToAsmMap = Record<string, string>;
 
-export function buildLineToOpcodesMap(bytecode: Script, souceMap: string): LineToOpcodesMap {
-  const locationData = sourceMapToLocationData(souceMap);
+export function buildLineToOpcodesMap(bytecode: Script, sourceMap: string): LineToOpcodesMap {
+  const locationData = sourceMapToLocationData(sourceMap);
 
   return locationData.reduce<LineToOpcodesMap>((lineToOpcodeMap, [location, positionHint], index) => {
     const opcode = bytecode[index];
@@ -18,16 +18,16 @@ export function buildLineToOpcodesMap(bytecode: Script, souceMap: string): LineT
   }, {});
 }
 
-export function buildLineToAsmMap(bytecode: Script, souceMap: string): LineToAsmMap {
-  const lineToOpcodesMap = buildLineToOpcodesMap(bytecode, souceMap);
+export function buildLineToAsmMap(bytecode: Script, sourceMap: string): LineToAsmMap {
+  const lineToOpcodesMap = buildLineToOpcodesMap(bytecode, sourceMap);
 
   return Object.fromEntries(
     Object.entries(lineToOpcodesMap).map(([lineNumber, opcodeList]) => [lineNumber, scriptToBitAuthAsm(opcodeList)]),
   );
 }
 
-export function formatBitAuthScript(bytecode: Script, souceMap: string, sourceCode: string): string {
-  const lineToAsmMap = buildLineToAsmMap(bytecode, souceMap);
+export function formatBitAuthScript(bytecode: Script, sourceMap: string, sourceCode: string): string {
+  const lineToAsmMap = buildLineToAsmMap(bytecode, sourceMap);
 
   const sourceCodeLines = sourceCode.split('\n');
 

From e9b0f9703bce3d7dfe3643c71663050106b2658e Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Tue, 23 Jan 2024 10:20:34 +0100
Subject: [PATCH 066/171] Update LocationData / PositionHint types

- Add enum for PositionHint
- Convert LocationData type to an object (instead of tuple)
- Update AST's Node class to always have a defined location
- Update LocationData's usage to reflect these new types
- Refactor some code in source-map.ts
- Update tests and fixtures to reflect these changes
---
 packages/cashc/src/ast/AST.ts                 |   2 +-
 packages/cashc/src/ast/Location.ts            |   4 +-
 .../src/generation/GenerateTargetTraversal.ts | 193 +++++++------
 packages/cashc/test/ast/Location.test.ts      |  10 +-
 packages/utils/src/bitauth-script.ts          |   5 +-
 packages/utils/src/source-map.ts              |  79 +++---
 packages/utils/src/types.ts                   |  24 ++
 .../utils/test/fixtures/source-map.fixture.ts | 266 +++++++++---------
 8 files changed, 318 insertions(+), 265 deletions(-)

diff --git a/packages/cashc/src/ast/AST.ts b/packages/cashc/src/ast/AST.ts
index d6acd68a..f8c7b762 100644
--- a/packages/cashc/src/ast/AST.ts
+++ b/packages/cashc/src/ast/AST.ts
@@ -9,7 +9,7 @@ import { binToHex } from '@bitauth/libauth';
 export type Ast = SourceFileNode;
 
 export abstract class Node {
-  location?: Location;
+  location: Location;
   abstract accept<T>(visitor: AstVisitor<T>): T;
 }
 
diff --git a/packages/cashc/src/ast/Location.ts b/packages/cashc/src/ast/Location.ts
index ebaaf151..a3054606 100644
--- a/packages/cashc/src/ast/Location.ts
+++ b/packages/cashc/src/ast/Location.ts
@@ -4,7 +4,7 @@ import { LocationI } from '@cashscript/utils';
 export class Location implements LocationI {
   constructor(public start: Point, public end: Point) {}
 
-  static fromCtx(ctx: ParserRuleContext): Location | undefined {
+  static fromCtx(ctx: ParserRuleContext): Location {
     const stop = ctx.stop?.text ? ctx.stop : ctx.start;
     const textLength = (stop.text ?? '').length;
 
@@ -14,7 +14,7 @@ export class Location implements LocationI {
     return new Location(start, end);
   }
 
-  static fromToken(token: Token): Location | undefined {
+  static fromToken(token: Token): Location {
     const textLength = (token.text ?? '').length;
 
     const start = new Point(token.line, token.column);
diff --git a/packages/cashc/src/generation/GenerateTargetTraversal.ts b/packages/cashc/src/generation/GenerateTargetTraversal.ts
index 639d9b70..6e1f5fbc 100644
--- a/packages/cashc/src/generation/GenerateTargetTraversal.ts
+++ b/packages/cashc/src/generation/GenerateTargetTraversal.ts
@@ -11,10 +11,11 @@ import {
   Script,
   scriptToAsm,
   generateSourceMap,
-  LocationI,
-  LocationData,
+  FullLocationData,
   LogEntry,
   RequireMessage,
+  PositionHint,
+  SingleLocationData,
 } from '@cashscript/utils';
 import {
   ContractNode,
@@ -56,10 +57,9 @@ import {
   compileTimeOp,
   compileUnaryOp,
 } from './utils.js';
-import { Location } from '../ast/Location.js';
 
 export default class GenerateTargetTraversalWithLocation extends AstTraversal {
-  private locationData: LocationData = []; // detailed location data needed for sourcemap creation
+  private locationData: FullLocationData = []; // detailed location data needed for sourcemap creation
   sourceMap: string;
   output: Script = [];
   stack: string[] = [];
@@ -70,13 +70,13 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
   private currentFunction: FunctionDefinitionNode;
   private constructorParameterCount: number;
 
-  private emit(op: OpOrData | OpOrData[], location: LocationI, positionHint?: number): void {
+  private emit(op: OpOrData | OpOrData[], locationData: SingleLocationData): void {
     if (Array.isArray(op)) {
       op.forEach((element) => this.output.push(element as Op));
-      op.forEach(() => this.locationData.push([location, positionHint]));
+      op.forEach(() => this.locationData.push(locationData));
     } else {
       this.output.push(op);
-      this.locationData.push([location, positionHint]);
+      this.locationData.push(locationData);
     }
   }
 
@@ -127,37 +127,40 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
     } else {
       this.pushToStack('$$', true);
       node.functions = node.functions.map((f, i) => {
+        const locationData = { location: f.location };
+
         const stackCopy = [...this.stack];
         const selectorIndex = this.getStackIndex('$$');
-        this.emit(encodeInt(BigInt(selectorIndex)), f.location!);
+
+        this.emit(encodeInt(BigInt(selectorIndex)), locationData);
         if (i === node.functions.length - 1) {
-          this.emit(Op.OP_ROLL, f.location!);
+          this.emit(Op.OP_ROLL, locationData);
           this.removeFromStack(selectorIndex);
         } else {
-          this.emit(Op.OP_PICK, f.location!);
+          this.emit(Op.OP_PICK, locationData);
         }
 
         // All functions are if-else statements, except the final one which is
         // enforced with NUMEQUALVERIFY
-        this.emit(encodeInt(BigInt(i)), f.location!);
-        this.emit(Op.OP_NUMEQUAL, f.location!);
+        this.emit(encodeInt(BigInt(i)), locationData);
+        this.emit(Op.OP_NUMEQUAL, locationData);
         if (i < node.functions.length - 1) {
-          this.emit(Op.OP_IF, f.location!);
+          this.emit(Op.OP_IF, locationData);
         } else {
-          this.emit(Op.OP_VERIFY, f.location!);
+          this.emit(Op.OP_VERIFY, locationData);
         }
 
         f = this.visit(f) as FunctionDefinitionNode;
 
         if (i < node.functions.length - 1) {
-          this.emit(Op.OP_ELSE, f.location!, 1);
+          this.emit(Op.OP_ELSE, { ...locationData, positionHint: PositionHint.END });
         }
 
         this.stack = [...stackCopy];
         return f;
       });
       for (let i = 0; i < node.functions.length - 1; i += 1) {
-        this.emit(Op.OP_ENDIF, node.location!, 1);
+        this.emit(Op.OP_ENDIF, { location: node.location, positionHint: PositionHint.END });
       }
     }
 
@@ -181,7 +184,7 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
     // "OP_VERIFY", "OP_CHECK{LOCKTIME|SEQUENCE}VERIFY OP_DROP" or "OP_ENDIF"
 
     const finalOp = this.output.pop() as Op;
-    const [location] = this.locationData.pop() as [Location, number?];
+    const { location } = this.locationData.pop()!;
 
     // If the final op is OP_VERIFY and the stack size is less than 4 we remove it from the script
     // - We have the stack size check because it is more efficient to use 2DROP rather than NIP
@@ -191,13 +194,13 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
       // we add it back to the stack
       this.pushToStack('(value)');
     } else {
-      this.emit(finalOp, location!, 1);
+      this.emit(finalOp, { location, positionHint: PositionHint.END });
 
       // At this point there is no verification value left on the stack:
       //  - scoped stack is cleared inside branch ended by OP_ENDIF
       //  - OP_CHECK{LOCKTIME|SEQUENCE}VERIFY OP_DROP does not leave a verification value
       // so we add OP_1 to the script (indicating success)
-      this.emit(Op.OP_1, node.location!, 1);
+      this.emit(Op.OP_1, { location: node.location, positionHint: PositionHint.END });
       this.pushToStack('(value)');
     }
   }
@@ -206,7 +209,7 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
     // Keep final verification value, OP_NIP the other stack values
     const stackSize = this.stack.length;
     for (let i = 0; i < stackSize - 1; i += 1) {
-      this.emit(Op.OP_NIP, node.location!, 1);
+      this.emit(Op.OP_NIP, { location: node.location, positionHint: PositionHint.END });
       this.nipFromStack();
     }
   }
@@ -246,30 +249,32 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
   // This algorithm can be optimised for hardcoded depths
   // See thesis for explanation
   emitReplace(index: number, node: Node): void {
-    this.emit(encodeInt(BigInt(index)), node.location!);
-    this.emit(Op.OP_ROLL, node.location!);
-    this.emit(Op.OP_DROP, node.location!);
+    const locationData = { location: node.location };
+
+    this.emit(encodeInt(BigInt(index)), locationData);
+    this.emit(Op.OP_ROLL, locationData);
+    this.emit(Op.OP_DROP, locationData);
     for (let i = 0; i < index - 1; i += 1) {
-      this.emit(Op.OP_SWAP, node.location!);
+      this.emit(Op.OP_SWAP, locationData);
       if (i < index - 2) {
-        this.emit(Op.OP_TOALTSTACK, node.location!);
+        this.emit(Op.OP_TOALTSTACK, locationData);
       }
     }
     for (let i = 0; i < index - 2; i += 1) {
-      this.emit(Op.OP_FROMALTSTACK, node.location!);
+      this.emit(Op.OP_FROMALTSTACK, locationData);
     }
   }
 
   visitTimeOp(node: TimeOpNode): Node {
     // const countBefore = this.output.length;
     node.expression = this.visit(node.expression);
-    this.emit(compileTimeOp(node.timeOp), node.location!, 1);
+    this.emit(compileTimeOp(node.timeOp), { location: node.location, positionHint: PositionHint.END });
 
     // add debug require message
     if (node.message) {
       this.requireMessages.push({
         ip: this.output.length + this.constructorParameterCount - 1,
-        line: node.location!.start.line,
+        line: node.location.start.line,
         message: node.message,
       });
     }
@@ -281,13 +286,13 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
   visitRequire(node: RequireNode): Node {
     node.expression = this.visit(node.expression);
 
-    this.emit(Op.OP_VERIFY, node.location!, 1);
+    this.emit(Op.OP_VERIFY, { location: node.location, positionHint: PositionHint.END });
 
     // add debug require message
     if (node.message) {
       this.requireMessages.push({
         ip: this.output.length + this.constructorParameterCount - 1,
-        line: node.location!.start.line,
+        line: node.location.start.line,
         message: node.message,
       });
     }
@@ -301,20 +306,27 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
     this.popFromStack();
 
     this.scopeDepth += 1;
-    this.emit(Op.OP_IF, node.ifBlock.location!);
+    this.emit(Op.OP_IF, { location: node.ifBlock.location });
 
     let stackDepth = this.stack.length;
     node.ifBlock = this.visit(node.ifBlock);
     this.removeScopedVariables(stackDepth, node);
 
     if (node.elseBlock) {
-      this.emit(Op.OP_ELSE, node.elseBlock.location!, 1);
+      // TODO: Why would the *start* of the else block be PositionHint.END? Is it because it is also the end of
+      // the if block?
+      this.emit(Op.OP_ELSE, { location: node.elseBlock.location, positionHint: PositionHint.END });
       stackDepth = this.stack.length;
       node.elseBlock = this.visit(node.elseBlock);
       this.removeScopedVariables(stackDepth, node);
     }
 
-    this.emit(Op.OP_ENDIF, node.elseBlock ? node.elseBlock.location! : node.ifBlock.location!, 1);
+    const endLocationData = {
+      location: node.elseBlock ? node.elseBlock.location : node.ifBlock.location,
+      positionHint: PositionHint.END,
+    };
+
+    this.emit(Op.OP_ENDIF, endLocationData);
     this.scopeDepth -= 1;
 
     return node;
@@ -323,7 +335,7 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
   removeScopedVariables(depthBeforeScope: number, node: Node): void {
     const dropCount = this.stack.length - depthBeforeScope;
     for (let i = 0; i < dropCount; i += 1) {
-      this.emit(Op.OP_DROP, node.location!);
+      this.emit(Op.OP_DROP, { location: node.location });
       this.popFromStack();
     }
   }
@@ -334,11 +346,14 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
     // Special case for sized bytes cast, since it has another node to traverse
     if (node.size) {
       node.size = this.visit(node.size);
-      this.emit(Op.OP_NUM2BIN, node.location!);
+      this.emit(Op.OP_NUM2BIN, { location: node.location });
       this.popFromStack();
     }
 
-    this.emit(compileCast(node.expression.type as PrimitiveType, node.type), node.location!, 1);
+    this.emit(
+      compileCast(node.expression.type as PrimitiveType, node.type),
+      { location: node.location, positionHint: PositionHint.END },
+    );
     this.popFromStack();
     this.pushToStack('(value)');
     return node;
@@ -351,7 +366,10 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
 
     node.parameters = this.visitList(node.parameters);
 
-    this.emit(compileGlobalFunction(node.identifier.name as GlobalFunction), node.location!, 1);
+    this.emit(
+      compileGlobalFunction(node.identifier.name as GlobalFunction),
+      { location: node.location, positionHint: PositionHint.END },
+    );
     this.popFromStack(node.parameters.length);
     this.pushToStack('(value)');
 
@@ -359,10 +377,10 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
   }
 
   visitMultiSig(node: FunctionCallNode): Node {
-    this.emit(encodeBool(false), node.location!);
+    this.emit(encodeBool(false), { location: node.location });
     this.pushToStack('(value)');
     node.parameters = this.visitList(node.parameters);
-    this.emit(Op.OP_CHECKMULTISIG, node.location!, 1);
+    this.emit(Op.OP_CHECKMULTISIG, { location: node.location, positionHint: PositionHint.END });
     const sigs = node.parameters[0] as ArrayNode;
     const pks = node.parameters[1] as ArrayNode;
     this.popFromStack(sigs.elements.length + pks.elements.length + 3);
@@ -372,72 +390,75 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
   }
 
   visitInstantiation(node: InstantiationNode): Node {
+    const nodeLocationData = { location: node.location };
+
     if (node.identifier.name === Class.LOCKING_BYTECODE_P2PKH) {
       // OP_DUP OP_HASH160 OP_PUSH<20>
-      this.emit(hexToBin('76a914'), node.location!);
+      this.emit(hexToBin('76a914'), nodeLocationData);
       this.pushToStack('(value)');
       // <pkh>
       this.visit(node.parameters[0]);
-      this.emit(Op.OP_CAT, node.location!);
+      this.emit(Op.OP_CAT, nodeLocationData);
       // OP_EQUAL OP_CHECKSIG
-      this.emit(hexToBin('88ac'), node.location!);
-      this.emit(Op.OP_CAT, node.location!);
+      this.emit(hexToBin('88ac'), nodeLocationData);
+      this.emit(Op.OP_CAT, nodeLocationData);
       this.popFromStack(2);
     } else if (node.identifier.name === Class.LOCKING_BYTECODE_P2SH20) {
       // OP_HASH160 OP_PUSH<20>
-      this.emit(hexToBin('a914'), node.location!);
+      this.emit(hexToBin('a914'), nodeLocationData);
       this.pushToStack('(value)');
       // <script hash>
       this.visit(node.parameters[0]);
-      this.emit(Op.OP_CAT, node.location!);
+      this.emit(Op.OP_CAT, nodeLocationData);
       // OP_EQUAL
-      this.emit(hexToBin('87'), node.location!);
-      this.emit(Op.OP_CAT, node.location!);
+      this.emit(hexToBin('87'), nodeLocationData);
+      this.emit(Op.OP_CAT, nodeLocationData);
       this.popFromStack(2);
     } else if (node.identifier.name === Class.LOCKING_BYTECODE_P2SH32) {
       // OP_HASH256 OP_PUSH<32>
-      this.emit(hexToBin('aa20'), node.location!);
+      this.emit(hexToBin('aa20'), nodeLocationData);
       this.pushToStack('(value)');
       // <script hash>
       this.visit(node.parameters[0]);
-      this.emit(Op.OP_CAT, node.location!);
+      this.emit(Op.OP_CAT, nodeLocationData);
       // OP_EQUAL
-      this.emit(hexToBin('87'), node.location!);
-      this.emit(Op.OP_CAT, node.location!);
+      this.emit(hexToBin('87'), nodeLocationData);
+      this.emit(Op.OP_CAT, nodeLocationData);
       this.popFromStack(2);
     } else if (node.identifier.name === Class.LOCKING_BYTECODE_NULLDATA) {
       // Total script = OP_RETURN (<VarInt> <chunk>)+
       // OP_RETURN
-      this.emit(hexToBin('6a'), node.location!);
+      this.emit(hexToBin('6a'), nodeLocationData);
       this.pushToStack('(value)');
       const { elements } = node.parameters[0] as ArrayNode;
       // <VarInt data chunk size (dynamic)>
-      elements.forEach((el) => {
-        this.visit(el);
+      elements.forEach((element) => {
+        const elementLocationData = { location: element.location };
+        this.visit(element);
         // Push the element's size (and calculate VarInt)
-        this.emit(Op.OP_SIZE, el.location!);
-        if (el instanceof HexLiteralNode) {
+        this.emit(Op.OP_SIZE, elementLocationData);
+        if (element instanceof HexLiteralNode) {
           // If the argument is a literal, we know its size
-          if (el.value.byteLength > 75) {
-            this.emit(hexToBin('4c'), el.location!);
-            this.emit(Op.OP_SWAP, el.location!);
-            this.emit(Op.OP_CAT, el.location!);
+          if (element.value.byteLength > 75) {
+            this.emit(hexToBin('4c'), elementLocationData);
+            this.emit(Op.OP_SWAP, elementLocationData);
+            this.emit(Op.OP_CAT, elementLocationData);
           }
         } else {
           // If the argument is not a literal, the script needs to check size
-          this.emit(Op.OP_DUP, el.location!);
-          this.emit(encodeInt(75n), el.location!);
-          this.emit(Op.OP_GREATERTHAN, el.location!);
-          this.emit(Op.OP_IF, el.location!);
-          this.emit(hexToBin('4c'), el.location!);
-          this.emit(Op.OP_SWAP, el.location!);
-          this.emit(Op.OP_CAT, el.location!);
-          this.emit(Op.OP_ENDIF, el.location!);
+          this.emit(Op.OP_DUP, elementLocationData);
+          this.emit(encodeInt(75n), elementLocationData);
+          this.emit(Op.OP_GREATERTHAN, elementLocationData);
+          this.emit(Op.OP_IF, elementLocationData);
+          this.emit(hexToBin('4c'), elementLocationData);
+          this.emit(Op.OP_SWAP, elementLocationData);
+          this.emit(Op.OP_CAT, elementLocationData);
+          this.emit(Op.OP_ENDIF, elementLocationData);
         }
         // Concat size and arguments
-        this.emit(Op.OP_SWAP, el.location!);
-        this.emit(Op.OP_CAT, el.location!);
-        this.emit(Op.OP_CAT, el.location!);
+        this.emit(Op.OP_SWAP, elementLocationData);
+        this.emit(Op.OP_CAT, elementLocationData);
+        this.emit(Op.OP_CAT, elementLocationData);
         this.popFromStack();
       });
       this.popFromStack();
@@ -453,11 +474,13 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
   visitTupleIndexOp(node: TupleIndexOpNode): Node {
     node.tuple = this.visit(node.tuple);
 
+    const locationData = { location: node.location, positionHint: PositionHint.END };
+
     if (node.index === 0) {
-      this.emit(Op.OP_DROP, node.location!, 1);
+      this.emit(Op.OP_DROP, locationData);
       this.popFromStack();
     } else if (node.index === 1) {
-      this.emit(Op.OP_NIP, node.location!, 1);
+      this.emit(Op.OP_NIP, locationData);
       this.nipFromStack();
     }
 
@@ -468,7 +491,7 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
     node.left = this.visit(node.left);
     node.right = this.visit(node.right);
     const isNumeric = resultingType(node.left.type, node.right.type) === PrimitiveType.INT;
-    this.emit(compileBinaryOp(node.operator, isNumeric), node.location!, 1);
+    this.emit(compileBinaryOp(node.operator, isNumeric), { location: node.location, positionHint: PositionHint.END });
     this.popFromStack(2);
     this.pushToStack('(value)');
     if (node.operator === BinaryOperator.SPLIT) this.pushToStack('(value)');
@@ -477,36 +500,36 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
 
   visitUnaryOp(node: UnaryOpNode): Node {
     node.expression = this.visit(node.expression);
-    this.emit(compileUnaryOp(node.operator), node.location!);
+    this.emit(compileUnaryOp(node.operator), { location: node.location });
     this.popFromStack();
     this.pushToStack('(value)');
     return node;
   }
 
   visitNullaryOp(node: NullaryOpNode): Node {
-    this.emit(compileNullaryOp(node.operator), node.location!);
+    this.emit(compileNullaryOp(node.operator), { location: node.location });
     this.pushToStack('(value)');
     return node;
   }
 
   visitArray(node: ArrayNode): Node {
     node.elements = this.visitList(node.elements);
-    this.emit(encodeInt(BigInt(node.elements.length)), node.location!, 1);
+    this.emit(encodeInt(BigInt(node.elements.length)), { location: node.location, positionHint: PositionHint.END });
     this.pushToStack('(value)');
     return node;
   }
 
   visitIdentifier(node: IdentifierNode): Node {
     const stackIndex = this.getStackIndex(node.name);
-    this.emit(encodeInt(BigInt(stackIndex)), node.location!);
+    this.emit(encodeInt(BigInt(stackIndex)), { location: node.location });
 
     // If the final use is inside an if-statement, we still OP_PICK it
     // We do this so that there's no difference in stack depths between execution paths
     if (this.isOpRoll(node)) {
-      this.emit(Op.OP_ROLL, node.location!);
+      this.emit(Op.OP_ROLL, { location: node.location });
       this.removeFromStack(stackIndex);
     } else {
-      this.emit(Op.OP_PICK, node.location!);
+      this.emit(Op.OP_PICK, { location: node.location });
     }
 
     this.pushToStack('(value)');
@@ -518,25 +541,25 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
   }
 
   visitBoolLiteral(node: BoolLiteralNode): Node {
-    this.emit(encodeBool(node.value), node.location!);
+    this.emit(encodeBool(node.value), { location: node.location });
     this.pushToStack('(value)');
     return node;
   }
 
   visitIntLiteral(node: IntLiteralNode): Node {
-    this.emit(encodeInt(node.value), node.location!);
+    this.emit(encodeInt(node.value), { location: node.location });
     this.pushToStack('(value)');
     return node;
   }
 
   visitStringLiteral(node: StringLiteralNode): Node {
-    this.emit(encodeString(node.value), node.location!);
+    this.emit(encodeString(node.value), { location: node.location });
     this.pushToStack('(value)');
     return node;
   }
 
   visitHexLiteral(node: HexLiteralNode): Node {
-    this.emit(node.value, node.location!);
+    this.emit(node.value, { location: node.location });
     this.pushToStack('(value)');
     return node;
   }
@@ -544,7 +567,7 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
   visitConsoleStatement(node: ConsoleStatementNode): Node {
     // instruction pointer is the count of emitted opcodes + number of constructor data pushes
     const ip = this.output.length + this.constructorParameterCount;
-    const { line } = node.location!.start;
+    const { line } = node.location.start;
 
     // TODO: refactor to use a map instead of array (also in the artifact and other places where console logs and
     // require statements are used)
diff --git a/packages/cashc/test/ast/Location.test.ts b/packages/cashc/test/ast/Location.test.ts
index aebc0a3e..d6a70891 100644
--- a/packages/cashc/test/ast/Location.test.ts
+++ b/packages/cashc/test/ast/Location.test.ts
@@ -12,7 +12,7 @@ describe('Location', () => {
     const f = ast.contract.functions[0];
 
     expect(f.location).toBeDefined();
-    expect((f.location!).text(code)).toEqual('function hello(sig s, pubkey pk) {\n        require(checkSig(s, pk));\n    }');
+    expect((f.location).text(code)).toEqual('function hello(sig s, pubkey pk) {\n        require(checkSig(s, pk));\n    }');
   });
 
   const wrap = (code: string): string => {
@@ -87,13 +87,13 @@ contract test() {
     const secondFunction = ast.contract.functions[1];
 
     expect(secondFunction.location).toBeDefined();
-    expect(secondFunction.location!.start).toEqual({ line: 6, column: 4 });
-    expect(secondFunction.location!.end).toEqual({ line: 8, column: 5 });
+    expect(secondFunction.location.start).toEqual({ line: 6, column: 4 });
+    expect(secondFunction.location.end).toEqual({ line: 8, column: 5 });
 
     const firstStatement = secondFunction.body.statements![0];
 
     expect(firstStatement.location).toBeDefined();
-    expect(firstStatement.location!.start).toEqual({ line: 7, column: 8 });
-    expect(firstStatement.location!.end).toEqual({ line: 7, column: 29 });
+    expect(firstStatement.location.start).toEqual({ line: 7, column: 8 });
+    expect(firstStatement.location.end).toEqual({ line: 7, column: 29 });
   });
 });
diff --git a/packages/utils/src/bitauth-script.ts b/packages/utils/src/bitauth-script.ts
index f0466d4d..21a7f4c5 100644
--- a/packages/utils/src/bitauth-script.ts
+++ b/packages/utils/src/bitauth-script.ts
@@ -1,5 +1,6 @@
 import { Script, scriptToBitAuthAsm } from './script.js';
 import { sourceMapToLocationData } from './source-map.js';
+import { PositionHint } from './types.js';
 
 export type LineToOpcodesMap = Record<string, Script>;
 export type LineToAsmMap = Record<string, string>;
@@ -7,9 +8,9 @@ export type LineToAsmMap = Record<string, string>;
 export function buildLineToOpcodesMap(bytecode: Script, sourceMap: string): LineToOpcodesMap {
   const locationData = sourceMapToLocationData(sourceMap);
 
-  return locationData.reduce<LineToOpcodesMap>((lineToOpcodeMap, [location, positionHint], index) => {
+  return locationData.reduce<LineToOpcodesMap>((lineToOpcodeMap, { location, positionHint }, index) => {
     const opcode = bytecode[index];
-    const line = positionHint ? location?.end.line : location?.start.line;
+    const line = positionHint === PositionHint.END ? location?.end.line : location?.start.line;
 
     return {
       ...lineToOpcodeMap,
diff --git a/packages/utils/src/source-map.ts b/packages/utils/src/source-map.ts
index 6a640c1e..e1d7dda5 100644
--- a/packages/utils/src/source-map.ts
+++ b/packages/utils/src/source-map.ts
@@ -1,15 +1,4 @@
-export interface LocationI {
-  start: {
-    line: number,
-    column: number
-  };
-  end: {
-    line: number,
-    column: number
-  };
-}
-
-export type LocationData = Array<[location: LocationI, positionHint?: number]>;
+import { FullLocationData, PositionHint, SingleLocationData } from './types.js';
 
 /*
  * The source mappings for the bytecode use the following notation (similar to Solidity):
@@ -36,27 +25,27 @@ export type LocationData = Array<[location: LocationI, positionHint?: number]>;
  * 14:20:14:29;;:12::30;:34::43;
  *
  */
-export function generateSourceMap(locationData: LocationData): string {
+export function generateSourceMap(locationData: FullLocationData): string {
   let prevStartLine = 0;
   let prevStartColumn = 0;
   let prevEndLine = 0;
   let prevEndColumn = 0;
-  let prevHint = 0;
+  let prevHint = PositionHint.START;
 
-  return locationData.map((row: any) => {
-    const prevStartLineString = prevStartLine === row[0].start.line ? '' : String(row[0].start.line);
-    prevStartLine = row[0].start.line;
+  return locationData.map(({ location, positionHint }: SingleLocationData) => {
+    const prevStartLineString = prevStartLine === location.start.line ? '' : String(location.start.line);
+    prevStartLine = location.start.line;
 
-    const prevStartColumnString = prevStartColumn === row[0].start.column ? '' : String(row[0].start.column);
-    prevStartColumn = row[0].start.column;
+    const prevStartColumnString = prevStartColumn === location.start.column ? '' : String(location.start.column);
+    prevStartColumn = location.start.column;
 
-    const prevEndLineString = prevEndLine === row[0].end.line ? '' : String(row[0].end.line);
-    prevEndLine = row[0].end.line;
+    const prevEndLineString = prevEndLine === location.end.line ? '' : String(location.end.line);
+    prevEndLine = location.end.line;
 
-    const prevEndColumnString = prevEndColumn === row[0].end.column ? '' : String(row[0].end.column);
-    prevEndColumn = row[0].end.column;
+    const prevEndColumnString = prevEndColumn === location.end.column ? '' : String(location.end.column);
+    prevEndColumn = location.end.column;
 
-    const hint = row[1] ?? 0;
+    const hint = positionHint ?? PositionHint.START;
     const prevHintString = prevHint === hint ? '' : String(hint);
     prevHint = hint;
 
@@ -90,27 +79,43 @@ export function generateSourceMap(locationData: LocationData): string {
   }).join(';');
 }
 
-export const sourceMapToLocationData = (sourceMap: string): LocationData => {
+export const sourceMapToLocationData = (sourceMap: string): FullLocationData => {
   let prevStartLine = 0;
   let prevStartColumn = 0;
   let prevEndLine = 0;
   let prevEndColumn = 0;
-  let prevHint: any;
+  let prevHint: PositionHint | undefined;
 
   return sourceMap.split(';').map((entry: string) => {
-    const val = entry.split(':');
-    const startLine = val[0] ? Number(val[0]) : prevStartLine; prevStartLine = startLine;
-    const startColumn = val[1] ? Number(val[1]) : prevStartColumn; prevStartColumn = startColumn;
-    const endLine = val[2] ? Number(val[2]) : prevEndLine; prevEndLine = endLine;
-    const endColumn = val[3] ? Number(val[3]) : prevEndColumn; prevEndColumn = endColumn;
-    const hint: number | undefined = val[4] ? Number(val[4]) : prevHint; prevHint = hint;
-
-    return [
-      {
+    const [startLineStr, startColumnStr, endLineStr, endColumnStr, positionHintStr] = entry.split(':');
+
+    const startLine = startLineStr ? Number(startLineStr) : prevStartLine;
+    prevStartLine = startLine;
+
+    const startColumn = startColumnStr ? Number(startColumnStr) : prevStartColumn;
+    prevStartColumn = startColumn;
+
+    const endLine = endLineStr ? Number(endLineStr) : prevEndLine;
+    prevEndLine = endLine;
+
+    const endColumn = endColumnStr ? Number(endColumnStr) : prevEndColumn;
+    prevEndColumn = endColumn;
+
+    const hint: PositionHint | undefined = parsePositionHint(positionHintStr) ?? prevHint;
+    prevHint = hint;
+
+    return {
+      location: {
         start: { line: startLine, column: startColumn },
         end: { line: endLine, column: endColumn },
       },
-      ...(hint ? [hint] : []),
-    ] as any;
+      ...(hint ? { positionHint: hint } : {}),
+    };
   });
 };
+
+const parsePositionHint = (hint: string): PositionHint | undefined => {
+  if (hint === '1') return PositionHint.END;
+  if (hint === '0') return PositionHint.START;
+  return undefined;
+};
diff --git a/packages/utils/src/types.ts b/packages/utils/src/types.ts
index d5a9e426..f5e598aa 100644
--- a/packages/utils/src/types.ts
+++ b/packages/utils/src/types.ts
@@ -185,3 +185,27 @@ export function parseType(str: string): Type {
 export function isPrimitive(type: Type): type is PrimitiveType {
   return !!PrimitiveType[type.toString().toUpperCase() as keyof typeof PrimitiveType];
 }
+
+export interface LocationI {
+  start: {
+    line: number,
+    column: number
+  };
+  end: {
+    line: number,
+    column: number
+  };
+}
+
+export type SingleLocationData = {
+  location: LocationI;
+  positionHint?: PositionHint;
+};
+
+export type FullLocationData = Array<SingleLocationData>;
+
+// Denotes whether an opcode belongs to the "start" or "end" of the statement it's in (defaults to "start")
+export enum PositionHint {
+  START = 0,
+  END = 1,
+}
diff --git a/packages/utils/test/fixtures/source-map.fixture.ts b/packages/utils/test/fixtures/source-map.fixture.ts
index 4be047fc..a4a05690 100644
--- a/packages/utils/test/fixtures/source-map.fixture.ts
+++ b/packages/utils/test/fixtures/source-map.fixture.ts
@@ -1,8 +1,8 @@
-import { LocationData } from '../../src/source-map.js';
+import { FullLocationData, PositionHint } from '../../src/types.js';
 
 export interface Fixture {
   name: string;
-  locationData: LocationData;
+  locationData: FullLocationData;
   sourceMap: string;
 }
 
@@ -10,143 +10,143 @@ export const fixtures: Fixture[] = [
   {
     name: 'Basic Test',
     locationData: [
-      [{ start: { line: 10, column: 8 }, end: { line: 15, column: 9 } }],
-      [{ start: { line: 10, column: 8 }, end: { line: 15, column: 9 } }],
-      [{ start: { line: 10, column: 8 }, end: { line: 15, column: 9 } }],
-      [{ start: { line: 10, column: 8 }, end: { line: 15, column: 9 } }],
-      [{ start: { line: 10, column: 8 }, end: { line: 15, column: 9 } }],
-      [{ start: { line: 11, column: 26 }, end: { line: 11, column: 32 } }],
-      [{ start: { line: 13, column: 20 }, end: { line: 13, column: 24 } }],
-      [{ start: { line: 13, column: 20 }, end: { line: 13, column: 24 } }],
-      [{ start: { line: 13, column: 28 }, end: { line: 13, column: 34 } }],
-      [{ start: { line: 13, column: 20 }, end: { line: 13, column: 34 } }, 1],
-      [{ start: { line: 13, column: 20 }, end: { line: 13, column: 34 } }, 1],
-      [{ start: { line: 13, column: 12 }, end: { line: 13, column: 36 } }, 1],
-      [{ start: { line: 14, column: 29 }, end: { line: 14, column: 41 } }],
-      [{ start: { line: 14, column: 29 }, end: { line: 14, column: 41 } }],
-      [{ start: { line: 14, column: 43 }, end: { line: 14, column: 52 } }],
-      [{ start: { line: 14, column: 43 }, end: { line: 14, column: 52 } }],
-      [{ start: { line: 14, column: 20 }, end: { line: 14, column: 53 } }, 1],
-      [{ start: { line: 10, column: 8 }, end: { line: 15, column: 9 } }, 1],
-      [{ start: { line: 10, column: 8 }, end: { line: 15, column: 9 } }, 1],
-      [{ start: { line: 10, column: 8 }, end: { line: 15, column: 9 } }, 1],
-      [{ start: { line: 10, column: 8 }, end: { line: 15, column: 9 } }, 1],
-      [{ start: { line: 18, column: 8 }, end: { line: 21, column: 9 } }],
-      [{ start: { line: 18, column: 8 }, end: { line: 21, column: 9 } }],
-      [{ start: { line: 18, column: 8 }, end: { line: 21, column: 9 } }],
-      [{ start: { line: 18, column: 8 }, end: { line: 21, column: 9 } }],
-      [{ start: { line: 18, column: 8 }, end: { line: 21, column: 9 } }],
-      [{ start: { line: 19, column: 29 }, end: { line: 19, column: 38 } }],
-      [{ start: { line: 19, column: 29 }, end: { line: 19, column: 38 } }],
-      [{ start: { line: 19, column: 40 }, end: { line: 19, column: 46 } }],
-      [{ start: { line: 19, column: 40 }, end: { line: 19, column: 46 } }],
-      [{ start: { line: 19, column: 20 }, end: { line: 19, column: 47 } }, 1],
-      [{ start: { line: 19, column: 12 }, end: { line: 19, column: 49 } }, 1],
-      [{ start: { line: 20, column: 31 }, end: { line: 20, column: 38 } }],
-      [{ start: { line: 20, column: 31 }, end: { line: 20, column: 38 } }],
-      [{ start: { line: 20, column: 12 }, end: { line: 20, column: 40 } }, 1],
-      [{ start: { line: 20, column: 12 }, end: { line: 20, column: 40 } }, 1],
-      [{ start: { line: 18, column: 8 }, end: { line: 21, column: 9 } }, 1],
-      [{ start: { line: 18, column: 8 }, end: { line: 21, column: 9 } }, 1],
-      [{ start: { line: 4, column: 4 }, end: { line: 22, column: 5 } }, 1],
+      { location: { start: { line: 10, column: 8 }, end: { line: 15, column: 9 } } },
+      { location: { start: { line: 10, column: 8 }, end: { line: 15, column: 9 } } },
+      { location: { start: { line: 10, column: 8 }, end: { line: 15, column: 9 } } },
+      { location: { start: { line: 10, column: 8 }, end: { line: 15, column: 9 } } },
+      { location: { start: { line: 10, column: 8 }, end: { line: 15, column: 9 } } },
+      { location: { start: { line: 11, column: 26 }, end: { line: 11, column: 32 } } },
+      { location: { start: { line: 13, column: 20 }, end: { line: 13, column: 24 } } },
+      { location: { start: { line: 13, column: 20 }, end: { line: 13, column: 24 } } },
+      { location: { start: { line: 13, column: 28 }, end: { line: 13, column: 34 } } },
+      { location: { start: { line: 13, column: 20 }, end: { line: 13, column: 34 } }, positionHint: PositionHint.END },
+      { location: { start: { line: 13, column: 20 }, end: { line: 13, column: 34 } }, positionHint: PositionHint.END },
+      { location: { start: { line: 13, column: 12 }, end: { line: 13, column: 36 } }, positionHint: PositionHint.END },
+      { location: { start: { line: 14, column: 29 }, end: { line: 14, column: 41 } } },
+      { location: { start: { line: 14, column: 29 }, end: { line: 14, column: 41 } } },
+      { location: { start: { line: 14, column: 43 }, end: { line: 14, column: 52 } } },
+      { location: { start: { line: 14, column: 43 }, end: { line: 14, column: 52 } } },
+      { location: { start: { line: 14, column: 20 }, end: { line: 14, column: 53 } }, positionHint: PositionHint.END },
+      { location: { start: { line: 10, column: 8 }, end: { line: 15, column: 9 } }, positionHint: PositionHint.END },
+      { location: { start: { line: 10, column: 8 }, end: { line: 15, column: 9 } }, positionHint: PositionHint.END },
+      { location: { start: { line: 10, column: 8 }, end: { line: 15, column: 9 } }, positionHint: PositionHint.END },
+      { location: { start: { line: 10, column: 8 }, end: { line: 15, column: 9 } }, positionHint: PositionHint.END },
+      { location: { start: { line: 18, column: 8 }, end: { line: 21, column: 9 } } },
+      { location: { start: { line: 18, column: 8 }, end: { line: 21, column: 9 } } },
+      { location: { start: { line: 18, column: 8 }, end: { line: 21, column: 9 } } },
+      { location: { start: { line: 18, column: 8 }, end: { line: 21, column: 9 } } },
+      { location: { start: { line: 18, column: 8 }, end: { line: 21, column: 9 } } },
+      { location: { start: { line: 19, column: 29 }, end: { line: 19, column: 38 } } },
+      { location: { start: { line: 19, column: 29 }, end: { line: 19, column: 38 } } },
+      { location: { start: { line: 19, column: 40 }, end: { line: 19, column: 46 } } },
+      { location: { start: { line: 19, column: 40 }, end: { line: 19, column: 46 } } },
+      { location: { start: { line: 19, column: 20 }, end: { line: 19, column: 47 } }, positionHint: PositionHint.END },
+      { location: { start: { line: 19, column: 12 }, end: { line: 19, column: 49 } }, positionHint: PositionHint.END },
+      { location: { start: { line: 20, column: 31 }, end: { line: 20, column: 38 } } },
+      { location: { start: { line: 20, column: 31 }, end: { line: 20, column: 38 } } },
+      { location: { start: { line: 20, column: 12 }, end: { line: 20, column: 40 } }, positionHint: PositionHint.END },
+      { location: { start: { line: 20, column: 12 }, end: { line: 20, column: 40 } }, positionHint: PositionHint.END },
+      { location: { start: { line: 18, column: 8 }, end: { line: 21, column: 9 } }, positionHint: PositionHint.END },
+      { location: { start: { line: 18, column: 8 }, end: { line: 21, column: 9 } }, positionHint: PositionHint.END },
+      { location: { start: { line: 4, column: 4 }, end: { line: 22, column: 5 } }, positionHint: PositionHint.END },
     ],
     sourceMap: '10:8:15:9;;;;;11:26:11:32;13:20:13:24;;:28::34;:20:::1;;:12::36;14:29:14:41:0;;:43::52;;:20::53:1;10:8:15:9;;;;18::21::0;;;;;19:29:19:38;;:40::46;;:20::47:1;:12::49;20:31:20:38:0;;:12::40:1;;18:8:21:9;;4:4:22:5',
   },
   {
     name: 'Mecenas',
     locationData: [
-      [{ start: { line: 9, column: 4 }, end: { line: 28, column: 5 } }],
-      [{ start: { line: 9, column: 4 }, end: { line: 28, column: 5 } }],
-      [{ start: { line: 9, column: 4 }, end: { line: 28, column: 5 } }],
-      [{ start: { line: 9, column: 4 }, end: { line: 28, column: 5 } }],
-      [{ start: { line: 9, column: 4 }, end: { line: 28, column: 5 } }],
-      [{ start: { line: 13, column: 27 }, end: { line: 13, column: 28 } }],
-      [{ start: { line: 13, column: 16 }, end: { line: 13, column: 45 } }],
-      [{ start: { line: 13, column: 49 }, end: { line: 13, column: 84 } }],
-      [{ start: { line: 13, column: 74 }, end: { line: 13, column: 83 } }],
-      [{ start: { line: 13, column: 74 }, end: { line: 13, column: 83 } }],
-      [{ start: { line: 13, column: 49 }, end: { line: 13, column: 84 } }],
-      [{ start: { line: 13, column: 49 }, end: { line: 13, column: 84 } }],
-      [{ start: { line: 13, column: 49 }, end: { line: 13, column: 84 } }],
-      [{ start: { line: 13, column: 16 }, end: { line: 13, column: 84 } }, 1],
-      [{ start: { line: 13, column: 8 }, end: { line: 13, column: 86 } }, 1],
-      [{ start: { line: 15, column: 23 }, end: { line: 15, column: 27 } }],
-      [{ start: { line: 16, column: 37 }, end: { line: 16, column: 58 } }],
-      [{ start: { line: 16, column: 27 }, end: { line: 16, column: 65 } }],
-      [{ start: { line: 17, column: 26 }, end: { line: 17, column: 38 } }],
-      [{ start: { line: 17, column: 26 }, end: { line: 17, column: 38 } }],
-      [{ start: { line: 17, column: 41 }, end: { line: 17, column: 47 } }],
-      [{ start: { line: 17, column: 41 }, end: { line: 17, column: 47 } }],
-      [{ start: { line: 17, column: 26 }, end: { line: 17, column: 47 } }, 1],
-      [{ start: { line: 17, column: 50 }, end: { line: 17, column: 58 } }],
-      [{ start: { line: 17, column: 50 }, end: { line: 17, column: 58 } }],
-      [{ start: { line: 17, column: 26 }, end: { line: 17, column: 58 } }, 1],
-      [{ start: { line: 21, column: 12 }, end: { line: 21, column: 23 } }],
-      [{ start: { line: 21, column: 12 }, end: { line: 21, column: 23 } }],
-      [{ start: { line: 21, column: 27 }, end: { line: 21, column: 33 } }],
-      [{ start: { line: 21, column: 27 }, end: { line: 21, column: 33 } }],
-      [{ start: { line: 21, column: 36 }, end: { line: 21, column: 44 } }],
-      [{ start: { line: 21, column: 36 }, end: { line: 21, column: 44 } }],
-      [{ start: { line: 21, column: 27 }, end: { line: 21, column: 44 } }, 1],
-      [{ start: { line: 21, column: 12 }, end: { line: 21, column: 44 } }, 1],
-      [{ start: { line: 21, column: 46 }, end: { line: 23, column: 9 } }],
-      [{ start: { line: 22, column: 31 }, end: { line: 22, column: 32 } }],
-      [{ start: { line: 22, column: 20 }, end: { line: 22, column: 39 } }],
-      [{ start: { line: 22, column: 43 }, end: { line: 22, column: 55 } }],
-      [{ start: { line: 22, column: 43 }, end: { line: 22, column: 55 } }],
-      [{ start: { line: 22, column: 58 }, end: { line: 22, column: 66 } }],
-      [{ start: { line: 22, column: 58 }, end: { line: 22, column: 66 } }],
-      [{ start: { line: 22, column: 43 }, end: { line: 22, column: 66 } }, 1],
-      [{ start: { line: 22, column: 20 }, end: { line: 22, column: 66 } }, 1],
-      [{ start: { line: 22, column: 12 }, end: { line: 22, column: 68 } }, 1],
-      [{ start: { line: 23, column: 15 }, end: { line: 27, column: 9 } }, 1],
-      [{ start: { line: 24, column: 31 }, end: { line: 24, column: 32 } }],
-      [{ start: { line: 24, column: 20 }, end: { line: 24, column: 39 } }],
-      [{ start: { line: 24, column: 43 }, end: { line: 24, column: 49 } }],
-      [{ start: { line: 24, column: 43 }, end: { line: 24, column: 49 } }],
-      [{ start: { line: 24, column: 20 }, end: { line: 24, column: 49 } }, 1],
-      [{ start: { line: 24, column: 12 }, end: { line: 24, column: 51 } }, 1],
-      [{ start: { line: 25, column: 31 }, end: { line: 25, column: 32 } }],
-      [{ start: { line: 25, column: 20 }, end: { line: 25, column: 49 } }],
-      [{ start: { line: 25, column: 63 }, end: { line: 25, column: 84 } }],
-      [{ start: { line: 25, column: 53 }, end: { line: 25, column: 101 } }],
-      [{ start: { line: 25, column: 20 }, end: { line: 25, column: 101 } }, 1],
-      [{ start: { line: 25, column: 12 }, end: { line: 25, column: 103 } }, 1],
-      [{ start: { line: 26, column: 31 }, end: { line: 26, column: 32 } }],
-      [{ start: { line: 26, column: 20 }, end: { line: 26, column: 39 } }],
-      [{ start: { line: 26, column: 43 }, end: { line: 26, column: 54 } }],
-      [{ start: { line: 26, column: 43 }, end: { line: 26, column: 54 } }],
-      [{ start: { line: 26, column: 20 }, end: { line: 26, column: 54 } }, 1],
-      [{ start: { line: 26, column: 12 }, end: { line: 26, column: 56 } }, 1],
-      [{ start: { line: 23, column: 15 }, end: { line: 27, column: 9 } }, 1],
-      [{ start: { line: 9, column: 4 }, end: { line: 28, column: 5 } }, 1],
-      [{ start: { line: 9, column: 4 }, end: { line: 28, column: 5 } }, 1],
-      [{ start: { line: 9, column: 4 }, end: { line: 28, column: 5 } }, 1],
-      [{ start: { line: 9, column: 4 }, end: { line: 28, column: 5 } }, 1],
-      [{ start: { line: 9, column: 4 }, end: { line: 28, column: 5 } }, 1],
-      [{ start: { line: 9, column: 4 }, end: { line: 28, column: 5 } }, 1],
-      [{ start: { line: 9, column: 4 }, end: { line: 28, column: 5 } }, 1],
-      [{ start: { line: 9, column: 4 }, end: { line: 28, column: 5 } }, 1],
-      [{ start: { line: 30, column: 4 }, end: { line: 33, column: 5 } }],
-      [{ start: { line: 30, column: 4 }, end: { line: 33, column: 5 } }],
-      [{ start: { line: 30, column: 4 }, end: { line: 33, column: 5 } }],
-      [{ start: { line: 30, column: 4 }, end: { line: 33, column: 5 } }],
-      [{ start: { line: 30, column: 4 }, end: { line: 33, column: 5 } }],
-      [{ start: { line: 31, column: 24 }, end: { line: 31, column: 26 } }],
-      [{ start: { line: 31, column: 24 }, end: { line: 31, column: 26 } }],
-      [{ start: { line: 31, column: 16 }, end: { line: 31, column: 27 } }, 1],
-      [{ start: { line: 31, column: 31 }, end: { line: 31, column: 37 } }],
-      [{ start: { line: 31, column: 31 }, end: { line: 31, column: 37 } }],
-      [{ start: { line: 31, column: 16 }, end: { line: 31, column: 37 } }, 1],
-      [{ start: { line: 31, column: 8 }, end: { line: 31, column: 39 } }, 1],
-      [{ start: { line: 32, column: 25 }, end: { line: 32, column: 26 } }],
-      [{ start: { line: 32, column: 25 }, end: { line: 32, column: 26 } }],
-      [{ start: { line: 32, column: 28 }, end: { line: 32, column: 30 } }],
-      [{ start: { line: 32, column: 28 }, end: { line: 32, column: 30 } }],
-      [{ start: { line: 32, column: 16 }, end: { line: 32, column: 31 } }, 1],
-      [{ start: { line: 30, column: 4 }, end: { line: 33, column: 5 } }, 1],
-      [{ start: { line: 30, column: 4 }, end: { line: 33, column: 5 } }, 1],
-      [{ start: { line: 8, column: 0 }, end: { line: 34, column: 1 } }, 1],
+      { location: { start: { line: 9, column: 4 }, end: { line: 28, column: 5 } } },
+      { location: { start: { line: 9, column: 4 }, end: { line: 28, column: 5 } } },
+      { location: { start: { line: 9, column: 4 }, end: { line: 28, column: 5 } } },
+      { location: { start: { line: 9, column: 4 }, end: { line: 28, column: 5 } } },
+      { location: { start: { line: 9, column: 4 }, end: { line: 28, column: 5 } } },
+      { location: { start: { line: 13, column: 27 }, end: { line: 13, column: 28 } } },
+      { location: { start: { line: 13, column: 16 }, end: { line: 13, column: 45 } } },
+      { location: { start: { line: 13, column: 49 }, end: { line: 13, column: 84 } } },
+      { location: { start: { line: 13, column: 74 }, end: { line: 13, column: 83 } } },
+      { location: { start: { line: 13, column: 74 }, end: { line: 13, column: 83 } } },
+      { location: { start: { line: 13, column: 49 }, end: { line: 13, column: 84 } } },
+      { location: { start: { line: 13, column: 49 }, end: { line: 13, column: 84 } } },
+      { location: { start: { line: 13, column: 49 }, end: { line: 13, column: 84 } } },
+      { location: { start: { line: 13, column: 16 }, end: { line: 13, column: 84 } }, positionHint: PositionHint.END },
+      { location: { start: { line: 13, column: 8 }, end: { line: 13, column: 86 } }, positionHint: PositionHint.END },
+      { location: { start: { line: 15, column: 23 }, end: { line: 15, column: 27 } } },
+      { location: { start: { line: 16, column: 37 }, end: { line: 16, column: 58 } } },
+      { location: { start: { line: 16, column: 27 }, end: { line: 16, column: 65 } } },
+      { location: { start: { line: 17, column: 26 }, end: { line: 17, column: 38 } } },
+      { location: { start: { line: 17, column: 26 }, end: { line: 17, column: 38 } } },
+      { location: { start: { line: 17, column: 41 }, end: { line: 17, column: 47 } } },
+      { location: { start: { line: 17, column: 41 }, end: { line: 17, column: 47 } } },
+      { location: { start: { line: 17, column: 26 }, end: { line: 17, column: 47 } }, positionHint: PositionHint.END },
+      { location: { start: { line: 17, column: 50 }, end: { line: 17, column: 58 } } },
+      { location: { start: { line: 17, column: 50 }, end: { line: 17, column: 58 } } },
+      { location: { start: { line: 17, column: 26 }, end: { line: 17, column: 58 } }, positionHint: PositionHint.END },
+      { location: { start: { line: 21, column: 12 }, end: { line: 21, column: 23 } } },
+      { location: { start: { line: 21, column: 12 }, end: { line: 21, column: 23 } } },
+      { location: { start: { line: 21, column: 27 }, end: { line: 21, column: 33 } } },
+      { location: { start: { line: 21, column: 27 }, end: { line: 21, column: 33 } } },
+      { location: { start: { line: 21, column: 36 }, end: { line: 21, column: 44 } } },
+      { location: { start: { line: 21, column: 36 }, end: { line: 21, column: 44 } } },
+      { location: { start: { line: 21, column: 27 }, end: { line: 21, column: 44 } }, positionHint: PositionHint.END },
+      { location: { start: { line: 21, column: 12 }, end: { line: 21, column: 44 } }, positionHint: PositionHint.END },
+      { location: { start: { line: 21, column: 46 }, end: { line: 23, column: 9 } } },
+      { location: { start: { line: 22, column: 31 }, end: { line: 22, column: 32 } } },
+      { location: { start: { line: 22, column: 20 }, end: { line: 22, column: 39 } } },
+      { location: { start: { line: 22, column: 43 }, end: { line: 22, column: 55 } } },
+      { location: { start: { line: 22, column: 43 }, end: { line: 22, column: 55 } } },
+      { location: { start: { line: 22, column: 58 }, end: { line: 22, column: 66 } } },
+      { location: { start: { line: 22, column: 58 }, end: { line: 22, column: 66 } } },
+      { location: { start: { line: 22, column: 43 }, end: { line: 22, column: 66 } }, positionHint: PositionHint.END },
+      { location: { start: { line: 22, column: 20 }, end: { line: 22, column: 66 } }, positionHint: PositionHint.END },
+      { location: { start: { line: 22, column: 12 }, end: { line: 22, column: 68 } }, positionHint: PositionHint.END },
+      { location: { start: { line: 23, column: 15 }, end: { line: 27, column: 9 } }, positionHint: PositionHint.END },
+      { location: { start: { line: 24, column: 31 }, end: { line: 24, column: 32 } } },
+      { location: { start: { line: 24, column: 20 }, end: { line: 24, column: 39 } } },
+      { location: { start: { line: 24, column: 43 }, end: { line: 24, column: 49 } } },
+      { location: { start: { line: 24, column: 43 }, end: { line: 24, column: 49 } } },
+      { location: { start: { line: 24, column: 20 }, end: { line: 24, column: 49 } }, positionHint: PositionHint.END },
+      { location: { start: { line: 24, column: 12 }, end: { line: 24, column: 51 } }, positionHint: PositionHint.END },
+      { location: { start: { line: 25, column: 31 }, end: { line: 25, column: 32 } } },
+      { location: { start: { line: 25, column: 20 }, end: { line: 25, column: 49 } } },
+      { location: { start: { line: 25, column: 63 }, end: { line: 25, column: 84 } } },
+      { location: { start: { line: 25, column: 53 }, end: { line: 25, column: 101 } } },
+      { location: { start: { line: 25, column: 20 }, end: { line: 25, column: 101 } }, positionHint: PositionHint.END },
+      { location: { start: { line: 25, column: 12 }, end: { line: 25, column: 103 } }, positionHint: PositionHint.END },
+      { location: { start: { line: 26, column: 31 }, end: { line: 26, column: 32 } } },
+      { location: { start: { line: 26, column: 20 }, end: { line: 26, column: 39 } } },
+      { location: { start: { line: 26, column: 43 }, end: { line: 26, column: 54 } } },
+      { location: { start: { line: 26, column: 43 }, end: { line: 26, column: 54 } } },
+      { location: { start: { line: 26, column: 20 }, end: { line: 26, column: 54 } }, positionHint: PositionHint.END },
+      { location: { start: { line: 26, column: 12 }, end: { line: 26, column: 56 } }, positionHint: PositionHint.END },
+      { location: { start: { line: 23, column: 15 }, end: { line: 27, column: 9 } }, positionHint: PositionHint.END },
+      { location: { start: { line: 9, column: 4 }, end: { line: 28, column: 5 } }, positionHint: PositionHint.END },
+      { location: { start: { line: 9, column: 4 }, end: { line: 28, column: 5 } }, positionHint: PositionHint.END },
+      { location: { start: { line: 9, column: 4 }, end: { line: 28, column: 5 } }, positionHint: PositionHint.END },
+      { location: { start: { line: 9, column: 4 }, end: { line: 28, column: 5 } }, positionHint: PositionHint.END },
+      { location: { start: { line: 9, column: 4 }, end: { line: 28, column: 5 } }, positionHint: PositionHint.END },
+      { location: { start: { line: 9, column: 4 }, end: { line: 28, column: 5 } }, positionHint: PositionHint.END },
+      { location: { start: { line: 9, column: 4 }, end: { line: 28, column: 5 } }, positionHint: PositionHint.END },
+      { location: { start: { line: 9, column: 4 }, end: { line: 28, column: 5 } }, positionHint: PositionHint.END },
+      { location: { start: { line: 30, column: 4 }, end: { line: 33, column: 5 } } },
+      { location: { start: { line: 30, column: 4 }, end: { line: 33, column: 5 } } },
+      { location: { start: { line: 30, column: 4 }, end: { line: 33, column: 5 } } },
+      { location: { start: { line: 30, column: 4 }, end: { line: 33, column: 5 } } },
+      { location: { start: { line: 30, column: 4 }, end: { line: 33, column: 5 } } },
+      { location: { start: { line: 31, column: 24 }, end: { line: 31, column: 26 } } },
+      { location: { start: { line: 31, column: 24 }, end: { line: 31, column: 26 } } },
+      { location: { start: { line: 31, column: 16 }, end: { line: 31, column: 27 } }, positionHint: PositionHint.END },
+      { location: { start: { line: 31, column: 31 }, end: { line: 31, column: 37 } } },
+      { location: { start: { line: 31, column: 31 }, end: { line: 31, column: 37 } } },
+      { location: { start: { line: 31, column: 16 }, end: { line: 31, column: 37 } }, positionHint: PositionHint.END },
+      { location: { start: { line: 31, column: 8 }, end: { line: 31, column: 39 } }, positionHint: PositionHint.END },
+      { location: { start: { line: 32, column: 25 }, end: { line: 32, column: 26 } } },
+      { location: { start: { line: 32, column: 25 }, end: { line: 32, column: 26 } } },
+      { location: { start: { line: 32, column: 28 }, end: { line: 32, column: 30 } } },
+      { location: { start: { line: 32, column: 28 }, end: { line: 32, column: 30 } } },
+      { location: { start: { line: 32, column: 16 }, end: { line: 32, column: 31 } }, positionHint: PositionHint.END },
+      { location: { start: { line: 30, column: 4 }, end: { line: 33, column: 5 } }, positionHint: PositionHint.END },
+      { location: { start: { line: 30, column: 4 }, end: { line: 33, column: 5 } }, positionHint: PositionHint.END },
+      { location: { start: { line: 8, column: 0 }, end: { line: 34, column: 1 } }, positionHint: PositionHint.END },
     ],
     sourceMap: '9:4:28:5;;;;;13:27:13:28;:16::45;:49::84;:74::83;;:49::84;;;:16:::1;:8::86;15:23:15:27:0;16:37:16:58;:27::65;17:26:17:38;;:41::47;;:26:::1;:50::58:0;;:26:::1;21:12:21:23:0;;:27::33;;:36::44;;:27:::1;:12;:46:23:9:0;22:31:22:32;:20::39;:43::55;;:58::66;;:43:::1;:20;:12::68;23:15:27:9;24:31:24:32:0;:20::39;:43::49;;:20:::1;:12::51;25:31:25:32:0;:20::49;:63::84;:53::101;:20:::1;:12::103;26:31:26:32:0;:20::39;:43::54;;:20:::1;:12::56;23:15:27:9;9:4:28:5;;;;;;;;30::33::0;;;;;31:24:31:26;;:16::27:1;:31::37:0;;:16:::1;:8::39;32:25:32:26:0;;:28::30;;:16::31:1;30:4:33:5;;8:0:34:1',
   },

From 79b35b755c191245afdaf5195c4a6c2921483c85 Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Tue, 23 Jan 2024 10:35:42 +0100
Subject: [PATCH 067/171] Small changes

---
 .../src/generation/GenerateTargetTraversal.ts | 72 ++++++++++---------
 .../ParseError/expression_in_console_log.cash |  5 ++
 2 files changed, 43 insertions(+), 34 deletions(-)
 create mode 100644 packages/cashc/test/compiler/ParseError/expression_in_console_log.cash

diff --git a/packages/cashc/src/generation/GenerateTargetTraversal.ts b/packages/cashc/src/generation/GenerateTargetTraversal.ts
index 6e1f5fbc..aca43ba5 100644
--- a/packages/cashc/src/generation/GenerateTargetTraversal.ts
+++ b/packages/cashc/src/generation/GenerateTargetTraversal.ts
@@ -108,6 +108,11 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
     return index;
   }
 
+  private getCurrentInstructionPointer(): number {
+    // instruction pointer is the count of emitted opcodes + number of constructor data pushes
+    return this.output.length + this.constructorParameterCount;
+  }
+
   visitSourceFile(node: SourceFileNode): Node {
     node.contract = this.visit(node.contract) as ContractNode;
 
@@ -179,7 +184,7 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
     return node;
   }
 
-  removeFinalVerify(node: Node): void {
+  removeFinalVerify(functionBodyNode: Node): void {
     // After EnsureFinalRequireTraversal, we know that the final opcodes are either
     // "OP_VERIFY", "OP_CHECK{LOCKTIME|SEQUENCE}VERIFY OP_DROP" or "OP_ENDIF"
 
@@ -200,16 +205,16 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
       //  - scoped stack is cleared inside branch ended by OP_ENDIF
       //  - OP_CHECK{LOCKTIME|SEQUENCE}VERIFY OP_DROP does not leave a verification value
       // so we add OP_1 to the script (indicating success)
-      this.emit(Op.OP_1, { location: node.location, positionHint: PositionHint.END });
+      this.emit(Op.OP_1, { location: functionBodyNode.location, positionHint: PositionHint.END });
       this.pushToStack('(value)');
     }
   }
 
-  cleanStack(node: Node): void {
+  cleanStack(functionBodyNode: Node): void {
     // Keep final verification value, OP_NIP the other stack values
     const stackSize = this.stack.length;
     for (let i = 0; i < stackSize - 1; i += 1) {
-      this.emit(Op.OP_NIP, { location: node.location, positionHint: PositionHint.END });
+      this.emit(Op.OP_NIP, { location: functionBodyNode.location, positionHint: PositionHint.END });
       this.nipFromStack();
     }
   }
@@ -273,7 +278,7 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
     // add debug require message
     if (node.message) {
       this.requireMessages.push({
-        ip: this.output.length + this.constructorParameterCount - 1,
+        ip: this.getCurrentInstructionPointer() - 1, // TODO: Why is there a minus 1 here?
         line: node.location.start.line,
         message: node.message,
       });
@@ -291,7 +296,7 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
     // add debug require message
     if (node.message) {
       this.requireMessages.push({
-        ip: this.output.length + this.constructorParameterCount - 1,
+        ip: this.getCurrentInstructionPointer() - 1, // TODO: Why is there a minus 1 here?
         line: node.location.start.line,
         message: node.message,
       });
@@ -301,6 +306,33 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
     return node;
   }
 
+  visitConsoleStatement(node: ConsoleStatementNode): Node {
+    const ip = this.getCurrentInstructionPointer();
+    const { line } = node.location.start;
+
+    // TODO: refactor to use a map instead of array (also in the artifact and other places where console logs and
+    // require statements are used)
+    // check if log entry exists for the instruction pointer, create if not
+    // TODO: Do we really want to merge different console logs at the same instruction pointer?
+    let index = this.consoleLogs.findIndex((entry: LogEntry) => entry.ip === ip);
+    if (index === -1) {
+      index = this.consoleLogs.push({ ip, line, data: [] }) - 1;
+    }
+
+    node.parameters.forEach((parameter: ConsoleParameterNode) => {
+      if (parameter instanceof IdentifierNode) {
+        const symbol = parameter.definition!;
+        const stackIndex = this.getStackIndex(parameter.name);
+        const type = typeof symbol.type === 'string' ? symbol.type : symbol.toString();
+        this.consoleLogs[index].data.push({ stackIndex, type });
+      } else {
+        this.consoleLogs[index].data.push(parameter.toString());
+      }
+    });
+
+    return node;
+  }
+
   visitBranch(node: BranchNode): Node {
     node.condition = this.visit(node.condition);
     this.popFromStack();
@@ -563,32 +595,4 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
     this.pushToStack('(value)');
     return node;
   }
-
-  visitConsoleStatement(node: ConsoleStatementNode): Node {
-    // instruction pointer is the count of emitted opcodes + number of constructor data pushes
-    const ip = this.output.length + this.constructorParameterCount;
-    const { line } = node.location.start;
-
-    // TODO: refactor to use a map instead of array (also in the artifact and other places where console logs and
-    // require statements are used)
-    // check if log entry exists for the instruction pointer, create if not
-    // TODO: Do we really want to merge different console logs at the same instruction pointer?
-    let index = this.consoleLogs.findIndex((entry: LogEntry) => entry.ip === ip);
-    if (index === -1) {
-      index = this.consoleLogs.push({ ip, line, data: [] }) - 1;
-    }
-
-    node.parameters.forEach((parameter: ConsoleParameterNode) => {
-      if (parameter instanceof IdentifierNode) {
-        const symbol = parameter.definition!;
-        const stackIndex = this.getStackIndex(parameter.name);
-        const type = typeof symbol.type === 'string' ? symbol.type : symbol.toString();
-        this.consoleLogs[index].data.push({ stackIndex, type });
-      } else {
-        this.consoleLogs[index].data.push(parameter.toString());
-      }
-    });
-
-    return node;
-  }
 }
diff --git a/packages/cashc/test/compiler/ParseError/expression_in_console_log.cash b/packages/cashc/test/compiler/ParseError/expression_in_console_log.cash
new file mode 100644
index 00000000..162afd14
--- /dev/null
+++ b/packages/cashc/test/compiler/ParseError/expression_in_console_log.cash
@@ -0,0 +1,5 @@
+contract DebugMessages() {
+  function spend(int value) {
+    console.log(value + 2);
+  }
+}

From 5fdb8f427225a32c0c7ecfcdfbd23159cb951a3e Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Thu, 1 Feb 2024 11:15:53 +0100
Subject: [PATCH 068/171] Update cashscript sdk fixtures to include debug data

---
 packages/cashscript/test/fixture/announcement.json | 14 ++++++++++----
 packages/cashscript/test/fixture/bigint.json       | 10 ++++++++--
 .../cashscript/test/fixture/bounded_bytes.json     | 10 ++++++++--
 packages/cashscript/test/fixture/hodl_vault.json   | 10 ++++++++--
 packages/cashscript/test/fixture/mecenas.json      | 14 ++++++++++----
 packages/cashscript/test/fixture/p2palindrome.json | 10 ++++++++--
 packages/cashscript/test/fixture/p2pkh.json        | 10 ++++++++--
 .../cashscript/test/fixture/simple_covenant.json   | 10 ++++++++--
 .../test/fixture/transfer_with_timeout.json        | 10 ++++++++--
 9 files changed, 76 insertions(+), 22 deletions(-)

diff --git a/packages/cashscript/test/fixture/announcement.json b/packages/cashscript/test/fixture/announcement.json
index 22d09e39..5b69e1e1 100644
--- a/packages/cashscript/test/fixture/announcement.json
+++ b/packages/cashscript/test/fixture/announcement.json
@@ -8,10 +8,16 @@
     }
   ],
   "bytecode": "6a 6d02 OP_SIZE OP_SWAP OP_CAT OP_CAT 4120636f6e7472616374206d6179206e6f7420696e6a75726520612068756d616e206265696e67206f722c207468726f75676820696e616374696f6e2c20616c6c6f7720612068756d616e206265696e6720746f20636f6d6520746f206861726d2e OP_SIZE OP_DUP 4b OP_GREATERTHAN OP_IF 4c OP_SWAP OP_CAT OP_ENDIF OP_SWAP OP_CAT OP_CAT OP_0 OP_OUTPUTVALUE OP_0 OP_NUMEQUALVERIFY OP_0 OP_OUTPUTBYTECODE OP_EQUALVERIFY e803 OP_INPUTINDEX OP_UTXOVALUE OP_OVER OP_SUB OP_DUP OP_ROT OP_GREATERTHANOREQUAL OP_IF OP_1 OP_OUTPUTBYTECODE OP_INPUTINDEX OP_UTXOBYTECODE OP_EQUALVERIFY OP_1 OP_OUTPUTVALUE OP_OVER OP_NUMEQUALVERIFY OP_ENDIF OP_DROP OP_1",
-  "source": "pragma cashscript ^0.9.0;\n\n/* This is a contract showcasing covenants outside of regular transactional use.\n * It enforces the contract to make an \"announcement\" on Memo.cash, and send the\n * remainder of contract funds back to the contract.\n */\ncontract Announcement() {\n    function announce() {\n        // Create the memo.cash announcement output\n        bytes announcement = new LockingBytecodeNullData([\n            0x6d02,\n            bytes('A contract may not injure a human being or, through inaction, allow a human being to come to harm.')\n        ]);\n\n        // Check that the first tx output matches the announcement\n        require(tx.outputs[0].value == 0);\n        require(tx.outputs[0].lockingBytecode == announcement);\n\n        // Calculate leftover money after fee (1000 sats)\n        // Check that the second tx output sends the change back if there's enough leftover for another announcement\n        int minerFee = 1000;\n        int changeAmount = tx.inputs[this.activeInputIndex].value - minerFee;\n        if (changeAmount >= minerFee) {\n            require(tx.outputs[1].lockingBytecode == tx.inputs[this.activeInputIndex].lockingBytecode);\n            require(tx.outputs[1].value == changeAmount);\n        }\n    }\n}\n",
+  "source": "pragma cashscript >=0.8.0;\n\n/* This is a contract showcasing covenants outside of regular transactional use.\n * It enforces the contract to make an \"announcement\" on Memo.cash, and send the\n * remainder of contract funds back to the contract.\n */\ncontract Announcement() {\n    function announce() {\n        // Create the memo.cash announcement output\n        bytes announcement = new LockingBytecodeNullData([\n            0x6d02,\n            bytes('A contract may not injure a human being or, through inaction, allow a human being to come to harm.')\n        ]);\n\n        // Check that the first tx output matches the announcement\n        require(tx.outputs[0].value == 0);\n        require(tx.outputs[0].lockingBytecode == announcement);\n\n        // Calculate leftover money after fee (1000 sats)\n        // Check that the second tx output sends the change back if there's enough leftover for another announcement\n        int minerFee = 1000;\n        int changeAmount = tx.inputs[this.activeInputIndex].value - minerFee;\n        if (changeAmount >= minerFee) {\n            require(tx.outputs[1].lockingBytecode == tx.inputs[this.activeInputIndex].lockingBytecode);\n            require(tx.outputs[1].value == changeAmount);\n        }\n    }\n}\n",
+  "debug": {
+    "bytecode": "016a026d02827c7e7e4c624120636f6e7472616374206d6179206e6f7420696e6a75726520612068756d616e206265696e67206f722c207468726f75676820696e616374696f6e2c20616c6c6f7720612068756d616e206265696e6720746f20636f6d6520746f206861726d2e8276014ba063014c7c7e687c7e7e00cc009c6900cd517a876902e803c0c65179940079527aa26351cdc0c7876951cc51799c69685177",
+    "sourceMap": "10:29:13:10;11:12:11:18;;;;;12:18:12:118;:12::119;;;;;;;;;;;;16:27:16:28;:16::35;:39::40;:16:::1;:8::42;17:27:17:28:0;:16::45;:49::61;;:16:::1;:8::63;21:23:21:27:0;22:37:22:58;:27::65;:68::76;;:27:::1;23:12:23:24:0;;:28::36;;:12:::1;:38:26:9:0;24:31:24:32;:20::49;:63::84;:53::101;:20:::1;:12::103;25:31:25:32:0;:20::39;:43::55;;:20:::1;:12::57;23:38:26:9;8:4:27:5;",
+    "logs": [],
+    "requireMessages": []
+  },
   "compiler": {
     "name": "cashc",
-    "version": "0.8.0-next.0"
+    "version": "0.10.0-next.0"
   },
-  "updatedAt": "2023-02-10T15:22:49.703Z"
-}
+  "updatedAt": "2024-02-01T10:15:35.499Z"
+}
\ No newline at end of file
diff --git a/packages/cashscript/test/fixture/bigint.json b/packages/cashscript/test/fixture/bigint.json
index 95219ed0..c0a5b59f 100644
--- a/packages/cashscript/test/fixture/bigint.json
+++ b/packages/cashscript/test/fixture/bigint.json
@@ -18,9 +18,15 @@
   ],
   "bytecode": "0000008000 OP_2DUP OP_GREATERTHANOREQUAL OP_VERIFY OP_SWAP OP_ROT OP_MUL OP_LESSTHANOREQUAL",
   "source": "contract BigInt() {\n    function proofOfBigInt(int x, int y) {\n        int maxInt32PlusOne = 2147483648;\n        require(x >= maxInt32PlusOne);\n        require(x * y >= maxInt32PlusOne);\n    }\n}\n",
+  "debug": {
+    "bytecode": "05000000800051795179a269517a527a95517aa2",
+    "sourceMap": "3:30:3:40;4:16:4:17;;:21::36;;:16:::1;:8::38;5:16:5:17:0;;:20::21;;:16:::1;:25::40:0;;:16:::1",
+    "logs": [],
+    "requireMessages": []
+  },
   "compiler": {
     "name": "cashc",
-    "version": "0.8.0-next.0"
+    "version": "0.10.0-next.0"
   },
-  "updatedAt": "2023-02-10T15:22:49.393Z"
+  "updatedAt": "2024-02-01T10:15:35.191Z"
 }
\ No newline at end of file
diff --git a/packages/cashscript/test/fixture/bounded_bytes.json b/packages/cashscript/test/fixture/bounded_bytes.json
index 009dd698..39aac5b5 100644
--- a/packages/cashscript/test/fixture/bounded_bytes.json
+++ b/packages/cashscript/test/fixture/bounded_bytes.json
@@ -18,9 +18,15 @@
   ],
   "bytecode": "OP_SWAP OP_4 OP_NUM2BIN OP_EQUAL",
   "source": "contract BoundedBytes() {\n    function spend(bytes4 b, int i) {\n        require(b == bytes4(i));\n    }\n}\n",
+  "debug": {
+    "bytecode": "007a517a548087",
+    "sourceMap": "3:16:3:17;;:28::29;;:21::30:1;;:16",
+    "logs": [],
+    "requireMessages": []
+  },
   "compiler": {
     "name": "cashc",
-    "version": "0.8.0-next.0"
+    "version": "0.10.0-next.0"
   },
-  "updatedAt": "2023-02-10T15:22:50.561Z"
+  "updatedAt": "2024-02-01T10:15:36.327Z"
 }
\ No newline at end of file
diff --git a/packages/cashscript/test/fixture/hodl_vault.json b/packages/cashscript/test/fixture/hodl_vault.json
index ba29302d..76302e82 100644
--- a/packages/cashscript/test/fixture/hodl_vault.json
+++ b/packages/cashscript/test/fixture/hodl_vault.json
@@ -39,9 +39,15 @@
   ],
   "bytecode": "OP_6 OP_PICK OP_4 OP_SPLIT OP_SWAP OP_BIN2NUM OP_SWAP OP_BIN2NUM OP_OVER OP_5 OP_ROLL OP_GREATERTHANOREQUAL OP_VERIFY OP_SWAP OP_CHECKLOCKTIMEVERIFY OP_DROP OP_3 OP_ROLL OP_GREATERTHANOREQUAL OP_VERIFY OP_3 OP_ROLL OP_4 OP_ROLL OP_3 OP_ROLL OP_CHECKDATASIGVERIFY OP_CHECKSIG",
   "source": "// This contract forces HODLing until a certain price target has been reached\n// A minimum block is provided to ensure that oracle price entries from before this block are disregarded\n// i.e. when the BCH price was $1000 in the past, an oracle entry with the old block number and price can not be used.\n// Instead, a message with a block number and price from after the minBlock needs to be passed.\n// This contract serves as a simple example for checkDataSig-based contracts.\ncontract HodlVault(\n    pubkey ownerPk,\n    pubkey oraclePk,\n    int minBlock,\n    int priceTarget\n) {\n    function spend(sig ownerSig, datasig oracleSig, bytes8 oracleMessage) {\n        // message: { blockHeight, price }\n        bytes4 blockHeightBin, bytes4 priceBin = oracleMessage.split(4);\n        int blockHeight = int(blockHeightBin);\n        int price = int(priceBin);\n\n        // Check that blockHeight is after minBlock and not in the future\n        require(blockHeight >= minBlock);\n        require(tx.time >= blockHeight);\n\n        // Check that current price is at least priceTarget\n        require(price >= priceTarget);\n\n        // Handle necessary signature checks\n        require(checkDataSig(oracleSig, oracleMessage, oraclePk));\n        require(checkSig(ownerSig, ownerPk));\n    }\n}\n",
+  "debug": {
+    "bytecode": "5679547f517a81517a815179557aa269517ab175007a537aa269537a547a537aba69517a517aac",
+    "sourceMap": "14:49:14:62;;:69::70;:49::71:1;15:30:15:44:0;;:26::45:1;16:24:16:32:0;;:20::33:1;19:16:19:27:0;;:31::39;;:16:::1;:8::41;20:27:20:38:0;;:8::40:1;;23:16:23:21:0;;:25::36;;:16:::1;:8::38;26:29:26::0;;:40::53;;:55::63;;:16::64:1;:8::66;27:25:27:33:0;;:35::42;;:16::43:1",
+    "logs": [],
+    "requireMessages": []
+  },
   "compiler": {
     "name": "cashc",
-    "version": "0.8.0-next.0"
+    "version": "0.10.0-next.0"
   },
-  "updatedAt": "2023-02-10T15:22:49.985Z"
+  "updatedAt": "2024-02-01T10:15:35.784Z"
 }
\ No newline at end of file
diff --git a/packages/cashscript/test/fixture/mecenas.json b/packages/cashscript/test/fixture/mecenas.json
index 0edb39b6..d619a3e9 100644
--- a/packages/cashscript/test/fixture/mecenas.json
+++ b/packages/cashscript/test/fixture/mecenas.json
@@ -34,10 +34,16 @@
     }
   ],
   "bytecode": "OP_3 OP_PICK OP_0 OP_NUMEQUAL OP_IF OP_0 OP_OUTPUTBYTECODE 76a914 OP_ROT OP_CAT 88ac OP_CAT OP_EQUALVERIFY e803 OP_INPUTINDEX OP_UTXOVALUE OP_DUP OP_4 OP_PICK OP_SUB OP_2 OP_PICK OP_SUB OP_DUP OP_5 OP_PICK OP_4 OP_PICK OP_ADD OP_LESSTHANOREQUAL OP_IF OP_0 OP_OUTPUTVALUE OP_2OVER OP_SWAP OP_SUB OP_NUMEQUALVERIFY OP_ELSE OP_0 OP_OUTPUTVALUE OP_5 OP_PICK OP_NUMEQUALVERIFY OP_1 OP_OUTPUTBYTECODE OP_INPUTINDEX OP_UTXOBYTECODE OP_EQUALVERIFY OP_1 OP_OUTPUTVALUE OP_OVER OP_NUMEQUALVERIFY OP_ENDIF OP_2DROP OP_2DROP OP_2DROP OP_1 OP_ELSE OP_3 OP_ROLL OP_1 OP_NUMEQUALVERIFY OP_3 OP_PICK OP_HASH160 OP_ROT OP_EQUALVERIFY OP_2SWAP OP_CHECKSIG OP_NIP OP_NIP OP_ENDIF",
-  "source": "pragma cashscript ^0.9.0;\n\n/* This is an unofficial CashScript port of Licho's Mecenas contract. It is\n * not compatible with Licho's EC plugin, but rather meant as a demonstration\n * of covenants in CashScript.\n * The time checking has been removed so it can be tested without time requirements.\n */\ncontract Mecenas(bytes20 recipient, bytes20 funder, int pledge/*, int period */) {\n    function receive() {\n        // require(tx.age >= period);\n\n        // Check that the first output sends to the recipient\n        require(tx.outputs[0].lockingBytecode == new LockingBytecodeP2PKH(recipient));\n\n        int minerFee = 1000;\n        int currentValue = tx.inputs[this.activeInputIndex].value;\n        int changeValue = currentValue - pledge - minerFee;\n\n        // If there is not enough left for *another* pledge after this one, we send the remainder to the recipient\n        // Otherwise we send the remainder to the recipient and the change back to the contract\n        if (changeValue <= pledge + minerFee) {\n            require(tx.outputs[0].value == currentValue - minerFee);\n        } else {\n            require(tx.outputs[0].value == pledge);\n            require(tx.outputs[1].lockingBytecode == tx.inputs[this.activeInputIndex].lockingBytecode);\n            require(tx.outputs[1].value == changeValue);\n        }\n    }\n\n    function reclaim(pubkey pk, sig s) {\n        require(hash160(pk) == funder);\n        require(checkSig(s, pk));\n    }\n}\n",
+  "source": "pragma cashscript >=0.8.0;\n\n/* This is an unofficial CashScript port of Licho's Mecenas contract. It is\n * not compatible with Licho's EC plugin, but rather meant as a demonstration\n * of covenants in CashScript.\n * The time checking has been removed so it can be tested without time requirements.\n */\ncontract Mecenas(bytes20 recipient, bytes20 funder, int pledge/*, int period */) {\n    function receive() {\n        // require(tx.age >= period);\n\n        // Check that the first output sends to the recipient\n        require(tx.outputs[0].lockingBytecode == new LockingBytecodeP2PKH(recipient));\n\n        int minerFee = 1000;\n        int currentValue = tx.inputs[this.activeInputIndex].value;\n        int changeValue = currentValue - pledge - minerFee;\n\n        // If there is not enough left for *another* pledge after this one, we send the remainder to the recipient\n        // Otherwise we send the remainder to the recipient and the change back to the contract\n        if (changeValue <= pledge + minerFee) {\n            require(tx.outputs[0].value == currentValue - minerFee);\n        } else {\n            require(tx.outputs[0].value == pledge);\n            require(tx.outputs[1].lockingBytecode == tx.inputs[this.activeInputIndex].lockingBytecode);\n            require(tx.outputs[1].value == changeValue);\n        }\n    }\n\n    function reclaim(pubkey pk, sig s) {\n        require(hash160(pk) == funder);\n        require(checkSig(s, pk));\n    }\n}\n",
+  "debug": {
+    "bytecode": "5379009c6300cd0376a914527a7e0288ac7e876902e803c0c6007954799452799400795579547993a16300cc52795479949c696700cc55799c6951cdc0c7876951cc51799c69685177777777777767537a519c695379a9527a8769537a537aac777768",
+    "sourceMap": "9:4:28:5;;;;;13:27:13:28;:16::45;:49::84;:74::83;;:49::84;;;:16:::1;:8::86;15:23:15:27:0;16:37:16:58;:27::65;17:26:17:38;;:41::47;;:26:::1;:50::58:0;;:26:::1;21:12:21:23:0;;:27::33;;:36::44;;:27:::1;:12;:46:23:9:0;22:31:22:32;:20::39;:43::55;;:58::66;;:43:::1;:20;:12::68;23:15:27:9;24:31:24:32:0;:20::39;:43::49;;:20:::1;:12::51;25:31:25:32:0;:20::49;:63::84;:53::101;:20:::1;:12::103;26:31:26:32:0;:20::39;:43::54;;:20:::1;:12::56;23:15:27:9;9:4:28:5;;;;;;;;30::33::0;;;;;31:24:31:26;;:16::27:1;:31::37:0;;:16:::1;:8::39;32:25:32:26:0;;:28::30;;:16::31:1;30:4:33:5;;8:0:34:1",
+    "logs": [],
+    "requireMessages": []
+  },
   "compiler": {
     "name": "cashc",
-    "version": "0.8.0-next.0"
+    "version": "0.10.0-next.0"
   },
-  "updatedAt": "2023-02-10T15:22:51.736Z"
-}
+  "updatedAt": "2024-02-01T10:15:37.487Z"
+}
\ No newline at end of file
diff --git a/packages/cashscript/test/fixture/p2palindrome.json b/packages/cashscript/test/fixture/p2palindrome.json
index 88039c95..fffdbd33 100644
--- a/packages/cashscript/test/fixture/p2palindrome.json
+++ b/packages/cashscript/test/fixture/p2palindrome.json
@@ -14,9 +14,15 @@
   ],
   "bytecode": "OP_DUP OP_REVERSEBYTES OP_EQUAL",
   "source": "contract P2Palindrome() {\n    function spend(string palindrome) {\n        require(palindrome.reverse() == palindrome);\n    }\n}\n",
+  "debug": {
+    "bytecode": "0079bc517a87",
+    "sourceMap": "3:16:3:26;;:::36;:40::50;;:16:::1",
+    "logs": [],
+    "requireMessages": []
+  },
   "compiler": {
     "name": "cashc",
-    "version": "0.8.0-next.0"
+    "version": "0.10.0-next.0"
   },
-  "updatedAt": "2023-02-10T15:22:50.274Z"
+  "updatedAt": "2024-02-01T10:15:36.058Z"
 }
\ No newline at end of file
diff --git a/packages/cashscript/test/fixture/p2pkh.json b/packages/cashscript/test/fixture/p2pkh.json
index c32ab8bc..da74a75d 100644
--- a/packages/cashscript/test/fixture/p2pkh.json
+++ b/packages/cashscript/test/fixture/p2pkh.json
@@ -23,9 +23,15 @@
   ],
   "bytecode": "OP_OVER OP_HASH160 OP_EQUALVERIFY OP_CHECKSIG",
   "source": "contract P2PKH(bytes20 pkh) {\n    // Require pk to match stored pkh and signature to match\n    function spend(pubkey pk, sig s) {\n        require(hash160(pk) == pkh);\n        require(checkSig(s, pk));\n    }\n}\n",
+  "debug": {
+    "bytecode": "5179a9517a8769517a517aac",
+    "sourceMap": "4:24:4:26;;:16::27:1;:31::34:0;;:16:::1;:8::36;5:25:5:26:0;;:28::30;;:16::31:1",
+    "logs": [],
+    "requireMessages": []
+  },
   "compiler": {
     "name": "cashc",
-    "version": "0.8.0-next.0"
+    "version": "0.10.0-next.0"
   },
-  "updatedAt": "2023-02-10T15:22:51.429Z"
+  "updatedAt": "2024-02-01T10:15:37.188Z"
 }
\ No newline at end of file
diff --git a/packages/cashscript/test/fixture/simple_covenant.json b/packages/cashscript/test/fixture/simple_covenant.json
index f903d3c3..f8ee9361 100644
--- a/packages/cashscript/test/fixture/simple_covenant.json
+++ b/packages/cashscript/test/fixture/simple_covenant.json
@@ -9,9 +9,15 @@
   ],
   "bytecode": "OP_TXVERSION OP_2 OP_GREATERTHANOREQUAL OP_VERIFY OP_TXINPUTCOUNT OP_1 OP_GREATERTHANOREQUAL OP_VERIFY OP_TXOUTPUTCOUNT OP_1 OP_GREATERTHANOREQUAL OP_VERIFY OP_ACTIVEBYTECODE OP_SIZE OP_NIP 0802 OP_LESSTHAN OP_VERIFY OP_0 OP_UTXOVALUE 2202 OP_GREATERTHANOREQUAL OP_VERIFY OP_0 OP_OUTPUTVALUE 2202 OP_GREATERTHANOREQUAL",
   "source": "contract Covenant() {\n    function spend() {\n        require(tx.version >= 2);\n        require(tx.inputs.length >= 1);\n        require(tx.outputs.length >= 1);\n        require(this.activeBytecode.length < 520);\n        require(tx.inputs[0].value >= 546);\n        require(tx.outputs[0].value >= 546);\n    }\n}\n",
+  "debug": {
+    "bytecode": "c252a269c351a269c451a269c182770208029f6900c6022202a26900cc022202a2",
+    "sourceMap": "3:16:3:26;:30::31;:16:::1;:8::33;4:16:4:32:0;:36::37;:16:::1;:8::39;5:16:5:33:0;:37::38;:16:::1;:8::40;6:16:6:35:0;:::42;;:45::48;:16:::1;:8::50;7:26:7:27:0;:16::34;:38::41;:16:::1;:8::43;8:27:8:28:0;:16::35;:39::42;:16:::1",
+    "logs": [],
+    "requireMessages": []
+  },
   "compiler": {
     "name": "cashc",
-    "version": "0.8.0-next.0"
+    "version": "0.10.0-next.0"
   },
-  "updatedAt": "2023-02-10T15:22:50.857Z"
+  "updatedAt": "2024-02-01T10:15:36.616Z"
 }
\ No newline at end of file
diff --git a/packages/cashscript/test/fixture/transfer_with_timeout.json b/packages/cashscript/test/fixture/transfer_with_timeout.json
index 5ffb7dc9..88f7dbd3 100644
--- a/packages/cashscript/test/fixture/transfer_with_timeout.json
+++ b/packages/cashscript/test/fixture/transfer_with_timeout.json
@@ -36,9 +36,15 @@
   ],
   "bytecode": "OP_3 OP_PICK OP_0 OP_NUMEQUAL OP_IF OP_4 OP_ROLL OP_ROT OP_CHECKSIG OP_NIP OP_NIP OP_NIP OP_ELSE OP_3 OP_ROLL OP_1 OP_NUMEQUALVERIFY OP_3 OP_ROLL OP_SWAP OP_CHECKSIGVERIFY OP_SWAP OP_CHECKLOCKTIMEVERIFY OP_2DROP OP_1 OP_ENDIF",
   "source": "contract TransferWithTimeout(\n    pubkey sender,\n    pubkey recipient,\n    int timeout\n) {\n    // Require recipient's signature to match\n    function transfer(sig recipientSig) {\n        require(checkSig(recipientSig, recipient));\n    }\n\n    // Require timeout time to be reached and sender's signature to match\n    function timeout(sig senderSig) {\n        require(checkSig(senderSig, sender));\n        require(tx.time >= timeout);\n    }\n}\n",
+  "debug": {
+    "bytecode": "5379009c63547a527aac77777767537a519c69537a517aac69517ab175517768",
+    "sourceMap": "7:4:9:5;;;;;8:25:8:37;;:39::48;;:16::49:1;7:4:9:5;;;;12::15::0;;;;;13:25:13:34;;:36::42;;:16::43:1;:8::45;14:27:14:34:0;;:8::36:1;;12:4:15:5;;1:0:16:1",
+    "logs": [],
+    "requireMessages": []
+  },
   "compiler": {
     "name": "cashc",
-    "version": "0.8.0-next.0"
+    "version": "0.10.0-next.0"
   },
-  "updatedAt": "2023-02-10T15:22:51.144Z"
+  "updatedAt": "2024-02-01T10:15:36.909Z"
 }
\ No newline at end of file

From ad4755b14db576df13f1a9fb50423db591a5c3dd Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Thu, 1 Feb 2024 11:57:41 +0100
Subject: [PATCH 069/171] Update sourcemap generation fixtures

---
 packages/utils/test/bitauth-script.test.ts    |   7 +
 .../test/fixtures/bitauth-script.fixture.ts   | 128 +++++++++---------
 2 files changed, 72 insertions(+), 63 deletions(-)

diff --git a/packages/utils/test/bitauth-script.test.ts b/packages/utils/test/bitauth-script.test.ts
index 4e74961d..b883a916 100644
--- a/packages/utils/test/bitauth-script.test.ts
+++ b/packages/utils/test/bitauth-script.test.ts
@@ -1,12 +1,19 @@
 import { asmToScript } from '../src/script.js';
 import { buildLineToOpcodesMap, buildLineToAsmMap, formatBitAuthScript } from '../src/bitauth-script.js';
 import { fixtures } from './fixtures/bitauth-script.fixture.js';
+import { compileString } from 'cashc';
 
 describe('Libauth Script formatting', () => {
   fixtures.forEach((fixture) => {
     describe(fixture.name, () => {
       const scriptBytecode = asmToScript(fixture.asmBytecode);
 
+      // Note: this also tests the compiler (but the compiler is tested much more thoroughly in its own test suite)
+      it('should generate a correct source map from freshly compiled source code', () => {
+        const artifact = compileString(fixture.sourceCode);
+        expect(artifact.debug?.sourceMap).toEqual(fixture.sourceMap);
+      });
+
       it('should build a line-to-opcodes map', () => {
         expect(buildLineToOpcodesMap(scriptBytecode, fixture.sourceMap)).toEqual(fixture.expectedLineToOpcodeMap);
       });
diff --git a/packages/utils/test/fixtures/bitauth-script.fixture.ts b/packages/utils/test/fixtures/bitauth-script.fixture.ts
index 8bf67016..c8117f04 100644
--- a/packages/utils/test/fixtures/bitauth-script.fixture.ts
+++ b/packages/utils/test/fixtures/bitauth-script.fixture.ts
@@ -34,7 +34,7 @@ contract TransferWithTimeout(bytes20 senderPkh, bytes20 recipientPkh, int timeou
   }
 }`,
     asmBytecode: 'OP_3 OP_PICK OP_0 OP_NUMEQUAL OP_IF OP_5 OP_ROLL OP_5 OP_PICK OP_CHECKSIG OP_VERIFY OP_4 OP_ROLL OP_HASH160 OP_2 OP_ROLL OP_EQUAL OP_NIP OP_NIP OP_NIP OP_ELSE OP_3 OP_ROLL OP_1 OP_NUMEQUAL OP_VERIFY OP_0 OP_PICK deadbeef OP_EQUAL OP_VERIFY OP_2 OP_PICK OP_3 OP_PICK OP_NUMEQUAL OP_VERIFY OP_4 OP_PICK OP_5 OP_PICK OP_EQUAL OP_VERIFY OP_3 OP_PICK OP_4 OP_PICK OP_EQUAL OP_VERIFY OP_4 OP_ROLL OP_4 OP_PICK OP_CHECKSIG OP_VERIFY OP_3 OP_ROLL OP_HASH160 OP_1 OP_ROLL OP_EQUAL OP_VERIFY OP_1 OP_ROLL OP_CHECKLOCKTIMEVERIFY OP_DROP OP_1 OP_NIP OP_ENDIF',
-    sourceMap: '3:2:6:3;;;;;4:21:4:22;;:24::33;;:12::34;:4::36;5:20:5:29;;:12::30;:34::46;;:12;3:2:6:3:1;;;;8::16::0;;;;;9:12:9:21;;:25::35;:12;:4::37;10:12:10:19;;:23::30;;:12;:4::32;11:12:11:13;;:17::18;;:12;:4::20;12:12:12:21;;:25::34;;:12;:4::36;13:21:13:22;;:24::33;;:12::34;:4::36;14:20:14:29;;:12::30;:34::43;;:12;:4::45;15:23:15:30;;:4::32;;8:2:16:3:1;;',
+    sourceMap: '3:2:6:3;;;;;4:21:4:22;;:24::33;;:12::34:1;:4::36;5:20:5:29:0;;:12::30:1;:34::46:0;;:12:::1;3:2:6:3;;;;8::16::0;;;;;9:12:9:21;;:25::35;:12:::1;:4::37;10:12:10:19:0;;:23::30;;:12:::1;:4::32;11:12:11:13:0;;:17::18;;:12:::1;:4::20;12:12:12:21:0;;:25::34;;:12:::1;:4::36;13:21:13:22:0;;:24::33;;:12::34:1;:4::36;14:20:14:29:0;;:12::30:1;:34::43:0;;:12:::1;:4::45;15:23:15:30:0;;:4::32:1;;8:2:16:3;;2:0:17:1',
     expectedLineToOpcodeMap: {
       3: [Op.OP_3, Op.OP_PICK, new Uint8Array([]), Op.OP_NUMEQUAL, Op.OP_IF],
       4: [Op.OP_5, Op.OP_ROLL, Op.OP_5, Op.OP_PICK, Op.OP_CHECKSIG, Op.OP_VERIFY],
@@ -48,7 +48,8 @@ contract TransferWithTimeout(bytes20 senderPkh, bytes20 recipientPkh, int timeou
       13: [Op.OP_4, Op.OP_ROLL, Op.OP_4, Op.OP_PICK, Op.OP_CHECKSIG, Op.OP_VERIFY],
       14: [Op.OP_3, Op.OP_ROLL, Op.OP_HASH160, Op.OP_1, Op.OP_ROLL, Op.OP_EQUAL, Op.OP_VERIFY],
       15: [Op.OP_1, Op.OP_ROLL, Op.OP_CHECKLOCKTIMEVERIFY, Op.OP_DROP],
-      16: [Op.OP_1, Op.OP_NIP, Op.OP_ENDIF],
+      16: [Op.OP_1, Op.OP_NIP],
+      17: [Op.OP_ENDIF],
     },
     expectedLineToAsmMap: {
       3: 'OP_3 OP_PICK OP_0 OP_NUMEQUAL OP_IF',
@@ -63,7 +64,8 @@ contract TransferWithTimeout(bytes20 senderPkh, bytes20 recipientPkh, int timeou
       13: 'OP_4 OP_ROLL OP_4 OP_PICK OP_CHECKSIG OP_VERIFY',
       14: 'OP_3 OP_ROLL OP_HASH160 OP_1 OP_ROLL OP_EQUAL OP_VERIFY',
       15: 'OP_1 OP_ROLL OP_CHECKLOCKTIMEVERIFY OP_DROP',
-      16: 'OP_1 OP_NIP OP_ENDIF',
+      16: 'OP_1 OP_NIP',
+      17: 'OP_ENDIF',
     },
     expectedBitAuthScript: `
                                                         /*                                                                                      */
@@ -81,8 +83,8 @@ OP_3 OP_PICK OP_4 OP_PICK OP_EQUAL OP_VERIFY            /*     require(signingPk
 OP_4 OP_ROLL OP_4 OP_PICK OP_CHECKSIG OP_VERIFY         /*     require(checkSig(s, signingPk));                                                 */
 OP_3 OP_ROLL OP_HASH160 OP_1 OP_ROLL OP_EQUAL OP_VERIFY /*     require(hash160(signingPk) == senderPkh);                                        */
 OP_1 OP_ROLL OP_CHECKLOCKTIMEVERIFY OP_DROP             /*     require(tx.time >= timeout);                                                     */
-OP_1 OP_NIP OP_ENDIF                                    /*   }                                                                                  */
-                                                        /* }                                                                                    */
+OP_1 OP_NIP                                             /*   }                                                                                  */
+OP_ENDIF                                                /* }                                                                                    */
 `.replace(/^\n+/, '').replace(/\n+$/, ''),
   },
   {
@@ -124,44 +126,44 @@ contract Mecenas(bytes20 recipient, bytes20 funder, int pledge/*, int period */)
     }
 }`,
     asmBytecode: 'OP_3 OP_PICK OP_0 OP_NUMEQUAL OP_IF OP_0 OP_OUTPUTBYTECODE 76a914 OP_2 OP_ROLL OP_CAT 88ac OP_CAT OP_EQUAL OP_VERIFY e803 OP_INPUTINDEX OP_UTXOVALUE OP_0 OP_PICK OP_4 OP_PICK OP_SUB OP_2 OP_PICK OP_SUB OP_0 OP_PICK OP_5 OP_PICK OP_4 OP_PICK OP_ADD OP_LESSTHANOREQUAL OP_IF OP_0 OP_OUTPUTVALUE OP_2 OP_PICK OP_4 OP_PICK OP_SUB OP_NUMEQUAL OP_VERIFY OP_ELSE OP_0 OP_OUTPUTVALUE OP_5 OP_PICK OP_NUMEQUAL OP_VERIFY OP_1 OP_OUTPUTBYTECODE OP_INPUTINDEX OP_UTXOBYTECODE OP_EQUAL OP_VERIFY OP_1 OP_OUTPUTVALUE OP_1 OP_PICK OP_NUMEQUAL OP_VERIFY OP_ENDIF OP_1 OP_NIP OP_NIP OP_NIP OP_NIP OP_NIP OP_NIP OP_ELSE OP_3 OP_ROLL OP_1 OP_NUMEQUAL OP_VERIFY OP_3 OP_PICK OP_HASH160 OP_2 OP_ROLL OP_EQUAL OP_VERIFY OP_3 OP_ROLL OP_3 OP_ROLL OP_CHECKSIG OP_NIP OP_NIP OP_ENDIF',
-    sourceMap: '9:4:28:5;;;;;13:27:13:28;:16::45;:49::84;:74::83;;:49::84;;;:16:::1;:8::86;15:23:15:27:0;16:37:16:58;:27::65;17:26:17:38;;:41::47;;:26:::1;:50::58:0;;:26:::1;21:12:21:23:0;;:27::33;;:36::44;;:27:::1;:12;:46:23:9:0;22:31:22:32;:20::39;:43::55;;:58::66;;:43:::1;:20;:12::68;23:15:27:9;24:31:24:32:0;:20::39;:43::49;;:20:::1;:12::51;25:31:25:32:0;:20::49;:63::84;:53::101;:20:::1;:12::103;26:31:26:32:0;:20::39;:43::54;;:20:::1;:12::56;23:15:27:9;9:4:28:5;;;;;;;;30::33::0;;;;;31:24:31:26;;:16::27:1;:31::37:0;;:16:::1;:8::39;32:25:32:26:0;;:28::30;;:16::31:1;30:4:33:5;;8:0:34:1',
+    sourceMap: '10:4:29:5;;;;;14:27:14:28;:16::45;:49::84;:74::83;;:49::84;;;:16:::1;:8::86;16:23:16:27:0;17:37:17:58;:27::65;18:26:18:38;;:41::47;;:26:::1;:50::58:0;;:26:::1;22:12:22:23:0;;:27::33;;:36::44;;:27:::1;:12;:46:24:9:0;23:31:23:32;:20::39;:43::55;;:58::66;;:43:::1;:20;:12::68;24:15:28:9;25:31:25:32:0;:20::39;:43::49;;:20:::1;:12::51;26:31:26:32:0;:20::49;:63::84;:53::101;:20:::1;:12::103;27:31:27:32:0;:20::39;:43::54;;:20:::1;:12::56;24:15:28:9;10:4:29:5;;;;;;;;31::34::0;;;;;32:24:32:26;;:16::27:1;:31::37:0;;:16:::1;:8::39;33:25:33:26:0;;:28::30;;:16::31:1;31:4:34:5;;9:0:35:1',
     expectedLineToOpcodeMap: {
-      9: [Op.OP_3, Op.OP_PICK, new Uint8Array([]), Op.OP_NUMEQUAL, Op.OP_IF],
-      13: [new Uint8Array([]), Op.OP_OUTPUTBYTECODE, hexToBin('76a914'), Op.OP_2, Op.OP_ROLL, Op.OP_CAT, hexToBin('88ac'), Op.OP_CAT, Op.OP_EQUAL, Op.OP_VERIFY],
-      15: [hexToBin('e803')],
-      16: [Op.OP_INPUTINDEX, Op.OP_UTXOVALUE],
-      17: [new Uint8Array([]), Op.OP_PICK, Op.OP_4, Op.OP_PICK, Op.OP_SUB, Op.OP_2, Op.OP_PICK, Op.OP_SUB],
-      21: [new Uint8Array([]), Op.OP_PICK, Op.OP_5, Op.OP_PICK, Op.OP_4, Op.OP_PICK, Op.OP_ADD, Op.OP_LESSTHANOREQUAL, Op.OP_IF],
-      22: [new Uint8Array([]), Op.OP_OUTPUTVALUE, Op.OP_2, Op.OP_PICK, Op.OP_4, Op.OP_PICK, Op.OP_SUB, Op.OP_NUMEQUAL, Op.OP_VERIFY],
-      24: [new Uint8Array([]), Op.OP_OUTPUTVALUE, Op.OP_5, Op.OP_PICK, Op.OP_NUMEQUAL, Op.OP_VERIFY],
-      25: [Op.OP_1, Op.OP_OUTPUTBYTECODE, Op.OP_INPUTINDEX, Op.OP_UTXOBYTECODE, Op.OP_EQUAL, Op.OP_VERIFY],
-      26: [Op.OP_1, Op.OP_OUTPUTVALUE, Op.OP_1, Op.OP_PICK, Op.OP_NUMEQUAL, Op.OP_VERIFY],
-      27: [Op.OP_ELSE, Op.OP_ENDIF],
-      28: [Op.OP_1, Op.OP_NIP, Op.OP_NIP, Op.OP_NIP, Op.OP_NIP, Op.OP_NIP, Op.OP_NIP, Op.OP_ELSE],
-      30: [Op.OP_3, Op.OP_ROLL, Op.OP_1, Op.OP_NUMEQUAL, Op.OP_VERIFY],
-      31: [Op.OP_3, Op.OP_PICK, Op.OP_HASH160, Op.OP_2, Op.OP_ROLL, Op.OP_EQUAL, Op.OP_VERIFY],
-      32: [Op.OP_3, Op.OP_ROLL, Op.OP_3, Op.OP_ROLL, Op.OP_CHECKSIG],
-      33: [Op.OP_NIP, Op.OP_NIP],
-      34: [Op.OP_ENDIF],
+      10: [Op.OP_3, Op.OP_PICK, new Uint8Array([]), Op.OP_NUMEQUAL, Op.OP_IF],
+      14: [new Uint8Array([]), Op.OP_OUTPUTBYTECODE, hexToBin('76a914'), Op.OP_2, Op.OP_ROLL, Op.OP_CAT, hexToBin('88ac'), Op.OP_CAT, Op.OP_EQUAL, Op.OP_VERIFY],
+      16: [hexToBin('e803')],
+      17: [Op.OP_INPUTINDEX, Op.OP_UTXOVALUE],
+      18: [new Uint8Array([]), Op.OP_PICK, Op.OP_4, Op.OP_PICK, Op.OP_SUB, Op.OP_2, Op.OP_PICK, Op.OP_SUB],
+      22: [new Uint8Array([]), Op.OP_PICK, Op.OP_5, Op.OP_PICK, Op.OP_4, Op.OP_PICK, Op.OP_ADD, Op.OP_LESSTHANOREQUAL, Op.OP_IF],
+      23: [new Uint8Array([]), Op.OP_OUTPUTVALUE, Op.OP_2, Op.OP_PICK, Op.OP_4, Op.OP_PICK, Op.OP_SUB, Op.OP_NUMEQUAL, Op.OP_VERIFY],
+      25: [new Uint8Array([]), Op.OP_OUTPUTVALUE, Op.OP_5, Op.OP_PICK, Op.OP_NUMEQUAL, Op.OP_VERIFY],
+      26: [Op.OP_1, Op.OP_OUTPUTBYTECODE, Op.OP_INPUTINDEX, Op.OP_UTXOBYTECODE, Op.OP_EQUAL, Op.OP_VERIFY],
+      27: [Op.OP_1, Op.OP_OUTPUTVALUE, Op.OP_1, Op.OP_PICK, Op.OP_NUMEQUAL, Op.OP_VERIFY],
+      28: [Op.OP_ELSE, Op.OP_ENDIF],
+      29: [Op.OP_1, Op.OP_NIP, Op.OP_NIP, Op.OP_NIP, Op.OP_NIP, Op.OP_NIP, Op.OP_NIP, Op.OP_ELSE],
+      31: [Op.OP_3, Op.OP_ROLL, Op.OP_1, Op.OP_NUMEQUAL, Op.OP_VERIFY],
+      32: [Op.OP_3, Op.OP_PICK, Op.OP_HASH160, Op.OP_2, Op.OP_ROLL, Op.OP_EQUAL, Op.OP_VERIFY],
+      33: [Op.OP_3, Op.OP_ROLL, Op.OP_3, Op.OP_ROLL, Op.OP_CHECKSIG],
+      34: [Op.OP_NIP, Op.OP_NIP],
+      35: [Op.OP_ENDIF],
     },
     expectedLineToAsmMap: {
-      9: 'OP_3 OP_PICK OP_0 OP_NUMEQUAL OP_IF',
-      13: 'OP_0 OP_OUTPUTBYTECODE <0x76a914> OP_2 OP_ROLL OP_CAT <0x88ac> OP_CAT OP_EQUAL OP_VERIFY',
-      15: '<0xe803>',
-      16: 'OP_INPUTINDEX OP_UTXOVALUE',
-      17: 'OP_0 OP_PICK OP_4 OP_PICK OP_SUB OP_2 OP_PICK OP_SUB',
-      21: 'OP_0 OP_PICK OP_5 OP_PICK OP_4 OP_PICK OP_ADD OP_LESSTHANOREQUAL OP_IF',
-      22: 'OP_0 OP_OUTPUTVALUE OP_2 OP_PICK OP_4 OP_PICK OP_SUB OP_NUMEQUAL OP_VERIFY',
-      24: 'OP_0 OP_OUTPUTVALUE OP_5 OP_PICK OP_NUMEQUAL OP_VERIFY',
-      25: 'OP_1 OP_OUTPUTBYTECODE OP_INPUTINDEX OP_UTXOBYTECODE OP_EQUAL OP_VERIFY',
-      26: 'OP_1 OP_OUTPUTVALUE OP_1 OP_PICK OP_NUMEQUAL OP_VERIFY',
-      27: 'OP_ELSE OP_ENDIF',
-      28: 'OP_1 OP_NIP OP_NIP OP_NIP OP_NIP OP_NIP OP_NIP OP_ELSE',
-      30: 'OP_3 OP_ROLL OP_1 OP_NUMEQUAL OP_VERIFY',
-      31: 'OP_3 OP_PICK OP_HASH160 OP_2 OP_ROLL OP_EQUAL OP_VERIFY',
-      32: 'OP_3 OP_ROLL OP_3 OP_ROLL OP_CHECKSIG',
-      33: 'OP_NIP OP_NIP',
-      34: 'OP_ENDIF',
+      10: 'OP_3 OP_PICK OP_0 OP_NUMEQUAL OP_IF',
+      14: 'OP_0 OP_OUTPUTBYTECODE <0x76a914> OP_2 OP_ROLL OP_CAT <0x88ac> OP_CAT OP_EQUAL OP_VERIFY',
+      16: '<0xe803>',
+      17: 'OP_INPUTINDEX OP_UTXOVALUE',
+      18: 'OP_0 OP_PICK OP_4 OP_PICK OP_SUB OP_2 OP_PICK OP_SUB',
+      22: 'OP_0 OP_PICK OP_5 OP_PICK OP_4 OP_PICK OP_ADD OP_LESSTHANOREQUAL OP_IF',
+      23: 'OP_0 OP_OUTPUTVALUE OP_2 OP_PICK OP_4 OP_PICK OP_SUB OP_NUMEQUAL OP_VERIFY',
+      25: 'OP_0 OP_OUTPUTVALUE OP_5 OP_PICK OP_NUMEQUAL OP_VERIFY',
+      26: 'OP_1 OP_OUTPUTBYTECODE OP_INPUTINDEX OP_UTXOBYTECODE OP_EQUAL OP_VERIFY',
+      27: 'OP_1 OP_OUTPUTVALUE OP_1 OP_PICK OP_NUMEQUAL OP_VERIFY',
+      28: 'OP_ELSE OP_ENDIF',
+      29: 'OP_1 OP_NIP OP_NIP OP_NIP OP_NIP OP_NIP OP_NIP OP_ELSE',
+      31: 'OP_3 OP_ROLL OP_1 OP_NUMEQUAL OP_VERIFY',
+      32: 'OP_3 OP_PICK OP_HASH160 OP_2 OP_ROLL OP_EQUAL OP_VERIFY',
+      33: 'OP_3 OP_ROLL OP_3 OP_ROLL OP_CHECKSIG',
+      34: 'OP_NIP OP_NIP',
+      35: 'OP_ENDIF',
     },
     expectedBitAuthScript: `
                                                                                          /*                                                                                                                    */
@@ -172,33 +174,33 @@ contract Mecenas(bytes20 recipient, bytes20 funder, int pledge/*, int period */)
                                                                                          /*  * of covenants in CashScript.                                                                                     */
                                                                                          /*  * The time checking has been removed so it can be tested without time requirements.                               */
                                                                                          /*  */                                                                                                                */
-OP_3 OP_PICK OP_0 OP_NUMEQUAL OP_IF                                                      /* contract Mecenas(bytes20 recipient, bytes20 funder, int pledge/*, int period */) {                                 */
-                                                                                         /*     function receive() {                                                                                           */
+                                                                                         /* contract Mecenas(bytes20 recipient, bytes20 funder, int pledge/*, int period */) {                                 */
+OP_3 OP_PICK OP_0 OP_NUMEQUAL OP_IF                                                      /*     function receive() {                                                                                           */
                                                                                          /*         // require(tx.age >= period);                                                                              */
                                                                                          /*                                                                                                                    */
-OP_0 OP_OUTPUTBYTECODE <0x76a914> OP_2 OP_ROLL OP_CAT <0x88ac> OP_CAT OP_EQUAL OP_VERIFY /*         // Check that the first output sends to the recipient                                                      */
-                                                                                         /*         require(tx.outputs[0].lockingBytecode == new LockingBytecodeP2PKH(recipient));                             */
-<0xe803>                                                                                 /*                                                                                                                    */
-OP_INPUTINDEX OP_UTXOVALUE                                                               /*         int minerFee = 1000;                                                                                       */
-OP_0 OP_PICK OP_4 OP_PICK OP_SUB OP_2 OP_PICK OP_SUB                                     /*         int currentValue = tx.inputs[this.activeInputIndex].value;                                                 */
-                                                                                         /*         int changeValue = currentValue - pledge - minerFee;                                                        */
+                                                                                         /*         // Check that the first output sends to the recipient                                                      */
+OP_0 OP_OUTPUTBYTECODE <0x76a914> OP_2 OP_ROLL OP_CAT <0x88ac> OP_CAT OP_EQUAL OP_VERIFY /*         require(tx.outputs[0].lockingBytecode == new LockingBytecodeP2PKH(recipient));                             */
+                                                                                         /*                                                                                                                    */
+<0xe803>                                                                                 /*         int minerFee = 1000;                                                                                       */
+OP_INPUTINDEX OP_UTXOVALUE                                                               /*         int currentValue = tx.inputs[this.activeInputIndex].value;                                                 */
+OP_0 OP_PICK OP_4 OP_PICK OP_SUB OP_2 OP_PICK OP_SUB                                     /*         int changeValue = currentValue - pledge - minerFee;                                                        */
                                                                                          /*                                                                                                                    */
                                                                                          /*         // If there is not enough left for *another* pledge after this one, we send the remainder to the recipient */
-OP_0 OP_PICK OP_5 OP_PICK OP_4 OP_PICK OP_ADD OP_LESSTHANOREQUAL OP_IF                   /*         // Otherwise we send the remainder to the recipient and the change back to the contract                    */
-OP_0 OP_OUTPUTVALUE OP_2 OP_PICK OP_4 OP_PICK OP_SUB OP_NUMEQUAL OP_VERIFY               /*         if (changeValue <= pledge + minerFee) {                                                                    */
-                                                                                         /*             require(tx.outputs[0].value == currentValue - minerFee);                                               */
-OP_0 OP_OUTPUTVALUE OP_5 OP_PICK OP_NUMEQUAL OP_VERIFY                                   /*         } else {                                                                                                   */
-OP_1 OP_OUTPUTBYTECODE OP_INPUTINDEX OP_UTXOBYTECODE OP_EQUAL OP_VERIFY                  /*             require(tx.outputs[0].value == pledge);                                                                */
-OP_1 OP_OUTPUTVALUE OP_1 OP_PICK OP_NUMEQUAL OP_VERIFY                                   /*             require(tx.outputs[1].lockingBytecode == tx.inputs[this.activeInputIndex].lockingBytecode);            */
-OP_ELSE OP_ENDIF                                                                         /*             require(tx.outputs[1].value == changeValue);                                                           */
-OP_1 OP_NIP OP_NIP OP_NIP OP_NIP OP_NIP OP_NIP OP_ELSE                                   /*         }                                                                                                          */
-                                                                                         /*     }                                                                                                              */
-OP_3 OP_ROLL OP_1 OP_NUMEQUAL OP_VERIFY                                                  /*                                                                                                                    */
-OP_3 OP_PICK OP_HASH160 OP_2 OP_ROLL OP_EQUAL OP_VERIFY                                  /*     function reclaim(pubkey pk, sig s) {                                                                           */
-OP_3 OP_ROLL OP_3 OP_ROLL OP_CHECKSIG                                                    /*         require(hash160(pk) == funder);                                                                            */
-OP_NIP OP_NIP                                                                            /*         require(checkSig(s, pk));                                                                                  */
-OP_ENDIF                                                                                 /*     }                                                                                                              */
-                                                                                         /* }                                                                                                                  */
+                                                                                         /*         // Otherwise we send the remainder to the recipient and the change back to the contract                    */
+OP_0 OP_PICK OP_5 OP_PICK OP_4 OP_PICK OP_ADD OP_LESSTHANOREQUAL OP_IF                   /*         if (changeValue <= pledge + minerFee) {                                                                    */
+OP_0 OP_OUTPUTVALUE OP_2 OP_PICK OP_4 OP_PICK OP_SUB OP_NUMEQUAL OP_VERIFY               /*             require(tx.outputs[0].value == currentValue - minerFee);                                               */
+                                                                                         /*         } else {                                                                                                   */
+OP_0 OP_OUTPUTVALUE OP_5 OP_PICK OP_NUMEQUAL OP_VERIFY                                   /*             require(tx.outputs[0].value == pledge);                                                                */
+OP_1 OP_OUTPUTBYTECODE OP_INPUTINDEX OP_UTXOBYTECODE OP_EQUAL OP_VERIFY                  /*             require(tx.outputs[1].lockingBytecode == tx.inputs[this.activeInputIndex].lockingBytecode);            */
+OP_1 OP_OUTPUTVALUE OP_1 OP_PICK OP_NUMEQUAL OP_VERIFY                                   /*             require(tx.outputs[1].value == changeValue);                                                           */
+OP_ELSE OP_ENDIF                                                                         /*         }                                                                                                          */
+OP_1 OP_NIP OP_NIP OP_NIP OP_NIP OP_NIP OP_NIP OP_ELSE                                   /*     }                                                                                                              */
+                                                                                         /*                                                                                                                    */
+OP_3 OP_ROLL OP_1 OP_NUMEQUAL OP_VERIFY                                                  /*     function reclaim(pubkey pk, sig s) {                                                                           */
+OP_3 OP_PICK OP_HASH160 OP_2 OP_ROLL OP_EQUAL OP_VERIFY                                  /*         require(hash160(pk) == funder);                                                                            */
+OP_3 OP_ROLL OP_3 OP_ROLL OP_CHECKSIG                                                    /*         require(checkSig(s, pk));                                                                                  */
+OP_NIP OP_NIP                                                                            /*     }                                                                                                              */
+OP_ENDIF                                                                                 /* }                                                                                                                  */
 `.replace(/^\n+/, '').replace(/\n+$/, ''),
   },
 ];

From 57b4e11521b334fa103edf5e180f99fedf373c7d Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Fri, 23 Feb 2024 07:39:21 -1000
Subject: [PATCH 070/171] Update LibauthTemplate console.log tests

---
 .../cashscript/src/test/JestExtensions.ts     |   2 +
 .../cashscript/test/LibauthTemplate.test.ts   | 160 +++++++++++++-----
 2 files changed, 117 insertions(+), 45 deletions(-)

diff --git a/packages/cashscript/src/test/JestExtensions.ts b/packages/cashscript/src/test/JestExtensions.ts
index 7d4de86a..dfe50050 100644
--- a/packages/cashscript/src/test/JestExtensions.ts
+++ b/packages/cashscript/src/test/JestExtensions.ts
@@ -45,6 +45,8 @@ Received: ${printReceived(received)}`;
       message = error as any;
     }
 
+    // TODO: If no console.log was called, then spyOnLoggerError.mock.calls[0] is undefined.
+    // We should handle that case properly.
     const received = spyOnLoggerError.mock.calls[0][0];
     spyOnLoggerError.mockClear();
 
diff --git a/packages/cashscript/test/LibauthTemplate.test.ts b/packages/cashscript/test/LibauthTemplate.test.ts
index 20d57139..581a33dc 100644
--- a/packages/cashscript/test/LibauthTemplate.test.ts
+++ b/packages/cashscript/test/LibauthTemplate.test.ts
@@ -5,71 +5,141 @@ import {
 } from './fixture/vars.js';
 import '../src/test/JestExtensions.js';
 import { randomUtxo } from '../src/utils.js';
+import { binToHex } from '@bitauth/libauth';
 
 describe('Libauth template generation tests', () => {
-  it('should log console statements', async () => {
-    const code = `
-    pragma cashscript ^0.10.0;
+  describe('console.log statements', () => {
+    const BASE_CONTRACT_CODE = `
+      contract Test(pubkey owner) {
+        function transfer(sig ownerSig, int num) {
+          require(checkSig(ownerSig, owner));
 
-    contract TransferWithTimeout(
-        pubkey sender,
-        pubkey recipient,
-        int timeout
-    ) {
-        // Require recipient's signature to match
-        function transfer(sig recipientSig) {
-            bytes2 beef = 0xbeef;
-            console.log(recipientSig, timeout, recipient, sender, beef, 1, "test", true);
-            require(beef != 0xfeed);
-            require(checkSig(recipientSig, recipient));
-        }
+          bytes2 beef = 0xbeef;
+          require(beef != 0xfeed);
 
-        // Require timeout time to be reached and sender's signature to match
-        function timeout(sig senderSig) {
-            require(checkSig(senderSig, sender));
-            require(tx.time >= timeout);
+          console.log(ownerSig, owner, num, beef, 1, "test", true);
+
+          require(num == 1000);
         }
-    }
+      }
     `;
-    const artifact = compileString(code);
 
+    const artifact = compileString(BASE_CONTRACT_CODE);
     const provider = new MockNetworkProvider();
 
-    {
-      const contract = new Contract(artifact, [alicePub, bobPub, 100000n], { provider });
+    it('should log correct values', async () => {
+      const contract = new Contract(artifact, [alicePub], { provider });
       provider.addUtxo(contract.address, randomUtxo());
 
-      const transaction = contract.functions.transfer(new SignatureTemplate(bobPriv)).to(contract.address, 10000n);
+      const transaction = contract.functions
+        .transfer(new SignatureTemplate(alicePriv), 1000n)
+        .to(contract.address, 10000n);
 
-      await (expect(transaction)).toLog(/0x[0-9a-f]{130} 100000 0x[0-9a-f]{66} 0x[0-9a-f]{66} 0xbeef 1 test true/);
-      await (expect(transaction)).toLog('beef');
-    }
+      // console.log(ownerSig, owner, num, beef, 1, "test", true);
+      const expectedLog = new RegExp(`^Test.cash:9 0x[0-9a-f]{130} 0x${binToHex(alicePub)} 1000 0xbeef 1 test true$`);
+      await expect(transaction).toLog(expectedLog);
+    });
 
-    const ip = artifact.debug!.logs[0].ip;
-    {
-      artifact.debug!.logs[0].ip = 100;
-      const contract = new Contract(artifact, [alicePub, bobPub, 100000n], { provider });
+    it('should log when logging happens before a failing require statement', async () => {
+      const contract = new Contract(artifact, [alicePub], { provider });
       provider.addUtxo(contract.address, randomUtxo());
 
-      const transaction = contract.functions.transfer(new SignatureTemplate(bobPriv)).to(contract.address, 10000n);
+      const incorrectNum = 100n;
+      const transaction = contract.functions
+        .transfer(new SignatureTemplate(alicePriv), incorrectNum)
+        .to(contract.address, 10000n);
 
-      await (expect(transaction.debug())).rejects.toThrow(
-        /Instruction pointer 100 points to a non-existing state of the program/,
-      );
-    }
+      // console.log(ownerSig, owner, num, beef, 1, "test", true);
+      const expectedLog = new RegExp(`^Test.cash:9 0x[0-9a-f]{130} 0x${binToHex(alicePub)} 100 0xbeef 1 test true$`);
+      await expect(transaction).toLog(expectedLog);
+    });
 
-    artifact.debug!.logs[0].ip = ip;
-    {
-      (artifact.debug!.logs[0].data[0] as any).stackIndex = 100;
-      const contract = new Contract(artifact, [alicePub, bobPub, 100000n], { provider });
+    it('should not log when logging happens after a failing require statement', async () => {
+      const contract = new Contract(artifact, [alicePub], { provider });
       provider.addUtxo(contract.address, randomUtxo());
 
-      const transaction = contract.functions.transfer(new SignatureTemplate(bobPriv)).to(contract.address, 10000n);
+      const incorrectPriv = bobPriv;
+      const transaction = contract.functions
+        .transfer(new SignatureTemplate(incorrectPriv), 1000n)
+        .to(contract.address, 10000n);
+
+      // TODO: This is a super ugly test, we should fix this by improving the JestExtensions
+      try {
+        const expectedLog = new RegExp(`^Test.cash:9 0x[0-9a-f]{130} 0x${binToHex(alicePub)} 1000 0xbeef 1 test true$`);
+        await expect(transaction).toLog(expectedLog);
+        throw new Error('Expected to fail');
+      } catch (e) {
+        if ((e as any)?.message === 'Expected to fail') throw e;
+      }
+    });
+
+    it('should log multiple consecutive console.log statements on a single line', async () => {
+      const contractCode = `
+        contract Test(pubkey owner) {
+          function transfer(sig ownerSig, int num) {
+            require(checkSig(ownerSig, owner));
 
-      await (expect(transaction.debug())).rejects.toThrow(
-        /Stack item at index 100 not found at instruction pointer 9/,
-      );
-    }
+            bytes2 beef = 0xbeef;
+            require(beef != 0xfeed);
+
+            console.log(ownerSig, owner, num);
+            console.log(beef, 1, "test", true);
+
+            require(num == 1000);
+          }
+        }
+      `;
+
+      const artifact2 = compileString(contractCode);
+
+      const contract = new Contract(artifact2, [alicePub], { provider });
+      provider.addUtxo(contract.address, randomUtxo());
+
+      const incorrectNum = 100n;
+      const transaction = contract.functions
+        .transfer(new SignatureTemplate(alicePriv), incorrectNum)
+        .to(contract.address, 10000n);
+
+      // console.log(ownerSig, owner, num, beef, 1, "test", true);
+      const expectedLog = new RegExp(`^Test.cash:9 0x[0-9a-f]{130} 0x${binToHex(alicePub)} 100 0xbeef 1 test true$`);
+      await expect(transaction).toLog(expectedLog);
+    });
+
+    it('should log multiple console.log statements with other statements in between', async () => {
+      const contractCode = `
+        contract Test(pubkey owner) {
+          function transfer(sig ownerSig, int num) {
+            require(checkSig(ownerSig, owner));
+
+            console.log(ownerSig, owner, num);
+
+            bytes2 beef = 0xbeef;
+            require(beef != 0xfeed);
+
+            console.log(beef, 1, "test", true);
+
+            require(num == 1000);
+          }
+        }
+      `;
+
+      const artifact2 = compileString(contractCode);
+
+      const contract = new Contract(artifact2, [alicePub], { provider });
+      provider.addUtxo(contract.address, randomUtxo());
+
+      const incorrectNum = 100n;
+      const transaction = contract.functions
+        .transfer(new SignatureTemplate(alicePriv), incorrectNum)
+        .to(contract.address, 10000n);
+
+      // console.log(ownerSig, owner, num);
+      const expectedFirstLog = new RegExp(`^Test.cash:6 0x[0-9a-f]{130} 0x${binToHex(alicePub)} 100$`);
+      await expect(transaction).toLog(expectedFirstLog);
+
+      const expectedSecondLog = new RegExp('^Test.cash:11 0xbeef 1 test true$');
+      await expect(transaction).toLog(expectedSecondLog);
+    });
   });
 
   it('should check for failed requires', async () => {

From fc3f74da943e5fb9b578a384ff0c1d7e82463545 Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Fri, 23 Feb 2024 07:40:39 -1000
Subject: [PATCH 071/171] Add Transaction#getLibauthTemplate function to export
 libauth template

---
 packages/cashscript/src/Transaction.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/cashscript/src/Transaction.ts b/packages/cashscript/src/Transaction.ts
index 8f4658d3..16b8cd69 100644
--- a/packages/cashscript/src/Transaction.ts
+++ b/packages/cashscript/src/Transaction.ts
@@ -216,19 +216,19 @@ export class Transaction {
 
   // method to debug the transaction with libauth VM, throws upon evaluation error
   async debug(): Promise<DebugResult> {
-    const template = await buildTemplate({
-      transaction: this,
-    });
+    const template = await this.getLibauthTemplate();
     return debugTemplate(template, this.contract.artifact);
   }
 
   async bitauthUri(): Promise<string> {
-    const template = await buildTemplate({
-      transaction: this,
-    });
+    const template = await this.getLibauthTemplate();
     return getBitauthUri(template);
   }
 
+  async getLibauthTemplate(): Promise<WalletTemplate> {
+    return buildTemplate({ transaction: this });
+  }
+
   private async getTxDetails(txid: string): Promise<TransactionDetails>;
   private async getTxDetails(txid: string, raw: true): Promise<string>;
 

From e471ceb2d786c4772d7409597652c95392f4c45e Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Fri, 23 Feb 2024 07:50:01 -1000
Subject: [PATCH 072/171] Escape multiline-style comments in debug bitauth
 (sourcemapped) script

---
 packages/utils/src/bitauth-script.ts                   | 3 ++-
 packages/utils/test/fixtures/bitauth-script.fixture.ts | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/packages/utils/src/bitauth-script.ts b/packages/utils/src/bitauth-script.ts
index 21a7f4c5..bb8b7e39 100644
--- a/packages/utils/src/bitauth-script.ts
+++ b/packages/utils/src/bitauth-script.ts
@@ -30,7 +30,8 @@ export function buildLineToAsmMap(bytecode: Script, sourceMap: string): LineToAs
 export function formatBitAuthScript(bytecode: Script, sourceMap: string, sourceCode: string): string {
   const lineToAsmMap = buildLineToAsmMap(bytecode, sourceMap);
 
-  const sourceCodeLines = sourceCode.split('\n');
+  const escapedSourceCode = sourceCode.replaceAll('/*', '\\/*').replaceAll('*/', '*\\/');
+  const sourceCodeLines = escapedSourceCode.split('\n');
 
   const sourceCodeLineLengths = sourceCodeLines.map((line) => line.length);
   const bytecodeLineLengths = Object.values(lineToAsmMap).map((line) => line.length);
diff --git a/packages/utils/test/fixtures/bitauth-script.fixture.ts b/packages/utils/test/fixtures/bitauth-script.fixture.ts
index c8117f04..07c60582 100644
--- a/packages/utils/test/fixtures/bitauth-script.fixture.ts
+++ b/packages/utils/test/fixtures/bitauth-script.fixture.ts
@@ -169,12 +169,12 @@ contract Mecenas(bytes20 recipient, bytes20 funder, int pledge/*, int period */)
                                                                                          /*                                                                                                                    */
                                                                                          /* pragma cashscript >=0.8.0;                                                                                         */
                                                                                          /*                                                                                                                    */
-                                                                                         /* /* This is an unofficial CashScript port of Licho's Mecenas contract. It is                                        */
+                                                                                         /* \\/* This is an unofficial CashScript port of Licho's Mecenas contract. It is                                       */
                                                                                          /*  * not compatible with Licho's EC plugin, but rather meant as a demonstration                                      */
                                                                                          /*  * of covenants in CashScript.                                                                                     */
                                                                                          /*  * The time checking has been removed so it can be tested without time requirements.                               */
-                                                                                         /*  */                                                                                                                */
-                                                                                         /* contract Mecenas(bytes20 recipient, bytes20 funder, int pledge/*, int period */) {                                 */
+                                                                                         /*  *\\/                                                                                                               */
+                                                                                         /* contract Mecenas(bytes20 recipient, bytes20 funder, int pledge\\/*, int period *\\/) {                               */
 OP_3 OP_PICK OP_0 OP_NUMEQUAL OP_IF                                                      /*     function receive() {                                                                                           */
                                                                                          /*         // require(tx.age >= period);                                                                              */
                                                                                          /*                                                                                                                    */

From a71004dd7495051b56b1687779a75d4f3eb6e595 Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Fri, 1 Mar 2024 06:42:27 -1000
Subject: [PATCH 073/171] Restructure require statement tests

---
 ...authTemplate.test.ts => debugging.test.ts} | 41 ++++++++-----------
 1 file changed, 16 insertions(+), 25 deletions(-)
 rename packages/cashscript/test/{LibauthTemplate.test.ts => debugging.test.ts} (91%)

diff --git a/packages/cashscript/test/LibauthTemplate.test.ts b/packages/cashscript/test/debugging.test.ts
similarity index 91%
rename from packages/cashscript/test/LibauthTemplate.test.ts
rename to packages/cashscript/test/debugging.test.ts
index 581a33dc..81b258b4 100644
--- a/packages/cashscript/test/LibauthTemplate.test.ts
+++ b/packages/cashscript/test/debugging.test.ts
@@ -7,7 +7,7 @@ import '../src/test/JestExtensions.js';
 import { randomUtxo } from '../src/utils.js';
 import { binToHex } from '@bitauth/libauth';
 
-describe('Libauth template generation tests', () => {
+describe('Debugging tests', () => {
   describe('console.log statements', () => {
     const BASE_CONTRACT_CODE = `
       contract Test(pubkey owner) {
@@ -142,10 +142,8 @@ describe('Libauth template generation tests', () => {
     });
   });
 
-  it('should check for failed requires', async () => {
+  describe('require statements', () => {
     const code = `
-    pragma cashscript ^0.10.0;
-
     contract TransferWithTimeout(
         pubkey sender,
         pubkey recipient,
@@ -159,12 +157,7 @@ describe('Libauth template generation tests', () => {
         // Require timeout time to be reached and sender's signature to match
         function timeout(sig senderSig) {
             require(checkSig(senderSig, sender), "sigcheck custom fail");
-            require(tx.time >= timeout);
-        }
-
-        function timeout2(sig senderSig) {
             require(tx.time >= timeout, "timecheck custom fail");
-            require(checkSig(senderSig, sender));
         }
 
         function test(int a) {
@@ -174,40 +167,38 @@ describe('Libauth template generation tests', () => {
     `;
 
     const artifact = compileString(code);
-
     const provider = new MockNetworkProvider();
-    {
+
+    it('should fail with correct error message when there are multiple require statements', async () => {
       const contract = new Contract(artifact, [alicePub, bobPub, 2000000n], { provider });
       provider.addUtxo(contract.address, randomUtxo());
 
       const transaction = contract.functions.timeout(new SignatureTemplate(bobPriv)).to(contract.address, 1000n);
       await expect(transaction).toFailRequireWith(/sigcheck custom fail/);
-    }
+    });
 
-    {
+    it('should fail with correct error message for timecheck require statemen when there are multiple require statements', async () => {
       const contract = new Contract(artifact, [alicePub, bobPub, 1000000n], { provider });
       provider.addUtxo(contract.address, randomUtxo());
 
-      const transaction = contract.functions.timeout2(new SignatureTemplate(alicePriv)).to(contract.address, 1000n);
+      const transaction = contract.functions.timeout(new SignatureTemplate(alicePriv)).to(contract.address, 1000n);
       await expect(transaction).toFailRequireWith(/timecheck custom fail/);
-    }
+    });
 
-    {
+    it('should fail with correct error message for the final require statement', async () => {
       const contract = new Contract(artifact, [alicePub, bobPub, 2000000n], { provider });
       provider.addUtxo(contract.address, randomUtxo());
 
-      const transaction = contract.functions.transfer(new SignatureTemplate(bobPriv)).to(contract.address, 1000n);
-      await expect(transaction).not.toFailRequireWith(/timecheck custom fail/);
-    }
+      const transaction = contract.functions.test(0n).to(contract.address, 1000n);
+      await expect(transaction).toFailRequireWith(/dropped last verify fail/);
+    });
 
-    {
+    it('should not fail if no require statements fail', async () => {
       const contract = new Contract(artifact, [alicePub, bobPub, 2000000n], { provider });
       provider.addUtxo(contract.address, randomUtxo());
 
-      const transaction = contract.functions.test(0n).to(contract.address, 1000n);
-      await expect(transaction).toFailRequireWith(/dropped last verify fail/);
-
-      await expect(transaction.send()).rejects.toThrow(/Stack contents after evaluation: 0x/);
-    }
+      const transaction = contract.functions.transfer(new SignatureTemplate(bobPriv)).to(contract.address, 1000n);
+      await expect(transaction).not.toFailRequireWith(/.*/);
+    });
   });
 });

From 6163af41320b8f18ccade5d6d84a37506fc44661 Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Fri, 1 Mar 2024 07:51:32 -1000
Subject: [PATCH 074/171] Add Libauth Template generation tests and fix some
 issues with the generation

---
 packages/cashscript/src/LibauthTemplate.ts    |   9 +-
 .../src/network/MockNetworkProvider.ts        |   2 +-
 .../test/fixture/libauth-template/fixtures.ts | 692 ++++++++++++++++++
 .../libauth-template/LibauthTemplate.test.ts  |  10 +
 4 files changed, 711 insertions(+), 2 deletions(-)
 create mode 100644 packages/cashscript/test/fixture/libauth-template/fixtures.ts
 create mode 100644 packages/cashscript/test/libauth-template/LibauthTemplate.test.ts

diff --git a/packages/cashscript/src/LibauthTemplate.ts b/packages/cashscript/src/LibauthTemplate.ts
index 57bf0d3f..7beb0860 100644
--- a/packages/cashscript/src/LibauthTemplate.ts
+++ b/packages/cashscript/src/LibauthTemplate.ts
@@ -164,7 +164,14 @@ const createScenarioTransaction = (libauthTransaction: TransactionBCH, csTransac
           lockingBytecode instanceof Uint8Array
             ? binToHex(lockingBytecode)
             : lockingBytecode,
-        token: output.token,
+        token: output.token ? {
+          amount: output.token.amount.toString(),
+          category: binToHex(output.token.category),
+          nft: output.token.nft ? {
+            capability: output.token.nft.capability,
+            commitment: binToHex(output.token.nft.commitment),
+          } : undefined,
+        } : undefined,
         valueSatoshis: Number(output.valueSatoshis),
       } as WalletTemplateScenarioTransactionOutput;
     },
diff --git a/packages/cashscript/src/network/MockNetworkProvider.ts b/packages/cashscript/src/network/MockNetworkProvider.ts
index ed260b2d..83c6eec8 100644
--- a/packages/cashscript/src/network/MockNetworkProvider.ts
+++ b/packages/cashscript/src/network/MockNetworkProvider.ts
@@ -23,7 +23,7 @@ export default class MockNetworkProvider implements NetworkProvider {
   }
 
   async getUtxos(address: string): Promise<Utxo[]> {
-    return this.utxoMap[address];
+    return this.utxoMap[address] ?? [];
   }
 
   async getBlockHeight(): Promise<number> {
diff --git a/packages/cashscript/test/fixture/libauth-template/fixtures.ts b/packages/cashscript/test/fixture/libauth-template/fixtures.ts
new file mode 100644
index 00000000..a8c1aa8c
--- /dev/null
+++ b/packages/cashscript/test/fixture/libauth-template/fixtures.ts
@@ -0,0 +1,692 @@
+import { Contract, MockNetworkProvider, SignatureTemplate, Transaction, randomNFT, randomToken, randomUtxo } from '../../../src/index.js';
+import TransferWithTimeout from '../transfer_with_timeout.json' assert { type: 'json' };
+import Mecenas from '../mecenas.json' assert { type: 'json' };
+import P2PKH from '../p2pkh.json' assert { type: 'json' };
+import { aliceAddress, alicePkh, alicePriv, alicePub, bobPkh, bobPriv, bobPub } from '../vars.js';
+import { WalletTemplate } from '@bitauth/libauth';
+
+const provider = new MockNetworkProvider();
+
+export interface Fixture {
+  name: string;
+  transaction: Transaction;
+  template: WalletTemplate;
+}
+
+export const fixtures: Fixture[] = [
+  {
+    name: 'TransferWithTimeout (transfer function)',
+    transaction: (() => {
+      const contract = new Contract(TransferWithTimeout, [alicePub, bobPub, 100000n], { provider });
+      provider.addUtxo(contract.address, randomUtxo());
+
+      const tx = contract.functions
+        .transfer(new SignatureTemplate(bobPriv))
+        .to(contract.address, 10000n)
+        .withoutChange();
+
+      return tx;
+    })(),
+    template: {
+      '$schema': 'https://ide.bitauth.com/authentication-template-v0.schema.json',
+      'description': 'Imported from cashscript',
+      'name': 'TransferWithTimeout',
+      'supported': [
+        'BCH_SPEC',
+      ],
+      'version': 0,
+      'entities': {
+        'parameters': {
+          'description': 'Contract creation and function parameters',
+          'name': 'parameters',
+          'scripts': [
+            'lock',
+            'unlock_lock',
+          ],
+          'variables': {
+            'recipient_sig': {
+              'description': '"recipientSig" parameter of function "transfer"',
+              'name': 'recipientSig',
+              'type': 'Key',
+            },
+            'function_index': {
+              'description': 'Script function index to execute',
+              'name': 'function_index',
+              'type': 'WalletData',
+            },
+            'timeout': {
+              'description': '"timeout" parameter of this contract',
+              'name': 'timeout',
+              'type': 'WalletData',
+            },
+            'recipient': {
+              'description': '"recipient" parameter of this contract',
+              'name': 'recipient',
+              'type': 'WalletData',
+            },
+            'sender': {
+              'description': '"sender" parameter of this contract',
+              'name': 'sender',
+              'type': 'WalletData',
+            },
+          },
+        },
+      },
+      'scenarios': {
+        'evaluate_function': {
+          'name': 'Evaluate',
+          'description': 'An example evaluation where this script execution passes.',
+          'data': {
+            'bytecode': {
+              'function_index': '0',
+              'timeout': '0xa08601',
+              'recipient': '0x028f1219c918234d6bb06b4782354ff0759bd73036f3c849b88020c79fe013cd38',
+              'sender': '0x0373cc07b54c22da627b572a387a20ea190c9382e5e6d48c1d5b89c5cea2c4c088',
+            },
+            'currentBlockHeight': 2,
+            'currentBlockTime': expect.any(Number),
+            'keys': {
+              'privateKeys': {
+                'recipient_sig': '71080d8b52ec7b12adaec909ed54cd989b682ce2c35647eec219a16f5f90c528',
+              },
+            },
+          },
+          'transaction': {
+            'inputs': [
+              {
+                'outpointIndex': expect.any(Number),
+                'outpointTransactionHash': expect.stringMatching(/^[0-9a-f]{64}$/),
+                'sequenceNumber': 4294967294,
+                'unlockingBytecode': [
+                  'slot',
+                ],
+              },
+            ],
+            'locktime': expect.any(Number),
+            'outputs': [
+              {
+                'lockingBytecode': {},
+                'valueSatoshis': 10000,
+              },
+            ],
+            'version': 2,
+          },
+          'sourceOutputs': [
+            {
+              'lockingBytecode': [
+                'slot',
+              ],
+              'valueSatoshis': expect.any(Number),
+            },
+          ],
+        },
+      },
+      'scripts': {
+        'unlock_lock': {
+          'passes': [
+            'evaluate_function',
+          ],
+          'name': 'unlock',
+          'script': '// "transfer" function parameters\n<recipient_sig.schnorr_signature.all_outputs> // sig\n\n// function index in contract\n<function_index> // int = <0>\n',
+          'unlocks': 'lock',
+        },
+        'lock': {
+          'lockingType': 'p2sh20',
+          'name': 'lock',
+          'script': "// \"TransferWithTimeout\" contract constructor parameters\n<timeout> // int = <0xa08601>\n<recipient> // pubkey = <0x028f1219c918234d6bb06b4782354ff0759bd73036f3c849b88020c79fe013cd38>\n<sender> // pubkey = <0x0373cc07b54c22da627b572a387a20ea190c9382e5e6d48c1d5b89c5cea2c4c088>\n\n// bytecode\n                                                /* contract TransferWithTimeout(                                             */\n                                                /*     pubkey sender,                                                        */\n                                                /*     pubkey recipient,                                                     */\n                                                /*     int timeout                                                           */\n                                                /* ) {                                                                       */\n                                                /*     // Require recipient's signature to match                             */\nOP_3 OP_PICK OP_0 OP_NUMEQUAL OP_IF             /*     function transfer(sig recipientSig) {                                 */\nOP_4 OP_ROLL OP_2 OP_ROLL OP_CHECKSIG           /*         require(checkSig(recipientSig, recipient));                       */\nOP_NIP OP_NIP OP_NIP OP_ELSE                    /*     }                                                                     */\n                                                /*                                                                           */\n                                                /*     // Require timeout time to be reached and sender's signature to match */\nOP_3 OP_ROLL OP_1 OP_NUMEQUAL OP_VERIFY         /*     function timeout(sig senderSig) {                                     */\nOP_3 OP_ROLL OP_1 OP_ROLL OP_CHECKSIG OP_VERIFY /*         require(checkSig(senderSig, sender));                             */\nOP_1 OP_ROLL OP_CHECKLOCKTIMEVERIFY OP_DROP     /*         require(tx.time >= timeout);                                      */\nOP_1 OP_NIP                                     /*     }                                                                     */\nOP_ENDIF                                        /* }                                                                         */\n                                                /*                                                                           */",
+        },
+      },
+    },
+  },
+  {
+    name: 'TransferWithTimeout (timeout function)',
+    transaction: (() => {
+      const contract = new Contract(TransferWithTimeout, [alicePub, bobPub, 100000n], { provider });
+      provider.addUtxo(contract.address, randomUtxo());
+
+      const tx = contract.functions
+        .timeout(new SignatureTemplate(alicePriv))
+        .to(contract.address, 10000n)
+        .withoutChange();
+
+      return tx;
+    })(),
+    template: {
+      '$schema': 'https://ide.bitauth.com/authentication-template-v0.schema.json',
+      'description': 'Imported from cashscript',
+      'name': 'TransferWithTimeout',
+      'supported': [
+        'BCH_SPEC',
+      ],
+      'version': 0,
+      'entities': {
+        'parameters': {
+          'description': 'Contract creation and function parameters',
+          'name': 'parameters',
+          'scripts': [
+            'lock',
+            'unlock_lock',
+          ],
+          'variables': {
+            'function_index': {
+              'description': 'Script function index to execute',
+              'name': 'function_index',
+              'type': 'WalletData',
+            },
+            'timeout': {
+              'description': '"timeout" parameter of this contract',
+              'name': 'timeout',
+              'type': 'WalletData',
+            },
+            'recipient': {
+              'description': '"recipient" parameter of this contract',
+              'name': 'recipient',
+              'type': 'WalletData',
+            },
+            'sender': {
+              'description': '"sender" parameter of this contract',
+              'name': 'sender',
+              'type': 'WalletData',
+            },
+            'sender_sig': {
+              'description': '"senderSig" parameter of function "timeout\"',
+              'name': 'senderSig',
+              'type': 'Key',
+            },
+          },
+        },
+      },
+      'scenarios': {
+        'evaluate_function': {
+          'name': 'Evaluate',
+          'description': 'An example evaluation where this script execution passes.',
+          'data': {
+            'bytecode': {
+              'function_index': '1',
+              'timeout': '0xa08601',
+              'recipient': '0x028f1219c918234d6bb06b4782354ff0759bd73036f3c849b88020c79fe013cd38',
+              'sender': '0x0373cc07b54c22da627b572a387a20ea190c9382e5e6d48c1d5b89c5cea2c4c088',
+            },
+            'currentBlockHeight': 2,
+            'currentBlockTime': expect.any(Number),
+            'keys': {
+              'privateKeys': {
+                'sender_sig': '36f8155c559f3a670586bbbf9fd52beef6f96124f5a3a39c167fc24b052d24d7',
+              },
+            },
+          },
+          'transaction': {
+            'inputs': [
+              {
+                'outpointIndex': expect.any(Number),
+                'outpointTransactionHash': expect.stringMatching(/^[0-9a-f]{64}$/),
+                'sequenceNumber': 4294967294,
+                'unlockingBytecode': [
+                  'slot',
+                ],
+              },
+            ],
+            'locktime': expect.any(Number),
+            'outputs': [
+              {
+                'lockingBytecode': {},
+                'valueSatoshis': 10000,
+              },
+            ],
+            'version': 2,
+          },
+          'sourceOutputs': [
+            {
+              'lockingBytecode': [
+                'slot',
+              ],
+              'valueSatoshis': expect.any(Number),
+            },
+          ],
+        },
+      },
+      'scripts': {
+        'unlock_lock': {
+          'passes': [
+            'evaluate_function',
+          ],
+          'name': 'unlock',
+          'script': '// "timeout\" function parameters\n<sender_sig.schnorr_signature.all_outputs> // sig\n\n// function index in contract\n<function_index> // int = <1>\n',
+          'unlocks': 'lock',
+        },
+        'lock': {
+          'lockingType': 'p2sh20',
+          'name': 'lock',
+          'script': "// \"TransferWithTimeout\" contract constructor parameters\n<timeout> // int = <0xa08601>\n<recipient> // pubkey = <0x028f1219c918234d6bb06b4782354ff0759bd73036f3c849b88020c79fe013cd38>\n<sender> // pubkey = <0x0373cc07b54c22da627b572a387a20ea190c9382e5e6d48c1d5b89c5cea2c4c088>\n\n// bytecode\n                                                /* contract TransferWithTimeout(                                             */\n                                                /*     pubkey sender,                                                        */\n                                                /*     pubkey recipient,                                                     */\n                                                /*     int timeout                                                           */\n                                                /* ) {                                                                       */\n                                                /*     // Require recipient's signature to match                             */\nOP_3 OP_PICK OP_0 OP_NUMEQUAL OP_IF             /*     function transfer(sig recipientSig) {                                 */\nOP_4 OP_ROLL OP_2 OP_ROLL OP_CHECKSIG           /*         require(checkSig(recipientSig, recipient));                       */\nOP_NIP OP_NIP OP_NIP OP_ELSE                    /*     }                                                                     */\n                                                /*                                                                           */\n                                                /*     // Require timeout time to be reached and sender's signature to match */\nOP_3 OP_ROLL OP_1 OP_NUMEQUAL OP_VERIFY         /*     function timeout(sig senderSig) {                                     */\nOP_3 OP_ROLL OP_1 OP_ROLL OP_CHECKSIG OP_VERIFY /*         require(checkSig(senderSig, sender));                             */\nOP_1 OP_ROLL OP_CHECKLOCKTIMEVERIFY OP_DROP     /*         require(tx.time >= timeout);                                      */\nOP_1 OP_NIP                                     /*     }                                                                     */\nOP_ENDIF                                        /* }                                                                         */\n                                                /*                                                                           */",
+        },
+      },
+    },
+  },
+  {
+    name: 'Mecenas',
+    transaction: (() => {
+      const contract = new Contract(Mecenas, [alicePkh, bobPkh, 10_000n], { provider });
+      provider.addUtxo(contract.address, randomUtxo());
+
+      const tx = contract.functions
+        .receive()
+        .to(aliceAddress, 10_000n)
+        .withHardcodedFee(1000n);
+
+      return tx;
+    })(),
+    template: {
+      '$schema': 'https://ide.bitauth.com/authentication-template-v0.schema.json',
+      'description': 'Imported from cashscript',
+      'name': 'Mecenas',
+      'supported': [
+        'BCH_SPEC',
+      ],
+      'version': 0,
+      'entities': {
+        'parameters': {
+          'description': 'Contract creation and function parameters',
+          'name': 'parameters',
+          'scripts': [
+            'lock',
+            'unlock_lock',
+          ],
+          'variables': {
+            'function_index': {
+              'description': 'Script function index to execute',
+              'name': 'function_index',
+              'type': 'WalletData',
+            },
+            'pledge': {
+              'description': '"pledge" parameter of this contract',
+              'name': 'pledge',
+              'type': 'WalletData',
+            },
+            'funder': {
+              'description': '"funder" parameter of this contract',
+              'name': 'funder',
+              'type': 'WalletData',
+            },
+            'recipient': {
+              'description': '"recipient" parameter of this contract',
+              'name': 'recipient',
+              'type': 'WalletData',
+            },
+          },
+        },
+      },
+      'scenarios': {
+        'evaluate_function': {
+          'name': 'Evaluate',
+          'description': 'An example evaluation where this script execution passes.',
+          'data': {
+            'bytecode': {
+              'function_index': '0',
+              'pledge': '0x1027',
+              'funder': '0xb40a2013337edb0dfe307f0a57d5dec5bfe60dd0',
+              'recipient': '0x512dbb2c8c02efbac8d92431aa0ac33f6b0bf970',
+            },
+            'currentBlockHeight': 2,
+            'currentBlockTime': expect.any(Number),
+            'keys': {
+              'privateKeys': {},
+            },
+          },
+          'transaction': {
+            'inputs': [
+              {
+                'outpointIndex': expect.any(Number),
+                'outpointTransactionHash': expect.stringMatching(/^[0-9a-f]{64}$/),
+                'sequenceNumber': 4294967294,
+                'unlockingBytecode': [
+                  'slot',
+                ],
+              },
+            ],
+            'locktime': 133700,
+            'outputs': [
+              {
+                'lockingBytecode': '76a914512dbb2c8c02efbac8d92431aa0ac33f6b0bf97088ac',
+                'valueSatoshis': 10000,
+              },
+              {
+                'lockingBytecode': {},
+                'valueSatoshis': expect.any(Number),
+              },
+            ],
+            'version': 2,
+          },
+          'sourceOutputs': [
+            {
+              'lockingBytecode': [
+                'slot',
+              ],
+              'valueSatoshis': expect.any(Number),
+            },
+          ],
+        },
+      },
+      'scripts': {
+        'unlock_lock': {
+          'passes': [
+            'evaluate_function',
+          ],
+          'name': 'unlock',
+          'script': '// "receive" function parameters\n// none\n\n// function index in contract\n<function_index> // int = <0>\n',
+          'unlocks': 'lock',
+        },
+        'lock': {
+          'lockingType': 'p2sh20',
+          'name': 'lock',
+          'script': "// \"Mecenas\" contract constructor parameters\n<pledge> // int = <0x1027>\n<funder> // bytes20 = <0xb40a2013337edb0dfe307f0a57d5dec5bfe60dd0>\n<recipient> // bytes20 = <0x512dbb2c8c02efbac8d92431aa0ac33f6b0bf970>\n\n// bytecode\n                                                                                         /* pragma cashscript >=0.8.0;                                                                                         */\n                                                                                         /*                                                                                                                    */\n                                                                                         /* /* This is an unofficial CashScript port of Licho's Mecenas contract. It is                                        */\n                                                                                         /*  * not compatible with Licho's EC plugin, but rather meant as a demonstration                                      */\n                                                                                         /*  * of covenants in CashScript.                                                                                     */\n                                                                                         /*  * The time checking has been removed so it can be tested without time requirements.                               */\n                                                                                         /*  */                                                                                                                */\n                                                                                         /* contract Mecenas(bytes20 recipient, bytes20 funder, int pledge/*, int period */) {                                 */\nOP_3 OP_PICK OP_0 OP_NUMEQUAL OP_IF                                                      /*     function receive() {                                                                                           */\n                                                                                         /*         // require(tx.age >= period);                                                                              */\n                                                                                         /*                                                                                                                    */\n                                                                                         /*         // Check that the first output sends to the recipient                                                      */\nOP_0 OP_OUTPUTBYTECODE <0x76a914> OP_2 OP_ROLL OP_CAT <0x88ac> OP_CAT OP_EQUAL OP_VERIFY /*         require(tx.outputs[0].lockingBytecode == new LockingBytecodeP2PKH(recipient));                             */\n                                                                                         /*                                                                                                                    */\n<0xe803>                                                                                 /*         int minerFee = 1000;                                                                                       */\nOP_INPUTINDEX OP_UTXOVALUE                                                               /*         int currentValue = tx.inputs[this.activeInputIndex].value;                                                 */\nOP_0 OP_PICK OP_4 OP_PICK OP_SUB OP_2 OP_PICK OP_SUB                                     /*         int changeValue = currentValue - pledge - minerFee;                                                        */\n                                                                                         /*                                                                                                                    */\n                                                                                         /*         // If there is not enough left for *another* pledge after this one, we send the remainder to the recipient */\n                                                                                         /*         // Otherwise we send the remainder to the recipient and the change back to the contract                    */\nOP_0 OP_PICK OP_5 OP_PICK OP_4 OP_PICK OP_ADD OP_LESSTHANOREQUAL OP_IF                   /*         if (changeValue <= pledge + minerFee) {                                                                    */\nOP_0 OP_OUTPUTVALUE OP_2 OP_PICK OP_4 OP_PICK OP_SUB OP_NUMEQUAL OP_VERIFY               /*             require(tx.outputs[0].value == currentValue - minerFee);                                               */\n                                                                                         /*         } else {                                                                                                   */\nOP_0 OP_OUTPUTVALUE OP_5 OP_PICK OP_NUMEQUAL OP_VERIFY                                   /*             require(tx.outputs[0].value == pledge);                                                                */\nOP_1 OP_OUTPUTBYTECODE OP_INPUTINDEX OP_UTXOBYTECODE OP_EQUAL OP_VERIFY                  /*             require(tx.outputs[1].lockingBytecode == tx.inputs[this.activeInputIndex].lockingBytecode);            */\nOP_1 OP_OUTPUTVALUE OP_1 OP_PICK OP_NUMEQUAL OP_VERIFY                                   /*             require(tx.outputs[1].value == changeValue);                                                           */\nOP_ELSE OP_ENDIF                                                                         /*         }                                                                                                          */\nOP_1 OP_NIP OP_NIP OP_NIP OP_NIP OP_NIP OP_NIP OP_ELSE                                   /*     }                                                                                                              */\n                                                                                         /*                                                                                                                    */\nOP_3 OP_ROLL OP_1 OP_NUMEQUAL OP_VERIFY                                                  /*     function reclaim(pubkey pk, sig s) {                                                                           */\nOP_3 OP_PICK OP_HASH160 OP_2 OP_ROLL OP_EQUAL OP_VERIFY                                  /*         require(hash160(pk) == funder);                                                                            */\nOP_3 OP_ROLL OP_3 OP_ROLL OP_CHECKSIG                                                    /*         require(checkSig(s, pk));                                                                                  */\nOP_NIP OP_NIP                                                                            /*     }                                                                                                              */\nOP_ENDIF                                                                                 /* }                                                                                                                  */\n                                                                                         /*                                                                                                                    */",
+        },
+      },
+    },
+  },
+  {
+    name: 'P2PKH (sending fungible tokens)',
+    transaction: (() => {
+      const contract = new Contract(P2PKH, [alicePkh], { provider });
+
+      const regularUtxo = randomUtxo();
+      const tokenUtxo = randomUtxo({ satoshis: 1000n, token: randomToken() });
+      provider.addUtxo(contract.address, regularUtxo);
+      provider.addUtxo(contract.address, tokenUtxo);
+
+      const to = contract.tokenAddress;
+      const amount = 1000n;
+
+      const tx = contract.functions
+        .spend(alicePub, new SignatureTemplate(alicePriv))
+        .from(regularUtxo)
+        .from(tokenUtxo)
+        .to(to, amount, tokenUtxo.token);
+
+      return tx;
+    })(),
+    template: {
+      '$schema': 'https://ide.bitauth.com/authentication-template-v0.schema.json',
+      'description': 'Imported from cashscript',
+      'name': 'P2PKH',
+      'supported': [
+        'BCH_SPEC',
+      ],
+      'version': 0,
+      'entities': {
+        'parameters': {
+          'description': 'Contract creation and function parameters',
+          'name': 'parameters',
+          'scripts': [
+            'lock',
+            'unlock_lock',
+          ],
+          'variables': {
+            's': {
+              'description': '"s" parameter of function "spend"',
+              'name': 's',
+              'type': 'Key',
+            },
+            'pk': {
+              'description': '"pk" parameter of function "spend"',
+              'name': 'pk',
+              'type': 'WalletData',
+            },
+            'function_index': {
+              'description': 'Script function index to execute',
+              'name': 'function_index',
+              'type': 'WalletData',
+            },
+            'pkh': {
+              'description': '"pkh" parameter of this contract',
+              'name': 'pkh',
+              'type': 'WalletData',
+            },
+          },
+        },
+      },
+      'scenarios': {
+        'evaluate_function': {
+          'name': 'Evaluate',
+          'description': 'An example evaluation where this script execution passes.',
+          'data': {
+            'bytecode': {
+              'pk': '0x0373cc07b54c22da627b572a387a20ea190c9382e5e6d48c1d5b89c5cea2c4c088',
+              'function_index': '0',
+              'pkh': '0x512dbb2c8c02efbac8d92431aa0ac33f6b0bf970',
+            },
+            'currentBlockHeight': 2,
+            'currentBlockTime': expect.any(Number),
+            'keys': {
+              'privateKeys': {
+                's': '36f8155c559f3a670586bbbf9fd52beef6f96124f5a3a39c167fc24b052d24d7',
+              },
+            },
+          },
+          'transaction': {
+            'inputs': [
+              {
+                'outpointIndex': expect.any(Number),
+                'outpointTransactionHash': expect.stringMatching(/^[0-9a-f]{64}$/),
+                'sequenceNumber': 4294967294,
+                'unlockingBytecode': [
+                  'slot',
+                ],
+              },
+              {
+                'outpointIndex': expect.any(Number),
+                'outpointTransactionHash': expect.stringMatching(/^[0-9a-f]{64}$/),
+                'sequenceNumber': 4294967294,
+                'unlockingBytecode': {},
+              },
+            ],
+            'locktime': 133700,
+            'outputs': [
+              {
+                'lockingBytecode': {},
+                'token': {
+                  'amount': expect.stringMatching(/^[0-9]+$/),
+                  'category': expect.stringMatching(/^[0-9a-f]{64}$/),
+                },
+                'valueSatoshis': 1000,
+              },
+              {
+                'lockingBytecode': {},
+                'valueSatoshis': expect.any(Number),
+              },
+            ],
+            'version': 2,
+          },
+          'sourceOutputs': [
+            {
+              'lockingBytecode': [
+                'slot',
+              ],
+              'valueSatoshis': expect.any(Number),
+            },
+            {
+              'lockingBytecode': {},
+              'valueSatoshis': 1000,
+              'token': {
+                'amount': expect.stringMatching(/^[0-9]+$/),
+                'category': expect.stringMatching(/^[0-9a-f]{64}$/),
+              },
+            },
+          ],
+        },
+      },
+      'scripts': {
+        'unlock_lock': {
+          'passes': [
+            'evaluate_function',
+          ],
+          'name': 'unlock',
+          'script': '// "spend" function parameters\n<s.schnorr_signature.all_outputs> // sig\n<pk> // pubkey = <0x0373cc07b54c22da627b572a387a20ea190c9382e5e6d48c1d5b89c5cea2c4c088>\n',
+          'unlocks': 'lock',
+        },
+        'lock': {
+          'lockingType': 'p2sh20',
+          'name': 'lock',
+          'script': '// "P2PKH" contract constructor parameters\n<pkh> // bytes20 = <0x512dbb2c8c02efbac8d92431aa0ac33f6b0bf970>\n\n// bytecode\n                                                        /* contract P2PKH(bytes20 pkh) {                                */\n                                                        /*     // Require pk to match stored pkh and signature to match */\n                                                        /*     function spend(pubkey pk, sig s) {                       */\nOP_1 OP_PICK OP_HASH160 OP_1 OP_ROLL OP_EQUAL OP_VERIFY /*         require(hash160(pk) == pkh);                         */\nOP_1 OP_ROLL OP_1 OP_ROLL OP_CHECKSIG                   /*         require(checkSig(s, pk));                            */\n                                                        /*     }                                                        */\n                                                        /* }                                                            */\n                                                        /*                                                              */',
+        },
+      },
+    },
+  },
+  {
+    name: 'P2PKH (sending NFTs)',
+    transaction: (() => {
+      const contract = new Contract(P2PKH, [alicePkh], { provider });
+
+      const regularUtxo = randomUtxo();
+      const nftUtxo = randomUtxo({ satoshis: 1000n, token: randomNFT() });
+      provider.addUtxo(contract.address, regularUtxo);
+      provider.addUtxo(contract.address, nftUtxo);
+
+      const to = contract.tokenAddress;
+      const amount = 1000n;
+
+      const tx = contract.functions
+        .spend(alicePub, new SignatureTemplate(alicePriv))
+        .from(regularUtxo)
+        .from(nftUtxo)
+        .to(to, amount, nftUtxo.token);
+
+      return tx;
+    })(),
+    template: {
+      '$schema': 'https://ide.bitauth.com/authentication-template-v0.schema.json',
+      'description': 'Imported from cashscript',
+      'name': 'P2PKH',
+      'supported': [
+        'BCH_SPEC',
+      ],
+      'version': 0,
+      'entities': {
+        'parameters': {
+          'description': 'Contract creation and function parameters',
+          'name': 'parameters',
+          'scripts': [
+            'lock',
+            'unlock_lock',
+          ],
+          'variables': {
+            's': {
+              'description': '"s" parameter of function "spend"',
+              'name': 's',
+              'type': 'Key',
+            },
+            'pk': {
+              'description': '"pk" parameter of function "spend"',
+              'name': 'pk',
+              'type': 'WalletData',
+            },
+            'function_index': {
+              'description': 'Script function index to execute',
+              'name': 'function_index',
+              'type': 'WalletData',
+            },
+            'pkh': {
+              'description': '"pkh" parameter of this contract',
+              'name': 'pkh',
+              'type': 'WalletData',
+            },
+          },
+        },
+      },
+      'scenarios': {
+        'evaluate_function': {
+          'name': 'Evaluate',
+          'description': 'An example evaluation where this script execution passes.',
+          'data': {
+            'bytecode': {
+              'pk': '0x0373cc07b54c22da627b572a387a20ea190c9382e5e6d48c1d5b89c5cea2c4c088',
+              'function_index': '0',
+              'pkh': '0x512dbb2c8c02efbac8d92431aa0ac33f6b0bf970',
+            },
+            'currentBlockHeight': 2,
+            'currentBlockTime': expect.any(Number),
+            'keys': {
+              'privateKeys': {
+                's': '36f8155c559f3a670586bbbf9fd52beef6f96124f5a3a39c167fc24b052d24d7',
+              },
+            },
+          },
+          'transaction': {
+            'inputs': [
+              {
+                'outpointIndex': expect.any(Number),
+                'outpointTransactionHash': expect.stringMatching(/^[0-9a-f]{64}$/),
+                'sequenceNumber': 4294967294,
+                'unlockingBytecode': [
+                  'slot',
+                ],
+              },
+              {
+                'outpointIndex': expect.any(Number),
+                'outpointTransactionHash': expect.stringMatching(/^[0-9a-f]{64}$/),
+                'sequenceNumber': 4294967294,
+                'unlockingBytecode': {},
+              },
+            ],
+            'locktime': 133700,
+            'outputs': [
+              {
+                'lockingBytecode': {},
+                'token': {
+                  'amount': '0',
+                  'category': expect.stringMatching(/^[0-9a-f]{64}$/),
+                  'nft': {
+                    'capability': 'none',
+                    'commitment': expect.stringMatching(/^[0-9a-f]{8}$/),
+                  },
+                },
+                'valueSatoshis': 1000,
+              },
+              {
+                'lockingBytecode': {},
+                'valueSatoshis': expect.any(Number),
+              },
+            ],
+            'version': 2,
+          },
+          'sourceOutputs': [
+            {
+              'lockingBytecode': [
+                'slot',
+              ],
+              'valueSatoshis': expect.any(Number),
+            },
+            {
+              'lockingBytecode': {},
+              'valueSatoshis': 1000,
+              'token': {
+                'amount': '0',
+                'category': expect.stringMatching(/^[0-9a-f]{64}$/),
+                'nft': {
+                  'capability': 'none',
+                  'commitment': expect.stringMatching(/^[0-9a-f]{8}$/),
+                },
+              },
+            },
+          ],
+        },
+      },
+      'scripts': {
+        'unlock_lock': {
+          'passes': [
+            'evaluate_function',
+          ],
+          'name': 'unlock',
+          'script': '// "spend" function parameters\n<s.schnorr_signature.all_outputs> // sig\n<pk> // pubkey = <0x0373cc07b54c22da627b572a387a20ea190c9382e5e6d48c1d5b89c5cea2c4c088>\n',
+          'unlocks': 'lock',
+        },
+        'lock': {
+          'lockingType': 'p2sh20',
+          'name': 'lock',
+          'script': '// "P2PKH" contract constructor parameters\n<pkh> // bytes20 = <0x512dbb2c8c02efbac8d92431aa0ac33f6b0bf970>\n\n// bytecode\n                                                        /* contract P2PKH(bytes20 pkh) {                                */\n                                                        /*     // Require pk to match stored pkh and signature to match */\n                                                        /*     function spend(pubkey pk, sig s) {                       */\nOP_1 OP_PICK OP_HASH160 OP_1 OP_ROLL OP_EQUAL OP_VERIFY /*         require(hash160(pk) == pkh);                         */\nOP_1 OP_ROLL OP_1 OP_ROLL OP_CHECKSIG                   /*         require(checkSig(s, pk));                            */\n                                                        /*     }                                                        */\n                                                        /* }                                                            */\n                                                        /*                                                              */',
+        },
+      },
+    },
+  },
+  // TODO: Add fixture with datasig arguments
+  // TODO: Add fixture with different signing types (other than all_outputs)
+];
diff --git a/packages/cashscript/test/libauth-template/LibauthTemplate.test.ts b/packages/cashscript/test/libauth-template/LibauthTemplate.test.ts
new file mode 100644
index 00000000..228c8198
--- /dev/null
+++ b/packages/cashscript/test/libauth-template/LibauthTemplate.test.ts
@@ -0,0 +1,10 @@
+import { fixtures } from '../fixture/libauth-template/fixtures.js';
+
+describe('Libauth Template generation tests', () => {
+  fixtures.forEach((fixture) => {
+    it(`should generate a valid libauth template for ${fixture.name}`, async () => {
+      const generatedTemplate = await fixture.transaction.getLibauthTemplate();
+      expect(generatedTemplate).toEqual(fixture.template);
+    });
+  });
+});

From 84e52b6627f291705d8183140aca244158d891ee Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Fri, 8 Mar 2024 17:33:58 +1100
Subject: [PATCH 075/171] Add some more edge case fixtures for Libauth Template
 generation

---
 .../test/fixture/libauth-template/fixtures.ts | 355 +++++++++++++++++-
 .../libauth-template/LibauthTemplate.test.ts  |   2 +
 2 files changed, 354 insertions(+), 3 deletions(-)

diff --git a/packages/cashscript/test/fixture/libauth-template/fixtures.ts b/packages/cashscript/test/fixture/libauth-template/fixtures.ts
index a8c1aa8c..dfaf6ddb 100644
--- a/packages/cashscript/test/fixture/libauth-template/fixtures.ts
+++ b/packages/cashscript/test/fixture/libauth-template/fixtures.ts
@@ -2,7 +2,8 @@ import { Contract, MockNetworkProvider, SignatureTemplate, Transaction, randomNF
 import TransferWithTimeout from '../transfer_with_timeout.json' assert { type: 'json' };
 import Mecenas from '../mecenas.json' assert { type: 'json' };
 import P2PKH from '../p2pkh.json' assert { type: 'json' };
-import { aliceAddress, alicePkh, alicePriv, alicePub, bobPkh, bobPriv, bobPub } from '../vars.js';
+import HoldVault from '../hodl_vault.json' assert { type: 'json' };
+import { aliceAddress, alicePkh, alicePriv, alicePub, bobPkh, bobPriv, bobPub, oracle, oraclePub } from '../vars.js';
 import { WalletTemplate } from '@bitauth/libauth';
 
 const provider = new MockNetworkProvider();
@@ -687,6 +688,354 @@ export const fixtures: Fixture[] = [
       },
     },
   },
-  // TODO: Add fixture with datasig arguments
-  // TODO: Add fixture with different signing types (other than all_outputs)
+  {
+    name: 'HodlVault (datasig)',
+    transaction: (() => {
+      const contract = new Contract(HoldVault, [alicePub, oraclePub, 99000n, 30000n], { provider });
+      provider.addUtxo(contract.address, randomUtxo());
+
+      // given
+      const message = oracle.createMessage(100000n, 30000n);
+      const oracleSig = oracle.signMessage(message);
+      const to = contract.address;
+      const amount = 10000n;
+
+      // when
+      const tx = contract.functions
+        .spend(new SignatureTemplate(alicePriv), oracleSig, message)
+        .to(to, amount);
+
+      return tx;
+    })(),
+    template: {
+      '$schema': 'https://ide.bitauth.com/authentication-template-v0.schema.json',
+      'description': 'Imported from cashscript',
+      'name': 'HodlVault',
+      'supported': [
+        'BCH_SPEC',
+      ],
+      'version': 0,
+      'entities': {
+        'parameters': {
+          'description': 'Contract creation and function parameters',
+          'name': 'parameters',
+          'scripts': [
+            'lock',
+            'unlock_lock',
+          ],
+          'variables': {
+            'oracle_message': {
+              'description': '"oracleMessage" parameter of function "spend"',
+              'name': 'oracleMessage',
+              'type': 'WalletData',
+            },
+            'oracle_sig': {
+              'description': '"oracleSig" parameter of function "spend"',
+              'name': 'oracleSig',
+              'type': 'WalletData',
+            },
+            'owner_sig': {
+              'description': '"ownerSig" parameter of function "spend"',
+              'name': 'ownerSig',
+              'type': 'Key',
+            },
+            'function_index': {
+              'description': 'Script function index to execute',
+              'name': 'function_index',
+              'type': 'WalletData',
+            },
+            'price_target': {
+              'description': '"priceTarget" parameter of this contract',
+              'name': 'priceTarget',
+              'type': 'WalletData',
+            },
+            'min_block': {
+              'description': '"minBlock" parameter of this contract',
+              'name': 'minBlock',
+              'type': 'WalletData',
+            },
+            'oracle_pk': {
+              'description': '"oraclePk" parameter of this contract',
+              'name': 'oraclePk',
+              'type': 'WalletData',
+            },
+            'owner_pk': {
+              'description': '"ownerPk" parameter of this contract',
+              'name': 'ownerPk',
+              'type': 'WalletData',
+            },
+          },
+        },
+      },
+      'scenarios': {
+        'evaluate_function': {
+          'name': 'Evaluate',
+          'description': 'An example evaluation where this script execution passes.',
+          'data': {
+            'bytecode': {
+              'oracle_message': '0xa086010030750000',
+              'oracle_sig': '0x569e137142ebdb96127b727787d605e427a858e8b17dc0605092d0019e5fc9d58810ee74c8ba9f9a5605268c9913e50f780f4c3780e06aea7f50766829895b4b',
+              'function_index': '0',
+              'price_target': '0x3075',
+              'min_block': '0xb88201',
+              'oracle_pk': '0x028f1219c918234d6bb06b4782354ff0759bd73036f3c849b88020c79fe013cd38',
+              'owner_pk': '0x0373cc07b54c22da627b572a387a20ea190c9382e5e6d48c1d5b89c5cea2c4c088',
+            },
+            'currentBlockHeight': 2,
+            'currentBlockTime': expect.any(Number),
+            'keys': {
+              'privateKeys': {
+                'owner_sig': '36f8155c559f3a670586bbbf9fd52beef6f96124f5a3a39c167fc24b052d24d7',
+              },
+            },
+          },
+          'transaction': {
+            'inputs': [
+              {
+                'outpointIndex': expect.any(Number),
+                'outpointTransactionHash': expect.stringMatching(/^[0-9a-f]{64}$/),
+                'sequenceNumber': 4294967294,
+                'unlockingBytecode': [
+                  'slot',
+                ],
+              },
+            ],
+            'locktime': 133700,
+            'outputs': [
+              {
+                'lockingBytecode': {},
+                'valueSatoshis': 10000,
+              },
+              {
+                'lockingBytecode': {},
+                'valueSatoshis': expect.any(Number),
+              },
+            ],
+            'version': 2,
+          },
+          'sourceOutputs': [
+            {
+              'lockingBytecode': [
+                'slot',
+              ],
+              'valueSatoshis': expect.any(Number),
+            },
+          ],
+        },
+      },
+      'scripts': {
+        'unlock_lock': {
+          'passes': [
+            'evaluate_function',
+          ],
+          'name': 'unlock',
+          'script': '// "spend" function parameters\n<oracle_message> // bytes8 = <0xa086010030750000>\n<oracle_sig> // datasig = <0x569e137142ebdb96127b727787d605e427a858e8b17dc0605092d0019e5fc9d58810ee74c8ba9f9a5605268c9913e50f780f4c3780e06aea7f50766829895b4b>\n<owner_sig.schnorr_signature.all_outputs> // sig\n',
+          'unlocks': 'lock',
+        },
+        'lock': {
+          'lockingType': 'p2sh20',
+          'name': 'lock',
+          'script': '// "HodlVault" contract constructor parameters\n<price_target> // int = <0x3075>\n<min_block> // int = <0xb88201>\n<oracle_pk> // pubkey = <0x028f1219c918234d6bb06b4782354ff0759bd73036f3c849b88020c79fe013cd38>\n<owner_pk> // pubkey = <0x0373cc07b54c22da627b572a387a20ea190c9382e5e6d48c1d5b89c5cea2c4c088>\n\n// bytecode\n                                                                 /* // This contract forces HODLing until a certain price target has been reached                                          */\n                                                                 /* // A minimum block is provided to ensure that oracle price entries from before this block are disregarded              */\n                                                                 /* // i.e. when the BCH price was $1000 in the past, an oracle entry with the old block number and price can not be used. */\n                                                                 /* // Instead, a message with a block number and price from after the minBlock needs to be passed.                        */\n                                                                 /* // This contract serves as a simple example for checkDataSig-based contracts.                                          */\n                                                                 /* contract HodlVault(                                                                                                    */\n                                                                 /*     pubkey ownerPk,                                                                                                    */\n                                                                 /*     pubkey oraclePk,                                                                                                   */\n                                                                 /*     int minBlock,                                                                                                      */\n                                                                 /*     int priceTarget                                                                                                    */\n                                                                 /* ) {                                                                                                                    */\n                                                                 /*     function spend(sig ownerSig, datasig oracleSig, bytes8 oracleMessage) {                                            */\n                                                                 /*         // message: { blockHeight, price }                                                                             */\nOP_6 OP_PICK OP_4 OP_SPLIT                                       /*         bytes4 blockHeightBin, bytes4 priceBin = oracleMessage.split(4);                                               */\nOP_1 OP_ROLL OP_BIN2NUM                                          /*         int blockHeight = int(blockHeightBin);                                                                         */\nOP_1 OP_ROLL OP_BIN2NUM                                          /*         int price = int(priceBin);                                                                                     */\n                                                                 /*                                                                                                                        */\n                                                                 /*         // Check that blockHeight is after minBlock and not in the future                                              */\nOP_1 OP_PICK OP_5 OP_ROLL OP_GREATERTHANOREQUAL OP_VERIFY        /*         require(blockHeight >= minBlock);                                                                              */\nOP_1 OP_ROLL OP_CHECKLOCKTIMEVERIFY OP_DROP                      /*         require(tx.time >= blockHeight);                                                                               */\n                                                                 /*                                                                                                                        */\n                                                                 /*         // Check that current price is at least priceTarget                                                            */\nOP_0 OP_ROLL OP_3 OP_ROLL OP_GREATERTHANOREQUAL OP_VERIFY        /*         require(price >= priceTarget);                                                                                 */\n                                                                 /*                                                                                                                        */\n                                                                 /*         // Handle necessary signature checks                                                                           */\nOP_3 OP_ROLL OP_4 OP_ROLL OP_3 OP_ROLL OP_CHECKDATASIG OP_VERIFY /*         require(checkDataSig(oracleSig, oracleMessage, oraclePk));                                                     */\nOP_1 OP_ROLL OP_1 OP_ROLL OP_CHECKSIG                            /*         require(checkSig(ownerSig, ownerPk));                                                                          */\n                                                                 /*     }                                                                                                                  */\n                                                                 /* }                                                                                                                      */\n                                                                 /*                                                                                                                        */',
+        },
+      },
+    },
+  },
+  // TODO: Make it work with different hashtypes and signature algorithms
+  // {
+  //   name: 'P2PKH (sending NFTs)',
+  //   transaction: (() => {
+  //     const contract = new Contract(P2PKH, [alicePkh], { provider });
+  //     provider.addUtxo(contract.address, randomUtxo());
+
+  //     const to = contract.address;
+  //     const amount = 1000n;
+
+  //     const hashtype = HashType.SIGHASH_SINGLE | HashType.SIGHASH_ANYONECANPAY;
+  //     const signatureAlgorithm = SignatureAlgorithm.ECDSA;
+
+  //     const tx = contract.functions
+  //       .spend(alicePub, new SignatureTemplate(alicePriv, hashtype, signatureAlgorithm))
+  //       .to(to, amount);
+
+  //     return tx;
+  //   })(),
+  //   template: {} as any,
+  // },
+  {
+    name: 'P2PKH (with P2PKH inputs)',
+    transaction: (() => {
+      const contract = new Contract(P2PKH, [alicePkh], { provider });
+
+      const regularUtxo = randomUtxo();
+      provider.addUtxo(contract.address, regularUtxo);
+
+      const p2pkhUtxo = randomUtxo();
+      provider.addUtxo(aliceAddress, p2pkhUtxo);
+
+      const to = contract.tokenAddress;
+      const amount = 1000n;
+
+      const tx = contract.functions
+        .spend(alicePub, new SignatureTemplate(alicePriv))
+        .fromP2PKH(p2pkhUtxo, new SignatureTemplate(alicePriv))
+        .from(regularUtxo)
+        .to(to, amount);
+
+      return tx;
+    })(),
+    template: {
+      '$schema': 'https://ide.bitauth.com/authentication-template-v0.schema.json',
+      'description': 'Imported from cashscript',
+      'name': 'P2PKH',
+      'supported': [
+        'BCH_SPEC',
+      ],
+      'version': 0,
+      'entities': {
+        'parameters': {
+          'description': 'Contract creation and function parameters',
+          'name': 'parameters',
+          'scripts': [
+            'lock',
+            'unlock_lock',
+            'p2pkh_placeholder_lock',
+            'p2pkh_placeholder_unlock',
+          ],
+          'variables': {
+            's': {
+              'description': '"s" parameter of function "spend"',
+              'name': 's',
+              'type': 'Key',
+            },
+            'pk': {
+              'description': '"pk" parameter of function "spend"',
+              'name': 'pk',
+              'type': 'WalletData',
+            },
+            'function_index': {
+              'description': 'Script function index to execute',
+              'name': 'function_index',
+              'type': 'WalletData',
+            },
+            'pkh': {
+              'description': '"pkh" parameter of this contract',
+              'name': 'pkh',
+              'type': 'WalletData',
+            },
+            'placeholder_key': {
+              'description': 'placeholder_key',
+              'name': 'placeholder_key',
+              'type': 'Key',
+            },
+          },
+        },
+      },
+      'scenarios': {
+        'evaluate_function': {
+          'name': 'Evaluate',
+          'description': 'An example evaluation where this script execution passes.',
+          'data': {
+            'bytecode': {
+              'pk': '0x0373cc07b54c22da627b572a387a20ea190c9382e5e6d48c1d5b89c5cea2c4c088',
+              'function_index': '0',
+              'pkh': '0x512dbb2c8c02efbac8d92431aa0ac33f6b0bf970',
+            },
+            'currentBlockHeight': 2,
+            'currentBlockTime': expect.any(Number),
+            'keys': {
+              'privateKeys': {
+                's': '36f8155c559f3a670586bbbf9fd52beef6f96124f5a3a39c167fc24b052d24d7',
+                'placeholder_key': '<Uint8Array: 0x0000000000000000000000000000000000000000000000000000000000000000>',
+              },
+            },
+          },
+          'transaction': {
+            'inputs': [
+              {
+                'outpointIndex': expect.any(Number),
+                'outpointTransactionHash': expect.stringMatching(/^[0-9a-f]{64}$/),
+                'sequenceNumber': 4294967294,
+                'unlockingBytecode': {
+                  'script': 'p2pkh_placeholder_unlock',
+                  'overrides': {
+                    'keys': {
+                      'privateKeys': {
+                        'placeholder_key': '36f8155c559f3a670586bbbf9fd52beef6f96124f5a3a39c167fc24b052d24d7',
+                      },
+                    },
+                  },
+                },
+              },
+              {
+                'outpointIndex': expect.any(Number),
+                'outpointTransactionHash': expect.stringMatching(/^[0-9a-f]{64}$/),
+                'sequenceNumber': 4294967294,
+                'unlockingBytecode': [
+                  'slot',
+                ],
+              },
+            ],
+            'locktime': 133700,
+            'outputs': [
+              {
+                'lockingBytecode': {},
+                'valueSatoshis': 1000,
+              },
+              {
+                'lockingBytecode': {},
+                'valueSatoshis': expect.any(Number),
+              },
+            ],
+            'version': 2,
+          },
+          'sourceOutputs': [
+            {
+              'lockingBytecode': {
+                'script': 'p2pkh_placeholder_lock',
+                'overrides': {
+                  'keys': {
+                    'privateKeys': {
+                      'placeholder_key': '36f8155c559f3a670586bbbf9fd52beef6f96124f5a3a39c167fc24b052d24d7',
+                    },
+                  },
+                },
+              },
+              'valueSatoshis': expect.any(Number),
+            },
+            {
+              'lockingBytecode': [
+                'slot',
+              ],
+              'valueSatoshis': expect.any(Number),
+            },
+          ],
+        },
+      },
+      'scripts': {
+        'unlock_lock': {
+          'passes': [
+            'evaluate_function',
+          ],
+          'name': 'unlock',
+          'script': '// "spend" function parameters\n<s.schnorr_signature.all_outputs> // sig\n<pk> // pubkey = <0x0373cc07b54c22da627b572a387a20ea190c9382e5e6d48c1d5b89c5cea2c4c088>\n',
+          'unlocks': 'lock',
+        },
+        'lock': {
+          'lockingType': 'p2sh20',
+          'name': 'lock',
+          'script': '// "P2PKH" contract constructor parameters\n<pkh> // bytes20 = <0x512dbb2c8c02efbac8d92431aa0ac33f6b0bf970>\n\n// bytecode\n                                                        /* contract P2PKH(bytes20 pkh) {                                */\n                                                        /*     // Require pk to match stored pkh and signature to match */\n                                                        /*     function spend(pubkey pk, sig s) {                       */\nOP_1 OP_PICK OP_HASH160 OP_1 OP_ROLL OP_EQUAL OP_VERIFY /*         require(hash160(pk) == pkh);                         */\nOP_1 OP_ROLL OP_1 OP_ROLL OP_CHECKSIG                   /*         require(checkSig(s, pk));                            */\n                                                        /*     }                                                        */\n                                                        /* }                                                            */\n                                                        /*                                                              */',
+        },
+        'p2pkh_placeholder_unlock': {
+          'name': 'p2pkh_placeholder_unlock',
+          'script': '<placeholder_key.schnorr_signature.all_outputs>\n<placeholder_key.public_key>',
+          'unlocks': 'p2pkh_placeholder_lock',
+        },
+        'p2pkh_placeholder_lock': {
+          'lockingType': 'standard',
+          'name': 'p2pkh_placeholder_lock',
+          'script': 'OP_DUP\nOP_HASH160 <$(<placeholder_key.public_key> OP_HASH160\n)> OP_EQUALVERIFY\nOP_CHECKSIG',
+        },
+      },
+    },
+  },
 ];
diff --git a/packages/cashscript/test/libauth-template/LibauthTemplate.test.ts b/packages/cashscript/test/libauth-template/LibauthTemplate.test.ts
index 228c8198..1c18fafc 100644
--- a/packages/cashscript/test/libauth-template/LibauthTemplate.test.ts
+++ b/packages/cashscript/test/libauth-template/LibauthTemplate.test.ts
@@ -4,6 +4,8 @@ describe('Libauth Template generation tests', () => {
   fixtures.forEach((fixture) => {
     it(`should generate a valid libauth template for ${fixture.name}`, async () => {
       const generatedTemplate = await fixture.transaction.getLibauthTemplate();
+      console.log(JSON.stringify(generatedTemplate, null, 2));
+      console.log(await fixture.transaction.bitauthUri());
       expect(generatedTemplate).toEqual(fixture.template);
     });
   });

From 62f92c01e4fe33659d29a7d740afdd035fd6d271 Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Fri, 8 Mar 2024 18:32:56 +1100
Subject: [PATCH 076/171] Fix bug with handling of ELSE statements + update
 tests accordingly

---
 .../src/generation/GenerateTargetTraversal.ts |  4 +-
 .../cashscript/test/fixture/announcement.json |  4 +-
 packages/cashscript/test/fixture/bigint.json  |  4 +-
 .../test/fixture/bounded_bytes.json           |  4 +-
 .../cashscript/test/fixture/hodl_vault.json   |  4 +-
 .../test/fixture/libauth-template/fixtures.ts |  2 +-
 packages/cashscript/test/fixture/mecenas.json |  6 +-
 .../cashscript/test/fixture/p2palindrome.json |  4 +-
 packages/cashscript/test/fixture/p2pkh.json   |  4 +-
 .../test/fixture/simple_covenant.json         |  4 +-
 .../test/fixture/transfer_with_timeout.json   |  4 +-
 .../test/fixtures/bitauth-script.fixture.ts   | 79 ++++++++++---------
 12 files changed, 61 insertions(+), 62 deletions(-)

diff --git a/packages/cashc/src/generation/GenerateTargetTraversal.ts b/packages/cashc/src/generation/GenerateTargetTraversal.ts
index aca43ba5..048751d1 100644
--- a/packages/cashc/src/generation/GenerateTargetTraversal.ts
+++ b/packages/cashc/src/generation/GenerateTargetTraversal.ts
@@ -345,9 +345,7 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
     this.removeScopedVariables(stackDepth, node);
 
     if (node.elseBlock) {
-      // TODO: Why would the *start* of the else block be PositionHint.END? Is it because it is also the end of
-      // the if block?
-      this.emit(Op.OP_ELSE, { location: node.elseBlock.location, positionHint: PositionHint.END });
+      this.emit(Op.OP_ELSE, { location: node.elseBlock.location });
       stackDepth = this.stack.length;
       node.elseBlock = this.visit(node.elseBlock);
       this.removeScopedVariables(stackDepth, node);
diff --git a/packages/cashscript/test/fixture/announcement.json b/packages/cashscript/test/fixture/announcement.json
index 5b69e1e1..7971f48a 100644
--- a/packages/cashscript/test/fixture/announcement.json
+++ b/packages/cashscript/test/fixture/announcement.json
@@ -17,7 +17,7 @@
   },
   "compiler": {
     "name": "cashc",
-    "version": "0.10.0-next.0"
+    "version": "0.10.0-next.2"
   },
-  "updatedAt": "2024-02-01T10:15:35.499Z"
+  "updatedAt": "2024-03-08T07:28:42.672Z"
 }
\ No newline at end of file
diff --git a/packages/cashscript/test/fixture/bigint.json b/packages/cashscript/test/fixture/bigint.json
index c0a5b59f..c116835c 100644
--- a/packages/cashscript/test/fixture/bigint.json
+++ b/packages/cashscript/test/fixture/bigint.json
@@ -26,7 +26,7 @@
   },
   "compiler": {
     "name": "cashc",
-    "version": "0.10.0-next.0"
+    "version": "0.10.0-next.2"
   },
-  "updatedAt": "2024-02-01T10:15:35.191Z"
+  "updatedAt": "2024-03-08T07:28:42.372Z"
 }
\ No newline at end of file
diff --git a/packages/cashscript/test/fixture/bounded_bytes.json b/packages/cashscript/test/fixture/bounded_bytes.json
index 39aac5b5..61260f9c 100644
--- a/packages/cashscript/test/fixture/bounded_bytes.json
+++ b/packages/cashscript/test/fixture/bounded_bytes.json
@@ -26,7 +26,7 @@
   },
   "compiler": {
     "name": "cashc",
-    "version": "0.10.0-next.0"
+    "version": "0.10.0-next.2"
   },
-  "updatedAt": "2024-02-01T10:15:36.327Z"
+  "updatedAt": "2024-03-08T07:28:43.531Z"
 }
\ No newline at end of file
diff --git a/packages/cashscript/test/fixture/hodl_vault.json b/packages/cashscript/test/fixture/hodl_vault.json
index 76302e82..a97d918b 100644
--- a/packages/cashscript/test/fixture/hodl_vault.json
+++ b/packages/cashscript/test/fixture/hodl_vault.json
@@ -47,7 +47,7 @@
   },
   "compiler": {
     "name": "cashc",
-    "version": "0.10.0-next.0"
+    "version": "0.10.0-next.2"
   },
-  "updatedAt": "2024-02-01T10:15:35.784Z"
+  "updatedAt": "2024-03-08T07:28:42.957Z"
 }
\ No newline at end of file
diff --git a/packages/cashscript/test/fixture/libauth-template/fixtures.ts b/packages/cashscript/test/fixture/libauth-template/fixtures.ts
index dfaf6ddb..3054175a 100644
--- a/packages/cashscript/test/fixture/libauth-template/fixtures.ts
+++ b/packages/cashscript/test/fixture/libauth-template/fixtures.ts
@@ -379,7 +379,7 @@ export const fixtures: Fixture[] = [
         'lock': {
           'lockingType': 'p2sh20',
           'name': 'lock',
-          'script': "// \"Mecenas\" contract constructor parameters\n<pledge> // int = <0x1027>\n<funder> // bytes20 = <0xb40a2013337edb0dfe307f0a57d5dec5bfe60dd0>\n<recipient> // bytes20 = <0x512dbb2c8c02efbac8d92431aa0ac33f6b0bf970>\n\n// bytecode\n                                                                                         /* pragma cashscript >=0.8.0;                                                                                         */\n                                                                                         /*                                                                                                                    */\n                                                                                         /* /* This is an unofficial CashScript port of Licho's Mecenas contract. It is                                        */\n                                                                                         /*  * not compatible with Licho's EC plugin, but rather meant as a demonstration                                      */\n                                                                                         /*  * of covenants in CashScript.                                                                                     */\n                                                                                         /*  * The time checking has been removed so it can be tested without time requirements.                               */\n                                                                                         /*  */                                                                                                                */\n                                                                                         /* contract Mecenas(bytes20 recipient, bytes20 funder, int pledge/*, int period */) {                                 */\nOP_3 OP_PICK OP_0 OP_NUMEQUAL OP_IF                                                      /*     function receive() {                                                                                           */\n                                                                                         /*         // require(tx.age >= period);                                                                              */\n                                                                                         /*                                                                                                                    */\n                                                                                         /*         // Check that the first output sends to the recipient                                                      */\nOP_0 OP_OUTPUTBYTECODE <0x76a914> OP_2 OP_ROLL OP_CAT <0x88ac> OP_CAT OP_EQUAL OP_VERIFY /*         require(tx.outputs[0].lockingBytecode == new LockingBytecodeP2PKH(recipient));                             */\n                                                                                         /*                                                                                                                    */\n<0xe803>                                                                                 /*         int minerFee = 1000;                                                                                       */\nOP_INPUTINDEX OP_UTXOVALUE                                                               /*         int currentValue = tx.inputs[this.activeInputIndex].value;                                                 */\nOP_0 OP_PICK OP_4 OP_PICK OP_SUB OP_2 OP_PICK OP_SUB                                     /*         int changeValue = currentValue - pledge - minerFee;                                                        */\n                                                                                         /*                                                                                                                    */\n                                                                                         /*         // If there is not enough left for *another* pledge after this one, we send the remainder to the recipient */\n                                                                                         /*         // Otherwise we send the remainder to the recipient and the change back to the contract                    */\nOP_0 OP_PICK OP_5 OP_PICK OP_4 OP_PICK OP_ADD OP_LESSTHANOREQUAL OP_IF                   /*         if (changeValue <= pledge + minerFee) {                                                                    */\nOP_0 OP_OUTPUTVALUE OP_2 OP_PICK OP_4 OP_PICK OP_SUB OP_NUMEQUAL OP_VERIFY               /*             require(tx.outputs[0].value == currentValue - minerFee);                                               */\n                                                                                         /*         } else {                                                                                                   */\nOP_0 OP_OUTPUTVALUE OP_5 OP_PICK OP_NUMEQUAL OP_VERIFY                                   /*             require(tx.outputs[0].value == pledge);                                                                */\nOP_1 OP_OUTPUTBYTECODE OP_INPUTINDEX OP_UTXOBYTECODE OP_EQUAL OP_VERIFY                  /*             require(tx.outputs[1].lockingBytecode == tx.inputs[this.activeInputIndex].lockingBytecode);            */\nOP_1 OP_OUTPUTVALUE OP_1 OP_PICK OP_NUMEQUAL OP_VERIFY                                   /*             require(tx.outputs[1].value == changeValue);                                                           */\nOP_ELSE OP_ENDIF                                                                         /*         }                                                                                                          */\nOP_1 OP_NIP OP_NIP OP_NIP OP_NIP OP_NIP OP_NIP OP_ELSE                                   /*     }                                                                                                              */\n                                                                                         /*                                                                                                                    */\nOP_3 OP_ROLL OP_1 OP_NUMEQUAL OP_VERIFY                                                  /*     function reclaim(pubkey pk, sig s) {                                                                           */\nOP_3 OP_PICK OP_HASH160 OP_2 OP_ROLL OP_EQUAL OP_VERIFY                                  /*         require(hash160(pk) == funder);                                                                            */\nOP_3 OP_ROLL OP_3 OP_ROLL OP_CHECKSIG                                                    /*         require(checkSig(s, pk));                                                                                  */\nOP_NIP OP_NIP                                                                            /*     }                                                                                                              */\nOP_ENDIF                                                                                 /* }                                                                                                                  */\n                                                                                         /*                                                                                                                    */",
+          'script': "// \"Mecenas\" contract constructor parameters\n<pledge> // int = <0x1027>\n<funder> // bytes20 = <0xb40a2013337edb0dfe307f0a57d5dec5bfe60dd0>\n<recipient> // bytes20 = <0x512dbb2c8c02efbac8d92431aa0ac33f6b0bf970>\n\n// bytecode\n                                                                                         /* pragma cashscript >=0.8.0;                                                                                         */\n                                                                                         /*                                                                                                                    */\n                                                                                         /* \\/* This is an unofficial CashScript port of Licho's Mecenas contract. It is                                       */\n                                                                                         /*  * not compatible with Licho's EC plugin, but rather meant as a demonstration                                      */\n                                                                                         /*  * of covenants in CashScript.                                                                                     */\n                                                                                         /*  * The time checking has been removed so it can be tested without time requirements.                               */\n                                                                                         /*  *\\/                                                                                                               */\n                                                                                         /* contract Mecenas(bytes20 recipient, bytes20 funder, int pledge\\/*, int period *\\/) {                               */\nOP_3 OP_PICK OP_0 OP_NUMEQUAL OP_IF                                                      /*     function receive() {                                                                                           */\n                                                                                         /*         // require(tx.age >= period);                                                                              */\n                                                                                         /*                                                                                                                    */\n                                                                                         /*         // Check that the first output sends to the recipient                                                      */\nOP_0 OP_OUTPUTBYTECODE <0x76a914> OP_2 OP_ROLL OP_CAT <0x88ac> OP_CAT OP_EQUAL OP_VERIFY /*         require(tx.outputs[0].lockingBytecode == new LockingBytecodeP2PKH(recipient));                             */\n                                                                                         /*                                                                                                                    */\n<0xe803>                                                                                 /*         int minerFee = 1000;                                                                                       */\nOP_INPUTINDEX OP_UTXOVALUE                                                               /*         int currentValue = tx.inputs[this.activeInputIndex].value;                                                 */\nOP_0 OP_PICK OP_4 OP_PICK OP_SUB OP_2 OP_PICK OP_SUB                                     /*         int changeValue = currentValue - pledge - minerFee;                                                        */\n                                                                                         /*                                                                                                                    */\n                                                                                         /*         // If there is not enough left for *another* pledge after this one, we send the remainder to the recipient */\n                                                                                         /*         // Otherwise we send the remainder to the recipient and the change back to the contract                    */\nOP_0 OP_PICK OP_5 OP_PICK OP_4 OP_PICK OP_ADD OP_LESSTHANOREQUAL OP_IF                   /*         if (changeValue <= pledge + minerFee) {                                                                    */\nOP_0 OP_OUTPUTVALUE OP_2 OP_PICK OP_4 OP_PICK OP_SUB OP_NUMEQUAL OP_VERIFY               /*             require(tx.outputs[0].value == currentValue - minerFee);                                               */\nOP_ELSE                                                                                  /*         } else {                                                                                                   */\nOP_0 OP_OUTPUTVALUE OP_5 OP_PICK OP_NUMEQUAL OP_VERIFY                                   /*             require(tx.outputs[0].value == pledge);                                                                */\nOP_1 OP_OUTPUTBYTECODE OP_INPUTINDEX OP_UTXOBYTECODE OP_EQUAL OP_VERIFY                  /*             require(tx.outputs[1].lockingBytecode == tx.inputs[this.activeInputIndex].lockingBytecode);            */\nOP_1 OP_OUTPUTVALUE OP_1 OP_PICK OP_NUMEQUAL OP_VERIFY                                   /*             require(tx.outputs[1].value == changeValue);                                                           */\nOP_ENDIF                                                                                 /*         }                                                                                                          */\nOP_1 OP_NIP OP_NIP OP_NIP OP_NIP OP_NIP OP_NIP OP_ELSE                                   /*     }                                                                                                              */\n                                                                                         /*                                                                                                                    */\nOP_3 OP_ROLL OP_1 OP_NUMEQUAL OP_VERIFY                                                  /*     function reclaim(pubkey pk, sig s) {                                                                           */\nOP_3 OP_PICK OP_HASH160 OP_2 OP_ROLL OP_EQUAL OP_VERIFY                                  /*         require(hash160(pk) == funder);                                                                            */\nOP_3 OP_ROLL OP_3 OP_ROLL OP_CHECKSIG                                                    /*         require(checkSig(s, pk));                                                                                  */\nOP_NIP OP_NIP                                                                            /*     }                                                                                                              */\nOP_ENDIF                                                                                 /* }                                                                                                                  */\n                                                                                         /*                                                                                                                    */",
         },
       },
     },
diff --git a/packages/cashscript/test/fixture/mecenas.json b/packages/cashscript/test/fixture/mecenas.json
index d619a3e9..37e70e38 100644
--- a/packages/cashscript/test/fixture/mecenas.json
+++ b/packages/cashscript/test/fixture/mecenas.json
@@ -37,13 +37,13 @@
   "source": "pragma cashscript >=0.8.0;\n\n/* This is an unofficial CashScript port of Licho's Mecenas contract. It is\n * not compatible with Licho's EC plugin, but rather meant as a demonstration\n * of covenants in CashScript.\n * The time checking has been removed so it can be tested without time requirements.\n */\ncontract Mecenas(bytes20 recipient, bytes20 funder, int pledge/*, int period */) {\n    function receive() {\n        // require(tx.age >= period);\n\n        // Check that the first output sends to the recipient\n        require(tx.outputs[0].lockingBytecode == new LockingBytecodeP2PKH(recipient));\n\n        int minerFee = 1000;\n        int currentValue = tx.inputs[this.activeInputIndex].value;\n        int changeValue = currentValue - pledge - minerFee;\n\n        // If there is not enough left for *another* pledge after this one, we send the remainder to the recipient\n        // Otherwise we send the remainder to the recipient and the change back to the contract\n        if (changeValue <= pledge + minerFee) {\n            require(tx.outputs[0].value == currentValue - minerFee);\n        } else {\n            require(tx.outputs[0].value == pledge);\n            require(tx.outputs[1].lockingBytecode == tx.inputs[this.activeInputIndex].lockingBytecode);\n            require(tx.outputs[1].value == changeValue);\n        }\n    }\n\n    function reclaim(pubkey pk, sig s) {\n        require(hash160(pk) == funder);\n        require(checkSig(s, pk));\n    }\n}\n",
   "debug": {
     "bytecode": "5379009c6300cd0376a914527a7e0288ac7e876902e803c0c6007954799452799400795579547993a16300cc52795479949c696700cc55799c6951cdc0c7876951cc51799c69685177777777777767537a519c695379a9527a8769537a537aac777768",
-    "sourceMap": "9:4:28:5;;;;;13:27:13:28;:16::45;:49::84;:74::83;;:49::84;;;:16:::1;:8::86;15:23:15:27:0;16:37:16:58;:27::65;17:26:17:38;;:41::47;;:26:::1;:50::58:0;;:26:::1;21:12:21:23:0;;:27::33;;:36::44;;:27:::1;:12;:46:23:9:0;22:31:22:32;:20::39;:43::55;;:58::66;;:43:::1;:20;:12::68;23:15:27:9;24:31:24:32:0;:20::39;:43::49;;:20:::1;:12::51;25:31:25:32:0;:20::49;:63::84;:53::101;:20:::1;:12::103;26:31:26:32:0;:20::39;:43::54;;:20:::1;:12::56;23:15:27:9;9:4:28:5;;;;;;;;30::33::0;;;;;31:24:31:26;;:16::27:1;:31::37:0;;:16:::1;:8::39;32:25:32:26:0;;:28::30;;:16::31:1;30:4:33:5;;8:0:34:1",
+    "sourceMap": "9:4:28:5;;;;;13:27:13:28;:16::45;:49::84;:74::83;;:49::84;;;:16:::1;:8::86;15:23:15:27:0;16:37:16:58;:27::65;17:26:17:38;;:41::47;;:26:::1;:50::58:0;;:26:::1;21:12:21:23:0;;:27::33;;:36::44;;:27:::1;:12;:46:23:9:0;22:31:22:32;:20::39;:43::55;;:58::66;;:43:::1;:20;:12::68;23:15:27:9:0;24:31:24:32;:20::39;:43::49;;:20:::1;:12::51;25:31:25:32:0;:20::49;:63::84;:53::101;:20:::1;:12::103;26:31:26:32:0;:20::39;:43::54;;:20:::1;:12::56;23:15:27:9;9:4:28:5;;;;;;;;30::33::0;;;;;31:24:31:26;;:16::27:1;:31::37:0;;:16:::1;:8::39;32:25:32:26:0;;:28::30;;:16::31:1;30:4:33:5;;8:0:34:1",
     "logs": [],
     "requireMessages": []
   },
   "compiler": {
     "name": "cashc",
-    "version": "0.10.0-next.0"
+    "version": "0.10.0-next.2"
   },
-  "updatedAt": "2024-02-01T10:15:37.487Z"
+  "updatedAt": "2024-03-08T07:28:44.590Z"
 }
\ No newline at end of file
diff --git a/packages/cashscript/test/fixture/p2palindrome.json b/packages/cashscript/test/fixture/p2palindrome.json
index fffdbd33..1a91fdbc 100644
--- a/packages/cashscript/test/fixture/p2palindrome.json
+++ b/packages/cashscript/test/fixture/p2palindrome.json
@@ -22,7 +22,7 @@
   },
   "compiler": {
     "name": "cashc",
-    "version": "0.10.0-next.0"
+    "version": "0.10.0-next.2"
   },
-  "updatedAt": "2024-02-01T10:15:36.058Z"
+  "updatedAt": "2024-03-08T07:28:43.277Z"
 }
\ No newline at end of file
diff --git a/packages/cashscript/test/fixture/p2pkh.json b/packages/cashscript/test/fixture/p2pkh.json
index da74a75d..9d5d4d11 100644
--- a/packages/cashscript/test/fixture/p2pkh.json
+++ b/packages/cashscript/test/fixture/p2pkh.json
@@ -31,7 +31,7 @@
   },
   "compiler": {
     "name": "cashc",
-    "version": "0.10.0-next.0"
+    "version": "0.10.0-next.2"
   },
-  "updatedAt": "2024-02-01T10:15:37.188Z"
+  "updatedAt": "2024-03-08T07:28:44.330Z"
 }
\ No newline at end of file
diff --git a/packages/cashscript/test/fixture/simple_covenant.json b/packages/cashscript/test/fixture/simple_covenant.json
index f8ee9361..e1e8f0d2 100644
--- a/packages/cashscript/test/fixture/simple_covenant.json
+++ b/packages/cashscript/test/fixture/simple_covenant.json
@@ -17,7 +17,7 @@
   },
   "compiler": {
     "name": "cashc",
-    "version": "0.10.0-next.0"
+    "version": "0.10.0-next.2"
   },
-  "updatedAt": "2024-02-01T10:15:36.616Z"
+  "updatedAt": "2024-03-08T07:28:43.800Z"
 }
\ No newline at end of file
diff --git a/packages/cashscript/test/fixture/transfer_with_timeout.json b/packages/cashscript/test/fixture/transfer_with_timeout.json
index 88f7dbd3..bd14c019 100644
--- a/packages/cashscript/test/fixture/transfer_with_timeout.json
+++ b/packages/cashscript/test/fixture/transfer_with_timeout.json
@@ -44,7 +44,7 @@
   },
   "compiler": {
     "name": "cashc",
-    "version": "0.10.0-next.0"
+    "version": "0.10.0-next.2"
   },
-  "updatedAt": "2024-02-01T10:15:36.909Z"
+  "updatedAt": "2024-03-08T07:28:44.062Z"
 }
\ No newline at end of file
diff --git a/packages/utils/test/fixtures/bitauth-script.fixture.ts b/packages/utils/test/fixtures/bitauth-script.fixture.ts
index 07c60582..29b65ec9 100644
--- a/packages/utils/test/fixtures/bitauth-script.fixture.ts
+++ b/packages/utils/test/fixtures/bitauth-script.fixture.ts
@@ -124,49 +124,50 @@ contract Mecenas(bytes20 recipient, bytes20 funder, int pledge/*, int period */)
         require(hash160(pk) == funder);
         require(checkSig(s, pk));
     }
-}`,
+}`.replace(/^\n+/, '').replace(/\n+$/, ''),
     asmBytecode: 'OP_3 OP_PICK OP_0 OP_NUMEQUAL OP_IF OP_0 OP_OUTPUTBYTECODE 76a914 OP_2 OP_ROLL OP_CAT 88ac OP_CAT OP_EQUAL OP_VERIFY e803 OP_INPUTINDEX OP_UTXOVALUE OP_0 OP_PICK OP_4 OP_PICK OP_SUB OP_2 OP_PICK OP_SUB OP_0 OP_PICK OP_5 OP_PICK OP_4 OP_PICK OP_ADD OP_LESSTHANOREQUAL OP_IF OP_0 OP_OUTPUTVALUE OP_2 OP_PICK OP_4 OP_PICK OP_SUB OP_NUMEQUAL OP_VERIFY OP_ELSE OP_0 OP_OUTPUTVALUE OP_5 OP_PICK OP_NUMEQUAL OP_VERIFY OP_1 OP_OUTPUTBYTECODE OP_INPUTINDEX OP_UTXOBYTECODE OP_EQUAL OP_VERIFY OP_1 OP_OUTPUTVALUE OP_1 OP_PICK OP_NUMEQUAL OP_VERIFY OP_ENDIF OP_1 OP_NIP OP_NIP OP_NIP OP_NIP OP_NIP OP_NIP OP_ELSE OP_3 OP_ROLL OP_1 OP_NUMEQUAL OP_VERIFY OP_3 OP_PICK OP_HASH160 OP_2 OP_ROLL OP_EQUAL OP_VERIFY OP_3 OP_ROLL OP_3 OP_ROLL OP_CHECKSIG OP_NIP OP_NIP OP_ENDIF',
-    sourceMap: '10:4:29:5;;;;;14:27:14:28;:16::45;:49::84;:74::83;;:49::84;;;:16:::1;:8::86;16:23:16:27:0;17:37:17:58;:27::65;18:26:18:38;;:41::47;;:26:::1;:50::58:0;;:26:::1;22:12:22:23:0;;:27::33;;:36::44;;:27:::1;:12;:46:24:9:0;23:31:23:32;:20::39;:43::55;;:58::66;;:43:::1;:20;:12::68;24:15:28:9;25:31:25:32:0;:20::39;:43::49;;:20:::1;:12::51;26:31:26:32:0;:20::49;:63::84;:53::101;:20:::1;:12::103;27:31:27:32:0;:20::39;:43::54;;:20:::1;:12::56;24:15:28:9;10:4:29:5;;;;;;;;31::34::0;;;;;32:24:32:26;;:16::27:1;:31::37:0;;:16:::1;:8::39;33:25:33:26:0;;:28::30;;:16::31:1;31:4:34:5;;9:0:35:1',
+    sourceMap: '9:4:28:5;;;;;13:27:13:28;:16::45;:49::84;:74::83;;:49::84;;;:16:::1;:8::86;15:23:15:27:0;16:37:16:58;:27::65;17:26:17:38;;:41::47;;:26:::1;:50::58:0;;:26:::1;21:12:21:23:0;;:27::33;;:36::44;;:27:::1;:12;:46:23:9:0;22:31:22:32;:20::39;:43::55;;:58::66;;:43:::1;:20;:12::68;23:15:27:9:0;24:31:24:32;:20::39;:43::49;;:20:::1;:12::51;25:31:25:32:0;:20::49;:63::84;:53::101;:20:::1;:12::103;26:31:26:32:0;:20::39;:43::54;;:20:::1;:12::56;23:15:27:9;9:4:28:5;;;;;;;;30::33::0;;;;;31:24:31:26;;:16::27:1;:31::37:0;;:16:::1;:8::39;32:25:32:26:0;;:28::30;;:16::31:1;30:4:33:5;;8:0:34:1',
     expectedLineToOpcodeMap: {
-      10: [Op.OP_3, Op.OP_PICK, new Uint8Array([]), Op.OP_NUMEQUAL, Op.OP_IF],
-      14: [new Uint8Array([]), Op.OP_OUTPUTBYTECODE, hexToBin('76a914'), Op.OP_2, Op.OP_ROLL, Op.OP_CAT, hexToBin('88ac'), Op.OP_CAT, Op.OP_EQUAL, Op.OP_VERIFY],
-      16: [hexToBin('e803')],
-      17: [Op.OP_INPUTINDEX, Op.OP_UTXOVALUE],
-      18: [new Uint8Array([]), Op.OP_PICK, Op.OP_4, Op.OP_PICK, Op.OP_SUB, Op.OP_2, Op.OP_PICK, Op.OP_SUB],
-      22: [new Uint8Array([]), Op.OP_PICK, Op.OP_5, Op.OP_PICK, Op.OP_4, Op.OP_PICK, Op.OP_ADD, Op.OP_LESSTHANOREQUAL, Op.OP_IF],
-      23: [new Uint8Array([]), Op.OP_OUTPUTVALUE, Op.OP_2, Op.OP_PICK, Op.OP_4, Op.OP_PICK, Op.OP_SUB, Op.OP_NUMEQUAL, Op.OP_VERIFY],
-      25: [new Uint8Array([]), Op.OP_OUTPUTVALUE, Op.OP_5, Op.OP_PICK, Op.OP_NUMEQUAL, Op.OP_VERIFY],
-      26: [Op.OP_1, Op.OP_OUTPUTBYTECODE, Op.OP_INPUTINDEX, Op.OP_UTXOBYTECODE, Op.OP_EQUAL, Op.OP_VERIFY],
-      27: [Op.OP_1, Op.OP_OUTPUTVALUE, Op.OP_1, Op.OP_PICK, Op.OP_NUMEQUAL, Op.OP_VERIFY],
-      28: [Op.OP_ELSE, Op.OP_ENDIF],
-      29: [Op.OP_1, Op.OP_NIP, Op.OP_NIP, Op.OP_NIP, Op.OP_NIP, Op.OP_NIP, Op.OP_NIP, Op.OP_ELSE],
-      31: [Op.OP_3, Op.OP_ROLL, Op.OP_1, Op.OP_NUMEQUAL, Op.OP_VERIFY],
-      32: [Op.OP_3, Op.OP_PICK, Op.OP_HASH160, Op.OP_2, Op.OP_ROLL, Op.OP_EQUAL, Op.OP_VERIFY],
-      33: [Op.OP_3, Op.OP_ROLL, Op.OP_3, Op.OP_ROLL, Op.OP_CHECKSIG],
-      34: [Op.OP_NIP, Op.OP_NIP],
-      35: [Op.OP_ENDIF],
+      9: [Op.OP_3, Op.OP_PICK, new Uint8Array([]), Op.OP_NUMEQUAL, Op.OP_IF],
+      13: [new Uint8Array([]), Op.OP_OUTPUTBYTECODE, hexToBin('76a914'), Op.OP_2, Op.OP_ROLL, Op.OP_CAT, hexToBin('88ac'), Op.OP_CAT, Op.OP_EQUAL, Op.OP_VERIFY],
+      15: [hexToBin('e803')],
+      16: [Op.OP_INPUTINDEX, Op.OP_UTXOVALUE],
+      17: [new Uint8Array([]), Op.OP_PICK, Op.OP_4, Op.OP_PICK, Op.OP_SUB, Op.OP_2, Op.OP_PICK, Op.OP_SUB],
+      21: [new Uint8Array([]), Op.OP_PICK, Op.OP_5, Op.OP_PICK, Op.OP_4, Op.OP_PICK, Op.OP_ADD, Op.OP_LESSTHANOREQUAL, Op.OP_IF],
+      22: [new Uint8Array([]), Op.OP_OUTPUTVALUE, Op.OP_2, Op.OP_PICK, Op.OP_4, Op.OP_PICK, Op.OP_SUB, Op.OP_NUMEQUAL, Op.OP_VERIFY],
+      23: [Op.OP_ELSE],
+      24: [new Uint8Array([]), Op.OP_OUTPUTVALUE, Op.OP_5, Op.OP_PICK, Op.OP_NUMEQUAL, Op.OP_VERIFY],
+      25: [Op.OP_1, Op.OP_OUTPUTBYTECODE, Op.OP_INPUTINDEX, Op.OP_UTXOBYTECODE, Op.OP_EQUAL, Op.OP_VERIFY],
+      26: [Op.OP_1, Op.OP_OUTPUTVALUE, Op.OP_1, Op.OP_PICK, Op.OP_NUMEQUAL, Op.OP_VERIFY],
+      27: [Op.OP_ENDIF],
+      28: [Op.OP_1, Op.OP_NIP, Op.OP_NIP, Op.OP_NIP, Op.OP_NIP, Op.OP_NIP, Op.OP_NIP, Op.OP_ELSE],
+      30: [Op.OP_3, Op.OP_ROLL, Op.OP_1, Op.OP_NUMEQUAL, Op.OP_VERIFY],
+      31: [Op.OP_3, Op.OP_PICK, Op.OP_HASH160, Op.OP_2, Op.OP_ROLL, Op.OP_EQUAL, Op.OP_VERIFY],
+      32: [Op.OP_3, Op.OP_ROLL, Op.OP_3, Op.OP_ROLL, Op.OP_CHECKSIG],
+      33: [Op.OP_NIP, Op.OP_NIP],
+      34: [Op.OP_ENDIF],
     },
     expectedLineToAsmMap: {
-      10: 'OP_3 OP_PICK OP_0 OP_NUMEQUAL OP_IF',
-      14: 'OP_0 OP_OUTPUTBYTECODE <0x76a914> OP_2 OP_ROLL OP_CAT <0x88ac> OP_CAT OP_EQUAL OP_VERIFY',
-      16: '<0xe803>',
-      17: 'OP_INPUTINDEX OP_UTXOVALUE',
-      18: 'OP_0 OP_PICK OP_4 OP_PICK OP_SUB OP_2 OP_PICK OP_SUB',
-      22: 'OP_0 OP_PICK OP_5 OP_PICK OP_4 OP_PICK OP_ADD OP_LESSTHANOREQUAL OP_IF',
-      23: 'OP_0 OP_OUTPUTVALUE OP_2 OP_PICK OP_4 OP_PICK OP_SUB OP_NUMEQUAL OP_VERIFY',
-      25: 'OP_0 OP_OUTPUTVALUE OP_5 OP_PICK OP_NUMEQUAL OP_VERIFY',
-      26: 'OP_1 OP_OUTPUTBYTECODE OP_INPUTINDEX OP_UTXOBYTECODE OP_EQUAL OP_VERIFY',
-      27: 'OP_1 OP_OUTPUTVALUE OP_1 OP_PICK OP_NUMEQUAL OP_VERIFY',
-      28: 'OP_ELSE OP_ENDIF',
-      29: 'OP_1 OP_NIP OP_NIP OP_NIP OP_NIP OP_NIP OP_NIP OP_ELSE',
-      31: 'OP_3 OP_ROLL OP_1 OP_NUMEQUAL OP_VERIFY',
-      32: 'OP_3 OP_PICK OP_HASH160 OP_2 OP_ROLL OP_EQUAL OP_VERIFY',
-      33: 'OP_3 OP_ROLL OP_3 OP_ROLL OP_CHECKSIG',
-      34: 'OP_NIP OP_NIP',
-      35: 'OP_ENDIF',
+      9: 'OP_3 OP_PICK OP_0 OP_NUMEQUAL OP_IF',
+      13: 'OP_0 OP_OUTPUTBYTECODE <0x76a914> OP_2 OP_ROLL OP_CAT <0x88ac> OP_CAT OP_EQUAL OP_VERIFY',
+      15: '<0xe803>',
+      16: 'OP_INPUTINDEX OP_UTXOVALUE',
+      17: 'OP_0 OP_PICK OP_4 OP_PICK OP_SUB OP_2 OP_PICK OP_SUB',
+      21: 'OP_0 OP_PICK OP_5 OP_PICK OP_4 OP_PICK OP_ADD OP_LESSTHANOREQUAL OP_IF',
+      22: 'OP_0 OP_OUTPUTVALUE OP_2 OP_PICK OP_4 OP_PICK OP_SUB OP_NUMEQUAL OP_VERIFY',
+      23: 'OP_ELSE',
+      24: 'OP_0 OP_OUTPUTVALUE OP_5 OP_PICK OP_NUMEQUAL OP_VERIFY',
+      25: 'OP_1 OP_OUTPUTBYTECODE OP_INPUTINDEX OP_UTXOBYTECODE OP_EQUAL OP_VERIFY',
+      26: 'OP_1 OP_OUTPUTVALUE OP_1 OP_PICK OP_NUMEQUAL OP_VERIFY',
+      27: 'OP_ENDIF',
+      28: 'OP_1 OP_NIP OP_NIP OP_NIP OP_NIP OP_NIP OP_NIP OP_ELSE',
+      30: 'OP_3 OP_ROLL OP_1 OP_NUMEQUAL OP_VERIFY',
+      31: 'OP_3 OP_PICK OP_HASH160 OP_2 OP_ROLL OP_EQUAL OP_VERIFY',
+      32: 'OP_3 OP_ROLL OP_3 OP_ROLL OP_CHECKSIG',
+      33: 'OP_NIP OP_NIP',
+      34: 'OP_ENDIF',
     },
     expectedBitAuthScript: `
-                                                                                         /*                                                                                                                    */
                                                                                          /* pragma cashscript >=0.8.0;                                                                                         */
                                                                                          /*                                                                                                                    */
                                                                                          /* \\/* This is an unofficial CashScript port of Licho's Mecenas contract. It is                                       */
@@ -189,11 +190,11 @@ OP_0 OP_PICK OP_4 OP_PICK OP_SUB OP_2 OP_PICK OP_SUB
                                                                                          /*         // Otherwise we send the remainder to the recipient and the change back to the contract                    */
 OP_0 OP_PICK OP_5 OP_PICK OP_4 OP_PICK OP_ADD OP_LESSTHANOREQUAL OP_IF                   /*         if (changeValue <= pledge + minerFee) {                                                                    */
 OP_0 OP_OUTPUTVALUE OP_2 OP_PICK OP_4 OP_PICK OP_SUB OP_NUMEQUAL OP_VERIFY               /*             require(tx.outputs[0].value == currentValue - minerFee);                                               */
-                                                                                         /*         } else {                                                                                                   */
+OP_ELSE                                                                                  /*         } else {                                                                                                   */
 OP_0 OP_OUTPUTVALUE OP_5 OP_PICK OP_NUMEQUAL OP_VERIFY                                   /*             require(tx.outputs[0].value == pledge);                                                                */
 OP_1 OP_OUTPUTBYTECODE OP_INPUTINDEX OP_UTXOBYTECODE OP_EQUAL OP_VERIFY                  /*             require(tx.outputs[1].lockingBytecode == tx.inputs[this.activeInputIndex].lockingBytecode);            */
 OP_1 OP_OUTPUTVALUE OP_1 OP_PICK OP_NUMEQUAL OP_VERIFY                                   /*             require(tx.outputs[1].value == changeValue);                                                           */
-OP_ELSE OP_ENDIF                                                                         /*         }                                                                                                          */
+OP_ENDIF                                                                                 /*         }                                                                                                          */
 OP_1 OP_NIP OP_NIP OP_NIP OP_NIP OP_NIP OP_NIP OP_ELSE                                   /*     }                                                                                                              */
                                                                                          /*                                                                                                                    */
 OP_3 OP_ROLL OP_1 OP_NUMEQUAL OP_VERIFY                                                  /*     function reclaim(pubkey pk, sig s) {                                                                           */

From f96706ff79779cae10f91dfdf131884531742c14 Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Tue, 19 Mar 2024 17:11:25 +1100
Subject: [PATCH 077/171] Bump version to 0.10.0-next.3

---
 examples/package.json            | 6 +++---
 packages/cashc/package.json      | 4 ++--
 packages/cashc/src/index.ts      | 2 +-
 packages/cashscript/package.json | 4 ++--
 packages/utils/package.json      | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/examples/package.json b/examples/package.json
index a6faa511..d508aefa 100644
--- a/examples/package.json
+++ b/examples/package.json
@@ -1,7 +1,7 @@
 {
   "name": "cashscript-examples",
   "private": true,
-  "version": "0.10.0-next.2",
+  "version": "0.10.0-next.3",
   "description": "Usage examples of the CashScript SDK",
   "main": "p2pkh.js",
   "type": "module",
@@ -14,8 +14,8 @@
     "@bitauth/libauth": "^2.0.0-alpha.8",
     "@types/node": "^12.7.8",
     "bip39": "^3.0.4",
-    "cashc": "^0.10.0-next.2",
-    "cashscript": "^0.10.0-next.2",
+    "cashc": "^0.10.0-next.3",
+    "cashscript": "^0.10.0-next.3",
     "eslint": "^8.56.0",
     "typescript": "^4.9.5"
   }
diff --git a/packages/cashc/package.json b/packages/cashc/package.json
index c7b449c3..3999f4c7 100644
--- a/packages/cashc/package.json
+++ b/packages/cashc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cashc",
-  "version": "0.10.0-next.2",
+  "version": "0.10.0-next.3",
   "description": "Compile Bitcoin Cash contracts to Bitcoin Cash Script or artifacts",
   "keywords": [
     "bitcoin",
@@ -50,7 +50,7 @@
   },
   "dependencies": {
     "@bitauth/libauth": "^2.0.0",
-    "@cashscript/utils": "^0.10.0-next.2",
+    "@cashscript/utils": "^0.10.0-next.3",
     "antlr4": "^4.13.1-patch-1",
     "commander": "^7.1.0",
     "semver": "^7.5.4"
diff --git a/packages/cashc/src/index.ts b/packages/cashc/src/index.ts
index 4273a82c..37cf20d1 100644
--- a/packages/cashc/src/index.ts
+++ b/packages/cashc/src/index.ts
@@ -2,4 +2,4 @@ export * from './Errors.js';
 export * as utils from '@cashscript/utils';
 export { compileFile, compileString } from './compiler.js';
 
-export const version = '0.10.0-next.2';
+export const version = '0.10.0-next.3';
diff --git a/packages/cashscript/package.json b/packages/cashscript/package.json
index 94587610..82de41d2 100644
--- a/packages/cashscript/package.json
+++ b/packages/cashscript/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cashscript",
-  "version": "0.10.0-next.2",
+  "version": "0.10.0-next.3",
   "description": "Easily write and interact with Bitcoin Cash contracts",
   "keywords": [
     "bitcoin cash",
@@ -44,7 +44,7 @@
   },
   "dependencies": {
     "@bitauth/libauth": "^2.0.0",
-    "@cashscript/utils": "^0.10.0-next.2",
+    "@cashscript/utils": "^0.10.0-next.3",
     "bip68": "^1.0.4",
     "bitcoin-rpc-promise-retry": "^1.3.0",
     "delay": "^5.0.0",
diff --git a/packages/utils/package.json b/packages/utils/package.json
index d2ff60f5..615bdd23 100644
--- a/packages/utils/package.json
+++ b/packages/utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cashscript/utils",
-  "version": "0.10.0-next.2",
+  "version": "0.10.0-next.3",
   "description": "CashScript utilities and types",
   "keywords": [
     "bitcoin cash",

From 1b66bdb92f972d311d968667290e96085d7fcdc7 Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Tue, 19 Mar 2024 17:26:17 +1100
Subject: [PATCH 078/171] Fix failing tests

---
 packages/cashc/test/generation/fixtures.ts         | 6 +++---
 packages/utils/test/fixtures/source-map.fixture.ts | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/cashc/test/generation/fixtures.ts b/packages/cashc/test/generation/fixtures.ts
index b8b2a8f7..f3f4efeb 100644
--- a/packages/cashc/test/generation/fixtures.ts
+++ b/packages/cashc/test/generation/fixtures.ts
@@ -102,7 +102,7 @@ export const fixtures: Fixture[] = [
         bytecode: '527954799300795479940079537a52949c6300795579935479517993527a757c00795279a0697567007954799c69680079547a93007a537a9c777777',
         logs: [],
         requireMessages: [],
-        sourceMap: '3:16:3:17;;:20::21;;:16:::1;4:12:4:13:0;;:16::17;;:12:::1;5::5:13:0;;:17::18;;:21::22;:17:::1;:12;:24:9:9:0;6:20:6:21;;:24::25;;:20:::1;7:16:7:17:0;;:20::21;;:16:::1;:12::22:0;;;;8:20:8:21;;:24::25;;:20:::1;:12::27;5:8:11:9:0;9:15:::1;10:20:10:21:0;;:25::26;;:20:::1;:12::28;9:15:11:9;12:12:12:13:0;;:16::17;;:12:::1;13:16:13::0;;:21::22;;:16:::1;2:4:14:5;;',
+        sourceMap: '3:16:3:17;;:20::21;;:16:::1;4:12:4:13:0;;:16::17;;:12:::1;5::5:13:0;;:17::18;;:21::22;:17:::1;:12;:24:9:9:0;6:20:6:21;;:24::25;;:20:::1;7:16:7:17:0;;:20::21;;:16:::1;:12::22:0;;;;8:20:8:21;;:24::25;;:20:::1;:12::27;5:8:11:9:0;9:15;10:20:10:21;;:25::26;;:20:::1;:12::28;9:15:11:9;12:12:12:13:0;;:16::17;;:12:::1;13:16:13::0;;:21::22;;:16:::1;2:4:14:5;;',
       },
       source: fs.readFileSync(new URL('../valid-contract-files/if_statement.cash', import.meta.url), { encoding: 'utf-8' }),
       compiler: {
@@ -205,7 +205,7 @@ export const fixtures: Fixture[] = [
         bytecode: '5279009c63537955799300795579940079537a9c6300795679935579517993527a757c00795279a06975675479517a75680079557a93007a537a9c69517777777767527a519c695279007952930079537a9c6300795479930079527993527a757c00795279a0697568537a007a537a9c777768',
         logs: [],
         requireMessages: [],
-        sourceMap: '2:4:14:5;;;;;3:16:3:17;;:20::21;;:16:::1;4:12:4:13:0;;:16::17;;:12:::1;5::5:13:0;;:17::18;;:12:::1;:20:9:9:0;6::6:21;;:24::25;;:20:::1;7:16:7:17:0;;:20::21;;:16:::1;:12::22:0;;;;8:20:8:21;;:24::25;;:20:::1;:12::27;5:8:11:9:0;9:15:::1;10:16:10:17:0;;:12::18;;;9:15:11:9:1;12:12:12:13:0;;:16::17;;:12:::1;13:16:13::0;;:21::22;;:16:::1;:8::24;2:4:14:5;;;;;;16::26::0;;;;;17:16:17:17;;18:12:18:13;;:16::17;:12:::1;19::19:13:0;;:17::18;;:12:::1;:20:23:9:0;20::20:21;;:24::25;;:20:::1;21:16:21:17:0;;:20::21;;:16:::1;:12::22:0;;;;22:20:22:21;;:24::25;;:20:::1;:12::27;19:8:23:9:0;:20:::1;24:12:24:13:0;;25:16:25:17;;:21::22;;:16:::1;16:4:26:5;;1:0:27:1',
+        sourceMap: '2:4:14:5;;;;;3:16:3:17;;:20::21;;:16:::1;4:12:4:13:0;;:16::17;;:12:::1;5::5:13:0;;:17::18;;:12:::1;:20:9:9:0;6::6:21;;:24::25;;:20:::1;7:16:7:17:0;;:20::21;;:16:::1;:12::22:0;;;;8:20:8:21;;:24::25;;:20:::1;:12::27;5:8:11:9:0;9:15;10:16:10:17;;:12::18;;;9:15:11:9:1;12:12:12:13:0;;:16::17;;:12:::1;13:16:13::0;;:21::22;;:16:::1;:8::24;2:4:14:5;;;;;;16::26::0;;;;;17:16:17:17;;18:12:18:13;;:16::17;:12:::1;19::19:13:0;;:17::18;;:12:::1;:20:23:9:0;20::20:21;;:24::25;;:20:::1;21:16:21:17:0;;:20::21;;:16:::1;:12::22:0;;;;22:20:22:21;;:24::25;;:20:::1;:12::27;19:8:23:9:0;:20:::1;24:12:24:13:0;;25:16:25:17;;:21::22;;:16:::1;16:4:26:5;;1:0:27:1',
       },
       source: fs.readFileSync(new URL('../valid-contract-files/multifunction_if_statements.cash', import.meta.url), { encoding: 'utf-8' }),
       compiler: {
@@ -540,7 +540,7 @@ export const fixtures: Fixture[] = [
         bytecode: '5479009c63537ab27500cd0376a914527a7e0288ac7e876902e803c0c6007954799452799400795579547993a16300cc52795479949c696700cc55799c6951cdc0c7876951cc51799c69685177777777777767547a519c695479a9527a8769547a547aac77777768',
         logs: [],
         requireMessages: [],
-        sourceMap: '2:4:21:5;;;;;3:26:3:32;;:8::34:1;;6:27:6:28:0;:16::45;:49::84;:74::83;;:49::84;;;:16:::1;:8::86;8:23:8:27:0;9:37:9:58;:27::65;10:26:10:38;;:41::47;;:26:::1;:50::58:0;;:26:::1;14:12:14:23:0;;:27::33;;:36::44;;:27:::1;:12;:46:16:9:0;15:31:15:32;:20::39;:43::55;;:58::66;;:43:::1;:20;:12::68;16:15:20:9;17:31:17:32:0;:20::39;:43::49;;:20:::1;:12::51;18:31:18:32:0;:20::49;:63::84;:53::101;:20:::1;:12::103;19:31:19:32:0;:20::39;:43::54;;:20:::1;:12::56;16:15:20:9;2:4:21:5;;;;;;;;23::26::0;;;;;24:24:24:26;;:16::27:1;:31::37:0;;:16:::1;:8::39;25:25:25:26:0;;:28::30;;:16::31:1;23:4:26:5;;;1:0:27:1',
+        sourceMap: '2:4:21:5;;;;;3:26:3:32;;:8::34:1;;6:27:6:28:0;:16::45;:49::84;:74::83;;:49::84;;;:16:::1;:8::86;8:23:8:27:0;9:37:9:58;:27::65;10:26:10:38;;:41::47;;:26:::1;:50::58:0;;:26:::1;14:12:14:23:0;;:27::33;;:36::44;;:27:::1;:12;:46:16:9:0;15:31:15:32;:20::39;:43::55;;:58::66;;:43:::1;:20;:12::68;16:15:20:9:0;17:31:17:32;:20::39;:43::49;;:20:::1;:12::51;18:31:18:32:0;:20::49;:63::84;:53::101;:20:::1;:12::103;19:31:19:32:0;:20::39;:43::54;;:20:::1;:12::56;16:15:20:9;2:4:21:5;;;;;;;;23::26::0;;;;;24:24:24:26;;:16::27:1;:31::37:0;;:16:::1;:8::39;25:25:25:26:0;;:28::30;;:16::31:1;23:4:26:5;;;1:0:27:1',
       },
       source: fs.readFileSync(new URL('../valid-contract-files/mecenas.cash', import.meta.url), { encoding: 'utf-8' }),
       compiler: {
diff --git a/packages/utils/test/fixtures/source-map.fixture.ts b/packages/utils/test/fixtures/source-map.fixture.ts
index a4a05690..58b0cfce 100644
--- a/packages/utils/test/fixtures/source-map.fixture.ts
+++ b/packages/utils/test/fixtures/source-map.fixture.ts
@@ -99,7 +99,7 @@ export const fixtures: Fixture[] = [
       { location: { start: { line: 22, column: 43 }, end: { line: 22, column: 66 } }, positionHint: PositionHint.END },
       { location: { start: { line: 22, column: 20 }, end: { line: 22, column: 66 } }, positionHint: PositionHint.END },
       { location: { start: { line: 22, column: 12 }, end: { line: 22, column: 68 } }, positionHint: PositionHint.END },
-      { location: { start: { line: 23, column: 15 }, end: { line: 27, column: 9 } }, positionHint: PositionHint.END },
+      { location: { start: { line: 23, column: 15 }, end: { line: 27, column: 9 } } },
       { location: { start: { line: 24, column: 31 }, end: { line: 24, column: 32 } } },
       { location: { start: { line: 24, column: 20 }, end: { line: 24, column: 39 } } },
       { location: { start: { line: 24, column: 43 }, end: { line: 24, column: 49 } } },
@@ -148,6 +148,6 @@ export const fixtures: Fixture[] = [
       { location: { start: { line: 30, column: 4 }, end: { line: 33, column: 5 } }, positionHint: PositionHint.END },
       { location: { start: { line: 8, column: 0 }, end: { line: 34, column: 1 } }, positionHint: PositionHint.END },
     ],
-    sourceMap: '9:4:28:5;;;;;13:27:13:28;:16::45;:49::84;:74::83;;:49::84;;;:16:::1;:8::86;15:23:15:27:0;16:37:16:58;:27::65;17:26:17:38;;:41::47;;:26:::1;:50::58:0;;:26:::1;21:12:21:23:0;;:27::33;;:36::44;;:27:::1;:12;:46:23:9:0;22:31:22:32;:20::39;:43::55;;:58::66;;:43:::1;:20;:12::68;23:15:27:9;24:31:24:32:0;:20::39;:43::49;;:20:::1;:12::51;25:31:25:32:0;:20::49;:63::84;:53::101;:20:::1;:12::103;26:31:26:32:0;:20::39;:43::54;;:20:::1;:12::56;23:15:27:9;9:4:28:5;;;;;;;;30::33::0;;;;;31:24:31:26;;:16::27:1;:31::37:0;;:16:::1;:8::39;32:25:32:26:0;;:28::30;;:16::31:1;30:4:33:5;;8:0:34:1',
+    sourceMap: '9:4:28:5;;;;;13:27:13:28;:16::45;:49::84;:74::83;;:49::84;;;:16:::1;:8::86;15:23:15:27:0;16:37:16:58;:27::65;17:26:17:38;;:41::47;;:26:::1;:50::58:0;;:26:::1;21:12:21:23:0;;:27::33;;:36::44;;:27:::1;:12;:46:23:9:0;22:31:22:32;:20::39;:43::55;;:58::66;;:43:::1;:20;:12::68;23:15:27:9:0;24:31:24:32;:20::39;:43::49;;:20:::1;:12::51;25:31:25:32:0;:20::49;:63::84;:53::101;:20:::1;:12::103;26:31:26:32:0;:20::39;:43::54;;:20:::1;:12::56;23:15:27:9;9:4:28:5;;;;;;;;30::33::0;;;;;31:24:31:26;;:16::27:1;:31::37:0;;:16:::1;:8::39;32:25:32:26:0;;:28::30;;:16::31:1;30:4:33:5;;8:0:34:1',
   },
 ];

From cc3f578a0d65c39c219dc388c592bb11f2ef740a Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Tue, 19 Mar 2024 18:06:14 +1100
Subject: [PATCH 079/171] Add tests for token category equality check + update
 fixtures

---
 .../token_category_comparison.cash            |  5 ++
 .../test/e2e/TokenCategoryCheck.test.ts       | 82 +++++++++++++++++++
 .../cashscript/test/fixture/announcement.json |  4 +-
 packages/cashscript/test/fixture/bigint.json  |  4 +-
 .../test/fixture/bounded_bytes.json           |  4 +-
 .../cashscript/test/fixture/hodl_vault.json   |  4 +-
 packages/cashscript/test/fixture/mecenas.json |  4 +-
 .../cashscript/test/fixture/p2palindrome.json |  4 +-
 packages/cashscript/test/fixture/p2pkh.json   |  4 +-
 .../test/fixture/simple_covenant.json         |  4 +-
 .../fixture/token_category_comparison.cash    |  5 ++
 .../fixture/token_category_comparison.json    | 23 ++++++
 .../test/fixture/transfer_with_timeout.json   |  4 +-
 13 files changed, 133 insertions(+), 18 deletions(-)
 create mode 100644 packages/cashc/test/valid-contract-files/token_category_comparison.cash
 create mode 100644 packages/cashscript/test/e2e/TokenCategoryCheck.test.ts
 create mode 100644 packages/cashscript/test/fixture/token_category_comparison.cash
 create mode 100644 packages/cashscript/test/fixture/token_category_comparison.json

diff --git a/packages/cashc/test/valid-contract-files/token_category_comparison.cash b/packages/cashc/test/valid-contract-files/token_category_comparison.cash
new file mode 100644
index 00000000..a4dacfa7
--- /dev/null
+++ b/packages/cashc/test/valid-contract-files/token_category_comparison.cash
@@ -0,0 +1,5 @@
+contract Test() {
+    function send() {
+        require(tx.inputs[1].tokenCategory == 0x);
+    }
+}
diff --git a/packages/cashscript/test/e2e/TokenCategoryCheck.test.ts b/packages/cashscript/test/e2e/TokenCategoryCheck.test.ts
new file mode 100644
index 00000000..ec777a84
--- /dev/null
+++ b/packages/cashscript/test/e2e/TokenCategoryCheck.test.ts
@@ -0,0 +1,82 @@
+import { randomUtxo, randomToken } from '../../src/utils.js';
+import {
+  Contract, ElectrumNetworkProvider, MockNetworkProvider,
+} from '../../src/index.js';
+import { Network, Utxo } from '../../src/interfaces.js';
+import artifact from '../fixture/token_category_comparison.json' assert { type: 'json' };
+
+describe('TokenCategoryCheck', () => {
+  let tokenCategoryCheckInstance: Contract;
+
+  beforeAll(() => {
+    const provider = process.env.TESTS_USE_MOCKNET
+      ? new MockNetworkProvider()
+      : new ElectrumNetworkProvider(Network.CHIPNET);
+    tokenCategoryCheckInstance = new Contract(artifact, [], { provider });
+    console.log(tokenCategoryCheckInstance.tokenAddress);
+
+    (provider as any).addUtxo?.(tokenCategoryCheckInstance.address, randomUtxo());
+    (provider as any).addUtxo?.(tokenCategoryCheckInstance.address, randomUtxo());
+    (provider as any).addUtxo?.(tokenCategoryCheckInstance.address, randomUtxo({
+      satoshis: 1000n,
+      token: randomToken(),
+    }));
+  });
+
+  describe('send', () => {
+    it('cannot send if the input at index 1 contains tokens', async () => {
+      const contractUtxos = await tokenCategoryCheckInstance.getUtxos();
+      const tokenUtxo = contractUtxos.find(isFungibleTokenUtxo);
+      const nonTokenUtxo = contractUtxos.find(isNonTokenUtxo);
+
+      if (!tokenUtxo) {
+        throw new Error('No token UTXO found with fungible tokens');
+      }
+
+      if (!nonTokenUtxo) {
+        throw new Error('No non-token UTXOs found');
+      }
+
+      const to = tokenCategoryCheckInstance.tokenAddress;
+      const amount = 1000n;
+      const { token } = tokenUtxo;
+
+      const txPromise = tokenCategoryCheckInstance.functions
+        .send()
+        .from(nonTokenUtxo)
+        .from(tokenUtxo)
+        .to(to, amount, token)
+        .send();
+
+      await expect(txPromise).rejects.toThrow(/completed with a non-truthy value on top of the stack/);
+    });
+
+    it('can send if the input at index 1 does not contain tokens', async () => {
+      const contractUtxos = await tokenCategoryCheckInstance.getUtxos();
+      const nonTokenUtxos = contractUtxos.filter(isNonTokenUtxo);
+
+      if (nonTokenUtxos.length < 2) {
+        throw new Error('Less than two non-token UTXOs found');
+      }
+
+      const to = tokenCategoryCheckInstance.tokenAddress;
+      const amount = 1000n;
+
+      const txPromise = tokenCategoryCheckInstance.functions
+        .send()
+        .from(nonTokenUtxos[0])
+        .from(nonTokenUtxos[1])
+        .to(to, amount)
+        .send();
+
+      await expect(txPromise).resolves.toBeTruthy();
+    });
+  });
+});
+
+// We don't include UTXOs that contain BOTH fungible and non-fungible tokens
+const isFungibleTokenUtxo = (utxo: Utxo): boolean => (
+  utxo.token !== undefined && utxo.token.amount > 0n && utxo.token.nft === undefined
+);
+
+const isNonTokenUtxo = (utxo: Utxo): boolean => utxo.token === undefined;
diff --git a/packages/cashscript/test/fixture/announcement.json b/packages/cashscript/test/fixture/announcement.json
index 7971f48a..5818dacc 100644
--- a/packages/cashscript/test/fixture/announcement.json
+++ b/packages/cashscript/test/fixture/announcement.json
@@ -17,7 +17,7 @@
   },
   "compiler": {
     "name": "cashc",
-    "version": "0.10.0-next.2"
+    "version": "0.10.0-next.3"
   },
-  "updatedAt": "2024-03-08T07:28:42.672Z"
+  "updatedAt": "2024-03-19T06:40:54.938Z"
 }
\ No newline at end of file
diff --git a/packages/cashscript/test/fixture/bigint.json b/packages/cashscript/test/fixture/bigint.json
index c116835c..6823b72a 100644
--- a/packages/cashscript/test/fixture/bigint.json
+++ b/packages/cashscript/test/fixture/bigint.json
@@ -26,7 +26,7 @@
   },
   "compiler": {
     "name": "cashc",
-    "version": "0.10.0-next.2"
+    "version": "0.10.0-next.3"
   },
-  "updatedAt": "2024-03-08T07:28:42.372Z"
+  "updatedAt": "2024-03-19T06:40:54.678Z"
 }
\ No newline at end of file
diff --git a/packages/cashscript/test/fixture/bounded_bytes.json b/packages/cashscript/test/fixture/bounded_bytes.json
index 61260f9c..e9537cd6 100644
--- a/packages/cashscript/test/fixture/bounded_bytes.json
+++ b/packages/cashscript/test/fixture/bounded_bytes.json
@@ -26,7 +26,7 @@
   },
   "compiler": {
     "name": "cashc",
-    "version": "0.10.0-next.2"
+    "version": "0.10.0-next.3"
   },
-  "updatedAt": "2024-03-08T07:28:43.531Z"
+  "updatedAt": "2024-03-19T06:40:55.720Z"
 }
\ No newline at end of file
diff --git a/packages/cashscript/test/fixture/hodl_vault.json b/packages/cashscript/test/fixture/hodl_vault.json
index a97d918b..b82200dc 100644
--- a/packages/cashscript/test/fixture/hodl_vault.json
+++ b/packages/cashscript/test/fixture/hodl_vault.json
@@ -47,7 +47,7 @@
   },
   "compiler": {
     "name": "cashc",
-    "version": "0.10.0-next.2"
+    "version": "0.10.0-next.3"
   },
-  "updatedAt": "2024-03-08T07:28:42.957Z"
+  "updatedAt": "2024-03-19T06:40:55.179Z"
 }
\ No newline at end of file
diff --git a/packages/cashscript/test/fixture/mecenas.json b/packages/cashscript/test/fixture/mecenas.json
index 37e70e38..94a8c042 100644
--- a/packages/cashscript/test/fixture/mecenas.json
+++ b/packages/cashscript/test/fixture/mecenas.json
@@ -43,7 +43,7 @@
   },
   "compiler": {
     "name": "cashc",
-    "version": "0.10.0-next.2"
+    "version": "0.10.0-next.3"
   },
-  "updatedAt": "2024-03-08T07:28:44.590Z"
+  "updatedAt": "2024-03-19T06:40:56.951Z"
 }
\ No newline at end of file
diff --git a/packages/cashscript/test/fixture/p2palindrome.json b/packages/cashscript/test/fixture/p2palindrome.json
index 1a91fdbc..2aa03066 100644
--- a/packages/cashscript/test/fixture/p2palindrome.json
+++ b/packages/cashscript/test/fixture/p2palindrome.json
@@ -22,7 +22,7 @@
   },
   "compiler": {
     "name": "cashc",
-    "version": "0.10.0-next.2"
+    "version": "0.10.0-next.3"
   },
-  "updatedAt": "2024-03-08T07:28:43.277Z"
+  "updatedAt": "2024-03-19T06:40:55.474Z"
 }
\ No newline at end of file
diff --git a/packages/cashscript/test/fixture/p2pkh.json b/packages/cashscript/test/fixture/p2pkh.json
index 9d5d4d11..cab6b31e 100644
--- a/packages/cashscript/test/fixture/p2pkh.json
+++ b/packages/cashscript/test/fixture/p2pkh.json
@@ -31,7 +31,7 @@
   },
   "compiler": {
     "name": "cashc",
-    "version": "0.10.0-next.2"
+    "version": "0.10.0-next.3"
   },
-  "updatedAt": "2024-03-08T07:28:44.330Z"
+  "updatedAt": "2024-03-19T06:40:56.694Z"
 }
\ No newline at end of file
diff --git a/packages/cashscript/test/fixture/simple_covenant.json b/packages/cashscript/test/fixture/simple_covenant.json
index e1e8f0d2..50f98d7f 100644
--- a/packages/cashscript/test/fixture/simple_covenant.json
+++ b/packages/cashscript/test/fixture/simple_covenant.json
@@ -17,7 +17,7 @@
   },
   "compiler": {
     "name": "cashc",
-    "version": "0.10.0-next.2"
+    "version": "0.10.0-next.3"
   },
-  "updatedAt": "2024-03-08T07:28:43.800Z"
+  "updatedAt": "2024-03-19T06:40:55.963Z"
 }
\ No newline at end of file
diff --git a/packages/cashscript/test/fixture/token_category_comparison.cash b/packages/cashscript/test/fixture/token_category_comparison.cash
new file mode 100644
index 00000000..a4dacfa7
--- /dev/null
+++ b/packages/cashscript/test/fixture/token_category_comparison.cash
@@ -0,0 +1,5 @@
+contract Test() {
+    function send() {
+        require(tx.inputs[1].tokenCategory == 0x);
+    }
+}
diff --git a/packages/cashscript/test/fixture/token_category_comparison.json b/packages/cashscript/test/fixture/token_category_comparison.json
new file mode 100644
index 00000000..2cd5d9ef
--- /dev/null
+++ b/packages/cashscript/test/fixture/token_category_comparison.json
@@ -0,0 +1,23 @@
+{
+  "contractName": "Test",
+  "constructorInputs": [],
+  "abi": [
+    {
+      "name": "send",
+      "inputs": []
+    }
+  ],
+  "bytecode": "OP_1 OP_UTXOTOKENCATEGORY OP_0 OP_EQUAL",
+  "source": "contract Test() {\n    function send() {\n        require(tx.inputs[1].tokenCategory == 0x);\n    }\n}\n",
+  "debug": {
+    "bytecode": "51ce0087",
+    "sourceMap": "3:26:3:27;:16::42;:46::48;:16:::1",
+    "logs": [],
+    "requireMessages": []
+  },
+  "compiler": {
+    "name": "cashc",
+    "version": "0.10.0-next.3"
+  },
+  "updatedAt": "2024-03-19T06:40:56.440Z"
+}
\ No newline at end of file
diff --git a/packages/cashscript/test/fixture/transfer_with_timeout.json b/packages/cashscript/test/fixture/transfer_with_timeout.json
index bd14c019..2ce57cd9 100644
--- a/packages/cashscript/test/fixture/transfer_with_timeout.json
+++ b/packages/cashscript/test/fixture/transfer_with_timeout.json
@@ -44,7 +44,7 @@
   },
   "compiler": {
     "name": "cashc",
-    "version": "0.10.0-next.2"
+    "version": "0.10.0-next.3"
   },
-  "updatedAt": "2024-03-08T07:28:44.062Z"
+  "updatedAt": "2024-03-19T06:40:56.204Z"
 }
\ No newline at end of file

From e8604dc6636f0af916e90e0689a6caa2ee23e86a Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Tue, 26 Mar 2024 18:05:04 +0800
Subject: [PATCH 080/171] JestExtensions + debugging test updates

- Handle case where no console.logs are called for expect().toLog()
- Display *all* console.logs in the 'Received' message for expect().toLog()
- Add tests for NOT logging console.log statements in earlier functions / branches
- Improve require message tests to check that it does not show incorrect messages
- Add JestExtensions tests that test the correct behaviour of the test framework

Note: JestExtensions tests are still failing, as are some of the new
console.log tests. We need to fix this in the debugTemplate() function.
---
 .../cashscript/src/test/JestExtensions.ts     |  35 ++--
 packages/cashscript/test/debugging.test.ts    | 176 ++++++++++++++++--
 2 files changed, 183 insertions(+), 28 deletions(-)

diff --git a/packages/cashscript/src/test/JestExtensions.ts b/packages/cashscript/src/test/JestExtensions.ts
index dfe50050..d451e3d4 100644
--- a/packages/cashscript/src/test/JestExtensions.ts
+++ b/packages/cashscript/src/test/JestExtensions.ts
@@ -28,31 +28,24 @@ expect.extend({
     try {
       await transaction.debug();
     } catch {}
-    let message: string = '';
-
-    const failMessage = (received: string, expected: RegExp | string) => () => `${matcherHint(
-      '.toLog',
-      'received',
-      'expected',
-    )}
-
-Expected: ${printExpected(expected)}
-Received: ${printReceived(received)}`;
+    let error: string = '';
 
     try {
       expect(spyOnLoggerError).toBeCalledWith(expect.stringMatching(match));
-    } catch (error) {
-      message = error as any;
+    } catch (e) {
+      error = e as any;
     }
 
-    // TODO: If no console.log was called, then spyOnLoggerError.mock.calls[0] is undefined.
-    // We should handle that case properly.
-    const received = spyOnLoggerError.mock.calls[0][0];
+    // We concatenate all the logs into a single string - if no logs are present, we set received to undefined
+    const receivedBase = spyOnLoggerError.mock.calls.reduce((acc, [log]) => `${acc}\n${log}`, '').trim();
+    const received = receivedBase === '' ? undefined : receivedBase;
+
     spyOnLoggerError.mockClear();
 
     return {
       message: failMessage(received, match),
-      pass: !message,
+      // message: () =>'Hello',
+      pass: !error,
     };
   },
 });
@@ -108,3 +101,13 @@ Contract function did not fail a require statement`;
     };
   },
 });
+
+// TODO: Update to have the same failMessage function for .toLog and .toFailRequireWith
+const failMessage = (received?: string, expected?: RegExp | string) => () => `${matcherHint(
+  '.toLog',
+  'received',
+  'expected',
+)}
+
+Expected: ${printExpected(expected)}
+Received: ${printReceived(received)}`;
diff --git a/packages/cashscript/test/debugging.test.ts b/packages/cashscript/test/debugging.test.ts
index 81b258b4..922378fb 100644
--- a/packages/cashscript/test/debugging.test.ts
+++ b/packages/cashscript/test/debugging.test.ts
@@ -9,9 +9,11 @@ import { binToHex } from '@bitauth/libauth';
 
 describe('Debugging tests', () => {
   describe('console.log statements', () => {
+
     const BASE_CONTRACT_CODE = `
       contract Test(pubkey owner) {
         function transfer(sig ownerSig, int num) {
+          console.log('Hello First Function');
           require(checkSig(ownerSig, owner));
 
           bytes2 beef = 0xbeef;
@@ -21,6 +23,25 @@ describe('Debugging tests', () => {
 
           require(num == 1000);
         }
+
+        function secondFunction() {
+          console.log("Hello Second Function");
+          require(1 == 1);
+        }
+
+        function functionWithIfStatement(int a) {
+          if (a == 1) {
+            console.log("a is 1");
+          } else {
+            console.log("a is not 1");
+          }
+
+          require(1 == 1);
+        }
+
+        function noLogs() {
+          require(1 == 1);
+        }
       }
     `;
 
@@ -36,7 +57,7 @@ describe('Debugging tests', () => {
         .to(contract.address, 10000n);
 
       // console.log(ownerSig, owner, num, beef, 1, "test", true);
-      const expectedLog = new RegExp(`^Test.cash:9 0x[0-9a-f]{130} 0x${binToHex(alicePub)} 1000 0xbeef 1 test true$`);
+      const expectedLog = new RegExp(`^Test.cash:10 0x[0-9a-f]{130} 0x${binToHex(alicePub)} 1000 0xbeef 1 test true$`);
       await expect(transaction).toLog(expectedLog);
     });
 
@@ -50,7 +71,7 @@ describe('Debugging tests', () => {
         .to(contract.address, 10000n);
 
       // console.log(ownerSig, owner, num, beef, 1, "test", true);
-      const expectedLog = new RegExp(`^Test.cash:9 0x[0-9a-f]{130} 0x${binToHex(alicePub)} 100 0xbeef 1 test true$`);
+      const expectedLog = new RegExp(`^Test.cash:10 0x[0-9a-f]{130} 0x${binToHex(alicePub)} 100 0xbeef 1 test true$`);
       await expect(transaction).toLog(expectedLog);
     });
 
@@ -63,14 +84,39 @@ describe('Debugging tests', () => {
         .transfer(new SignatureTemplate(incorrectPriv), 1000n)
         .to(contract.address, 10000n);
 
-      // TODO: This is a super ugly test, we should fix this by improving the JestExtensions
-      try {
-        const expectedLog = new RegExp(`^Test.cash:9 0x[0-9a-f]{130} 0x${binToHex(alicePub)} 1000 0xbeef 1 test true$`);
-        await expect(transaction).toLog(expectedLog);
-        throw new Error('Expected to fail');
-      } catch (e) {
-        if ((e as any)?.message === 'Expected to fail') throw e;
-      }
+      const expectedLog = new RegExp(`^Test.cash:10 0x[0-9a-f]{130} 0x${binToHex(alicePub)} 1000 0xbeef 1 test true$`);
+      await expect(transaction).not.toLog(expectedLog);
+    });
+
+    it('should only log console.log statements from the called function', async () => {
+      const contract = new Contract(artifact, [alicePub], { provider });
+      provider.addUtxo(contract.address, randomUtxo());
+
+      const transaction = contract.functions
+        .secondFunction()
+        .to(contract.address, 10000n);
+
+      await expect(transaction).toLog(new RegExp('^Test.cash:14 Hello Second Function$'));
+      await expect(transaction).not.toLog(/Hello First Function/);
+    });
+
+    it('should only log console.log statements from the chosen branch in if-statement', async () => {
+      const contract = new Contract(artifact, [alicePub], { provider });
+      provider.addUtxo(contract.address, randomUtxo());
+
+      const transaction1 = contract.functions
+        .functionWithIfStatement(1n)
+        .to(contract.address, 10000n);
+
+      await expect(transaction1).toLog(new RegExp('^Test.cash:21 a is 1$'));
+      await expect(transaction1).not.toLog(/a is not 1/);
+
+      const transaction2 = contract.functions
+        .functionWithIfStatement(2n)
+        .to(contract.address, 10000n);
+
+      await expect(transaction2).toLog(new RegExp('^Test.cash:23 a is not 1$'));
+      await expect(transaction2).not.toLog(/a is 1/);
     });
 
     it('should log multiple consecutive console.log statements on a single line', async () => {
@@ -169,20 +215,22 @@ describe('Debugging tests', () => {
     const artifact = compileString(code);
     const provider = new MockNetworkProvider();
 
-    it('should fail with correct error message when there are multiple require statements', async () => {
+    it('should only fail with correct error message when there are multiple require statements', async () => {
       const contract = new Contract(artifact, [alicePub, bobPub, 2000000n], { provider });
       provider.addUtxo(contract.address, randomUtxo());
 
       const transaction = contract.functions.timeout(new SignatureTemplate(bobPriv)).to(contract.address, 1000n);
       await expect(transaction).toFailRequireWith(/sigcheck custom fail/);
+      await expect(transaction).not.toFailRequireWith(/timecheck custom fail/);
     });
 
-    it('should fail with correct error message for timecheck require statemen when there are multiple require statements', async () => {
+    it('should only fail with correct error message for timecheck require statement when there are multiple require statements', async () => {
       const contract = new Contract(artifact, [alicePub, bobPub, 1000000n], { provider });
       provider.addUtxo(contract.address, randomUtxo());
 
       const transaction = contract.functions.timeout(new SignatureTemplate(alicePriv)).to(contract.address, 1000n);
       await expect(transaction).toFailRequireWith(/timecheck custom fail/);
+      await expect(transaction).not.toFailRequireWith(/sigcheck custom fail/);
     });
 
     it('should fail with correct error message for the final require statement', async () => {
@@ -201,4 +249,108 @@ describe('Debugging tests', () => {
       await expect(transaction).not.toFailRequireWith(/.*/);
     });
   });
+
+  describe('JestExtensions', () => {
+    const CONTRACT_CODE = `
+      contract Test() {
+        function test_logs() {
+          console.log("Hello World");
+          require(1 == 2);
+        }
+
+        function test_no_logs() {
+          require(1 == 2);
+        }
+
+        function test_require() {
+          require(1 == 2, "1 should equal 2");
+        }
+
+        function test_require_no_failure() {
+          require(1 == 1, "1 should equal 1");
+        }
+      }
+    `;
+
+    const artifact = compileString(CONTRACT_CODE);
+    const provider = new MockNetworkProvider();
+
+    it('should fail the JestExtensions test if an incorrect log is expected', async () => {
+      const contract = new Contract(artifact, [], { provider });
+      provider.addUtxo(contract.address, randomUtxo());
+
+      const transaction = contract.functions
+        .test_logs()
+        .to(contract.address, 10000n);
+
+      const incorrectExpectedLog = new RegExp('^This is definitely not the log$');
+
+      // Note: We're wrapping the expect call in another expect, since we expect the inner expect to throw
+      await expect(
+        expect(transaction).toLog(incorrectExpectedLog),
+      ).rejects.toThrow(/Expected: .*This is definitely not the log.*\nReceived: .*Test.cash:4 Hello World/);
+    });
+
+    // TODO: Investigate why it still logs, even though we call test_no_logs()
+    it('should fail the JestExtensions test if a log is expected where no log is logged', async () => {
+      const contract = new Contract(artifact, [], { provider });
+      provider.addUtxo(contract.address, randomUtxo());
+
+      const transaction = contract.functions
+        .test_no_logs()
+        .to(contract.address, 10000n);
+
+      const incorrectExpectedLog = new RegExp('Hello World');
+
+      // Note: We're wrapping the expect call in another expect, since we expect the inner expect to throw
+      await expect(
+        expect(transaction).toLog(incorrectExpectedLog),
+      ).rejects.toThrow(/Expected: .*Hello World.*\nReceived: undefined/);
+    });
+
+    it('[WIP] should fail the JestExtensions test if a log is expected where no log is logged', async () => {
+      const contract = new Contract(artifact, [], { provider });
+      provider.addUtxo(contract.address, randomUtxo());
+
+      const transaction = await contract.functions
+        .test_no_logs()
+        .to(contract.address, 10000n)
+        .debug();
+
+      console.log(transaction);
+    });
+
+    it('should fail the JestExtensions test if an incorrect require error message is expected', async () => {
+      const contract = new Contract(artifact, [], { provider });
+      provider.addUtxo(contract.address, randomUtxo());
+
+      const transaction = contract.functions
+        .test_require()
+        .to(contract.address, 10000n);
+
+      const incorrectExpectedRequire = new RegExp('1 should equal 3');
+
+      // Note: We're wrapping the expect call in another expect, since we expect the inner expect to throw
+      await expect(
+        expect(transaction).toFailRequireWith(incorrectExpectedRequire),
+      ).rejects.toThrow(/Expected: .*1 should equal 3.*\nReceived: .*1 should equal 2.*/);
+    });
+
+
+    it('should fail the JestExtensions test if a require error message is expected where no error is thrown', async () => {
+      const contract = new Contract(artifact, [], { provider });
+      provider.addUtxo(contract.address, randomUtxo());
+
+      const transaction = contract.functions
+        .test_require_no_failure()
+        .to(contract.address, 10000n);
+
+      const incorrectExpectedRequire = new RegExp('1 should equal 3');
+
+      // Note: We're wrapping the expect call in another expect, since we expect the inner expect to throw
+      await expect(
+        expect(transaction).toFailRequireWith(incorrectExpectedRequire),
+      ).rejects.toThrow(/Expected: .*1 should equal 3.*\nReceived: undefined/);
+    });
+  });
 });

From 0504e922f1202567a6611872357c22d3fed40e80 Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Fri, 12 Apr 2024 16:46:56 +0800
Subject: [PATCH 081/171] Fix bug in console.log statement handling

---
 packages/cashscript/src/LibauthTemplate.ts | 93 ++++++++++++----------
 packages/cashscript/src/utils.ts           |  9 +++
 packages/cashscript/test/debugging.test.ts |  8 +-
 packages/utils/src/artifact.ts             |  9 ++-
 4 files changed, 74 insertions(+), 45 deletions(-)

diff --git a/packages/cashscript/src/LibauthTemplate.ts b/packages/cashscript/src/LibauthTemplate.ts
index 7beb0860..fec2eb29 100644
--- a/packages/cashscript/src/LibauthTemplate.ts
+++ b/packages/cashscript/src/LibauthTemplate.ts
@@ -1,5 +1,16 @@
 import {
-  AbiFunction, Artifact, Op, PrimitiveType, bytecodeToScript, decodeBool, decodeInt, decodeString, formatBitAuthScript,
+  AbiFunction,
+  Artifact,
+  LogData,
+  LogEntry,
+  Op,
+  PrimitiveType,
+  StackItem,
+  bytecodeToScript,
+  decodeBool,
+  decodeInt,
+  decodeString,
+  formatBitAuthScript,
 } from '@cashscript/utils';
 import {
   hash160,
@@ -34,7 +45,7 @@ import {
 import { Argument, encodeArgument as csEncodeArgument } from './Argument.js';
 import SignatureTemplate from './SignatureTemplate.js';
 import { Transaction } from './Transaction.js';
-import { toRegExp } from './utils.js';
+import { findLastIndex, toRegExp } from './utils.js';
 
 // all bitauth variables must be in snake case
 const snakeCase = (str: string): string => (
@@ -532,47 +543,21 @@ export const debugTemplate = (template: WalletTemplate, artifact: Artifact): Deb
 
   const debugResult = vm.debug(program);
 
-  for (const log of artifact.debug?.logs ?? []) {
-    // there might be 2 elements with same instruction pointer, first from unllocking script, second from locking
-    const state = debugResult
-      .filter((debugState: AuthenticationProgramStateBCHCHIPs) => debugState.ip === log.ip)!
-      .slice().reverse()[0];
+  // P2SH executions have 3 phases, we only want the last one (locking script execution)
+  // https://libauth.org/types/AuthenticationVirtualMachine.html#__type.debug
+  const lockingScriptDebugResult = debugResult.slice(findLastIndex(debugResult, (state) => state.ip === 0));
 
-    if (!state) {
-      throw Error(`Instruction pointer ${log.ip} points to a non-existing state of the program`);
-    }
-
-    let line = `${artifact.contractName}.cash:${log.line}`;
-    log.data.forEach((element) => {
-      let value: any;
-      if (typeof element === 'string') {
-        value = element;
-      } else {
-        const stackItem = state.stack.slice().reverse()[element.stackIndex];
-        if (!stackItem) {
-          throw Error(`Stack item at index ${element.stackIndex} not found at instruction pointer ${log.ip}`);
-        }
-        switch (element.type) {
-          case PrimitiveType.BOOL:
-            value = decodeBool(stackItem);
-            break;
-          case PrimitiveType.INT:
-            value = decodeInt(stackItem);
-            break;
-          case PrimitiveType.STRING:
-            value = decodeString(stackItem);
-            break;
-          default:
-            value = `0x${binToHex(stackItem)}`;
-            break;
-        }
-      }
+  // The controlStack determines whether the current debug step is in the executed branch
+  // https://libauth.org/types/AuthenticationProgramStateControlStack.html
+  const executedDebugSteps = lockingScriptDebugResult
+    .filter((debugStep) => debugStep.controlStack.every(item => item === true));
 
-      line += ` ${value}`;
-    });
+  const executedLogs = (artifact.debug?.logs ?? [])
+    .filter((debugStep) => executedDebugSteps.some((log) => log.ip === debugStep.ip));
 
-    // actual log, do not delete :)
-    console.log(line);
+  for (const log of executedLogs) {
+    const correspondingDebugStep = executedDebugSteps.find((debugStep) => debugStep.ip === log.ip)!;
+    logConsoleLogStatement(log, correspondingDebugStep, artifact);
   }
 
   const lastState = debugResult[debugResult.length - 1];
@@ -602,6 +587,7 @@ ${lastState.error}`;
 
       const lastMessage = artifact.debug?.requireMessages.sort((a, b) => b.ip - a.ip)[0];
       if (!lastMessage) {
+        // TODO: Throw an ERROR instead of string
         // eslint-disable-next-line
         throw evaluationResult + stackContentsMessage;
       }
@@ -622,3 +608,30 @@ ${evaluationResult.replace(/Error in evaluating input index \d: /, '')}` + stack
 
   return debugResult;
 };
+
+const logConsoleLogStatement = (
+  log: LogEntry,
+  debugStep: AuthenticationProgramStateBCHCHIPs,
+  artifact: Artifact,
+): void => {
+  let line = `${artifact.contractName}.cash:${log.line}`;
+  const decodedData = log.data.map((element) => decodeLogData(element, debugStep.stack, log.ip));
+  console.log(`${line} ${decodedData.join(' ')}`);
+};
+
+const decodeLogData = (element: LogData, stack: Uint8Array[], ip: number): any => {
+  if (typeof element === 'string') return element;
+
+  // Reversed since stack is in reverse order
+  const stackItem = [...stack].reverse()[element.stackIndex];
+
+  if (!stackItem) {
+    throw Error(`Stack item at index ${(element as StackItem).stackIndex} not found at instruction pointer ${ip}`);
+  }
+
+  if (element.type === PrimitiveType.BOOL) return decodeBool(stackItem);
+  if (element.type === PrimitiveType.INT) return decodeInt(stackItem);
+  if (element.type === PrimitiveType.STRING) return decodeString(stackItem);
+
+  return `0x${binToHex(stackItem)}`;
+};
diff --git a/packages/cashscript/src/utils.ts b/packages/cashscript/src/utils.ts
index cff75067..0569d6aa 100644
--- a/packages/cashscript/src/utils.ts
+++ b/packages/cashscript/src/utils.ts
@@ -367,3 +367,12 @@ export const randomNFT = (defaults?: Partial<TokenDetails>): TokenDetails => ({
   },
   ...defaults,
 });
+
+// https://stackoverflow.com/questions/40929260/find-last-index-of-element-inside-array-by-certain-condition
+export function findLastIndex<T>(array: Array<T>, predicate: (value: T, index: number, obj: T[]) => boolean): number {
+  let l = array.length;
+  while (l--) {
+    if (predicate(array[l], l, array)) return l;
+  }
+  return -1;
+}
diff --git a/packages/cashscript/test/debugging.test.ts b/packages/cashscript/test/debugging.test.ts
index 922378fb..380ac525 100644
--- a/packages/cashscript/test/debugging.test.ts
+++ b/packages/cashscript/test/debugging.test.ts
@@ -9,7 +9,7 @@ import { binToHex } from '@bitauth/libauth';
 
 describe('Debugging tests', () => {
   describe('console.log statements', () => {
-
+    // TODO: Double check if multiple console.log statements are two separate entries in the artifact OR one single one
     const BASE_CONTRACT_CODE = `
       contract Test(pubkey owner) {
         function transfer(sig ownerSig, int num) {
@@ -96,7 +96,7 @@ describe('Debugging tests', () => {
         .secondFunction()
         .to(contract.address, 10000n);
 
-      await expect(transaction).toLog(new RegExp('^Test.cash:14 Hello Second Function$'));
+      await expect(transaction).toLog(new RegExp('^Test.cash:16 Hello Second Function$'));
       await expect(transaction).not.toLog(/Hello First Function/);
     });
 
@@ -108,14 +108,14 @@ describe('Debugging tests', () => {
         .functionWithIfStatement(1n)
         .to(contract.address, 10000n);
 
-      await expect(transaction1).toLog(new RegExp('^Test.cash:21 a is 1$'));
+      await expect(transaction1).toLog(new RegExp('^Test.cash:22 a is 1$'));
       await expect(transaction1).not.toLog(/a is not 1/);
 
       const transaction2 = contract.functions
         .functionWithIfStatement(2n)
         .to(contract.address, 10000n);
 
-      await expect(transaction2).toLog(new RegExp('^Test.cash:23 a is not 1$'));
+      await expect(transaction2).toLog(new RegExp('^Test.cash:24 a is not 1$'));
       await expect(transaction2).not.toLog(/a is 1/);
     });
 
diff --git a/packages/utils/src/artifact.ts b/packages/utils/src/artifact.ts
index 54952783..d3735c46 100644
--- a/packages/utils/src/artifact.ts
+++ b/packages/utils/src/artifact.ts
@@ -21,9 +21,16 @@ export interface DebugInformation {
 export interface LogEntry {
   ip: number; // instruction pointer
   line: number; // line in the source code
-  data: Array<{ stackIndex: number, type: string } | string>; // data to be logged
+  data: Array<LogData>; // data to be logged
 }
 
+export interface StackItem {
+  type: string;
+  stackIndex: number;
+}
+
+export type LogData = StackItem | string;
+
 export interface RequireMessage {
   ip: number; // instruction pointer
   line: number; // line in the source code

From 01ecfaee2ced80bf4334cf3da75e2314849a2e1f Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Fri, 12 Apr 2024 17:00:43 +0800
Subject: [PATCH 082/171] Do NOT merge separate console.log statements into a
 single line

---
 .../src/generation/GenerateTargetTraversal.ts | 19 ++++++-------------
 packages/cashscript/test/debugging.test.ts    | 10 +++++-----
 2 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/packages/cashc/src/generation/GenerateTargetTraversal.ts b/packages/cashc/src/generation/GenerateTargetTraversal.ts
index 048751d1..8d172674 100644
--- a/packages/cashc/src/generation/GenerateTargetTraversal.ts
+++ b/packages/cashc/src/generation/GenerateTargetTraversal.ts
@@ -310,26 +310,19 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
     const ip = this.getCurrentInstructionPointer();
     const { line } = node.location.start;
 
-    // TODO: refactor to use a map instead of array (also in the artifact and other places where console logs and
-    // require statements are used)
-    // check if log entry exists for the instruction pointer, create if not
-    // TODO: Do we really want to merge different console logs at the same instruction pointer?
-    let index = this.consoleLogs.findIndex((entry: LogEntry) => entry.ip === ip);
-    if (index === -1) {
-      index = this.consoleLogs.push({ ip, line, data: [] }) - 1;
-    }
-
-    node.parameters.forEach((parameter: ConsoleParameterNode) => {
+    const data = node.parameters.map((parameter: ConsoleParameterNode) => {
       if (parameter instanceof IdentifierNode) {
         const symbol = parameter.definition!;
         const stackIndex = this.getStackIndex(parameter.name);
         const type = typeof symbol.type === 'string' ? symbol.type : symbol.toString();
-        this.consoleLogs[index].data.push({ stackIndex, type });
-      } else {
-        this.consoleLogs[index].data.push(parameter.toString());
+        return { stackIndex, type };
       }
+
+      return parameter.toString();
     });
 
+    this.consoleLogs.push({ ip, line, data });
+
     return node;
   }
 
diff --git a/packages/cashscript/test/debugging.test.ts b/packages/cashscript/test/debugging.test.ts
index 380ac525..c6f0107c 100644
--- a/packages/cashscript/test/debugging.test.ts
+++ b/packages/cashscript/test/debugging.test.ts
@@ -9,7 +9,6 @@ import { binToHex } from '@bitauth/libauth';
 
 describe('Debugging tests', () => {
   describe('console.log statements', () => {
-    // TODO: Double check if multiple console.log statements are two separate entries in the artifact OR one single one
     const BASE_CONTRACT_CODE = `
       contract Test(pubkey owner) {
         function transfer(sig ownerSig, int num) {
@@ -119,7 +118,7 @@ describe('Debugging tests', () => {
       await expect(transaction2).not.toLog(/a is 1/);
     });
 
-    it('should log multiple consecutive console.log statements on a single line', async () => {
+    it('should log multiple consecutive console.log statements on separate lines', async () => {
       const contractCode = `
         contract Test(pubkey owner) {
           function transfer(sig ownerSig, int num) {
@@ -146,9 +145,10 @@ describe('Debugging tests', () => {
         .transfer(new SignatureTemplate(alicePriv), incorrectNum)
         .to(contract.address, 10000n);
 
-      // console.log(ownerSig, owner, num, beef, 1, "test", true);
-      const expectedLog = new RegExp(`^Test.cash:9 0x[0-9a-f]{130} 0x${binToHex(alicePub)} 100 0xbeef 1 test true$`);
-      await expect(transaction).toLog(expectedLog);
+      // console.log(ownerSig, owner, num, beef);
+      await expect(transaction).toLog(new RegExp(`^Test.cash:9 0x[0-9a-f]{130} 0x${binToHex(alicePub)} 100$`));
+      // console.log(1, "test", true)
+      await expect(transaction).toLog(new RegExp('^Test.cash:10 0xbeef 1 test true$'));
     });
 
     it('should log multiple console.log statements with other statements in between', async () => {

From d0594d0f5e7972739988bcf48837c3b74dda4701 Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Sun, 14 Apr 2024 16:52:43 +0800
Subject: [PATCH 083/171] Fix bugs in require statement message handling and
 add a bunch of tests

---
 .../src/generation/GenerateTargetTraversal.ts |  18 +-
 packages/cashscript/src/LibauthTemplate.ts    | 163 -------------
 packages/cashscript/src/Transaction.ts        |   6 +-
 packages/cashscript/src/debugging.ts          | 167 +++++++++++++
 .../cashscript/src/test/JestExtensions.ts     |   2 +-
 packages/cashscript/test/debugging.test.ts    | 222 ++++++++++++------
 6 files changed, 326 insertions(+), 252 deletions(-)
 create mode 100644 packages/cashscript/src/debugging.ts

diff --git a/packages/cashc/src/generation/GenerateTargetTraversal.ts b/packages/cashc/src/generation/GenerateTargetTraversal.ts
index 8d172674..7513b291 100644
--- a/packages/cashc/src/generation/GenerateTargetTraversal.ts
+++ b/packages/cashc/src/generation/GenerateTargetTraversal.ts
@@ -275,10 +275,12 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
     node.expression = this.visit(node.expression);
     this.emit(compileTimeOp(node.timeOp), { location: node.location, positionHint: PositionHint.END });
 
-    // add debug require message
+    // TODO: Same comment as in require
     if (node.message) {
       this.requireMessages.push({
-        ip: this.getCurrentInstructionPointer() - 1, // TODO: Why is there a minus 1 here?
+        // We're removing 1 from the IP because the error message needs to match the OP_XXX_VERIFY, not the OP_DROP that
+        // is emitted directly after
+        ip: this.getCurrentInstructionPointer() - 1,
         line: node.location.start.line,
         message: node.message,
       });
@@ -293,10 +295,12 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
 
     this.emit(Op.OP_VERIFY, { location: node.location, positionHint: PositionHint.END });
 
-    // add debug require message
+    // TODO: Add *all* require messages to the artifact, so we can report on line number for the failed require(),
+    // even if there is no message in the require() call
+    // TODO: We don't even have to display the Libauth message if we just say "this and this require failed"
     if (node.message) {
       this.requireMessages.push({
-        ip: this.getCurrentInstructionPointer() - 1, // TODO: Why is there a minus 1 here?
+        ip: this.getCurrentInstructionPointer(),
         line: node.location.start.line,
         message: node.message,
       });
@@ -335,13 +339,13 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
 
     let stackDepth = this.stack.length;
     node.ifBlock = this.visit(node.ifBlock);
-    this.removeScopedVariables(stackDepth, node);
+    this.removeScopedVariables(stackDepth, node.ifBlock);
 
     if (node.elseBlock) {
       this.emit(Op.OP_ELSE, { location: node.elseBlock.location });
       stackDepth = this.stack.length;
       node.elseBlock = this.visit(node.elseBlock);
-      this.removeScopedVariables(stackDepth, node);
+      this.removeScopedVariables(stackDepth, node.elseBlock);
     }
 
     const endLocationData = {
@@ -358,7 +362,7 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
   removeScopedVariables(depthBeforeScope: number, node: Node): void {
     const dropCount = this.stack.length - depthBeforeScope;
     for (let i = 0; i < dropCount; i += 1) {
-      this.emit(Op.OP_DROP, { location: node.location });
+      this.emit(Op.OP_DROP, { location: node.location, positionHint: PositionHint.END });
       this.popFromStack();
     }
   }
diff --git a/packages/cashscript/src/LibauthTemplate.ts b/packages/cashscript/src/LibauthTemplate.ts
index fec2eb29..225e714d 100644
--- a/packages/cashscript/src/LibauthTemplate.ts
+++ b/packages/cashscript/src/LibauthTemplate.ts
@@ -1,15 +1,7 @@
 import {
   AbiFunction,
-  Artifact,
-  LogData,
-  LogEntry,
-  Op,
   PrimitiveType,
-  StackItem,
   bytecodeToScript,
-  decodeBool,
-  decodeInt,
-  decodeString,
   formatBitAuthScript,
 } from '@cashscript/utils';
 import {
@@ -22,17 +14,9 @@ import {
   WalletTemplate,
   WalletTemplateScenarioInput,
   TransactionBCH,
-  walletTemplateToCompilerConfiguration,
-  createCompiler,
-  createVirtualMachineBCHCHIPs,
   binToBase64,
   utf8ToBin,
   isHex,
-  AuthenticationProgramStateBCHCHIPs,
-  AuthenticationProgramCommon,
-  AuthenticationVirtualMachine,
-  ResolvedTransactionCommon,
-  AuthenticationErrorCommon,
   WalletTemplateScenarioOutput,
 } from '@bitauth/libauth';
 import { deflate } from 'pako';
@@ -45,7 +29,6 @@ import {
 import { Argument, encodeArgument as csEncodeArgument } from './Argument.js';
 import SignatureTemplate from './SignatureTemplate.js';
 import { Transaction } from './Transaction.js';
-import { findLastIndex, toRegExp } from './utils.js';
 
 // all bitauth variables must be in snake case
 const snakeCase = (str: string): string => (
@@ -489,149 +472,3 @@ export const getBitauthUri = (template: WalletTemplate): string => {
   );
   return `https://ide.bitauth.com/import-template/${payload}`;
 };
-
-type VM = AuthenticationVirtualMachine<
-ResolvedTransactionCommon,
-AuthenticationProgramCommon,
-AuthenticationProgramStateBCHCHIPs
->;
-type Program = AuthenticationProgramCommon;
-type CreateProgramResult = { vm: VM, program: Program };
-
-// internal util. instantiates the virtual machine and compiles the template into a program
-const createProgram = (template: WalletTemplate): CreateProgramResult => {
-  const configuration = walletTemplateToCompilerConfiguration(template);
-  const vm = createVirtualMachineBCHCHIPs();
-  const compiler = createCompiler(configuration);
-
-  const scenarioGeneration = compiler.generateScenario({
-    debug: true,
-    lockingScriptId: undefined,
-    unlockingScriptId: 'unlock_lock',
-    scenarioId: 'evaluate_function',
-  });
-
-  if (
-    typeof scenarioGeneration === 'string'
-    || typeof scenarioGeneration.scenario === 'string'
-  ) {
-    // eslint-disable-next-line
-    throw scenarioGeneration;
-  }
-
-  return { vm, program: scenarioGeneration.scenario.program };
-};
-
-// evaluates the fully defined template, throws upon error
-export const evaluateTemplate = (template: WalletTemplate): boolean => {
-  const { vm, program } = createProgram(template);
-
-  const verifyResult = vm.verify(program);
-  if (typeof verifyResult === 'string') {
-    // eslint-disable-next-line
-    throw verifyResult;
-  }
-
-  return verifyResult;
-};
-
-export type DebugResult = AuthenticationProgramStateBCHCHIPs[];
-
-// debugs the template, optionally logging the execution data
-export const debugTemplate = (template: WalletTemplate, artifact: Artifact): DebugResult => {
-  const { vm, program } = createProgram(template);
-
-  const debugResult = vm.debug(program);
-
-  // P2SH executions have 3 phases, we only want the last one (locking script execution)
-  // https://libauth.org/types/AuthenticationVirtualMachine.html#__type.debug
-  const lockingScriptDebugResult = debugResult.slice(findLastIndex(debugResult, (state) => state.ip === 0));
-
-  // The controlStack determines whether the current debug step is in the executed branch
-  // https://libauth.org/types/AuthenticationProgramStateControlStack.html
-  const executedDebugSteps = lockingScriptDebugResult
-    .filter((debugStep) => debugStep.controlStack.every(item => item === true));
-
-  const executedLogs = (artifact.debug?.logs ?? [])
-    .filter((debugStep) => executedDebugSteps.some((log) => log.ip === debugStep.ip));
-
-  for (const log of executedLogs) {
-    const correspondingDebugStep = executedDebugSteps.find((debugStep) => debugStep.ip === log.ip)!;
-    logConsoleLogStatement(log, correspondingDebugStep, artifact);
-  }
-
-  const lastState = debugResult[debugResult.length - 1];
-  if (lastState.error) {
-    const requireMessage = (artifact.debug?.requireMessages ?? []).filter((message) => message.ip === lastState.ip)[0];
-    if (requireMessage) {
-      // eslint-disable-next-line
-      throw `${artifact.contractName}.cash:${requireMessage.line} Error in evaluating input index ${lastState.program.inputIndex} with the following message: ${requireMessage.message}.
-${lastState.error}`;
-    } else {
-      // eslint-disable-next-line
-      throw `Error in evaluating input index ${lastState.program.inputIndex}.
-${lastState.error}`;
-    }
-  } else {
-    // one last pass of verifications not covered by the above debugging
-    // checks for removed final verify
-    const evaluationResult = vm.verify(program);
-
-    if (typeof evaluationResult === 'string' && toRegExp([
-      AuthenticationErrorCommon.requiresCleanStack,
-      AuthenticationErrorCommon.nonEmptyControlStack,
-      AuthenticationErrorCommon.unsuccessfulEvaluation,
-    ]).test(evaluationResult)) {
-      const stackContents = lastState.stack.map(item => `0x${binToHex(item)}`).join(', ');
-      const stackContentsMessage = `\nStack contents after evaluation: ${lastState.stack.length ? stackContents : 'empty'}`;
-
-      const lastMessage = artifact.debug?.requireMessages.sort((a, b) => b.ip - a.ip)[0];
-      if (!lastMessage) {
-        // TODO: Throw an ERROR instead of string
-        // eslint-disable-next-line
-        throw evaluationResult + stackContentsMessage;
-      }
-
-      const instructionsLeft = lastState.instructions.slice(lastMessage.ip);
-      if (instructionsLeft.length === 0
-          || instructionsLeft.every(instruction => [Op.OP_NIP, Op.OP_ENDIF].includes(instruction.opcode))
-      ) {
-        // eslint-disable-next-line
-        throw `${artifact.contractName}.cash:${lastMessage.line} Error in evaluating input index ${lastState.program.inputIndex} with the following message: ${lastMessage.message}.
-${evaluationResult.replace(/Error in evaluating input index \d: /, '')}` + stackContentsMessage;
-      }
-
-      // eslint-disable-next-line
-      throw evaluationResult + stackContentsMessage;
-    }
-  }
-
-  return debugResult;
-};
-
-const logConsoleLogStatement = (
-  log: LogEntry,
-  debugStep: AuthenticationProgramStateBCHCHIPs,
-  artifact: Artifact,
-): void => {
-  let line = `${artifact.contractName}.cash:${log.line}`;
-  const decodedData = log.data.map((element) => decodeLogData(element, debugStep.stack, log.ip));
-  console.log(`${line} ${decodedData.join(' ')}`);
-};
-
-const decodeLogData = (element: LogData, stack: Uint8Array[], ip: number): any => {
-  if (typeof element === 'string') return element;
-
-  // Reversed since stack is in reverse order
-  const stackItem = [...stack].reverse()[element.stackIndex];
-
-  if (!stackItem) {
-    throw Error(`Stack item at index ${(element as StackItem).stackIndex} not found at instruction pointer ${ip}`);
-  }
-
-  if (element.type === PrimitiveType.BOOL) return decodeBool(stackItem);
-  if (element.type === PrimitiveType.INT) return decodeInt(stackItem);
-  if (element.type === PrimitiveType.STRING) return decodeString(stackItem);
-
-  return `0x${binToHex(stackItem)}`;
-};
diff --git a/packages/cashscript/src/Transaction.ts b/packages/cashscript/src/Transaction.ts
index 16b8cd69..085bca66 100644
--- a/packages/cashscript/src/Transaction.ts
+++ b/packages/cashscript/src/Transaction.ts
@@ -40,10 +40,8 @@ import { P2PKH_INPUT_SIZE } from './constants.js';
 import { TransactionBuilder } from './TransactionBuilder.js';
 import { Contract } from './Contract.js';
 import MockNetworkProvider from './network/MockNetworkProvider.js';
-import {
-  DebugResult,
-  buildTemplate, debugTemplate, evaluateTemplate, getBitauthUri,
-} from './LibauthTemplate.js';
+import { buildTemplate, getBitauthUri } from './LibauthTemplate.js';
+import { debugTemplate, evaluateTemplate, DebugResult } from './debugging.js';
 
 export class Transaction {
   public inputs: Utxo[] = [];
diff --git a/packages/cashscript/src/debugging.ts b/packages/cashscript/src/debugging.ts
new file mode 100644
index 00000000..16518ef6
--- /dev/null
+++ b/packages/cashscript/src/debugging.ts
@@ -0,0 +1,167 @@
+import { AuthenticationErrorCommon, AuthenticationInstruction, AuthenticationProgramCommon, AuthenticationProgramStateBCHCHIPs, AuthenticationVirtualMachine, ResolvedTransactionCommon, WalletTemplate, binToHex, createCompiler, createVirtualMachineBCHCHIPs, walletTemplateToCompilerConfiguration } from '@bitauth/libauth';
+import { Artifact, LogData, LogEntry, Op, PrimitiveType, decodeBool, decodeInt, decodeString } from '@cashscript/utils';
+import { findLastIndex, toRegExp } from './utils.js';
+
+// evaluates the fully defined template, throws upon error
+export const evaluateTemplate = (template: WalletTemplate): boolean => {
+  const { vm, program } = createProgram(template);
+
+  const verifyResult = vm.verify(program);
+  if (typeof verifyResult === 'string') {
+    throw new Error(verifyResult);
+  }
+
+  return verifyResult;
+};
+
+export type DebugResult = AuthenticationProgramStateBCHCHIPs[];
+
+// debugs the template, optionally logging the execution data
+export const debugTemplate = (template: WalletTemplate, artifact: Artifact): DebugResult => {
+  const { vm, program } = createProgram(template);
+
+  const fullDebugSteps = vm.debug(program);
+
+  // P2SH executions have 3 phases, we only want the last one (locking script execution)
+  // https://libauth.org/types/AuthenticationVirtualMachine.html#__type.debug
+  const lockingScriptDebugResult = fullDebugSteps.slice(findLastIndex(fullDebugSteps, (state) => state.ip === 0));
+
+  // The controlStack determines whether the current debug step is in the executed branch
+  // https://libauth.org/types/AuthenticationProgramStateControlStack.html
+  const executedDebugSteps = lockingScriptDebugResult
+    .filter((debugStep) => debugStep.controlStack.every(item => item === true));
+
+  const executedLogs = (artifact.debug?.logs ?? [])
+    .filter((debugStep) => executedDebugSteps.some((log) => log.ip === debugStep.ip));
+
+  for (const log of executedLogs) {
+    const correspondingDebugStep = executedDebugSteps.find((debugStep) => debugStep.ip === log.ip)!;
+    logConsoleLogStatement(log, correspondingDebugStep, artifact);
+  }
+
+  const lastExecutedDebugStep = executedDebugSteps[executedDebugSteps.length - 1];
+
+  // If an error is present in the last step, that means a require statement in the middle of the function failed
+  if (lastExecutedDebugStep.error) {
+    const requireStatement = (artifact.debug?.requireMessages ?? [])
+      .find((message) => message.ip === lastExecutedDebugStep.ip);
+
+    if (requireStatement) {
+      throw new Error(`${artifact.contractName}.cash:${requireStatement.line} Error in evaluating input index ${lastExecutedDebugStep.program.inputIndex} with the following message: ${requireStatement.message}.\n${lastExecutedDebugStep.error}`);
+    }
+
+    throw new Error(`Error in evaluating input index ${lastExecutedDebugStep.program.inputIndex}.\n${lastExecutedDebugStep.error}`);
+  }
+
+  const evaluationResult = vm.verify(program);
+
+  if (failedFinalVerify(evaluationResult)) {
+    const stackContents = lastExecutedDebugStep.stack.map(item => `0x${binToHex(item)}`).join(', ');
+    const stackContentsMessage = `\nStack contents after evaluation: ${lastExecutedDebugStep.stack.length ? stackContents : 'empty'}`;
+
+    const executedInstructions = lastExecutedDebugStep.instructions
+      .filter((_, i) => executedDebugSteps.map((step) => step.ip).includes(i));
+
+    const cleanupSize = calculateCleanupSize(executedInstructions);
+    const finalExecutedVerify = executedDebugSteps[executedDebugSteps.length - cleanupSize - 1];
+
+    const finalVerifyMessage = artifact.debug?.requireMessages.find((message) => message.ip === finalExecutedVerify.ip);
+
+    if (finalVerifyMessage) {
+      throw new Error(`${artifact.contractName}.cash:${finalVerifyMessage.line} Error in evaluating input index ${lastExecutedDebugStep.program.inputIndex} with the following message: ${finalVerifyMessage.message}.\n${evaluationResult.replace(/Error in evaluating input index \d: /, '')}` + stackContentsMessage);
+    }
+
+    throw new Error(evaluationResult + stackContentsMessage);
+  }
+
+  return fullDebugSteps;
+};
+
+type VM = AuthenticationVirtualMachine<
+ResolvedTransactionCommon,
+AuthenticationProgramCommon,
+AuthenticationProgramStateBCHCHIPs
+>;
+type Program = AuthenticationProgramCommon;
+type CreateProgramResult = { vm: VM, program: Program };
+
+// internal util. instantiates the virtual machine and compiles the template into a program
+const createProgram = (template: WalletTemplate): CreateProgramResult => {
+  const configuration = walletTemplateToCompilerConfiguration(template);
+  const vm = createVirtualMachineBCHCHIPs();
+  const compiler = createCompiler(configuration);
+
+  const scenarioGeneration = compiler.generateScenario({
+    debug: true,
+    lockingScriptId: undefined,
+    unlockingScriptId: 'unlock_lock',
+    scenarioId: 'evaluate_function',
+  });
+
+  if (typeof scenarioGeneration === 'string') {
+    throw new Error(scenarioGeneration);
+  }
+
+  if (typeof scenarioGeneration.scenario === 'string') {
+    throw new Error(scenarioGeneration.scenario);
+  }
+
+  return { vm, program: scenarioGeneration.scenario.program };
+};
+
+const logConsoleLogStatement = (
+  log: LogEntry,
+  debugStep: AuthenticationProgramStateBCHCHIPs,
+  artifact: Artifact,
+): void => {
+  let line = `${artifact.contractName}.cash:${log.line}`;
+  const decodedData = log.data.map((element) => decodeLogData(element, debugStep.stack, log.ip));
+  console.log(`${line} ${decodedData.join(' ')}`);
+};
+
+const decodeLogData = (element: LogData, stack: Uint8Array[], ip: number): any => {
+  if (typeof element === 'string') return element;
+
+  // Reversed since stack is in reverse order
+  const stackItem = [...stack].reverse()[element.stackIndex];
+
+  if (!stackItem) {
+    throw Error(`Stack item at index ${element.stackIndex} not found at instruction pointer ${ip}`);
+  }
+
+  if (element.type === PrimitiveType.BOOL) return decodeBool(stackItem);
+  if (element.type === PrimitiveType.INT) return decodeInt(stackItem);
+  if (element.type === PrimitiveType.STRING) return decodeString(stackItem);
+
+  return `0x${binToHex(stackItem)}`;
+};
+
+const failedFinalVerify = (evaluationResult: string | true): evaluationResult is string => {
+  // true indicates a successful evaluation (so no failed final verify)
+  if (evaluationResult === true) return false;
+
+  // If any of the following errors occurred, then the final verify failed - any other messages
+  // indicate other kinds of failures
+  return toRegExp([
+    AuthenticationErrorCommon.requiresCleanStack,
+    AuthenticationErrorCommon.nonEmptyControlStack,
+    AuthenticationErrorCommon.unsuccessfulEvaluation,
+  ]).test(evaluationResult);
+};
+
+const calculateCleanupSize = (instructions: AuthenticationInstruction[]): number => {
+  // OP_NIP is used for cleanup at the end of a function, OP_ENDIF and OP_ELSE are the end of branches
+  // We need to remove all of these to get to the actual last executed instruction of a function
+  const cleanupOpcodes = [Op.OP_ENDIF, Op.OP_NIP, Op.OP_ELSE];
+
+  let cleanupSize = 0;
+  for (const instruction of [...instructions].reverse()) {
+    if (cleanupOpcodes.includes(instruction.opcode)) {
+      cleanupSize++;
+    } else {
+      break;
+    }
+  }
+
+  return cleanupSize;
+};
diff --git a/packages/cashscript/src/test/JestExtensions.ts b/packages/cashscript/src/test/JestExtensions.ts
index d451e3d4..2c383895 100644
--- a/packages/cashscript/src/test/JestExtensions.ts
+++ b/packages/cashscript/src/test/JestExtensions.ts
@@ -69,7 +69,7 @@ expect.extend({
 
 Contract function did not fail a require statement`;
     } catch (error) {
-      message = error as any;
+      message = (error as any)?.message;
     }
 
     // should not have failed
diff --git a/packages/cashscript/test/debugging.test.ts b/packages/cashscript/test/debugging.test.ts
index c6f0107c..3b00b348 100644
--- a/packages/cashscript/test/debugging.test.ts
+++ b/packages/cashscript/test/debugging.test.ts
@@ -1,12 +1,82 @@
 import { compileString } from 'cashc';
 import { Contract, MockNetworkProvider, SignatureTemplate } from '../src/index.js';
 import {
-  alicePriv, alicePub, bobPriv, bobPub,
+  alicePriv, alicePub, bobPriv,
 } from './fixture/vars.js';
 import '../src/test/JestExtensions.js';
 import { randomUtxo } from '../src/utils.js';
 import { binToHex } from '@bitauth/libauth';
 
+const CONTRACT_CODE = `
+contract Test() {
+  function test_logs() {
+    console.log("Hello World");
+    require(1 == 2);
+  }
+
+  function test_no_logs() {
+    require(1 == 2);
+  }
+
+  function test_require() {
+    require(1 == 2, "1 should equal 2");
+  }
+
+  function test_require_no_failure() {
+    require(1 == 1, "1 should equal 1");
+  }
+
+  // TODO: Add test for this
+  function test_multiple_require_statements() {
+    require(1 == 2, "1 should equal 2");
+    require(1 == 1, "1 should equal 1");
+  }
+
+  // TODO: Add test for this
+  function test_multiple_require_statements_final_fails() {
+    require(1 == 1, "1 should equal 1");
+    require(1 == 2, "1 should equal 2");
+  }
+
+  // TODO: Add test for this
+  function test_multiple_require_statements_no_message_final() {
+    require(1 == 1, "1 should equal 1");
+    require(1 == 2);
+  }
+
+  function test_timeops_as_final_require() {
+    require(1 == 1, "1 should equal 1");
+    require(tx.time >= 100000000, "time should be HUGE");
+  }
+
+  function test_final_require_in_if_statement(int switch) {
+    if (switch == 1) {
+      int a = 2;
+      require(1 == a, "1 should equal 2");
+    // TODO: Check if it's better test with or without this else
+    } else if (switch == 2) {
+      int b = 3;
+      require(1 == b, "1 should equal 3");
+    } else {
+      int c = 4;
+      require(switch == c, "switch should equal 4");
+    }
+  }
+
+  function test_final_require_in_if_statement_with_deep_reassignment() {
+    int a = 0;
+    int b = 1;
+    int c = 2;
+    int d = 3;
+    int e = 4;
+    if (a == 0) {
+      a = 10;
+      require(a + b + c + d + e == 10, "sum should equal 10");
+    }
+  }
+}
+`;
+
 describe('Debugging tests', () => {
   describe('console.log statements', () => {
     const BASE_CONTRACT_CODE = `
@@ -189,89 +259,99 @@ describe('Debugging tests', () => {
   });
 
   describe('require statements', () => {
-    const code = `
-    contract TransferWithTimeout(
-        pubkey sender,
-        pubkey recipient,
-        int timeout
-    ) {
-        // Require recipient's signature to match
-        function transfer(sig recipientSig) {
-            require(checkSig(recipientSig, recipient));
-        }
-
-        // Require timeout time to be reached and sender's signature to match
-        function timeout(sig senderSig) {
-            require(checkSig(senderSig, sender), "sigcheck custom fail");
-            require(tx.time >= timeout, "timecheck custom fail");
-        }
-
-        function test(int a) {
-          require(a == 1, "dropped last verify fail");
-        }
-    }
-    `;
-
-    const artifact = compileString(code);
+    const artifact = compileString(CONTRACT_CODE);
     const provider = new MockNetworkProvider();
 
-    it('should only fail with correct error message when there are multiple require statements', async () => {
-      const contract = new Contract(artifact, [alicePub, bobPub, 2000000n], { provider });
+    it('should fail with error message when require statement fails', async () => {
+      const contract = new Contract(artifact, [], { provider });
       provider.addUtxo(contract.address, randomUtxo());
 
-      const transaction = contract.functions.timeout(new SignatureTemplate(bobPriv)).to(contract.address, 1000n);
-      await expect(transaction).toFailRequireWith(/sigcheck custom fail/);
-      await expect(transaction).not.toFailRequireWith(/timecheck custom fail/);
+      const transaction = contract.functions.test_require().to(contract.address, 1000n);
+      await expect(transaction).toFailRequireWith(/1 should equal 2/);
     });
 
-    it('should only fail with correct error message for timecheck require statement when there are multiple require statements', async () => {
-      const contract = new Contract(artifact, [alicePub, bobPub, 1000000n], { provider });
+    // // test_multiple_require_statements
+    it('it should only fail with correct error message when there are multiple require statements', async () => {
+      const contract = new Contract(artifact, [], { provider });
       provider.addUtxo(contract.address, randomUtxo());
 
-      const transaction = contract.functions.timeout(new SignatureTemplate(alicePriv)).to(contract.address, 1000n);
-      await expect(transaction).toFailRequireWith(/timecheck custom fail/);
-      await expect(transaction).not.toFailRequireWith(/sigcheck custom fail/);
+      const transaction = contract.functions.test_multiple_require_statements().to(contract.address, 1000n);
+      await expect(transaction).toFailRequireWith(/1 should equal 2/);
+      await expect(transaction).not.toFailRequireWith(/1 should equal 1/);
     });
 
-    it('should fail with correct error message for the final require statement', async () => {
-      const contract = new Contract(artifact, [alicePub, bobPub, 2000000n], { provider });
+    // // test_multiple_require_statements_final_fails
+    it('it should only fail with correct error message when there are multiple require statements where the final statement fails', async () => {
+      const contract = new Contract(artifact, [], { provider });
       provider.addUtxo(contract.address, randomUtxo());
 
-      const transaction = contract.functions.test(0n).to(contract.address, 1000n);
-      await expect(transaction).toFailRequireWith(/dropped last verify fail/);
+      const transaction = contract.functions.test_multiple_require_statements_final_fails().to(contract.address, 1000n);
+      await expect(transaction).toFailRequireWith(/1 should equal 2/);
+      await expect(transaction).not.toFailRequireWith(/1 should equal 1/);
     });
 
     it('should not fail if no require statements fail', async () => {
-      const contract = new Contract(artifact, [alicePub, bobPub, 2000000n], { provider });
+      const contract = new Contract(artifact, [], { provider });
       provider.addUtxo(contract.address, randomUtxo());
 
-      const transaction = contract.functions.transfer(new SignatureTemplate(bobPriv)).to(contract.address, 1000n);
+      const transaction = contract.functions.test_require_no_failure().to(contract.address, 1000n);
+      // TODO: add `toFailRequire` without any arguments to JestExtensions
       await expect(transaction).not.toFailRequireWith(/.*/);
     });
-  });
 
-  describe('JestExtensions', () => {
-    const CONTRACT_CODE = `
-      contract Test() {
-        function test_logs() {
-          console.log("Hello World");
-          require(1 == 2);
-        }
+    // test_multiple_require_statements_no_message_final
+    it('should fail without custom message if the final require statement does not have a message', async () => {
+      const contract = new Contract(artifact, [], { provider });
+      provider.addUtxo(contract.address, randomUtxo());
 
-        function test_no_logs() {
-          require(1 == 2);
-        }
+      const transaction = contract.functions
+        .test_multiple_require_statements_no_message_final().to(contract.address, 1000n);
 
-        function test_require() {
-          require(1 == 2, "1 should equal 2");
-        }
+      await expect(transaction).toFailRequireWith(/Error in evaluating input index 0/);
+      await expect(transaction).not.toFailRequireWith(/1 should equal 1/);
+    });
 
-        function test_require_no_failure() {
-          require(1 == 1, "1 should equal 1");
-        }
-      }
-    `;
+    // test_timeops_as_final_require
+    it('should fail with correct error message for the final TimeOp require statement', async () => {
+      const contract = new Contract(artifact, [], { provider });
+      provider.addUtxo(contract.address, randomUtxo());
+
+      const transaction = contract.functions.test_timeops_as_final_require().to(contract.address, 1000n);
+
+      await expect(transaction).toFailRequireWith(/time should be HUGE/);
+      await expect(transaction).not.toFailRequireWith(/1 should equal 1/);
+    });
+
+    // test_final_require_in_if_statement
+    it('should fail with correct error message for the final require statement in an if statement', async () => {
+      const contract = new Contract(artifact, [], { provider });
+      provider.addUtxo(contract.address, randomUtxo());
+
+      const transactionIfBranch = contract.functions
+        .test_final_require_in_if_statement(1n).to(contract.address, 1000n);
+      await expect(transactionIfBranch).toFailRequireWith(/1 should equal 2/);
+
+      const transactionElseIfBranch = contract.functions
+        .test_final_require_in_if_statement(2n).to(contract.address, 1000n);
+      await expect(transactionElseIfBranch).toFailRequireWith(/1 should equal 3/);
+
+      const transactionElseBranch = contract.functions
+        .test_final_require_in_if_statement(3n).to(contract.address, 1000n);
+      await expect(transactionElseBranch).toFailRequireWith(/switch should equal 4/);
+    });
+
+    // test_final_require_in_if_statement_with_deep_reassignment
+    it('should fail with correct error message for the final require statement in an if statement with a deep reassignment', async () => {
+      const contract = new Contract(artifact, [], { provider });
+      provider.addUtxo(contract.address, randomUtxo());
 
+      const transaction = contract.functions
+        .test_final_require_in_if_statement_with_deep_reassignment().to(contract.address, 1000n);
+      await expect(transaction).toFailRequireWith(/sum should equal 10/);
+    });
+  });
+
+  describe('JestExtensions', () => {
     const artifact = compileString(CONTRACT_CODE);
     const provider = new MockNetworkProvider();
 
@@ -291,7 +371,6 @@ describe('Debugging tests', () => {
       ).rejects.toThrow(/Expected: .*This is definitely not the log.*\nReceived: .*Test.cash:4 Hello World/);
     });
 
-    // TODO: Investigate why it still logs, even though we call test_no_logs()
     it('should fail the JestExtensions test if a log is expected where no log is logged', async () => {
       const contract = new Contract(artifact, [], { provider });
       provider.addUtxo(contract.address, randomUtxo());
@@ -305,19 +384,7 @@ describe('Debugging tests', () => {
       // Note: We're wrapping the expect call in another expect, since we expect the inner expect to throw
       await expect(
         expect(transaction).toLog(incorrectExpectedLog),
-      ).rejects.toThrow(/Expected: .*Hello World.*\nReceived: undefined/);
-    });
-
-    it('[WIP] should fail the JestExtensions test if a log is expected where no log is logged', async () => {
-      const contract = new Contract(artifact, [], { provider });
-      provider.addUtxo(contract.address, randomUtxo());
-
-      const transaction = await contract.functions
-        .test_no_logs()
-        .to(contract.address, 10000n)
-        .debug();
-
-      console.log(transaction);
+      ).rejects.toThrow(/Expected: .*Hello World.*\nReceived: .*undefined/);
     });
 
     it('should fail the JestExtensions test if an incorrect require error message is expected', async () => {
@@ -331,12 +398,13 @@ describe('Debugging tests', () => {
       const incorrectExpectedRequire = new RegExp('1 should equal 3');
 
       // Note: We're wrapping the expect call in another expect, since we expect the inner expect to throw
+      // TODO: Figure out why this error message says "Received string:" instead of "Received:"
       await expect(
         expect(transaction).toFailRequireWith(incorrectExpectedRequire),
-      ).rejects.toThrow(/Expected: .*1 should equal 3.*\nReceived: .*1 should equal 2.*/);
+      ).rejects.toThrow(/Expected pattern: .*1 should equal 3.*\nReceived string: .*1 should equal 2.*/);
     });
 
-
+    // TODO: Fix this
     it('should fail the JestExtensions test if a require error message is expected where no error is thrown', async () => {
       const contract = new Contract(artifact, [], { provider });
       provider.addUtxo(contract.address, randomUtxo());
@@ -349,7 +417,7 @@ describe('Debugging tests', () => {
 
       // Note: We're wrapping the expect call in another expect, since we expect the inner expect to throw
       await expect(
-        expect(transaction).toFailRequireWith(incorrectExpectedRequire),
+        await expect(transaction).toFailRequireWith(incorrectExpectedRequire),
       ).rejects.toThrow(/Expected: .*1 should equal 3.*\nReceived: undefined/);
     });
   });

From 8122671873a19a74b4b0627220ff6e9868a54bbb Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Mon, 15 Apr 2024 11:40:06 +0800
Subject: [PATCH 084/171] Fix bugs in JestExtensions, refactor and update tests

---
 .../cashscript/src/test/JestExtensions.ts     | 97 ++++++-------------
 packages/cashscript/test/debugging.test.ts    | 67 ++++++++-----
 2 files changed, 72 insertions(+), 92 deletions(-)

diff --git a/packages/cashscript/src/test/JestExtensions.ts b/packages/cashscript/src/test/JestExtensions.ts
index 2c383895..e96cf81d 100644
--- a/packages/cashscript/src/test/JestExtensions.ts
+++ b/packages/cashscript/src/test/JestExtensions.ts
@@ -1,6 +1,5 @@
 import { MatcherContext } from '@jest/expect';
 import { SyncExpectationResult } from 'expect';
-import { printExpected, printReceived, matcherHint } from 'jest-matcher-utils';
 import { Transaction } from '../index.js';
 
 export {};
@@ -9,7 +8,7 @@ declare global {
   namespace jest {
     // eslint-disable-next-line
     interface Matchers<R> {
-      toLog(value: RegExp | string): Promise<void>;
+      toLog(value?: RegExp | string): Promise<void>;
       toFailRequireWith(value: RegExp | string): Promise<void>;
     }
   }
@@ -19,34 +18,32 @@ expect.extend({
   async toLog(
     this: MatcherContext,
     transaction: Transaction,
-    match: RegExp | string,
+    match?: RegExp | string,
   ): Promise<SyncExpectationResult> {
-    const spyOnLoggerError = jest.spyOn(console, 'log');
+    const loggerSpy = jest.spyOn(console, 'log');
 
     // silence actual stdout output
-    spyOnLoggerError.mockImplementation(() => {});
-    try {
-      await transaction.debug();
-    } catch {}
-    let error: string = '';
+    loggerSpy.mockImplementation(() => {});
+    try { await transaction.debug(); } catch {}
+
+    // We concatenate all the logs into a single string - if no logs are present, we set received to undefined
+    const receivedBase = loggerSpy.mock.calls.reduce((acc, [log]) => `${acc}\n${log}`, '').trim();
+    const received = receivedBase === '' ? undefined : receivedBase;
+
+    const matcherHint = this.utils.matcherHint('toLog', 'received', 'expected', { isNot: this.isNot });
+    const expectedText = `Expected: ${this.isNot ? 'not ' : ''}${this.utils.printExpected(match)}`;
+    const receivedText = `Received: ${this.utils.printReceived(received)}`;
+    const message = (): string => `${matcherHint}\n\n${expectedText}\n${receivedText}`;
 
     try {
-      expect(spyOnLoggerError).toBeCalledWith(expect.stringMatching(match));
+      expect(loggerSpy).toBeCalledWith(match ? expect.stringMatching(match) : expect.anything());
     } catch (e) {
-      error = e as any;
+      return { message, pass: false };
     }
 
-    // We concatenate all the logs into a single string - if no logs are present, we set received to undefined
-    const receivedBase = spyOnLoggerError.mock.calls.reduce((acc, [log]) => `${acc}\n${log}`, '').trim();
-    const received = receivedBase === '' ? undefined : receivedBase;
+    loggerSpy.mockClear();
 
-    spyOnLoggerError.mockClear();
-
-    return {
-      message: failMessage(received, match),
-      // message: () =>'Hello',
-      pass: !error,
-    };
+    return { message, pass: true };
   },
 });
 
@@ -56,58 +53,24 @@ expect.extend({
     transaction: Transaction,
     match: RegExp | string,
   ): Promise<SyncExpectationResult> {
-    let message: string = '';
-    let failMessage: any = () => {};
-
     try {
       await transaction.debug();
-      failMessage = () => () => `${matcherHint(
-        '.toFailRequireWith',
-        undefined,
-        '',
-      )}
-
-Contract function did not fail a require statement`;
-    } catch (error) {
-      message = (error as any)?.message;
-    }
 
-    // should not have failed
-    if (this.isNot) {
-      return {
-        message: () => `${matcherHint(
-          '.toFailRequireWith',
-          'received',
-          '',
-          { isNot: true },
-        )}`,
-        pass: false,
-      };
-    }
+      const matcherHint = this.utils.matcherHint('.toFailRequireWith', undefined, match.toString(), { isNot: this.isNot });
+      const message = (): string => `${matcherHint}\n\nContract function did not fail a require statement`;
+      return { message, pass: false };
+    } catch (transactionError: any) {
+      const matcherHint = this.utils.matcherHint('toFailRequireWith', 'received', 'expected', { isNot: this.isNot });
+      const expectedText = `Expected pattern: ${this.isNot ? 'not ' : ''}${this.utils.printExpected(match)}`;
+      const receivedText = `Received string: ${this.utils.printReceived(transactionError?.message ?? '')}`;
+      const message = (): string => `${matcherHint}\n\n${expectedText}\n${receivedText}`;
 
-    if (message) {
       try {
-        expect(message).toMatch(match);
-        message = '';
-      } catch (error: any) {
-        message = error.message;
-        failMessage = () => () => message.replace('.toMatch', '.toFailRequireWith');
+        expect(transactionError?.message ?? '').toMatch(match);
+        return { message, pass: true };
+      } catch {
+        return { message, pass: false };
       }
     }
-
-    return {
-      message: failMessage(message, match),
-      pass: !message,
-    };
   },
 });
-
-// TODO: Update to have the same failMessage function for .toLog and .toFailRequireWith
-const failMessage = (received?: string, expected?: RegExp | string) => () => `${matcherHint(
-  '.toLog',
-  'received',
-  'expected',
-)}
-
-Expected: ${printExpected(expected)}
-Received: ${printReceived(received)}`;
diff --git a/packages/cashscript/test/debugging.test.ts b/packages/cashscript/test/debugging.test.ts
index 3b00b348..7dd51db8 100644
--- a/packages/cashscript/test/debugging.test.ts
+++ b/packages/cashscript/test/debugging.test.ts
@@ -355,35 +355,45 @@ describe('Debugging tests', () => {
     const artifact = compileString(CONTRACT_CODE);
     const provider = new MockNetworkProvider();
 
+    // Note: happy cases are implicitly tested by the "regular" debugging tests, since the use JestExtensions
+
     it('should fail the JestExtensions test if an incorrect log is expected', async () => {
       const contract = new Contract(artifact, [], { provider });
       provider.addUtxo(contract.address, randomUtxo());
 
-      const transaction = contract.functions
-        .test_logs()
-        .to(contract.address, 10000n);
-
-      const incorrectExpectedLog = new RegExp('^This is definitely not the log$');
+      const transaction = contract.functions.test_logs().to(contract.address, 10000n);
 
       // Note: We're wrapping the expect call in another expect, since we expect the inner expect to throw
       await expect(
-        expect(transaction).toLog(incorrectExpectedLog),
+        expect(transaction).toLog('^This is definitely not the log$'),
       ).rejects.toThrow(/Expected: .*This is definitely not the log.*\nReceived: .*Test.cash:4 Hello World/);
     });
 
-    it('should fail the JestExtensions test if a log is expected where no log is logged', async () => {
+    it('should fail the JestExtensions test if a log is logged that is NOT expected', async () => {
       const contract = new Contract(artifact, [], { provider });
       provider.addUtxo(contract.address, randomUtxo());
 
-      const transaction = contract.functions
-        .test_no_logs()
-        .to(contract.address, 10000n);
+      const transaction = contract.functions.test_logs().to(contract.address, 10000n);
+
+      // Note: We're wrapping the expect call in another expect, since we expect the inner expect to throw
+      await expect(
+        expect(transaction).not.toLog('^Test.cash:4 Hello World$'),
+      ).rejects.toThrow(/Expected: not .*Test.cash:4 Hello World.*\nReceived: .*Test.cash:4 Hello World/);
+
+      await expect(
+        expect(transaction).not.toLog(),
+      ).rejects.toThrow(/Expected: not .*undefined.*\nReceived: .*Test.cash:4 Hello World/);
+    });
 
-      const incorrectExpectedLog = new RegExp('Hello World');
+    it('should fail the JestExtensions test if a log is expected where no log is logged', async () => {
+      const contract = new Contract(artifact, [], { provider });
+      provider.addUtxo(contract.address, randomUtxo());
+
+      const transaction = contract.functions.test_no_logs().to(contract.address, 10000n);
 
       // Note: We're wrapping the expect call in another expect, since we expect the inner expect to throw
       await expect(
-        expect(transaction).toLog(incorrectExpectedLog),
+        expect(transaction).toLog('Hello World'),
       ).rejects.toThrow(/Expected: .*Hello World.*\nReceived: .*undefined/);
     });
 
@@ -391,16 +401,11 @@ describe('Debugging tests', () => {
       const contract = new Contract(artifact, [], { provider });
       provider.addUtxo(contract.address, randomUtxo());
 
-      const transaction = contract.functions
-        .test_require()
-        .to(contract.address, 10000n);
-
-      const incorrectExpectedRequire = new RegExp('1 should equal 3');
+      const transaction = contract.functions.test_require().to(contract.address, 10000n);
 
       // Note: We're wrapping the expect call in another expect, since we expect the inner expect to throw
-      // TODO: Figure out why this error message says "Received string:" instead of "Received:"
       await expect(
-        expect(transaction).toFailRequireWith(incorrectExpectedRequire),
+        expect(transaction).toFailRequireWith('1 should equal 3'),
       ).rejects.toThrow(/Expected pattern: .*1 should equal 3.*\nReceived string: .*1 should equal 2.*/);
     });
 
@@ -409,16 +414,28 @@ describe('Debugging tests', () => {
       const contract = new Contract(artifact, [], { provider });
       provider.addUtxo(contract.address, randomUtxo());
 
-      const transaction = contract.functions
-        .test_require_no_failure()
-        .to(contract.address, 10000n);
+      const transaction = contract.functions.test_require_no_failure().to(contract.address, 10000n);
 
-      const incorrectExpectedRequire = new RegExp('1 should equal 3');
+      // Note: We're wrapping the expect call in another expect, since we expect the inner expect to throw
+      await expect(
+        expect(transaction).toFailRequireWith('1 should equal 3'),
+      ).rejects.toThrow(/Contract function did not fail a require statement/);
+    });
+
+    it('should fail the JestExtensions test if an error is thrown where it is NOT expected', async () => {
+      const contract = new Contract(artifact, [], { provider });
+      provider.addUtxo(contract.address, randomUtxo());
+
+      const transaction = contract.functions.test_require().to(contract.address, 10000n);
 
       // Note: We're wrapping the expect call in another expect, since we expect the inner expect to throw
       await expect(
-        await expect(transaction).toFailRequireWith(incorrectExpectedRequire),
-      ).rejects.toThrow(/Expected: .*1 should equal 3.*\nReceived: undefined/);
+        expect(transaction).not.toFailRequireWith('1 should equal 2'),
+      ).rejects.toThrow(/Expected pattern: not .*1 should equal 2.*\nReceived string: .*1 should equal 2.*/);
+
+      await expect(
+        expect(transaction).not.toFailRequireWith(/.*/),
+      ).rejects.toThrow(/Expected pattern: not .*\nReceived string: .*1 should equal 2.*/);
     });
   });
 });

From 3c6b899b3ff511343941d65a6ab405622eb0d263 Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Mon, 15 Apr 2024 11:50:31 +0800
Subject: [PATCH 085/171] Fix cashc tests after debug message fixes

---
 packages/cashc/test/generation/fixtures.ts | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/packages/cashc/test/generation/fixtures.ts b/packages/cashc/test/generation/fixtures.ts
index f3f4efeb..438b341c 100644
--- a/packages/cashc/test/generation/fixtures.ts
+++ b/packages/cashc/test/generation/fixtures.ts
@@ -102,7 +102,7 @@ export const fixtures: Fixture[] = [
         bytecode: '527954799300795479940079537a52949c6300795579935479517993527a757c00795279a0697567007954799c69680079547a93007a537a9c777777',
         logs: [],
         requireMessages: [],
-        sourceMap: '3:16:3:17;;:20::21;;:16:::1;4:12:4:13:0;;:16::17;;:12:::1;5::5:13:0;;:17::18;;:21::22;:17:::1;:12;:24:9:9:0;6:20:6:21;;:24::25;;:20:::1;7:16:7:17:0;;:20::21;;:16:::1;:12::22:0;;;;8:20:8:21;;:24::25;;:20:::1;:12::27;5:8:11:9:0;9:15;10:20:10:21;;:25::26;;:20:::1;:12::28;9:15:11:9;12:12:12:13:0;;:16::17;;:12:::1;13:16:13::0;;:21::22;;:16:::1;2:4:14:5;;',
+        sourceMap: '3:16:3:17;;:20::21;;:16:::1;4:12:4:13:0;;:16::17;;:12:::1;5::5:13:0;;:17::18;;:21::22;:17:::1;:12;:24:9:9:0;6:20:6:21;;:24::25;;:20:::1;7:16:7:17:0;;:20::21;;:16:::1;:12::22:0;;;;8:20:8:21;;:24::25;;:20:::1;:12::27;5:24:9:9;9:15:11::0;10:20:10:21;;:25::26;;:20:::1;:12::28;9:15:11:9;12:12:12:13:0;;:16::17;;:12:::1;13:16:13::0;;:21::22;;:16:::1;2:4:14:5;;',
       },
       source: fs.readFileSync(new URL('../valid-contract-files/if_statement.cash', import.meta.url), { encoding: 'utf-8' }),
       compiler: {
@@ -205,7 +205,7 @@ export const fixtures: Fixture[] = [
         bytecode: '5279009c63537955799300795579940079537a9c6300795679935579517993527a757c00795279a06975675479517a75680079557a93007a537a9c69517777777767527a519c695279007952930079537a9c6300795479930079527993527a757c00795279a0697568537a007a537a9c777768',
         logs: [],
         requireMessages: [],
-        sourceMap: '2:4:14:5;;;;;3:16:3:17;;:20::21;;:16:::1;4:12:4:13:0;;:16::17;;:12:::1;5::5:13:0;;:17::18;;:12:::1;:20:9:9:0;6::6:21;;:24::25;;:20:::1;7:16:7:17:0;;:20::21;;:16:::1;:12::22:0;;;;8:20:8:21;;:24::25;;:20:::1;:12::27;5:8:11:9:0;9:15;10:16:10:17;;:12::18;;;9:15:11:9:1;12:12:12:13:0;;:16::17;;:12:::1;13:16:13::0;;:21::22;;:16:::1;:8::24;2:4:14:5;;;;;;16::26::0;;;;;17:16:17:17;;18:12:18:13;;:16::17;:12:::1;19::19:13:0;;:17::18;;:12:::1;:20:23:9:0;20::20:21;;:24::25;;:20:::1;21:16:21:17:0;;:20::21;;:16:::1;:12::22:0;;;;22:20:22:21;;:24::25;;:20:::1;:12::27;19:8:23:9:0;:20:::1;24:12:24:13:0;;25:16:25:17;;:21::22;;:16:::1;16:4:26:5;;1:0:27:1',
+        sourceMap: '2:4:14:5;;;;;3:16:3:17;;:20::21;;:16:::1;4:12:4:13:0;;:16::17;;:12:::1;5::5:13:0;;:17::18;;:12:::1;:20:9:9:0;6::6:21;;:24::25;;:20:::1;7:16:7:17:0;;:20::21;;:16:::1;:12::22:0;;;;8:20:8:21;;:24::25;;:20:::1;:12::27;5:20:9:9;9:15:11::0;10:16:10:17;;:12::18;;;9:15:11:9:1;12:12:12:13:0;;:16::17;;:12:::1;13:16:13::0;;:21::22;;:16:::1;:8::24;2:4:14:5;;;;;;16::26::0;;;;;17:16:17:17;;18:12:18:13;;:16::17;:12:::1;19::19:13:0;;:17::18;;:12:::1;:20:23:9:0;20::20:21;;:24::25;;:20:::1;21:16:21:17:0;;:20::21;;:16:::1;:12::22:0;;;;22:20:22:21;;:24::25;;:20:::1;:12::27;19:20:23:9;;24:12:24:13:0;;25:16:25:17;;:21::22;;:16:::1;16:4:26:5;;1:0:27:1',
       },
       source: fs.readFileSync(new URL('../valid-contract-files/multifunction_if_statements.cash', import.meta.url), { encoding: 'utf-8' }),
       compiler: {
@@ -652,8 +652,11 @@ export const fixtures: Fixture[] = [
       bytecode: 'OP_DUP OP_1 OP_NUMEQUALVERIFY OP_1ADD OP_2 OP_NUMEQUAL',
       debug: {
         bytecode: '0079519c69007a5193529c',
-        logs: [{ data: [{ stackIndex: 0, type: 'int' }, 'test', { stackIndex: 0, type: 'int' }, 'test2'], ip: 5, line: 4 }],
-        requireMessages: [{ ip: 4, line: 3, message: 'Wrong value passed' }, { ip: 11, line: 6, message: 'Sum doesn\'t work' }],
+        logs: [
+          { data: [{ stackIndex: 0, type: 'int' }, 'test'], ip: 5, line: 4 },
+          { data: [{ stackIndex: 0, type: 'int' }, 'test2'], ip: 5, line: 5 },
+        ],
+        requireMessages: [{ ip: 5, line: 3, message: 'Wrong value passed' }, { ip: 12, line: 6, message: 'Sum doesn\'t work' }],
         sourceMap: '3:12:3:17;;:21::22;:12:::1;:4::46;6:12:6:17:0;;:20::21;:12:::1;:25::26:0;:12:::1',
       },
       source: fs.readFileSync(new URL('../valid-contract-files/debug_messages.cash', import.meta.url), { encoding: 'utf-8' }),

From fa64c5d6e1e827bb3382a04fcc845d360a6c0022 Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Mon, 15 Apr 2024 11:56:13 +0800
Subject: [PATCH 086/171] Move ts-node to tsx

---
 README.md                                     |   6 +-
 examples/README.md                            |   6 +-
 examples/testing-suite/artifacts/example.json |   4 +-
 examples/testing-suite/package.json           |   6 +-
 examples/testing-suite/yarn.lock              | 314 +++++++++++-------
 package.json                                  |   6 +-
 yarn.lock                                     | 171 ++++++++++
 7 files changed, 378 insertions(+), 135 deletions(-)

diff --git a/README.md b/README.md
index fb3519bb..9c203d23 100644
--- a/README.md
+++ b/README.md
@@ -99,11 +99,11 @@ cd cashscript/examples
 npm install
 ```
 
-All `.ts` files in the [`examples/`](/examples) directory can then be executed with `ts-node-esm`.
+All `.ts` files in the [`examples/`](/examples) directory can then be executed with `tsx`.
 
 ```bash
-npm install -g ts-node
-ts-node-esm p2pkh.ts
+npm install -g tsx
+tsx p2pkh.ts
 ```
 
 All `.js` files can be executed with `node`.
diff --git a/examples/README.md b/examples/README.md
index 242c6a79..803a8015 100644
--- a/examples/README.md
+++ b/examples/README.md
@@ -12,11 +12,11 @@ cd cashscript/examples
 yarn
 ```
 
-All `.ts` files can then be executed with `ts-node-esm`.
+All `.ts` files can then be executed with `tsx`.
 
 ```bash
-npm install -g ts-node
-ts-node-esm p2pkh.ts
+npm install -g tsx
+tsx p2pkh.ts
 ```
 
 All `.js` files can be executed with `node`.
diff --git a/examples/testing-suite/artifacts/example.json b/examples/testing-suite/artifacts/example.json
index 50b4db3d..bac84de7 100644
--- a/examples/testing-suite/artifacts/example.json
+++ b/examples/testing-suite/artifacts/example.json
@@ -40,7 +40,7 @@
   },
   "compiler": {
     "name": "cashc",
-    "version": "0.10.0-next.0"
+    "version": "0.10.0-next.3"
   },
-  "updatedAt": "2023-12-13T15:04:57.625Z"
+  "updatedAt": "2024-04-15T03:55:07.781Z"
 }
\ No newline at end of file
diff --git a/examples/testing-suite/package.json b/examples/testing-suite/package.json
index bff4660e..e63b70ec 100644
--- a/examples/testing-suite/package.json
+++ b/examples/testing-suite/package.json
@@ -16,8 +16,8 @@
     "build:test": "yarn clean:test && yarn compile:test",
     "clean": "rm -rf ./dist",
     "clean:test": "rm -rf ./dist-test",
-    "compile": "tsc -p tsconfig.json && ts-node-esm tasks/index.ts compile",
-    "compile:test": "tsc -p tsconfig.test.json && ts-node-esm tasks/index.ts compile",
+    "compile": "tsc -p tsconfig.json && tsx tasks/index.ts compile",
+    "compile:test": "tsc -p tsconfig.test.json && tsx tasks/index.ts compile",
     "lint": "eslint . --ext .ts --ignore-path ../../.eslintignore",
     "prepare": "yarn build",
     "prepublishOnly": "yarn test && yarn lint",
@@ -32,7 +32,7 @@
     "@jest/globals": "^29.4.1",
     "@types/jest": "^29.4.1",
     "jest": "^29.4.1",
-    "ts-node": "^10.9.1",
+    "tsx": "^4.7.2",
     "typescript": "^4.9.5"
   }
 }
diff --git a/examples/testing-suite/yarn.lock b/examples/testing-suite/yarn.lock
index d43fdd4a..c731accf 100644
--- a/examples/testing-suite/yarn.lock
+++ b/examples/testing-suite/yarn.lock
@@ -297,25 +297,133 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@bitauth/libauth@^2.0.0-alpha.8":
-  version "2.0.0-alpha.8"
-  resolved "https://registry.yarnpkg.com/@bitauth/libauth/-/libauth-2.0.0-alpha.8.tgz#352ade2075517f1548e05553e7bb1c5e1023d1fe"
-  integrity sha512-KINAJbzg5pKs+WM8wCjWw6Ct/CeZG1JMrRXsIyPFztjNtwA5eeQL8eFkyquePsf8aZ5peRYK2eFPUDo/1rkg+w==
+"@bitauth/libauth@^2.0.0":
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/@bitauth/libauth/-/libauth-2.1.0.tgz#e618706092fe9ea5e4103a2cf427cd5ae5287e1e"
+  integrity sha512-O0cIN7/UPUHg6gaWHuePXIYRkvNPrc3zHfi80guZkkO4Ke9nSaN5mSITqhC5lKFBwAakr6OSToClXHN/IxiOfA==
 
-"@cashscript/utils@^0.10.0-next.0":
-  version "0.10.0-next.0"
-  resolved "https://registry.yarnpkg.com/@cashscript/utils/-/utils-0.10.0-next.0.tgz#d8a47c2e9b18840678e62c58c3190afb86794f9a"
-  integrity sha512-cqTniDARlZqqThMTd33LtwSFhRdVe15tTq1K4Zs0gYFgBcT1l40B3P57szN+2gXsffGmN77I33IXv+wPoObcDg==
+"@cashscript/utils@^0.10.0-next.3":
+  version "0.10.0-next.3"
+  resolved "https://registry.yarnpkg.com/@cashscript/utils/-/utils-0.10.0-next.3.tgz#53bcdfae252734696c8158d4f479c8c60e2a0f7f"
+  integrity sha512-eS16y0OyZ0m2OitsvsKwPX+fwI8Lc4imJioM+hRjedSZ0ioqO+6qZUJoeLAkdpCvEzkRo2I68vuRCbelH0wQMQ==
   dependencies:
-    "@bitauth/libauth" "^2.0.0-alpha.8"
+    "@bitauth/libauth" "^2.0.0"
     hash.js "^1.1.7"
 
-"@cspotcode/source-map-support@^0.8.0":
-  version "0.8.1"
-  resolved "https://registry.yarnpkg.com/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz#00629c35a688e05a88b1cda684fb9d5e73f000a1"
-  integrity sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==
-  dependencies:
-    "@jridgewell/trace-mapping" "0.3.9"
+"@esbuild/aix-ppc64@0.19.12":
+  version "0.19.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.19.12.tgz#d1bc06aedb6936b3b6d313bf809a5a40387d2b7f"
+  integrity sha512-bmoCYyWdEL3wDQIVbcyzRyeKLgk2WtWLTWz1ZIAZF/EGbNOwSA6ew3PftJ1PqMiOOGu0OyFMzG53L0zqIpPeNA==
+
+"@esbuild/android-arm64@0.19.12":
+  version "0.19.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.19.12.tgz#7ad65a36cfdb7e0d429c353e00f680d737c2aed4"
+  integrity sha512-P0UVNGIienjZv3f5zq0DP3Nt2IE/3plFzuaS96vihvD0Hd6H/q4WXUGpCxD/E8YrSXfNyRPbpTq+T8ZQioSuPA==
+
+"@esbuild/android-arm@0.19.12":
+  version "0.19.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.19.12.tgz#b0c26536f37776162ca8bde25e42040c203f2824"
+  integrity sha512-qg/Lj1mu3CdQlDEEiWrlC4eaPZ1KztwGJ9B6J+/6G+/4ewxJg7gqj8eVYWvao1bXrqGiW2rsBZFSX3q2lcW05w==
+
+"@esbuild/android-x64@0.19.12":
+  version "0.19.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.19.12.tgz#cb13e2211282012194d89bf3bfe7721273473b3d"
+  integrity sha512-3k7ZoUW6Q6YqhdhIaq/WZ7HwBpnFBlW905Fa4s4qWJyiNOgT1dOqDiVAQFwBH7gBRZr17gLrlFCRzF6jFh7Kew==
+
+"@esbuild/darwin-arm64@0.19.12":
+  version "0.19.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.19.12.tgz#cbee41e988020d4b516e9d9e44dd29200996275e"
+  integrity sha512-B6IeSgZgtEzGC42jsI+YYu9Z3HKRxp8ZT3cqhvliEHovq8HSX2YX8lNocDn79gCKJXOSaEot9MVYky7AKjCs8g==
+
+"@esbuild/darwin-x64@0.19.12":
+  version "0.19.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.19.12.tgz#e37d9633246d52aecf491ee916ece709f9d5f4cd"
+  integrity sha512-hKoVkKzFiToTgn+41qGhsUJXFlIjxI/jSYeZf3ugemDYZldIXIxhvwN6erJGlX4t5h417iFuheZ7l+YVn05N3A==
+
+"@esbuild/freebsd-arm64@0.19.12":
+  version "0.19.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.12.tgz#1ee4d8b682ed363b08af74d1ea2b2b4dbba76487"
+  integrity sha512-4aRvFIXmwAcDBw9AueDQ2YnGmz5L6obe5kmPT8Vd+/+x/JMVKCgdcRwH6APrbpNXsPz+K653Qg8HB/oXvXVukA==
+
+"@esbuild/freebsd-x64@0.19.12":
+  version "0.19.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.19.12.tgz#37a693553d42ff77cd7126764b535fb6cc28a11c"
+  integrity sha512-EYoXZ4d8xtBoVN7CEwWY2IN4ho76xjYXqSXMNccFSx2lgqOG/1TBPW0yPx1bJZk94qu3tX0fycJeeQsKovA8gg==
+
+"@esbuild/linux-arm64@0.19.12":
+  version "0.19.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.19.12.tgz#be9b145985ec6c57470e0e051d887b09dddb2d4b"
+  integrity sha512-EoTjyYyLuVPfdPLsGVVVC8a0p1BFFvtpQDB/YLEhaXyf/5bczaGeN15QkR+O4S5LeJ92Tqotve7i1jn35qwvdA==
+
+"@esbuild/linux-arm@0.19.12":
+  version "0.19.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.19.12.tgz#207ecd982a8db95f7b5279207d0ff2331acf5eef"
+  integrity sha512-J5jPms//KhSNv+LO1S1TX1UWp1ucM6N6XuL6ITdKWElCu8wXP72l9MM0zDTzzeikVyqFE6U8YAV9/tFyj0ti+w==
+
+"@esbuild/linux-ia32@0.19.12":
+  version "0.19.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.19.12.tgz#d0d86b5ca1562523dc284a6723293a52d5860601"
+  integrity sha512-Thsa42rrP1+UIGaWz47uydHSBOgTUnwBwNq59khgIwktK6x60Hivfbux9iNR0eHCHzOLjLMLfUMLCypBkZXMHA==
+
+"@esbuild/linux-loong64@0.19.12":
+  version "0.19.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.19.12.tgz#9a37f87fec4b8408e682b528391fa22afd952299"
+  integrity sha512-LiXdXA0s3IqRRjm6rV6XaWATScKAXjI4R4LoDlvO7+yQqFdlr1Bax62sRwkVvRIrwXxvtYEHHI4dm50jAXkuAA==
+
+"@esbuild/linux-mips64el@0.19.12":
+  version "0.19.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.19.12.tgz#4ddebd4e6eeba20b509d8e74c8e30d8ace0b89ec"
+  integrity sha512-fEnAuj5VGTanfJ07ff0gOA6IPsvrVHLVb6Lyd1g2/ed67oU1eFzL0r9WL7ZzscD+/N6i3dWumGE1Un4f7Amf+w==
+
+"@esbuild/linux-ppc64@0.19.12":
+  version "0.19.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.19.12.tgz#adb67dadb73656849f63cd522f5ecb351dd8dee8"
+  integrity sha512-nYJA2/QPimDQOh1rKWedNOe3Gfc8PabU7HT3iXWtNUbRzXS9+vgB0Fjaqr//XNbd82mCxHzik2qotuI89cfixg==
+
+"@esbuild/linux-riscv64@0.19.12":
+  version "0.19.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.19.12.tgz#11bc0698bf0a2abf8727f1c7ace2112612c15adf"
+  integrity sha512-2MueBrlPQCw5dVJJpQdUYgeqIzDQgw3QtiAHUC4RBz9FXPrskyyU3VI1hw7C0BSKB9OduwSJ79FTCqtGMWqJHg==
+
+"@esbuild/linux-s390x@0.19.12":
+  version "0.19.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.19.12.tgz#e86fb8ffba7c5c92ba91fc3b27ed5a70196c3cc8"
+  integrity sha512-+Pil1Nv3Umes4m3AZKqA2anfhJiVmNCYkPchwFJNEJN5QxmTs1uzyy4TvmDrCRNT2ApwSari7ZIgrPeUx4UZDg==
+
+"@esbuild/linux-x64@0.19.12":
+  version "0.19.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.19.12.tgz#5f37cfdc705aea687dfe5dfbec086a05acfe9c78"
+  integrity sha512-B71g1QpxfwBvNrfyJdVDexenDIt1CiDN1TIXLbhOw0KhJzE78KIFGX6OJ9MrtC0oOqMWf+0xop4qEU8JrJTwCg==
+
+"@esbuild/netbsd-x64@0.19.12":
+  version "0.19.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.19.12.tgz#29da566a75324e0d0dd7e47519ba2f7ef168657b"
+  integrity sha512-3ltjQ7n1owJgFbuC61Oj++XhtzmymoCihNFgT84UAmJnxJfm4sYCiSLTXZtE00VWYpPMYc+ZQmB6xbSdVh0JWA==
+
+"@esbuild/openbsd-x64@0.19.12":
+  version "0.19.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.19.12.tgz#306c0acbdb5a99c95be98bdd1d47c916e7dc3ff0"
+  integrity sha512-RbrfTB9SWsr0kWmb9srfF+L933uMDdu9BIzdA7os2t0TXhCRjrQyCeOt6wVxr79CKD4c+p+YhCj31HBkYcXebw==
+
+"@esbuild/sunos-x64@0.19.12":
+  version "0.19.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.19.12.tgz#0933eaab9af8b9b2c930236f62aae3fc593faf30"
+  integrity sha512-HKjJwRrW8uWtCQnQOz9qcU3mUZhTUQvi56Q8DPTLLB+DawoiQdjsYq+j+D3s9I8VFtDr+F9CjgXKKC4ss89IeA==
+
+"@esbuild/win32-arm64@0.19.12":
+  version "0.19.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.19.12.tgz#773bdbaa1971b36db2f6560088639ccd1e6773ae"
+  integrity sha512-URgtR1dJnmGvX864pn1B2YUYNzjmXkuJOIqG2HdU62MVS4EHpU2946OZoTMnRUHklGtJdJZ33QfzdjGACXhn1A==
+
+"@esbuild/win32-ia32@0.19.12":
+  version "0.19.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.19.12.tgz#000516cad06354cc84a73f0943a4aa690ef6fd67"
+  integrity sha512-+ZOE6pUkMOJfmxmBZElNOx72NKpIa/HFOMGzu8fqzQJ5kgf6aTGrcJaFsNiVMH4JKpMipyK+7k0n2UXN7a8YKQ==
+
+"@esbuild/win32-x64@0.19.12":
+  version "0.19.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.19.12.tgz#c57c8afbb4054a3ab8317591a0b7320360b444ae"
+  integrity sha512-T1QyPSDCyMXaO3pzBkF96E8xMkiRYbUEZADd29SyPGabqxMViNoii+NcK7eWJAEoU6RZyEm5lVSIjTmcdoB9HA==
 
 "@istanbuljs/load-nyc-config@^1.0.0":
   version "1.1.0"
@@ -534,7 +642,7 @@
     "@jridgewell/sourcemap-codec" "^1.4.10"
     "@jridgewell/trace-mapping" "^0.3.9"
 
-"@jridgewell/resolve-uri@^3.0.3", "@jridgewell/resolve-uri@^3.1.0":
+"@jridgewell/resolve-uri@^3.1.0":
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz#c08679063f279615a3326583ba3a90d1d82cc721"
   integrity sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==
@@ -549,14 +657,6 @@
   resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32"
   integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==
 
-"@jridgewell/trace-mapping@0.3.9":
-  version "0.3.9"
-  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz#6534fd5933a53ba7cbf3a17615e273a0d1273ff9"
-  integrity sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==
-  dependencies:
-    "@jridgewell/resolve-uri" "^3.0.3"
-    "@jridgewell/sourcemap-codec" "^1.4.10"
-
 "@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.18", "@jridgewell/trace-mapping@^0.3.9":
   version "0.3.20"
   resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.20.tgz#72e45707cf240fa6b081d0366f8265b0cd10197f"
@@ -584,26 +684,6 @@
   dependencies:
     "@sinonjs/commons" "^3.0.0"
 
-"@tsconfig/node10@^1.0.7":
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.9.tgz#df4907fc07a886922637b15e02d4cebc4c0021b2"
-  integrity sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==
-
-"@tsconfig/node12@^1.0.7":
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/@tsconfig/node12/-/node12-1.0.11.tgz#ee3def1f27d9ed66dac6e46a295cffb0152e058d"
-  integrity sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==
-
-"@tsconfig/node14@^1.0.0":
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/@tsconfig/node14/-/node14-1.0.3.tgz#e4386316284f00b98435bf40f72f75a09dabf6c1"
-  integrity sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==
-
-"@tsconfig/node16@^1.0.2":
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.4.tgz#0b92dcc0cc1c81f6f306a381f28e31b1a56536e9"
-  integrity sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==
-
 "@types/babel__core@^7.1.14":
   version "7.20.5"
   resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.20.5.tgz#3df15f27ba85319caa07ba08d0721889bb39c017"
@@ -702,16 +782,6 @@
   dependencies:
     "@types/yargs-parser" "*"
 
-acorn-walk@^8.1.1:
-  version "8.3.0"
-  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.3.0.tgz#2097665af50fd0cf7a2dfccd2b9368964e66540f"
-  integrity sha512-FS7hV565M5l1R08MXqo8odwMTB02C2UqzB17RVgu9EyuYFBqJZ3/ZY97sQD5FewVu1UyDFc1yztUDrAwT0EypA==
-
-acorn@^8.4.1:
-  version "8.11.2"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.2.tgz#ca0d78b51895be5390a5903c5b3bdcdaf78ae40b"
-  integrity sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==
-
 ansi-escapes@^4.2.1:
   version "4.3.2"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e"
@@ -743,10 +813,10 @@ ansi-styles@^5.0.0:
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-5.2.0.tgz#07449690ad45777d1924ac2abb2fc8895dba836b"
   integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==
 
-antlr4ts@^0.5.0-alpha.4:
-  version "0.5.0-alpha.4"
-  resolved "https://registry.yarnpkg.com/antlr4ts/-/antlr4ts-0.5.0-alpha.4.tgz#71702865a87478ed0b40c0709f422cf14d51652a"
-  integrity sha512-WPQDt1B74OfPv/IMS2ekXAKkTZIHl88uMetg6q3OTqgFxZ/dxDXI0EWLyZid/1Pe6hTftyg5N7gel5wNAGxXyQ==
+antlr4@^4.13.1-patch-1:
+  version "4.13.1-patch-1"
+  resolved "https://registry.yarnpkg.com/antlr4/-/antlr4-4.13.1-patch-1.tgz#946176f863f890964a050c4f18c47fd6f7e57602"
+  integrity sha512-OjFLWWLzDMV9rdFhpvroCWR4ooktNg9/nvVYSA5z28wuVpU36QUNuioR1XLnQtcjVlf8npjyz593PxnU/f/Cow==
 
 anymatch@^3.0.3:
   version "3.1.3"
@@ -756,11 +826,6 @@ anymatch@^3.0.3:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
 
-arg@^4.1.0:
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089"
-  integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==
-
 argparse@^1.0.7:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
@@ -915,23 +980,23 @@ caniuse-lite@^1.0.30001541:
   integrity sha512-xrE//a3O7TP0vaJ8ikzkD2c2NgcVUvsEe2IvFTntV4Yd1Z9FVzh+gW+enX96L0psrbaFMcVcH2l90xNuGDWc8w==
 
 cashc@^0.10.0:
-  version "0.10.0-next.0"
-  resolved "https://registry.yarnpkg.com/cashc/-/cashc-0.10.0-next.0.tgz#ba8f803abca77ad1ac629cfa3e794fa691906c81"
-  integrity sha512-PeOiU/5u+MyugcICuzb1aD5TitVRKbXD/4cBz9WNR7PCjdMX+3NpYDZi0Ql61YrcHP1s4z8a3Xw+w4FKcCL5LQ==
+  version "0.10.0-next.3"
+  resolved "https://registry.yarnpkg.com/cashc/-/cashc-0.10.0-next.3.tgz#25e82b55c7a11848ba25c45a05c24b263a322fba"
+  integrity sha512-TfZvCSi840txb2XTuf7H1OgFWB+nraHVeibwsFLfQZu1n1VfW9Ff6tNkEqzxa6EpXuyJfgZAgM9zS9B7J0P2Yg==
   dependencies:
-    "@bitauth/libauth" "^2.0.0-alpha.8"
-    "@cashscript/utils" "^0.10.0-next.0"
-    antlr4ts "^0.5.0-alpha.4"
+    "@bitauth/libauth" "^2.0.0"
+    "@cashscript/utils" "^0.10.0-next.3"
+    antlr4 "^4.13.1-patch-1"
     commander "^7.1.0"
-    semver "^7.3.4"
+    semver "^7.5.4"
 
 cashscript@^0.10.0:
-  version "0.10.0-next.0"
-  resolved "https://registry.yarnpkg.com/cashscript/-/cashscript-0.10.0-next.0.tgz#6959a5d0872660094e10a77fb59a8aec52ead3bf"
-  integrity sha512-ph6gmsLA7q7birLyFIE6gAAS4QRnA5Msa+T4Dx5sxLoQERIUHn8nJ8w/QjE1+UdcwimK43YV6fwaEVRXYm0UZQ==
+  version "0.10.0-next.3"
+  resolved "https://registry.yarnpkg.com/cashscript/-/cashscript-0.10.0-next.3.tgz#2d186a7fa1f8ca496016dba1fb077a1956662407"
+  integrity sha512-eXGZu1jpsJDWpoJq+iaN9XXBuLefJP8GGgv4mR7mBxaRfW/+IKeIvvu9lcD98wWggwQcJqom2/e43cB7K5Wonw==
   dependencies:
-    "@bitauth/libauth" "^2.0.0-alpha.8"
-    "@cashscript/utils" "^0.10.0-next.0"
+    "@bitauth/libauth" "^2.0.0"
+    "@cashscript/utils" "^0.10.0-next.3"
     bip68 "^1.0.4"
     bitcoin-rpc-promise-retry "^1.3.0"
     delay "^5.0.0"
@@ -1042,11 +1107,6 @@ create-jest@^29.7.0:
     jest-util "^29.7.0"
     prompts "^2.0.1"
 
-create-require@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333"
-  integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==
-
 cross-spawn@^7.0.3:
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
@@ -1088,11 +1148,6 @@ diff-sequences@^29.6.3:
   resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-29.6.3.tgz#4deaf894d11407c51efc8418012f9e70b84ea921"
   integrity sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==
 
-diff@^4.0.1:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
-  integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==
-
 electron-to-chromium@^1.4.535:
   version "1.4.594"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.594.tgz#f69f207fba80735a44a988df42f3f439115d0515"
@@ -1126,6 +1181,35 @@ error-ex@^1.3.1:
   dependencies:
     is-arrayish "^0.2.1"
 
+esbuild@~0.19.10:
+  version "0.19.12"
+  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.19.12.tgz#dc82ee5dc79e82f5a5c3b4323a2a641827db3e04"
+  integrity sha512-aARqgq8roFBj054KvQr5f1sFu0D65G+miZRCuJyJ0G13Zwx7vRar5Zhn2tkQNzIXcBrNVsv/8stehpj+GAjgbg==
+  optionalDependencies:
+    "@esbuild/aix-ppc64" "0.19.12"
+    "@esbuild/android-arm" "0.19.12"
+    "@esbuild/android-arm64" "0.19.12"
+    "@esbuild/android-x64" "0.19.12"
+    "@esbuild/darwin-arm64" "0.19.12"
+    "@esbuild/darwin-x64" "0.19.12"
+    "@esbuild/freebsd-arm64" "0.19.12"
+    "@esbuild/freebsd-x64" "0.19.12"
+    "@esbuild/linux-arm" "0.19.12"
+    "@esbuild/linux-arm64" "0.19.12"
+    "@esbuild/linux-ia32" "0.19.12"
+    "@esbuild/linux-loong64" "0.19.12"
+    "@esbuild/linux-mips64el" "0.19.12"
+    "@esbuild/linux-ppc64" "0.19.12"
+    "@esbuild/linux-riscv64" "0.19.12"
+    "@esbuild/linux-s390x" "0.19.12"
+    "@esbuild/linux-x64" "0.19.12"
+    "@esbuild/netbsd-x64" "0.19.12"
+    "@esbuild/openbsd-x64" "0.19.12"
+    "@esbuild/sunos-x64" "0.19.12"
+    "@esbuild/win32-arm64" "0.19.12"
+    "@esbuild/win32-ia32" "0.19.12"
+    "@esbuild/win32-x64" "0.19.12"
+
 escalade@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
@@ -1214,7 +1298,7 @@ fs.realpath@^1.0.0:
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
   integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
 
-fsevents@^2.3.2:
+fsevents@^2.3.2, fsevents@~2.3.3:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"
   integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==
@@ -1244,6 +1328,13 @@ get-stream@^6.0.0:
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7"
   integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==
 
+get-tsconfig@^4.7.2:
+  version "4.7.3"
+  resolved "https://registry.yarnpkg.com/get-tsconfig/-/get-tsconfig-4.7.3.tgz#0498163d98f7b58484dd4906999c0c9d5f103f83"
+  integrity sha512-ZvkrzoUA0PQZM6fy6+/Hce561s+faD1rsNwhnO5FelNjyy7EMGJ3Rz1AQ8GYDWjhRs/7dBLOEJvhK8MiEJOAFg==
+  dependencies:
+    resolve-pkg-maps "^1.0.0"
+
 glob@^7.1.3, glob@^7.1.4:
   version "7.2.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
@@ -1851,11 +1942,6 @@ make-dir@^4.0.0:
   dependencies:
     semver "^7.5.3"
 
-make-error@^1.1.1:
-  version "1.3.6"
-  resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
-  integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
-
 makeerror@1.0.12:
   version "1.0.12"
   resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.12.tgz#3e5dd2079a82e812e983cc6610c4a2cb0eaa801a"
@@ -2066,6 +2152,11 @@ resolve-from@^5.0.0:
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
   integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
 
+resolve-pkg-maps@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz#616b3dc2c57056b5588c31cdf4b3d64db133720f"
+  integrity sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==
+
 resolve.exports@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-2.0.2.tgz#f8c934b8e6a13f539e38b7098e2e36134f01e800"
@@ -2085,7 +2176,7 @@ semver@^6.3.0, semver@^6.3.1:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
-semver@^7.3.4, semver@^7.5.3, semver@^7.5.4:
+semver@^7.5.3, semver@^7.5.4:
   version "7.5.4"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
   integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
@@ -2235,30 +2326,21 @@ to-regex-range@^5.0.1:
   dependencies:
     is-number "^7.0.0"
 
-ts-node@^10.9.1:
-  version "10.9.1"
-  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.9.1.tgz#e73de9102958af9e1f0b168a6ff320e25adcff4b"
-  integrity sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==
-  dependencies:
-    "@cspotcode/source-map-support" "^0.8.0"
-    "@tsconfig/node10" "^1.0.7"
-    "@tsconfig/node12" "^1.0.7"
-    "@tsconfig/node14" "^1.0.0"
-    "@tsconfig/node16" "^1.0.2"
-    acorn "^8.4.1"
-    acorn-walk "^8.1.1"
-    arg "^4.1.0"
-    create-require "^1.1.0"
-    diff "^4.0.1"
-    make-error "^1.1.1"
-    v8-compile-cache-lib "^3.0.1"
-    yn "3.1.1"
-
 tslib@^2.3.1:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae"
   integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==
 
+tsx@^4.7.2:
+  version "4.7.2"
+  resolved "https://registry.yarnpkg.com/tsx/-/tsx-4.7.2.tgz#a108b1a6e16876cd4c9a4b4ba263f2a07f9cf562"
+  integrity sha512-BCNd4kz6fz12fyrgCTEdZHGJ9fWTGeUzXmQysh0RVocDY3h4frk05ZNCXSy4kIenF7y/QnrdiVpTsyNRn6vlAw==
+  dependencies:
+    esbuild "~0.19.10"
+    get-tsconfig "^4.7.2"
+  optionalDependencies:
+    fsevents "~2.3.3"
+
 type-detect@4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
@@ -2287,11 +2369,6 @@ update-browserslist-db@^1.0.13:
     escalade "^3.1.1"
     picocolors "^1.0.0"
 
-v8-compile-cache-lib@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf"
-  integrity sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==
-
 v8-to-istanbul@^9.0.1:
   version "9.2.0"
   resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-9.2.0.tgz#2ed7644a245cddd83d4e087b9b33b3e62dfd10ad"
@@ -2375,11 +2452,6 @@ yargs@^17.3.1:
     y18n "^5.0.5"
     yargs-parser "^21.1.1"
 
-yn@3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50"
-  integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==
-
 yocto-queue@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
diff --git a/package.json b/package.json
index d9ba8647..9cc1c22b 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     "eslint-config-airbnb-typescript": "^17.1.0",
     "eslint-plugin-import": "^2.29.0",
     "lerna": "^3.22.1",
-    "ts-node": "^10.9.1",
+    "tsx": "^4.7.2",
     "typescript": "^4.9.5"
   },
   "scripts": {
@@ -32,11 +32,11 @@
     "proof:0.2.0": "yarn cashproof packages/cashc/test/cashproof/0.1.2=0.2.0.equiv",
     "proof": "yarn proof:opt && yarn proof:0.2.0",
     "cashproof": "python3 node_modules/cashproof/run.py",
-    "examples": "ts-node-esm examples/p2pkh.ts && ts-node-esm examples/transfer_with_timeout.ts && ts-node-esm examples/hodl_vault.ts",
+    "examples": "tsx examples/p2pkh.ts && tsx examples/transfer_with_timeout.ts && tsx examples/hodl_vault.ts",
     "coverage": "codecov",
     "postinstall": "lerna bootstrap && lerna run build --ignore cashscript-examples",
     "spellcheck": "cspell lint '**' --no-progress --must-find-files",
-    "update-version": "ts-node-esm update-version.ts",
+    "update-version": "tsx update-version.ts",
     "publish-all": "lerna publish from-package",
     "build": "lerna run build"
   }
diff --git a/yarn.lock b/yarn.lock
index 8904bbf3..830152ee 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -721,6 +721,121 @@
   dependencies:
     "@jridgewell/trace-mapping" "0.3.9"
 
+"@esbuild/aix-ppc64@0.19.12":
+  version "0.19.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.19.12.tgz#d1bc06aedb6936b3b6d313bf809a5a40387d2b7f"
+  integrity sha512-bmoCYyWdEL3wDQIVbcyzRyeKLgk2WtWLTWz1ZIAZF/EGbNOwSA6ew3PftJ1PqMiOOGu0OyFMzG53L0zqIpPeNA==
+
+"@esbuild/android-arm64@0.19.12":
+  version "0.19.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.19.12.tgz#7ad65a36cfdb7e0d429c353e00f680d737c2aed4"
+  integrity sha512-P0UVNGIienjZv3f5zq0DP3Nt2IE/3plFzuaS96vihvD0Hd6H/q4WXUGpCxD/E8YrSXfNyRPbpTq+T8ZQioSuPA==
+
+"@esbuild/android-arm@0.19.12":
+  version "0.19.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.19.12.tgz#b0c26536f37776162ca8bde25e42040c203f2824"
+  integrity sha512-qg/Lj1mu3CdQlDEEiWrlC4eaPZ1KztwGJ9B6J+/6G+/4ewxJg7gqj8eVYWvao1bXrqGiW2rsBZFSX3q2lcW05w==
+
+"@esbuild/android-x64@0.19.12":
+  version "0.19.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.19.12.tgz#cb13e2211282012194d89bf3bfe7721273473b3d"
+  integrity sha512-3k7ZoUW6Q6YqhdhIaq/WZ7HwBpnFBlW905Fa4s4qWJyiNOgT1dOqDiVAQFwBH7gBRZr17gLrlFCRzF6jFh7Kew==
+
+"@esbuild/darwin-arm64@0.19.12":
+  version "0.19.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.19.12.tgz#cbee41e988020d4b516e9d9e44dd29200996275e"
+  integrity sha512-B6IeSgZgtEzGC42jsI+YYu9Z3HKRxp8ZT3cqhvliEHovq8HSX2YX8lNocDn79gCKJXOSaEot9MVYky7AKjCs8g==
+
+"@esbuild/darwin-x64@0.19.12":
+  version "0.19.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.19.12.tgz#e37d9633246d52aecf491ee916ece709f9d5f4cd"
+  integrity sha512-hKoVkKzFiToTgn+41qGhsUJXFlIjxI/jSYeZf3ugemDYZldIXIxhvwN6erJGlX4t5h417iFuheZ7l+YVn05N3A==
+
+"@esbuild/freebsd-arm64@0.19.12":
+  version "0.19.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.12.tgz#1ee4d8b682ed363b08af74d1ea2b2b4dbba76487"
+  integrity sha512-4aRvFIXmwAcDBw9AueDQ2YnGmz5L6obe5kmPT8Vd+/+x/JMVKCgdcRwH6APrbpNXsPz+K653Qg8HB/oXvXVukA==
+
+"@esbuild/freebsd-x64@0.19.12":
+  version "0.19.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.19.12.tgz#37a693553d42ff77cd7126764b535fb6cc28a11c"
+  integrity sha512-EYoXZ4d8xtBoVN7CEwWY2IN4ho76xjYXqSXMNccFSx2lgqOG/1TBPW0yPx1bJZk94qu3tX0fycJeeQsKovA8gg==
+
+"@esbuild/linux-arm64@0.19.12":
+  version "0.19.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.19.12.tgz#be9b145985ec6c57470e0e051d887b09dddb2d4b"
+  integrity sha512-EoTjyYyLuVPfdPLsGVVVC8a0p1BFFvtpQDB/YLEhaXyf/5bczaGeN15QkR+O4S5LeJ92Tqotve7i1jn35qwvdA==
+
+"@esbuild/linux-arm@0.19.12":
+  version "0.19.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.19.12.tgz#207ecd982a8db95f7b5279207d0ff2331acf5eef"
+  integrity sha512-J5jPms//KhSNv+LO1S1TX1UWp1ucM6N6XuL6ITdKWElCu8wXP72l9MM0zDTzzeikVyqFE6U8YAV9/tFyj0ti+w==
+
+"@esbuild/linux-ia32@0.19.12":
+  version "0.19.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.19.12.tgz#d0d86b5ca1562523dc284a6723293a52d5860601"
+  integrity sha512-Thsa42rrP1+UIGaWz47uydHSBOgTUnwBwNq59khgIwktK6x60Hivfbux9iNR0eHCHzOLjLMLfUMLCypBkZXMHA==
+
+"@esbuild/linux-loong64@0.19.12":
+  version "0.19.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.19.12.tgz#9a37f87fec4b8408e682b528391fa22afd952299"
+  integrity sha512-LiXdXA0s3IqRRjm6rV6XaWATScKAXjI4R4LoDlvO7+yQqFdlr1Bax62sRwkVvRIrwXxvtYEHHI4dm50jAXkuAA==
+
+"@esbuild/linux-mips64el@0.19.12":
+  version "0.19.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.19.12.tgz#4ddebd4e6eeba20b509d8e74c8e30d8ace0b89ec"
+  integrity sha512-fEnAuj5VGTanfJ07ff0gOA6IPsvrVHLVb6Lyd1g2/ed67oU1eFzL0r9WL7ZzscD+/N6i3dWumGE1Un4f7Amf+w==
+
+"@esbuild/linux-ppc64@0.19.12":
+  version "0.19.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.19.12.tgz#adb67dadb73656849f63cd522f5ecb351dd8dee8"
+  integrity sha512-nYJA2/QPimDQOh1rKWedNOe3Gfc8PabU7HT3iXWtNUbRzXS9+vgB0Fjaqr//XNbd82mCxHzik2qotuI89cfixg==
+
+"@esbuild/linux-riscv64@0.19.12":
+  version "0.19.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.19.12.tgz#11bc0698bf0a2abf8727f1c7ace2112612c15adf"
+  integrity sha512-2MueBrlPQCw5dVJJpQdUYgeqIzDQgw3QtiAHUC4RBz9FXPrskyyU3VI1hw7C0BSKB9OduwSJ79FTCqtGMWqJHg==
+
+"@esbuild/linux-s390x@0.19.12":
+  version "0.19.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.19.12.tgz#e86fb8ffba7c5c92ba91fc3b27ed5a70196c3cc8"
+  integrity sha512-+Pil1Nv3Umes4m3AZKqA2anfhJiVmNCYkPchwFJNEJN5QxmTs1uzyy4TvmDrCRNT2ApwSari7ZIgrPeUx4UZDg==
+
+"@esbuild/linux-x64@0.19.12":
+  version "0.19.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.19.12.tgz#5f37cfdc705aea687dfe5dfbec086a05acfe9c78"
+  integrity sha512-B71g1QpxfwBvNrfyJdVDexenDIt1CiDN1TIXLbhOw0KhJzE78KIFGX6OJ9MrtC0oOqMWf+0xop4qEU8JrJTwCg==
+
+"@esbuild/netbsd-x64@0.19.12":
+  version "0.19.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.19.12.tgz#29da566a75324e0d0dd7e47519ba2f7ef168657b"
+  integrity sha512-3ltjQ7n1owJgFbuC61Oj++XhtzmymoCihNFgT84UAmJnxJfm4sYCiSLTXZtE00VWYpPMYc+ZQmB6xbSdVh0JWA==
+
+"@esbuild/openbsd-x64@0.19.12":
+  version "0.19.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.19.12.tgz#306c0acbdb5a99c95be98bdd1d47c916e7dc3ff0"
+  integrity sha512-RbrfTB9SWsr0kWmb9srfF+L933uMDdu9BIzdA7os2t0TXhCRjrQyCeOt6wVxr79CKD4c+p+YhCj31HBkYcXebw==
+
+"@esbuild/sunos-x64@0.19.12":
+  version "0.19.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.19.12.tgz#0933eaab9af8b9b2c930236f62aae3fc593faf30"
+  integrity sha512-HKjJwRrW8uWtCQnQOz9qcU3mUZhTUQvi56Q8DPTLLB+DawoiQdjsYq+j+D3s9I8VFtDr+F9CjgXKKC4ss89IeA==
+
+"@esbuild/win32-arm64@0.19.12":
+  version "0.19.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.19.12.tgz#773bdbaa1971b36db2f6560088639ccd1e6773ae"
+  integrity sha512-URgtR1dJnmGvX864pn1B2YUYNzjmXkuJOIqG2HdU62MVS4EHpU2946OZoTMnRUHklGtJdJZ33QfzdjGACXhn1A==
+
+"@esbuild/win32-ia32@0.19.12":
+  version "0.19.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.19.12.tgz#000516cad06354cc84a73f0943a4aa690ef6fd67"
+  integrity sha512-+ZOE6pUkMOJfmxmBZElNOx72NKpIa/HFOMGzu8fqzQJ5kgf6aTGrcJaFsNiVMH4JKpMipyK+7k0n2UXN7a8YKQ==
+
+"@esbuild/win32-x64@0.19.12":
+  version "0.19.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.19.12.tgz#c57c8afbb4054a3ab8317591a0b7320360b444ae"
+  integrity sha512-T1QyPSDCyMXaO3pzBkF96E8xMkiRYbUEZADd29SyPGabqxMViNoii+NcK7eWJAEoU6RZyEm5lVSIjTmcdoB9HA==
+
 "@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.4.0":
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz#a23514e8fb9af1269d5f7788aa556798d61c6b59"
@@ -5070,6 +5185,35 @@ es6-promisify@^5.0.0:
   dependencies:
     es6-promise "^4.0.3"
 
+esbuild@~0.19.10:
+  version "0.19.12"
+  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.19.12.tgz#dc82ee5dc79e82f5a5c3b4323a2a641827db3e04"
+  integrity sha512-aARqgq8roFBj054KvQr5f1sFu0D65G+miZRCuJyJ0G13Zwx7vRar5Zhn2tkQNzIXcBrNVsv/8stehpj+GAjgbg==
+  optionalDependencies:
+    "@esbuild/aix-ppc64" "0.19.12"
+    "@esbuild/android-arm" "0.19.12"
+    "@esbuild/android-arm64" "0.19.12"
+    "@esbuild/android-x64" "0.19.12"
+    "@esbuild/darwin-arm64" "0.19.12"
+    "@esbuild/darwin-x64" "0.19.12"
+    "@esbuild/freebsd-arm64" "0.19.12"
+    "@esbuild/freebsd-x64" "0.19.12"
+    "@esbuild/linux-arm" "0.19.12"
+    "@esbuild/linux-arm64" "0.19.12"
+    "@esbuild/linux-ia32" "0.19.12"
+    "@esbuild/linux-loong64" "0.19.12"
+    "@esbuild/linux-mips64el" "0.19.12"
+    "@esbuild/linux-ppc64" "0.19.12"
+    "@esbuild/linux-riscv64" "0.19.12"
+    "@esbuild/linux-s390x" "0.19.12"
+    "@esbuild/linux-x64" "0.19.12"
+    "@esbuild/netbsd-x64" "0.19.12"
+    "@esbuild/openbsd-x64" "0.19.12"
+    "@esbuild/sunos-x64" "0.19.12"
+    "@esbuild/win32-arm64" "0.19.12"
+    "@esbuild/win32-ia32" "0.19.12"
+    "@esbuild/win32-x64" "0.19.12"
+
 escalade@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
@@ -5908,6 +6052,11 @@ fsevents@^2.1.2, fsevents@^2.3.2:
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
   integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
 
+fsevents@~2.3.3:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"
+  integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==
+
 function-bind@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
@@ -6052,6 +6201,13 @@ get-symbol-description@^1.0.0:
     call-bind "^1.0.2"
     get-intrinsic "^1.1.1"
 
+get-tsconfig@^4.7.2:
+  version "4.7.3"
+  resolved "https://registry.yarnpkg.com/get-tsconfig/-/get-tsconfig-4.7.3.tgz#0498163d98f7b58484dd4906999c0c9d5f103f83"
+  integrity sha512-ZvkrzoUA0PQZM6fy6+/Hce561s+faD1rsNwhnO5FelNjyy7EMGJ3Rz1AQ8GYDWjhRs/7dBLOEJvhK8MiEJOAFg==
+  dependencies:
+    resolve-pkg-maps "^1.0.0"
+
 get-value@^2.0.3, get-value@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
@@ -10177,6 +10333,11 @@ resolve-global@^1.0.0:
   dependencies:
     global-dirs "^0.1.1"
 
+resolve-pkg-maps@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz#616b3dc2c57056b5588c31cdf4b3d64db133720f"
+  integrity sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==
+
 resolve-url@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
@@ -11450,6 +11611,16 @@ tslib@^2.3.1:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae"
   integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==
 
+tsx@^4.7.2:
+  version "4.7.2"
+  resolved "https://registry.yarnpkg.com/tsx/-/tsx-4.7.2.tgz#a108b1a6e16876cd4c9a4b4ba263f2a07f9cf562"
+  integrity sha512-BCNd4kz6fz12fyrgCTEdZHGJ9fWTGeUzXmQysh0RVocDY3h4frk05ZNCXSy4kIenF7y/QnrdiVpTsyNRn6vlAw==
+  dependencies:
+    esbuild "~0.19.10"
+    get-tsconfig "^4.7.2"
+  optionalDependencies:
+    fsevents "~2.3.3"
+
 tunnel-agent@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"

From 9105dbcd300aa6a96f8f5297147572a9a79af6c4 Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Mon, 15 Apr 2024 12:01:23 +0800
Subject: [PATCH 087/171] Bump version to 0.10.0-next.4

---
 examples/package.json               | 6 +++---
 examples/testing-suite/package.json | 6 +++---
 package.json                        | 9 +++++----
 packages/cashc/package.json         | 4 ++--
 packages/cashc/src/index.ts         | 2 +-
 packages/cashscript/package.json    | 4 ++--
 packages/utils/package.json         | 2 +-
 7 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/examples/package.json b/examples/package.json
index d508aefa..163e23b4 100644
--- a/examples/package.json
+++ b/examples/package.json
@@ -1,7 +1,7 @@
 {
   "name": "cashscript-examples",
   "private": true,
-  "version": "0.10.0-next.3",
+  "version": "0.10.0-next.4",
   "description": "Usage examples of the CashScript SDK",
   "main": "p2pkh.js",
   "type": "module",
@@ -14,8 +14,8 @@
     "@bitauth/libauth": "^2.0.0-alpha.8",
     "@types/node": "^12.7.8",
     "bip39": "^3.0.4",
-    "cashc": "^0.10.0-next.3",
-    "cashscript": "^0.10.0-next.3",
+    "cashc": "^0.10.0-next.4",
+    "cashscript": "^0.10.0-next.4",
     "eslint": "^8.56.0",
     "typescript": "^4.9.5"
   }
diff --git a/examples/testing-suite/package.json b/examples/testing-suite/package.json
index e63b70ec..a46037f2 100644
--- a/examples/testing-suite/package.json
+++ b/examples/testing-suite/package.json
@@ -1,6 +1,6 @@
 {
   "name": "testing-suite",
-  "version": "0.10.0",
+  "version": "0.10.0-next.4",
   "description": "Example project to develop and test CashScript contracts",
   "main": "index.js",
   "type": "module",
@@ -25,8 +25,8 @@
     "test": "NODE_OPTIONS='--experimental-vm-modules --no-warnings' jest"
   },
   "dependencies": {
-    "cashc": "^0.10.0",
-    "cashscript": "^0.10.0"
+    "cashc": "^0.10.0-next.4",
+    "cashscript": "^0.10.0-next.4"
   },
   "devDependencies": {
     "@jest/globals": "^29.4.1",
diff --git a/package.json b/package.json
index 9cc1c22b..d142a139 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,8 @@
   "type": "module",
   "workspaces": [
     "packages/*",
-    "examples"
+    "examples",
+    "examples/testing-suite"
   ],
   "devDependencies": {
     "@jest/reporters": "^26.6.2",
@@ -24,8 +25,8 @@
     "typescript": "^4.9.5"
   },
   "scripts": {
-    "test": "lerna run test --ignore cashscript-examples",
-    "lint": "lerna run lint --ignore cashscript-examples",
+    "test": "lerna run test --ignore cashscript-examples --ignore testing-suite",
+    "lint": "lerna run lint --ignore cashscript-examples --ignore testing-suite",
     "preproof:opt": "cp packages/utils/src/cashproof-optimisations.ts opt.equiv && sed -i '' '/`/d' opt.equiv",
     "proof:opt": "yarn cashproof opt.equiv",
     "postproof:opt": "rm opt.equiv",
@@ -34,7 +35,7 @@
     "cashproof": "python3 node_modules/cashproof/run.py",
     "examples": "tsx examples/p2pkh.ts && tsx examples/transfer_with_timeout.ts && tsx examples/hodl_vault.ts",
     "coverage": "codecov",
-    "postinstall": "lerna bootstrap && lerna run build --ignore cashscript-examples",
+    "postinstall": "lerna bootstrap && lerna run build --ignore cashscript-examples --ignore testing-suite",
     "spellcheck": "cspell lint '**' --no-progress --must-find-files",
     "update-version": "tsx update-version.ts",
     "publish-all": "lerna publish from-package",
diff --git a/packages/cashc/package.json b/packages/cashc/package.json
index 3999f4c7..54496950 100644
--- a/packages/cashc/package.json
+++ b/packages/cashc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cashc",
-  "version": "0.10.0-next.3",
+  "version": "0.10.0-next.4",
   "description": "Compile Bitcoin Cash contracts to Bitcoin Cash Script or artifacts",
   "keywords": [
     "bitcoin",
@@ -50,7 +50,7 @@
   },
   "dependencies": {
     "@bitauth/libauth": "^2.0.0",
-    "@cashscript/utils": "^0.10.0-next.3",
+    "@cashscript/utils": "^0.10.0-next.4",
     "antlr4": "^4.13.1-patch-1",
     "commander": "^7.1.0",
     "semver": "^7.5.4"
diff --git a/packages/cashc/src/index.ts b/packages/cashc/src/index.ts
index 37cf20d1..83027743 100644
--- a/packages/cashc/src/index.ts
+++ b/packages/cashc/src/index.ts
@@ -2,4 +2,4 @@ export * from './Errors.js';
 export * as utils from '@cashscript/utils';
 export { compileFile, compileString } from './compiler.js';
 
-export const version = '0.10.0-next.3';
+export const version = '0.10.0-next.4';
diff --git a/packages/cashscript/package.json b/packages/cashscript/package.json
index 82de41d2..ea2e8e9f 100644
--- a/packages/cashscript/package.json
+++ b/packages/cashscript/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cashscript",
-  "version": "0.10.0-next.3",
+  "version": "0.10.0-next.4",
   "description": "Easily write and interact with Bitcoin Cash contracts",
   "keywords": [
     "bitcoin cash",
@@ -44,7 +44,7 @@
   },
   "dependencies": {
     "@bitauth/libauth": "^2.0.0",
-    "@cashscript/utils": "^0.10.0-next.3",
+    "@cashscript/utils": "^0.10.0-next.4",
     "bip68": "^1.0.4",
     "bitcoin-rpc-promise-retry": "^1.3.0",
     "delay": "^5.0.0",
diff --git a/packages/utils/package.json b/packages/utils/package.json
index 615bdd23..ecb58255 100644
--- a/packages/utils/package.json
+++ b/packages/utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cashscript/utils",
-  "version": "0.10.0-next.3",
+  "version": "0.10.0-next.4",
   "description": "CashScript utilities and types",
   "keywords": [
     "bitcoin cash",

From 1b68e4836bfe7f8e573c6c4597536506a2d16a66 Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Thu, 25 Apr 2024 15:19:52 +0800
Subject: [PATCH 088/171] Fix issue with address/tokenAddress in
 MockNetworkProvider

---
 .../cashscript/src/network/MockNetworkProvider.ts    | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/packages/cashscript/src/network/MockNetworkProvider.ts b/packages/cashscript/src/network/MockNetworkProvider.ts
index 83c6eec8..501ba9b8 100644
--- a/packages/cashscript/src/network/MockNetworkProvider.ts
+++ b/packages/cashscript/src/network/MockNetworkProvider.ts
@@ -2,7 +2,7 @@ import { binToHex, hexToBin } from '@bitauth/libauth';
 import { sha256 } from '@cashscript/utils';
 import { Utxo, Network } from '../interfaces.js';
 import NetworkProvider from './NetworkProvider.js';
-import { randomUtxo } from '../utils.js';
+import { addressToLockScript, randomUtxo } from '../utils.js';
 
 // redeclare the addresses from vars.ts instead of importing them
 const aliceAddress = 'bchtest:qpgjmwev3spwlwkgmyjrr2s2cvlkkzlewq62mzgjnp';
@@ -23,7 +23,8 @@ export default class MockNetworkProvider implements NetworkProvider {
   }
 
   async getUtxos(address: string): Promise<Utxo[]> {
-    return this.utxoMap[address] ?? [];
+    const lockingBytecode = binToHex(addressToLockScript(address));
+    return this.utxoMap[lockingBytecode] ?? [];
   }
 
   async getBlockHeight(): Promise<number> {
@@ -43,11 +44,12 @@ export default class MockNetworkProvider implements NetworkProvider {
   }
 
   addUtxo(address: string, utxo: Utxo): void {
-    if (!this.utxoMap[address]) {
-      this.utxoMap[address] = [];
+    const lockingBytecode = binToHex(addressToLockScript(address));
+    if (!this.utxoMap[lockingBytecode]) {
+      this.utxoMap[lockingBytecode] = [];
     }
 
-    this.utxoMap[address].push(utxo);
+    this.utxoMap[lockingBytecode].push(utxo);
   }
 
   reset(): void {

From 85153a9bc4ae196ee5a00150d7980221c9d17de5 Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Thu, 25 Apr 2024 16:19:17 +0800
Subject: [PATCH 089/171] Fix bug in require message mapping for NULLFAIL
 signature checks

---
 packages/cashscript/src/Argument.ts          |  2 +-
 packages/cashscript/src/SignatureTemplate.ts |  1 +
 packages/cashscript/src/debugging.ts         |  5 +-
 packages/cashscript/test/debugging.test.ts   | 65 +++++++++++++++++++-
 4 files changed, 69 insertions(+), 4 deletions(-)

diff --git a/packages/cashscript/src/Argument.ts b/packages/cashscript/src/Argument.ts
index e542d5ba..2c1409d5 100644
--- a/packages/cashscript/src/Argument.ts
+++ b/packages/cashscript/src/Argument.ts
@@ -60,7 +60,7 @@ export function encodeArgument(
     type = new BytesType(65);
   }
 
-  // Redefine SIG as a bytes64 so it is included in the size checks below
+  // Redefine DATASIG as a bytes64 so it is included in the size checks below
   // Note that ONLY Schnorr signatures are accepted
   if (type === PrimitiveType.DATASIG && argument.byteLength !== 0) {
     type = new BytesType(64);
diff --git a/packages/cashscript/src/SignatureTemplate.ts b/packages/cashscript/src/SignatureTemplate.ts
index 9879bde8..0e9de359 100644
--- a/packages/cashscript/src/SignatureTemplate.ts
+++ b/packages/cashscript/src/SignatureTemplate.ts
@@ -26,6 +26,7 @@ export default class SignatureTemplate {
     }
   }
 
+  // TODO: Allow signing of non-transaction messages (i.e. don't add the hashtype)
   generateSignature(payload: Uint8Array, bchForkId?: boolean): Uint8Array {
     const signature = this.signatureAlgorithm === SignatureAlgorithm.SCHNORR
       ? secp256k1.signMessageHashSchnorr(this.privateKey, payload) as Uint8Array
diff --git a/packages/cashscript/src/debugging.ts b/packages/cashscript/src/debugging.ts
index 16518ef6..1f06947d 100644
--- a/packages/cashscript/src/debugging.ts
+++ b/packages/cashscript/src/debugging.ts
@@ -43,8 +43,11 @@ export const debugTemplate = (template: WalletTemplate, artifact: Artifact): Deb
 
   // If an error is present in the last step, that means a require statement in the middle of the function failed
   if (lastExecutedDebugStep.error) {
+    const isNullFail = lastExecutedDebugStep.error === AuthenticationErrorCommon.nonNullSignatureFailure;
+    const messageIp = lastExecutedDebugStep.ip + (isNullFail ? 1 : 0);
+
     const requireStatement = (artifact.debug?.requireMessages ?? [])
-      .find((message) => message.ip === lastExecutedDebugStep.ip);
+      .find((message) => message.ip === messageIp);
 
     if (requireStatement) {
       throw new Error(`${artifact.contractName}.cash:${requireStatement.line} Error in evaluating input index ${lastExecutedDebugStep.program.inputIndex} with the following message: ${requireStatement.message}.\n${lastExecutedDebugStep.error}`);
diff --git a/packages/cashscript/test/debugging.test.ts b/packages/cashscript/test/debugging.test.ts
index 7dd51db8..9477bc84 100644
--- a/packages/cashscript/test/debugging.test.ts
+++ b/packages/cashscript/test/debugging.test.ts
@@ -1,11 +1,12 @@
 import { compileString } from 'cashc';
-import { Contract, MockNetworkProvider, SignatureTemplate } from '../src/index.js';
+import { Contract, MockNetworkProvider, SignatureAlgorithm, SignatureTemplate } from '../src/index.js';
 import {
   alicePriv, alicePub, bobPriv,
+  bobPub,
 } from './fixture/vars.js';
 import '../src/test/JestExtensions.js';
 import { randomUtxo } from '../src/utils.js';
-import { binToHex } from '@bitauth/libauth';
+import { binToHex, hexToBin } from '@bitauth/libauth';
 
 const CONTRACT_CODE = `
 contract Test() {
@@ -74,6 +75,18 @@ contract Test() {
       require(a + b + c + d + e == 10, "sum should equal 10");
     }
   }
+
+  function test_fail_checksig(sig s, pubkey pk) {
+    require(checkSig(s, pk), "Signatures do not match");
+  }
+
+  function test_fail_checkdatasig(datasig s, bytes message, pubkey pk) {
+    require(checkDataSig(s, message, pk), "Data Signatures do not match");
+  }
+
+  function test_fail_checkmultisig(sig s1, pubkey pk1, sig s2, pubkey pk2) {
+    require(checkMultiSig([s1, s2], [pk1, pk2]), "Multi Signatures do not match");
+  }
 }
 `;
 
@@ -349,6 +362,54 @@ describe('Debugging tests', () => {
         .test_final_require_in_if_statement_with_deep_reassignment().to(contract.address, 1000n);
       await expect(transaction).toFailRequireWith(/sum should equal 10/);
     });
+
+    // test_fail_checksig
+    it('should fail with correct error message when checkSig fails', async () => {
+      const contract = new Contract(artifact, [], { provider });
+      provider.addUtxo(contract.address, randomUtxo());
+
+      const checkSigTransaction = contract.functions
+        .test_fail_checksig(new SignatureTemplate(alicePriv), bobPub).to(contract.address, 1000n);
+      await expect(checkSigTransaction).toFailRequireWith(/Signatures do not match/);
+
+      // TODO: Add test for checksig with a NULL Signature (after we refactor Libauth Template generation)
+      // const checkSigTransactionNullSignature = contract.functions
+      //   .test_fail_checksig('', bobPub).to(contract.address, 1000n);
+      // await expect(checkSigTransactionNullSignature).toFailRequireWith(/Signatures do not match/);
+    });
+
+    // test_fail_checkdatasig
+    it('should fail with correct error message when checkDataSig fails', async () => {
+      const contract = new Contract(artifact, [], { provider });
+      provider.addUtxo(contract.address, randomUtxo());
+
+      const checkDataSigTransaction = contract.functions
+        .test_fail_checkdatasig(new SignatureTemplate(alicePriv).generateSignature(hexToBin('0xbeef')).slice(0, -1), '0xbeef', bobPub)
+        .to(contract.address, 1000n);
+      await expect(checkDataSigTransaction).toFailRequireWith(/Data Signatures do not match/);
+
+      const checkDataSigTransactionWrongMessage = contract.functions
+        .test_fail_checkdatasig(new SignatureTemplate(alicePriv).generateSignature(hexToBin('0xc0ffee')).slice(0, -1), '0xbeef', alicePub)
+        .to(contract.address, 1000n);
+      await expect(checkDataSigTransactionWrongMessage).toFailRequireWith(/Data Signatures do not match/);
+    });
+
+    // test_fail_checkmultisig
+    // TODO: Add test for checkmultisig (requires ECDSA signatures) after refactoring Libauth Template generation
+    it.skip('should fail with correct error message when checkMultiSig fails', async () => {
+      const contract = new Contract(artifact, [], { provider });
+      provider.addUtxo(contract.address, randomUtxo());
+
+      const checkmultiSigTransaction = contract.functions
+        .test_fail_checkmultisig(
+          new SignatureTemplate(alicePriv, undefined, SignatureAlgorithm.ECDSA),
+          bobPub,
+          new SignatureTemplate(bobPriv, undefined, SignatureAlgorithm.ECDSA),
+          alicePub,
+        )
+        .to(contract.address, 1000n);
+      await expect(checkmultiSigTransaction).toFailRequireWith(/Multi Signatures do not match/);
+    });
   });
 
   describe('JestExtensions', () => {

From d803dc202d04513a362584956b7a105f0817a4e9 Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Wed, 1 May 2024 10:32:05 +0300
Subject: [PATCH 090/171] Extract formatBitAuthScriptForDebugging in
 LibauthTemplate.ts

---
 packages/cashscript/src/Argument.ts        |  37 ++++-
 packages/cashscript/src/Contract.ts        |  11 +-
 packages/cashscript/src/LibauthTemplate.ts | 157 +++++++++------------
 packages/cashscript/src/utils.ts           |  25 ++++
 packages/utils/src/script.ts               |   2 +-
 5 files changed, 131 insertions(+), 101 deletions(-)

diff --git a/packages/cashscript/src/Argument.ts b/packages/cashscript/src/Argument.ts
index 2c1409d5..1a6f7cb2 100644
--- a/packages/cashscript/src/Argument.ts
+++ b/packages/cashscript/src/Argument.ts
@@ -1,5 +1,6 @@
 import { hexToBin } from '@bitauth/libauth';
 import {
+  Artifact,
   BytesType,
   encodeBool,
   encodeInt,
@@ -10,12 +11,13 @@ import {
 import { TypeError } from './Errors.js';
 import SignatureTemplate from './SignatureTemplate.js';
 
+// TODO: Separate ConstructorArgument (no SignatureTemplate) and FunctionArgument (with SignatureTemplate)
 export type Argument = bigint | boolean | string | Uint8Array | SignatureTemplate;
+export type EncodedArgument = Uint8Array | SignatureTemplate;
 
-export function encodeArgument(
-  argument: Argument,
-  typeStr: string,
-): Uint8Array | SignatureTemplate {
+export type EncodeFunction = (arg: Argument, typeStr: string) => EncodedArgument;
+
+export function encodeArgument(argument: Argument, typeStr: string): EncodedArgument {
   let type = parseType(typeStr);
 
   if (type === PrimitiveType.BOOL) {
@@ -73,3 +75,30 @@ export function encodeArgument(
 
   return argument;
 }
+
+export const encodeConstructorArguments = (
+  artifact: Artifact,
+  constructorArgs: Argument[],
+  encodeFunction: EncodeFunction = encodeArgument,
+): Uint8Array[] => {
+  // Check there's no signature templates in the constructor
+  if (constructorArgs.some((arg) => arg instanceof SignatureTemplate)) {
+    throw new Error('Cannot use signatures in constructor');
+  }
+
+  const encodedArgs = constructorArgs
+    .map((arg, i) => encodeFunction(arg, artifact.constructorInputs[i].type))
+    .reverse();
+
+  return encodedArgs as Uint8Array[];
+};
+
+// Note: BitAuth IDE requires 0 to be encoded as a single byte (rather than the default empty byte array)
+// TODO: Double check this with Pat
+export function encodeArgumentForLibauthTemplate(
+  argument: Argument,
+  typeStr: string,
+): Uint8Array | SignatureTemplate {
+  if (typeStr === PrimitiveType.INT && argument === 0n) return Uint8Array.from([0]);
+  return encodeArgument(argument, typeStr);
+}
diff --git a/packages/cashscript/src/Contract.ts b/packages/cashscript/src/Contract.ts
index 3e2e3355..1b8e9645 100644
--- a/packages/cashscript/src/Contract.ts
+++ b/packages/cashscript/src/Contract.ts
@@ -11,7 +11,7 @@ import {
   scriptToBytecode,
 } from '@cashscript/utils';
 import { Transaction } from './Transaction.js';
-import { Argument, encodeArgument } from './Argument.js';
+import { Argument, encodeArgument, encodeConstructorArguments } from './Argument.js';
 import {
   Unlocker, ContractOptions, GenerateUnlockingBytecodeOptions, Utxo,
 } from './interfaces.js';
@@ -55,14 +55,7 @@ export class Contract {
     }
 
     // Encode arguments (this also performs type checking)
-    const encodedArgs = constructorArgs
-      .map((arg, i) => encodeArgument(arg, artifact.constructorInputs[i].type))
-      .reverse();
-
-    // Check there's no signature templates in the constructor
-    if (encodedArgs.some((arg) => arg instanceof SignatureTemplate)) {
-      throw new Error('Cannot use signatures in constructor');
-    }
+    const encodedArgs = encodeConstructorArguments(artifact, constructorArgs);
 
     this.redeemScript = generateRedeemScript(
       asmToScript(this.artifact.bytecode),
diff --git a/packages/cashscript/src/LibauthTemplate.ts b/packages/cashscript/src/LibauthTemplate.ts
index 225e714d..e049ab13 100644
--- a/packages/cashscript/src/LibauthTemplate.ts
+++ b/packages/cashscript/src/LibauthTemplate.ts
@@ -1,5 +1,6 @@
 import {
   AbiFunction,
+  Artifact,
   PrimitiveType,
   bytecodeToScript,
   formatBitAuthScript,
@@ -26,20 +27,12 @@ import {
   Utxo,
   isUtxoP2PKH,
 } from './interfaces.js';
-import { Argument, encodeArgument as csEncodeArgument } from './Argument.js';
 import SignatureTemplate from './SignatureTemplate.js';
 import { Transaction } from './Transaction.js';
+import { Argument, encodeArgumentForLibauthTemplate } from './Argument.js';
+import { extendedStringify, snakeCase } from './utils.js';
 
-// all bitauth variables must be in snake case
-const snakeCase = (str: string): string => (
-  str
-    && str
-      .match(
-        /[A-Z]{2,}(?=[A-Z][a-z]+[0-9]*|\b)|[A-Z]?[a-z]+[0-9]*|[A-Z]|[0-9]+/g,
-      )!
-      .map((s) => s.toLowerCase())
-      .join('_')
-);
+// wtf is this
 const merge = (array: any): any => array.reduce(
   (prev: any, cur: any) => ({
     ...prev,
@@ -48,32 +41,8 @@ const merge = (array: any): any => array.reduce(
   {},
 );
 
-const encodeArgument = (
-  argument: Argument,
-  typeStr: string,
-): Uint8Array | SignatureTemplate => {
-  if (typeStr === PrimitiveType.INT && argument === 0n) {
-    return Uint8Array.from([0]);
-  }
-  return csEncodeArgument(argument, typeStr);
-};
-
-// stringify version which can serialize otherwise unsupported types
-export const stringify = (any: any, spaces?: number): string => JSON.stringify(
-  any,
-  (_, v) => {
-    if (typeof v === 'bigint') {
-      return `${v.toString()}`;
-    }
-    if (v instanceof Uint8Array) {
-      return `${binToHex(v)}`;
-    }
-    return v;
-  },
-  spaces,
-);
+const zip = <T, U>(a: T[], b: U[]): [T, U][] => Array.from(Array(Math.max(b.length, a.length)), (_, i) => [a[i], b[i]]);
 
-const zip = (a: any[], b: any[]): any[] => Array.from(Array(Math.max(b.length, a.length)), (_, i) => [a[i], b[i]]);
 
 const createScenarioTransaction = (libauthTransaction: TransactionBCH, csTransaction: Transaction): WalletTemplateScenario['transaction'] => {
   const contract = csTransaction.contract;
@@ -227,24 +196,23 @@ const createScenarioSourceOutputs = (csTransaction: Transaction): Array<WalletTe
   );
 };
 
+interface BuildTemplateOptions {
+  transaction: Transaction;
+  transactionHex?: string;
+}
+
+// TODO: Can we change this so we don't need to pass in both the transaction and the transactionHex?
 export const buildTemplate = async ({
   transaction,
   transactionHex = undefined, // set this argument to prevent unnecessary call `transaction.build()`
-}: {
-  transaction: Transaction;
-  transactionHex?: string;
-}): Promise<WalletTemplate> => {
+}: BuildTemplateOptions): Promise<WalletTemplate> => {
   const contract = transaction.contract;
   const txHex = transactionHex ?? await transaction.build();
 
   const libauthTransaction = decodeTransaction(hexToBin(txHex));
-  if (typeof libauthTransaction === 'string') {
-    throw Error(libauthTransaction);
-  }
+  if (typeof libauthTransaction === 'string') throw Error(libauthTransaction);
 
-  const constructorInputs = contract.artifact.constructorInputs
-    .slice()
-    .reverse();
+  const constructorInputs = contract.artifact.constructorInputs.slice().reverse();
   const contractParameters = contract.constructorArgs.slice().reverse();
 
   const abiFunction = transaction.abiFunction;
@@ -260,19 +228,6 @@ export const buildTemplate = async ({
     (input) => isUtxoP2PKH(input),
   ).length;
 
-  const formattedBytecode = contract.artifact.debug
-    ? formatBitAuthScript(
-      bytecodeToScript(hexToBin(contract.artifact.debug.bytecode)),
-      contract.artifact.debug.sourceMap,
-      contract.artifact.source,
-    ).split('\n')
-    : contract.artifact.bytecode.split(' ').map((asmElement) => {
-      if (isHex(asmElement)) {
-        return `<0x${asmElement}>`;
-      }
-      return asmElement;
-    });
-
   const template = {
     $schema: 'https://ide.bitauth.com/authentication-template-v0.schema.json',
     description: 'Imported from cashscript',
@@ -349,7 +304,7 @@ export const buildTemplate = async ({
           { function_index: functionIndex.toString() },
           ...constructorInputs.map((input, index) => {
             const hex = binToHex(
-              encodeArgument(
+              encodeArgumentForLibauthTemplate(
                 contractParameters[index],
                 constructorInputs[index].type,
               ) as Uint8Array,
@@ -367,9 +322,9 @@ export const buildTemplate = async ({
             ...zip(functionInputs, args)
               .filter(([input]) => input.type === PrimitiveType.SIG)
               .map(([input, arg]) => ({
-                [snakeCase(input.name)]: binToHex(
-                  (arg as SignatureTemplate).privateKey,
-                ),
+                [snakeCase(input.name)]: arg instanceof SignatureTemplate
+                  ? binToHex(arg.privateKey)
+                  : binToHex((arg)), // TODO: Double check if this makes sense
               })),
             ...(hasSignatureTemplates
               ? [
@@ -405,7 +360,7 @@ export const buildTemplate = async ({
               input.name,
             )}.schnorr_signature.all_outputs> // ${input.type}`
             : `<${snakeCase(input.name)}> // ${input.type} = <${
-              `0x${binToHex(arg)}`
+              `0x${binToHex(arg as any)}` // TODO: remove any cast
             }>`))
           : ['// none']),
         '',
@@ -422,26 +377,7 @@ export const buildTemplate = async ({
     lock: {
       lockingType: 'p2sh20', //transaction.contract.addressType,
       name: 'lock',
-      // locking script contains the CashScript contract parameters followed by the contract opcodes
-      // we output these values as pushdata, comment will contain the type and the value of the variable
-      // example: '<timeout> // int = <0xa08601>'
-      script: [
-        `// "${contract.artifact.contractName}" contract constructor parameters`,
-        ...(constructorInputs.length
-          ? constructorInputs.map((input, index) => {
-            const encoded = encodeArgument(
-              contractParameters[index],
-              constructorInputs[index].type,
-            ) as Uint8Array;
-            return `<${snakeCase(input.name)}> // ${
-              input.type === 'bytes' ? `bytes${encoded.length}` : input.type
-            } = <${`0x${binToHex(encoded)}`}>`;
-          })
-          : ['// none']),
-        '',
-        '// bytecode',
-        ...formattedBytecode,
-      ].join('\n'),
+      script: formatBitAuthScriptForDebugging(contract.artifact, contract.constructorArgs),
     },
   };
 
@@ -467,8 +403,55 @@ export const buildTemplate = async ({
 
 export const getBitauthUri = (template: WalletTemplate): string => {
   const base64toBase64Url = (base64: string): string => base64.replace(/\+/g, '-').replace(/\//g, '_');
-  const payload = base64toBase64Url(
-    binToBase64(deflate(utf8ToBin(stringify(template)))),
-  );
+  const payload = base64toBase64Url(binToBase64(deflate(utf8ToBin(extendedStringify(template)))));
   return `https://ide.bitauth.com/import-template/${payload}`;
 };
+
+const formatBitAuthScriptForDebugging = (artifact: Artifact, constructorArguments: Argument[]): string => {
+  // locking script contains the CashScript contract parameters followed by the contract opcodes
+  // we output these values as pushdata, comment will contain the type and the value of the variable
+  return [
+    `// "${artifact.contractName}" contract constructor parameters`,
+    formatConstructorParametersForDebugging(artifact, constructorArguments),
+    '',
+    '// bytecode',
+    formatBytecodeForDebugging(artifact),
+  ].join('\n');
+};
+
+const formatConstructorParametersForDebugging = (artifact: Artifact, constructorArguments: Argument[]): string => {
+  const constructorTypesReversed = [...artifact.constructorInputs].reverse();
+  const constructorArgumentsReversed = [...constructorArguments].reverse();
+
+  if (constructorArgumentsReversed.length === 0) {
+    return '// none';
+  }
+
+  return constructorTypesReversed.map((input, index) => {
+    const encodedArgument = encodeArgumentForLibauthTemplate(
+      constructorArgumentsReversed[index],
+      constructorTypesReversed[index].type,
+    ) as Uint8Array;
+
+    const typeStr = input.type === 'bytes' ? `bytes${encodedArgument.length}` : input.type;
+
+    // e.g. <timeout> // int = <0xa08601>
+    return `<${snakeCase(input.name)}> // ${typeStr} = <${`0x${binToHex(encodedArgument)}`}>`;
+  }).join('\n');
+};
+
+const formatBytecodeForDebugging = (artifact: Artifact): string => {
+  if (!artifact.debug) {
+    // TODO: See if we can merge this with code from @cashscript/utils -> script.ts
+    return artifact.bytecode
+      .split(' ')
+      .map((asmElement) => (isHex(asmElement) ? `<0x${asmElement}>` : asmElement))
+      .join('\n');
+  }
+
+  return formatBitAuthScript(
+    bytecodeToScript(hexToBin(artifact.debug.bytecode)),
+    artifact.debug.sourceMap,
+    artifact.source,
+  );
+};
diff --git a/packages/cashscript/src/utils.ts b/packages/cashscript/src/utils.ts
index 0569d6aa..6e18fba2 100644
--- a/packages/cashscript/src/utils.ts
+++ b/packages/cashscript/src/utils.ts
@@ -376,3 +376,28 @@ export function findLastIndex<T>(array: Array<T>, predicate: (value: T, index: n
   }
   return -1;
 }
+
+export const snakeCase = (str: string): string => (
+  str
+    && str
+      .match(
+        /[A-Z]{2,}(?=[A-Z][a-z]+[0-9]*|\b)|[A-Z]?[a-z]+[0-9]*|[A-Z]|[0-9]+/g,
+      )!
+      .map((s) => s.toLowerCase())
+      .join('_')
+);
+
+// JSON.stringify version that can serialize otherwise unsupported types (bigint and Uint8Array)
+export const extendedStringify = (obj: any, spaces?: number): string => JSON.stringify(
+  obj,
+  (_, v) => {
+    if (typeof v === 'bigint') {
+      return `${v.toString()}`;
+    }
+    if (v instanceof Uint8Array) {
+      return `${binToHex(v)}`;
+    }
+    return v;
+  },
+  spaces,
+);
diff --git a/packages/utils/src/script.ts b/packages/utils/src/script.ts
index 638c7e77..b20251fd 100644
--- a/packages/utils/src/script.ts
+++ b/packages/utils/src/script.ts
@@ -100,7 +100,7 @@ export function bytecodeToBitAuthAsm(bytecode: Uint8Array): string {
   // Convert the bytecode to libauth's ASM format
   let asm = disassembleBytecodeBCH(bytecode);
 
-  // COnvert libauth's ASM format to BITBOX's
+  // COnvert libauth's ASM format to BitAuth Script ASM
   asm = asm.replace(/OP_PUSHBYTES_[^\s]+/g, '');
   asm = asm.replace(/OP_PUSHDATA[^\s]+ [^\s]+/g, '');
   asm = asm.replace(/(^|\s)(0x\w*)/g, ' \<$2\>');

From 1a442d08a1df3654fcab90762e49c7aa5030207e Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Wed, 1 May 2024 11:11:27 +0300
Subject: [PATCH 091/171] Extract generateTemplateEntities in
 LibauthTemplate.ts

---
 packages/cashscript/src/LibauthTemplate.ts    | 102 ++++++++++--------
 packages/cashscript/src/utils.ts              |   4 +
 .../test/fixture/libauth-template/fixtures.ts |  20 ----
 3 files changed, 59 insertions(+), 67 deletions(-)

diff --git a/packages/cashscript/src/LibauthTemplate.ts b/packages/cashscript/src/LibauthTemplate.ts
index e049ab13..166dba4b 100644
--- a/packages/cashscript/src/LibauthTemplate.ts
+++ b/packages/cashscript/src/LibauthTemplate.ts
@@ -19,6 +19,7 @@ import {
   utf8ToBin,
   isHex,
   WalletTemplateScenarioOutput,
+  WalletTemplateVariable,
 } from '@bitauth/libauth';
 import { deflate } from 'pako';
 import {
@@ -30,16 +31,7 @@ import {
 import SignatureTemplate from './SignatureTemplate.js';
 import { Transaction } from './Transaction.js';
 import { Argument, encodeArgumentForLibauthTemplate } from './Argument.js';
-import { extendedStringify, snakeCase } from './utils.js';
-
-// wtf is this
-const merge = (array: any): any => array.reduce(
-  (prev: any, cur: any) => ({
-    ...prev,
-    ...{ [Object.keys(cur)[0]]: cur[Object.keys(cur)[0]] },
-  }),
-  {},
-);
+import { extendedStringify, mergeObjects, snakeCase } from './utils.js';
 
 const zip = <T, U>(a: T[], b: U[]): [T, U][] => Array.from(Array(Math.max(b.length, a.length)), (_, i) => [a[i], b[i]]);
 
@@ -234,43 +226,9 @@ export const buildTemplate = async ({
     name: contract.artifact.contractName,
     supported: ['BCH_SPEC'],
     version: 0,
+    entities: generateTemplateEntities(contract.artifact, abiFunction),
   } as WalletTemplate;
 
-  // declaration of template variables and their types
-  template.entities = {
-    parameters: {
-      description: 'Contract creation and function parameters',
-      name: 'parameters',
-      scripts: [
-        'lock',
-        'unlock_lock',
-      ],
-      variables: merge([
-        ...functionInputs.map((input) => ({
-          [snakeCase(input.name)]: {
-            description: `"${input.name}" parameter of function "${func.name}"`,
-            name: input.name,
-            type: input.type === PrimitiveType.SIG ? 'Key' : 'WalletData',
-          },
-        })),
-        {
-          function_index: {
-            description: 'Script function index to execute',
-            name: 'function_index',
-            type: 'WalletData',
-          },
-        },
-        ...constructorInputs.map((input) => ({
-          [snakeCase(input.name)]: {
-            description: `"${input.name}" parameter of this contract`,
-            name: input.name,
-            type: 'WalletData',
-          },
-        })),
-      ]),
-    },
-  };
-
   // add extra variables for the p2pkh utxos spent together with our contract
   if (hasSignatureTemplates) {
     template.entities.parameters.scripts!.push('p2pkh_placeholder_lock', 'p2pkh_placeholder_unlock');
@@ -291,7 +249,7 @@ export const buildTemplate = async ({
       description: 'An example evaluation where this script execution passes.',
       data: {
         // encode values for the variables defined above in `entities` property
-        bytecode: merge([
+        bytecode: mergeObjects([
           ...zip(functionInputs, args)
             .filter(([input]) => input.type !== PrimitiveType.SIG)
             .map(([input, arg]) => {
@@ -318,7 +276,7 @@ export const buildTemplate = async ({
         currentBlockHeight: 2,
         currentBlockTime: Math.round(+new Date() / 1000),
         keys: {
-          privateKeys: merge([
+          privateKeys: mergeObjects([
             ...zip(functionInputs, args)
               .filter(([input]) => input.type === PrimitiveType.SIG)
               .map(([input, arg]) => ({
@@ -455,3 +413,53 @@ const formatBytecodeForDebugging = (artifact: Artifact): string => {
     artifact.source,
   );
 };
+
+const generateTemplateEntities = (artifact: Artifact, abiFunction: AbiFunction): WalletTemplate['entities'] => {
+  const functionParameters = Object.fromEntries<WalletTemplateVariable>(
+    abiFunction.inputs.map((input) => ([
+      snakeCase(input.name),
+      {
+        description: `"${input.name}" parameter of function "${abiFunction.name}"`,
+        name: input.name,
+        type: input.type === PrimitiveType.SIG ? 'Key' : 'WalletData',
+      },
+    ])),
+  );
+
+  const constructorParameters = Object.fromEntries<WalletTemplateVariable>(
+    artifact.constructorInputs.map((input) => ([
+      snakeCase(input.name),
+      {
+        description: `"${input.name}" parameter of this contract`,
+        name: input.name,
+        type: 'WalletData',
+      },
+    ])),
+  );
+
+  const entities = {
+    parameters: {
+      description: 'Contract creation and function parameters',
+      name: 'parameters',
+      scripts: [
+        'lock',
+        'unlock_lock',
+      ],
+      variables: {
+        ...functionParameters,
+        ...constructorParameters,
+      },
+    },
+  };
+
+  // function_index is a special variable that indicates the function to execute
+  if (artifact.abi.length > 1) {
+    entities.parameters.variables.function_index = {
+      description: 'Script function index to execute',
+      name: 'function_index',
+      type: 'WalletData',
+    };
+  }
+
+  return entities;
+};
diff --git a/packages/cashscript/src/utils.ts b/packages/cashscript/src/utils.ts
index 6e18fba2..e23e2c81 100644
--- a/packages/cashscript/src/utils.ts
+++ b/packages/cashscript/src/utils.ts
@@ -401,3 +401,7 @@ export const extendedStringify = (obj: any, spaces?: number): string => JSON.str
   },
   spaces,
 );
+
+export const mergeObjects = (array: Array<Record<string, any>>): Record<string, any> => {
+  return Object.fromEntries(array.flatMap(Object.entries));
+};
diff --git a/packages/cashscript/test/fixture/libauth-template/fixtures.ts b/packages/cashscript/test/fixture/libauth-template/fixtures.ts
index 3054175a..c66d2a06 100644
--- a/packages/cashscript/test/fixture/libauth-template/fixtures.ts
+++ b/packages/cashscript/test/fixture/libauth-template/fixtures.ts
@@ -432,11 +432,6 @@ export const fixtures: Fixture[] = [
               'name': 'pk',
               'type': 'WalletData',
             },
-            'function_index': {
-              'description': 'Script function index to execute',
-              'name': 'function_index',
-              'type': 'WalletData',
-            },
             'pkh': {
               'description': '"pkh" parameter of this contract',
               'name': 'pkh',
@@ -580,11 +575,6 @@ export const fixtures: Fixture[] = [
               'name': 'pk',
               'type': 'WalletData',
             },
-            'function_index': {
-              'description': 'Script function index to execute',
-              'name': 'function_index',
-              'type': 'WalletData',
-            },
             'pkh': {
               'description': '"pkh" parameter of this contract',
               'name': 'pkh',
@@ -739,11 +729,6 @@ export const fixtures: Fixture[] = [
               'name': 'ownerSig',
               'type': 'Key',
             },
-            'function_index': {
-              'description': 'Script function index to execute',
-              'name': 'function_index',
-              'type': 'WalletData',
-            },
             'price_target': {
               'description': '"priceTarget" parameter of this contract',
               'name': 'priceTarget',
@@ -912,11 +897,6 @@ export const fixtures: Fixture[] = [
               'name': 'pk',
               'type': 'WalletData',
             },
-            'function_index': {
-              'description': 'Script function index to execute',
-              'name': 'function_index',
-              'type': 'WalletData',
-            },
             'pkh': {
               'description': '"pkh" parameter of this contract',
               'name': 'pkh',

From ccaf740c2d9503f48c1f27021c42d0c1a817a33d Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Wed, 1 May 2024 11:52:04 +0300
Subject: [PATCH 092/171] Extract generateTemplateScripts in LibauthTemplate.ts

---
 packages/cashscript/src/LibauthTemplate.ts | 224 +++++++++++----------
 packages/cashscript/src/utils.ts           |   4 +
 2 files changed, 118 insertions(+), 110 deletions(-)

diff --git a/packages/cashscript/src/LibauthTemplate.ts b/packages/cashscript/src/LibauthTemplate.ts
index 166dba4b..0ae4bdf2 100644
--- a/packages/cashscript/src/LibauthTemplate.ts
+++ b/packages/cashscript/src/LibauthTemplate.ts
@@ -1,5 +1,6 @@
 import {
   AbiFunction,
+  AbiInput,
   Artifact,
   PrimitiveType,
   bytecodeToScript,
@@ -20,6 +21,8 @@ import {
   isHex,
   WalletTemplateScenarioOutput,
   WalletTemplateVariable,
+  WalletTemplateScriptLocking,
+  WalletTemplateScriptUnlocking,
 } from '@bitauth/libauth';
 import { deflate } from 'pako';
 import {
@@ -31,10 +34,7 @@ import {
 import SignatureTemplate from './SignatureTemplate.js';
 import { Transaction } from './Transaction.js';
 import { Argument, encodeArgumentForLibauthTemplate } from './Argument.js';
-import { extendedStringify, mergeObjects, snakeCase } from './utils.js';
-
-const zip = <T, U>(a: T[], b: U[]): [T, U][] => Array.from(Array(Math.max(b.length, a.length)), (_, i) => [a[i], b[i]]);
-
+import { extendedStringify, mergeObjects, snakeCase, zip } from './utils.js';
 
 const createScenarioTransaction = (libauthTransaction: TransactionBCH, csTransaction: Transaction): WalletTemplateScenario['transaction'] => {
   const contract = csTransaction.contract;
@@ -216,9 +216,7 @@ export const buildTemplate = async ({
   const functionInputs = func.inputs.slice().reverse();
   const args = transaction.args.slice().reverse();
 
-  const hasSignatureTemplates = transaction.inputs.filter(
-    (input) => isUtxoP2PKH(input),
-  ).length;
+  const hasSignatureTemplates = transaction.inputs.filter((input) => isUtxoP2PKH(input)).length > 0;
 
   const template = {
     $schema: 'https://ide.bitauth.com/authentication-template-v0.schema.json',
@@ -227,6 +225,7 @@ export const buildTemplate = async ({
     supported: ['BCH_SPEC'],
     version: 0,
     entities: generateTemplateEntities(contract.artifact, abiFunction),
+    scripts: generateTemplateScripts(contract.artifact, abiFunction, transaction.args, contract.constructorArgs),
   } as WalletTemplate;
 
   // add extra variables for the p2pkh utxos spent together with our contract
@@ -240,6 +239,21 @@ export const buildTemplate = async ({
         type: 'Key',
       },
     };
+
+    // add extra unlocking and locking script for P2PKH inputs spent alongside our contract
+    // this is needed for correct cross-referrences in the template
+    template.scripts.p2pkh_placeholder_unlock = {
+      name: 'p2pkh_placeholder_unlock',
+      script:
+          '<placeholder_key.schnorr_signature.all_outputs>\n<placeholder_key.public_key>',
+      unlocks: 'p2pkh_placeholder_lock',
+    };
+    template.scripts.p2pkh_placeholder_lock = {
+      lockingType: 'standard',
+      name: 'p2pkh_placeholder_lock',
+      script:
+          'OP_DUP\nOP_HASH160 <$(<placeholder_key.public_key> OP_HASH160\n)> OP_EQUALVERIFY\nOP_CHECKSIG',
+    };
   }
 
   template.scenarios = {
@@ -301,61 +315,6 @@ export const buildTemplate = async ({
     },
   };
 
-  // definition of locking scripts and unlocking scripts with their respective bytecode
-  template.scripts = {
-    unlock_lock: {
-      // this unlocking script must pass our only scenario
-      passes: ['evaluate_function'],
-      name: 'unlock',
-      // unlocking script contains the CashScript function parameters and function selector
-      // we output these values as pushdata, comment will contain the type and the value of the variable
-      // example: '<timeout> // int = <0xa08601>'
-      script: [
-        `// "${func.name}" function parameters`,
-        ...(functionInputs.length
-          ? zip(functionInputs, args).map(([input, arg]) => (input.type === PrimitiveType.SIG
-            ? `<${snakeCase(
-              input.name,
-            )}.schnorr_signature.all_outputs> // ${input.type}`
-            : `<${snakeCase(input.name)}> // ${input.type} = <${
-              `0x${binToHex(arg as any)}` // TODO: remove any cast
-            }>`))
-          : ['// none']),
-        '',
-        ...(contract.artifact.abi.length > 1
-          ? [
-            '// function index in contract',
-            `<function_index> // int = <${functionIndex.toString()}>`,
-            '',
-          ]
-          : []),
-      ].join('\n'),
-      unlocks: 'lock',
-    },
-    lock: {
-      lockingType: 'p2sh20', //transaction.contract.addressType,
-      name: 'lock',
-      script: formatBitAuthScriptForDebugging(contract.artifact, contract.constructorArgs),
-    },
-  };
-
-  // add extra unlocking and locking script for P2PKH inputs spent alongside our contract
-  // this is needed for correct cross-referrences in the template
-  if (hasSignatureTemplates) {
-    template.scripts.p2pkh_placeholder_unlock = {
-      name: 'p2pkh_placeholder_unlock',
-      script:
-          '<placeholder_key.schnorr_signature.all_outputs>\n<placeholder_key.public_key>',
-      unlocks: 'p2pkh_placeholder_lock',
-    };
-    template.scripts.p2pkh_placeholder_lock = {
-      lockingType: 'standard',
-      name: 'p2pkh_placeholder_lock',
-      script:
-          'OP_DUP\nOP_HASH160 <$(<placeholder_key.public_key> OP_HASH160\n)> OP_EQUALVERIFY\nOP_CHECKSIG',
-    };
-  }
-
   return template;
 };
 
@@ -365,54 +324,6 @@ export const getBitauthUri = (template: WalletTemplate): string => {
   return `https://ide.bitauth.com/import-template/${payload}`;
 };
 
-const formatBitAuthScriptForDebugging = (artifact: Artifact, constructorArguments: Argument[]): string => {
-  // locking script contains the CashScript contract parameters followed by the contract opcodes
-  // we output these values as pushdata, comment will contain the type and the value of the variable
-  return [
-    `// "${artifact.contractName}" contract constructor parameters`,
-    formatConstructorParametersForDebugging(artifact, constructorArguments),
-    '',
-    '// bytecode',
-    formatBytecodeForDebugging(artifact),
-  ].join('\n');
-};
-
-const formatConstructorParametersForDebugging = (artifact: Artifact, constructorArguments: Argument[]): string => {
-  const constructorTypesReversed = [...artifact.constructorInputs].reverse();
-  const constructorArgumentsReversed = [...constructorArguments].reverse();
-
-  if (constructorArgumentsReversed.length === 0) {
-    return '// none';
-  }
-
-  return constructorTypesReversed.map((input, index) => {
-    const encodedArgument = encodeArgumentForLibauthTemplate(
-      constructorArgumentsReversed[index],
-      constructorTypesReversed[index].type,
-    ) as Uint8Array;
-
-    const typeStr = input.type === 'bytes' ? `bytes${encodedArgument.length}` : input.type;
-
-    // e.g. <timeout> // int = <0xa08601>
-    return `<${snakeCase(input.name)}> // ${typeStr} = <${`0x${binToHex(encodedArgument)}`}>`;
-  }).join('\n');
-};
-
-const formatBytecodeForDebugging = (artifact: Artifact): string => {
-  if (!artifact.debug) {
-    // TODO: See if we can merge this with code from @cashscript/utils -> script.ts
-    return artifact.bytecode
-      .split(' ')
-      .map((asmElement) => (isHex(asmElement) ? `<0x${asmElement}>` : asmElement))
-      .join('\n');
-  }
-
-  return formatBitAuthScript(
-    bytecodeToScript(hexToBin(artifact.debug.bytecode)),
-    artifact.debug.sourceMap,
-    artifact.source,
-  );
-};
 
 const generateTemplateEntities = (artifact: Artifact, abiFunction: AbiFunction): WalletTemplate['entities'] => {
   const functionParameters = Object.fromEntries<WalletTemplateVariable>(
@@ -463,3 +374,96 @@ const generateTemplateEntities = (artifact: Artifact, abiFunction: AbiFunction):
 
   return entities;
 };
+
+const generateTemplateScripts = (
+  artifact: Artifact,
+  abiFunction: AbiFunction,
+  functionArguments: Argument[],
+  constructorArguments: Argument[],
+): WalletTemplate['scripts'] => {
+  // definition of locking scripts and unlocking scripts with their respective bytecode
+  return {
+    unlock_lock: generateTemplateUnlockScript(artifact, abiFunction, functionArguments),
+    lock: generateTemplateLockScript(artifact, constructorArguments),
+  };
+};
+
+const generateTemplateLockScript = (
+  artifact: Artifact,
+  constructorArguments: Argument[],
+): WalletTemplateScriptLocking => {
+  return {
+    lockingType: 'p2sh20', // TODO: use 'transaction.contract.addressType',
+    name: 'lock',
+    script: [
+      `// "${artifact.contractName}" contract constructor parameters`,
+      formatParametersForDebugging(artifact.constructorInputs, constructorArguments),
+      '',
+      '// bytecode',
+      formatBytecodeForDebugging(artifact),
+    ].join('\n'),
+  };
+};
+
+const generateTemplateUnlockScript = (
+  artifact: Artifact,
+  abiFunction: AbiFunction,
+  functionArguments: Argument[],
+): WalletTemplateScriptUnlocking => {
+  const functionIndex = artifact.abi.findIndex((func) => func.name === abiFunction.name);
+
+  const functionIndexString = artifact.abi.length > 1
+    ? ['// function index in contract', `<function_index> // int = <${functionIndex}>`, '']
+    : [];
+
+  return {
+    // this unlocking script must pass our only scenario
+    passes: ['evaluate_function'],
+    name: 'unlock',
+    script: [
+      `// "${abiFunction.name}" function parameters`,
+      formatParametersForDebugging(abiFunction.inputs, functionArguments),
+      '',
+      ...functionIndexString,
+    ].join('\n'),
+    unlocks: 'lock',
+  };
+};
+
+const formatParametersForDebugging = (types: AbiInput[], args: Argument[]): string => {
+  if (types.length === 0) return '// none';
+
+  const typesAndArguments = zip(types, args).reverse();
+
+  return typesAndArguments.map(([input, arg]) => {
+    const encodedArgument = encodeArgumentForLibauthTemplate(arg, input.type);
+    const typeStr = input.type === 'bytes' && encodedArgument instanceof Uint8Array
+      ? `bytes${encodedArgument.length}`
+      : input.type;
+
+    if (encodedArgument instanceof SignatureTemplate) {
+      // TODO: Different signing algorithms / hashtypes
+      return `<${snakeCase(input.name)}.schnorr_signature.all_outputs> // ${input.type}`;
+    }
+
+    // we output these values as pushdata, comment will contain the type and the value of the variable
+    // e.g. <timeout> // int = <0xa08601>
+    return `<${snakeCase(input.name)}> // ${typeStr} = <${`0x${binToHex(encodedArgument)}`}>`;
+  }).join('\n');
+};
+
+const formatBytecodeForDebugging = (artifact: Artifact): string => {
+  if (!artifact.debug) {
+    // TODO: See if we can merge this with code from @cashscript/utils -> script.ts
+    return artifact.bytecode
+      .split(' ')
+      .map((asmElement) => (isHex(asmElement) ? `<0x${asmElement}>` : asmElement))
+      .join('\n');
+  }
+
+  return formatBitAuthScript(
+    bytecodeToScript(hexToBin(artifact.debug.bytecode)),
+    artifact.debug.sourceMap,
+    artifact.source,
+  );
+};
diff --git a/packages/cashscript/src/utils.ts b/packages/cashscript/src/utils.ts
index e23e2c81..c81d0200 100644
--- a/packages/cashscript/src/utils.ts
+++ b/packages/cashscript/src/utils.ts
@@ -405,3 +405,7 @@ export const extendedStringify = (obj: any, spaces?: number): string => JSON.str
 export const mergeObjects = (array: Array<Record<string, any>>): Record<string, any> => {
   return Object.fromEntries(array.flatMap(Object.entries));
 };
+
+export const zip = <T, U>(a: T[], b: U[]): [T, U][] => (
+  Array.from(Array(Math.max(b.length, a.length)), (_, i) => [a[i], b[i]])
+);

From 79fc5d08bc7deb97751966a138fff90ffe9e359c Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Thu, 2 May 2024 13:44:05 +0300
Subject: [PATCH 093/171] Extract generateTemplateScenarioParameterValues and
 generateTemplateScenarioKeys in LibauthTemplate.ts

---
 packages/cashscript/src/LibauthTemplate.ts    |  90 ++++++------
 packages/cashscript/src/utils.ts              |   4 -
 .../test/fixture/libauth-template/fixtures.ts | 129 +++++++++++++++++-
 3 files changed, 167 insertions(+), 56 deletions(-)

diff --git a/packages/cashscript/src/LibauthTemplate.ts b/packages/cashscript/src/LibauthTemplate.ts
index 0ae4bdf2..ed254295 100644
--- a/packages/cashscript/src/LibauthTemplate.ts
+++ b/packages/cashscript/src/LibauthTemplate.ts
@@ -34,7 +34,7 @@ import {
 import SignatureTemplate from './SignatureTemplate.js';
 import { Transaction } from './Transaction.js';
 import { Argument, encodeArgumentForLibauthTemplate } from './Argument.js';
-import { extendedStringify, mergeObjects, snakeCase, zip } from './utils.js';
+import { extendedStringify, snakeCase, zip } from './utils.js';
 
 const createScenarioTransaction = (libauthTransaction: TransactionBCH, csTransaction: Transaction): WalletTemplateScenario['transaction'] => {
   const contract = csTransaction.contract;
@@ -204,9 +204,6 @@ export const buildTemplate = async ({
   const libauthTransaction = decodeTransaction(hexToBin(txHex));
   if (typeof libauthTransaction === 'string') throw Error(libauthTransaction);
 
-  const constructorInputs = contract.artifact.constructorInputs.slice().reverse();
-  const contractParameters = contract.constructorArgs.slice().reverse();
-
   const abiFunction = transaction.abiFunction;
   const funcName = abiFunction.name;
   const functionIndex = contract.artifact.abi.findIndex(
@@ -263,51 +260,14 @@ export const buildTemplate = async ({
       description: 'An example evaluation where this script execution passes.',
       data: {
         // encode values for the variables defined above in `entities` property
-        bytecode: mergeObjects([
-          ...zip(functionInputs, args)
-            .filter(([input]) => input.type !== PrimitiveType.SIG)
-            .map(([input, arg]) => {
-              const hex = binToHex(arg as Uint8Array);
-              const result = hex.length ? `0x${hex}` : hex;
-              return {
-                [snakeCase(input.name)]: result,
-              };
-            }),
-          { function_index: functionIndex.toString() },
-          ...constructorInputs.map((input, index) => {
-            const hex = binToHex(
-              encodeArgumentForLibauthTemplate(
-                contractParameters[index],
-                constructorInputs[index].type,
-              ) as Uint8Array,
-            );
-            const result = hex.length ? `0x${hex}` : hex;
-            return {
-              [snakeCase(input.name)]: result,
-            };
-          }),
-        ]),
+        bytecode: {
+          ...generateTemplateScenarioParametersValues(abiFunction.inputs, transaction.args),
+          ...generateTemplateScenarioParametersValues(contract.artifact.constructorInputs, contract.constructorArgs),
+        },
         currentBlockHeight: 2,
         currentBlockTime: Math.round(+new Date() / 1000),
         keys: {
-          privateKeys: mergeObjects([
-            ...zip(functionInputs, args)
-              .filter(([input]) => input.type === PrimitiveType.SIG)
-              .map(([input, arg]) => ({
-                [snakeCase(input.name)]: arg instanceof SignatureTemplate
-                  ? binToHex(arg.privateKey)
-                  : binToHex((arg)), // TODO: Double check if this makes sense
-              })),
-            ...(hasSignatureTemplates
-              ? [
-                {
-                  // placeholder will be replaced by a key for each respective P2PKH input spent
-                  placeholder_key:
-                      '<Uint8Array: 0x0000000000000000000000000000000000000000000000000000000000000000>',
-                },
-              ]
-              : []),
-          ]),
+          privateKeys: generateTemplateScenarioKeys(functionInputs, args, hasSignatureTemplates),
         },
       },
       transaction: createScenarioTransaction(libauthTransaction, transaction),
@@ -315,6 +275,10 @@ export const buildTemplate = async ({
     },
   };
 
+  if (contract.artifact.abi.length > 1) {
+    template.scenarios!.evaluate_function!.data!.bytecode!.function_index = functionIndex.toString();
+  }
+
   return template;
 };
 
@@ -430,6 +394,40 @@ const generateTemplateUnlockScript = (
   };
 };
 
+const generateTemplateScenarioParametersValues = (types: AbiInput[], args: Argument[]): Record<string, string> => {
+  const typesAndArguments = zip(types, args);
+
+  const entries = typesAndArguments
+    // SignatureTemplates are handled by the 'keys' object in the scenario
+    .filter(([, arg]) => !(arg instanceof SignatureTemplate))
+    .map(([input, arg]) => {
+      const encodedArgument = binToHex(encodeArgumentForLibauthTemplate(arg, input.type) as Uint8Array);
+      // TODO: Is this really necessary?
+      const prefixedEncodedArgument = encodedArgument.length ? `0x${encodedArgument}` : encodedArgument;
+      return [snakeCase(input.name), prefixedEncodedArgument] as const;
+    });
+
+  return Object.fromEntries(entries);
+};
+
+const generateTemplateScenarioKeys = (
+  types: AbiInput[],
+  args: Argument[],
+  hasSignatureTemplates: boolean,
+): Record<string, string> => {
+  const typesAndArguments = zip(types, args);
+
+  const entries = typesAndArguments
+    .filter(([, arg]) => arg instanceof SignatureTemplate)
+    .map(([input, arg]) => ([snakeCase(input.name), binToHex((arg as SignatureTemplate).privateKey)] as const));
+
+  const placeholderKey = hasSignatureTemplates
+    ? [['placeholder_key', '0x0000000000000000000000000000000000000000000000000000000000000000']]
+    : [];
+
+  return Object.fromEntries([...entries, ...placeholderKey]);
+};
+
 const formatParametersForDebugging = (types: AbiInput[], args: Argument[]): string => {
   if (types.length === 0) return '// none';
 
diff --git a/packages/cashscript/src/utils.ts b/packages/cashscript/src/utils.ts
index c81d0200..a6098b69 100644
--- a/packages/cashscript/src/utils.ts
+++ b/packages/cashscript/src/utils.ts
@@ -402,10 +402,6 @@ export const extendedStringify = (obj: any, spaces?: number): string => JSON.str
   spaces,
 );
 
-export const mergeObjects = (array: Array<Record<string, any>>): Record<string, any> => {
-  return Object.fromEntries(array.flatMap(Object.entries));
-};
-
 export const zip = <T, U>(a: T[], b: U[]): [T, U][] => (
   Array.from(Array(Math.max(b.length, a.length)), (_, i) => [a[i], b[i]])
 );
diff --git a/packages/cashscript/test/fixture/libauth-template/fixtures.ts b/packages/cashscript/test/fixture/libauth-template/fixtures.ts
index c66d2a06..c950f999 100644
--- a/packages/cashscript/test/fixture/libauth-template/fixtures.ts
+++ b/packages/cashscript/test/fixture/libauth-template/fixtures.ts
@@ -4,7 +4,7 @@ import Mecenas from '../mecenas.json' assert { type: 'json' };
 import P2PKH from '../p2pkh.json' assert { type: 'json' };
 import HoldVault from '../hodl_vault.json' assert { type: 'json' };
 import { aliceAddress, alicePkh, alicePriv, alicePub, bobPkh, bobPriv, bobPub, oracle, oraclePub } from '../vars.js';
-import { WalletTemplate } from '@bitauth/libauth';
+import { WalletTemplate, hexToBin } from '@bitauth/libauth';
 
 const provider = new MockNetworkProvider();
 
@@ -447,7 +447,6 @@ export const fixtures: Fixture[] = [
           'data': {
             'bytecode': {
               'pk': '0x0373cc07b54c22da627b572a387a20ea190c9382e5e6d48c1d5b89c5cea2c4c088',
-              'function_index': '0',
               'pkh': '0x512dbb2c8c02efbac8d92431aa0ac33f6b0bf970',
             },
             'currentBlockHeight': 2,
@@ -527,6 +526,127 @@ export const fixtures: Fixture[] = [
       },
     },
   },
+  {
+    name: 'P2PKH (hardcoded signature)',
+    transaction: (() => {
+      const contract = new Contract(P2PKH, [alicePkh], { provider });
+
+      const regularUtxo = randomUtxo();
+      provider.addUtxo(contract.address, regularUtxo);
+
+      const to = contract.tokenAddress;
+      const amount = 1000n;
+
+      const hardcodedSignature = new SignatureTemplate(alicePriv).generateSignature(hexToBin('c0ffee'));
+      const tx = contract.functions
+        .spend(alicePub, hardcodedSignature)
+        .from(regularUtxo)
+        .to(to, amount);
+
+      return tx;
+    })(),
+    template: {
+      '$schema': 'https://ide.bitauth.com/authentication-template-v0.schema.json',
+      'description': 'Imported from cashscript',
+      'name': 'P2PKH',
+      'supported': [
+        'BCH_SPEC',
+      ],
+      'version': 0,
+      'entities': {
+        'parameters': {
+          'description': 'Contract creation and function parameters',
+          'name': 'parameters',
+          'scripts': [
+            'lock',
+            'unlock_lock',
+          ],
+          'variables': {
+            's': {
+              'description': '"s" parameter of function "spend"',
+              'name': 's',
+              'type': 'Key',
+            },
+            'pk': {
+              'description': '"pk" parameter of function "spend"',
+              'name': 'pk',
+              'type': 'WalletData',
+            },
+            'pkh': {
+              'description': '"pkh" parameter of this contract',
+              'name': 'pkh',
+              'type': 'WalletData',
+            },
+          },
+        },
+      },
+      'scenarios': {
+        'evaluate_function': {
+          'name': 'Evaluate',
+          'description': 'An example evaluation where this script execution passes.',
+          'data': {
+            'bytecode': {
+              'pk': '0x0373cc07b54c22da627b572a387a20ea190c9382e5e6d48c1d5b89c5cea2c4c088',
+              'pkh': '0x512dbb2c8c02efbac8d92431aa0ac33f6b0bf970',
+              's': '0x65f72c5cce773383b45032a3f9f9255814e3d53ee260056e3232cd89e91a0a84278b35daf8938d47047e7d3bd3407fe90b07dfabf4407947af6fb09730a34c0b61',
+            },
+            'currentBlockHeight': 2,
+            'currentBlockTime': expect.any(Number),
+            'keys': {
+              'privateKeys': {},
+            },
+          },
+          'transaction': {
+            'inputs': [
+              {
+                'outpointIndex': expect.any(Number),
+                'outpointTransactionHash': expect.stringMatching(/^[0-9a-f]{64}$/),
+                'sequenceNumber': 4294967294,
+                'unlockingBytecode': [
+                  'slot',
+                ],
+              },
+            ],
+            'locktime': 133700,
+            'outputs': [
+              {
+                'lockingBytecode': {},
+                'valueSatoshis': 1000,
+              },
+              {
+                'lockingBytecode': {},
+                'valueSatoshis': expect.any(Number),
+              },
+            ],
+            'version': 2,
+          },
+          'sourceOutputs': [
+            {
+              'lockingBytecode': [
+                'slot',
+              ],
+              'valueSatoshis': expect.any(Number),
+            },
+          ],
+        },
+      },
+      'scripts': {
+        'unlock_lock': {
+          'passes': [
+            'evaluate_function',
+          ],
+          'name': 'unlock',
+          'script': '// "spend" function parameters\n<s> // sig = <0x65f72c5cce773383b45032a3f9f9255814e3d53ee260056e3232cd89e91a0a84278b35daf8938d47047e7d3bd3407fe90b07dfabf4407947af6fb09730a34c0b61>\n<pk> // pubkey = <0x0373cc07b54c22da627b572a387a20ea190c9382e5e6d48c1d5b89c5cea2c4c088>\n',
+          'unlocks': 'lock',
+        },
+        'lock': {
+          'lockingType': 'p2sh20',
+          'name': 'lock',
+          'script': '// "P2PKH" contract constructor parameters\n<pkh> // bytes20 = <0x512dbb2c8c02efbac8d92431aa0ac33f6b0bf970>\n\n// bytecode\n                                                        /* contract P2PKH(bytes20 pkh) {                                */\n                                                        /*     // Require pk to match stored pkh and signature to match */\n                                                        /*     function spend(pubkey pk, sig s) {                       */\nOP_1 OP_PICK OP_HASH160 OP_1 OP_ROLL OP_EQUAL OP_VERIFY /*         require(hash160(pk) == pkh);                         */\nOP_1 OP_ROLL OP_1 OP_ROLL OP_CHECKSIG                   /*         require(checkSig(s, pk));                            */\n                                                        /*     }                                                        */\n                                                        /* }                                                            */\n                                                        /*                                                              */',
+        },
+      },
+    },
+  },
   {
     name: 'P2PKH (sending NFTs)',
     transaction: (() => {
@@ -590,7 +710,6 @@ export const fixtures: Fixture[] = [
           'data': {
             'bytecode': {
               'pk': '0x0373cc07b54c22da627b572a387a20ea190c9382e5e6d48c1d5b89c5cea2c4c088',
-              'function_index': '0',
               'pkh': '0x512dbb2c8c02efbac8d92431aa0ac33f6b0bf970',
             },
             'currentBlockHeight': 2,
@@ -760,7 +879,6 @@ export const fixtures: Fixture[] = [
             'bytecode': {
               'oracle_message': '0xa086010030750000',
               'oracle_sig': '0x569e137142ebdb96127b727787d605e427a858e8b17dc0605092d0019e5fc9d58810ee74c8ba9f9a5605268c9913e50f780f4c3780e06aea7f50766829895b4b',
-              'function_index': '0',
               'price_target': '0x3075',
               'min_block': '0xb88201',
               'oracle_pk': '0x028f1219c918234d6bb06b4782354ff0759bd73036f3c849b88020c79fe013cd38',
@@ -917,7 +1035,6 @@ export const fixtures: Fixture[] = [
           'data': {
             'bytecode': {
               'pk': '0x0373cc07b54c22da627b572a387a20ea190c9382e5e6d48c1d5b89c5cea2c4c088',
-              'function_index': '0',
               'pkh': '0x512dbb2c8c02efbac8d92431aa0ac33f6b0bf970',
             },
             'currentBlockHeight': 2,
@@ -925,7 +1042,7 @@ export const fixtures: Fixture[] = [
             'keys': {
               'privateKeys': {
                 's': '36f8155c559f3a670586bbbf9fd52beef6f96124f5a3a39c167fc24b052d24d7',
-                'placeholder_key': '<Uint8Array: 0x0000000000000000000000000000000000000000000000000000000000000000>',
+                'placeholder_key': '0x0000000000000000000000000000000000000000000000000000000000000000',
               },
             },
           },

From 4b3ff47a71271fad64f3621148694015b68cf66a Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Thu, 2 May 2024 15:33:35 +0300
Subject: [PATCH 094/171] Fix bug with double-encoding function arguments in
 LibauthTemplate.ts

---
 packages/cashscript/src/Argument.ts           |  14 ++-
 packages/cashscript/src/Contract.ts           |  15 ++-
 packages/cashscript/src/LibauthTemplate.ts    |  68 ++++++------
 packages/cashscript/src/Transaction.ts        |   5 +-
 packages/cashscript/src/utils.ts              |   2 +-
 .../cashscript/test/e2e/Announcement.test.ts  |   4 +-
 packages/utils/src/script.ts                  |   4 +-
 yarn.lock                                     | 102 ++----------------
 8 files changed, 69 insertions(+), 145 deletions(-)

diff --git a/packages/cashscript/src/Argument.ts b/packages/cashscript/src/Argument.ts
index 1a6f7cb2..43bb57d2 100644
--- a/packages/cashscript/src/Argument.ts
+++ b/packages/cashscript/src/Argument.ts
@@ -1,5 +1,6 @@
 import { hexToBin } from '@bitauth/libauth';
 import {
+  AbiFunction,
   Artifact,
   BytesType,
   encodeBool,
@@ -87,12 +88,21 @@ export const encodeConstructorArguments = (
   }
 
   const encodedArgs = constructorArgs
-    .map((arg, i) => encodeFunction(arg, artifact.constructorInputs[i].type))
-    .reverse();
+    .map((arg, i) => encodeFunction(arg, artifact.constructorInputs[i].type));
 
   return encodedArgs as Uint8Array[];
 };
 
+export const encodeFunctionArguments = (
+  abiFunction: AbiFunction,
+  functionArgs: Argument[],
+  encodeFunction: EncodeFunction = encodeArgument,
+): EncodedArgument[] => {
+  const encodedArgs = functionArgs.map((arg, i) => encodeFunction(arg, abiFunction.inputs[i].type));
+
+  return encodedArgs;
+};
+
 // Note: BitAuth IDE requires 0 to be encoded as a single byte (rather than the default empty byte array)
 // TODO: Double check this with Pat
 export function encodeArgumentForLibauthTemplate(
diff --git a/packages/cashscript/src/Contract.ts b/packages/cashscript/src/Contract.ts
index 1b8e9645..2bffa792 100644
--- a/packages/cashscript/src/Contract.ts
+++ b/packages/cashscript/src/Contract.ts
@@ -11,7 +11,7 @@ import {
   scriptToBytecode,
 } from '@cashscript/utils';
 import { Transaction } from './Transaction.js';
-import { Argument, encodeArgument, encodeConstructorArguments } from './Argument.js';
+import { Argument, encodeArgument, encodeConstructorArguments, encodeFunctionArguments } from './Argument.js';
 import {
   Unlocker, ContractOptions, GenerateUnlockingBytecodeOptions, Utxo,
 } from './interfaces.js';
@@ -36,10 +36,11 @@ export class Contract {
   redeemScript: Script;
   public provider: NetworkProvider;
   public addressType: 'p2sh20' | 'p2sh32';
+  public encodedConstructorArgs: Uint8Array[];
 
   constructor(
     public artifact: Artifact,
-    public constructorArgs: Argument[],
+    constructorArgs: Argument[],
     private options?: ContractOptions,
   ) {
     this.provider = this.options?.provider ?? new ElectrumNetworkProvider();
@@ -55,12 +56,9 @@ export class Contract {
     }
 
     // Encode arguments (this also performs type checking)
-    const encodedArgs = encodeConstructorArguments(artifact, constructorArgs);
+    this.encodedConstructorArgs = encodeConstructorArguments(artifact, constructorArgs);
 
-    this.redeemScript = generateRedeemScript(
-      asmToScript(this.artifact.bytecode),
-      encodedArgs as Uint8Array[],
-    );
+    this.redeemScript = generateRedeemScript(asmToScript(this.artifact.bytecode), this.encodedConstructorArgs);
 
     // Populate the functions object with the contract's functions
     // (with a special case for single function, which has no "function selector")
@@ -110,8 +108,7 @@ export class Contract {
       }
 
       // Encode passed args (this also performs type checking)
-      const encodedArgs = args
-        .map((arg, i) => encodeArgument(arg, abiFunction.inputs[i].type));
+      const encodedArgs = encodeFunctionArguments(abiFunction, args);
 
       const unlocker = this.createUnlocker(abiFunction, selector)(...args);
 
diff --git a/packages/cashscript/src/LibauthTemplate.ts b/packages/cashscript/src/LibauthTemplate.ts
index ed254295..7093ba8c 100644
--- a/packages/cashscript/src/LibauthTemplate.ts
+++ b/packages/cashscript/src/LibauthTemplate.ts
@@ -33,7 +33,7 @@ import {
 } from './interfaces.js';
 import SignatureTemplate from './SignatureTemplate.js';
 import { Transaction } from './Transaction.js';
-import { Argument, encodeArgumentForLibauthTemplate } from './Argument.js';
+import { EncodedArgument } from './Argument.js';
 import { extendedStringify, snakeCase, zip } from './utils.js';
 
 const createScenarioTransaction = (libauthTransaction: TransactionBCH, csTransaction: Transaction): WalletTemplateScenario['transaction'] => {
@@ -204,14 +204,9 @@ export const buildTemplate = async ({
   const libauthTransaction = decodeTransaction(hexToBin(txHex));
   if (typeof libauthTransaction === 'string') throw Error(libauthTransaction);
 
-  const abiFunction = transaction.abiFunction;
-  const funcName = abiFunction.name;
   const functionIndex = contract.artifact.abi.findIndex(
-    (func) => func.name === funcName,
+    (func) => func.name === transaction.abiFunction.name,
   )!;
-  const func: AbiFunction = contract.artifact.abi[functionIndex];
-  const functionInputs = func.inputs.slice().reverse();
-  const args = transaction.args.slice().reverse();
 
   const hasSignatureTemplates = transaction.inputs.filter((input) => isUtxoP2PKH(input)).length > 0;
 
@@ -221,8 +216,10 @@ export const buildTemplate = async ({
     name: contract.artifact.contractName,
     supported: ['BCH_SPEC'],
     version: 0,
-    entities: generateTemplateEntities(contract.artifact, abiFunction),
-    scripts: generateTemplateScripts(contract.artifact, abiFunction, transaction.args, contract.constructorArgs),
+    entities: generateTemplateEntities(contract.artifact, transaction.abiFunction),
+    scripts: generateTemplateScripts(
+      contract.artifact, transaction.abiFunction, transaction.encodedFunctionArgs, contract.encodedConstructorArgs,
+    ),
   } as WalletTemplate;
 
   // add extra variables for the p2pkh utxos spent together with our contract
@@ -261,13 +258,17 @@ export const buildTemplate = async ({
       data: {
         // encode values for the variables defined above in `entities` property
         bytecode: {
-          ...generateTemplateScenarioParametersValues(abiFunction.inputs, transaction.args),
-          ...generateTemplateScenarioParametersValues(contract.artifact.constructorInputs, contract.constructorArgs),
+          ...generateTemplateScenarioParametersValues(transaction.abiFunction.inputs, transaction.encodedFunctionArgs),
+          ...generateTemplateScenarioParametersValues(
+            contract.artifact.constructorInputs, contract.encodedConstructorArgs,
+          ),
         },
         currentBlockHeight: 2,
         currentBlockTime: Math.round(+new Date() / 1000),
         keys: {
-          privateKeys: generateTemplateScenarioKeys(functionInputs, args, hasSignatureTemplates),
+          privateKeys: generateTemplateScenarioKeys(
+            transaction.abiFunction.inputs, transaction.encodedFunctionArgs, hasSignatureTemplates,
+          ),
         },
       },
       transaction: createScenarioTransaction(libauthTransaction, transaction),
@@ -342,19 +343,19 @@ const generateTemplateEntities = (artifact: Artifact, abiFunction: AbiFunction):
 const generateTemplateScripts = (
   artifact: Artifact,
   abiFunction: AbiFunction,
-  functionArguments: Argument[],
-  constructorArguments: Argument[],
+  encodedFunctionArgs: EncodedArgument[],
+  encodedConstructorArgs: EncodedArgument[],
 ): WalletTemplate['scripts'] => {
   // definition of locking scripts and unlocking scripts with their respective bytecode
   return {
-    unlock_lock: generateTemplateUnlockScript(artifact, abiFunction, functionArguments),
-    lock: generateTemplateLockScript(artifact, constructorArguments),
+    unlock_lock: generateTemplateUnlockScript(artifact, abiFunction, encodedFunctionArgs),
+    lock: generateTemplateLockScript(artifact, encodedConstructorArgs),
   };
 };
 
 const generateTemplateLockScript = (
   artifact: Artifact,
-  constructorArguments: Argument[],
+  constructorArguments: EncodedArgument[],
 ): WalletTemplateScriptLocking => {
   return {
     lockingType: 'p2sh20', // TODO: use 'transaction.contract.addressType',
@@ -372,7 +373,7 @@ const generateTemplateLockScript = (
 const generateTemplateUnlockScript = (
   artifact: Artifact,
   abiFunction: AbiFunction,
-  functionArguments: Argument[],
+  encodedFunctionArgs: EncodedArgument[],
 ): WalletTemplateScriptUnlocking => {
   const functionIndex = artifact.abi.findIndex((func) => func.name === abiFunction.name);
 
@@ -386,7 +387,7 @@ const generateTemplateUnlockScript = (
     name: 'unlock',
     script: [
       `// "${abiFunction.name}" function parameters`,
-      formatParametersForDebugging(abiFunction.inputs, functionArguments),
+      formatParametersForDebugging(abiFunction.inputs, encodedFunctionArgs),
       '',
       ...functionIndexString,
     ].join('\n'),
@@ -394,16 +395,19 @@ const generateTemplateUnlockScript = (
   };
 };
 
-const generateTemplateScenarioParametersValues = (types: AbiInput[], args: Argument[]): Record<string, string> => {
-  const typesAndArguments = zip(types, args);
+const generateTemplateScenarioParametersValues = (
+  types: AbiInput[],
+  encodedArgs: EncodedArgument[],
+): Record<string, string> => {
+  const typesAndArguments = zip(types, encodedArgs);
 
   const entries = typesAndArguments
     // SignatureTemplates are handled by the 'keys' object in the scenario
     .filter(([, arg]) => !(arg instanceof SignatureTemplate))
     .map(([input, arg]) => {
-      const encodedArgument = binToHex(encodeArgumentForLibauthTemplate(arg, input.type) as Uint8Array);
+      const encodedArgumentHex = binToHex(arg as Uint8Array);
       // TODO: Is this really necessary?
-      const prefixedEncodedArgument = encodedArgument.length ? `0x${encodedArgument}` : encodedArgument;
+      const prefixedEncodedArgument = encodedArgumentHex.length ? `0x${encodedArgumentHex}` : encodedArgumentHex;
       return [snakeCase(input.name), prefixedEncodedArgument] as const;
     });
 
@@ -412,10 +416,10 @@ const generateTemplateScenarioParametersValues = (types: AbiInput[], args: Argum
 
 const generateTemplateScenarioKeys = (
   types: AbiInput[],
-  args: Argument[],
+  encodedArgs: EncodedArgument[],
   hasSignatureTemplates: boolean,
 ): Record<string, string> => {
-  const typesAndArguments = zip(types, args);
+  const typesAndArguments = zip(types, encodedArgs);
 
   const entries = typesAndArguments
     .filter(([, arg]) => arg instanceof SignatureTemplate)
@@ -428,25 +432,23 @@ const generateTemplateScenarioKeys = (
   return Object.fromEntries([...entries, ...placeholderKey]);
 };
 
-const formatParametersForDebugging = (types: AbiInput[], args: Argument[]): string => {
+const formatParametersForDebugging = (types: AbiInput[], args: EncodedArgument[]): string => {
   if (types.length === 0) return '// none';
 
+  // We reverse the arguments because the order of the arguments in the bytecode is reversed
   const typesAndArguments = zip(types, args).reverse();
 
   return typesAndArguments.map(([input, arg]) => {
-    const encodedArgument = encodeArgumentForLibauthTemplate(arg, input.type);
-    const typeStr = input.type === 'bytes' && encodedArgument instanceof Uint8Array
-      ? `bytes${encodedArgument.length}`
-      : input.type;
-
-    if (encodedArgument instanceof SignatureTemplate) {
+    if (arg instanceof SignatureTemplate) {
       // TODO: Different signing algorithms / hashtypes
       return `<${snakeCase(input.name)}.schnorr_signature.all_outputs> // ${input.type}`;
     }
 
+    const typeStr = input.type === 'bytes' ? `bytes${arg.length}` : input.type;
+
     // we output these values as pushdata, comment will contain the type and the value of the variable
     // e.g. <timeout> // int = <0xa08601>
-    return `<${snakeCase(input.name)}> // ${typeStr} = <${`0x${binToHex(encodedArgument)}`}>`;
+    return `<${snakeCase(input.name)}> // ${typeStr} = <${`0x${binToHex(arg)}`}>`;
   }).join('\n');
 };
 
diff --git a/packages/cashscript/src/Transaction.ts b/packages/cashscript/src/Transaction.ts
index 085bca66..7f6cdf4d 100644
--- a/packages/cashscript/src/Transaction.ts
+++ b/packages/cashscript/src/Transaction.ts
@@ -42,6 +42,7 @@ import { Contract } from './Contract.js';
 import MockNetworkProvider from './network/MockNetworkProvider.js';
 import { buildTemplate, getBitauthUri } from './LibauthTemplate.js';
 import { debugTemplate, evaluateTemplate, DebugResult } from './debugging.js';
+import { EncodedArgument } from './Argument.js';
 
 export class Transaction {
   public inputs: Utxo[] = [];
@@ -58,7 +59,7 @@ export class Transaction {
     public contract: Contract,
     private unlocker: Unlocker,
     public abiFunction: AbiFunction,
-    public args: (Uint8Array | SignatureTemplate)[],
+    public encodedFunctionArgs: EncodedArgument[],
     private selector?: number,
   ) {}
 
@@ -357,7 +358,7 @@ export class Transaction {
     }
 
     // Replace all SignatureTemplate with 65-length placeholder Uint8Arrays
-    const placeholderArgs = this.args.map((arg) => (
+    const placeholderArgs = this.encodedFunctionArgs.map((arg) => (
       arg instanceof SignatureTemplate ? placeholder(65) : arg
     ));
 
diff --git a/packages/cashscript/src/utils.ts b/packages/cashscript/src/utils.ts
index a6098b69..e2b52c74 100644
--- a/packages/cashscript/src/utils.ts
+++ b/packages/cashscript/src/utils.ts
@@ -168,7 +168,7 @@ export function createInputScript(
   preimage?: Uint8Array,
 ): Uint8Array {
   // Create unlock script / redeemScriptSig (add potential preimage and selector)
-  const unlockScript = encodedArgs.reverse();
+  const unlockScript = [...encodedArgs].reverse();
   if (preimage !== undefined) unlockScript.push(preimage);
   if (selector !== undefined) unlockScript.push(encodeInt(BigInt(selector)));
 
diff --git a/packages/cashscript/test/e2e/Announcement.test.ts b/packages/cashscript/test/e2e/Announcement.test.ts
index 0545df21..57065130 100644
--- a/packages/cashscript/test/e2e/Announcement.test.ts
+++ b/packages/cashscript/test/e2e/Announcement.test.ts
@@ -104,11 +104,11 @@ describe('Announcement', () => {
     it('should fail when sending the correct change amount to an incorrect address', async () => {
       // given
       const str = 'A contract may not injure a human being or, through inaction, allow a human being to come to harm.';
-      const largestUtxo = (await announcement.getUtxos())
+      const [largestUtxo] = (await announcement.getUtxos())
         .sort(utxoComparator)
         .reverse()
         .slice(0, 1);
-      const changeAmount = largestUtxo[0]?.satoshis - minerFee;
+      const changeAmount = largestUtxo?.satoshis - minerFee;
 
       // when
       const txPromise = announcement.functions
diff --git a/packages/utils/src/script.ts b/packages/utils/src/script.ts
index b20251fd..63095d4d 100644
--- a/packages/utils/src/script.ts
+++ b/packages/utils/src/script.ts
@@ -186,8 +186,8 @@ export function replaceBytecodeNop(script: Script): Script {
   return asmToScript(scriptToAsm(script));
 }
 
-export function generateRedeemScript(baseScript: Script, encodedArgs: Script): Script {
-  return replaceBytecodeNop([...encodedArgs, ...baseScript]);
+export function generateRedeemScript(baseScript: Script, encodedConstructorArgs: Script): Script {
+  return replaceBytecodeNop([...encodedConstructorArgs.slice().reverse(), ...baseScript]);
 }
 
 export function optimiseBytecode(script: Script, runs: number = 1000): Script {
diff --git a/yarn.lock b/yarn.lock
index 830152ee..0fb4e534 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -714,13 +714,6 @@
   resolved "https://registry.yarnpkg.com/@cspell/dict-typescript/-/dict-typescript-1.0.16.tgz#18d20a91c4caf52540c795921a50b0e4ce3bc50c"
   integrity sha512-DEKi6vD605ebDhCC4Hrtz29k59TcijPVsmVKheTpMrL1MD/S96Ftb19gW0pEIVK9vwYZIljmGwgz4qYyuM5Liw==
 
-"@cspotcode/source-map-support@^0.8.0":
-  version "0.8.1"
-  resolved "https://registry.yarnpkg.com/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz#00629c35a688e05a88b1cda684fb9d5e73f000a1"
-  integrity sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==
-  dependencies:
-    "@jridgewell/trace-mapping" "0.3.9"
-
 "@esbuild/aix-ppc64@0.19.12":
   version "0.19.12"
   resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.19.12.tgz#d1bc06aedb6936b3b6d313bf809a5a40387d2b7f"
@@ -1348,14 +1341,6 @@
   resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.13.tgz#b6461fb0c2964356c469e115f504c95ad97ab88c"
   integrity sha512-GryiOJmNcWbovBxTfZSF71V/mXbgcV3MewDe3kIMCLyIh5e7SKAeUZs+rMnJ8jkMolZ/4/VsdBmMrw3l+VdZ3w==
 
-"@jridgewell/trace-mapping@0.3.9":
-  version "0.3.9"
-  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz#6534fd5933a53ba7cbf3a17615e273a0d1273ff9"
-  integrity sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==
-  dependencies:
-    "@jridgewell/resolve-uri" "^3.0.3"
-    "@jridgewell/sourcemap-codec" "^1.4.10"
-
 "@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.15":
   version "0.3.17"
   resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz#793041277af9073b0951a7fe0f0d8c4c98c36985"
@@ -2356,26 +2341,6 @@
   resolved "https://registry.yarnpkg.com/@transloadit/prettier-bytes/-/prettier-bytes-0.0.7.tgz#cdb5399f445fdd606ed833872fa0cabdbc51686b"
   integrity sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==
 
-"@tsconfig/node10@^1.0.7":
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.9.tgz#df4907fc07a886922637b15e02d4cebc4c0021b2"
-  integrity sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==
-
-"@tsconfig/node12@^1.0.7":
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/@tsconfig/node12/-/node12-1.0.11.tgz#ee3def1f27d9ed66dac6e46a295cffb0152e058d"
-  integrity sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==
-
-"@tsconfig/node14@^1.0.0":
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/@tsconfig/node14/-/node14-1.0.3.tgz#e4386316284f00b98435bf40f72f75a09dabf6c1"
-  integrity sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==
-
-"@tsconfig/node16@^1.0.2":
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.4.tgz#0b92dcc0cc1c81f6f306a381f28e31b1a56536e9"
-  integrity sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==
-
 "@types/babel__core@^7.1.14":
   version "7.20.0"
   resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.20.0.tgz#61bc5a4cae505ce98e1e36c5445e4bee060d8891"
@@ -2456,6 +2421,14 @@
     expect "^29.0.0"
     pretty-format "^29.0.0"
 
+"@types/jest@^29.4.1":
+  version "29.5.12"
+  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-29.5.12.tgz#7f7dc6eb4cf246d2474ed78744b05d06ce025544"
+  integrity sha512-eDC8bTvT/QhYdxJAulQikueigY5AsdBRH2yDKW3yveW7svY3+DzN84/2NUgkw10RTiJbWqZrTtoGVdYlvFJdLw==
+  dependencies:
+    expect "^29.0.0"
+    pretty-format "^29.0.0"
+
 "@types/json-schema@^7.0.12":
   version "7.0.15"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841"
@@ -2748,11 +2721,6 @@ acorn-jsx@^5.3.2:
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
   integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
 
-acorn-walk@^8.1.1:
-  version "8.2.0"
-  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1"
-  integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==
-
 acorn@^3.0.4:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
@@ -2763,11 +2731,6 @@ acorn@^5.5.0:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.4.tgz#3e8d8a9947d0599a1796d10225d7432f4a4acf5e"
   integrity sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==
 
-acorn@^8.4.1:
-  version "8.8.2"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.2.tgz#1b2f25db02af965399b9776b0c2c391276d37c4a"
-  integrity sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==
-
 acorn@^8.9.0:
   version "8.11.2"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.2.tgz#ca0d78b51895be5390a5903c5b3bdcdaf78ae40b"
@@ -2980,11 +2943,6 @@ are-we-there-yet@~1.1.2:
     delegates "^1.0.0"
     readable-stream "^2.0.6"
 
-arg@^4.1.0:
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089"
-  integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==
-
 argparse@^1.0.7:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
@@ -4437,11 +4395,6 @@ create-hmac@^1.1.3, create-hmac@^1.1.4:
     safe-buffer "^5.0.1"
     sha.js "^2.4.8"
 
-create-require@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333"
-  integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==
-
 cross-spawn@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
@@ -4811,11 +4764,6 @@ diff-sequences@^29.4.2:
   resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-29.4.2.tgz#711fe6bd8a5869fe2539cee4a5152425ff671fda"
   integrity sha512-R6P0Y6PrsH3n4hUXxL3nns0rbRk6Q33js3ygJBeEpbzLzgcNuJ61+u0RXasFpTKISw99TxUzFnumSnRLsjhLaw==
 
-diff@^4.0.1:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
-  integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==
-
 dijkstrajs@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/dijkstrajs/-/dijkstrajs-1.0.1.tgz#d3cd81221e3ea40742cfcde556d4e99e98ddc71b"
@@ -8423,11 +8371,6 @@ make-dir@^3.0.0, make-dir@^3.0.2:
   dependencies:
     semver "^6.0.0"
 
-make-error@^1.1.1:
-  version "1.3.6"
-  resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
-  integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
-
 make-fetch-happen@^5.0.0:
   version "5.0.2"
   resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-5.0.2.tgz#aa8387104f2687edca01c8687ee45013d02d19bd"
@@ -11572,25 +11515,6 @@ ts-api-utils@^1.0.1:
   resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.0.3.tgz#f12c1c781d04427313dbac808f453f050e54a331"
   integrity sha512-wNMeqtMz5NtwpT/UZGY5alT+VoKdSsOOP/kqHFcUW1P/VRhH2wJ48+DN2WwUliNbQ976ETwDL0Ifd2VVvgonvg==
 
-ts-node@^10.9.1:
-  version "10.9.1"
-  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.9.1.tgz#e73de9102958af9e1f0b168a6ff320e25adcff4b"
-  integrity sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==
-  dependencies:
-    "@cspotcode/source-map-support" "^0.8.0"
-    "@tsconfig/node10" "^1.0.7"
-    "@tsconfig/node12" "^1.0.7"
-    "@tsconfig/node14" "^1.0.0"
-    "@tsconfig/node16" "^1.0.2"
-    acorn "^8.4.1"
-    acorn-walk "^8.1.1"
-    arg "^4.1.0"
-    create-require "^1.1.0"
-    diff "^4.0.1"
-    make-error "^1.1.1"
-    v8-compile-cache-lib "^3.0.1"
-    yn "3.1.1"
-
 tsconfig-paths@^3.14.2:
   version "3.14.2"
   resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz#6e32f1f79412decd261f92d633a9dc1cfa99f088"
@@ -11938,11 +11862,6 @@ uuid@^8.3.0:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
   integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
 
-v8-compile-cache-lib@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf"
-  integrity sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==
-
 v8-to-istanbul@^7.0.0:
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-7.1.2.tgz#30898d1a7fa0c84d225a2c1434fb958f290883c1"
@@ -12397,11 +12316,6 @@ yeast@0.1.2:
   resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"
   integrity sha1-AI4G2AlDIMNy28L47XagymyKxBk=
 
-yn@3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50"
-  integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==
-
 yocto-queue@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"

From 0b69ed9966995e07454f3dc258757e7be0bb6fd0 Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Thu, 23 May 2024 11:30:42 +0200
Subject: [PATCH 095/171] Add instructions for running tests to DEVELOPMENT.md

---
 DEVELOPMENT.md | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
index 6589007a..cb7aed62 100644
--- a/DEVELOPMENT.md
+++ b/DEVELOPMENT.md
@@ -32,4 +32,22 @@ When updating the grammar file in `src/grammar/CashScript.g4`, we also need to m
 
 ```bash
 yarn antlr
-``````
+```
+
+## cashscript
+
+### Running tests
+
+By default, running tests in the `cashscript` package uses chipnet contracts, which requires the test accounts to have some chipnet BCH. To run the tests against a local "mock network", you can use the `TESTS_USE_MOCKNET` environment variable.
+
+```bash
+# Run all tests using the mock network
+TESTS_USE_MOCKNET=true yarn test
+```
+
+To run specific tests, you can use the `-t` flag to match the name mentioned in the `it` or `describe` block:
+
+```bash
+# Run all tests in the 'Transaction Builder' describe block (test/e2e/transaction-builder/TransactionBuilder.test.ts)
+yarn test -t 'Transaction Builder'
+```

From 9467ec0ee0478b6ecd366260f707d2c093b72978 Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Thu, 23 May 2024 11:31:07 +0200
Subject: [PATCH 096/171] Extract generateTemplateScenarios in
 LibauthTemplate.ts

---
 packages/cashscript/src/LibauthTemplate.ts | 92 +++++++++++++---------
 1 file changed, 55 insertions(+), 37 deletions(-)

diff --git a/packages/cashscript/src/LibauthTemplate.ts b/packages/cashscript/src/LibauthTemplate.ts
index 7093ba8c..e0267d77 100644
--- a/packages/cashscript/src/LibauthTemplate.ts
+++ b/packages/cashscript/src/LibauthTemplate.ts
@@ -201,13 +201,6 @@ export const buildTemplate = async ({
   const contract = transaction.contract;
   const txHex = transactionHex ?? await transaction.build();
 
-  const libauthTransaction = decodeTransaction(hexToBin(txHex));
-  if (typeof libauthTransaction === 'string') throw Error(libauthTransaction);
-
-  const functionIndex = contract.artifact.abi.findIndex(
-    (func) => func.name === transaction.abiFunction.name,
-  )!;
-
   const hasSignatureTemplates = transaction.inputs.filter((input) => isUtxoP2PKH(input)).length > 0;
 
   const template = {
@@ -220,6 +213,15 @@ export const buildTemplate = async ({
     scripts: generateTemplateScripts(
       contract.artifact, transaction.abiFunction, transaction.encodedFunctionArgs, contract.encodedConstructorArgs,
     ),
+    scenarios: generateTemplateScenarios(
+      transaction,
+      txHex,
+      contract.artifact,
+      transaction.abiFunction,
+      transaction.encodedFunctionArgs,
+      contract.encodedConstructorArgs,
+      hasSignatureTemplates,
+    ),
   } as WalletTemplate;
 
   // add extra variables for the p2pkh utxos spent together with our contract
@@ -250,36 +252,6 @@ export const buildTemplate = async ({
     };
   }
 
-  template.scenarios = {
-    // single scenario to spend out transaction under test given the CashScript parameters provided
-    evaluate_function: {
-      name: 'Evaluate',
-      description: 'An example evaluation where this script execution passes.',
-      data: {
-        // encode values for the variables defined above in `entities` property
-        bytecode: {
-          ...generateTemplateScenarioParametersValues(transaction.abiFunction.inputs, transaction.encodedFunctionArgs),
-          ...generateTemplateScenarioParametersValues(
-            contract.artifact.constructorInputs, contract.encodedConstructorArgs,
-          ),
-        },
-        currentBlockHeight: 2,
-        currentBlockTime: Math.round(+new Date() / 1000),
-        keys: {
-          privateKeys: generateTemplateScenarioKeys(
-            transaction.abiFunction.inputs, transaction.encodedFunctionArgs, hasSignatureTemplates,
-          ),
-        },
-      },
-      transaction: createScenarioTransaction(libauthTransaction, transaction),
-      sourceOutputs: createScenarioSourceOutputs(transaction),
-    },
-  };
-
-  if (contract.artifact.abi.length > 1) {
-    template.scenarios!.evaluate_function!.data!.bytecode!.function_index = functionIndex.toString();
-  }
-
   return template;
 };
 
@@ -395,6 +367,52 @@ const generateTemplateUnlockScript = (
   };
 };
 
+const generateTemplateScenarios = (
+  transaction: Transaction,
+  transactionHex: string,
+  artifact: Artifact,
+  abiFunction: AbiFunction,
+  encodedFunctionArgs: EncodedArgument[],
+  encodedConstructorArgs: EncodedArgument[],
+  hasSignatureTemplates: boolean,
+): WalletTemplate['scenarios'] => {
+  const libauthTransaction = decodeTransaction(hexToBin(transactionHex));
+  if (typeof libauthTransaction === 'string') throw Error(libauthTransaction);
+
+  const scenarios = {
+    // single scenario to spend out transaction under test given the CashScript parameters provided
+    evaluate_function: {
+      name: 'Evaluate',
+      description: 'An example evaluation where this script execution passes.',
+      data: {
+        // encode values for the variables defined above in `entities` property
+        bytecode: {
+          ...generateTemplateScenarioParametersValues(abiFunction.inputs, encodedFunctionArgs),
+          ...generateTemplateScenarioParametersValues(artifact.constructorInputs, encodedConstructorArgs),
+        },
+        // TODO: Don't hardcode these values
+        currentBlockHeight: 2,
+        currentBlockTime: Math.round(+new Date() / 1000),
+        keys: {
+          privateKeys: generateTemplateScenarioKeys(
+            abiFunction.inputs, encodedFunctionArgs, hasSignatureTemplates,
+          ),
+        },
+      },
+      transaction: createScenarioTransaction(libauthTransaction, transaction),
+      sourceOutputs: createScenarioSourceOutputs(transaction),
+    },
+  };
+
+
+  if (artifact.abi.length > 1) {
+    const functionIndex = artifact.abi.findIndex((func) => func.name === transaction.abiFunction.name);
+    scenarios!.evaluate_function!.data!.bytecode!.function_index = functionIndex.toString();
+  }
+
+  return scenarios;
+};
+
 const generateTemplateScenarioParametersValues = (
   types: AbiInput[],
   encodedArgs: EncodedArgument[],

From b05cd4d86f6ed1459112476bc0c4db4c4f73c612 Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Thu, 23 May 2024 12:07:48 +0200
Subject: [PATCH 097/171] Refactor createScenarioSourceOutputs

---
 packages/cashscript/src/LibauthTemplate.ts | 293 ++++++++++-----------
 1 file changed, 140 insertions(+), 153 deletions(-)

diff --git a/packages/cashscript/src/LibauthTemplate.ts b/packages/cashscript/src/LibauthTemplate.ts
index e0267d77..127faf9c 100644
--- a/packages/cashscript/src/LibauthTemplate.ts
+++ b/packages/cashscript/src/LibauthTemplate.ts
@@ -36,158 +36,6 @@ import { Transaction } from './Transaction.js';
 import { EncodedArgument } from './Argument.js';
 import { extendedStringify, snakeCase, zip } from './utils.js';
 
-const createScenarioTransaction = (libauthTransaction: TransactionBCH, csTransaction: Transaction): WalletTemplateScenario['transaction'] => {
-  const contract = csTransaction.contract;
-  const result = ({} as WalletTemplateScenario['transaction'])!;
-
-  // only one 'slot' is allowed, otherwise {} must be used
-  let inputSlotInserted = false;
-  result.inputs = libauthTransaction.inputs.map((input, index) => {
-    const csInput = csTransaction.inputs[index] as Utxo;
-    const signable = isUtxoP2PKH(csInput);
-    let unlockingBytecode = {};
-    if (signable) {
-      unlockingBytecode = {
-        script: 'p2pkh_placeholder_unlock',
-        overrides: {
-          keys: {
-            privateKeys: {
-              placeholder_key: binToHex((csInput as UtxoP2PKH).template.privateKey),
-            },
-          },
-        },
-      };
-    } else {
-      // assume it is our contract's input
-      // eslint-disable-next-line
-      if (!inputSlotInserted) {
-        unlockingBytecode = ['slot'];
-        inputSlotInserted = true;
-      }
-    }
-    return {
-      outpointIndex: input.outpointIndex,
-      outpointTransactionHash:
-        input.outpointTransactionHash instanceof Uint8Array
-          ? binToHex(input.outpointTransactionHash)
-          : input.outpointTransactionHash,
-      sequenceNumber: input.sequenceNumber,
-      unlockingBytecode,
-    } as WalletTemplateScenarioInput;
-  });
-  result.locktime = libauthTransaction.locktime;
-
-  result.outputs = libauthTransaction.outputs.map(
-    (output: LibauthOutput, index) => {
-      const csOutput = csTransaction.outputs[index];
-      let { lockingBytecode }: any = output;
-      if (typeof csOutput.to === 'string') {
-        if (
-          [
-            contract.address,
-            contract.tokenAddress,
-          ].includes(csOutput.to)
-        ) {
-          lockingBytecode = {};
-        } else {
-          for (const csInput of csTransaction.inputs) {
-            if (isUtxoP2PKH(csInput)) {
-              const inputPkh = hash160(csInput.template.getPublicKey());
-              if (
-                binToHex(output.lockingBytecode).slice(6, 46)
-                === binToHex(inputPkh)
-              ) {
-                lockingBytecode = {
-                  script: 'p2pkh_placeholder_lock',
-                  overrides: {
-                    keys: {
-                      privateKeys: {
-                        placeholder_key: binToHex(
-                          csInput.template.privateKey,
-                        ),
-                      },
-                    },
-                  },
-                };
-              }
-            }
-          }
-        }
-      }
-      return {
-        lockingBytecode:
-          lockingBytecode instanceof Uint8Array
-            ? binToHex(lockingBytecode)
-            : lockingBytecode,
-        token: output.token ? {
-          amount: output.token.amount.toString(),
-          category: binToHex(output.token.category),
-          nft: output.token.nft ? {
-            capability: output.token.nft.capability,
-            commitment: binToHex(output.token.nft.commitment),
-          } : undefined,
-        } : undefined,
-        valueSatoshis: Number(output.valueSatoshis),
-      } as WalletTemplateScenarioTransactionOutput;
-    },
-  );
-  result.version = libauthTransaction.version;
-  return result;
-};
-
-const createScenarioSourceOutputs = (csTransaction: Transaction): Array<WalletTemplateScenarioOutput<true>> => {
-  // only one 'slot' is allowed, otherwise {} must be used
-  let inputSlotInserted = false;
-  return csTransaction.inputs.map(
-    (csInput) => {
-      const signable = isUtxoP2PKH(csInput);
-      let lockingBytecode = {} as WalletTemplateScenarioOutput<true>['lockingBytecode'];
-      if (signable) {
-        lockingBytecode = {
-          script: 'p2pkh_placeholder_lock',
-          overrides: {
-            keys: {
-              privateKeys: {
-                placeholder_key: binToHex(
-                  csInput.template.privateKey,
-                ),
-              },
-            },
-          },
-        };
-      } else {
-        // assume it is our contract's input
-        // eslint-disable-next-line
-        if (!inputSlotInserted) {
-          lockingBytecode = ['slot'];
-          inputSlotInserted = true;
-        }
-      }
-
-      const result = {
-        lockingBytecode: lockingBytecode,
-        valueSatoshis: Number(csInput.satoshis),
-      } as WalletTemplateScenarioOutput<true>;
-
-      if (csInput.token) {
-        result.token = {
-          amount: csInput.token.amount.toString(),
-          category: csInput.token.category,
-        };
-
-        if (csInput.token.nft) {
-          result.token.nft = {
-            capability: csInput.token.nft.capability,
-            commitment: csInput.token.nft.commitment,
-          };
-        }
-      }
-
-      return result;
-    },
-  );
-};
-
 interface BuildTemplateOptions {
   transaction: Transaction;
   transactionHex?: string;
@@ -400,7 +248,7 @@ const generateTemplateScenarios = (
         },
       },
       transaction: createScenarioTransaction(libauthTransaction, transaction),
-      sourceOutputs: createScenarioSourceOutputs(transaction),
+      sourceOutputs: generateScenarioSourceOutputs(transaction),
     },
   };
 
@@ -413,6 +261,145 @@ const generateTemplateScenarios = (
   return scenarios;
 };
 
+const createScenarioTransaction = (libauthTransaction: TransactionBCH, csTransaction: Transaction): WalletTemplateScenario['transaction'] => {
+  const contract = csTransaction.contract;
+  const result = ({} as WalletTemplateScenario['transaction'])!;
+
+  // only one 'slot' is allowed, otherwise {} must be used
+  let inputSlotInserted = false;
+  result.inputs = libauthTransaction.inputs.map((input, index) => {
+    const csInput = csTransaction.inputs[index] as Utxo;
+    const signable = isUtxoP2PKH(csInput);
+    let unlockingBytecode = {};
+    if (signable) {
+      unlockingBytecode = {
+        script: 'p2pkh_placeholder_unlock',
+        overrides: {
+          keys: {
+            privateKeys: {
+              placeholder_key: binToHex((csInput as UtxoP2PKH).template.privateKey),
+            },
+          },
+        },
+      };
+    } else {
+      // assume it is our contract's input
+      // eslint-disable-next-line
+      if (!inputSlotInserted) {
+        unlockingBytecode = ['slot'];
+        inputSlotInserted = true;
+      }
+    }
+    return {
+      outpointIndex: input.outpointIndex,
+      outpointTransactionHash:
+        input.outpointTransactionHash instanceof Uint8Array
+          ? binToHex(input.outpointTransactionHash)
+          : input.outpointTransactionHash,
+      sequenceNumber: input.sequenceNumber,
+      unlockingBytecode,
+    } as WalletTemplateScenarioInput;
+  });
+  result.locktime = libauthTransaction.locktime;
+
+  result.outputs = libauthTransaction.outputs.map(
+    (output: LibauthOutput, index) => {
+      const csOutput = csTransaction.outputs[index];
+      let { lockingBytecode }: any = output;
+      if (typeof csOutput.to === 'string') {
+        if (
+          [
+            contract.address,
+            contract.tokenAddress,
+          ].includes(csOutput.to)
+        ) {
+          lockingBytecode = {};
+        } else {
+          for (const csInput of csTransaction.inputs) {
+            if (isUtxoP2PKH(csInput)) {
+              const inputPkh = hash160(csInput.template.getPublicKey());
+              if (
+                binToHex(output.lockingBytecode).slice(6, 46)
+                === binToHex(inputPkh)
+              ) {
+                lockingBytecode = {
+                  script: 'p2pkh_placeholder_lock',
+                  overrides: {
+                    keys: {
+                      privateKeys: {
+                        placeholder_key: binToHex(
+                          csInput.template.privateKey,
+                        ),
+                      },
+                    },
+                  },
+                };
+              }
+            }
+          }
+        }
+      }
+      return {
+        lockingBytecode:
+          lockingBytecode instanceof Uint8Array
+            ? binToHex(lockingBytecode)
+            : lockingBytecode,
+        token: output.token ? {
+          amount: output.token.amount.toString(),
+          category: binToHex(output.token.category),
+          nft: output.token.nft ? {
+            capability: output.token.nft.capability,
+            commitment: binToHex(output.token.nft.commitment),
+          } : undefined,
+        } : undefined,
+        valueSatoshis: Number(output.valueSatoshis),
+      } as WalletTemplateScenarioTransactionOutput;
+    },
+  );
+  result.version = libauthTransaction.version;
+  return result;
+};
+
+const generateScenarioSourceOutputs = (csTransaction: Transaction): Array<WalletTemplateScenarioOutput<true>> => {
+  const slotIndex = csTransaction.inputs.findIndex((input) => !isUtxoP2PKH(input));
+
+  return csTransaction.inputs.map((input, index) => {
+    const lockingBytecode = generateTemplateScenarioSourceOutputLockingBytecode(input, index === slotIndex);
+    const valueSatoshis = Number(input.satoshis);
+
+    if (input.token) {
+      const token = {
+        amount: input.token.amount.toString(),
+        category: input.token.category,
+        nft: input.token.nft,
+      };
+
+      return { lockingBytecode, valueSatoshis, token };
+    }
+
+    return { lockingBytecode, valueSatoshis };
+  });
+};
+
+const generateTemplateScenarioSourceOutputLockingBytecode = (
+  input: Utxo, insertSlot?: boolean,
+): WalletTemplateScenarioOutput<true>['lockingBytecode'] => {
+  if (isUtxoP2PKH(input)) {
+    return {
+      script: 'p2pkh_placeholder_lock',
+      overrides: {
+        keys: {
+          privateKeys: {
+            placeholder_key: binToHex(input.template.privateKey),
+          },
+        },
+      },
+    };
+  }
+
+  return insertSlot ? ['slot'] : {};
+};
+
 const generateTemplateScenarioParametersValues = (
   types: AbiInput[],
   encodedArgs: EncodedArgument[],

From 287e57300faa809581dc15bc0d310271973753e9 Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Tue, 28 May 2024 10:50:25 +0200
Subject: [PATCH 098/171] Refactor createScenarioTransaction

We simplified the transaction outputs by just encoding the output's
address as a lock script, rather than using `{}` or the P2PKH script.
This caused some issues due to Libauth's incorrect handling (or not
handling) P2SH32 lock scripts. This should be addressed before release.
---
 packages/cashscript/src/LibauthTemplate.ts    | 190 +++++++-----------
 packages/cashscript/src/debugging.ts          |   4 +-
 .../test/fixture/libauth-template/fixtures.ts |  26 +--
 3 files changed, 93 insertions(+), 127 deletions(-)

diff --git a/packages/cashscript/src/LibauthTemplate.ts b/packages/cashscript/src/LibauthTemplate.ts
index 127faf9c..fa4dd447 100644
--- a/packages/cashscript/src/LibauthTemplate.ts
+++ b/packages/cashscript/src/LibauthTemplate.ts
@@ -7,7 +7,6 @@ import {
   formatBitAuthScript,
 } from '@cashscript/utils';
 import {
-  hash160,
   hexToBin,
   WalletTemplateScenarioTransactionOutput,
   WalletTemplateScenario,
@@ -23,18 +22,20 @@ import {
   WalletTemplateVariable,
   WalletTemplateScriptLocking,
   WalletTemplateScriptUnlocking,
+  WalletTemplateScenarioBytecode,
 } from '@bitauth/libauth';
 import { deflate } from 'pako';
 import {
-  UtxoP2PKH,
-  LibauthOutput,
   Utxo,
   isUtxoP2PKH,
+  TokenDetails,
+  LibauthTokenDetails,
+  Output,
 } from './interfaces.js';
 import SignatureTemplate from './SignatureTemplate.js';
 import { Transaction } from './Transaction.js';
 import { EncodedArgument } from './Argument.js';
-import { extendedStringify, snakeCase, zip } from './utils.js';
+import { addressToLockScript, extendedStringify, snakeCase, zip } from './utils.js';
 
 interface BuildTemplateOptions {
   transaction: Transaction;
@@ -247,8 +248,8 @@ const generateTemplateScenarios = (
           ),
         },
       },
-      transaction: createScenarioTransaction(libauthTransaction, transaction),
-      sourceOutputs: generateScenarioSourceOutputs(transaction),
+      transaction: generateTemplateScenarioTransaction(libauthTransaction, transaction),
+      sourceOutputs: generateTemplateScenarioSourceOutputs(transaction),
     },
   };
 
@@ -261,132 +262,72 @@ const generateTemplateScenarios = (
   return scenarios;
 };
 
-const createScenarioTransaction = (libauthTransaction: TransactionBCH, csTransaction: Transaction): WalletTemplateScenario['transaction'] => {
-  const contract = csTransaction.contract;
-  const result = ({} as WalletTemplateScenario['transaction'])!;
-
-  // only one 'slot' is allowed, otherwise {} must be used
-  let inputSlotInserted = false;
-  result.inputs = libauthTransaction.inputs.map((input, index) => {
-    const csInput = csTransaction.inputs[index] as Utxo;
-    const signable = isUtxoP2PKH(csInput);
-    let unlockingBytecode = {};
-    if (signable) {
-      unlockingBytecode = {
-        script: 'p2pkh_placeholder_unlock',
-        overrides: {
-          keys: {
-            privateKeys: {
-              placeholder_key: binToHex((csInput as UtxoP2PKH).template.privateKey),
-            },
-          },
-        },
-      };
-    } else {
-      // assume it is our contract's input
-      // eslint-disable-next-line
-      if (!inputSlotInserted) {
-        unlockingBytecode = ['slot'];
-        inputSlotInserted = true;
-      }
-    }
+const generateTemplateScenarioTransaction = (
+  libauthTransaction: TransactionBCH,
+  csTransaction: Transaction,
+): WalletTemplateScenario['transaction'] => {
+  const slotIndex = csTransaction.inputs.findIndex((input) => !isUtxoP2PKH(input));
+
+  const inputs = libauthTransaction.inputs.map((input, index) => {
+    const csInput = csTransaction.inputs[index] as Utxo; // TODO: Change
+
     return {
       outpointIndex: input.outpointIndex,
       outpointTransactionHash:
+      // TODO: This should always be Uint8Array according to the libauth transaction types
         input.outpointTransactionHash instanceof Uint8Array
           ? binToHex(input.outpointTransactionHash)
           : input.outpointTransactionHash,
       sequenceNumber: input.sequenceNumber,
-      unlockingBytecode,
+      unlockingBytecode: generateTemplateScenarioBytecode(csInput, 'p2pkh_placeholder_unlock', index === slotIndex),
     } as WalletTemplateScenarioInput;
   });
-  result.locktime = libauthTransaction.locktime;
-
-  result.outputs = libauthTransaction.outputs.map(
-    (output: LibauthOutput, index) => {
-      const csOutput = csTransaction.outputs[index];
-      let { lockingBytecode }: any = output;
-      if (typeof csOutput.to === 'string') {
-        if (
-          [
-            contract.address,
-            contract.tokenAddress,
-          ].includes(csOutput.to)
-        ) {
-          lockingBytecode = {};
-        } else {
-          for (const csInput of csTransaction.inputs) {
-            if (isUtxoP2PKH(csInput)) {
-              const inputPkh = hash160(csInput.template.getPublicKey());
-              if (
-                binToHex(output.lockingBytecode).slice(6, 46)
-                === binToHex(inputPkh)
-              ) {
-                lockingBytecode = {
-                  script: 'p2pkh_placeholder_lock',
-                  overrides: {
-                    keys: {
-                      privateKeys: {
-                        placeholder_key: binToHex(
-                          csInput.template.privateKey,
-                        ),
-                      },
-                    },
-                  },
-                };
-              }
-            }
-          }
-        }
-      }
-      return {
-        lockingBytecode:
-          lockingBytecode instanceof Uint8Array
-            ? binToHex(lockingBytecode)
-            : lockingBytecode,
-        token: output.token ? {
-          amount: output.token.amount.toString(),
-          category: binToHex(output.token.category),
-          nft: output.token.nft ? {
-            capability: output.token.nft.capability,
-            commitment: binToHex(output.token.nft.commitment),
-          } : undefined,
-        } : undefined,
-        valueSatoshis: Number(output.valueSatoshis),
-      } as WalletTemplateScenarioTransactionOutput;
-    },
-  );
-  result.version = libauthTransaction.version;
-  return result;
-};
 
-const generateScenarioSourceOutputs = (csTransaction: Transaction): Array<WalletTemplateScenarioOutput<true>> => {
-  const slotIndex = csTransaction.inputs.findIndex((input) => !isUtxoP2PKH(input));
+  const locktime = libauthTransaction.locktime;
 
-  return csTransaction.inputs.map((input, index) => {
-    const lockingBytecode = generateTemplateScenarioSourceOutputLockingBytecode(input, index === slotIndex);
-    const valueSatoshis = Number(input.satoshis);
+  const outputs = libauthTransaction.outputs.map((output, index) => {
+    const csOutput = csTransaction.outputs[index]; // TODO: Change
+
+    return {
+      lockingBytecode: generateTemplateScenarioTransactionOutputLockingBytecode(csOutput),
+      token: serialiseTokenDetails(output.token),
+      valueSatoshis: Number(output.valueSatoshis),
+    } as WalletTemplateScenarioTransactionOutput;
+  });
 
-    if (input.token) {
-      const token = {
-        amount: input.token.amount.toString(),
-        category: input.token.category,
-        nft: input.token.nft,
-      };
+  const version = libauthTransaction.version;
 
-      return { lockingBytecode, valueSatoshis, token };
-    }
+  return { inputs, locktime, outputs, version };
+};
 
-    return { lockingBytecode, valueSatoshis };
+const generateTemplateScenarioTransactionOutputLockingBytecode = (
+  csOutput: Output,
+): string => {
+  if (csOutput.to instanceof Uint8Array) return binToHex(csOutput.to);
+  return binToHex(addressToLockScript(csOutput.to));
+};
+
+const generateTemplateScenarioSourceOutputs = (
+  csTransaction: Transaction,
+): Array<WalletTemplateScenarioOutput<true>> => {
+  const slotIndex = csTransaction.inputs.findIndex((input) => !isUtxoP2PKH(input));
+
+  return csTransaction.inputs.map((input, index) => {
+    return {
+      lockingBytecode: generateTemplateScenarioBytecode(input, 'p2pkh_placeholder_lock', index === slotIndex),
+      valueSatoshis: Number(input.satoshis),
+      token: serialiseTokenDetails(input.token),
+    };
   });
 };
 
-const generateTemplateScenarioSourceOutputLockingBytecode = (
-  input: Utxo, insertSlot?: boolean,
-): WalletTemplateScenarioOutput<true>['lockingBytecode'] => {
+// Used for generating the locking / unlocking bytecode for source outputs and inputs
+const generateTemplateScenarioBytecode = (
+  input: Utxo, p2pkhScriptName: string, insertSlot?: boolean,
+): WalletTemplateScenarioBytecode | ['slot'] => {
   if (isUtxoP2PKH(input)) {
     return {
-      script: 'p2pkh_placeholder_lock',
+      script: p2pkhScriptName,
       overrides: {
         keys: {
           privateKeys: {
@@ -472,3 +413,26 @@ const formatBytecodeForDebugging = (artifact: Artifact): string => {
     artifact.source,
   );
 };
+
+// TODO: Maybe move / refactor
+const serialiseTokenDetails = (token?: TokenDetails | LibauthTokenDetails): LibauthTemplateTokenDetails | undefined => {
+  if (!token) return undefined;
+
+  return {
+    amount: token.amount.toString(),
+    category: token.category instanceof Uint8Array ? binToHex(token.category) : token.category,
+    nft: token.nft ? {
+      capability: token.nft.capability,
+      commitment: token.nft.commitment instanceof Uint8Array ? binToHex(token.nft.commitment) : token.nft.commitment,
+    } : undefined,
+  };
+};
+
+export interface LibauthTemplateTokenDetails {
+  amount: string;
+  category: string;
+  nft?: {
+    capability: 'none' | 'mutable' | 'minting';
+    commitment: string;
+  };
+}
diff --git a/packages/cashscript/src/debugging.ts b/packages/cashscript/src/debugging.ts
index 1f06947d..0c4ea3f3 100644
--- a/packages/cashscript/src/debugging.ts
+++ b/packages/cashscript/src/debugging.ts
@@ -91,7 +91,9 @@ type CreateProgramResult = { vm: VM, program: Program };
 // internal util. instantiates the virtual machine and compiles the template into a program
 const createProgram = (template: WalletTemplate): CreateProgramResult => {
   const configuration = walletTemplateToCompilerConfiguration(template);
-  const vm = createVirtualMachineBCHCHIPs();
+  // TODO: We disabled standardness checks due to an issue with Libauth (https://github.com/bitauth/libauth/issues/133).
+  // We should re-enable this once the issue is resolved.
+  const vm = createVirtualMachineBCHCHIPs(false);
   const compiler = createCompiler(configuration);
 
   const scenarioGeneration = compiler.generateScenario({
diff --git a/packages/cashscript/test/fixture/libauth-template/fixtures.ts b/packages/cashscript/test/fixture/libauth-template/fixtures.ts
index c950f999..73c2b8f5 100644
--- a/packages/cashscript/test/fixture/libauth-template/fixtures.ts
+++ b/packages/cashscript/test/fixture/libauth-template/fixtures.ts
@@ -106,7 +106,7 @@ export const fixtures: Fixture[] = [
             'locktime': expect.any(Number),
             'outputs': [
               {
-                'lockingBytecode': {},
+                'lockingBytecode': 'aa203f567c4556a3b1fe2d6dd250ee07a939c54f22ce4cb87fb0581800063eaca0b187',
                 'valueSatoshis': 10000,
               },
             ],
@@ -230,7 +230,7 @@ export const fixtures: Fixture[] = [
             'locktime': expect.any(Number),
             'outputs': [
               {
-                'lockingBytecode': {},
+                'lockingBytecode': 'aa203f567c4556a3b1fe2d6dd250ee07a939c54f22ce4cb87fb0581800063eaca0b187',
                 'valueSatoshis': 10000,
               },
             ],
@@ -351,7 +351,7 @@ export const fixtures: Fixture[] = [
                 'valueSatoshis': 10000,
               },
               {
-                'lockingBytecode': {},
+                'lockingBytecode': 'aa209c6c87b192226fa02ed3834607a94a6ea040acc59df983c49a648406c695816b87',
                 'valueSatoshis': expect.any(Number),
               },
             ],
@@ -477,7 +477,7 @@ export const fixtures: Fixture[] = [
             'locktime': 133700,
             'outputs': [
               {
-                'lockingBytecode': {},
+                'lockingBytecode': 'aa2034d9ffce86b4d136ca74e9db6f6433d3548966a6be064052e728a4c1d16aa3a587',
                 'token': {
                   'amount': expect.stringMatching(/^[0-9]+$/),
                   'category': expect.stringMatching(/^[0-9a-f]{64}$/),
@@ -485,7 +485,7 @@ export const fixtures: Fixture[] = [
                 'valueSatoshis': 1000,
               },
               {
-                'lockingBytecode': {},
+                'lockingBytecode': 'aa2034d9ffce86b4d136ca74e9db6f6433d3548966a6be064052e728a4c1d16aa3a587',
                 'valueSatoshis': expect.any(Number),
               },
             ],
@@ -610,11 +610,11 @@ export const fixtures: Fixture[] = [
             'locktime': 133700,
             'outputs': [
               {
-                'lockingBytecode': {},
+                'lockingBytecode': 'aa2034d9ffce86b4d136ca74e9db6f6433d3548966a6be064052e728a4c1d16aa3a587',
                 'valueSatoshis': 1000,
               },
               {
-                'lockingBytecode': {},
+                'lockingBytecode': 'aa2034d9ffce86b4d136ca74e9db6f6433d3548966a6be064052e728a4c1d16aa3a587',
                 'valueSatoshis': expect.any(Number),
               },
             ],
@@ -740,7 +740,7 @@ export const fixtures: Fixture[] = [
             'locktime': 133700,
             'outputs': [
               {
-                'lockingBytecode': {},
+                'lockingBytecode': 'aa2034d9ffce86b4d136ca74e9db6f6433d3548966a6be064052e728a4c1d16aa3a587',
                 'token': {
                   'amount': '0',
                   'category': expect.stringMatching(/^[0-9a-f]{64}$/),
@@ -752,7 +752,7 @@ export const fixtures: Fixture[] = [
                 'valueSatoshis': 1000,
               },
               {
-                'lockingBytecode': {},
+                'lockingBytecode': 'aa2034d9ffce86b4d136ca74e9db6f6433d3548966a6be064052e728a4c1d16aa3a587',
                 'valueSatoshis': expect.any(Number),
               },
             ],
@@ -906,11 +906,11 @@ export const fixtures: Fixture[] = [
             'locktime': 133700,
             'outputs': [
               {
-                'lockingBytecode': {},
+                'lockingBytecode': 'aa202b9369ac73606fc710cb756d82807e45e283bbf2a642df014bfce7a1c749c5e087',
                 'valueSatoshis': 10000,
               },
               {
-                'lockingBytecode': {},
+                'lockingBytecode': 'aa202b9369ac73606fc710cb756d82807e45e283bbf2a642df014bfce7a1c749c5e087',
                 'valueSatoshis': expect.any(Number),
               },
             ],
@@ -1075,11 +1075,11 @@ export const fixtures: Fixture[] = [
             'locktime': 133700,
             'outputs': [
               {
-                'lockingBytecode': {},
+                'lockingBytecode': 'aa2034d9ffce86b4d136ca74e9db6f6433d3548966a6be064052e728a4c1d16aa3a587',
                 'valueSatoshis': 1000,
               },
               {
-                'lockingBytecode': {},
+                'lockingBytecode': 'aa2034d9ffce86b4d136ca74e9db6f6433d3548966a6be064052e728a4c1d16aa3a587',
                 'valueSatoshis': expect.any(Number),
               },
             ],

From 5e30b90adc57b38b88b6dd86af8094b5f0d89517 Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Tue, 28 May 2024 11:38:26 +0200
Subject: [PATCH 099/171] Move to BCH_2023_05 VM (which supports P2SH32) +
 rollback one of the refactors that caused issues with change outputs

---
 packages/cashscript/src/Contract.ts           |  3 +-
 packages/cashscript/src/LibauthTemplate.ts    | 27 ++++++---
 packages/cashscript/src/debugging.ts          | 12 ++--
 packages/cashscript/src/interfaces.ts         |  4 +-
 packages/cashscript/src/utils.ts              |  7 ++-
 .../test/fixture/libauth-template/fixtures.ts | 58 +++++++++----------
 6 files changed, 64 insertions(+), 47 deletions(-)

diff --git a/packages/cashscript/src/Contract.ts b/packages/cashscript/src/Contract.ts
index 2bffa792..1efefc13 100644
--- a/packages/cashscript/src/Contract.ts
+++ b/packages/cashscript/src/Contract.ts
@@ -14,6 +14,7 @@ import { Transaction } from './Transaction.js';
 import { Argument, encodeArgument, encodeConstructorArguments, encodeFunctionArguments } from './Argument.js';
 import {
   Unlocker, ContractOptions, GenerateUnlockingBytecodeOptions, Utxo,
+  AddressType,
 } from './interfaces.js';
 import NetworkProvider from './network/NetworkProvider.js';
 import {
@@ -35,7 +36,7 @@ export class Contract {
 
   redeemScript: Script;
   public provider: NetworkProvider;
-  public addressType: 'p2sh20' | 'p2sh32';
+  public addressType: AddressType;
   public encodedConstructorArgs: Uint8Array[];
 
   constructor(
diff --git a/packages/cashscript/src/LibauthTemplate.ts b/packages/cashscript/src/LibauthTemplate.ts
index fa4dd447..38d3650c 100644
--- a/packages/cashscript/src/LibauthTemplate.ts
+++ b/packages/cashscript/src/LibauthTemplate.ts
@@ -31,11 +31,13 @@ import {
   TokenDetails,
   LibauthTokenDetails,
   Output,
+  AddressType,
 } from './interfaces.js';
 import SignatureTemplate from './SignatureTemplate.js';
 import { Transaction } from './Transaction.js';
 import { EncodedArgument } from './Argument.js';
 import { addressToLockScript, extendedStringify, snakeCase, zip } from './utils.js';
+import { Contract } from './Contract.js';
 
 interface BuildTemplateOptions {
   transaction: Transaction;
@@ -56,13 +58,18 @@ export const buildTemplate = async ({
     $schema: 'https://ide.bitauth.com/authentication-template-v0.schema.json',
     description: 'Imported from cashscript',
     name: contract.artifact.contractName,
-    supported: ['BCH_SPEC'],
+    supported: ['BCH_2023_05'],
     version: 0,
     entities: generateTemplateEntities(contract.artifact, transaction.abiFunction),
     scripts: generateTemplateScripts(
-      contract.artifact, transaction.abiFunction, transaction.encodedFunctionArgs, contract.encodedConstructorArgs,
+      contract.artifact,
+      contract.addressType,
+      transaction.abiFunction,
+      transaction.encodedFunctionArgs,
+      contract.encodedConstructorArgs,
     ),
     scenarios: generateTemplateScenarios(
+      contract,
       transaction,
       txHex,
       contract.artifact,
@@ -163,6 +170,7 @@ const generateTemplateEntities = (artifact: Artifact, abiFunction: AbiFunction):
 
 const generateTemplateScripts = (
   artifact: Artifact,
+  addressType: AddressType,
   abiFunction: AbiFunction,
   encodedFunctionArgs: EncodedArgument[],
   encodedConstructorArgs: EncodedArgument[],
@@ -170,16 +178,17 @@ const generateTemplateScripts = (
   // definition of locking scripts and unlocking scripts with their respective bytecode
   return {
     unlock_lock: generateTemplateUnlockScript(artifact, abiFunction, encodedFunctionArgs),
-    lock: generateTemplateLockScript(artifact, encodedConstructorArgs),
+    lock: generateTemplateLockScript(artifact, addressType, encodedConstructorArgs),
   };
 };
 
 const generateTemplateLockScript = (
   artifact: Artifact,
+  addressType: AddressType,
   constructorArguments: EncodedArgument[],
 ): WalletTemplateScriptLocking => {
   return {
-    lockingType: 'p2sh20', // TODO: use 'transaction.contract.addressType',
+    lockingType: addressType,
     name: 'lock',
     script: [
       `// "${artifact.contractName}" contract constructor parameters`,
@@ -217,6 +226,7 @@ const generateTemplateUnlockScript = (
 };
 
 const generateTemplateScenarios = (
+  contract: Contract,
   transaction: Transaction,
   transactionHex: string,
   artifact: Artifact,
@@ -248,7 +258,7 @@ const generateTemplateScenarios = (
           ),
         },
       },
-      transaction: generateTemplateScenarioTransaction(libauthTransaction, transaction),
+      transaction: generateTemplateScenarioTransaction(contract, libauthTransaction, transaction),
       sourceOutputs: generateTemplateScenarioSourceOutputs(transaction),
     },
   };
@@ -263,6 +273,7 @@ const generateTemplateScenarios = (
 };
 
 const generateTemplateScenarioTransaction = (
+  contract: Contract,
   libauthTransaction: TransactionBCH,
   csTransaction: Transaction,
 ): WalletTemplateScenario['transaction'] => {
@@ -289,7 +300,7 @@ const generateTemplateScenarioTransaction = (
     const csOutput = csTransaction.outputs[index]; // TODO: Change
 
     return {
-      lockingBytecode: generateTemplateScenarioTransactionOutputLockingBytecode(csOutput),
+      lockingBytecode: generateTemplateScenarioTransactionOutputLockingBytecode(csOutput, contract),
       token: serialiseTokenDetails(output.token),
       valueSatoshis: Number(output.valueSatoshis),
     } as WalletTemplateScenarioTransactionOutput;
@@ -302,8 +313,10 @@ const generateTemplateScenarioTransaction = (
 
 const generateTemplateScenarioTransactionOutputLockingBytecode = (
   csOutput: Output,
-): string => {
+  contract: Contract,
+): string | {} => {
   if (csOutput.to instanceof Uint8Array) return binToHex(csOutput.to);
+  if ([contract.address, contract.tokenAddress].includes(csOutput.to)) return {};
   return binToHex(addressToLockScript(csOutput.to));
 };
 
diff --git a/packages/cashscript/src/debugging.ts b/packages/cashscript/src/debugging.ts
index 0c4ea3f3..62ce9c86 100644
--- a/packages/cashscript/src/debugging.ts
+++ b/packages/cashscript/src/debugging.ts
@@ -1,4 +1,4 @@
-import { AuthenticationErrorCommon, AuthenticationInstruction, AuthenticationProgramCommon, AuthenticationProgramStateBCHCHIPs, AuthenticationVirtualMachine, ResolvedTransactionCommon, WalletTemplate, binToHex, createCompiler, createVirtualMachineBCHCHIPs, walletTemplateToCompilerConfiguration } from '@bitauth/libauth';
+import { AuthenticationErrorCommon, AuthenticationInstruction, AuthenticationProgramCommon, AuthenticationProgramStateBCH, AuthenticationProgramStateCommon, AuthenticationVirtualMachine, ResolvedTransactionCommon, WalletTemplate, binToHex, createCompiler, createVirtualMachineBCH2023, walletTemplateToCompilerConfiguration } from '@bitauth/libauth';
 import { Artifact, LogData, LogEntry, Op, PrimitiveType, decodeBool, decodeInt, decodeString } from '@cashscript/utils';
 import { findLastIndex, toRegExp } from './utils.js';
 
@@ -14,7 +14,7 @@ export const evaluateTemplate = (template: WalletTemplate): boolean => {
   return verifyResult;
 };
 
-export type DebugResult = AuthenticationProgramStateBCHCHIPs[];
+export type DebugResult = AuthenticationProgramStateCommon[];
 
 // debugs the template, optionally logging the execution data
 export const debugTemplate = (template: WalletTemplate, artifact: Artifact): DebugResult => {
@@ -83,7 +83,7 @@ export const debugTemplate = (template: WalletTemplate, artifact: Artifact): Deb
 type VM = AuthenticationVirtualMachine<
 ResolvedTransactionCommon,
 AuthenticationProgramCommon,
-AuthenticationProgramStateBCHCHIPs
+AuthenticationProgramStateBCH
 >;
 type Program = AuthenticationProgramCommon;
 type CreateProgramResult = { vm: VM, program: Program };
@@ -91,9 +91,7 @@ type CreateProgramResult = { vm: VM, program: Program };
 // internal util. instantiates the virtual machine and compiles the template into a program
 const createProgram = (template: WalletTemplate): CreateProgramResult => {
   const configuration = walletTemplateToCompilerConfiguration(template);
-  // TODO: We disabled standardness checks due to an issue with Libauth (https://github.com/bitauth/libauth/issues/133).
-  // We should re-enable this once the issue is resolved.
-  const vm = createVirtualMachineBCHCHIPs(false);
+  const vm = createVirtualMachineBCH2023();
   const compiler = createCompiler(configuration);
 
   const scenarioGeneration = compiler.generateScenario({
@@ -116,7 +114,7 @@ const createProgram = (template: WalletTemplate): CreateProgramResult => {
 
 const logConsoleLogStatement = (
   log: LogEntry,
-  debugStep: AuthenticationProgramStateBCHCHIPs,
+  debugStep: AuthenticationProgramStateCommon,
   artifact: Artifact,
 ): void => {
   let line = `${artifact.contractName}.cash:${log.line}`;
diff --git a/packages/cashscript/src/interfaces.ts b/packages/cashscript/src/interfaces.ts
index 757b9d00..5ebd13c6 100644
--- a/packages/cashscript/src/interfaces.ts
+++ b/packages/cashscript/src/interfaces.ts
@@ -116,5 +116,7 @@ export interface TransactionDetails extends Transaction {
 
 export interface ContractOptions {
   provider?: NetworkProvider,
-  addressType?: 'p2sh20' | 'p2sh32',
+  addressType?: AddressType,
 }
+
+export type AddressType = 'p2sh20' | 'p2sh32';
diff --git a/packages/cashscript/src/utils.ts b/packages/cashscript/src/utils.ts
index e2b52c74..a904d9b6 100644
--- a/packages/cashscript/src/utils.ts
+++ b/packages/cashscript/src/utils.ts
@@ -32,6 +32,7 @@ import {
   Network,
   LibauthOutput,
   TokenDetails,
+  AddressType,
 } from './interfaces.js';
 import { VERSION_SIZE, LOCKTIME_SIZE } from './constants.js';
 import {
@@ -247,14 +248,16 @@ export function toRegExp(reasons: string[]): RegExp {
   return new RegExp(reasons.join('|').replace(/\(/g, '\\(').replace(/\)/g, '\\)'));
 }
 
-export function scriptToAddress(script: Script, network: string, addressType: 'p2sh20' | 'p2sh32', tokenSupport: boolean): string {
+export function scriptToAddress(
+  script: Script, network: string, addressType: AddressType, tokenSupport: boolean,
+): string {
   const lockingBytecode = scriptToLockingBytecode(script, addressType);
   const prefix = getNetworkPrefix(network);
   const address = lockingBytecodeToCashAddress(lockingBytecode, prefix, { tokenSupport }) as string;
   return address;
 }
 
-export function scriptToLockingBytecode(script: Script, addressType: 'p2sh20' | 'p2sh32'): Uint8Array {
+export function scriptToLockingBytecode(script: Script, addressType: AddressType): Uint8Array {
   const scriptBytecode = scriptToBytecode(script);
   const scriptHash = (addressType === 'p2sh20') ? hash160(scriptBytecode) : hash256(scriptBytecode);
   const addressContents = { payload: scriptHash, type: LockingBytecodeType[addressType] };
diff --git a/packages/cashscript/test/fixture/libauth-template/fixtures.ts b/packages/cashscript/test/fixture/libauth-template/fixtures.ts
index 73c2b8f5..bb2eb8ba 100644
--- a/packages/cashscript/test/fixture/libauth-template/fixtures.ts
+++ b/packages/cashscript/test/fixture/libauth-template/fixtures.ts
@@ -33,7 +33,7 @@ export const fixtures: Fixture[] = [
       'description': 'Imported from cashscript',
       'name': 'TransferWithTimeout',
       'supported': [
-        'BCH_SPEC',
+        'BCH_2023_05',
       ],
       'version': 0,
       'entities': {
@@ -106,7 +106,7 @@ export const fixtures: Fixture[] = [
             'locktime': expect.any(Number),
             'outputs': [
               {
-                'lockingBytecode': 'aa203f567c4556a3b1fe2d6dd250ee07a939c54f22ce4cb87fb0581800063eaca0b187',
+                'lockingBytecode': {},
                 'valueSatoshis': 10000,
               },
             ],
@@ -132,7 +132,7 @@ export const fixtures: Fixture[] = [
           'unlocks': 'lock',
         },
         'lock': {
-          'lockingType': 'p2sh20',
+          'lockingType': 'p2sh32',
           'name': 'lock',
           'script': "// \"TransferWithTimeout\" contract constructor parameters\n<timeout> // int = <0xa08601>\n<recipient> // pubkey = <0x028f1219c918234d6bb06b4782354ff0759bd73036f3c849b88020c79fe013cd38>\n<sender> // pubkey = <0x0373cc07b54c22da627b572a387a20ea190c9382e5e6d48c1d5b89c5cea2c4c088>\n\n// bytecode\n                                                /* contract TransferWithTimeout(                                             */\n                                                /*     pubkey sender,                                                        */\n                                                /*     pubkey recipient,                                                     */\n                                                /*     int timeout                                                           */\n                                                /* ) {                                                                       */\n                                                /*     // Require recipient's signature to match                             */\nOP_3 OP_PICK OP_0 OP_NUMEQUAL OP_IF             /*     function transfer(sig recipientSig) {                                 */\nOP_4 OP_ROLL OP_2 OP_ROLL OP_CHECKSIG           /*         require(checkSig(recipientSig, recipient));                       */\nOP_NIP OP_NIP OP_NIP OP_ELSE                    /*     }                                                                     */\n                                                /*                                                                           */\n                                                /*     // Require timeout time to be reached and sender's signature to match */\nOP_3 OP_ROLL OP_1 OP_NUMEQUAL OP_VERIFY         /*     function timeout(sig senderSig) {                                     */\nOP_3 OP_ROLL OP_1 OP_ROLL OP_CHECKSIG OP_VERIFY /*         require(checkSig(senderSig, sender));                             */\nOP_1 OP_ROLL OP_CHECKLOCKTIMEVERIFY OP_DROP     /*         require(tx.time >= timeout);                                      */\nOP_1 OP_NIP                                     /*     }                                                                     */\nOP_ENDIF                                        /* }                                                                         */\n                                                /*                                                                           */",
         },
@@ -157,7 +157,7 @@ export const fixtures: Fixture[] = [
       'description': 'Imported from cashscript',
       'name': 'TransferWithTimeout',
       'supported': [
-        'BCH_SPEC',
+        'BCH_2023_05',
       ],
       'version': 0,
       'entities': {
@@ -230,7 +230,7 @@ export const fixtures: Fixture[] = [
             'locktime': expect.any(Number),
             'outputs': [
               {
-                'lockingBytecode': 'aa203f567c4556a3b1fe2d6dd250ee07a939c54f22ce4cb87fb0581800063eaca0b187',
+                'lockingBytecode': {},
                 'valueSatoshis': 10000,
               },
             ],
@@ -256,7 +256,7 @@ export const fixtures: Fixture[] = [
           'unlocks': 'lock',
         },
         'lock': {
-          'lockingType': 'p2sh20',
+          'lockingType': 'p2sh32',
           'name': 'lock',
           'script': "// \"TransferWithTimeout\" contract constructor parameters\n<timeout> // int = <0xa08601>\n<recipient> // pubkey = <0x028f1219c918234d6bb06b4782354ff0759bd73036f3c849b88020c79fe013cd38>\n<sender> // pubkey = <0x0373cc07b54c22da627b572a387a20ea190c9382e5e6d48c1d5b89c5cea2c4c088>\n\n// bytecode\n                                                /* contract TransferWithTimeout(                                             */\n                                                /*     pubkey sender,                                                        */\n                                                /*     pubkey recipient,                                                     */\n                                                /*     int timeout                                                           */\n                                                /* ) {                                                                       */\n                                                /*     // Require recipient's signature to match                             */\nOP_3 OP_PICK OP_0 OP_NUMEQUAL OP_IF             /*     function transfer(sig recipientSig) {                                 */\nOP_4 OP_ROLL OP_2 OP_ROLL OP_CHECKSIG           /*         require(checkSig(recipientSig, recipient));                       */\nOP_NIP OP_NIP OP_NIP OP_ELSE                    /*     }                                                                     */\n                                                /*                                                                           */\n                                                /*     // Require timeout time to be reached and sender's signature to match */\nOP_3 OP_ROLL OP_1 OP_NUMEQUAL OP_VERIFY         /*     function timeout(sig senderSig) {                                     */\nOP_3 OP_ROLL OP_1 OP_ROLL OP_CHECKSIG OP_VERIFY /*         require(checkSig(senderSig, sender));                             */\nOP_1 OP_ROLL OP_CHECKLOCKTIMEVERIFY OP_DROP     /*         require(tx.time >= timeout);                                      */\nOP_1 OP_NIP                                     /*     }                                                                     */\nOP_ENDIF                                        /* }                                                                         */\n                                                /*                                                                           */",
         },
@@ -281,7 +281,7 @@ export const fixtures: Fixture[] = [
       'description': 'Imported from cashscript',
       'name': 'Mecenas',
       'supported': [
-        'BCH_SPEC',
+        'BCH_2023_05',
       ],
       'version': 0,
       'entities': {
@@ -351,7 +351,7 @@ export const fixtures: Fixture[] = [
                 'valueSatoshis': 10000,
               },
               {
-                'lockingBytecode': 'aa209c6c87b192226fa02ed3834607a94a6ea040acc59df983c49a648406c695816b87',
+                'lockingBytecode': {},
                 'valueSatoshis': expect.any(Number),
               },
             ],
@@ -377,7 +377,7 @@ export const fixtures: Fixture[] = [
           'unlocks': 'lock',
         },
         'lock': {
-          'lockingType': 'p2sh20',
+          'lockingType': 'p2sh32',
           'name': 'lock',
           'script': "// \"Mecenas\" contract constructor parameters\n<pledge> // int = <0x1027>\n<funder> // bytes20 = <0xb40a2013337edb0dfe307f0a57d5dec5bfe60dd0>\n<recipient> // bytes20 = <0x512dbb2c8c02efbac8d92431aa0ac33f6b0bf970>\n\n// bytecode\n                                                                                         /* pragma cashscript >=0.8.0;                                                                                         */\n                                                                                         /*                                                                                                                    */\n                                                                                         /* \\/* This is an unofficial CashScript port of Licho's Mecenas contract. It is                                       */\n                                                                                         /*  * not compatible with Licho's EC plugin, but rather meant as a demonstration                                      */\n                                                                                         /*  * of covenants in CashScript.                                                                                     */\n                                                                                         /*  * The time checking has been removed so it can be tested without time requirements.                               */\n                                                                                         /*  *\\/                                                                                                               */\n                                                                                         /* contract Mecenas(bytes20 recipient, bytes20 funder, int pledge\\/*, int period *\\/) {                               */\nOP_3 OP_PICK OP_0 OP_NUMEQUAL OP_IF                                                      /*     function receive() {                                                                                           */\n                                                                                         /*         // require(tx.age >= period);                                                                              */\n                                                                                         /*                                                                                                                    */\n                                                                                         /*         // Check that the first output sends to the recipient                                                      */\nOP_0 OP_OUTPUTBYTECODE <0x76a914> OP_2 OP_ROLL OP_CAT <0x88ac> OP_CAT OP_EQUAL OP_VERIFY /*         require(tx.outputs[0].lockingBytecode == new LockingBytecodeP2PKH(recipient));                             */\n                                                                                         /*                                                                                                                    */\n<0xe803>                                                                                 /*         int minerFee = 1000;                                                                                       */\nOP_INPUTINDEX OP_UTXOVALUE                                                               /*         int currentValue = tx.inputs[this.activeInputIndex].value;                                                 */\nOP_0 OP_PICK OP_4 OP_PICK OP_SUB OP_2 OP_PICK OP_SUB                                     /*         int changeValue = currentValue - pledge - minerFee;                                                        */\n                                                                                         /*                                                                                                                    */\n                                                                                         /*         // If there is not enough left for *another* pledge after this one, we send the remainder to the recipient */\n                                                                                         /*         // Otherwise we send the remainder to the recipient and the change back to the contract                    */\nOP_0 OP_PICK OP_5 OP_PICK OP_4 OP_PICK OP_ADD OP_LESSTHANOREQUAL OP_IF                   /*         if (changeValue <= pledge + minerFee) {                                                                    */\nOP_0 OP_OUTPUTVALUE OP_2 OP_PICK OP_4 OP_PICK OP_SUB OP_NUMEQUAL OP_VERIFY               /*             require(tx.outputs[0].value == currentValue - minerFee);                                               */\nOP_ELSE                                                                                  /*         } else {                                                                                                   */\nOP_0 OP_OUTPUTVALUE OP_5 OP_PICK OP_NUMEQUAL OP_VERIFY                                   /*             require(tx.outputs[0].value == pledge);                                                                */\nOP_1 OP_OUTPUTBYTECODE OP_INPUTINDEX OP_UTXOBYTECODE OP_EQUAL OP_VERIFY                  /*             require(tx.outputs[1].lockingBytecode == tx.inputs[this.activeInputIndex].lockingBytecode);            */\nOP_1 OP_OUTPUTVALUE OP_1 OP_PICK OP_NUMEQUAL OP_VERIFY                                   /*             require(tx.outputs[1].value == changeValue);                                                           */\nOP_ENDIF                                                                                 /*         }                                                                                                          */\nOP_1 OP_NIP OP_NIP OP_NIP OP_NIP OP_NIP OP_NIP OP_ELSE                                   /*     }                                                                                                              */\n                                                                                         /*                                                                                                                    */\nOP_3 OP_ROLL OP_1 OP_NUMEQUAL OP_VERIFY                                                  /*     function reclaim(pubkey pk, sig s) {                                                                           */\nOP_3 OP_PICK OP_HASH160 OP_2 OP_ROLL OP_EQUAL OP_VERIFY                                  /*         require(hash160(pk) == funder);                                                                            */\nOP_3 OP_ROLL OP_3 OP_ROLL OP_CHECKSIG                                                    /*         require(checkSig(s, pk));                                                                                  */\nOP_NIP OP_NIP                                                                            /*     }                                                                                                              */\nOP_ENDIF                                                                                 /* }                                                                                                                  */\n                                                                                         /*                                                                                                                    */",
         },
@@ -410,7 +410,7 @@ export const fixtures: Fixture[] = [
       'description': 'Imported from cashscript',
       'name': 'P2PKH',
       'supported': [
-        'BCH_SPEC',
+        'BCH_2023_05',
       ],
       'version': 0,
       'entities': {
@@ -477,7 +477,7 @@ export const fixtures: Fixture[] = [
             'locktime': 133700,
             'outputs': [
               {
-                'lockingBytecode': 'aa2034d9ffce86b4d136ca74e9db6f6433d3548966a6be064052e728a4c1d16aa3a587',
+                'lockingBytecode': {},
                 'token': {
                   'amount': expect.stringMatching(/^[0-9]+$/),
                   'category': expect.stringMatching(/^[0-9a-f]{64}$/),
@@ -485,7 +485,7 @@ export const fixtures: Fixture[] = [
                 'valueSatoshis': 1000,
               },
               {
-                'lockingBytecode': 'aa2034d9ffce86b4d136ca74e9db6f6433d3548966a6be064052e728a4c1d16aa3a587',
+                'lockingBytecode': {},
                 'valueSatoshis': expect.any(Number),
               },
             ],
@@ -519,7 +519,7 @@ export const fixtures: Fixture[] = [
           'unlocks': 'lock',
         },
         'lock': {
-          'lockingType': 'p2sh20',
+          'lockingType': 'p2sh32',
           'name': 'lock',
           'script': '// "P2PKH" contract constructor parameters\n<pkh> // bytes20 = <0x512dbb2c8c02efbac8d92431aa0ac33f6b0bf970>\n\n// bytecode\n                                                        /* contract P2PKH(bytes20 pkh) {                                */\n                                                        /*     // Require pk to match stored pkh and signature to match */\n                                                        /*     function spend(pubkey pk, sig s) {                       */\nOP_1 OP_PICK OP_HASH160 OP_1 OP_ROLL OP_EQUAL OP_VERIFY /*         require(hash160(pk) == pkh);                         */\nOP_1 OP_ROLL OP_1 OP_ROLL OP_CHECKSIG                   /*         require(checkSig(s, pk));                            */\n                                                        /*     }                                                        */\n                                                        /* }                                                            */\n                                                        /*                                                              */',
         },
@@ -550,7 +550,7 @@ export const fixtures: Fixture[] = [
       'description': 'Imported from cashscript',
       'name': 'P2PKH',
       'supported': [
-        'BCH_SPEC',
+        'BCH_2023_05',
       ],
       'version': 0,
       'entities': {
@@ -610,11 +610,11 @@ export const fixtures: Fixture[] = [
             'locktime': 133700,
             'outputs': [
               {
-                'lockingBytecode': 'aa2034d9ffce86b4d136ca74e9db6f6433d3548966a6be064052e728a4c1d16aa3a587',
+                'lockingBytecode': {},
                 'valueSatoshis': 1000,
               },
               {
-                'lockingBytecode': 'aa2034d9ffce86b4d136ca74e9db6f6433d3548966a6be064052e728a4c1d16aa3a587',
+                'lockingBytecode': {},
                 'valueSatoshis': expect.any(Number),
               },
             ],
@@ -640,7 +640,7 @@ export const fixtures: Fixture[] = [
           'unlocks': 'lock',
         },
         'lock': {
-          'lockingType': 'p2sh20',
+          'lockingType': 'p2sh32',
           'name': 'lock',
           'script': '// "P2PKH" contract constructor parameters\n<pkh> // bytes20 = <0x512dbb2c8c02efbac8d92431aa0ac33f6b0bf970>\n\n// bytecode\n                                                        /* contract P2PKH(bytes20 pkh) {                                */\n                                                        /*     // Require pk to match stored pkh and signature to match */\n                                                        /*     function spend(pubkey pk, sig s) {                       */\nOP_1 OP_PICK OP_HASH160 OP_1 OP_ROLL OP_EQUAL OP_VERIFY /*         require(hash160(pk) == pkh);                         */\nOP_1 OP_ROLL OP_1 OP_ROLL OP_CHECKSIG                   /*         require(checkSig(s, pk));                            */\n                                                        /*     }                                                        */\n                                                        /* }                                                            */\n                                                        /*                                                              */',
         },
@@ -673,7 +673,7 @@ export const fixtures: Fixture[] = [
       'description': 'Imported from cashscript',
       'name': 'P2PKH',
       'supported': [
-        'BCH_SPEC',
+        'BCH_2023_05',
       ],
       'version': 0,
       'entities': {
@@ -740,7 +740,7 @@ export const fixtures: Fixture[] = [
             'locktime': 133700,
             'outputs': [
               {
-                'lockingBytecode': 'aa2034d9ffce86b4d136ca74e9db6f6433d3548966a6be064052e728a4c1d16aa3a587',
+                'lockingBytecode': {},
                 'token': {
                   'amount': '0',
                   'category': expect.stringMatching(/^[0-9a-f]{64}$/),
@@ -752,7 +752,7 @@ export const fixtures: Fixture[] = [
                 'valueSatoshis': 1000,
               },
               {
-                'lockingBytecode': 'aa2034d9ffce86b4d136ca74e9db6f6433d3548966a6be064052e728a4c1d16aa3a587',
+                'lockingBytecode': {},
                 'valueSatoshis': expect.any(Number),
               },
             ],
@@ -790,7 +790,7 @@ export const fixtures: Fixture[] = [
           'unlocks': 'lock',
         },
         'lock': {
-          'lockingType': 'p2sh20',
+          'lockingType': 'p2sh32',
           'name': 'lock',
           'script': '// "P2PKH" contract constructor parameters\n<pkh> // bytes20 = <0x512dbb2c8c02efbac8d92431aa0ac33f6b0bf970>\n\n// bytecode\n                                                        /* contract P2PKH(bytes20 pkh) {                                */\n                                                        /*     // Require pk to match stored pkh and signature to match */\n                                                        /*     function spend(pubkey pk, sig s) {                       */\nOP_1 OP_PICK OP_HASH160 OP_1 OP_ROLL OP_EQUAL OP_VERIFY /*         require(hash160(pk) == pkh);                         */\nOP_1 OP_ROLL OP_1 OP_ROLL OP_CHECKSIG                   /*         require(checkSig(s, pk));                            */\n                                                        /*     }                                                        */\n                                                        /* }                                                            */\n                                                        /*                                                              */',
         },
@@ -821,7 +821,7 @@ export const fixtures: Fixture[] = [
       'description': 'Imported from cashscript',
       'name': 'HodlVault',
       'supported': [
-        'BCH_SPEC',
+        'BCH_2023_05',
       ],
       'version': 0,
       'entities': {
@@ -906,11 +906,11 @@ export const fixtures: Fixture[] = [
             'locktime': 133700,
             'outputs': [
               {
-                'lockingBytecode': 'aa202b9369ac73606fc710cb756d82807e45e283bbf2a642df014bfce7a1c749c5e087',
+                'lockingBytecode': {},
                 'valueSatoshis': 10000,
               },
               {
-                'lockingBytecode': 'aa202b9369ac73606fc710cb756d82807e45e283bbf2a642df014bfce7a1c749c5e087',
+                'lockingBytecode': {},
                 'valueSatoshis': expect.any(Number),
               },
             ],
@@ -936,7 +936,7 @@ export const fixtures: Fixture[] = [
           'unlocks': 'lock',
         },
         'lock': {
-          'lockingType': 'p2sh20',
+          'lockingType': 'p2sh32',
           'name': 'lock',
           'script': '// "HodlVault" contract constructor parameters\n<price_target> // int = <0x3075>\n<min_block> // int = <0xb88201>\n<oracle_pk> // pubkey = <0x028f1219c918234d6bb06b4782354ff0759bd73036f3c849b88020c79fe013cd38>\n<owner_pk> // pubkey = <0x0373cc07b54c22da627b572a387a20ea190c9382e5e6d48c1d5b89c5cea2c4c088>\n\n// bytecode\n                                                                 /* // This contract forces HODLing until a certain price target has been reached                                          */\n                                                                 /* // A minimum block is provided to ensure that oracle price entries from before this block are disregarded              */\n                                                                 /* // i.e. when the BCH price was $1000 in the past, an oracle entry with the old block number and price can not be used. */\n                                                                 /* // Instead, a message with a block number and price from after the minBlock needs to be passed.                        */\n                                                                 /* // This contract serves as a simple example for checkDataSig-based contracts.                                          */\n                                                                 /* contract HodlVault(                                                                                                    */\n                                                                 /*     pubkey ownerPk,                                                                                                    */\n                                                                 /*     pubkey oraclePk,                                                                                                   */\n                                                                 /*     int minBlock,                                                                                                      */\n                                                                 /*     int priceTarget                                                                                                    */\n                                                                 /* ) {                                                                                                                    */\n                                                                 /*     function spend(sig ownerSig, datasig oracleSig, bytes8 oracleMessage) {                                            */\n                                                                 /*         // message: { blockHeight, price }                                                                             */\nOP_6 OP_PICK OP_4 OP_SPLIT                                       /*         bytes4 blockHeightBin, bytes4 priceBin = oracleMessage.split(4);                                               */\nOP_1 OP_ROLL OP_BIN2NUM                                          /*         int blockHeight = int(blockHeightBin);                                                                         */\nOP_1 OP_ROLL OP_BIN2NUM                                          /*         int price = int(priceBin);                                                                                     */\n                                                                 /*                                                                                                                        */\n                                                                 /*         // Check that blockHeight is after minBlock and not in the future                                              */\nOP_1 OP_PICK OP_5 OP_ROLL OP_GREATERTHANOREQUAL OP_VERIFY        /*         require(blockHeight >= minBlock);                                                                              */\nOP_1 OP_ROLL OP_CHECKLOCKTIMEVERIFY OP_DROP                      /*         require(tx.time >= blockHeight);                                                                               */\n                                                                 /*                                                                                                                        */\n                                                                 /*         // Check that current price is at least priceTarget                                                            */\nOP_0 OP_ROLL OP_3 OP_ROLL OP_GREATERTHANOREQUAL OP_VERIFY        /*         require(price >= priceTarget);                                                                                 */\n                                                                 /*                                                                                                                        */\n                                                                 /*         // Handle necessary signature checks                                                                           */\nOP_3 OP_ROLL OP_4 OP_ROLL OP_3 OP_ROLL OP_CHECKDATASIG OP_VERIFY /*         require(checkDataSig(oracleSig, oracleMessage, oraclePk));                                                     */\nOP_1 OP_ROLL OP_1 OP_ROLL OP_CHECKSIG                            /*         require(checkSig(ownerSig, ownerPk));                                                                          */\n                                                                 /*     }                                                                                                                  */\n                                                                 /* }                                                                                                                      */\n                                                                 /*                                                                                                                        */',
         },
@@ -991,7 +991,7 @@ export const fixtures: Fixture[] = [
       'description': 'Imported from cashscript',
       'name': 'P2PKH',
       'supported': [
-        'BCH_SPEC',
+        'BCH_2023_05',
       ],
       'version': 0,
       'entities': {
@@ -1075,11 +1075,11 @@ export const fixtures: Fixture[] = [
             'locktime': 133700,
             'outputs': [
               {
-                'lockingBytecode': 'aa2034d9ffce86b4d136ca74e9db6f6433d3548966a6be064052e728a4c1d16aa3a587',
+                'lockingBytecode': {},
                 'valueSatoshis': 1000,
               },
               {
-                'lockingBytecode': 'aa2034d9ffce86b4d136ca74e9db6f6433d3548966a6be064052e728a4c1d16aa3a587',
+                'lockingBytecode': {},
                 'valueSatoshis': expect.any(Number),
               },
             ],
@@ -1118,7 +1118,7 @@ export const fixtures: Fixture[] = [
           'unlocks': 'lock',
         },
         'lock': {
-          'lockingType': 'p2sh20',
+          'lockingType': 'p2sh32',
           'name': 'lock',
           'script': '// "P2PKH" contract constructor parameters\n<pkh> // bytes20 = <0x512dbb2c8c02efbac8d92431aa0ac33f6b0bf970>\n\n// bytecode\n                                                        /* contract P2PKH(bytes20 pkh) {                                */\n                                                        /*     // Require pk to match stored pkh and signature to match */\n                                                        /*     function spend(pubkey pk, sig s) {                       */\nOP_1 OP_PICK OP_HASH160 OP_1 OP_ROLL OP_EQUAL OP_VERIFY /*         require(hash160(pk) == pkh);                         */\nOP_1 OP_ROLL OP_1 OP_ROLL OP_CHECKSIG                   /*         require(checkSig(s, pk));                            */\n                                                        /*     }                                                        */\n                                                        /* }                                                            */\n                                                        /*                                                              */',
         },

From 3d6611410e8c7ed9d760071a8c639e91c2cbb477 Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Tue, 28 May 2024 11:39:34 +0200
Subject: [PATCH 100/171] Bump version to 0.10.0-next.5

---
 examples/package.json               | 6 +++---
 examples/testing-suite/package.json | 6 +++---
 packages/cashc/package.json         | 4 ++--
 packages/cashc/src/index.ts         | 2 +-
 packages/cashscript/package.json    | 4 ++--
 packages/utils/package.json         | 2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/examples/package.json b/examples/package.json
index 163e23b4..ceaf832f 100644
--- a/examples/package.json
+++ b/examples/package.json
@@ -1,7 +1,7 @@
 {
   "name": "cashscript-examples",
   "private": true,
-  "version": "0.10.0-next.4",
+  "version": "0.10.0-next.5",
   "description": "Usage examples of the CashScript SDK",
   "main": "p2pkh.js",
   "type": "module",
@@ -14,8 +14,8 @@
     "@bitauth/libauth": "^2.0.0-alpha.8",
     "@types/node": "^12.7.8",
     "bip39": "^3.0.4",
-    "cashc": "^0.10.0-next.4",
-    "cashscript": "^0.10.0-next.4",
+    "cashc": "^0.10.0-next.5",
+    "cashscript": "^0.10.0-next.5",
     "eslint": "^8.56.0",
     "typescript": "^4.9.5"
   }
diff --git a/examples/testing-suite/package.json b/examples/testing-suite/package.json
index a46037f2..7cb4d91b 100644
--- a/examples/testing-suite/package.json
+++ b/examples/testing-suite/package.json
@@ -1,6 +1,6 @@
 {
   "name": "testing-suite",
-  "version": "0.10.0-next.4",
+  "version": "0.10.0-next.5",
   "description": "Example project to develop and test CashScript contracts",
   "main": "index.js",
   "type": "module",
@@ -25,8 +25,8 @@
     "test": "NODE_OPTIONS='--experimental-vm-modules --no-warnings' jest"
   },
   "dependencies": {
-    "cashc": "^0.10.0-next.4",
-    "cashscript": "^0.10.0-next.4"
+    "cashc": "^0.10.0-next.5",
+    "cashscript": "^0.10.0-next.5"
   },
   "devDependencies": {
     "@jest/globals": "^29.4.1",
diff --git a/packages/cashc/package.json b/packages/cashc/package.json
index 54496950..5b48f4aa 100644
--- a/packages/cashc/package.json
+++ b/packages/cashc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cashc",
-  "version": "0.10.0-next.4",
+  "version": "0.10.0-next.5",
   "description": "Compile Bitcoin Cash contracts to Bitcoin Cash Script or artifacts",
   "keywords": [
     "bitcoin",
@@ -50,7 +50,7 @@
   },
   "dependencies": {
     "@bitauth/libauth": "^2.0.0",
-    "@cashscript/utils": "^0.10.0-next.4",
+    "@cashscript/utils": "^0.10.0-next.5",
     "antlr4": "^4.13.1-patch-1",
     "commander": "^7.1.0",
     "semver": "^7.5.4"
diff --git a/packages/cashc/src/index.ts b/packages/cashc/src/index.ts
index 83027743..01e18dc6 100644
--- a/packages/cashc/src/index.ts
+++ b/packages/cashc/src/index.ts
@@ -2,4 +2,4 @@ export * from './Errors.js';
 export * as utils from '@cashscript/utils';
 export { compileFile, compileString } from './compiler.js';
 
-export const version = '0.10.0-next.4';
+export const version = '0.10.0-next.5';
diff --git a/packages/cashscript/package.json b/packages/cashscript/package.json
index ea2e8e9f..0a591dca 100644
--- a/packages/cashscript/package.json
+++ b/packages/cashscript/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cashscript",
-  "version": "0.10.0-next.4",
+  "version": "0.10.0-next.5",
   "description": "Easily write and interact with Bitcoin Cash contracts",
   "keywords": [
     "bitcoin cash",
@@ -44,7 +44,7 @@
   },
   "dependencies": {
     "@bitauth/libauth": "^2.0.0",
-    "@cashscript/utils": "^0.10.0-next.4",
+    "@cashscript/utils": "^0.10.0-next.5",
     "bip68": "^1.0.4",
     "bitcoin-rpc-promise-retry": "^1.3.0",
     "delay": "^5.0.0",
diff --git a/packages/utils/package.json b/packages/utils/package.json
index ecb58255..f4465fc9 100644
--- a/packages/utils/package.json
+++ b/packages/utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cashscript/utils",
-  "version": "0.10.0-next.4",
+  "version": "0.10.0-next.5",
   "description": "CashScript utilities and types",
   "keywords": [
     "bitcoin cash",

From 3a3badc411ad9c003f90ec66402de593ef592c3c Mon Sep 17 00:00:00 2001
From: Mathieu Geukens <mr-zwets@protonmail.com>
Date: Wed, 29 May 2024 11:50:58 +0200
Subject: [PATCH 101/171] added failing test

---
 packages/cashscript/test/debugging.test.ts | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/packages/cashscript/test/debugging.test.ts b/packages/cashscript/test/debugging.test.ts
index 9477bc84..2c7a3e0e 100644
--- a/packages/cashscript/test/debugging.test.ts
+++ b/packages/cashscript/test/debugging.test.ts
@@ -90,6 +90,13 @@ contract Test() {
 }
 `;
 
+const CONTRACT_CODE2 = `
+contract Test() {
+  function test_require_single_function() {
+    require(tx.outputs.length == 1, "should have 1 output");
+  }
+}`;
+
 describe('Debugging tests', () => {
   describe('console.log statements', () => {
     const BASE_CONTRACT_CODE = `
@@ -273,8 +280,10 @@ describe('Debugging tests', () => {
 
   describe('require statements', () => {
     const artifact = compileString(CONTRACT_CODE);
+    const artifact2 = compileString(CONTRACT_CODE2);
     const provider = new MockNetworkProvider();
 
+    // test_require
     it('should fail with error message when require statement fails', async () => {
       const contract = new Contract(artifact, [], { provider });
       provider.addUtxo(contract.address, randomUtxo());
@@ -283,6 +292,17 @@ describe('Debugging tests', () => {
       await expect(transaction).toFailRequireWith(/1 should equal 2/);
     });
 
+    // test_require_single_function
+    it('should fail with error message when require statement fails in single function', async () => {
+      const contract = new Contract(artifact2, [], { provider });
+      provider.addUtxo(contract.address, randomUtxo());
+
+      const transaction = contract.functions.test_require_single_function()
+        .to(contract.address, 1000n)
+        .to(contract.address, 1000n);
+      await expect(transaction).toFailRequireWith(/should have 1 output/);
+    });
+
     // // test_multiple_require_statements
     it('it should only fail with correct error message when there are multiple require statements', async () => {
       const contract = new Contract(artifact, [], { provider });

From 4d6e8cbca19f9071221be4a3db2498ff74826dfc Mon Sep 17 00:00:00 2001
From: Mathieu Geukens <mr-zwets@protonmail.com>
Date: Thu, 30 May 2024 09:49:31 +0200
Subject: [PATCH 102/171] improve text landing page

---
 website/src/pages/index.js | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/website/src/pages/index.js b/website/src/pages/index.js
index 626e92ef..56ca1d04 100755
--- a/website/src/pages/index.js
+++ b/website/src/pages/index.js
@@ -11,43 +11,42 @@ const features = [
     title: 'Efficient and Reliable Verification',
     description: (
       <>
-        Smart contracts on Bitcoin Cash are stateless and UTXO-based. This
+        Smart contracts on Bitcoin Cash are UTXO-based with local state. This
         model allows transactions to be verified independently and efficiently.
-        Because there is no state that can impact the execution of these smart
+        Because there is no global state that can impact the execution of these smart
         contracts, the results are deterministic and predictable.
       </>
     ),
   },
   {
-    title: 'Private and Isolated Contracts',
+    title: 'Strong Abstraction',
     description: (
       <>
-        Because of Bitcoin Cash' UTXO-based model, each contract is fully
-        independent and isolated from each other. This limits systemic risk
-        and makes contract upgrades much simpler. Furthermore, Bitcoin Cash
-        contracts use P2SH, preserving the privacy of participants.
+        Bitcoin Cash transactions run on a virtual machine called 'BCH Script'.
+        Writing bytecode for this virtual machine is difficult and error-prone.
+        CashScript offers a strong abstraction for writing Bitcoin Cash smart
+        contracts, improving developer experience and reliability of contracts.
       </>
     ),
   },
   {
-    title: 'Strong Abstraction',
+    title: 'DeFi on Bitcoin Cash',
     description: (
       <>
-        Bitcoin Cash transactions run on a virtual machine called Bitcoin Script.
-        Writing bytecode for this virtual machine is difficult and error-prone.
-        CashScript offers a strong abstraction for writing Bitcoin Cash smart
-        contracts, improving developer experience and reliability of contracts.
+        Bitcoin Cash has had many script upgrades on such as CashTokens and transaction introspection.
+        Because of this DeFi is very much possible on Bitcoin Cash.
+        However, compared to EVM smart contracts work very differently due to BCH's UTXO
+        architecture.
       </>
     ),
   },
   {
-    title: 'DeFi on Bitcoin Cash',
+    title: 'Integrated Tooling',
     description: (
       <>
-        Most DeFi applications are currently built on top of the EVM. Bitcoin
-        Cash contracts use a different paradigm than EVM chains due to its UTXO
-        architecture. But with CashTokens, transaction introspection and local
-        state, DeFi is very much possible on Bitcoin Cash.
+        CashScript offers integrated tooling through the Javascript SDK.
+        The SDK has utilities for easy transaction building and other network functionality.
+        CashScript has built-in debug tooling comaptible with the Bitauth-IDE to offer the best developer experience.  
       </>
     ),
   },

From 92b686ac5a34cde936127b0c8564f97e76c3ae5d Mon Sep 17 00:00:00 2001
From: Mathieu Geukens <mr-zwets@protonmail.com>
Date: Thu, 30 May 2024 11:18:08 +0200
Subject: [PATCH 103/171] full makeover to the getting-started page

---
 website/docs/basics/getting-started.md | 126 +++++++++++++++++--------
 website/docs/sdk/instantiation.md      |   4 +
 2 files changed, 93 insertions(+), 37 deletions(-)

diff --git a/website/docs/basics/getting-started.md b/website/docs/basics/getting-started.md
index b51d42a3..9e6fe09c 100644
--- a/website/docs/basics/getting-started.md
+++ b/website/docs/basics/getting-started.md
@@ -2,26 +2,47 @@
 title: Getting Started
 ---
 
-## Installing the CashScript compiler
+## Try CashScript Online
+
+To get started with writing CashScript smart contracts quickly, it is recommended to try out the [CashScript Playground](https://playground.cashscript.org/), a web application which lets you easily write and create contracts easily!
+
+Here you will learn what CashScript contract looks like through the `TransferWithTimeout` example contract. Then you can compile the contract and provide the contract arguments to create a smart contract address. To actually create the smart contract itself you fund the address so it has a UTXO on the contract address. After setting up the smart contract, you can try spending from the smart contract by invoking a contract funcion!
+
+:::tip
+The [CashScript Playground](https://playground.cashscript.org/) is a great way to get started without doing any Javascript coding to setup up wallets, fetch balances and invoke contract functions. This way you can focus on learning one thing at a time!
+:::
+
+## Creating a CashScript Smart Contract
+
+With the CashScript playground there's a nice integrated editor to get started, as well as an integrated compiler to change your CashScript contract into a Contract `Artifact` behind the screens. Now, to get started we will have to get set up with a CashScript editor outside of the Playground and learn how to work with the `cashc` compiler to create CashScript contract artifacts.
+
+### Prerequisites
+
+To write CashScript smart contracts contracts locally you use a code-editor. For the best developer experience is recommended to use VS Code with the CashScript extension. This way it will automatically recognize `.cash` files and offer highlighting and auto-completion.
+
+:::note prerequisties
+- Basic familiarity with the command line
+- Node.js installed
+- A code editor (VS code recommended)
+:::
+
+:::tip
+See the [Syntax Highlighting](/docs/guides/syntax-highlighting) guide for how to get set-up for the best CashScript developer environment.
+:::
+
+### Installing the CashScript compiler
 The command line CashScript compiler `cashc` can be installed from NPM.
 
 ```bash
 npm install -g cashc
 ```
 
-## Installing the JavaScript SDK
-The JavaScript SDK can be installed into your project with NPM. Note that CashScript is a [Pure ESM package](https://gist.github.com/sindresorhus/a39789f98801d908bbc7ff3ecc99d99c).
-
-```bash
-npm install cashscript
-```
+### Writing your first smart contract
 
-:::caution
-CashScript only offers a JavaScript SDK, but CashScript contracts can be integrated into other languages as well. Because there are no ready-to-use SDKs available for them, this is considered advanced usage, and it is recommended to use the JavaScript SDK.
-:::
+Open your code-editor to start writing your first CashScript smart contract.
+We can start from a basic `TransferWithTimeout` smart contract, create a new file `TransferWithTimeout.cash` for the file.
 
-## Writing your first smart contract
-There are some examples available on the [Examples page](/docs/language/examples), that can be used to take inspiration from. Further examples of the JavaScript integration can be found on [GitHub](https://github.com/Bitcoin-com/cashscript/tree/master/examples). A simple example is included below.
+The `TransferWithTimeout` contract takes in 3 contract arguments and has 2 contract functions: `transfer` and `timeout`.
 
 ```solidity
 pragma cashscript ^0.9.0;
@@ -41,29 +62,74 @@ contract TransferWithTimeout(pubkey sender, pubkey recipient, int timeout) {
 ```
 
 :::tip
-Read more about the CashScript language syntax in the [Language Description](/docs/language/contracts).
+There are some other examples available on the [Examples page](/docs/language/examples), that can be used to take inspiration from. Further examples of the JavaScript integration can be found on [GitHub](https://github.com/Bitcoin-com/cashscript/tree/master/examples).
 :::
 
-## Integrating into JavaScript
-While more detailed examples are available on GitHub, we show an integration of the `TransferWithTimeout` contract in a JavaScript project.
+### Compiling your smart contract
+
+The next step after writing your smart contract is using the command line compiler to create a contract artifact so it can be imported into the CashScript SDK.
+
+```bash
+cashc ./TransferWithTimeout.cash --output ./TransferWithTimeout.json
+```
+
+This will create an artifact file `TransferWithTimeout.json` from your CashScript file. It can be helpful to take a look at the generated artifact file to understand what the `cashc` compiler is generating.
+
+## Creating a CashScript Transaction
 
-After compiling the contract file to an artifact JSON with cashc, it can be imported into the CashScript SDK.
+After creating a contract artifact we can now use the JavaScript SDK to initialise the smart contract and to invoke spending functions on the smart contract UTXOs.We'll continue with the `TransferWithTimeout` artifact generated in the previous steps.
+
+### Installing the JavaScript SDK
+The JavaScript SDK can be installed into your project with NPM. Note that CashScript is a [Pure ESM package](https://gist.github.com/sindresorhus/a39789f98801d908bbc7ff3ecc99d99c).
 
 ```bash
-cashc ./transfer_with_timeout.cash --output ./transfer_with_timeout.json
+npm install cashscript
 ```
 
+### Initialising a Contract
+
+Now to initialise a contract we will import the ElectrumNetworkProvider and contract classes from the CashScript SDK. We of course also need the contract arifact, and lastly we need public keys from a generated key-pair to use as arguments to initialise the contract.
+
+```javascript
+import { ElectrumNetworkProvider, Contract } from 'cashscript';
+import { alicePub, bobPub } from './keys.js';
+import artifact from './TransferWithTimeout.json';
+
+// Initialise a network provider for network operations
+const provider = new ElectrumNetworkProvider('chipnet');
+
+// Instantiate a new TransferWithTimeout contract
+const contractArguments = [alicePub, bobPub, 100000n]
+const ptions = { provider }
+const contract = new Contract(artifact, contractArguments, options);
+
+// Get the contract address and info about its balance
+console.log("Contract address:" + contract.address)
+console.log("Contract balance:" + await contract.getBalance())
+console.log("Contract Utxos:")
+console.log(await contract.getUtxos())
+```
+
+:::tip
+For a code example of how to generate key-pairs with Libauth see the [CashScript Examples](https://github.com/CashScript/cashscript/blob/master/examples/common.ts) `common-ts` file where Alice and Bob's key-pairs are created!
+:::
+
+### Creating a Transction
+
+Lastly to spend from the smart contract we've initialised you need to make sure there is an actual contract balance on the smart contract address. Or in other words, you need to make sure there's at least one UTXO with the smart contract locking bytecode so we can spend from it!
+
 ```javascript
 import { ElectrumNetworkProvider, Contract, SignatureTemplate } from 'cashscript';
-import { alicePriv, alicePub, bobPriv, bobPub } from './keys.js';
-import artifact from './transfer_with_timeout.json';
+import { alicePub, bobPriv, bobPub } from './keys.js';
+import artifact from './TransferWithTimeout.json';
 
 // Initialise a network provider for network operations
-const provider = new ElectrumNetworkProvider('mainnet');
-const addressType = 'p2sh20';
+const provider = new ElectrumNetworkProvider('chipnet');
 
 // Instantiate a new TransferWithTimeout contract
-const contract = new Contract(artifact, [alicePub, bobPub, 100000n], options:{ provider, addressType});
+const contractArguments = [alicePub, bobPub, 100000n]
+const options = { provider }
+const contract = new Contract(artifact, contractArguments, options);
 
 // Call the transfer function with Bob's signature
 // i.e. Bob claims the money that Alice has sent him
@@ -72,20 +138,6 @@ const transferDetails = await contract.functions
   .to('bitcoincash:qrhea03074073ff3zv9whh0nggxc7k03ssh8jv9mkx', 10000n)
   .send();
 console.log(transferDetails);
-
-// Call the timeout function with Alice's signature
-// i.e. Alice recovers the money that Bob has not claimed
-const timeoutDetails = await contract.functions
-  .timeout(new SignatureTemplate(alicePriv))
-  .to('bitcoincash:qqeht8vnwag20yv8dvtcrd4ujx09fwxwsqqqw93w88', 10000n)
-  .send();
-console.log(timeoutDetails);
 ```
 
-:::tip
-Read more about the JavaScript SDK in the [SDK documentation](/docs/sdk/instantiation).
-:::
-
-:::tip
-Read more about CashScript contract development and testing suite in the [Debug tools](/docs/sdk/debugging).
-:::
\ No newline at end of file
+Congrats 🎉! You've succesfully created a transaction spending from a Bitcoin Cash smart contract! 
diff --git a/website/docs/sdk/instantiation.md b/website/docs/sdk/instantiation.md
index 0f7dfe0c..8a64a0ab 100644
--- a/website/docs/sdk/instantiation.md
+++ b/website/docs/sdk/instantiation.md
@@ -4,6 +4,10 @@ title: Contract Instantiation
 
 Before interacting with smart contracts on the BCH network, the CashScript SDK needs to instantiate a `Contract` object. This is done by providing the contract's information and constructor arguments. After this instantiation, the CashScript SDK can interact with BCH contracts.
 
+:::note
+CashScript only offers a JavaScript SDK, but CashScript contracts can be integrated into other languages as well. Because there are no ready-to-use SDKs available for them, this is considered advanced usage.
+:::
+
 ## Contract class
 The `Contract` class is used to represent a CashScript contract in a JavaScript object. These objects can be used to retrieve information such as the contract's address and balance. They can be used to interact with the contract by calling the contract's functions.
 

From 656396ed8c0bf44086a4a1aa44167318b8edf5a6 Mon Sep 17 00:00:00 2001
From: Mathieu Geukens <mr-zwets@protonmail.com>
Date: Thu, 30 May 2024 11:34:09 +0200
Subject: [PATCH 104/171] update what is CashScript

---
 website/docs/basics/about.md           | 12 ++++++++++--
 website/docs/basics/getting-started.md |  2 +-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/website/docs/basics/about.md b/website/docs/basics/about.md
index 9a359206..26247d1c 100644
--- a/website/docs/basics/about.md
+++ b/website/docs/basics/about.md
@@ -3,6 +3,14 @@ title: What is CashScript?
 sidebar_label: About CashScript
 ---
 
-CashScript is a high-level programming language for smart contracts on Bitcoin Cash. It offers a strong abstraction layer over Bitcoin Cash' native virtual machine, Bitcoin Script. Its syntax is based on Ethereum's smart contract language Solidity, but its functionality is very different since smart contracts on Bitcoin Cash differ greatly from smart contracts on Ethereum. For a detailed comparison of them, refer to the blog post [*Smart Contracts on Ethereum, Bitcoin and Bitcoin Cash*](https://kalis.me/smart-contracts-eth-btc-bch/).
+CashScript is a high-level programming language for smart contracts on Bitcoin Cash. It offers a strong abstraction layer over Bitcoin Cash' native virtual machine, BCH Script. The CashScript syntax is based on Ethereum's smart contract language Solidity, but its functionality is very different since smart contracts on Bitcoin Cash differ greatly from smart contracts on Ethereum.
 
-If you're interested to see what kind of things can be built with CashScript, you can look at the [Showcase](/docs/showcase) or [Examples](/docs/language/examples). If you just want to dive into CashScript, refer to the [Getting Started page](/docs/basics/getting-started) and other pages in the documentation.
+CashScript was created in 2019 and has seen major upgrades over the years, including support for the new script functionality enabled with the different Bitcoin Cash network upgrades, including native introspection and CashTokens. Unrelated to the network upgrades, CashScript has also been upgraded with an advanced transaction builder and integrated debug tooling.
+
+CashScript aims to make programming Bitcoin Cash accessible to a wide range of developers and enable the next-generation of UTXO smart contract applications.
+
+:::tip
+To see what kind of things can be built with CashScript, you can look at the [Showcase](/docs/showcase) or [Examples](/docs/language/examples). 
+
+To just dive into CashScript, refer to the [Getting Started page](/docs/basics/getting-started).
+:::
diff --git a/website/docs/basics/getting-started.md b/website/docs/basics/getting-started.md
index 9e6fe09c..8e372a2c 100644
--- a/website/docs/basics/getting-started.md
+++ b/website/docs/basics/getting-started.md
@@ -77,7 +77,7 @@ This will create an artifact file `TransferWithTimeout.json` from your CashScrip
 
 ## Creating a CashScript Transaction
 
-After creating a contract artifact we can now use the JavaScript SDK to initialise the smart contract and to invoke spending functions on the smart contract UTXOs.We'll continue with the `TransferWithTimeout` artifact generated in the previous steps.
+After creating a contract artifact we can now use the JavaScript SDK to initialise the smart contract and to invoke spending functions on the smart contract UTXOs. We'll continue with the `TransferWithTimeout` artifact generated in the previous steps.
 
 ### Installing the JavaScript SDK
 The JavaScript SDK can be installed into your project with NPM. Note that CashScript is a [Pure ESM package](https://gist.github.com/sindresorhus/a39789f98801d908bbc7ff3ecc99d99c).

From 6b3f04a9b9c3df716e5c718b614f032b3eca783c Mon Sep 17 00:00:00 2001
From: Mathieu Geukens <mr-zwets@protonmail.com>
Date: Thu, 30 May 2024 12:00:53 +0200
Subject: [PATCH 105/171] single place with all compiler info

---
 website/docs/basics/cli.md        | 47 ++++++++++++++++++++++++++++---
 website/docs/sdk/instantiation.md | 34 ----------------------
 2 files changed, 43 insertions(+), 38 deletions(-)

diff --git a/website/docs/basics/cli.md b/website/docs/basics/cli.md
index 9a529770..39085d65 100644
--- a/website/docs/basics/cli.md
+++ b/website/docs/basics/cli.md
@@ -1,17 +1,22 @@
 ---
-title: Command Line Interface
+title: Compiler
 ---
 
-The `cashc` command line interface is used to compile CashScript `.cash` files into `.json` artifact files. These artifacts can be imported and used by the JavaScript SDK or other libraries / applications that use CashScript. For more information on this artifact format refer to [Artifacts](/docs/language/artifacts).
+The CashScript compiler is called `cashc` and is used to compile CashScript `.cash` contract files into `.json` artifact files.
+These artifact files can be used to instantiate a CashScript contract with the help of the CashScript SDK. For more information on this artifact format refer to [Artifacts](/docs/language/artifacts).
 
-## Installation
+## Command Line Interface
+
+The `cashc` command line interface is used to compile CashScript `.cash` files into `.json` artifact files.
+
+### Installation
 You can use `npm` to install the `cashc` command line tool globally.
 
 ```bash
 npm install -g cashc
 ```
 
-## Usage
+### CLI Usage
 The `cashc` CLI tool can be used to compile `.cash` files to JSON artifact files.
 
 ```bash
@@ -26,3 +31,37 @@ Options:
   -s, --size           Display the size in bytes of the compiled bytecode.
   -?, --help           Display help
 ```
+
+## Javascript Compilation
+Generally CashScript contracts are compiled to an Artifact JSON file using the CLI compiler. As an alternative to this, CashScript contracts can be compiled from within JavaScript apps using the `cashc` package. This package exports two compilation functions.
+
+```bash
+npm install cashc
+```
+
+### compileFile()
+```ts
+compileFile(sourceFile: PathLike): Artifact
+```
+
+Compiles a CashScript contract from a source file. This is the recommended compile method if you're using Node.js and you have a source file available.
+
+#### Example
+```ts
+const P2PKH = compileFile(new URL('p2pkh.cash', import.meta.url));
+```
+
+### compileString()
+```ts
+compileString(sourceCode: string): Artifact
+```
+
+Compiles a CashScript contract from a source code string. This is the recommended compile method if you're building a webapp, because `compileFile()` only works from a Node.js context. This is also the recommended method if no source file is locally available (e.g. the source code is retrieved with a REST API).
+
+```ts
+const baseUrl = 'https://raw.githubusercontent.com/Bitcoin-com/cashscript'
+const result = await fetch(`${baseUrl}/master/examples/p2pkh.cash`);
+const source = await result.text();
+
+const P2PKH = compileString(source);
+```
\ No newline at end of file
diff --git a/website/docs/sdk/instantiation.md b/website/docs/sdk/instantiation.md
index 8a64a0ab..15bb0f9f 100644
--- a/website/docs/sdk/instantiation.md
+++ b/website/docs/sdk/instantiation.md
@@ -306,40 +306,6 @@ interface Utxo {
 }
 ```
 
-## CashScript Compiler
-Generally CashScript contracts are compiled to an Artifact JSON file using the CLI compiler. As an alternative to this, CashScript contracts can be compiled from within JavaScript apps using the `cashc` package. This package needs to be installed separately and exports two compilation functions.
-
-```bash
-npm install cashc
-```
-
-### compileFile()
-```ts
-compileFile(sourceFile: PathLike): Artifact
-```
-
-Compiles a CashScript contract from a source file. This is the recommended compile method if you're using Node.js and you have a source file available.
-
-#### Example
-```ts
-const P2PKH = compileFile(new URL('p2pkh.cash', import.meta.url));
-```
-
-### compileString()
-```ts
-compileString(sourceCode: string): Artifact
-```
-
-Compiles a CashScript contract from a source code string. This is the recommended compile method if you're building a webapp, because `compileFile()` only works from a Node.js context. This is also the recommended method if no source file is locally available (e.g. the source code is retrieved with a REST API).
-
-```ts
-const baseUrl = 'https://raw.githubusercontent.com/Bitcoin-com/cashscript'
-const result = await fetch(`${baseUrl}/master/examples/p2pkh.cash`);
-const source = await result.text();
-
-const P2PKH = compileString(source);
-```
-
 [fetch-api]: https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API
 [bip68]: https://github.com/bitcoin/bips/blob/master/bip-0068.mediawiki
 [wif]: https://en.bitcoin.it/wiki/Wallet_import_format

From 9a0a6c5aab848cb9b07db8a6e977bcd5324817e8 Mon Sep 17 00:00:00 2001
From: Mathieu Geukens <mr-zwets@protonmail.com>
Date: Thu, 30 May 2024 13:10:09 +0200
Subject: [PATCH 106/171] separate page for network-provider

---
 website/docs/sdk/instantiation.md    | 148 +++++----------------------
 website/docs/sdk/network-provider.md | 123 ++++++++++++++++++++++
 website/sidebars.js                  |   2 +-
 3 files changed, 151 insertions(+), 122 deletions(-)
 create mode 100644 website/docs/sdk/network-provider.md

diff --git a/website/docs/sdk/instantiation.md b/website/docs/sdk/instantiation.md
index 15bb0f9f..a10c543e 100644
--- a/website/docs/sdk/instantiation.md
+++ b/website/docs/sdk/instantiation.md
@@ -27,7 +27,7 @@ A CashScript contract can be instantiated by providing an `Artifact` object, a l
 
 An `Artifact` object is the result of compiling a CashScript contract. See the [Language Documentation](/docs/language/artifacts) for more information on Artifacts. Compilation can be done using the standalone [`cashc` CLI](/docs/basics/cli) or programmatically with the `cashc` NPM package (see [CashScript Compiler](#cashscript-compiler)).
 
-The `NetworkProvider` option is used to manage network operations for the CashScript contract. By default, a mainnet `ElectrumNetworkProvider` is used, but alternative network providers can be used. See the section on [NetworkProvider](#networkprovider) below.
+The `NetworkProvider` option is used to manage network operations for the CashScript contract. By default, a mainnet `ElectrumNetworkProvider` is used, but the network providers can be configured. See the docs on [NetworkProvider](/docs/sdk/network-provider).
 
 The `addressType` option is used to choose between a `p2sh32` and `p2sh20` address for the CashScript contract. By default `p2sh32` is used because it has increased cryptographic security but it is not yet supported by all wallets.
 
@@ -46,9 +46,11 @@ import P2PKH from './p2pkh.json';
 // Or compile a contract file
 const P2PKH = compileFile(new URL('p2pkh.cash', import.meta.url));
 
-const provider = new ElectrumNetworkProvider('testnet4');
+const provider = new ElectrumNetworkProvider('chipnet');
 const addressType = 'p2sh20';
-const contract = new Contract(P2PKH, [alicePkh], , options:{ provider, addressType});
+const contractArguments = [alicePkh]
+const options = { provider, addressType}
+const contract = new Contract(P2PKH, contractArguments, options);
 ```
 
 ### address
@@ -153,9 +155,10 @@ const utxos = await contract.getUtxos()
 contract.functions.<functionName>(...args: Argument[]): Transaction
 ```
 
-The main way to use smart contracts once they have been instantiated is through the functions defined in the CashScript source code. These functions can be found by their name under `functions` member field of a contract object. To call these functions, the parameters need to match ones defined in the CashScript code.
+Once a smart contract has been instantiated, you can invoke a contract function to spend from the contract with the '[Simple transaction-builder](/docs/sdk/transactions)' by calling the function name under the `functions` member field of a contract object.
+To call these functions succesfully, the parameters provided to the function need to match ones defined in the CashScript code.
 
-These contract functions return an incomplete `Transaction` object, which needs to be completed by providing outputs of the transaction. More information about sending transactions is found on the [*Sending Transactions*](/docs/sdk/transactions) page.
+These contract functions return an incomplete `Transaction` object, which needs to be completed by providing outputs of the transaction. For more information see the [Simple transaction-builder](/docs/sdk/transactions) page.
 
 #### Example
 ```ts
@@ -167,6 +170,25 @@ const tx = await contract.functions
   .send()
 ```
 
+### Contract unlockers
+
+```ts
+contract.unlock.<functionName>(...args: Argument[]): Unlocker
+```
+
+Once a smart contract has been instantiated, you can invoke a contract function on a smart contract UTXO to use the '[Advanced transaction-builder](/docs/sdk/transactions-advanced)' by calling the function name under the `unlock` member field of a contract object.
+To call these functions succesfully, the parameters provided to the function need to match ones defined in the CashScript code.
+
+These contract functions return an incomplete `transactionBuilder` object, which needs to be completed by providing outputs of the transaction. For more information see the [Advanced transaction-builder](/docs/sdk/transactions-advanced) page.
+
+```ts
+import { contract, transactionBuilder } from './somewhere.js';
+
+const contractUtxos = await contract.getUtxos();
+
+transactionBuilder.addInput(contractUtxos[0], contract.unlock.spend());
+```
+
 ## SignatureTemplate
 ```ts
 new SignatureTemplate(signer: Keypair | Uint8Array | string, hashtype?: HashType)
@@ -196,122 +218,6 @@ const wif = 'L4vmKsStbQaCvaKPnCzdRArZgdAxTqVx8vjMGLW5nHtWdRguiRi1';
 const sig = new SignatureTemplate(wif, HashType.SIGHASH_ALL | HashType.SIGHASH_UTXOS );
 ```
 
-## NetworkProvider
-The CashScript SDK needs to connect to the BCH network to perform certain operations, like retrieving the contract's balance, or sending transactions. All network functionality that the CashScript SDK needs is encapsulated in a network provider. This allows different network providers to be used and makes it easy to swap out dependencies.
-
-### ElectrumNetworkProvider
-```ts
-new ElectrumNetworkProvider(network?: Network, electrum?: ElectrumCluster)
-```
-
-The ElectrumNetworkProvider uses [electrum-cash][electrum-cash] to connect to the BCH network. This is the recommended provider for most use cases and is used as the default when no other provider is provided. Both `network` and `electrum` parameters are optional, and they default to mainnet and a 2-of-3 ElectrumCluster with a number of reliable electrum servers.
-
-#### Example
-```ts
-const provider = new ElectrumProvider('testnet');
-```
-
-### FullStackNetworkProvider
-```ts
-new FullStackNetworkProvider(network: Network, bchjs: BCHJS)
-```
-
-The FullStackNetworkProvider uses [FullStack.cash][fullstack]' infrastructure to connect to the BCH network. FullStack.cash' offers dedicated infrastructure and support plans for larger projects. Both `network` and `bchjs` parameters are mandatory, where `bchjs` is an instance of FullStack.cash' [BCHJS][bchjs].
-
-:::note
-The FullStackNetworkProvider does not currently support CashTokens. If you want to use CashTokens, please use the ElectrumNetworkProvider instead.
-:::
-
-#### Example
-```js
-import BCHJS from '@psf/bch-js';
-
-const restURL = 'https://api.fullstack.cash/v3/';
-const apiToken = 'eyJhbGciO...'; // Your JWT token here.
-const bchjs = new BCHJS({ restURL, apiToken });
-
-const provider = new FullStackNetworkProvider('mainnet', bchjs);
-```
-
-### BitcoinRpcNetworkProvider
-```ts
-new BitcoinRpcNetworkProvider(network: Network, url: string, options?: any)
-```
-
-The BitcoinRpcNetworkProvider uses a direct connection to a BCH node. Note that a regular node does not have indexing, so any address of interest (e.g. the contract address) need to be registered by the node *before* sending any funds to those addresses. Because of this it is recommended to use a different network provider unless you have a specific reason to use the RPC provider.
-
-:::note
-The BitcoinRpcNetworkProvider does not currently support CashTokens. If you want to use CashTokens, please use the ElectrumNetworkProvider instead.
-:::
-
-#### Example
-```js
-const provider = new BitcoinRpcNetworkProvider('mainnet', 'http://localhost:8332');
-```
-
-### MockNetworkProvider
-```ts
-new MockNetworkProvider()
-```
-
-The `MockNetworkProvider` is a special network provider that allows you to evaluate transactions locally without interacting with the Bitcoin Cash network. This is useful when writing automated tests for your contracts, or when debugging your contract locally. You can read more about the `MockNetworkProvider` and debugging in the [debugging guide](/docs/sdk/debugging).
-
-### Custom NetworkProviders
-A big strength of the NetworkProvider setup is that it allows you to implement custom providers. So if new BCH libraries are created in the future, it is simple to use them with CashScript. This also potentially enables the CashScript SDK to be used with other (partially) compatible networks, such as BTC or BSV.
-
-#### NetworkProvider interface
-```ts
-interface NetworkProvider {
-  /**
-   * Variable indicating the network that this provider connects to.
-   */
-  network: Network;
-
-  /**
-   * Retrieve all UTXOs (confirmed and unconfirmed) for a given address.
-   * @param address The CashAddress for which we wish to retrieve UTXOs.
-   * @returns List of UTXOs spendable by the provided address.
-   */
-  getUtxos(address: string): Promise<Utxo[]>;
-
-  /**
-   * @returns The current block height.
-   */
-  getBlockHeight(): Promise<number>;
-
-  /**
-   * Retrieve the Hex transaction details for a given transaction ID.
-   * @param txid Hex transaction ID.
-   * @throws {Error} If the transaction does not exist
-   * @returns The full hex transaction for the provided transaction ID.
-   */
-  getRawTransaction(txid: string): Promise<string>;
-
-  /**
-   * Broadcast a raw hex transaction to the network.
-   * @param txHex The raw transaction hex to be broadcast.
-   * @throws {Error} If the transaction was not accepted by the network.
-   * @returns The transaction ID corresponding to the broadcast transaction.
-   */
-  sendRawTransaction(txHex: string): Promise<string>;
-}
-
-type Network = 'mainnet' | 'testnet3' | 'testnet4' | 'chipnet' | 'regtest';
-
-interface Utxo {
-  txid: string;
-  vout: number;
-  satoshis: bigint;
-  token?: TokenDetails;
-}
-```
-
-[fetch-api]: https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API
-[bip68]: https://github.com/bitcoin/bips/blob/master/bip-0068.mediawiki
 [wif]: https://en.bitcoin.it/wiki/Wallet_import_format
 [ecpair]: https://bchjs.fullstack.cash/#api-ECPair
 [privatekey]: https://github.com/bitpay/bitcore/blob/master/packages/bitcore-lib-cash/docs/privatekey.md
-[electrum-cash]: https://www.npmjs.com/package/electrum-cash
-[fullstack]: https://fullstack.cash/
-[bchjs]: https://bchjs.fullstack.cash/
-[bitbox]: https://developer.bitcoin.com/bitbox/
diff --git a/website/docs/sdk/network-provider.md b/website/docs/sdk/network-provider.md
new file mode 100644
index 00000000..ddb0fd80
--- /dev/null
+++ b/website/docs/sdk/network-provider.md
@@ -0,0 +1,123 @@
+---
+title: Network Provider
+---
+
+The CashScript SDK needs to connect to the BCH network to perform certain operations, like retrieving the contract's balance, or sending transactions. By default the network provider is an `ElectrumNetworkProvider`.
+
+## ElectrumNetworkProvider
+
+The ElectrumNetworkProvider uses [electrum-cash][electrum-cash] to connect to the BCH network. Both `network` and `electrum` parameters are optional, and they default to mainnet and a 2-of-3 ElectrumCluster with a number of reliable electrum servers.
+```ts
+new ElectrumNetworkProvider(network?: Network, electrum?: ElectrumCluster)
+```
+
+#### Example
+```ts
+const provider = new ElectrumProvider('chipnet');
+```
+
+:::note
+In some cases it might be desirable to overwrite the 2-of-3 ElectrumCluster default to use only a 1-of-1 cluster because of network latency.
+:::
+
+## Interface NetworkProvider
+
+### Network
+```ts
+type Network = 'mainnet' | 'testnet3' | 'testnet4' | 'chipnet' | 'regtest';
+```
+
+The network parameter can be one of 5 different options.
+
+#### Example
+```ts
+const provider = new ElectrumProvider('chipnet');
+```
+
+### getUtxos
+```ts
+async provider.getUtxos(address: string): Promise<Utxo[]>;
+```
+Returns all UTXOs on specific address. Both confirmed and unconfirmed UTXOs are included.
+
+```ts
+interface Utxo {
+  txid: string;
+  vout: number;
+  satoshis: bigint;
+  token?: TokenDetails;
+}
+```
+
+#### Example
+```ts
+const userUtxos = await provider.getUtxos(userAddress)
+```
+
+### getBlockHeight
+```ts
+async provider.getBlockHeight(): Promise<number>;
+```
+Get the current blockHeight.
+
+#### Example
+```ts
+const currentBlockHeight = await provider.getBlockHeight()
+```
+
+### getRawTransaction
+```ts
+async provider.getRawTransaction(txid: string): Promise<string>;
+```
+
+Retrieve the Hex transaction details for a given transaction ID.
+
+#### Example
+```ts
+const rawTransaction = await provider.getRawTransaction(txid)
+```
+
+### sendRawTransaction
+```ts
+async provider.sendRawTransaction(txHex: string): Promise<string>;
+```
+Broadcast a raw hex transaction to the network.
+
+#### Example
+```ts
+const txId = await provider.sendRawTransaction(txHex)
+```
+
+## Advanced Options
+
+All network functionality that the CashScript SDK needs is encapsulated in a network provider. This allows different network providers to be used and makes it easy to swap out dependencies.
+
+### MockNetworkProvider
+```ts
+new MockNetworkProvider()
+```
+
+The `MockNetworkProvider` is a special network provider that allows you to evaluate transactions locally without interacting with the Bitcoin Cash network. This is useful when writing automated tests for your contracts, or when debugging your contract locally. You can read more about the `MockNetworkProvider` and debugging in the [debugging guide](/docs/sdk/debugging).
+
+#### Example
+```ts
+const provider = new MockNetworkProvider();
+const newUtxo = randomUtxo({satoshis: 10_000n})
+provider.addUtxo(contractAddress, newUtxo);
+```
+
+### Other NetworkProviders
+
+There are two alternative network providers implemented. There is the `FullStackNetworkProvider` which uses [FullStack.cash][fullstack]' infrastructure to connect to the BCH network. There's also the `BitcoinRpcNetworkProvider` uses a direct connection to a Bitcoin Cash node. Currently neither supports CashTokens, so it is recommended to use the ElectrumNetworkProvider.
+
+### Custom NetworkProviders
+A big strength of the NetworkProvider setup is that it allows you to implement custom providers. So if new BCH libraries are created in the future, it is simple to use them with CashScript. Custom NetworkProviders also potentially enables the CashScript SDK to be used with other (partially) compatible networks, such as BTC or BSV.
+
+:::info
+To implement a Custom NetworkProvider refer to the [NetworkProvider interface](https://github.com/CashScript/cashscript/blob/master/packages/cashscript/src/network/NetworkProvider.ts).
+:::
+
+
+[electrum-cash]: https://www.npmjs.com/package/electrum-cash
+[fullstack]: https://fullstack.cash/
+[bchjs]: https://bchjs.fullstack.cash/
\ No newline at end of file
diff --git a/website/sidebars.js b/website/sidebars.js
index 8df02acb..0476bb18 100755
--- a/website/sidebars.js
+++ b/website/sidebars.js
@@ -28,10 +28,10 @@ module.exports = {
       label: 'JavaScript SDK',
       items: [
         'sdk/instantiation',
+        'sdk/network-provider',
         'sdk/transactions',
         'sdk/transactions-advanced',
         'sdk/debugging',
-        'sdk/examples',
       ],
     },
     {

From df69d9b3751ac23035d49770cee926231f888196 Mon Sep 17 00:00:00 2001
From: Mathieu Geukens <mr-zwets@protonmail.com>
Date: Thu, 30 May 2024 13:56:46 +0200
Subject: [PATCH 107/171] add more info types

---
 website/docs/language/types.md | 45 +++++++++++++++++++++++++---------
 1 file changed, 34 insertions(+), 11 deletions(-)

diff --git a/website/docs/language/types.md b/website/docs/language/types.md
index 09f3d300..be16cb6c 100644
--- a/website/docs/language/types.md
+++ b/website/docs/language/types.md
@@ -27,10 +27,22 @@ Operators:
 - Comparisons: `<=`, `<`, `==`, `!=`, `>=`, `>` (all evaluate to `bool`)
 - Arithmetic operators: `+`, `-`, unary `-`, `*`, `/`, `%` (modulo).
 
-Note the clear lack of the `**` (exponentiation) operator as well as any bitwise operators.
+Note the lack of the `**` (exponentiation) operator as well as any bitwise operators.
+
+### Over- & Underflows
+
+The maximum range for 64-bit integers is `-9223372036854775807` to `9223372036854775807`, operations exceeding these limits will fail the transaction. So operations like summation, subtraction and multiplation should take in to account these boundry cases with over- or underflows.
+
+:::caution
+Contract authors should always consider whether `+`, `-` and `*` operations can cause under- or overflows and how this would impact contract security.
+:::
+
+### Division by Zero
+
+The script will fail when the right hand side of division or modulo operations is zero.
 
 :::caution
-The script will fail when the right hand side of Division and modulo operations is zero.
+Contract authors should always consider whether `/` and `%` operations have division-by-zero edge cases and how this would impact contract security.
 :::
 
 ### Date Parsing
@@ -64,7 +76,7 @@ The script will fail if `split()` is called with an index that is out of bounds.
 :::
 
 ## Bytes
-`bytes`: Byte sequence. Can optionally be bound to a byte length by specifying e.g. `bytes4`, `bytes32`, `bytes64`. It is also possible to use `byte` as an alias for `bytes1`.
+`bytes`: Byte sequence. Prefixed with `0x` to indicate hexadecimal sequence. Can optionally be bound to a byte length by specifying e.g. `bytes4`, `bytes32`, `bytes64`. It is also possible to use `byte` as an alias for `bytes1`.
 
 Operators:
 
@@ -85,6 +97,12 @@ Members:
 The script will fail if `split()` is called with an index that is out of bounds.
 :::
 
+#### Example
+```solidity
+bytes mintingCapability = 0x02;
+bytes noCapability = 0x;
+```
+
 ## Bytes types with semantic meaning
 Some byte sequences hold specific meanings inside Bitcoin Cash contracts. These have been granted their own types separate from the regular `bytes` type.
 
@@ -137,14 +155,6 @@ require(bitcoin == cash);
 ## Type Casting
 Type casting can be done both explicitly and implicitly as illustrated below. `pubkey`, `sig` and `datasig` can be implicitly cast to `bytes`, meaning they can be used anywhere where you would normally use a `bytes` type. Explicit type casting can be done with a broader range of types, but is still limited. The syntax of this explicit type casting is illustrated below. Note that you can also cast to bounded `bytes` types.
 
-:::note
-When casting integer types to bytes of a certain size, the integer value is padded with zeros. e.g. `bytes4(0) == 0x00000000`. It is also possible to pad with a variable number of zeros, by passing in a `size` parameter, which indicates the size of the output. e.g. `bytes(0, 4 - 2) == 0x0000`. Lastly, note that `bytes(0) == 0x`.
-:::
-
-:::caution
-When casting bytes types to integer, you should be sure that the bytes value fits inside a 64-bit signed integer, or the script will fail.
-:::
-
 See the following table for information on which types can be cast to other which other types.
 
 | Type    | Implicitly castable to | Explicitly castable to             |
@@ -163,3 +173,16 @@ pubkey pk = pubkey(0x0000);
 bytes editedPk = bytes(pk) + 0x1234;
 bytes4 integer = bytes4(25);
 ```
+
+### Int to Byte Casting
+
+When casting integer types to bytes of a certain size, the integer value is padded with zeros. e.g. `bytes4(0) == 0x00000000`. It is also possible to pad with a variable number of zeros, by passing in a `size` parameter, which indicates the size of the output. e.g. `bytes(0, 4 - 2) == 0x0000`. The size casting can be a very important feature when keeping local state in an nftCommitment or in the simulated state.
+
+:::note
+VM numbers follow Script Number format (A.K.A. CSCriptNum), to convert VM number to bytes or the revserse, it's recommended to use helperfunctions for these conversions from libraries like Libauth.
+:::
+
+
+:::caution
+When casting bytes types to integer, you should be sure that the bytes value fits inside a 64-bit signed integer, or the script will fail.
+:::

From d726562a6099d1ab0c2411545894ed53315aee97 Mon Sep 17 00:00:00 2001
From: Mathieu Geukens <mr-zwets@protonmail.com>
Date: Thu, 30 May 2024 15:01:03 +0200
Subject: [PATCH 108/171] separate debugging & testing

---
 website/docs/guides/debugging.md              | 49 +++++++++++++++++++
 .../sdk/{debugging.md => testing-setup.md}    | 31 ++++--------
 website/sidebars.js                           |  3 +-
 3 files changed, 60 insertions(+), 23 deletions(-)
 create mode 100644 website/docs/guides/debugging.md
 rename website/docs/sdk/{debugging.md => testing-setup.md} (70%)

diff --git a/website/docs/guides/debugging.md b/website/docs/guides/debugging.md
new file mode 100644
index 00000000..07d96008
--- /dev/null
+++ b/website/docs/guides/debugging.md
@@ -0,0 +1,49 @@
+---
+title: Debugging
+---
+
+Debugging is no walk in the park, this is especially true for debugging complex smart contracts. Luckily there is a handful of startegies that can make it easier for developers to discover bugs with their contracts.
+
+Generally there are 2 broad categories of smart contract bugs
+
+- A bug in the smart contract which doesn't allow for valid spending
+- A bug in your invokation making the transaction invalid.
+
+## Simple Transaction Builder
+
+The [Simple Transaction Builder](/docs/sdk/transactions) has deep integration with libauth to enable local transaction evaluation without actual interaction with the Bitcoin Cash network. This allows for advanced debugging functionality.
+
+:::note
+Currently the CashScript debugging tools only work with the [Simple Transaction Builder](/docs/sdk/transactions). We plan to extend the debugging tools to work with the [Advanced Transaction Builder](/docs/sdk/transactions-advanced) in the future.
+:::
+
+
+### Error messages
+
+If a CashScript transaction is sent using any network provider and is rejected by the network (or the `MockNetworkProvider`), the transaction will be evaluated locally using libauth to provide failure reasons and debug information in addition to the failure reason communicated by the network.
+
+### Console Logging
+
+### Bitauth IDE
+
+It is possible to export the transaction for step-by-step debugging in the BitAuth IDE. This will allow you to inspect the transaction in detail, and see exactly why the transaction failed. To do so, you can call the `bitauthUri()` function on the transaction. This will return a URI that can be opened in the BitAuth IDE. This URI is also displayed in the console whenever a transaction fails.
+
+```ts
+const transaction = contract.functions.exampleFunction(0n).to(contract.address, 10000n);
+const uri = await transaction.bitauthUri();
+```
+
+:::caution
+It is unsafe to debug transactions on mainnet as private keys will be exposed to BitAuth IDE and transmitted over the network.
+:::
+
+## Advanced Transaction Builder
+
+Because the advanced transaction builder does not yet support the advanced debugging tooling, you are left with just a few strategies.
+
+### Failing Opcode
+
+### Removing Contract Checks
+
+### Single Check Contract
+
diff --git a/website/docs/sdk/debugging.md b/website/docs/sdk/testing-setup.md
similarity index 70%
rename from website/docs/sdk/debugging.md
rename to website/docs/sdk/testing-setup.md
index 547553d7..5fe11b4c 100644
--- a/website/docs/sdk/debugging.md
+++ b/website/docs/sdk/testing-setup.md
@@ -1,8 +1,10 @@
 ---
-title: Debugging & Testing
+title: Testing Setup
 ---
 
-To speed up contract development and ensure contract quality and security, CashScript takes advantage of deep integration with libauth. This allows for local transaction evaluation without actual interaction with the Bitcoin Cash network. For a quick start, you can check out [our testing-suite example](https://github.com/CashScript/cashscript/tree/next/examples/testing-suite) that demonstrates a full development and testing environment for CashScript contracts, similar to Hardhat on Ethereum.
+Because of deep integration with libauth, CashScript allows for local transaction evaluation without actual interaction with any Bitcoin Cash test network. With a MockNetwork environment you can create virtual UTXOs without doing additional preparations. This has the advantages of not needing any testnet balances, not having to set up smart contract UTXOs and not having network latency. This setup allows for using a testing framework to run repeated automated tests for increased smart contract security.
+
+For a quick start with a CashScript testing setup, you can check out [our testing-suite example](https://github.com/CashScript/cashscript/tree/next/examples/testing-suite) that demonstrates a full development and testing environment for CashScript contracts, similar to Hardhat on Ethereum.
 
 :::caution
 The CashScript debugging tools only work with the [Simple Transaction Builder](/docs/sdk/transactions). We plan to extend the debugging tools to work with the [Advanced Transaction Builder](/docs/sdk/transactions-advanced) in the future.
@@ -28,19 +30,12 @@ provider.addUtxo(aliceAddress, randomUtxo({
 The `MockNetworkProvider` only evaluates the transactions locally, so any UTXOs added to a transaction still count as "unspent", even after mocking a `sendTransaction` using the provider.
 :::
 
-## Transaction evaluation
-
-If a CashScript transaction is sent using any network provider and is rejected by the network (or the `MockNetworkProvider`), the transaction will be evaluated locally using libauth to provide failure reasons and debug information in addition to the failure reason communicated by the network.
+## Jest extension
 
-It is possible to export the transaction for step-by-step debugging in the BitAuth IDE. This will allow you to inspect the transaction in detail, and see exactly why the transaction failed. To do so, you can call the `bitauthUri()` function on the transaction. This will return a URI that can be opened in the BitAuth IDE. This URI is also displayed in the console whenever a transaction fails.
-
-```ts
-const transaction = contract.functions.exampleFunction(0n).to(contract.address, 10000n);
-const uri = await transaction.bitauthUri();
-```
+To make writing automated tests for CashScript contracts easier, we provide a Jest extension that enables easy testing of `console.log` values and `require` error messages. To use the extension, you can import it from `cashscript/dist/test/JestExtensions`.
 
-:::caution
-It is unsafe to debug transactions on mainnet as private keys will be exposed to BitAuth IDE and transmitted over the network.
+:::tip
+If you're using a different testing framework, you can test for `console.log` values by spying on the console output, and test for `require` error messages by asserting that an error is thrown with a specific error message.
 :::
 
 ## Automated testing
@@ -63,15 +58,7 @@ The `require` statement accepts an optional error message as a second argument.
 Similar to `console.log`, the error message in a `require` statement is only available in debug evaluation of a transaction, so the error message has no impact on the compiled bytecode or regular (non-debug) execution.
 :::
 
-### Jest extension
-
-To make writing automated tests for CashScript contracts easier, we provide a Jest extension that enables easy testing of `console.log` values and `require` error messages. To use the extension, you can import it from `cashscript/dist/test/JestExtensions`.
-
-:::tip
-If you're using a different testing framework, you can test for `console.log` values by spying on the console output, and test for `require` error messages by asserting that an error is thrown with a specific error message.
-:::
-
-### Example
+## Example
 
 ```solidity title="Example contract"
 contract Example() {
diff --git a/website/sidebars.js b/website/sidebars.js
index 0476bb18..c0bfe798 100755
--- a/website/sidebars.js
+++ b/website/sidebars.js
@@ -31,7 +31,7 @@ module.exports = {
         'sdk/network-provider',
         'sdk/transactions',
         'sdk/transactions-advanced',
-        'sdk/debugging',
+        'sdk/testing-setup',
       ],
     },
     {
@@ -40,6 +40,7 @@ module.exports = {
       items: [
         'guides/syntax-highlighting',
         'guides/covenants',
+        'guides/debugging',
         'guides/optimization'
       ],
     },

From 5f8f6cc67dbff888fecce67cb212f528b9cefc76 Mon Sep 17 00:00:00 2001
From: Mathieu Geukens <mr-zwets@protonmail.com>
Date: Thu, 30 May 2024 15:32:30 +0200
Subject: [PATCH 109/171] fix links to debugging page

---
 website/docs/language/contracts.md   | 4 ++--
 website/docs/sdk/network-provider.md | 2 +-
 website/docs/sdk/transactions.md     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/website/docs/language/contracts.md b/website/docs/language/contracts.md
index 3e31a86d..8a54a77e 100644
--- a/website/docs/language/contracts.md
+++ b/website/docs/language/contracts.md
@@ -61,7 +61,7 @@ CashScript functions are made up of a collection of statements that determine wh
 ### require()
 The most important statement of CashScript contracts is the `require` statement. This statement takes a boolean expression and checks that it evaluates to `true`. If it evaluates to `false` instead, the transaction fails. This statement is used to ensure that the requirements are met to spend money from the contract.
 
-The `require` statement can also take an optional error message as a second argument. This can be used to provide more information about why the transaction failed when running the transaction in debug mode. You can read more about debugging in the [debugging guide](/docs/sdk/debugging).
+The `require` statement can also take an optional error message as a second argument. This can be used to provide more information about why the transaction failed when running the transaction in debug mode. You can read more about debugging in the [debugging guide](/docs/guides/debugging).
 
 :::note
 The error message in a `require` statement is only available in debug evaluation of a transaction, so the error message has no impact on the compiled bytecode or regular (non-debug) execution.
@@ -130,7 +130,7 @@ contract OneOfTwo(bytes20 pkh1, bytes32 hash1, bytes20 pkh2, bytes32 hash2) {
 ```
 
 ### console.log()
-The `console.log` statement can be used to log values during debug evaluation of a transaction. Any variables or primitive values (such as ints, strings, bytes, etc) can be logged. You can read more about debugging in the [debugging guide](/docs/sdk/debugging).
+The `console.log` statement can be used to log values during debug evaluation of a transaction. Any variables or primitive values (such as ints, strings, bytes, etc) can be logged. You can read more about debugging in the [debugging guide](/docs/guides/debugging).
 
 :::note
 Logging is only available in debug evaluation of a transaction, but has no impact on the compiled bytecode or regular (non-debug) execution.
diff --git a/website/docs/sdk/network-provider.md b/website/docs/sdk/network-provider.md
index ddb0fd80..d4a8d08e 100644
--- a/website/docs/sdk/network-provider.md
+++ b/website/docs/sdk/network-provider.md
@@ -97,7 +97,7 @@ All network functionality that the CashScript SDK needs is encapsulated in a net
 new MockNetworkProvider()
 ```
 
-The `MockNetworkProvider` is a special network provider that allows you to evaluate transactions locally without interacting with the Bitcoin Cash network. This is useful when writing automated tests for your contracts, or when debugging your contract locally. You can read more about the `MockNetworkProvider` and debugging in the [debugging guide](/docs/sdk/debugging).
+The `MockNetworkProvider` is a special network provider that allows you to evaluate transactions locally without interacting with the Bitcoin Cash network. This is useful when writing automated tests for your contracts, or when debugging your contract locally. You can read more about the `MockNetworkProvider` and automated tests on the [testing-setup](/docs/sdk/testing-setup) page.
 
 #### Example
 ```ts
diff --git a/website/docs/sdk/transactions.md b/website/docs/sdk/transactions.md
index 43d36c52..bf78e786 100644
--- a/website/docs/sdk/transactions.md
+++ b/website/docs/sdk/transactions.md
@@ -248,7 +248,7 @@ If you want to debug a transaction locally instead of sending it to the network,
 
 If you prefer a lower-level debugging experience, you can call the `bitauthUri()` function on the transaction. This will return a URI that can be opened in the BitAuth IDE. This URI is also displayed in the console whenever a transaction fails.
 
-You can read more about debugging transactions [here](/docs/sdk/debugging).
+You can read more about debugging transactions [here](/docs/guides/debugging).
 
 :::caution
 It is unsafe to debug transactions on mainnet as private keys will be exposed to BitAuth IDE and transmitted over the network.

From 8dd1efde399a14301cb9259cce376a47d231b650 Mon Sep 17 00:00:00 2001
From: Mathieu Geukens <mr-zwets@protonmail.com>
Date: Thu, 30 May 2024 17:10:49 +0200
Subject: [PATCH 110/171] add to debugging guide

---
 website/docs/guides/debugging.md | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/website/docs/guides/debugging.md b/website/docs/guides/debugging.md
index 07d96008..45cb121d 100644
--- a/website/docs/guides/debugging.md
+++ b/website/docs/guides/debugging.md
@@ -17,16 +17,21 @@ The [Simple Transaction Builder](/docs/sdk/transactions) has deep integration wi
 Currently the CashScript debugging tools only work with the [Simple Transaction Builder](/docs/sdk/transactions). We plan to extend the debugging tools to work with the [Advanced Transaction Builder](/docs/sdk/transactions-advanced) in the future.
 :::
 
-
 ### Error messages
 
 If a CashScript transaction is sent using any network provider and is rejected by the network (or the `MockNetworkProvider`), the transaction will be evaluated locally using libauth to provide failure reasons and debug information in addition to the failure reason communicated by the network.
 
+Read the error message to see which line in the CashScript contract causes the transcation validation to fail. Investigate whether the contract function invocation is the issue (on the javascript SDK side) or whether the issue is in the CashScript contract itself (so you'd need to update your contract and recompile the artifact). If it is not clear **why** the CashScript contract is failing on that line, then you can use the following two strategies: console logging & Bitauth IDE stack trace.
+
 ### Console Logging
 
+To help with debugging you can add `console.log` statements to your CashScript contract file to log variables. This way you investigate whether the variable have the expected values when they get to the failing `require` statement in the CashScript file. After adding the `console.log` statements, recompile your contract so they are added to your contract's Arifact. 
+
 ### Bitauth IDE
 
-It is possible to export the transaction for step-by-step debugging in the BitAuth IDE. This will allow you to inspect the transaction in detail, and see exactly why the transaction failed. To do so, you can call the `bitauthUri()` function on the transaction. This will return a URI that can be opened in the BitAuth IDE. This URI is also displayed in the console whenever a transaction fails.
+Whenever a transaction fails there will be a link in the console to open your smart contract trnasaction in the BitAuth IDE. This will allow you to inspect the transaction in detail, and see exactly why the transaction failed. In the BitAuth IDE you will see the raw BCH Script mapping to each line in your CashScript contract. Find the failing line and investigate the failing OpCode. You can break up the failing line, one opcode at a time to see how the stack evolves and ends with your `require` failure.
+
+It's also possible to export the transaction for step-by-step debugging in the BitAuth IDE without failure. To do so, you can call the `bitauthUri()` function on the transaction. This will return a URI that can be opened in the BitAuth IDE.
 
 ```ts
 const transaction = contract.functions.exampleFunction(0n).to(contract.address, 10000n);
@@ -43,7 +48,14 @@ Because the advanced transaction builder does not yet support the advanced debug
 
 ### Failing Opcode
 
+When a transaction gets rejected by a full node it will return a cryptic error message, read the message carefully to investigate whether the issue is a failing script (failing OpCode) or whether a standarness rule like minimum-relay-fee is violated. If the cause is a failing OpCode, you can check the contract's Artifact to see how many appearances this OpCode has. Sometimes the OpCode only appears once or twice, indicating where the failing `require` statement is. Other times you might see 15 appearances of the OpCode leaving you to try the next strategies.
+
 ### Removing Contract Checks
 
+If your contract fails, you can remove (or comment out) the lines that are the likely cause of the error. After recompiling to a new Artifact you can test whether the remaining subcontract works or fails with a different error. If this is the case then you learned that there is an issue in the removed CashScript code block. In the worst case when you have no indication from the failing opcode (previous strategy) then you will have to try remove different parts of your contract and trying different sub-contracts repeatedly. 
+
+To use this strategy effectively, the contract setup with funding should be automated as to avoid having to send testnet coins manually to each different subcontract. However inefficient, this strategy should always be able to get you to find the failing line in your CashScript contract. Then you can investigate whether the issue is the contract invocation or the `require` statement in the CashScript file.
+
 ### Single Check Contract
 
+If it is unclear whether the issue is the contract invocation or the `require` statement in the CashScript file, it might prove handy to create a 'single-check Contract' which has only the previously failing require statement. The goal then is to discover if your transaction is the issue and you are violating a correct contract requirement or whether the contract is enforcing an incorrect/impossible condition to hold in the spending transaction.

From 9fd45d886de5550d8cd850cb4f1e0288ce004c77 Mon Sep 17 00:00:00 2001
From: Mathieu Geukens <mr-zwets@protonmail.com>
Date: Thu, 30 May 2024 17:37:55 +0200
Subject: [PATCH 111/171] improve coventants guide

---
 website/docs/guides/covenants.md | 40 ++++++++++++++++++++++++++------
 1 file changed, 33 insertions(+), 7 deletions(-)

diff --git a/website/docs/guides/covenants.md b/website/docs/guides/covenants.md
index 499b3109..052b7ac7 100644
--- a/website/docs/guides/covenants.md
+++ b/website/docs/guides/covenants.md
@@ -135,11 +135,17 @@ contract Mecenas(bytes20 recipient, bytes20 funder, int pledge, int period) {
 
 This contract applies similar techniques as the previous two examples to verify the signature, although in this case it does not matter who the *signer* of the transaction is. Since the outputs are restricted with covenants, there is **no way** someone could call this function to send money **anywhere but to the correct outputs**.
 
-### Keeping local State in NFTs
+## Local State
+
+Smart contracts which persist for multiple transactions might want to keep data for later use, this is called local state. With the CashTokens upgrade local state can be kept in the commitment field of the NFT of the smart contract UTXO. Because the state is not kept in the script of the smart contract itself, the address can remain the same. 
 
-Smart contracts which persist for multiple transactions might want to keep data for later use, this is called local state. With the CashTokens upgrade local state can be kept in the commitment field of the NFT of the smart contract UTXO. Because the state is not kept in the script of the smart contract itself, the address can remain the same unlike with the "simulated state" strategy where the P2SH locking bytecode of the new iteration of the contract was restricted to contain the updated state, which caused the address to change each time.
+:::info
+Covenants can also use 'simulated state', where state is kept in the contract script and the contract enforces a new P2SH locking bytecode of the contract with a different state update. This method causes the contract address to change with each state update.
+:::
+
+### Keeping local State in NFTs
 
-To demonstrate this we consider the Mecenas contract again, and focus on a drawback of this contract: you have to claim the funds at exactly the right moment or you're leaving money on the table. Every time you claim money from the contract, the `tx.age` counter is reset, so the next claim is possible 30 days after the previous claim. So if we wait a few days to claim, **these days are basically wasted**.
+To demonstrate the concept of 'local state' we consider the Mecenas contract again, and focus on a drawback of this contract: you have to claim the funds at exactly the right moment or you're leaving money on the table. Every time you claim money from the contract, the `tx.age` counter is reset, so the next claim is possible 30 days after the previous claim. So if we wait a few days to claim, **these days are basically wasted**.
 
 Besides these wasted days it can also be inconvenient to claim at set intervals, rather than the "streaming" model that the Ethereum project [Sablier](https://www.sablier.finance/) employs. Instead of set intervals, you should be able to claim funds at any time during the "money stream". Using local state, we can approach a similar system with BCH.
 
@@ -199,9 +205,22 @@ contract StreamingMecenas(
 
 Instead of having a pledge per 30 day period, we define a pledge per block. At any point in time we can calculate how much money the recipient has earned. Then the covenant **enforces that this amount is withdrawn from the contract**. The remainder is sent to a new stream that **starts at the end of of the previous one**. The locktime used for the last withdrawal from the covenant is kept in the local state to calculate the amount of money the recipient has earned over the passed time. This process of changing the local state in the NFT associated with the smart contractUTXO can be applied to the new stream until the money in the stream runs out.
 
+:::tip
+We use `tx.locktime` to introspect the value of the timelock, and to write the value to the contract local state: the NFT commitment field.
+:::
+
 ### Issuing NFTs as receipts
 
-A covenant that manages funds (BCH + fungible tokens of a certain category) which are pooled together from different people often wants to enable its participants to also exit the covenants with their funds. Instead of keeping track of which address contributed how much in the local state, a better strategy is to issue a receipt for each time funds are added to the pool. Technically this happens by minting a new NFT with in the commitment field the amount of satoshis or fungible tokens that were contributed to the pool and sending this to the address of the contributor. All outputs need to be carefully controlled in the covenant contract code so no additional NFTs can be minted in other outputs. The minted NFTs only differ from the covenant's minting NFT in that there is no minting capability added to the token's categoryID when calling `.tokenCategory`. At withdrawal this NFT commitment data needs to be read and the receipt NFT needs to be burned.
+A covenant that manages funds (BCH + fungible tokens of a certain category) which are pooled together from different people often wants to enable its participants to also exit the covenants with their funds. It would be incredibly hard continuously updating a data structure to keep track of which address contributed how much in the local state of the contract. A much better solution is to issue receipts each time funds are added to the pool! This way the contract does not have a 'global view' of who owns what at any time, but it can validate the receipts when invocing a withdrawal. 
+
+Technically this happens by minting a new NFT with in the commitment field the amount of satoshis or fungible tokens that were contributed to the pool and sending this to the address of the contributor.
+
+:::tip
+Minting NFT receipts allows the contract to offload state to an NFT helf by a user. By default these receipts are easily transferable and tradable because they are generic NFTs.
+:::
+
+Let's take a look at an example contract called `PooledFunds` which has two contract functions: `addFunds` and `withdrawFunds`
+
 
 ```solidity
 contract PooledFunds(
@@ -250,7 +269,7 @@ contract PooledFunds(
             require(tx.outputs[2].tokenCategory == bytes(0));
         }
     }
-    function withdraw(
+    function withdrawFunds(
     ) {
         // Require the covenant contract always lives at index zero with a minting NFT
         require(this.activeInputIndex == 0);
@@ -288,10 +307,17 @@ contract PooledFunds(
 }
 ```
 
-Keeping local state in NFTs and issuing NFTs as receipts are two strategies which can be used to create much more sophisticated decentralized applications such as the AMM-style DEX named [Jedex](https://blog.bitjson.com/jedex-decentralized-exchanges-on-bitcoin-cash/).
+All outputs of the `PooledFunds` contract need to be carefully controlled in the contract code so no additional NFTs can be minted in other outputs as this would allow 'fake' receipts to be created. The user receipt NFTs only differ from the covenant's minting NFT in that there is no minting capability added to the token's categoryID when calling `.tokenCategory`. At withdrawal the receipt needs to be validated and then the NFT commitment data is read to understand the contents of the receipt. In the current contract the receipt NFT also needs to be burned (simply not re-created in the outputs) ensuring the same receipt cannot be used to withdraw twice.
+
+:::caution
+With contracts holding minting NFTs, all outputs need to be carefully controlled in the covenant contract code so no additional (minting) NFTs can un-intentionally be created in other outputs.
+:::
+
 
 ## Conclusion
-We have discussed the main uses for covenants as they exist on Bitcoin Cash today. We've seen how we can achieve different use case by combining transaction output restrictions to `P2SH` and `P2PKH` outputs. We also touched on more advanced subjects such as keeping local state in NFTs. Covenants and CashTokens are the **main differentiating factor** for BCH smart contracts when compared to BTC, while keeping the same **efficient stateless verification**. If you're interested in learning more about the differences in smart contracts among BCH, BTC and ETH, read the article [*Smart contracts on Ethereum, Bitcoin and Bitcoin Cash*](https://kalis.me/smart-contracts-eth-btc-bch/).
+We have discussed the main uses for covenants as they exist on Bitcoin Cash today. We've seen how we can achieve different use case by combining transaction output restrictions to `P2SH` and `P2PKH` outputs. We also touched on more advanced subjects such as keeping local state in NFTs. Covenants and CashTokens are the **main differentiating factor** for BCH smart contracts when compared to BTC, while keeping the same **efficient, atomic verification**.
+
+Keeping local state in NFTs and issuing NFTs as receipts are two strategies which can be used to create much more sophisticated decentralized applications such as the AMM-style DEX named [Jedex](https://blog.bitjson.com/jedex-decentralized-exchanges-on-bitcoin-cash/).
 
 [bitcoin-covenants]: https://fc16.ifca.ai/bitcoin/papers/MES16.pdf
 [bip68]: https://github.com/bitcoin/bips/blob/master/bip-0068.mediawiki

From 92d6db3f202d165b8117efd3266cc0ca938e3c3a Mon Sep 17 00:00:00 2001
From: Mathieu Geukens <mr-zwets@protonmail.com>
Date: Thu, 30 May 2024 18:18:15 +0200
Subject: [PATCH 112/171] Misc. fixes docs website

---
 website/docs/basics/{cli.md => compiler.md} | 0
 website/docs/basics/getting-started.md      | 2 +-
 website/docs/guides/covenants.md            | 4 ++--
 website/docs/guides/debugging.md            | 6 ++++--
 website/docs/sdk/instantiation.md           | 2 +-
 website/sidebars.js                         | 2 +-
 6 files changed, 9 insertions(+), 7 deletions(-)
 rename website/docs/basics/{cli.md => compiler.md} (100%)

diff --git a/website/docs/basics/cli.md b/website/docs/basics/compiler.md
similarity index 100%
rename from website/docs/basics/cli.md
rename to website/docs/basics/compiler.md
diff --git a/website/docs/basics/getting-started.md b/website/docs/basics/getting-started.md
index 8e372a2c..02ab6c70 100644
--- a/website/docs/basics/getting-started.md
+++ b/website/docs/basics/getting-started.md
@@ -114,7 +114,7 @@ console.log(await contract.getUtxos())
 For a code example of how to generate key-pairs with Libauth see the [CashScript Examples](https://github.com/CashScript/cashscript/blob/master/examples/common.ts) `common-ts` file where Alice and Bob's key-pairs are created!
 :::
 
-### Creating a Transction
+### Creating a Transaction
 
 Lastly to spend from the smart contract we've initialised you need to make sure there is an actual contract balance on the smart contract address. Or in other words, you need to make sure there's at least one UTXO with the smart contract locking bytecode so we can spend from it!
 
diff --git a/website/docs/guides/covenants.md b/website/docs/guides/covenants.md
index 052b7ac7..2897a985 100644
--- a/website/docs/guides/covenants.md
+++ b/website/docs/guides/covenants.md
@@ -266,7 +266,7 @@ contract PooledFunds(
         // A 3rd output for change is allowed
         if (tx.outputs.length == 3) {
             // Require that the change output does not mint any NFTs
-            require(tx.outputs[2].tokenCategory == bytes(0));
+            require(tx.outputs[2].tokenCategory == 0x);
         }
     }
     function withdrawFunds(
@@ -302,7 +302,7 @@ contract PooledFunds(
         require(tx.outputs[1].value == amountToWithdraw - 1000);
 
         // require that the receipt NFT is burned
-        require(tx.outputs[1].tokenCategory == bytes(0));
+        require(tx.outputs[1].tokenCategory == 0x);
     }
 }
 ```
diff --git a/website/docs/guides/debugging.md b/website/docs/guides/debugging.md
index 45cb121d..ebe2b167 100644
--- a/website/docs/guides/debugging.md
+++ b/website/docs/guides/debugging.md
@@ -6,8 +6,10 @@ Debugging is no walk in the park, this is especially true for debugging complex
 
 Generally there are 2 broad categories of smart contract bugs
 
-- A bug in the smart contract which doesn't allow for valid spending
-- A bug in your invokation making the transaction invalid.
+- A bug in your invocation making the transaction invalid
+- A bug in the smart contract which prohibits valid spending
+
+Whatever category your bug falls into, the first step is discovering what line in your CashScript contract is making your transaction get rejected. Afterwards, investigation needs to start whether it's a contract bug, or a invocation bug.
 
 ## Simple Transaction Builder
 
diff --git a/website/docs/sdk/instantiation.md b/website/docs/sdk/instantiation.md
index a10c543e..4d08108a 100644
--- a/website/docs/sdk/instantiation.md
+++ b/website/docs/sdk/instantiation.md
@@ -25,7 +25,7 @@ new Contract(
 
 A CashScript contract can be instantiated by providing an `Artifact` object, a list of constructor arguments, and optionally an options object configuring `NetworkProvider` and `addressType`.
 
-An `Artifact` object is the result of compiling a CashScript contract. See the [Language Documentation](/docs/language/artifacts) for more information on Artifacts. Compilation can be done using the standalone [`cashc` CLI](/docs/basics/cli) or programmatically with the `cashc` NPM package (see [CashScript Compiler](#cashscript-compiler)).
+An `Artifact` object is the result of compiling a CashScript contract. See the [Language Documentation](/docs/language/artifacts) for more information on Artifacts. Compilation can be done using the standalone [`cashc` CLI](/docs/basics/compiler) or programmatically with the `cashc` NPM package (see [CashScript Compiler](#cashscript-compiler)).
 
 The `NetworkProvider` option is used to manage network operations for the CashScript contract. By default, a mainnet `ElectrumNetworkProvider` is used, but the network providers can be configured. See the docs on [NetworkProvider](/docs/sdk/network-provider).
 
diff --git a/website/sidebars.js b/website/sidebars.js
index c0bfe798..888c1069 100755
--- a/website/sidebars.js
+++ b/website/sidebars.js
@@ -7,7 +7,7 @@ module.exports = {
         'basics/about',
         // 'basics/about-bch',
         'basics/getting-started',
-        'basics/cli',
+        'basics/compiler',
       ],
     },
     {

From 6e3ca7a61bf89c95dd6e1a7be4a37550f8a4d31a Mon Sep 17 00:00:00 2001
From: Mathieu Geukens <mr-zwets@protonmail.com>
Date: Fri, 31 May 2024 10:42:48 +0200
Subject: [PATCH 113/171] added badgers.cash to showcase

---
 website/docs/showcase.md       |   8 ++++++++
 website/static/img/badgers.png | Bin 0 -> 71393 bytes
 2 files changed, 8 insertions(+)
 create mode 100644 website/static/img/badgers.png

diff --git a/website/docs/showcase.md b/website/docs/showcase.md
index d375afe5..a404c1fd 100644
--- a/website/docs/showcase.md
+++ b/website/docs/showcase.md
@@ -52,6 +52,14 @@ BCH Guru is a non-custodial price-prediction platform and a collectible NFT proj
 
 The CashTokens Studio is an application for creating CashTokens and for their managing metadata updates and reserved supply. The CashTokens Studio uses CashScript to lock the AuthUTXO in an AuthGuard contract to prevent accidentally spending the authority to be able to update the token's metadata or release reserved supply.
 
+## Badgers.cash
+
+<div style={{textAlign: 'center', width: '35%', margin: 'auto', marginBottom: '20px'}}>
+    <a href="https://badgers.cash/" target="_blank"><img style={{borderRadius: '100%'}} src="/img/badgers.png" /></a>
+</div>
+
+BadgerCoin is a fungible CashToken using a novel distibution mechanism. BadgerCoins are earned through staking Bitcoin Cash in the Badgers Smart Contract. The staking duration is predetermined, and depending on the stake amount and period you earn tokens. The website allows for anyone to invoce contract unlocks.
+
 ## BCHouse
 
 <div style={{textAlign: 'center', width: '35%', margin: 'auto', marginBottom: '20px'}}>
diff --git a/website/static/img/badgers.png b/website/static/img/badgers.png
new file mode 100644
index 0000000000000000000000000000000000000000..a0c9613ccfcba40ad52582a02b9dd9c8f4e23127
GIT binary patch
literal 71393
zcmd42gL9<M*FGHEwr$(Cv9Z0eZQHgt&c?RQjcq#<{_^=g_5Kg<RP{{FsqVY)KHbMx
zM=B{u!o%Re009BPOG}BV0099%{@0)&ekhYGJ5fJ>LaanZm83;Qi5#5l&8>c$0Rd4Z
z`X=&A4GQ568!XC1tD&t64-t#HHbzHrrO{yYi&)V%of|rxVX`rkQ8UB^+4T3v5B~{{
z{#%Ps8$|R9ynne{a!Nw}#Yo*0aktw>cyrBvy$vi<HKWFw0Hij}(pXvYi>fxFUlR;z
z2#EwrdTMF0J(Q1cbd}%7r#t$A?#9_a4!G2mrH>MYGQ;lI(8UmIcG`?*KG(#bBoQA4
zKBGDCNWyl8&X1Ay{rW!EVhI6WNj!24T7J40rYanoJ2po-W%db77zWy$R<5cih>OkS
zUMAgzG-us%?kF^jL<tBIQ#K`0e2o1j>ynJI1;2$s!Tnd(!=!O_P|{I8jsg*<k6r)U
zPMyDe>}M3A$wE8Pw*E1|{dxskO;<N28+Q3XUlzME7jK-}eV3GH)3q49AP}vA(HFH8
zH^Aw<eYeRB*h!=SE0`meTR({%H87G^q3=H%Iu?ZGh(dWC+8w|M2!VGnW_6xjyh|G!
zy%s#5pFm<0PAO!HkfT4_0%0sGDF%cFR0^aikw3rpLxFaX(sBj@Vj%sm0eh4Ry8RF#
zU8Lp3Ay2^|k;uTBIB5YtBy1P)UoN8dwzg(=E<mDAW=1Y%rbO;mE|x@+((+20fe4sD
zKtw>&V!~=3>zCc`E_$QBH}9F5dJ6r*<iJTp|Ek1fip0h>8miA}+Ql011i2lvl66NT
zcjUdtyDyGMsNJ_V56y<pX5$Y2H5`n|98!!&(dlS3cTgpwQAc$L1I;^5FtFalcRM-&
z1(8XiHB6=3Fg6W3Kj-m#3p`{4(CZujfBWG{4Y38Gty){nsq=LKzGdD`4@|Z1r|!~v
z_{7*<+<Mvc{<n=yOAG5lOIroD^a4uQ6To<f*m=|b;=j&oYi1T`XXe@i+6njCLay+~
z-F?UThO`B{x|(jTrg{e5;hW?Zd;?{%%&oJ;{(pVhae+8n(9QMoFM3Y4zc)C7Q&Yh^
zep*}ee$D?z(e>3-ga2P&GhjRRjX(c&G}?gE(7-s=z}VHmOcPl1o$da%%<i9<0NI)l
z**qVZw|D)S_uJ-&^g}uS0D6V(lh{DfC|7;qe_3ys{vQ=D__esNriHwkZnNgU*P9WH
z_@=l$`5~AKrMvu$=lGfAXATWk$U8=0K^vWc3GM6u&3ZyObd}e(++HB_^EmUFmuSll
zqfd$5P%E#_*++q9K;7@vdZE@v9{jNy_m0%&^>Tz;E#Ek={Po|SMnCK^BepZ!^Xmcr
zVC$%RshoD-&^HdWbG;M#U<{o7msa0s*h@rYNALc_VVhVTEj^^H=FR&P(6O3jyPv_r
z|FPF*q;Vm)oTyc!6TD*?9K`XW($0+D4b}<P4c4XV0qfALua(}&%=P*GauLtkt@gZj
zyPRXk-aGQAcRQq0XSIN|w2)<RgzNos09ybD71}}oGlU6T!Tj=#FjOEK2r-y8HHaiq
z`+z_LCelAfwW>|+i~pE?c+%V$C~OtURseUZl<dlP{+HWlwYaBNh&Z|Q=UX6o^x;Q)
z4LkGerux7SupBvM5<xMIFmZ87+1oSn4+gtnLSn^%1W}PlnBavX7lfM6#b3g6wYpTl
z=Xr0?O;Ii-{=6q+z1|SWmi067m)7o!t!xezx_E|)m;|>+L&@&ae3Ff!{-Eyh;f2;l
zLx}jaZ4>9rpz!Yg{{AizaAZHxf<Fx9r=3eoJk;V18#0qz=Cz7oxEIeE!MVlcb}ruK
z*}kPcr|&$HFoj4bk~czOy>p$jSUy;fl1($`R{hs%;H=&yyh)Ag4;$A&+o!7p0zZC{
zngm9%gJ&Aq6^1?^bEHjQ7;f!1v$b(&bwiwwEA{nDCJ7e;Matd%Mk&CJMMB9e>e7G+
z9x;@&_JoZTLMem}02%}W76rp2xHfe^0d67K?!WMMbNJmBE+wKhtmYG#_>Amd#SZcq
z+G=1DCQH6SgmM1E?7tvRHtX^QA{9{4W{nFb$`3wivsNefajDf>Z8`0k<~U=@;qk%J
z^!CBQLLdk*%ER2$UF0KJAzXk1ix}WSW}bF(W*mB##wi3bEH)ygA*l(lOIm!R$!+|u
zCJWeX#GA5o7T-p(!|qT+P8>Z1>Nai{G-P#=0j_~N{17%NNhBTyZQWN<Wq{7cU7U4{
z?}YX8%KOr>NelLmsFWcday<UdX$%w!3#(Q}Q%g(5m;Kq0Ao$6Z#xeWSR0tokFev0v
z(~xKzFcB^jA^x{dvG}aa!(yvBZOt9~Lw-s8Q!?Nzs6iyNu*fxKo<8SJ&WEWMO)jo~
z<4k5Em60iAdE#vsT>DAlw4S5nn#J#va4+ymH0a!3UCA<~Lk^A+PDm;XS-)i9kfh~H
z*p8+`MFp@enUDx^g!neZHwo9nr~Y?j7h#-my*LyUs1=?&WV2*3=#CZulWltoRlihv
z6TDas7w~W3^sR#_C(jg~%9HE8aPruEX+*g``AFf2v#<u4%n(MmeskYK2yQ>o=pbAb
z{rxAaJgj!l@HbEvKfKyXYlyJ-hV!f-6D}yhi3fmXZ0V8FKY{cfhj%3P?f6W<-<SAh
z#}n>dK_yDX9>^v}GIFTaVdj_@%+E2D-8skj^bc}IWb5a&Ya7~Oep#zwN)_z|1Z5W&
zSH|Kpv}f69)LKMx#`7ha-+PSFR93xmjFXlOS;5^{`7AuP#iInw6%!hT2uDNZ@@&H^
z?Qxmq@juec_B2GMyV)ODmJ({6D7&D(&TaykICRK<tjoXLMotPyg(XnHq*N9xKCDK#
zY!I1ez=(^)%@1zRkaqRBL%#DOI#twVn|zK!L-z;&3naS8$q%;sjnvSO$B4r3gEX-&
z5b(eAiE+4C_<Jp(25O~={wS<j)9I+Fxq61NC=L!JGQ1Cx3?#T3xWI6zunWe;8Kq*9
zm7msmBL4~6AKy2{WdG3}CsYU&m>C@oG-Yk2H9K72Cn){pcc~7dsv2-=4sY-k?jpg`
z-Og8?qO<5H4UBY%fC{fA@jOV;(x~7aVnhO$m>5_{N(7hro2TcA2FKOrR9>wp9?ogW
z{%{Ju{2^4+L7w}k0tC)L#_64ChOhWLk#>bnfsR%}KD(t1h^8n-O4s*!cDv)W1P7YN
zd<bHQ=`GZLMvRjU5>3S7=ty6rP@TA~ZFDp%c?b9O>;b(i>#;g%-b3RGs4NtX7}~rG
z>r`2B-NWsJ;_dy{72F$eA|=%f5N2thkHHu^y)58TQgB#hKB|tKK|qRq@4GStScD=j
zxM2y41+H|(n{e>=#l~RSmX61Db2``3hV)^88~I3}jKuVx{JxYzgi}4=Aw@j?r=AH@
z2$y8IbK%M)x0u5(TK1OQL5E8Mzu#=NCwpEDBGQjKm+cmXKW2fQc}x(*XRu|c;yy8&
zQTKktWb0$N%jVNnm-Plk+iD0L4Fz)KGO8*|Qe1K6mV?Y@&%&Z8ANW?$*-m}Jh7Adn
zI145#uRcB<!R{nlup|D{h;uNmECrc$?ii$wasQfjdzjMxgNpv}79{q>b0|@mdp~6r
z$0Q;UN*)dkno6~>nlwy4)WWT6z<GnSq3RuJG>RWB7fO9hN#m^x>&Uc#IT-kE5RwTr
z**ybQMCdn?a*W8XO!!I~hIUq#m9=$|i7>DH^faAL3mP?goQf1VH3H`R$lTi6_;t7U
zKmSvr@Ho8VxkOSp1jN9Tgqlgx)M_4s|J%~4j~o@%L)27}l_`UX)aaG_+Q~YzL`x$E
zaF+6bTAm9@v$8-2ikHUq^ymhQ6~(^j;JSytD#iQP6-;i12{5fWYp?L|u%rT}-CG;?
zFFf~}woo{nQ7MWyEZ+s`@zWiW;>d#t65_%GW}(Qzj%eF(_q)w!&3|qVm|LRV5!F9}
zE&jdvquUFFaraN+iVSW9<?C3)j(}#lrs&z6&dyV-wR@6e8MG#&%qF!OEt#=bNiWQ9
zrHY7>;Gj@|)lWoXDWE`0icfLz3{S50e(y9Vm*@MZVH$X521~~8z7f>k7=iu0PO|)O
zn}zL!1q#ne!>b*CZEyC!ujtJ_$ue3H%bPkZ=-RRZKROGQ-?pt*F6$7R3hME-KdARS
zEX4oQ;+E*8QsiB_=wM4<Vmyu)c)qBfm>Ok8u@Ab67_SW?tAY<>0Vb9v$qPUVHnngR
z)OqP1U#zp=2YhZ|J+n2?64gogV9#~~YvGES&Ot&%_&b0ZI}g;r(V%PN9@iUP@!0vj
zZ)pAXLC0OGDHkxPFvoLI*@3QM*B<q#j1R2jCc!s}89}D8l?|3C23H$Mn5kvRd%IiY
zd(B6D*gV$6s!nlm#tupOyGF*LUJd>x4ttN^C$oWaz|#)Qjit<}YuEk3v)#G}QTwQ=
z96u1ru9YgkHP*%yC=kgG1`Mb4W65+N+#jCG3HO&t?OCKewdprRPDLy-<89k=6?gm)
z=}qrq_>9PSwlo?mC2(VS7NOxJ!YvCUL(8P3Vv531cxfa(-(uzYp6>tRUGs*`KpA5O
zRr68aM8dI^VWIfBBN|g##Y&CRY1b!g)b(b%@3_ETXx0{z8%R+WLs%t|d(^P2$Verl
zC?6;q#t4t%9K~E$jw;7Ep;4?XcRz4}cd8)}XA$;3qr`umGWR^~x^vHYqV+Ox+C0{4
zbbxm>Pt*Y2ibJp>&CN4~XKNUYEB<baENw~}B@UKzYAY4uMi)B--&Ww^2VomTJ1ZU1
z%<IaB)c4FO>?+JjR+HnS&sWC^`Up5w^!sY{P<%+`;t`QKi3wmB?QZFqrj-at86p7-
z8LI3J=r4@c*Z<d$N$K7-<jl*t$OtOt8y1C`@BAVLfrC1vMzA(1(i$4?drH~%Q0D%(
z$QBx*>^y-Qz5+TKJ66PJ>V^V`+WL81QiIXhWR7P<DiXOM#Q6P7&*yzF{B@z%H+CkF
zpi4JxP0IIwN=ewS!TlQM&^VnO-gdL+nrFNBS>kwaQ4RwUB|$SE#8VlxTLYOHUF41G
z;q(g=u<yS;TDy;Ic@K@pPM@E6!@k+@?B#cpmTzX)aYk&T4H&BLY5+~+3zRIAA)&X~
zH8m~)rpAYu_!N^tZATErYLN{0I6Nx%++RN7V)4MsbRIuueXN?`26rvp(_HmWh}Zq}
zJ5~u_F@s?VE>0H6PI*TzmWEb|)?KYOkI^#XfuFM})VI|sKnZ=#Q-u31*cIOUwSNLQ
z|9nZLKeQNjoDunaRB3^xn_?7e*Pf?pbTQ3({r7ZpG;_qcs6eWPr>n*S6lZEG{ZJGi
z7lFAw<xUnk39ZQ$XrC*FQtasPYk?{LC>lc*F8u6LASeN;vQp7rS90FJIz5(_v5<a|
zh2h|Hd=Q{0RbnFn@0|E$G<2g_vPx140@rhJKtow0Z*Qp@tGm^cr&HUJ_AEj=sK<}T
z?Sv&Mt4kiSq~pIDi&6m3=yFw1_l+h0kezYCK`DDFVyGm=nuS=HHdHj>!EAn`yTqa7
zg*EcUw~!Y^)?A+eLQdw0R_H3H>I=%L?+*GSz7~tJjEjpq;V$MJ^NMcD8-yt@gzwe(
zTXb`bYzgki*V-=@E#wp$Wpra;L2h-4ikpwXc6x1zo=eI?yBZhSvEpIEIVfBEXbE_r
zn9R@-J?MspE_FUrfQU#%g+e8%MvtZ=onK8|xm+=4*E};yj!*}RwzmkW!iegYuIE}i
z4LFdYyufqAX8{5|&BOmNFd<?%EK!NYK*-6_2v8`)ViI1FtFwAzaO>LQhVk(qT?mT*
z2}aoW!JB~G)ad0i(?H8__#XoCy5EQ`zc+EVP`0!qK`EOA!U|`#mai+Inz3Q|N2orz
zCr%~BFjEmb;z62$^&B+1+!<f{eB<Nsxg>0Lx}%2dWqbn8(!e{w-$E@@Pkw?BQw&Bl
z1;bx@zxosn+#%f=I^wuZZyiS9tts%Qz$ls#Bw;cYT;#ycm=kx8#bB1dtihmpAW(5b
zP)_Fz*_LmZNm1c}N020yUCGs;l(%5nM{<;$Tv_IAj#Gs2z`w>Wl8b7_$t>e64evhO
zAi^QI*F94LCy+=E<l)tnhq`n@HEVuJA|Te8bK&efAKV0E+4sOgtB`~YK}F(G8<T>G
zz=R|$yGvWo(ej<`Vu?#|zYdUxPfm=4c3m`PTjuk|*MdrN`*jf_M&1(n!O{+3lh09<
zRjHUR)^eT}OZn=MI-8N!0!dP=Vpf&J$Jkdb5?FahX1U?=OS~6Ir9X&UA9so<j~#l>
z*0d_;Pd*%2<dcV;UsR|5m?T$}gp;3B0r?Z{&u5zaI9AoxzfVk7d(t;B^h99^>?#su
z9E^eHpsa^W=q;U5Y#LVf<<B#twGYf67fnHKi6W3xNK&Qri^Y=U><$H?fMp6xs(IL~
z5`{FD;2M*`y{__)$n;ft|IvaGpcv3-&})UJznop3mHB%Z%A|Ef57CcodI5MXiK6|J
z_AI+nsrO23?!26)mGxB8pi-2$B=+|b&=I)tc(RTiFT%2abyWxZdOtJ$^Tnf#8lx5#
z?`Fs7bVL8~-XxjruQw*QLEkO2cEp_B5Fi3EirrsAM1)!UR_DKfC!jcV{lIM)v<4CV
zUqxw@!MR1#Izs<DAcm<rxlREbY~l<LITC*7>o0fPaW<K<7?|l)wM41TC<W2dz`I~`
znaba!%m_3fiLd0?v61Y`czaah%A=3)h>M&|Qi}eB?+Ey&JB7h`SLge;4WvImhnAX{
zlAWCuL&O8l!rW?dU?f_?b5_Hy<I-tJ6pq&xX2d9@$V<s)W*1IxVeecXuSDb%STC0a
z3^K^hn_jiOze#I~zDk4yk4od-kH{9Ua+o|5Rf<CTu(8ox#T2A8(AGUy!*GAG*c0Tw
zBd{>34XGzZJ*;S5tb-SlcMk@4wVBY0GZq!QGHdaHG5a+~B<#lUyr|8LV>Lx;^;kl4
z>iY953O=Cm`*yRo)Y%34z4_U?UI%ueS~k-=da*-9aZ}7H>b>}FcfLVjlw+^;8^WEU
zMX-y`VR^gCG^>tig+o9cB-GY2JQMtzZK!47u-%c-bVqzg#M||7=bUha3JTzgW2TUf
z*!Ln>lY>}&u(Y!4fAKw@$`rM+p^cS~t=92|o=j&bW;Te=?nsDS{I#`6Dk>Ks_wWx<
z<(SKiK=75s|G9>7;Us(raEaY(Bb#HCYI*D~cu&3Z9!<5I>-nBf=I1NI`09w^<qCZi
z^1?hMCPqOoMvG^R2FW$EYT%I&p68v@h^y?#_PN&T0L8uwPvsPN_$<3UGHU-tl+Fd~
zSdmcmoUn#}9Bl+X`{e0)bMf(Z^Tm<v{(E$Gb_${J$*WbURRaKC@zzIfkm9rZC;K(C
zwL9KTdyGg)+jv3uTtv>7nFb0ZMGcBNK?P+LSUW)ah4Fn-^!Hjv>S(@S)Ry;i!%Lr^
z+to(0>GlHi9ax~F42?0q$)hE5EZF_HeuWB*EnCk`aYEB<{_J__r008BmB)s<rt{gK
zWz$etZOSSLnVCM6s(z$WKS-9?i#RU4m)ir;Y(O?-&xnylM*WQ7U+I59UBy=Py$`7Q
zrVSes&vF=Wvq-1qISKMWE_$w{a!J)-R;J#W8Jv@lfc?RjyYoWM({hm<Rk-d@D>K$X
z1by+wE+c~cwolPbz8e^v#6t(FP;{oG>h#>^2kCoktZlBQ@bCML?^Jr;mIL!oD@9zJ
zz#qL~<QGVd$+LtTf5FReplScfC2Q5U3L)7R8SWe_I;(Y1O~D+_3_%J;T4+bitkYt9
z#Jl62@SkT48jk4rdaB$dhmojJiy}ioE^mVuC9z<E<Ld+#`zuvDKm}nz2n|fE6h>>b
zSRni0YPBoYUH8Fl`*TL;G@}&=QWz_&Z2~))__tS>l^!ekyqM+l#leT=>g2~3;#V$z
zs@>)r-iRQ7MlO^2O#NtiU2k-}-j_h5he_Awj&?!3er4rx$>Op<a2Nqd9``+rf$yo`
zGXg<zO6=T|fcV486348#z#r2L%JVjpgV;^qqpK$6a54%-j96?`46a3*QDSXr{f#Gx
z-h149qxWr2YBqM1(Zvk`jPnCHunn*ijIo-7jZA7>+B9~C-E=zubsD$x*nx3`iv5X8
z;ucidegT~Xh*zwzlrS6~?&aP%rvFs_=d{87iT@`zf$tl19NrDdKtR>l@@gSoC<cxR
zn*`Z=lgb}99~#eD<=OqaxM37((~jOMA)6vD2;$pD>==|s&8Xjg5Ac4kkI8&@OUW*7
z?uj<l<=w9O`$FY`Ru5AIj>L;lY*|>C@pMVz^swWHjc|wvj$OUsN<$H<msQdCNPkM!
znEcTNJ)f@VZnGAfSoSX!E*^6PpT03s?*t<KB2){a&%@;Jm&J%DaWL-lXzk0G^AC3W
zMIT?D_o0PfF+$oySty*?kGOu^N#DnmH?2kwaQH*!5UM5YHa`WuI5jXwG3UZSo7$c%
zd%;IN68u%Le#OP1{_E18sJ`lBK*?mhP}!pG;m<~!@AmT2!JZ)#X?ry?6zjRIU)i(e
z)kHH#R%2WQ_=m@0^hcfGx9Zpa&3D)dXLroRo9P9t)T(eh16LAJ)EotWyo*2r+5{HA
z+;kvw<WoL@cD5;rq1-*E#2%qZMAOKfUY8GsE!=1v{=u1r{}dv@JMo75jVT}sosFG?
zV)Awo{D~QT7A1NXogpr<scFg#(1`Bh?#9f=C4__#DUZDu!!VdV0hB2tRk-h9_D<vX
zwu0DDSPvoyPl{@fKBwqdN%{<sq6=XH2_+-d<s%+XHges7;m~&l7t89lzZO#`Irq&k
z%Gr`!hl0|BpD-HT=D)nzoJ~T9wMvp_f52d+HAFo4$z&j}GxfR($ZFCZWbb@oh{%Lw
z30(e)|4AytKEMh+1<Eo!0>-Phhb32g(<S(PNEg^L#s!Te4ki?N!<G|>Y9aEVnRwPj
zQ^RV!-ERHA&KX}f1wZKPx*Onq(tT7xYfq3zjL=<hkR}4;(tj^D`;$t_JCI^IL$S_7
z#}bUYW}Fj?@2|zjB?dU5#hozWrL8?5yIp@jb5d)_=r+2+b2G|fjTSeoS;%#3+i=7l
zaWvv=)P#siyt%yER_nC~>0S~|GTV{O4T^H5!mLG=F+Xapwq@v~*&o(c*_oI;SmWF(
zH3&(+(9M`F^a>nc#_`~meaA>$+?9TZh(wvH3j@P@Y}UWh)av?E`%1?DJ?Zn)t%Txd
zj;$g~4ylZ~Eh+k2mn`4eGS^m-`8>sEsvRmHBaJA@ZY9^)%qB26fISl;(U)XL%}tY8
zQKQ`mLJS`-aEF!YW2arW3gX-7K0Fchfu~kxJO)Ov+EjP&a`TFYU+LfE+%o=e)GT1W
zWVvjvjSCKJ(C2gGyI;@`AbYvl4Lkba&?wL#2m1@^Pin11esu#SYJQpi$yrRhs@58*
z_Z6u@C@{8Igp~928|`be0RXMF`(TAEL;8XZdYnz`LOmK^hJp+U*^HzE+xUA<*^9<^
zmuILH23|i89AJLz8M~BRny9Oi&AT8q%3J=vS?Qc=6B7w-DimNC5Mkd95bb#zYdu95
zCqaa8`fJbYDT>Up;9`1mi|hVDw>sS&1eY*O9;}1^VFEf}8N)#(DTe}|EEx_Vf{Fw^
ztmuE7?s402lWcF9vtrZieYPUf$|R_m3X7k{(elusb8V_;&a5S-5@5nJl8>gKj2EEx
zo4Y=F=X=M0D!u2!ti#)T?6C1i%sLn#M621A(F*a(vn0D@mYF|LRdEO?JAc<MIw#2N
zdoW1Gx!%7nDl#ikH(IW#+_&@OU}ucN0_Q22Iyx$$#muVs6I3}}(LMYWMp`pc*TARJ
z;SWLLy)xzLeBed6GN|9UyPE4MBUz9tXTg|pwKW{C!f4O<S0)n&B~foc@r$<BaGgvP
zjeWuw3=>aUf0Il>f4sqcmJ-t_M;w>|OG9~B9YUyM_AQp`WPMDd2;qfN9o1V;(-8PR
zDu)f;H?63*YIHQu(NE2a0t$%?9AC%bTkj*Q{DV9X$FL%86b@8ed0@LCA{^fgeZB#s
z00aLg%&tZNJ09`4m%xH6lM2!Zvc%G_Q<0dXR~^g3_%8h{wmnI-LgW5U`|jMG_bGb^
ztI_+)*~3wtQ%9$1C({HDp=wDRC(?Q4l%`}Ht*|(uN;VW>ikavWORdgity9WvOi?*G
za+*T?a6h)$r=FRU-iNx&b6%m-5il+BQ{KN`Uv~C=c&!1KH1qAQjMGMO09R+NW*>N3
zo-~K6RLw@GGnDgtPrkiUBk$t)SkobUV;00EF%2&i^g`s1Mb4gyo6mefiK9k2O}gx#
zh5v8q?3p|oN9(Wlgs<W&6@WvfN_naoKL@1ZJxfPCRN8S?9sR@Pe1Lk~)64FOQv?<D
zV5Q`JQ+eM?vQLmX$|)*vImaP9QL#_dXRvOg4|(tNxWV4_i*E!K!Wb3flR<tFd&c#Z
zX1JGa(tQ)DS(gMK+#;H{goH`ZF4~vp7UO96BsowtH8LvD*5lphYToXb1%Z)bLvq0`
z%8`YCc447GL8mO9@0a|Ck#xI7L{K*A1&<5eufAB$uHa5VA50sJIx*D5K~f?S%UDu1
zdBGHmEeUiu_wRefhu6v315=hoH(QKzxACok4?Y!!6jPZXUe4_S`I>aqe2saHvMji#
z>Og{W&xO<!p9Almy;c7gPHq9d0E2WzzNJ{~bbq$yC`#^-sg<NoHuiE#iP>34-F>Pe
z_k#HHJU^UXhRM=&{U}O&WBh}hW-GoG!Y+=R4ypZni8=+W7%+O*X11A%?vtF>PZic$
zs97m45-W91Lxd+f8=ax3Wm+g&V#zoHQWy~>lFBj;**~UzngY}E&ZmTz^7mw1(h(Nl
zb41x3y(7i(p9y-M?hS@tJ~%pAi#{)n+C$`ydC3+J8S0|n#|)N7{g4Di19BS+oqBGq
zLizLwjAL8Pc6}{FODU0HKWV~4i*11Lx@BLTv_Fq}0c_Ii{f)pU)%StoSHj@dr~_*z
z8FkG3a>toO3|?|L;5U$7d=+TzRE6**5en?2GL$CDX#{1ySC(<*7&|T}Mc&x{@5Q*7
zx1H6MKe)D}!HJ~pC+ymB`}#Oq{4;CK&(hktl!sY$3|Qn>C@8xHzjj-lmZK(rHG5D)
zK3|u2mSc{(Mp`%upqjz~bOV2z1Ui*UIa)#)cp8E&D5p%K>-*9JdvhbSxoq(`EhrKT
zczw^1;Wcu=sR2b}(wV-;U3E1cv43>nnd8XiUKX`XAAOFtXcg#8lTF=l^9El3e^>y>
z9zz{t>p#xEEab1dW}J?LU9@9+ah0}yD?*AdQ=q#5{A|G0_nr48Pknk=83jo(>f~m|
zpF+>)VR>_mQ*%5uiN-^06i9BZSR=?iGGYtHo<|aXetuowY4+DzUUCa=)_(L%nuUd<
zSLS3Qt=J0%9F3fG+<-C&Ehp1u;f%zmNb7zL%+Tlo;a$t|#sL(K8ofXhGRPM~p<(GW
zRaV)DtRmE1s`QQ#GT;TJZz35Oz9W*9U?;RArrk`7{G(J&{o}^T)y0Lm7zq=Xn3Nf<
z=0&M*xFQ(*XpFmQ$R1g8gz~D0Nl8XG+AR=Yb0fQe<`(iYqh~#|>I#Ft+3iQ+<H)di
zUuPjGPcOtXXc%joVq}tW-p^N?+54UELqw0yX?(U>E8-Yb$XYNS)f0JJxsS^8ntb{>
zaj#k@vKf8=xdg?IEVaa929A;pO5s}5k^1vbP|dEXFYQ}<U7Z}4<H1i-Q^ue?#`dAF
zW>X!n7A21gxrCNNXwd$-nN|__97)gA(&Ll$jVQ@wn%Kna+~#zrtubpbu!3K=xU-|U
z@&dJVc{vrDC&3dnkOLuyr^0~2%tH~!rp-e{7FT@A=N5A#_=P2_$!Kx*F+4;evjCGD
z7%Cv}6quCM?tId46uY|CaplU=zS;CT`hN$YrfiT0k!+e|)Vr=N5O<w{GP-Y6nuvPn
zuz*YW(}5I>ILl<v_u~ljD=+-(fw<8Xz+5LUQ$is-rpkI$22rudV861Yhgl+<b1)H=
z<ycOdIy7m%_V%WMK*%%nv}zzZGg%Z_p7ZiPG#<qr?cT=3rp)gy+=!mEiU5mq;&gVD
zzOb=6_yzj@6aP)Cy!{)KAGp>&Zc@U-F|Kz9lBAlFaurDwb3~gY_q#17Z14f7q%ms8
zk<QR5-*^;A@{p03&wOxPzaM`Vlu-uf{2(Vn0qu6V;ZX?XiQaZ!M6^eIDa>sZ%ossJ
z<pfKV+}1Xt(euJ(mLOkyguQ)&-xr#97x$*lek?$^{3FI}sz;M>pn7sl9&vz9ybS_j
zq<t;~6&bu$v-fP?Qvtsmn>t@ytx>_wuJfFIvKbE%7eDRGWLpHFVt5e>-*&BK$ER~z
zCK$I%A5>EEL|)z#3~r=hX6NG;WQ24o#B@iA0ijTZ526&&cHLu1MS=c5?6g{3z4-1W
zL3?C&@kZ4KT_`B@U^TW69_Q^A|J)4)?cB~25iq@Je*NdRI_rl<4aUmW?ru%ij*2Fr
z>bqLCY0F=+VH7ABFgu|g1V|0g>gXT&e~l9=$IzHQcs9jFEF3*s9o|jpoR)unoA|ro
zVUnw>B<tBICCO(S3??h=Q&E<2e@>}saxpL!(26CI3Q2OQ5XsARk2QGgiD;j++^;{c
zGUGHcWoTiQl49;lEv~SnJ5^3ORF0ie!~$g=!cu_)&kDZN(WX}$&Ih@rsGY4WXTC*1
z8MC2?Q~$Z0D~?a7tCIE6_+P5b$j|5x!?R@!pMdY^?A$e5;;^t4x3vT8Lf1t(u99S8
zowP`a`{l-X{@0Pg?f$X+5<3SHtmtp!kQB;8?fkb0fleX9n*B5{(s;-}$d)x#{_Z}A
zpnTs8vP<k}|Jtr6&Q%&}S8#bnzZ4GN_|HV0%=IBoI)*a*N%sIW^dyI6vj4zYsx9>g
z)|;!=dTen)ML|uSxj~9D!#g0gEpgVhsnTU0UtUPm_p8g~lh7cjsWfSRZ#8AM_Fi3~
z!GQC*9wXS|EZF8|wA<GBTzDfg{i375#{6*zep~`Zr3*e4-R4sifu?hFoI6J)X_Pda
zRy*d%&oymEXLzs>pU<!N*Zp1}>|TNRgZ3fqS>4Aao!^D|mc;SCy+m-1x{!M`Ex)%W
zKAzn)==1``c9%SU&r$#}l4Yvumdf=eL*S9sCNu$@+r0+W@lN^1dO+WkQ%kk}X(Dcs
zt?K!j@HfoEJtGw0A(~X!4MKtXcKcp#{Y}TU?@AP*a3A?JIedZ{JG$rloPfRj_ZN0G
z`>pW@I`bne+!Yc|uj12+T?cx)+P@?)ATtNV<L(-{eIF>*yCmrpJWReBzOD%cXY)iM
zt?Y6|$>AtlOc_xMWWgp}p^764RTAavdL~>~4JLC&%ynTOv4Op`wfOanaO8DMlq^w`
zFa<R0dUAv`JzQ_x#8$FX>s!W<hg9acED(l*_P&Tq(zw_YaV8wO9bS=o4xF~sS96f1
z9>>T=$kajMgM>i{K4!!3KBrQu7WJmyPccq0j!&u^1C0}R1|VyDLPP(6_u{zEv^7>F
z)4p)+f8v9FKQ{Xxf8F?nca%W{aS?zYi^I4aaft~>jO+pg21N(|%W%7Idyqcam1P0j
zK680H{yJ4JpFBsW9CB0k_+QdkyvhOB$L)Gs`WFK8*OaOrFA}k(o%I0Lpu-N(0u-5a
zl&KmD+uKN-tqYxYMv5fA=mp<d8U#I<onF`t-y@L`n!M~W*AI5-M_}dJg~#cuc1FC@
zx|2Z=>~IEkYp$5h?OQkiWn4y3=s-LaNXU$Kewl)wn+8mH8b~y;^R-@s`BxGAZnLXc
zWuB;hI235*T!hKj<+8*~Ja@mhJA7%|l43OtVxd9!Ml(Syhp`DT(-izljdk(77vjZm
zILZ<ZZ`+Ko$=TR3{<Sz$mNE^!vhGN%GlR)2&Z!YmX;z>`CzxXZNh5)WIQA6=Lwe43
zZi^q2%_C=_st7H~sgR36ox{fZyaYmWuPn0DOPe!j6v$T7P0b3kkK=isHU6=s1|;TO
zsmk8M@JKHK#t;dPb`wcod*UxTLX=H$efV}``)7|{C%O$zAZG<4Ps}0)f#zBq%}ue=
zDB(s?9DdSc6_R&fM>o5@I}g-6roik8YIE6E!?i|Z(Z3wlR6d?1!puUWVj|_hRFI$s
z)3$hDSM4`t3rP1JQP0MoF%ZYq(+%<tTU#52TA6zL0$A|oa_THTlhE6e8`lmiJO8c>
zVZFV-dmhe9BFiXrsH_jexU4#!Ufi5G`+sU)@-!0ed4=$h#L%<^ny+=t7F$vbPQzck
z4(7k9uN<$>@drmN{PyUDg<wT~sMA#_E6z+pRbeI`NZjR0X*!;#%rB{`d#Tpc6hU<Y
zbWB3gpqG(1{GTATlaBVS4^L(sEStzNJ;l+0OZ2G<`i1Fry6tr^2%{m35id0GDpIQI
z3Cyn8);*;Af47Q3;hh!Yt#VBLma*9%OAuF%H#9LK?|qn8blTc~Y7<4)H#-h5iLyD>
zG{dOYkuewMZ?K=62uK=|sQ0~LAn?0XHipyAU!#cwYaB2eZagw&#V)In`YEXXC)Xg4
zSU6pDo_yyag7BSxlKx>4d~Cl|gaAw6gn&vY#An*YU_0w#;YmZ9ukP{gd=u<=-5ZG%
z6kRo*RwFE^6qN{B1xCvP=eGiAUkM4{$gkTTy}J65%F$+DJ%@V8#&9t78iJ;RK+q|R
zRHzHlTo9ihJ}LdgG!;2TBAB1{j?U5u1Bei`nvKCjeYUU_p?&~{KQW^bps-)OzR`p^
zip+6JjrY$A^83rp$=XRiseysixe%=5%xiUS70U=wiYXJ_L%aVgF9JM)sI*OCFSt7h
z6BYektSCMKt>poy{X4jT&oaGfH1muD(}9KZ43><(+(j0G*x&GR7!hRDu?&7mg!}as
z`qS5`z)L9cktfSP_CWkkg)L`cPdopC6PW}t0|=yH*6{GJV3UQKtvvb$x%P)O^~-b_
zP)FvM2KyL5svN*hrGR@TWp(rq@_X*hgtS-N)^sR=*(6SBRzoq`)=4G90Ee$rPlP8H
zc0PgtV=+4n3`H3&(Yez(w>6cF1J!3^v6++G28EX2Yfc(BXHwEDlXL6qQ5=g4odQ3Y
zM>8Wo1Sy~zfO!@bS)sLRjO=oNlb+w>V=|g+#J#RfYQFS)X32iqz24WA&UgP$R9PR(
zvhgCs1ml`yOtT;bV`?dMx0t>&UcT*(xYm;)XLVezQ(7I!t+mdeBlGW+N%yQAPm{~3
zD>?6L`)~Fbsa3UopC#|1c7aZY0n>ex@mbDr(_DZEilk~MJVXVMcN{*kQh`&Z)r*55
zvHKe|<6OCb!aK0n3L<f`wPC@X9^&l7za7tvy6qQxv|<#BIFyU|p-OzMP7)MNTtOOj
ziEpl?KeGZ_7EEH4#MvTb?MsQI1}OfqJWfqXCkIv6yRFwB+{b8ojr~)zzrwpBRH7$y
zo}vqwM-9y~av|NEOJ4qA2Mnw6if0DAy?KQ^IsH@*n0f<vN&_tmauCd%w9|H<@zy8%
zXGp1bNau<R1qQZ{#^F(va}GORbO~O+{3!^25(X@!qdbDx3D!+Ok;zX<L;P;JemLfF
zCBw54;dW+ZfH5-$?Csu5FTaOcgMx;`-874yeiOpY7B3!-YLY*iKPW{b|Chw3g4xV*
z;x)-uBb)z>4yIZ;+Tma6W4Bmg1<~P@TwZq-It=K6f-G$(GQzIVx3kh>EGwb|uSbN(
zhtRrj*xbR-kh@o(dT9lx;4-mH;xKAdq{s{*OJgI6WPny~L#ba<XRun3j9CT*8Ylg~
zzMIV_=`0xpJG0}1rQm9czfGxSlW7iAmu8wTego$$Q)hAO<@yQZrq$^`$|e*LN<yh%
zJhyQ?H9SnrfozSlKO|d<GB`MB`j@*%hDm#K*m?n{9dXSk?}W2=qP6#%Ux@~Ok<}6o
zoh>*7uO$C!o>-sy`Z#o70YSCIK<p8fMNBTD0pgu)0!wt{VLY)g6pyo2fB4(^g>fG3
z^|dhb4xpN^T4W{9D{r&Dw&fiX0OdO%F-2Vm1T_0FGa<WeZJIhbG4P?AWn?Y7J(=*r
z$|dE)%&+G%o5!z4gYFcHr!rwJTt3dznQ!$Q0R8^sj1oC^aQfH;0%O@KK{cVE6|)$;
zwbtF`W!stgE$YHaQ}p2XBNO;MGyAmxMpN|U>5}`~x2r6+lGHan#?`Cy{|0%o5&hJR
zGB=-ea-00IMR9_t=d8Y7AkbQ;x1?TsU<`a71-Z&(A15=N1376-3lNT*IUSbZ78IfL
z;Rvu}5Rl5@UFGP!OpIe1Dl`7)z{Ld0P|EJfDAvvZO6Vhc1opW`l%t4X=!IrLh(=<x
zy<}wEE;j~yKSnuU9~r+`AUv-BQ3!nRa{e>mQ^-gLlR+&Nx`B^tI9U$ndsu&<v(Fh-
z>^bo5vb{SRf<g=9%Y=sY{w06BU7;-ci_DLb8;l@ogJ&C}wSR}-i?N{&+t?g+4vm#L
zyjVd0Vq=&+wu)M5Bt3cjEA4|ninK)K76a|Fn+T3%1MJ5G(hf(HAekOJs9r4XtgLKk
zKqdxjSb6QS$9<z?N5N0H^C_a*$3^ss=7d1JGj)XZf4gFA9L2L}0}`bvA|VlBYlx(h
z6mOKrmU%+X4oAFQd;f}?6?lB%!@M*C5(dao+CyAW3rfHksl9EI$!>v&;(~8)Ir8VX
z9VwhoCZMxsAA9_Z<Wf63pjG7S6M$GqQF5H7nHv9dPEG|A1XTK)=J@XoIL2{4__kH&
zKszyK8XI;#Eze5*A6III#xj_<%(&O$9sb8)NssH)^s!~kg`)%0gv=g~$3^<gZ0xUZ
z*6K)^T9BW*s*C!Y$KLJ5CAFK%IQ0aLNH$l^z3qZ26*1LdeQg1M=rg(Gd)&iR*$H;h
z*g1GrV#Q-^Zqc7S?!V@p9_HGlF>HoO)b%JRn4x|3)sD=5&S|!tZiVQTi|cSMsBr68
zac=I#@>6f2RSw8hIg0{=ApM~6`~zwD8;P~NN7>%YX-dr)JRd!_LC%$uFd(*AH0crZ
z)M#b3{e}JWklng@Uz-=K_!fS(n|WDfC^95^;goq^NhaN+ca7L3Y*K965=10mIFTcc
zzQ*t>9YaH6DynXvalGQ!-gicRR~P<cprd)k(I~+w)TsGNQ4eZqfXp@nz523DxwM^9
z7l)8wxj|?rk16s|y=ePAQq4^f=lMcubBjy0qG}?$sr#+;{N3yg0u!KVq$A~<Cv8f1
z`aee2Aj0jsEv(Jdr$yVMt+H1{O~PO}*tjK$;{uhyl3Y|^GEgB7BRCNf#xWxqC5=h*
z(iF_}C`1R)G%O<T7TaBgEMkcYc@J!RAvs~5<tJWJ)XBfBv!7ijlvYXBG}Bd_K0FB9
zK_xAJtx1q0II_Z^h7gfWKp~Ylju*cuPbS8q$<yJrAY32Be;w7ez2n~;T-$8R!+PS3
z7Xq(ppQtu2s%2%ArSj#seGCG9Ts*|@p5W6=#eiySrAFutyX$-9sLN_P_?pveXB|!r
zi6u84S`p&lWI35j{jY4}4?-v{X2{eaA;zpVN?Pp0lBYQ0Zbi$skWf|LJ|{$+Pg(4P
zM|_8esmS$O%L#F+Z4*RP@MF%wfV)Nc;WT7^%7vviZSjE>a+<3^>+TWw(o}3T-d^E&
z^nF7_vDIO;xF%(nhq>dXf8zAU1B^sXW>#1T2i1sgLk@Raw%D3mcR9UMT*1c9zZ1if
zJB_iW>H0lD^b&l|BJCdr;^=+ef?pi0jHstgfrF#v(o@W0<pq!j=-?>yd!<+=r-zRY
z(s!f{ux`7rX6I<bBFwFgQ#A3Q-T>b{5A12%pSW~|*!|Map0N~YVLd$pDJqM1E&>++
z6^i?*RGpL|HnCCybMi}-(u+%f)~aK;7BtLe_Rz$}zL;WDuzly~=#b!Xma{!7kBBI*
z#vUPOZA<P~5y|KkDNJG*0n^<vR+z`oA^VAUdTly6gYN?Wq>6(;1&$sg6_!zOH^hX)
zm^3C;&?Hv_n_7(^=QwxAhe!-QVi|&#cCyH=C8o?RAhvo<I<?UjRHy=dwlr|)lCYdo
z1hg|N<QzuN-w8;r`+z5Gd&ao#x$j1Epe}H5U^<1?t*llcH-VGD!UIDQhV}IGJ5WSH
zy35t{i>O6C#U7i%Kw-M<$L$XHbXYvtbRN!SBVp3smy*C=10QmXNee41EVKe#{@jV^
z{lSP2e0;PNc?pj|7<jP(xV3S!w6@p#lUe|Dc2>pBwTWrEqyz}qcs^+QQ8yX&9ZmGA
zlh8s@roM7GoOcB^<LhZ2e3ZPo;5bZ{BrtSI^?nMFz{E#!2@7EnqQRqUJ^q}$h?m8!
zY(v?S&-2b6NLN%79U_}x>zr)rFl{o%BnezlOHDEBvgr)sP>~mHmcWh`s<4X)ugQs6
znw);7?&4T|P<RJU9vcEUn6t%3c6o&kP&IPvijR?Yb`lypV_3l#+*tUeU|gQ*wQXZ3
zgzxV9+r6oZ+W_TSC0Xi{n>~_6E7L2M9`SeSn_MKQ;>8&T$GN7x2UuLep}TE@y!GD9
ziUO$OGsa#VB&HN+z)QMcU)1nqTl*Oc3rpn+=R)ZZp6f`Jj=;j9f)KaIFwk#)U^5cF
zsA60aJF5#KZAxcsA8<vN%bGvzd@`SyuLw~w*e|)iTgLiidL~=AkiY5j3y*isSOU+2
z^419h8ks#{&XV}<$3^QGKR`xCMQZ4p8+nsWSL$FRlW6pQWy*f(8n@Xnu(+8Ag?olW
z2?I_ohzDFvwm;v;dUz~i#A<6&5rr10R2t@xHN;F~aLS`f6Vd9*lqQI7xc#N-L`ij=
z3&CRcg!H9PA}W`%ZaN{+O(!Jui1p3inVj8uM85vz4eM$;hlK_anuGBj6}^uTIUku3
zT|)3n1hv=ieU|w#xA!P@drK@Yg8*{gk)|r);Lm`sBLBby?}nDb2G}CgbmELc5LIIj
zGRA3g5MUklNV`i(lzWIhNQ7f_bA-Z9+ZDfRJ?*ctFeE+NSkc(Q9tgS~1+A}X$6?xQ
z94s8g)&`z$&{D(`c(D-$NC;12HH9yk_?x=$@;o)Lqp=Au7ne{N9kCYNT%N&jm}@k3
zjW?xacn8;lZ$@|c^E@Zh&<ML`JsW5I6x+Jq)fMcRDGS^M)+khn;W}-t-q=EUeQ;=6
zTU-%J*yD|WT!Sydc9O(|1d)nl1#(5Ub^5|`zGRv=d{~?H6QmS0V1=i{D;%&X`aJ;K
z*>YRS>zBrXW7#JQ^OB%2HMEuk80NT=Sr;v9$KP)oVp$&Z|LmK+d;h-UcEgBAqUE+t
zByWbnAB25xxtqq!-#y{*%aF(!3Xy_`2r;_Z=1-X<FFE*!&kXyxc>eV83DRg5j2nze
zi-C6BSY$$-UZXu3)gEo7S;Ll8j(~_5m=A(MBpNo)Mo+pENv2(5J`G3_&BNm5iwk{w
zH4-(BsG2|c^A@=~%p4e}1d@dpPT_OB)Lva-vzJ9~GcU#R>Jf9f9Bn0yv%J18!H{39
zOI^f=i4WdFHHo$-P(~;QVbCEaJhgZA{)?kEP;Q2J;Vy$`+eE{C<b$uJ%o-`gR5!lR
z2|86hq-XMg*TCoo6X8yl@Pmu9Nne;CvziAw`eO0VF*eE>TbJ-rM1rmi@Ar`};eqqc
zmjyza7u3gD{u#nJ3Vf`q&r9m)uU;>DPPCO>O=meFQ#Q$Xe9{P#ri*p;m%mHmiNB70
z^sUnq`)RFkNa8V)%?1b9eH;$xeJlrUH@kdDHJ9s3MQ46+_UDdw%4Y;7@Sx%~)AR|I
zqS<Ig+JocrH80Ge^%PR4Z1=^PyW}SEi7rgkD~sA$A~JYKyHM)%oo7UMcVkJ!;ffHD
zoL5;axgI$H{g;13EE4^oi2m_2d3MH$B@E&*a@;Dg4d(6hVJ-4}#jKPwcOy-?(M7t|
z3FE8eYXDv8ii7!QxliPSb#xSBq>&PSadO!+6{CebHF*9PG|-Nzzu5+5`9^8Ybwt6k
zc$yBOKsEhj;eAXk2T<Pce@OerR<h)DHs%g7EN!v}k8^pcvXJ;eSxcheB3+~uPmpU3
ze8I8F8s?#>nMLjuU;IL+?XUZ|wo?QzjOA#Ym4QBeLfdg+8qF-zJTc6(Jx|W7UT-(-
z54ttGlHuvAv~sLU)mK#eDC48!E3U($p~LGO739tN0){K~{a|$Sd;%5a*tjbIABm5(
zEd1_}foS6|?5cr(U376_T{HoFfC1LuJAb2neEE6e6oRN>A5~HIQtFVFtxPJ_isqDr
zOwk84hqN_|ajoee6DyC$SnBws&jm=~8kRyBhGcF>u5&L1Tk?;pFq6}{Sq8*mgMTjf
z<vzNouX|p0^WEu3;k1bo#HabdD#(V_@U|jnAQhM8pO0X|J-;NWM>X44F_UC!z@4EO
ze6`j&)}L^VRho?dXNht=mp+6NVZmgbAKGl6*f)KrJKKDhm#fDaO%b%R#*zmIM=P%l
zqounaDj^Tfz}~E8N98_5NJsMG_kL?`PD2Y`@zsYD@;!mo-o$?K%Nvr?%_(kWkw_ys
zH)_n2w7WwDA~XF5n1O6!$W%NPB4bO$0&g?@t>t2*khaaK6}3tN-93;Hu#t*)E->ND
zt8a3>06uk>eHRjp!H!W;pq;w0J*_HOgMfk=4}h;pk&C1ccSki(dS}U97(v1r+$IhG
z)#JzhV9H96q?hXr*zo`0OFaX0RZYIf<F^R)_N8>%Y!T*ga+1uMl1h_eAFGT)a%>NU
z@3`UKX#3GmI@?Z_3T;cBi{lfZsQ;~Ipa9I}#S7(k`FdEx>XBem!Qb`05RTk!I>rh9
z=-w+qW0X(fgpx&i49Emm>~kHQ2=E~Z&6f^IjR@-`+?@N|D(_2Umn2N?upYw%3w;lQ
zqt2!o10jy5AVNX@diMvHXCBL9D<n^hDSL~ZJ|hGdeDbur45j5WrE0?pm9k#@0Gl-1
zKJojhW6bvNe#oTdRO&xJ_ey(x8n!24F-}jCUGwOnaqiB>S{yF^RJ{)IZqH6fGg^3-
z#X|V7P<15+u&VwAWMmO!CDS+LS2rr-WNSO;P$!ndxrjBodkuKX{jQV;KPA1%vZuSf
zy5X1FnIlpu9VQu)0!CKd0>N5?sIYB+u&tDon`=?!Msgb1p%r5<_yv_nhK(LMj0p-F
z{K?kLmPl>-NBu!U1)TD3-U>H=4v|eHAd&P_tSnrp6jhKEejWG<O5ewX_FK^V2H$Md
zb;r~1x*J{pbQ7M9MF<RpNC*fl1Be1hj7Tbo1l)-#azRR9WoGRzkDIqs;2^i5n>C3)
zj||e&)SE4-G<8(A&QuG{j8+>*x+Fsgg-jR;n<&xw<U0M&`Sxe=dADCK?hq)?@^Iy1
z?DcA${??!O_w5@-AOBH?JoD!TPpU!(WFvhk!vvPFheTzLlnC^JU1R6PplmJ&7eRXd
zE3D3Yraf3u9Z5(DYYaBVec7E?ScPu?4wCHf%5%H?rT_uuzAhenBUg+Jqt$xbWv`aH
z^}c5__rL$(u|3%l;*@_SQnWBNrs!(KaTGgK>z68bUIz$(iPlY(6W%K184zX4-A!!R
zJMG>Q>#oM0pTd)XJnUh;iGe-h_Rq=U5-h&M1PYBS-RwNvn?7)7nR67Dj=14B>Jt<W
z%vc*sarT@YG%%ah(L$IsF}*GzNdZHrv!*lDTig(o%~~6KJv}PzDPh#Vm3fVrM66*@
zY>vqgJ4iG6Ub{Tw3yN)ny`nQfC#nRfH8nTiy?NW;E)ssBQ5s-#MFI0eJmB(N;*~Up
zxoG@#ysNqFdLn3{*O^`K7?vx>umaKD3n^kOT9qRiIKP{Nkub9iN|+uB5V)jNV=+C{
z6OOz2`h1a6*A!>o0h$_Pc)^+rhj>JC5EV>hBQ{yJ1c8fFGxg@_V_#CVFA)lGr1OE3
z2x<I(00=?%zQkh4^NBEa-<uv;`k67|*Fc8;6Cn(?Bk9q3UV8g=I=oI6&tDROxsF0q
zF{lrZ=*2LIKp|;%o3Wb`95{NIoYCkCD=`K5^yCYizkG@I3oW>r%5({i0eupU@g6r%
zWF#q1a7)8H9$LMD4rcU~001BWNkl<Z9jor;p1G@-Y1L6rH3CgaBqIYPqp+cf8kCf!
zibZN2hThhLF`y6sPTFXiny2%v@BAG|8Fh3EyT!>tLJ~2cj|}KW6j`(>0k0wKp%Un@
z2~fU}BbUvQs7m72q$wCf5Lxb_0i8Y!z4r$)0(H}yh$q0d6g{~tT7gQ~96$9w`#(6q
zvXx7zrWy!A>cc%tlYeMo%I>g0im=mRb9FO4ewL%>PEZ)>W?lV5N}x2=)paOe(0S=H
zj(_bj^cc`%c7FXQ+P6sM1k*|Jz@jzmT(gm_%QkRJVgc2paB(6z)-q@@y_MlohIQK%
zk3OX*Lsx^3I&JP6Uw)N;KI98O^!ttQPR0<%RvnkaM~-md@Ii1Q`8y4=G^b`rKsUo&
z@OT4>iUYbZLmr}3F;LuIhG3wiguq})8&l9^vju8qPDdo2h`(#3i8Kobyszw&V_}M3
zsnP=x%DxH_x`_j=v6MteFe1Q7Ih^ghz%So>joSH*%udcB+0XeN<<Cb|4pSTECB?ap
zH2Ncz$0}@YnYEm~XZLfa?E=QBJY*D1f%?WeS~^;htscsJ_&9poOZ%qujhr-qKAyom
znYT%LiiK6vd35aqeDv-utf^hh9O|%;7%#w*){rnJ#v@`(GzJocDOs+xNTgEy-S?lz
zNhPC%uX0!4(11SNJ(&D}KEm%zKj5c4<}DB!3I$D<m!WCqG>iz)QK(1^`u-z%NFraA
z=$HH`bjaSN!PtVXpocf!ehVRB!R$pS1itaGL@2M+SH3tN<#VZ`&WoV2rzP2c{1Dyw
zEXJ;E*1Hi91e%(v8rrY4;ATGj-I&Vkd{P1WcyzVP93(uO29n%2|5kP^zniVM+{Hqg
zsg7Ee3P34Er9I~H=yxxqj1sE^v*yj^#aCY9?1l3<juYlymsH|nK>tt|Xomk=EhI(+
zWV^a?9Gj}fS^^Pq`-mC#uXY#>po^lOTuD|S`bHbH4nQa@+veRv2e{OInI(&sk`_+X
z$4?9{suYg_b6=mVL)F;qJ-#2$qT+1|17%1hQdnA&x!8^se7H?R4CpaCzdo!yt8j9#
zsJfZ^7p>;WJGOA&%+*YziUbPbX{3s#e>9y4Vw>~f4U#eVI_iTSiD(q?dEr;TLb*2i
ze7>x-DF*cG0qDjUf&i3;Om`R4XU{@f7RKnv-TvVidY|${Lm%%zU^GhE<O_LJ(&6w2
zhdFxo7z=M%LXAjAJqBV(AJv8!!?gM)&SzWr;KCWSU3nEbtpsU1L3>9Vc8C5jccnRZ
z>QYY(=rNdA)>}|;P+7QR&N4oB`-41w>%H9U%p!%274<U{O7)dRjRF0-f}4=Cls>3|
zn-(qRd*AzeTH0H&6E4Q+7|^d1poe8`5=SVMk@#LfS63&~nwoHu3B0K1UwMkN=vViS
z97L}`2$TqW5`@OA*qcCvb?#E4O@LGagO5yDobPPqm%Cr#rdyWK;5Oh~mD=JIT|XEs
z3>J!-+0%LN*daP{-59IFDspIC+odX1MeEt~INsGI$hEz+@3*G<y_)cVKHgmI{*@eQ
zUvc}~W$avgAKT`yqe-Ml;h?mnT;rk~LPYFxzrHNJY!U^KP&Rc9_58z+e}I#4(Zc|`
z7K3D4$ACV1hHhjiID<f%5I(y*+Q=0=>ZUiKTt#4lKJoAY41KWldU{>#{c|8p`8-4(
z04)N1B?y4mUw@56U5cBgEdUHEa>2)Aa6ng)XDcDAu<MfSIrI*m(jY6#)brA(I+3EI
zvmMdqA+I7qZmPT6Cp@5!H+JrHYv!gKxPQ?aKDl8B8>in!3X2qOl=u^>l9ft(`kSw7
zN*kY=qo~zAlIFV^#7He%xRCdb9b*5HLs+&QfwzeoMwHk2SFlWPDgt_${+^69+l7*J
zw_hRa=V_eLgs}yI&}A&VA44CYTxX)bD`8(h6^Wt{#o|r$6<N04gg}b$&KfD$f8-$f
zgwKK*^GRc457UHow9nb(-42Jf02UUtHMJaVKh3Et=fJ6a2X3VlNjpJXYYT4A=m34H
zXSYvyKp#(FZWX}omdv#4*uHWDpS*V`E8IDx5G1h&i3LTaI%Ot8Oi@!&8Rk7W?i6eH
z`@gQ(qg@MVYM#bV{_!8fBC4n^y$B%XtS|=jN&tGVj)IgRq@t&%3n8I?`ZNL)APA*e
zO~3VEMhJHl8G4cB_qGa%O5P$Nnxf3CCm@H<yGIYuneS%xf?Lbl2luYnQcGPS#`XQa
z5j<T)WF$$N)XXXl96Lm7t`lKb7SszOpe9+3m-q25b)iPl%Qa@_6CBXTi>qDwhD1iN
z&}rrqckkrMHJh13Eol^X)N44*3X**(w=hGgtjAB~H2`{Pi=-pL7%9VqEZ@gcDr(hP
zOqw#xoi&>)S1$AN8@qARDT;xR0f1<(vje67^D&^%{p$9w19AXH5Dpkk#An!JxZVJz
z&#rr$tPslW+JU02rJb6Fdg>eM2?7rz1w!aBJSD@Xtfn7F4w-&2BO=@!_bFjBvIOQ~
z*=MhYgO(x`7P2IPD>#1c6#LH{V#)I5)Q~J?z?VN<#R`c5&)E>i<XXkOn=u&$CYtO9
zOw#b~i6iuwLRhI&QI=#;l}K~>+*#c0$SQv^pif{xA200ODhQIEU}0)HpWN^m4=%lf
zxuT9F3ahlJ<={XqDyNAymB(lSrf6`2GJ|Z1&^#@^c`+}%@-pWxT_l-IMBu;;7K|Aw
zNPlgB&Y0%_6x-<O(q>i~5wb4>m#<u+ae5QUbc%dX0AUD;nJ5#iDW8shS?*@=^9{x9
zjSv_aW>#xUaIxhwM?W~q@)gT)g@cQY6w&L3=m0p8JT{ftIu|!l1}M<nIFkbx-se(R
zE4so7ay~w`ba13i_mx&`Z)m8B-R%<?(8mjy%Ru2|H7lxT@Z{}Vd35PUW{N5V0Tu!s
zIjBlIb}>X-3(*&f^px1~UuT*wdO<CSX3vkb$%^x6A@J~#2&&RmG&I!mi=Y1-BL$xC
zBUQK&E2>>y|A%gp1A3X@%wXsC^B!%NTWOv%Gt_x^ER58pwgrZMo!&5gYS*J(+<>Fp
zW6;;5(tE|ll)bYTFS7T@VV15~PQ41tOZ!6E=;v!PtykU84oL(qPN*g~J;l3+_S2)Y
z7**jmtCpcISxZ}c3s#3eWN-GEoljsu9}li}ku%WV!`fMk_}Jas*|F$8nn<AtP&zER
z8Hh1rR4YH`?bitA(PRZt5>J3&@6iK%=LgU8qhI`#H}<~8*^B2$*H=@Yu0tUxP+-Br
zg?w=01V`RKj^#S&qK23$kI%+{etoXoprj<1%hJ-)!t8l-(JFL}hizWWfR6PePseEM
z*h5c&?Yb!2rlq@+J#W9oP4nkbUsaEa#F$Mn6f?>aH!-P}n5Mj!9?^Uh2&hfe(HV4c
z?A!@*N>{XZy1`)CcF58%U&bD!8(YlIC-8GO9@x3%D@0e84Re<BiTfVm&W2@7qXvsm
zDp5x}SdHnIGb;xNA~A3`Jjko#F%qbo-igzM`p|hD@P#k_G2j0C=eg3=j+VLv&?z^`
zx;1O~*wY{5p^e*+z?GghKK{S_8t)!CNFtRCcf1<Vp$lGL&($(gd5+Lmx3I+sWnb5}
zU%2+mHKxyJ^No)$HO4WdXEn0ufz@<bdGexwaMi%iulvr2(Wc+~iy_Y!{<$cvG847W
z6((frP8RA5F8|v{Kh2hT>!>F|@znxB!7t!g?ywv7$+LcSKSL!-Kh5FOLykk<89x8~
zS2)mh1}{<hE3eDDT-tq@;7|unV8?(y85nxgvrk_H(qs7<oV-A0d{#`G$20dl%=&4|
zsUw90rM3@6Y>}hgJBd-@d^|?EJ=G$NlV?nU-}udc$@4$@KAFG+M<OhRR0?4!eC=`c
zgX8?<fBuy3|Kktn=<Z_uUH3rJ;s-zaA&F!%!ckLt-!a`=Phy6yP1HRQgA4@uY=+j(
zcAA=}hxb8-q9grE7)J2ah!HjvebX6@0Br&cK0*l!fzR7}-lD#$hD9@PD%Ghg6jBcC
zuP!ESYHPVg68%Vrz(tWz3A)`p2R=APU|R&GOqB|K0%1rfht?~XaC559T*vPA2@2?`
zT`RvZmgkoSRCj?}8|U$vjgRr*jCIuGMiUs;!bZifrN>_be)Lrg<#dk$y)sy649GB6
z?qT@GxBg%L{Oeyuq+Fa-0&NURNTdWQ1%42aOsDa6z~%N<ezp4*e(=km(A|@vwXKan
z2PIZ##ErU$sR`&t=-y;GA@McjIywkEP2-Gd7-taSnQH`eQEJT+#^Oy>*Di$#YuW=t
zPe%{$?K?m!UB!wyOCazOvgm!2lN!)_<L0JMI$UYFML)A55>wyM$nnc3In{oNpu(l;
zfizUt)YH+`^+#T3W`h$Y$i?h@f&%(@aJ9?!EH_op;K@6-uyy`jG?4_~$Cfq{6{gh)
z(Fc%CzujyM=+|!qqPM!g)9>MT|KRtz($$Vixa4v<q%at5!giU)V7o5b7(5dKyR<FZ
z+S)jD<OsHHql4fE--9U(=!9_)BO=GP5h$a`cJ+|SW|=;%ITZYnk^f7CtX^CLpd(Bl
zw|odtVfQy>1a=^}aOym#j-6!B>u=FeUBk+oSA=ohK5dI9C!m{t--!VoAfa!np`mtW
zBd@&o7C9Ad(keMDs7a<bbhTW;?UXS)pU8kd)`@V*tf0<I@zk9U@#KoFG?74}aD<B#
zR!NRRm-o{~MluYd1m>duiXXHexGr<t$9e8o!zL^QK88bwkMhO8{4&CE!v5HSMhVep
z;!P17ltSwe?1hk6mW9^(#$UuR{l-TH=0f$UwH`&~_|+Z4RP^mk*%}Z+M#_8wVI-DN
zILbl<V7d$Bx-!g|H51#l(P*;yEYgutd-Tu|UfK{8v)fBq@I|NDVE-3U27RPDXFzI+
z(iTaPruFm{@@*N&1-$(7D<rB@tXdul&^Smm0gA8<D@I3s#LXZ&kQ3ACB}$&f;nfx-
z0vn68Q_ZQaOPsoJn!q*{^=$bjpxU)bXy;PyWP7^(rTwu%9Q0nq?0ndf@Fh-O^2lwQ
zcx?59G>{;PgF;1&q8C&Ko7`T}%XnPx;Q<bkuI{ezo`^76N{vEqTAJ_}>i_Y${-#K1
ziHO4KLW8X(qC24bR11e**^9oCCE;1rx>ZP1me(LOA8re#ONTT%TBA{W7bB5IVh7=K
z;3@dSFaH@|{+q9p!zTc=4hVw6;2x2wb>~Q8(?EhJ)^A~!TSqEid9K(debUW!(+f@U
zYMGD>eXPN}HgKUU&jZVD=i?h5W|5jsH439OLMY6j-agaE1$Xr>^tf>CYDaGuwa^`U
zvGodn|KsnYMOb{Mq#P)fR@7)0y##qM$4SYdINqmUT<0z04M>A8uNl|cglQ2{po4&H
zM<<1z9CdXyNZSfSEK%IOzx#YNAGf@wy|{UkNQ_V@6t1@DID3VlJ%?))81Q_bS6+V&
zWn0{_dM%caSkfM1eNL_QDgYY`TiNuO3<uAjAg@fnhC3Bl>z-!Lv{_vI*?Y0OeIhdS
zF?&FLgUo4G%~-?}cWq{wJ%?1kNVq8N=i@OR42l)qo0-kcBrONa2!uAH>XsIdae7~c
zz(J7;EV@o!<oNFWc;`E*%3CBnJ1i@#z&Qr<*eDa0EfzgBiBuBhI{d}gzRDkd<-d}_
z@3XD!Um7<RH`aAnJho;tb8Dw#`ITRE*&4~&IXYe#6OEydH9L2D6m!$lc=EQ5Y@E4<
zYHaMNmw6Z>GhysZ8!!eTius_$hg<aF+M|z%#|-_$G4$TARq1NpdhZ>M96yFixCB~<
zJ+lYt&RGO{*<XpQ-!bk@^#o(+!_75NV&|pr5hx?^GFh&iy@YEi>g(z;mLxDb>V2-!
zI!t<$LLg*6rMPld-tU~2Quu+!ag(^hCU>!e*7whm)C$Xl-XGuhz=RnaZ|vQRuq|#~
zwGtP*Bz+@<A_zRBR8wjVh7cRzpm1=>SHU}n_T$@O2g6E_%yau=h8{EY(Tzm6penG~
zdfNsz-+U*vxVT7^j(Vg?Q8sZJh<A+R;UO;fn0)3FpCriU2|RDgGpC8j%8OuL+O(Na
zsLAy$oUG>kHxKf`>-(`feA33jmI~XpaU2KRwh{8`HoyS}+p!6P06d@WE3HUBC<)e-
zKSP0lz!Ln?fBO<&{MvsfLx9GVRMM1krsjP^VjD>c$(DKRSvhkdeotXi626$BPmr4>
zvx0;#*}CiwK6&RO%%PqtY^0HW;;FI-=B1!(v1m$+ic!Z5{ra%<;w;UZHJ8>*2QR$#
z3YOzUarB`X`ZaY2jT!oN=YLv+o!X=h#a*-?km>B9yRDscI)zi4B2b{U#`pcuBQwkm
zRQ(uwAqen%AIEYqop~-EIDyRgNNr(sv2`e=@QrOb2urg2?L8>hV%>^c!w`=Un25y}
zv+1Wol}bshQG`}7frDzWdHLvDWUK&n9iGparB47rZ+iCWF9LUu)%o3m#Vt(>`0Rtb
zSZ2+l8V7?$mRWuybW~<z25?0)N&t=lz48X7e_y-RYuE7Ro;_T+a30ID`sBrle(G;A
zppR!jFD6$BqzMxog%J=Kyq+AFFJ8tA46fslQVCK{65|I^!Btc~)$il?2YgF7q*RKO
z?{MUe{S?l&;c6RWL|9fA)x8(ZfYAombqR#wm6u+oDv@OMt+yhjL<!laeY!EGq8jJp
zc|+Z62{pCpdJc7-=H!(N2&?k;E46Fo=VDMF=YXEtwem+}b?$^`QI{2b;@(HNfBJ2t
zA|0eK`!!O36TRBTrtIj=YVVbR9S)WUNK=<~x#e}A<;PHc*y1|%!RAw7aBQ268}8w?
zmtWz`r3<KJf&hb)aPhR)%PLI7EF$)025Fl*)_^`@KXbvzwd~h&RJdRJi1)J(gAVJ|
zC9+g+FA*qVp^QR$&~>qu?sM&^tR}4zq?{CB!Uit_kP@i`LKuVu%eL?XpCAaZgpK37
z$WG0fw~moHdV#b|VQC93B*yd_N*R^oqcwr=gV9))WcQn|(=fe}r8h6Z7AjiDQIjAM
zwtJn-rENv!I29>x$f$Fq+tk2Y@4ib{(1Wxq4>vKOk7Gb@diLoYV2#DOEu&Cf1$M35
z%;T#z(Ljns)M=>*7)JD(cG0K(V()jN3|<F2h5{fnU~vovSz;9L9FO8GDkSw)b=-5$
zJ^bROU(wpxf#W#j3i&<^Dy(7~Ug>Mh8Tv@VXV)Dp#=5)9z!fAS#x9M(6%Hcj({ZJp
zE9b9J$YybsLrp4;@WIyM8h5b5B({7&N+n202RkpxoayB3yC2YX>M}{~;A%Ts%TZZd
zw9ZRwTlAAbwInaR_#*S>%;n}qH;0x$8_*gl<dk6O<sP!Ix<rz6syW$umJ@Af(9U&X
z>Ca@I+yAB5-i<>*PwiUy`(t%(r=VF{KZj@TdYGk&nIy1FWl*9Ihb~T>>Z_t;#Nf~?
zhKFBWwireO&oNIQ-OxI~4}6qVG}P2{*M_@!`K6b*bm<aqGJ$V`K654_!#&je$ACW0
z+O?GpDJ05>uom4nn4Cw~m3G=MwbFB`6T2Wt`W7k|kjTrh$x^pZ(3YkB^kps|Jx|-=
zbLf@~X>4R6z!FwT237(}^j+Kiuhs+_+j02iOTS{_;+wc>?tEP7gg!edC;dtt>}o8b
z&=?Za)4Xx?9olu~dSw4M#w>jt0{U1c!r3`!wrhE6!*;gJxSeWTRGDO}Gz<_(=--@S
z)Rayz$o63LOWX|c_M=P1n_>)I*?4{dB^5PwH9WX!GrQk-gJZ{!kw_)_B*clKJJ!d5
zKF$Fh!1pym3oL12DI2L3<N|swwbFU9jf*GG({l16t*0;3cKQkzj-BEBu`_g>Z6RpO
zA$v5gFL8v0ZCPQdoGFuXEyH3x$b1VaF-8*z!^^L}%DOdcnKrEvTUtZR+~i!T#m?y_
z&<H6)kBFP(X!|Knx12{`pIG|Y%yawSifvw8wuX%&r4<`y-@>N(YjLqq(LaGe8BrD+
z>iwt7{tZga<sc|)OqhkMb;&+>XbL94(*|FIuOTqK#c;;-6|9i`K*kVD%MJ~28r!nb
z7+fsoH_zsOeEF-~aqDVw?L8!fgEX?NH}-HxJjUDo6+&QyLL-rujZhXEiSY%>S2(^!
zm8ize+axj)tJ6SB0q<fDszZ~?*;IQ;QU#Zkaj>z`0R(=y-n1C}pln^14gr27F4L9m
z;s5w|zs>267CZz2Q>VhJxKgAHHSQe(rjy{YbsL!`su2D9nOA6hHC_?ph@p=uJNIB-
zx`}7j@8IUtY--B%;QF{<g&A^LmKUpqEmKXD3?uLaWbw%hLskUjgdryk-2`;u(S=7w
z_+*4fR`_IvPfqw`3CQA;6^4Q^<S}^B5zyP(P!kY@k-j*ZJ_M&OpObVV#rAF6IDF_3
zM~@!Gvh9-m=Ws07jI~jY8Tt_SB?NXYWYk+hAfqgJWn`rI7P{nBpYIjQNGz?8Cfv9i
z5v_b-qW26dT8uCQLS3@oeCV<##9(Oe=-}rs{F3btZ6ocb2ibH__LW-9KnOQGDW{5)
z?dLdl`5fAgg=WTRl}>&@PxJ&lb>~+8#p<V+MKx9wIS<N6wq&^G54yC74VnUi0vaDl
z7ELEvI_RM#(@AHxoA%BQIx^jKW_t)Q1ja{egJpE7ltvn;tE<CxT~f(33CAUAC8$lL
zX>w|*BZWiQh{VOhLE)lMSHUFpq<7Kie&6+aR(v#V*>3*jzxh{u@25W|T~{+AC<X*$
zyFD3eKsO^iDPnBIm9!ZAvk7em?lFXheu6VXSiP?+zK_sIVIoGZON=~Rn{vqcF0yxN
z!W^4yS2y=<xR<Ye=`Uy`fjuafoy;TjGkR!R$ntW>VSe{JU!gr^@O4kc&vxaRZ%uhV
zV~zC(7*i3MjvTe3ng>_kLo)1WUfM~UA)HAj0`~w-5PkKd#;NUeaG|G-mTU+6Pafx7
zM=NLBuh5y#(2?oE!^78_0E16xFnkj#nJJ@D<vQ^~M)H&ji!h6~E}3RpO+EE)6>}S>
zGqYhD3un(|j@?WRX&fX9u%fSGV5Gkv)J-M6ZX%adSXR@JtmZ3U{4=Wm?QiopfA_ak
z)z*X(l`{5mOgvhm`+&MML*zV|!B@5!rs_`iSuewbaIpiN7Lc?ZNT+$_jotj_@BC}N
z`UhVOlk3VINK@ib3vEyx36|B)=k~=bdGYi<{CJs7PCy?^6R$LET6PD^m`gPYBnC-n
z9Awllx%{C7@R4+qA%~$0k4toL@Z3>OT{_JN=TC9++!?Z70pAjM5`yS3%FylPuflQL
zml4+F3$$grIMsb2EY&%xaUF;Hnp$SmG;!<f#VnpSk6ULfqJe6XSW(%X>djQ4ub9fv
zO<yO6AsO5#hwf72<*2a}eDUA?0rRKL<UfAtPe?b^f)EsZALUs6Tv^v<fv#14c0`Z%
zH5$l~J?46Z)pWg=s~i$U2Y3idJ<kXEd(&T1R+oK#UAk6n`d*Y2eRC-W-cH?T9&=s+
zr6kI+`TkFS#OJ5a;NSl5{}<^Zq?bt>>PgGjW$Dp$v1p`@dzP){&13H%k_mcDuHxiy
zs<ZSljiHYvJ9h)aO;t1aUmyG!OPraw2(03=GCHgqjUJ5xkOy)=8wE~!SNQqS*ZKaw
zU+~Qrzt4*Y_weSa1Dxu)Ot%%#o($-8d@`0#PWj}ePeEOq%QkOm^0p!C7&5M=Ct=9?
zc`kOha;EJ9?;YLGfs;qLlxgLB_Z6xeYOrO303Tm#lvD$Zz8usHPtNtwKfl0I7C}%z
z8d!h#-Bi`o@Uvh1PaMYyO|uA5LEJdVy2c9>*E~OC`v%u|f@|IJl(k|Ve0oPRm3{v%
z@Pm-~OM$H{-hBOa63GO2tyzZ%f?oR~CO=sh2t40INgI`RIePv$XFD$AS#d0VQUQ8u
z*UHb0$wdd6>YU=EcWq_cto2k!HRnYpS6pm)0<vhj(VU>2U$yS%uV4QG&%W|QUjE=6
z4z--2P4|#V24s`q*@A*H{aEnz8`_qbgoU3_;7Gdi84g}J$y+B5vhUO}>gG3*a#AE^
z0uZHZ6h*ZwQC?9inOZ4z1}QC+v=9RBUUMglmoDb-zWW@$4v@BmkaEbf#Td{h8=#vJ
zrdN*mJoRP%MafqYmce0o^UXJyzi<Hy7cImtZV<%OSanKDJbY}DcuCFfqkHk4%5RfX
zyH<WR^W6Tf7|^E@JNIC|s^^)FA7O!<7P-N~C~JVmi`?lM;COI>m(K3x>%aUCKYHg^
zym$T>U5-bmog?FTc(x%J2gcr4f<i)4NJ^}<%f-$s>^r)jWL<*Bx<*`FY*cu|wJ8Gt
zam`>b5l2{`ZlSdw-FKg*i<Ytep7p%>#v62Xb)%&0ZRZ&SdJO1S0q9a$VdpkuLg5>w
z$YwIUvU@k{)~;ht^X!sX&6L<aM@hc{9&SyVw?24})_f;H<zo%MIh9%Zm;w4&v2y_=
zbApGL-^Y&m_fd_5m(Su@R+Ntk88q+H#@`<L8DII?xB15dyE&I{rN=7Johnd}UYVx*
z_#1iSqa8`!FYwOceY|~WFSBRNVP?7+i(=fdUz@QhhUqe5NTD}IqJ%{N%$+%#T{|CV
z@18d~c;EoZREoUsN6k;l#NMN0-0X#7Kp$6t4gx7<BsgO*Iv`zLO;@&umtK2?2RCh|
zzPc9Q^!9I`%tJ&SDlKdT7KJK!{k?avQlV;NB}WYCH=dn82P_|pb32}3PP&Ot-o2BB
z$z~J=%d+v&^x$)jcAkIl=X~Q=-{lua_Ha>m;iaL=%2Sa3gt@UALtYtBf=nh)>$z4|
z2}nmy001BWNkl<ZF299ZnZlA{V878RoJtbrNrh!?7J{VXvUBI7baZy|%I?>&Z3~1z
zS_(^9D5XN}0Wp{eXbk8vp!Yprv6+i8p*}@hM>~7p-N*KaAEL@iU`=)pS+N6BDJMnY
z)~4BebU*EdE<9D)H8hpGu#E|zr*^IU=2%^DjY@F$qE+lzd>^$W5Ljd}oS=mtp4!b<
zfB7ALa&R{n=|ZQWQ~G#gT!VZq!;_G*lC+*{VadEDEU24_rTa00DXd7N%i3XvEJ7fK
zL`vAcX*)MBS;Q}2c!5klM}R>piIfs;^bm$T2J{%v2LievjHxTj!gd^vpFGL?Cr|L`
z)<>`yIx$W&Ns{KG+Q4E5I)zQE-^qKYkC1mNf4Zp(=r_DtqUqVEXN}dx+Def$lC{g0
z<6xsvwBxZSdyFsq;OqSNpM8sWJ5G_Qm9(e=t$ty0++-<9rjl5$6B-vOV=y1a<SW1y
z76Q#vJ09mBzWp347B0c>&f<4x(FHH;z%>X4^q1<5M?8uf0^16uWqhMiNtYl0{Ac{f
z|MtgpN0dPi0_KxuVU-C0DI`f89$2%UYL&zdbo_u!RED0~wX$=pF1FrIQ{xGqy7Lii
zBp+~&zk2yQeB+nj<z(S9*`%Re<j5O;Qrz4`J|G=P+-}X<nag?Xj?L8JhH>;Ly;h4}
z!!ea`y{H8)5rld&k*H8ntq&13&lOCoYvNNM`visVEJqI<Cfk$6wiHq+q*N%&Ch#>z
z_Y!5<zn%DXo?OvSuJ~$?O4;n|b&S-nT^QM~+d}_;Bb{S}zYf#ZhdJnXl>LtIGy2*O
zQ!li^vJ}da?A^bQ>be@%E?<S++w=h)wuHH{PLLbqNz#$zRUiZxbSDQ-9!0yAg`%nI
zb{`8s|J+zztmPS2E?CU+`8V^kgD>#SpFPjpmyXiq`n1VBIpa<E8(Qnxr1O&MoFH9L
z%uLjA@6BuZ==yCeO3cE+VACs<qD4&9i{M`TzP}MIs_)%*&%JDVU?U$KKhC~=?;?f3
zwym(tO^C>r>(Yjx#I(eXxrQm>J{e|1GoFVLI=Y4s+>JI^j)NEYy!P5|?%Hq{Gn$%1
zL8~%_2wmZg*O;^PXh=j@#@3wXjs5SC(;2j?EF8svex1iymZ|}`#wJ}?&7sy){OFYz
zX~V-$S#;|BguaQXLV{#gkm!I^kYJYEz_Pk|Y+13M$8Ud-?YC@TL1H>-Bod8HQDjE+
zse_&B{nUp8#iA{qHLaP)cJ8EUS|f)J9^(ADbC^IQl|osnx4cb=QZoElfA$#A$HV9E
zYx)X#56iO9T9eJ^cyrGlwm!6t8aEB-QeOta<lJy8K%&r6a=zy>A6z+uZ&fw|oZ7YW
z(adxEr&K4l8~TilHK3=pg|b3MWw{QW`JM@T<Ltb|$x4)#*nwoxv{@{jyO8DcmoT%g
zk(+8}Qin?tNdgNK_+i0_vim8#%YL$`@fb+22wkUA-~|D`3GhY0m5z2k_j{k`hd=)*
zc{EnS#j+(D(}$T4rxhLp`e+&MNO&p7`RCXD?pLq0uu_Wdj!w2cu!*nz@t@I1q9g|!
zc2X1*eqHu&237Dfc(&pSd46(XH~;w`zD{SthYGXwsU`(`!x;KlgE@dFG<oCWp~(jm
z)4i?=3e{n-x->V{&S1mBRXnufZXR88Kld(J#oDID%y%1UAVC!tDJ)zRPEi%D)Ze>z
z&p#<#de;-o%f2chkV+AF0qInlM|M2KLtD3T_~;S#zxN*K$N(!VjIS#@+7Jv8y}eFI
zKj{E|k}>q+CQ%51F@{7s#ol+{rLMM?J67F}z=RbSQT%?Q-_PDE*|4>hk`jZD6c(wf
z8upw#KzlxmuPU1$H`UzkHw@6nGIl;0hSO<~odLBb!A<qE*|z2$9=&5DTW`IayJoCp
zZn}}_cA6?|QYaEAEM#vi*OY;HjNI2Wq!2ikg^~&(1dWXiJn_U6+<C_xy!GZDE}lD2
zBAG-0T5E=_R*wOFY65y`U7C{jCzVd~;)^e`c=-};p1-67>J$B5mNzmM#s3L|it<h*
zNxD-$Z|;AGz!nvC6Q*{pJezrL|65bVHr<dXrRmwHe-rq_7z#eb4a$Jbc}%maS=cm-
z^~-PLwgtB^KRtscs<F{HQKw}AI7RndKjE05EG8$1TyU|=eMp8;R*I$trB=5E0s`%W
zR2U$u3;g267x?6_eVTmWGi^pQS_zP1=rSas2e}giwh>br&?lSAy?^((Kx-_^LLsPe
zll<tL&ojTF83ldXDo<oEFMgF}4tO6y3m$KCn&1DMKj;0-Mf_A{H@Q>E?S4ZTdTQ6o
zS7J!Gx=~+9A=>iPsx&K_7x0lgHu2cn2e^OET5fWtF`YCC1Zf<KQE`RndqX2uuEju+
zi#{*A(L20}%r-=CiC7rt6euAvCcyVST+3ncf}8lvr$5cC<{A9t2S22c%aKl|AR-?k
za*~+xSr>-kMQX0@&cqCTf-v+lua6LdKni+#dN_FCAUhv@l*ELF^YSOUH+E%8D<}l@
z0Exk(HRxvFsiSDOvY%lpx!te(v(ohJ)7yZb#85E0r$3c}gm01b73-F);*O=OSvhAB
zOYPYt=q;gAQG`wQ+yBb`>qiXn`*>8Gg@o;WbmT^q<aL1)Cr|R7?>)~S{Lz0wBphn$
zYLS*gD~T8Q7%8xA8$T#uOfaZeP5GT0Z3&zZ@z(5GJRA(O>8-ROHPL<50s<Lo7zABe
ze*NiZ_`+}f9s)m9kC^afD0&b(B*_7n$@50n5q{^JU!cY6!MJwJ(#Io1PwiTHEH);i
zn5VqL>hPH9*0XNzQl8oTIGdK=!MbV7n4zkv$03QtMxr7p7yS&1VCWyjNpIJ8S1c&D
zr8P*vE96l^&{S8?op;>9le?azv#p(d@4icCTL+d>;UOfsY!=H>$l-(Sq4AFaeOz)E
zQGw@2m-YQoLh|NYZ!vRbGq){U9ll0P{Ci-c2VC^|8CY0I*JA&bqnv9!hjuCp=u?HI
z-v~heTx?8+9+u}~Wen3qihFNb%|BWH5Rb3j$ja&k%(3dI!X=4?jf&h<=0-VJ;&BaJ
zPN^_qE<mG=p}ww;M|M2S=1rR^<Z>K*Z$H_tZi0eGV|@d@?*Vd1qphR5_EDS87|<sS
zpcntX=$(-!4CUCC#XIl3!}@#grn!E4zi`^bGy?;5`+6^-fT4wU4xc_w)~YxTy_$J$
z|M3{muVFMj`}F652V!F~_>gT-i_5a6c|39F79Lu44|g=IV46r#gG<WTI6`9eVdF8N
zPXs_Os?RBDV=EgYG+Jxs&X~pH4?V^mcixUPaQx_T+Ad!qkw_wCsB<lZ#F)tNiO}#}
ztw2o-=o1UjW#mpTfx1+Hp|i7-!v_xWk)4m>NPA%5KunH1V*&$Gqw8#5-191)E>v1*
z=2KIFrC(P-PwiUyi`bA196_5;y5KO&uHliD8~DWf?QEHOC-bbPsN~EJOU{HSbz3SP
zA_nyFYnX&U2pM(e>Ko*cLSadT@ikuHvv~eOwr}0W#trx3S`P2-eTUY|ZCFB4ldi^=
zHrfb$FF@H=Nvx&>*5zf0gDI1X{=c8<4P(Y9pi9%QgRv-vZ^GJh%dxq9`7%A7J#5-=
ze_w+wCQmmuB?P_*u!PHrD`z==<uraGmVzB`fd0AI%$Kb{164VfYU8ke$ts?>`$4uY
zy`9C$nbeZNMV89WB!d?*#ehC>;Y1=(G6HsE@Nxy_&YsQIEn9iy;T_bZ)0{Z|J|DdQ
ze$>WQkV+&_N)bejJ&KzKgcug12Qu^+(8uGun=)C5^1ce?U!@Sd_VTMNxalUAEM9~y
zROtni!W#6l6#}5sWY}|T9|bGGsLHYQsnD?Hx&iulP=*^%!}Tq6dyYBDdOouDKAygF
z3wPJwOtY+~h6EP9^`_-u-gm+3eqEO1F;Pa5NfFhvD=D!p3mpUm1&=w+v)FRqCU$Ip
zh?&!7aQ5tJE}g$XrYD0D;3SeD6*@3z9l7=8(4Zaz`osYABB=Kdsfd0I-d2j&cfZO*
zTei?xS6?doGGY=~1JS!VktkA))x3J_ZCbjopc9pCmL3Co%+9ZQBr+1!6R>Xna-Lkj
zjYpT=%R<#iJt?fHvyv6Txg5g$7G+6dK%clIq{z0)JG&{RkV2BnWGLkFG&VG_;jZ;;
z-@c98R;{9|t%KH<7TP<)%=ly?K~*Y+_5#3^+P<0?&?hECAK`t9Zg?prnOu%{-+h-S
z9)BE5T78@}ViK&7VzQh;aJcORr!Su;pQw1lmhQ}R`(KR#JqGj-x6r!->P3o&mTX|x
z+O0e=dlk)8Q-gzrf~W*d(zjB!82Ri~UN?vvXrSV8T}a5FLrRHd+XyA`eV@ShNxDf^
zE?dFQM|QI5-UsMxZRhN%Gh8}*fuP`1ol4>RK8|IR&lgZiB9sa@2vU}m?Mi?l%-~Y;
zF`$oXyK|%Z$q&WeJsn^tTuz)hMMtKajT`Q#;N_4?VvG(;9{Xk6OtkxBqOGYx64ctf
zw)ZUp;Z-_0ZrfyL>DL9&V|P24jEB|b)9lu<bKQe{V#C9%t6D-G4hbYO0`sEA)yR*m
zxhew{j|pbZgb0D%vJgU$Oe6_>A6qJB&z!|W+qd(`j)z$=cOI87UgCq}$I*e05|U&h
zffN#>H73yLAc&Y<nSR<(n(<Qx)WsP7^|imh<v5@umSgkwJMS=i_Dq&7TZV;-V(Js$
zJ{0-621LT)(Ai_0%eLWFwj_O0yWOwLU7zZJF7x1IG)wE|@YuRd>{xam)2Jqa0OOMo
z4)KV`kXtunFvcKdxXmjR3K#*t1fdiyZLJ(Qyr1uV{~!47_r6E2kjGBANXtT63Sp_J
zr<Ep<MWz>qYz9-BD_5rzlXm6GYi8(UIkfh%EgL`ZQ3xzw@SXqfTdZENgrpdxoNWSY
zLKe`pkmK3+e#oEx>f7XMD?j^_RXMKW487^ur@si?Jyngd%0tqV+&*hLpWgTc8|U9f
zBQCYLC=5!-@vl1_k1=QKrmSVA5TVG3j6^w7i6k?co7uMcL3V6^hz0ZJbLNASWV*T$
zzQ*@FY^6$KB}L{#pZ`b2Y@%<b_2hjr$2UVC8PEfSlqjjt7_vdYYp=Y@<2ye>%1M;u
zT6&+GiFGG+@e>;mBJ46}HKq8~fjwOA?m#6ft28rNS$f3*J+*7)kEW_2cDjA)NwRgt
zJ^b^{|AbqrW;2}{Tn}s|%Hm{`p>i}H*BjLPe_u?fQ$m6X_2QfA8d<yMHa_+7PqJ;(
z7Q9@6v!~8*?(7-7TmegjBEhxQwFnKq7hqcsXoJyV28Sr?)h>pN5)aQ|r5QfPY{vX?
zzp;RBwCNMlzE+_hON6qi#u$tMH<jY#=~G-ff1Zc8>;MyB2@5c29Yn%36UZxt4xc>}
zK7~?%5-w-`c8;7nj!sqfdQ!Vq{y6j8{<ATlk33PIn~DZFnG2Za)UtKu1|DC#iRJbz
znn;sCVhJ?}hR1*&j}Hkf#vme~mLhD_6L>zeX3S*kmM#3+Km9aoZe0mlbN=*Mdb+yF
zb!V`Y!nGXG8WZ(tmqH+<97JP#pvk=!z?*7--haBT70?By<W126a-K)Rb=mjcKIY7u
z!);4%MH(Fm8x_TcCXS6Ur7ZW}3HJ!d+lF_K?kD4Sq3w#Y^v_O4mR|8YJ{9BVi406n
zRI_E(2A*8?AoGY6-vS3I!`7H4Dm#<Ke&uoBvv>?M^e7BqpM|UqK@gDlJZ#%Sn*gCC
zS6W*5@lSrtcYpK)-gs*dT|M16=_GXx4H!$}8;y@481amHM20@>UynJq+}Iep(f#g^
z6cu?QihwSHsNJg8xB<NR!=E#+p&4T|LZ}J&yob$*%kNSr9_PvM@BjWwym0<4velK%
zJ(`Sh^orj3re~l28L)7wfqBZ4JhpB#A6dPTB{WlwMH&YsMX8X~L|{I!B|$vmarFQb
zcHHYdihtzTHnwGf(G+qyYEo6Ky=^TYec}o3zvmuoWs&R7aO(XJ@CyYJmW^xKprhy0
zm?7NcW>~lSh}RP{^vXODMQK<q$QKGI$HprZIDY5|k3aetmXKk*UC0Ucy!Q%Q7oC|J
zP$)dx=anOGQE)WKSUK*70eWiJ%D<XYVBQnZU{&$t`t5vl#RDvtvq+*)MwIG8i;t*`
z;9SOyOye<10J)mF=VIAg5jd2zaGeCkfM4+O3qFe$Eaagr+j;t<PqO-!6?i>a&K^HO
zwzCTz1XQQfSVEyaAI}faTK6#&VmLq-*B8*u2oo~0%ily7FvL+|z%MrE5u#GA@7{|w
z(S1;n-hh&d!zYfDNT*n{>Q<DH6Rs{@n6m7RlKP#*Mv$(r=EZ}1xRU7rH%^ZG@P4Rx
z3^|fHL%m3{<F<QwWaYgqRWqr=#zCPFC1H=^B+GcR<1q%qwr!HhB-QCE@HM*Nk#-X7
z+`faq`TAe+!cTt2Z~veFil$TzmrkDH;;A!;LO@+AO_lB97=eWtw45z|rbq8lxo!qL
zI&q@5nlJqMpK|cT@hCZN;!mOlB#<=I$elOehREvpLAy~5eJaJyRUYa{^60t;cxugN
z7En(*(tRu6p%1@@k4HRiAOjKtqr)s|#|d*gdNMuKH#KnQop<rsU;lO1tXYFF@cz+b
zT)B7&Wx%y;lvEg@2Y^<I|Bd3&HkD`?{^5UJi5FDd1M{K(&J6x@?Fa1Jw~rkUKSaWE
zOPj5*By0lMpCM`|Jq)_uV$b2dbm$zyirwzl9nhyrcDu?+Ql8@B)%Wtmx(8WEBUQ!<
zd3nFUV_#5@0X-gLJEW8)u^J)3aUA?0pis!8jbX{cMLhoSV?6cbF4Bo4r%#@u?Me&z
zTn@{!P*RrM+vX~PItKI#o^237H^$()F2~<LPBxe0!Fx9LJKs3BKf}b6G=_we=J2Ht
zINov=;<l<WpjX5oW(`$=&HamR<KuU1XPGsNI+D1;E>V@<xS67|YR~bAM`f6LdEa(R
zSva<fKwttx;0M%H)v)#6jXd*-k8|JM>$!0LJQvPgq_d+7?P;n~RXCP|?+5t4Mhe-h
zP-6r}M>~eH=U<j&al(H_TxFm3aR%s~?*oubBq(?uN+}35j_rgV4HL$=b)ZAd0IA65
zb113$hPFRMow|s+vXsZ@l@J7efRl9DzkfeVZeGlS`SWmu-J3KyL5Bex9D*vr3;W)r
zTLf5kMOpeYndkO@DF*atOa*tlG7=|mxV7mfKC|fwZcQ$rfdoa-#d1}zn32b0!ad(o
zMJk3spg}?4c`RMHl*d2v7$5)m$4RGBoIZJyV@HmV&lhN@ugA3=lv2g6upzieHLx9M
zKfvn!{lo-x8I_D_t&s?f7vSad^z?L-&15L#^Py)$S-6f%K9?hvN)ZG>9~Ho%=I3fz
zx{2H_I_ki7?8s5JZ{0?Hq6)43ai8^GY%eSZyGCK~@NlcEIoNWVGwm0VZbh%Bak8-V
ziU9glVCQy0v!rnjpW5&+>+4rgO9I=-Fppgjmixpm_IOOtp(8-BqHb+L;E_tC(b^|p
z$dgVa*|`3GKKAjaS-JccIy*Wzu>Sy^ogGNaLMeq10&PN&V-f?pF$Qf6N=p17K$y^w
z&YwM(yY9S;2RChI&Fa<E*3@8I7Tuj)U<^uGm>>WHO7?Agd#!-pXHJFS^x3oYbat_I
z<0h10AfS)4zN@C}YkyFeLLjlQNpUi`%)S$c2^>>V;hf0==oOif$<EO295l)lpV|Bb
zPt3cQW~y)kiDeX86}7Mps?REm^MB(p!2rGNsWm2uutA}<j~3wTAOsB=hLaATJjPf4
z@-O-RkA6T~S0^gzl1e7A6E2y2t`E=*W_&}jnbBn~j}(I+sj19}F?=IO1aYYp!hkUv
zOIi5&0;yz@)yr4#FaG&&uzcw<l6Df`_+b(vf^0s^tGi$0D_{Fd-aB{zY4!D96tDhj
zg=hK;*A(AVi!k$DNrm5?;m`j4f8og;kKzai8J$m#LqOMqS<bT0=ws-@@RE0g|McxI
zbF6R<?Nr9bR{Mf3%S;NPnQLa~P0v349I$+{8oD6xsUpb}D>t)a>AlPoP1r``3L7Cn
z%c1~6e;w?2#A9OZ?ECnaq8NMedlR|RK_UzUUY@y)GugU%Gaq~MDHhC~$LSAFaN_v;
zNFlJLMJkaX2m&(MEE0iZ*$4!I@0XIagb|^ZypRkVQ#WSN*mLO^kyZDN^A9*iL>v=(
zFAxxDvOO85*EjOdKK?0w@3(%Nn`bVdTDc^Uq=ZEhiv)^lE5Y*li`lW`A+nhaZ|;2?
zCz(L|L71Q@#fOfg3n9W>h4Om$=m>%UX(?Xc`xf_a-o&)(#?tJ1UI9y~(v8>Sz+w$*
zIm><^5ok0?mEuCjMGl=kieI7RxPqKKEd82iB(-bhHz%u+lNwBSp8J-r<LR~ASZdFt
z3JYlhlu!`a0vW@2Jf;BT3j{)hE>KIUuvthDU@67=+wS61&wPrz?!1#Tr%!X_;30DP
z92lsptqohb>HuvtzVC-FdU{1^WE8r(eihx~ny+3W!i~EzR3%dUvrqpTzwu9howVg(
z3yBrE-iwD79YTO>x!k+q9`e4&tFOIEBAKL6D4?~*ahw5Cz8`j&vJ@W6b!h2q=g^^p
zJhgKd7#(KATXr8XXM)%+gT_M9LymXP9-`IjL|T<=mY&+R@^3TG?Y}aiF)KDy!;Eg9
z6}7Y3w)i%dxHCy(A<!sk^--u2@kGXB3c<QUpo$#{q#~V2k@s`>UY@P@Y~nkA{Y_r}
z`3rpPv5%4x7N_4oL7`B<avYRxV_Bi_i8N7{wg}7QI1Sv1a2JEGgOI69#e*9+@oS&{
z3{@(LBb*Vp5;jnS!|(paZ}O1`x8vpWI0+Zmb;;-R*X1+oNORzo-MjhI|L4mf6s}Yg
z^vTmG11S`1<}K%z1<MeHiVMvgnD8VtHc>+?h>WH|rPz7f13WNm6-~G}7*sqp@tEQx
zz@RZG6qc|MkvlzQyJ+K~eUGI#E#|-e=RfB8Z+@HK``5oiy_@FZ=`(a(X~9wUxCQS)
znV~T#%R*~S5co9I*74a-eTHh16m*`z_`_b0G$6Gh&;^wC`TW26U8dF6<NH3I=b<Xw
zMXaP!8TdZN7*aJ={K=R9oZUzEQh<`A?}XA_)5Tr_0Zmk~?xqzq$SP!D;sseYt_hze
zYy4dKf<%wt{w25Z$-A~OpGFdhNYpi~sx6jT6y5Fdh{t3eW`N<4Wxop<yD*{tf-S93
zlL0|<<8(IMxt_-#*~!A$^XX{q;Nscy^z>xH)~}Yrb{#w~OuQ4KJb*R&e(WRf(63Fq
z-P2(<yQ6HjZ+?)cc0Nv0TG&Ei2^od1#juAG5+xL=WEE#yF7oEyx2dYDCGUF`3)z(?
zAW9ilEFc7)_Idm5w|Vl3$8nW|Mn~r}$g*Sv9R^ayoe)hJlF&#a(L#`}tz+-e1Dxr&
zh)7h_?LMKE<F1vVKQSrUd6&n6s%h-J{eI>$4ci1|js1F?pT_Qucud7Hn6cMoY!pC6
zVkb(3TJQ^J%;7ga^I3lUo$v7<{@v$UvG`{EY@YTjt@!yu_`Wifrw#mIKo<A7FqW1=
zDao2!S5u>sSP*UTuiofBv~?S<ZIkKgL8|NT_jA%o4!nPa|NB4uK3Tj0RSn~wpqC}b
zIY^qRW%H_gNE$a@kQD^<$!DxQMPs^-EvxS4wz{P_NQAHmfPi7#REBHH!i`5fCi>7~
zVBhm%oLmB4HixC*vrj$4&%gg;{_4wLW$T9f=)TlS>xGLH3Lds?lSm{+UB)%qB=w3h
zxKxT2%Womd_aFV-ME1jvjs^4PF}=Q#TrNk!_bPA4`qiBm3I%M(;amUkJm3GtPYFt_
zcj(VMq<iK@KUYQDE5pP|3uq$A1Gn5sb9EivZ5<Uo-$X9Mjsd;jgPYchMGbR#WbI}e
zNs+`wMa!2mo*n~rJmN80a0!7gl}KPoNe~3MD0Xh##<#xl*ZhyKevKVlwv%aX=hCS&
z6ne5KUA7r8eK!aSan&(+ajk1r8?+ygPNzwyQy+?%mye{IVCM8@bfm$4-AACYTnAi>
zKlqa`aG|S(V3am-+-w+29-<J`=hDP|EAA$(9gL1Uv0W3OH$D5bQC={qCd1AKGzSSj
zv0*#2sV9LIYET;+Wh81a#vKEDJf?`D7^)3$@n@=(0pEL+*H#M={>)YiB?M?qLOAT)
zyo0~{>fi9)Z+w&O_in^%>mu9UNueu)EmW9r=ccfwgDo9|kq9G^M)m>f5d8I^M-kLZ
z2YUFUU&!4N5?%1{@&&rPd(as012l$=mqSN@GuT0CenKF!0b4`TcEWCU2!tF#*hZT{
z4~j=WkBBgS>5yn#+d=yQ0fsY|FY<d|_)p{!6pEQZravJ3|LnbYoLyIW@BLkC?RMI9
z^=8?UEXi_{tzy}-EE_j)iyZ=i5N^u7A(y;KNZurGUT%niB$NOK0+<*G7_b2Y#>Nng
zG1%a4V@tLy$?Cn0W;A`yIlHWN|JeJ?oGFrKq>(f;KF@r%M$`7$XYaM1-&222a`hrP
z&hXl^5Ll?*H3YZ_ZeDyn3u@=m-8r(I0uA@Q<ItPVLyzonRP${Ns%W_U+>5xhVLmzH
zjaCVpSEM2%FN!$7UaA0BI^u@QSM$KV-{#(XzRKm7EG6nHaA4OSg6;w)(wHbBNW#<Q
zVRm6oZOfZXUc<I++B-Wq(0DNR6O*(+%1#YA{9ZDCf+(WpNDD#;eBVFCs!fA7v2h{<
zLP_p_@caDe@kcPoSh<bz%HF{YNe9VvQOD)yUWyfrI2KKO(*gRpPT<%p001BWNkl<Z
zQZV_5nYB~7VcBY`Dchi8gpP_-q#}K!d{USz6&Q_e1UIj~fd{^MA9sK5^IUuRm9#ZB
z(X{U%#t*TSg-HleqSLgmG!Ph#P?EOJ4xV}TS$q?KR75&N6MO2%N7ml+ZQZkz9f$Ve
zhXKm5PyKs{B8<@}A+eQ(r2rd2<i0HK{FjfgcH4S_vPi<H4O|=9m!8*vV_*^~RxP}k
zS+$dCE96JoOTVrH=wncv&|q~NuD|pO<~UPHp-|=d@(L(dq#~yj*dY#Ur=*J_4oTns
z)|+|YTlaI%XTQKD3l`DU+(K(pGbZW{p~LARq=_&@#^8q`Pe1o8+xG3oCqzmMIn?f7
z(TnR(Jo_|Vp^uaD2!i0$Uc8R|a8c%^S5;NfbmR!1`1GgfFa<(NMZcpk6gg<B)5Oet
zk<Y@+EUsE`33X)fqY+I5|9s3jrYC5*ECAj=ZWKy;kxM4e<J~K7VHR~{u&~MyTyy*)
z_TwEDd!Ql}87l4xl(0}j;YgcB^Uve$xBm{)rcLAZ*I#G<_8lN4DbI@sjzk)ju+Nz!
zr5w}L_V%<7zY>1HxVX5&+OlYEX{FHB%@r$G;z*kajY1LW083azCQ6307<58+8|ero
zZ3-q}%fUVT)j$3{+Ljn8l1cH&#UIDJKZaG*?`zZZNeGclgDeeZ(Fi4QT!)QYHlZxZ
z(o2>Q5%ye*7|@(JN;H^AysP9HI|&81H!;Vio!e;Y?m&znPfz-eMbC9VxPIHX2K4kD
zi=GAQ$Ax#U4PF6mzHl`wrkqbLE{?JKtYb4GN~$6ismO5lONswQ0*+EFIe#&?{myM<
zb2-+pU(ew^d&y+8WV2a{#Uhc>eTZE8;NeLEx=gs-g%C(7*tTsuU4?FzEL(zy18Ag(
z;ZO>R!Ng=cA|`f0Dk21jI*;&oANnA>8xIhP-d8zgfL?a}ecW9`OlKQ~Y~H$+Wy_Z`
zsbL}xRu5^==mhlMchNJfPl7EyT8izg+qId<8_`#M&sZXwIZ;6W{CH6uD$>lYoz5R#
zelv5e$yml<3Dvt|#8A`Z8j&z8RZ{2`smRDkJPTVOlM%(aRGO8`S8(ms*Pw;q+2@|2
zv$KPAHj8E3$&|Q3@Nl@Bu&l&gVvr{OEaDP*{4nCR4X@L9_%L(ko<mKx3JZls6Y3zz
zSI4xtA(|o~8+UHyZ$I?^^VAE^p&UEb4Wi6=;nV?o|F>_XAVTA&Qna+Tuz&Af-hR^^
z2tX5&%$4hjPM$I5ICBg;OOzaTLk5qkDb+l_=2?#Td6YA9+2r&ci)8nM>z^FYfPUwA
zQ5be-z%}PB=f;_rkwYRi@$i*l8>Yt?Fg#+jhmRHfub2%L86Ps(I8Px2q3`$fp-*a<
z#OkY7v3&V5nwy$fzhOOop@`!+c&<wnMm;CdqL<&i{CvZT7L<LV1sEYQ#<1y)H+bTS
zCkUbdqrlCk5srlxg203{wH;y0?wvgN$dCEA&-^<Zw{6Bwr!XcaS;d&-+RV_@%Lo9v
z7O{6Ogg`kKw(YQG(`GW&8J3=ZDRvnwNCX%&fT-rogly>hOhsuhmcR&2hANuvZq{sk
z4dW<;HDWq()mZV;Pv{+wWhR|I)=X!>44LC2@BJGtv1e0lT$Hh}r0fU6dPqvBv;}(q
zEyr8k8!j?&@24>)=34G^o>IY&Nt90f^N0wO<mM=|m`kswk!YQajn)Ps1yUv!TR9c>
zQF}@&^^p}By<$w?Vke!X!Zgs>*32W1J<8|4{3SMT-Gr0!sIILcl28bIEX(TUH#a>l
zYM=d3`neW^lcJXXu7`rObe?2rh>0{4>KnN5!V8!>Wh$2K5EP2+-nE-eTer}3q`8Ml
z&xnB<r9^vM{&k=CYffC{3N!G0BzmVr$P#Idi{uAi`zDvpzW`}8wy+Wc9W(0mL!YN)
zAPOS1qj-@$eCXSs<>ltB*b`DC`I7%{)4RX-=?b8aX79YEz-{MU!3VDTBPNm}i;GCC
z)6zm2Dyc&3JNL~!N%{k+PLz`%!o*g(lxPHDTtb6M0$sYt9*DnR9`X{&Nlnin1&M`&
zOvcBU<Sc@?s#PUq3<K4O9Kq;8MJjUo0KHry0YxJA96G?=U;9t)|L%8aYHgvqp$^M+
zkd{Rd2C+xiL!hFD1?U6JU(+8S6+svf_&!Qm1cd-)#Y8AtYrJ${aEXo+F&Ifehd6a{
zG>2ac5K7V2*3Pv{FXtO~-$R2)$9lwQgcyB%BmDs#0|gP$Dh&6(@hG4C>DTD461W*>
z#9p)M-QOGaT5{M=s^PwO{4H?W`}3rcR24E*6&z{`4u!pK*zE={bV;ccMQeDiA1a8*
zMh@>@aU&Py&c;Jwp?X$_zzmTuQc_+MD*A02(-Ru%4SpFBYZfgGKAJosZ4_xH&tW<^
zL>rsC_OUsCfORc9S=X|iZ5{jA)V?P^I(D;Pw6RaOaM<diRpcoWQ6M7d>50`CqC{bp
z8w&!{TUUFMrd>rUa@rt$aK)ai+b|5Nuc~MD%2ljbv7G&T_ONsN4s0QDl+^>ErYCeO
zlf7w@@0BXyO~26E;D<?mzvs}JDAKsDgOmctb&~|Sz_M+m6vuow0{~r!A-wzHxNb+^
z;6^}*#`QdQ?%Y9LO$`?<x*#Fc83p0?qj;j_X%G{Ett19beM19l_ibTM(*f-4$N~CT
z$fXZkjh}As+|rU<w~OgA<eR(bIB=NGmNrZfVuT?*se$@)roaS?d}`>R?iCFe)t${p
zZ~b%5p#cx4&q&CjFJU>T<!F+xVmQ@3eV+0EHF=6Og)Qtqa)`s7ZM?E&18s#)j&!!u
zS?H!a$P-`)&=_s7`fX{;QYd9%+ZHZ1RaTZM)f1RGWhzr@8<;(L8uh6vYN^6P;3U2E
z<wqsRUXiixp_c$X>Zv1%_gp?K@WUTH$bWq4i)`Gwg_<c7iDd8JNL2i{WgdE*3e$rE
z>hboyF^0$wa9ub4e-tyz0cbt&+M{9S^iOsG&9Tm}1w=9)=%Rv%jI{ag-CyIvc?(F}
zUXrJlqj+t^y^2Cf^14W?H2iq~^L+SQpQpv`B0I76P2;7HYCv~Gi;2Y)ZQC2!@zQ48
z(84kTE7AyK&{9xvEsCzs^efLJs<Q|($G<#jAlGjAgUfH`e_e13^*BlAc{!lVeh_`M
z)g<G@b(sYo#sPH{76l3v2x-G-pKj)j-P>8eV>3G&_j07GmDa8{j1+{z5Q(_@)CdR^
z6kOAzga$+yG}u~ThZ3XXIl(d%C<Ar`Im@NS%P@b=To%t=#QBrwQb!gKiz+-oV<%ko
z(IE4WD_~!d(Iv;;hf$fqYk(jOa4nDRdv@?&_kWXnzI88!D4?pQ8s*sdzE2QE7}a<0
z9_@9G7j_;{bjQessZTYa_Y|2Ka3feS^(=n)?fa>AvgjzlQSRv02}%7yB%upU3n3qV
z__I8;;Yrl2>JfdZ(G2RtUUjFd!oAi{Q&Y6**t(wsuWl!mmpG9@Y113LHeiRE&<F}q
zH#5$eMW;GGNq@>0OtGr?y;W~xzC9f`p5N4OLy92=yJAjfjm9UUh>wq<h^CQNwsh{{
z7aN}CyD$8NhhBJ`$Jaj1=GMI&D7Mim3Up>9tr<hN2YC+)E)*OH>|<|YBOsLETL#~T
zqGKp{n!KmUyPEENk=8;d+YasJ<&CfL@*8Vt3ES~%GkCU#!X_k40`X!1kwhf|Uy)Jf
zhaGztn%*$11ca1CI-sViiq$Juvv|oR96E4-EpKebgb`I$RiHIGijawSZpvO~U<h0u
z*W4%%%Ac%9+uuMyoZOBS#|gRjRE#J0ao^s(xQ@fJOP3?0z#7)D*fX&_;wK=IUN(tl
z+S$|i^{da**w%!TOP}zm9V4mgmedC+)UGa$Jo(0`t#}`mfL>E{$#w}2uGvh}`dv7_
zKt)I2AdZehZ0V{DZZ=0z9Xs@%3KW;mKA#)st|Es+3M(ls6FqrmF+@dzh_llg2r+aL
za)fSvb>O$$|J+ac?h8NTnLX>+*40RdEK*1*+A@Zs3%)IgPJ!8LBm^lzF(b&QK^e*3
zmV<2EyOo#USjXnWJIPGUQRP-+Be9S@y{4rqf(oElWGn%?F3)ERu!KTM3ne6>37I|Z
zEN;8?7N$*_!kRT}*tLBJsZ@$g+M^f*7+GR@86KdQa`FT5SN3VOI_dp%3IV<J6IEsu
zAth_qtz+T&3pi`qtR$8<npa1!<`yDuZA_^&-I<WJTh<d0q1@r+)9aLn=Y!W$z~9x#
zzLz%AzOxZim%3B$Yaf-MKI#Cyrs$F>TI_peGp*YWkqKSIaZpbHT5GJdi&dY-caI&O
zOZyhLU34WE)SXQ_@y}IRQCnX?8;mB#^jPHqkVn%(k!>8{@i(61zF$AgL(l($t!?{h
zwtU)MP2LscE%4RpZxG1anjq^SZAm^Tu;<W0UVP;h+WihDPo0dXQrJm_yr=+rMaCeY
z5BRCpaTke+NnwP5&<|LA!G+v$+wHU-Il}Af*3sG4Np&uV*1D&7RV4u2XQJEDJoKJc
zRE}u?jAlSDzrG%DcWm0*+u5;W2iIPE4b^TImFQU^#OPcf$@3FN#N$?lMct$Z)@^>B
z1MP=Vx#PF7Wwb*&R9J0A3I~pG_>J8hT(_P4o+IeyZc@bzu5?Mwm~dxd&*4!A>Z1nG
zC4vT>C0CT}U$=vnZHLGd?IDl<v6V&SDr#m=rrSQchc3D`Q`{Qfx#T)#ITNr^z2PL&
zYfbB;0h^A$Ux<8)($I-veYlrztbK%ge))YKTlXA$ip}_*qBUy>tdq}wjg<IGkaq>4
zB_J?t*t(TNjfa?d)=cW08l1#akDKAj=pri!Uy(B|$L492{XSyGxR|h23WYQRTUihp
zGG2;X-+Bv+<}YN&<}Ga9vXyiu8_y)yF|Cahs^sq>l19-!KxUHe784%>Uf1-!!YHY$
zIogLfj*{pf(jNe-LNj29d)ZN9R2%AHG&ruqo_+i9i$!j{d^Mnnq99ID2sx_MLflXw
zAYlrO?~kFL9Q6%#{QQ-tY1iGjslh>gg2+<qI|K*XII>|k?QiTSzoUuZU?-Vw8@G_c
z7JdJ=0_ew(2_{D_a@qRQ>ojlPLppF!dg#l=Cqz_x)SNS!PV4A-bX9;Ab1&qYb1q?m
z$R)MkqPIg$^tJd)R}h(`8dN|i1nn~50G-_T^pE+*;}7!u{`IujMG9F-(S@QtdRz5F
z1)XV4I<Po&@E}oFk)`Keh=<+t-g^f|jFgK}k&2vIgFqNiQX-{97{k0dbGhy2n@OiL
zJoC)cbm#M=Qyx0fy?xsyeIWXKy5g9w?f|OQ<JAB#yefBb6lS;+_0W&@MnWC2ZQC}^
zKKm@@oiztAD5)@mwCSGt2+lw<AV)~5t83WNb%-tdc3@TY1?3zLwK`4ro@Tbaw4UY-
zJ1I1_;<XFhE*m$rk$P~L9F1Q3umHW`zIS{WST)iYQ5)IhiY^<TT1&^)edKfoI~?9p
z@jXFyRz2ydIl7LLLsv%O6$Ed)WHrm{7LrPO&s9I*(*2gT(V%7ALe_~-Bi%f-<=1@n
zk+1W@o^`a^Me=q;(HfP*2ahUU8BMw)Lgpi`y>un6a1vsgL8dKL0KFn()v@n!@I^0q
zIuHf{j%TxK#g$xq>BSt}x1U`*ci=g0$qkNK-3A3yam+XZV;s<>vd~&%+csTYUF_Jg
zgR8DuMSZp!5t&}5xlt3q>({rRFl|O*gpv-`GwXO^%}ca(cOet9nHue(8#`%yeFu%}
zcc7cQsqM^=3SE>Q8Z?eJP#+ecr|($w#K?oWBIVnxfAUod`&+5;J=AbV+Nuas?=pGe
zOo9{?tij{-wlA5TnZoTWu4R^Nz)OPdvR~NBlr2*OL_*U^NFKpc2VUXxKlwV3ZG4`?
zvWr5>(B=k2YV48cO=)!@?=!1r3ac(yPFmO~q52G%sQ`LK#s#RC7pNuE*p!MZXCf0a
zcjh^~^=&tj&1QK1x#wbrx5Nk#g8}L=OT@+;pi2v>6k!;W%VycNdpCuAo*P$Pn|SDb
zfqb;8hcF89l!d1}BB^=twO6o(MU70;y}yMc8}`z%^#Cc~CRaGIF>Rv>(9dY$V!cRV
z9r4-n<SVGA0=3=NP?=WC7M`Hs38pTZg{iV>agR~q9z@KopU&CV6l|=XA~4;vBKz{N
zhxi2ebm6m^gM8-sd-<0i-NU-BJ#=~zZC*&16^%(9SKDC|b`_bCZQzC#tH{_MQYtD^
zkvD}Th$N-NmKJ_7Po0<JFaPxYeDj`fFmv(@I-6QC`4C-<u%&~JVxYssa~R5xad&%+
zi3^P_3qK0U)z$FLAAFBTp8R=2Qyt&L(Omg1gurneG@5!G-o5m#Trz1sa(_3iYj<<-
z`OWBk9n=<ccm?~!b?J(Qqh<k|vF9<vsUbMf&ZcKx#oynC*RD_KJRK^ecJ_3fNi{U(
zj@_=NG%T7qml`tIgW1G_o}mo^AsRsod7jw&A|L+xr+9eHujtNc4yTK>JHeRTsOdIC
zU5i4t7C9?Bfwy0CGnX$|f`?n-j;qMHmEK7TgNy5?2tprYB33NBj0Ye1KL7Z4|A6o#
zy4yPmi#|#z3i-k)t@0juK=0#)MgiKA{L?4?mHiz}glKdSCO21)y6Z20Mhc0GVggnC
z&zpZA>rkG<ukFBVH+WqZBatT^EuelzH27Jvmi*>M_CLD;`$$MtA#+0K>6RK%o272v
zbo|t@@23<BTS(5CG!+l9h>Iplhb~#|$;S859Hf&kJ@Wvc`}uwBGDnE270s$JHi5iD
zkZaV`b=%C;IezEj)%^KQ@8Y`it{_JWyAo5c$eRGjj|M#^3b8F0S2(yRa$btR`}4o%
z#}E8~E0<nI%i+Tmi$z@5MUO%NJJn*_HmPietq1q=&;R~0EMyP0ZU2dpqj3#HMqw~q
zGh-QdthgSpsBnC1+&!mZY4MY#eRZW`g2~Xa^&q>R-+<Q*w(p+Mxk95UR@+Rw^jzE-
z)ih;0kNNw4SAnII7x2lO-_Kkolg2{oUX!NO7NV13DH{qq`N~he!`g#e>COmRRe{hN
zdmgOUWpI6g-DQ|nGl}KrE@sKR^O-kgCUs=64OEFVL78<Y`dfRIwzZ0kVL(5s7gIh>
zQ5%p7KPVtA3rkppL};L30`B_C-F*JbU!tYGjhebTgzD7=S`40}F86ZvadL^$9EXXn
z|Mb(r+SZ2Xu@23{m4o_w8YmoT<r|;=62EudO=wI!YvO32J_@>IVxuk|gav}8pq*Ra
z{SNjuH4+y65q+(eXE&TtO?lb?y$VUa$guyl?d*Gb3)#RqVK4`1cMJ{lr!jHyY!0S7
zFvlqhk!=NTyYOoMX~myVk4*}v2dFfF4)J9~JDO(>y~<a9@qKo6HWDaJOJ?ll$(3)&
zbbuWiraDzzyXZ<TnlYdA&OVnqa!53GGDK1$2OF$fk&28vV3$V$oZg}}Jpe!r5MX#=
z%}f0A$NrTU*S<owwwlNoJkKN0Az@kERvR;5yy~!vgN9(3^aXfzVt_v2x^y2vHzxTy
zc|RcrX(W@X>Uj7&4=}l^mXxr2>XCZyvFt5@FCmRM^J^dieBiNHp5l-H;?J>CE>U4*
zqpoKX)Q4N;e&>n2NJ=RtnjG6+*uddU`$+i;w|L@UUX%i7Qih2OW)M|Lx`!}2wYs3V
z?t;s?xNZ(v>^NU6N)K6+7ezYI{P)hM`OilmpvenqHeGb3#$I?W+X{6>hX$2m<-7~|
z!)tHn#)T`HS384h(kL`GqEC&#pl>Rv;*eKlJju`<Mbig=O5E^)?=xrm+1z}~O;}R$
z@=L#^tFx1o>mrpxtGFs&nBK9;<@9kUn|43$M2X{Y%^w}m&EW4}lr%y-2uqrzg^zgT
z?2(ohnvOJc)9SY&6CmkZ@h%u}BhRpuPv>ZuGMVPq7G7Dq79~ga;?88%`;Y;>;l6i#
z7Fa%PaIqD+yv^bD`#HSnAWmM8I*E!x1Nd3Rlnc+snvkVA(|z2($%KlAD9yXBzLlA>
zo)mT;)}=fVjTE`>)kpcyUp>qLnWxk8@yA#NyDDnj4nr<bEUKT$%@?iYcQ3n+g}Jk+
zCY5;PA{i4~s_++m4CxA>S7bcOQ88t}4+e)$$8ym`WUUmJFTadsOP8{7!v?l)-HMZP
zF*4pyQYkRKjjttcc{wHlJ^s4Hk#5Q`I_0H#?Ul96nRhnlojo7b57bMPo4Rc9%V>$x
z#PI{edFL<UsTZE5xxEcBf}ILyvNwG=k<~U!4=>-4Qj%1cWdCbB+4u4`ye>()aB{6t
z-L57xy^ie6dYY@ch6Z$6GOc<tldT36vWME#N7F?}J0V|r<_CQL#m8v2iWD+FzVOGC
z!pe3FtY)9HQ}x_@=_>x>wm;;KORi;}J(Y9>(r5%adG~R}KvdRoUy+Jb<k)bakf0+h
zZCHNsB|P%|AM(M!`v;2co%mgOq96pVd#1O+=%IZcwgF*uPq^KPcsy-+O@Ne=s+wv(
z`mujw$KgFhWq?`wy>hx*ea4?&uQ8&46gJay6ZqS|_$zc6A*DT{uXm=Z-iM5?={puZ
zA<!5xbU>c0JX&7gOVew6$p$GL|KuKP(J|<HkF%DXOWxBItZ-;nOIOH+_2+Q?xtEhh
zVj~C%=)&h9-F)h?ukzTY7ie_?{B$_xHlN$7$rTir&0NSGORnbji?3$3Gl?utJfr}H
zB<8awp=&l`&;VKDyH}(lZ!!-)A)D#pV()j92knIvC?n9oTb8flq9u!2^Xgjm?Ai_5
zkWHmy@)aF3M=B{#+H5}E9{Ruw=*wvv6a$15baZsEb?X*xd)uwOIz+^=c_9Q5y`-#X
zQm^z+Cz>e2l9K7uW|A*<^WsY{;&>ifk6ctXHDkh03wsXlAFUobkr<j4V+p}D<<Yo)
z5Bpx(f>%^n{>k4c<0<NAPsUF{tCt`8n=~*XTaAN6Vh9M6dF374^XvQg<(3!ea6|I$
z*y=5JIyJd=!&EE7?MqhkXE(fqTjpKGY$hg#i$rJ{_tu+%555B26{*Nc>_5w<)9+%{
zvK2h|?eFqu@BL#e4eiZGAPBJ#C=DhWdv!R+BhGPMmqHMbsj1?LXP@SqKl%<KF@S^Y
zDH@QBt^(WA^;l98>HrJ)pMUsAT)KEMot>Q{{c<mziT5|+GFd8)tlP!GwL7o_3)eq+
z2C^uv@al6^&upMD%&K!`U~0oeY%~gukIz0j_`)yl<B?Z?MIo)pyJIU~p6QfSMK+5Y
zX7VSiZsEPlZenS69#uF56yuRIrM8^X(J$~-Ud%GuHeN+4GCE!Pco#`&VWG%6X><@W
zwQ2%){nN+!+JAhBb7!AJ)K$O{ij?gT7K#I_-p3lii@xcD2!oeS(OE1Y9Gkno^aVEV
z-<AM+FQG@dei=>1N@NU{v`HbEk)6Qb{PhQzJ$p8m<&5ZSo$k>4h~MYQ%EoW(X5YHq
zI318JrcU~t+7cAKkh(dOP*pbFVt8S3VW6%mhrrN{Pdg!ZKmKigvGE0{@#uEPmam#?
z6J&hJvY88b=ZYJ-<=iWorRs5wiHFTZ1C>xYwQc_xR0YT@QjsC*qGaoYNd<~Tkh9YW
z6A}d7+`Re*e)iChdCOI+@jJRGw0DwoQwSpm1@#iK)mW4;2+$auOp2zCHa_@~J1G*O
z>D%)+TJ(!du15%gB_&!%SO^^8%7sh$%Rl`y{6Z1O@kaD@Pba7kCx?FL@qTA|s+#=H
z4mLgU8g939Qq}C`(y6*h&#9ws!DJ4(#bN(_jj*}(;#D+wbu?4p-WMO{k=LIgpVo9b
zV`~$ok7(*ditEl>%Db<;nWeSoQ61CdAd>n9DOKE#Ci)*L{#**Ui%QVFA{803i;C!(
zw5H<e=RH5Rgu+%f5`imSZoTmq>LxU>?$vc1KHP+*B-#jU*CW*N{BvpIN$VwhJNAJ4
zPd<+ibDRX(@p9;Kgw70da1`sm|1t1>2q92HVzkC`9d_>8NjjV1;`1-U5wbUVuFc>x
z+)r;{WxzKqA$y_+E->%xIqYscz{~5_lF8<X!jVhCp029*5i_1<WvemGdA7W`5jr51
zADM?22p_w~rT&~rgwBcOq72~FWa-B6oi&g0;7d=?<!JKW*a0**l4KeKCWthDaLsMJ
z^NP1J*PB8P8(W(p@UY84JobuIq#`4tG)-?^iU2zD9lYmv-^Dk-_Ft^N;!6CkJf5;J
zL5L$Hs+40MCoLw$zz5snvv+@ym)=;Lu(QSbI`I9`&wn3kQbzHA{`T)#deLG!+ebE^
ze!9H$5drjisW8n&Ha+(mv~*MJkDS|Ev<;JHPbX7TMYB9HK#wE@DDGSHW4`m7pV8)N
z@~N@2le|uW-2u~clX%Znw{YvZS1{X}KpiP;>=AFds7OUBaummP2ri%mYEwD13AteI
zd3^i7zQNzT|1T-Fc0e&i_z}Xy)!?N*Z9UcvY;7=+CeR@tzw6U<5TO$~Sle|+|8tb_
zINd3!8b0~KJE^IvA{=2O<aB`gh=klHiZnZ3+(74+1Jo3=h!JYO^sNx;T&6BO3teN=
zB~Gkx%`uS9q<QSwCpe-43Yjqk<{b(z6r9^Ii(8jn!%YiTGKCzOWB_aw1@TD7<2SZc
zlyXHXa*Cxi_8`LG3PnhSg<|Eh%eZv$VxD~B37Q%ku`LUw6o@irxt=o&cHWZ>xsR;Q
z>pu_Pv1~8~X<6*vy$jcMS#r^(*keTXXk(B<U?G@T(?HdPI-Y+1IU*Tz4~&$YYSNjL
z2K4DxhL+9yX<EOJRMEu>M{cHe!3(IJH-);{lh|kHPiL7dZ~y=x07*naRDAJi!y7xd
z(j@{;aIo7M5xW&8dDSdvn8oc&uHm|KmNJc66b2hB9yK7XWWSg}f-j?pcd;TBc@sJE
zC1!IgVP`af&sno(@t$|Si|)=YUVUW^-T6GJY?{bujDR2rFh*cmcETFld$yD9LqFAk
zt|N^Q0*yf`#q%$|#Hy>VWJ=vcq%osD<X(P#0$4bAA$}C_#8bbfs;-XEFOJx2ok~DI
zsgV0bH-l*R*}ZNXvS4uhkqiBHs3LA{mf9H;Xt(^6qGc#p(BW!2Ju_xl(VTWejj_0J
z%Gunp>{?cxwV27&q5uawsU(dv=Wo7YjuolM*a3G1xVDFk3{|N#AOG;baM#EGowT&+
zYHf#5BMn%Vg>732na$WT!pqy*jELu_|LdneNqd+_kFob6iN|Zd@4bJ_tv9@t)~05}
z2#$z7m7({Ox=K3`>{_$wtGc<9O!vs<Nwf{MGbWL$&(W-cH<cprx*}?ExaPd2{QmN{
zaNV>^m_{`g5F!Z69-i*=C@T$U6{*N*0fqiM(oz;Wh>%+I&fDM4j~{%Hix)1Uv!#uo
z=p&^>YfYh$AC$~x%os8T(&;o$J@X6?{OE_t*wV2j4p3#K_~*a>M=qSd5KD~>YS<G-
zfJq|Fk<AA=vT6UHR#QEq7v;MGm2;_@Qcs60zNr*Jx-%kMw77b~Qf|8V3NEdgk4J>S
zU?-Mi-$9QRsYpdeuj@*mY?$k&u%(TIV#&hAJo3N~`HMgOUl>26<47wCfoD4ds^8@(
zH`#T+!oJ8DQn?IY{MuL8xMM40jZiz(8eufEYNzn2kNg{sR48X;oz_zU>O)F+H{AD*
zmw>6IuX9F`ZBuOd&8v9D6n1fBmszJOFk!)Tax>~^bp1EY-cNTyH5r!9IFCQN@>b5z
z&Z3qyB8sq+O7>D_{HPgnbCjHUC5>K@ikty=wY2w4pQ&RyL3#^|)mN-$*=5UEvt}&^
z_wOg2PT@EXq0#6_qb!Bcz5VLRAhSLrk54*>Zu)DKV;=)j0tpwsO!zG#9b#FE=Jq4(
z-M5z;-f~@BPat~7R-5w68fE%P3V{?71=QCzFk{Yae){Ooa6FGF969r3q>JQ+1nB8I
z7Tr_+^<<T0_wyU@4|J0Dtr5MEku><}h^dRtfjWmS5xyz*z1yLwHYt{!bw2OB{CXB<
zXHZQlDXNi}o=sF5cq)dkSSnJHikv}g7kwP}a?0hIQ)Y70+is-k&>_~YSxXp(c%Db3
zBXlyst>g*!4*-k^pbt|)^au2Qvs<t%3yncY$<CcSnK^Yji{>vtA^MJD6{A-_#m^_c
z-sv-EU^_OydHQJ(azr_~QZpvx3VRMeb~*w5&eH!Uxh}<h?d)H(jjZp*1Vkh0ojX4D
zvnMlg&UE&<-EWGG?si2?v}?I&(j4A%`3+oBJ%<`H^q5LQB1C^?r=#rb3ZPe{BBNgV
z?_^;#wW%uJa_!YDn0qdd|MGE~o0`aFb4W`OV2EVD;<G*gdu9Q>e_T*1MGyp7woP|e
z7yI|@W9iamOs;LfnAkvx-ILKXFa3CT=CTWy(pKo;#oxY!mrjr5WVRI}<)se^&}ZMU
z@XjtLep~gS!;Tj=QasQ>DjIphfMQNCY3_8adXElk{CnqicSI_bTs(Om@4e<$F38QI
z3L71TNGTAgp1H(*H&MkyuSiA41E5Qik)u(BCmrU_nah$Tm*V?A>t1^;W>B@QKEqK;
z|24*-)DUJTo?<{B@cy(WisI;km-5)VcOQ;zbJ_Ccanv!X8Xu(*_W^gtMiQdAY}s=5
z?c2*6TQ(zX3!_KIqaCTx`;d~~CW>$SL`%`JtBJ1d2dOc+5x;SrPJmONCO4y=15RPw
zZ)&SxunUF@CZEl_F29jQ=~+~f#=^l-c0BqNgD{M_HkOK1q$0;syrSnQvCD{LZn}rX
zWs8^c<-5MXr$6#>a#o7YmJTvb8c(?>EfHD}7DJ4Qjs8(*uo#1sF>q^RkZGGA{P#or
z=C{wHl!~kP$50`^0bC?GEI#{@PjLQ%g+xKvCyjElG7?2{LjrV##4-lEAlUQjCQ^7K
z#s*g|k<@tgIb_Zn`&5WS0ra9~PVFRazwA0LteZ;>=_JRLWY%PI6J!O<D^ihhEqx4j
zLt41FDBkyu_wtKJ{+lZnFX706LloLN$haPkW#hUoQp!==;wH<<T9o2IQzH-l^bxuU
ziNr7fXjB+raX8yHF|dE(lb>Pk%-IC_kuBOjSx_G$pev^1ad6Yl-xdyc;`!-QV+C1~
z`l%D>6yv||JXKWGdl_!M^eR?PKA#+JvXw<r0oyCO?5IdZDl)!7J>KgPHj;>lb0*K=
z!Eb+;5B<$Qkdij-hmT<V0HI^L(r660y2`e|ws`#6r+9AtD{&iJQl>wa2GnQ~w+_#%
zpT^fe^95#1o=Oyro;NTgK)1ERw1gbmu=`RgvQEi`_$f)MHj7u2;fNmJz2|m!L^c%s
z?ur|D%el*`!NbBN;}k_7@UDP(MJn>9LUjP5C`2Mq2plAy7JT4;{%?Ny$bWO~%ByH=
zK0=T$fHr;7<HGbkdcCDH=L>5Qhu|~0EQec<@Yt_^MKp$WTU`BaIA_XqzI@l`sLNE1
z=zy$~@zRIpq5D>2%f`m9I-L%=Fn3CBQkUOJ?c@d`dwjE<Dc>inCD$)l!u4~PFo)@6
z@o<cVN-95-!HVcII*HQ9QRyX)*E(8}iX2Pn9_OPXBLM?LJ0ucExs)?bxYEW&GH=>!
zzIFG1@lSvI4^(?;Om~rta<GgdD27<lhQJ`SKqPE0x~D8&9{o7p)%P<Lj;2;h1T*DF
z9DESSWWwCzPyCAAhxZT?Q49--<)InPvB=U@iBj90HrPV3c-}%j|F54Q<G4hlAfG-Y
z^h`<TgZajeKlO^vDZ61-Hbrhi4WW$2?UuF*MbbsVl9>y*{nBeVTTVa`Afq^~Aq}X+
zDz8XIPN&G@d{pF2Kc6^<s{kALyFdSHe)hwMxnl8BTJ|3zEEI92MdT;xN<F&b*wVya
zI!dv3?_M@<-W(e$wl`+(f4M7Vj6ne@VRO~86@2VNA4d8Sj^&>5>pZUPd1L$ATbo-^
z(WwC%Ex@f#QQc5O`*`JTHwM=i%*##X9hcq6LT?rsBvBM#L~Q?+SF%e+Kiy+R#@iY_
z%2AO~<>yO)C}7Ui8QlBDFY}py`54t+hOp?PEQRg4XeD~Q<I$3%j<iN8Nuf|+)22<Q
z#iQ0E<@=ZI2MO3p5rq*FNDG@=R$a%x{^LK<+18E_Bhz(oB3}BCUipaX{#IJ1kf*5h
zyxR@&Cg!M{J&87}I4*TasxxA;Tf=*<xP_~xTtr3-(l{ttnyxg2UebzG<V>MRMMi<O
z)eGoKNNiz~wp}h*bUrJuSjm9{2iUY}Gg2uAG$DzRT>?jIqdi*llSH6R9IG#OcC&cF
zB37-q0v!cCJ?SHP!6Tl19OML2N<yvUIq<;63ojsBmF3Y#A0?Z~5t);ZHV?Nq{kYCw
z!+r1gE4l(yc<TJb2t)mhNfcx>pu&4RNV>z2^=)okw33_7UcnTq$jEeTPnn9gtjHOJ
z31fQOo_boM;}30g{6AB1)6cw=#p_I5E*E=@0vC%V=Pu&zPke^EKKe20vsFX|KL%YX
zkd}oI;*4@x7@~yjQX_<kXTM{RQk}{d?Q?`hpRnkIHkfE|UtMcWgc;PM*Th3xf+!*+
z9>p!C#F7#bM!3NL^R7SU1Ap>9+MAD{Mt~n+xL*2kU$Oha^)J-UnSJLeeb^bB35#ZM
zuxk8~$w(uRZ3R}(y_9!eaTDjriAZz;<cU`<1eL&gMb3!xohbT1`-B8UghWIrp+Fdn
z&}a-A9hU=D2#!XBqdxFC8bikQm^W`8H{N(7ZLO_r-Lf?ab1S43>z7FD*i&YBWK}2Y
zp_?S!u8jddWa$Nqx%!G#*g|5o9^`yt<nB}Qex+q0Efo)vk%9<%jsg)NiG(0eNJlYG
zho7gdyOSf`9W=JJ(9+dGd!dVVzksn7zBCkxh!9xH!VtH#U9n;%yBhcN;%|RTwyNr+
zDPo7?rCXz6jk+0^R4xs)kGuV+iV@Qrrf~bR>zQTM<5R#Q1)}UB8(9f!o_0CYm9(eX
zfE$EkQ|pi*hzPV#TX!2;YNU>@%eE~nJ0>r2rJLL_U8ZhJy%-fk^h`WI-RIjTnREtO
z<uHHJ48HKuf9IN&tN7Gs?_%?=?WF6fFvJ|{n!cnjr(|~xlE07BiV@1Pm^^6`>IBw~
z9_sGt!;;<mMT8;5Adm!TwjbKfhRtuVaoZO5?%&6*-MeXRYonv1gD?sSgOD%^QBom<
zKv^n|dPtjGE=Mk#C6mpv@Z9;#n=_Yb6DKkM-1&Us!=E4@20Z-ePw~8yD<-d9vCy<U
zyJ1KV?2H3?mk7wFs|d#7RJBxI;0BVnUA~&d^$VGRn|MHBZza2_D8$hK-)00LUk*dZ
zoDjT^F!6N|g|v3J(pl&Ni{6<5M$*~YiLxy0yp1I+vgtIAWn(M152Wj|cTic$XUbU@
zJzzzsiO@(X`Tgr|X6Z$X`NCK4;ocwKk8vy<$HB5K3i(qL4V9+vL^v&y3U?8&uM*Ym
z%vrONyn2Ln0t;G~?HPTX`%`WN>}cH2+V!vV#4}Iw>iXB&v3nQ3iD)ZyBQ4dF0`S!F
zp|P>GnS9`*Bh90~{uPd8k+K{n*H7S@Radcc<rO^p@{4qIw4J_)+fXfpQ*{BY=>lgj
zUx;%~9fzIqLnvc)g{Y2*J1)J3_g(q>%t(k`NxI9=h?h2|JP>^x;FCSSXG(sGDSg&G
z9ziLTX9oGZ5-b_OM-vjEjYext5CjBKgdg~XVMsookI!?I9pfk)TPa-I!M1H|%R(xN
zW5s}2YW@;E%2%U_P)KYPV2}um(FhS&&}ySmLL#M%y$o&Q&vJN%hwN{$2=ECx*nEI)
z-HmSol<LjC2`v$_H@vP;C=GUU?LtU$*{b-xN;@9y+w;?*nN{*kM=Zvfkt)m9KR}fH
zUkeBY{NV9N_|^};$8TSL86gCzY?>hG>qMDk{(7<qjv10S^5`LVEg(uZO3!}L5i&A_
zg(6GNyMX)e{yLMhwa7@v9QI;p>p>s$ewbvv3W~-j5C#jEmav`2e*FYL|HWhccFijs
zJlu$sG7iBjIpS4YLW&;4#=wZQ5RMrS-J}E}XVL78FLpRjE9Op}$xVw_F@-En!q8q(
zTqojzl(p+5iYqieT7VL&r+B4z#<D^o(HH_kBBSXp6lm}4ptZG?j*bovA3jW5TN{TD
zAEu?fjpnvi+PgYwZEvHiyNi5xo-m3Cq7bb$`R?vMp~L~v7{|p{7Pe9-W#M@qp6%ee
zE{<g}VZsD*xg7Pib>y-+CQh2j#EBD`GI0`_REk_WOD>&F6kCXGSr`;ixq4HvhKPay
zWuFW)l_rRMeB%?SuqQv>6D^WDX}yU<xyHnl8GdO<kcl|lc9^uACY4IzIhlkGMU_#Z
z3?&*-*$XG-4fg@#zM!FcjIsFl-u{+bS$X*tJoL!J-1D`svj5;g(%CH1jzh@4@ArVw
z$%cXAp7Va5y4ENSrWo*+D_2vWt%=u{lEZ3^l!F*Dy+9x9*Z>HHVsG<)9(ediJoM8?
z*tmTw#V{b3%VDRyV@BpqT5o9+@7obP`B1~|XB^O-ltVh3rj_wSD3k7t$b}BKUvVAh
zWoKi<D4d5hcD#`Oz4)azKM91Ggv(lRu<bBAckiaL=`h>3Z|6YcA$IKA$$`d0G&MC*
z415ZOLhOBqems*|2#geXo)^z$PP}?)*~4-m{h$zQlG3JbjUbA8Mo5|{_IQ+x&tD>-
za9x*7I!$#|71O3p!*LwWoj;$MQ)e)H_H1U(oJn;$OC4@ZeJw!PcAt==9K>@OaJfR4
zT&rF$F4B~y2hhLTxb*u8FqE2HO7~1iML`F2br!Hx7ui%5j!NMuCm}!)3@r7m0Qi}Z
zc>HI?v{Vg$_IrQGwJTTi?H_!X`@jDHhnt&mQYosE;;kSEiNX-0PA;_DlRHm7r`;5t
z%`IFwe<8Qs@K&s3jU4Y}gMs&8ef2U4T(udWrj9nga{o8@-j9CBp{Bz`7&7TJ={L!<
z9+Gu%Dqg(H^-(i2EL?pFyPU3ZaYOBVK(1hM-MnS|)wTbFNu<eOQ=)XN$Z_0pk$Bt5
zR@VJMt3(ocsJ)3TJGZmu)mPcNV>|0NZlJZJou(trw70ht8jX??W!osriibmt;!Riz
zbt)xeZ^=kp+o7SMfyoUMxM0qFE?#s#(<V=4)>*Td)Gz^8IX(GDG03Ktebi##a-z;K
z&!Lus_%guP{s1oOlBd>(?5J#vZ^<K+QX+(f!p2b!p6%dRHlDPx`>c3b0rpe5eU95&
z7#o!N(8pL75wQKx9=>?bm-*RaKj%nmE4FQ6doH$R<446~Mx>5f<!+Lwj_wV)3j;=n
zWR$~QAN?3NuDY76^adF1gPElIScXC=J(qxaH=6JL^hbQ=%U@*U&Ml;?b6Df3EqEv%
z`WXfEHm5+{MKhSa<Xm>pHZE>@sx4q)%`852`}<hnPN9}8eo(~jM+rE7+kf;B0))L%
zEEaKHw?`T1NMocxNC<n*rP$fHhv#4ZEw8O#$G$@c*}f<C#2cHN2y}>aY&^#uceJ?@
zi9k^7>?Y-Tq*Ez8Cngh_JYgaiUw9!GoOeDmCQqT(%@Sh3XuN)GRT`f#3UE}0(1cjR
zVt3143OY|w2Lnd*ivC{<)9-85&qGp(WOA0$U@M1|<&eu{u(6O>W$LEVrg^$|p(%@i
z#x)}m5(|T2)2^-j<mZp_?eBeuJ^S|JrBg`T!g3s>t?2H~BW;C}ibzLEwR(Rb*O(+%
zY@)cDK8zx4+rlptag5;a|MCO;(L3MG1g|>2!m_aZv1%%Ge?S*~-)8`9-oJxSe(o+F
z{`pS`RUB~}k8(UvKcj%&;ue^^^c*H!G?N3mbIjlDY-gUVpW<Ct+{_<cbQ2ADSU8|H
zrr#!bvjcj`l8?eDE*_BrA>sm+5KUuCBU`p?;kg%{XU*%cv3=hjcJ1FwM^_iN=YkZZ
z(&;y4x1T~01z|kF%1cp|%`tW2Bo?24A(vcq5ew#?%bZzfC%oS>QQ<KahDxGEApt%C
zyAJF`xQfX1Ekis$pbrkpG68i<DjZ>BNr@#CnRFH<EG#T2D-o>7=?C<9yh!h}3(@!(
zw(i@(ub=u2KYZv%ys>o)dA}G}ep?ns3LMX+P$=Me9$_@FE6M1XG0h}nT_GlO$+#*0
z=70YMzjyO(OsJ~C6%H8PCn9&eB1zrPL-zw8>BMXKC(k~?ouBwOHg4Taswy29k&aUt
z)qvifDlqlR1z2-y=`drP!`;>q)m<TrYv=L7-}_6>VJbETVN8!VQyvz3vje);u|=<}
zxTviSpI6qe<LPIfX5*$!Y}&esZ9BFTg&}S>Lueu_$DtwvB{X0ONfd-wMlgB8M9yEZ
zkojlN;i^?DxnSV}veLmRtK={Ue0*BF+h}TU23z!ba;hJI4@XG~DX@gX7y(*iDGMEj
zcwUNZDvO7QL}8Uij+hh2_T$zLRDeDC+_y%_O4dSXLbQ(P_KVn_OC+GF<p{rd?iqgc
zlOMBj(<Tl!A4WKKOv;kzE~)xPXk6DN3PYkGKu4Nlp@2eg@r4)h*YA5jS1w*cm6OIo
zp>;Tf^>h?KFN-o1fxEwVFaQ1@pQR(;h3(nn{&|jSKyS+wIqRAWXrD3m6?M8R&rG|9
z4_yC0SUu%ZoJf(DE<&h5^IPK;&`W-v9PoWPpf9w!y@ib%H}d#zp5)iByuhw~dueWM
zK`Disb}B<VPt>?n4nd)aV@WJ2m^F1eS1wz|<(FN?CFfsERjvvb2aP7L^BinGL_~y<
z`lufH00k^`kGG@+1Nam~5^*UN0Y*V=u$vGpVNsK*#<e|CGKEB<5hn!76+j=_{V{_S
z9SdTED}KHTpNM=RkLzWKFm#69Y~Qt$XP$eGXJ2}O4O=$T-qB9JyBn?h-ubZTV>?dV
z?P1$2U%HfQuDY7ltFB^3%@h<NPEQT?P^SLKqdw<2-UN4k=40IRoo~?{`J__ro8ozn
zYCtbE2xh)z5zX~u`zB`t4J~<Yzw}!E>WX(Vo%$HQj5W+VJr@1#-r}{QU&MBtB%B(D
z-?Y{sB@qyyY3^#{xfh=2u_u1nL+nuU4n}j~+E^7S;>vVC@Uf+0&aBy7yy$#ZUbcc2
zOO`PyS5HL9;f_Y~ei0=hG%+zrgy|`SlVvMGQy!AneR}gtc0l}hy{n|$rWHma4cOAb
z^E^^cinOSTDQ1m9iKCAY*2h_ymBQ1ZODXMDen(@dHL-zbbWbmJXfy{J5AntuZ?J9K
zHX0in@dKZHp+MmKOsKA-p{}0Uv(IA2j2X<FIh(qwnjT#t6Mb+prdNbPA?U*J|9$*U
z?)}bv2v@zS^v0+LbbpG?jBC!Lsd{X;tXW68IKO%(?|<7La82FCWJ{Ba%e|KI2<RsE
z)QmA`5!dmD=pLo26MwxB7I}W{%lz=i5Ap2t&vCHnFdfA_*cRDLrlMI-lL#q@q5wxI
zbTMGgteGsDe=fJ&bTj8)v<Ta>DHe+qirrX_L$O#y7)ZG;I*NK*+2~6wV#>Z>0(3Q?
zW}@G<B%rQ^#+Duy9@VKD(zc7n^lX>@z^?nme2(wgRpjJ7dXpII%C=C#D*JxiGAaR!
zawAOk7z{^?_zd?s8Dj{Dxzqp8zkQUiKX5<Bl5dJI`)~mLjG8veR@k-;W4H(13L<Kp
zEN@$OH5b>-M<l#uVjL?L*)M7)L`>)yq7zV$`I6Ud+rTfM{tZ9*`OjGY#zwk2JIPj8
zVWk|hsY*Wlw0mUQAcaK;NY7#0-rc;heKQX|_A|~~uz;0UtmLXyD>-Y{EF8;52t`=*
z@rxmjo#eaAG`}G>==wtIP!lD(r@}eVJ_f~+jur}@7Z=baJ19z4oJxphD{y@p_Vyrv
zD;*C%3h<*s&p;m`1X2nVl6-d;j^p%<LhauMdD6zHh)emt@~!{k-tXRr<vQS2R>P<P
z^nwU*?F^PRwjYYstvP$*bS|H_m>OJC2?0otS6-ej8slkmlaPGI!yS6xQ#_4Jl21k-
zJooZTJoM8?`03+6=g^TRv=mfjbJV1~%8nZ?o|pkF2WdG-WqA4Z*I2XeHNO7Mds#5=
zT&{b|wX9ru1yd$Y#&c~tT3h>g;IWd`n3AV0<03~PlTiCGV|qqtjEd;=JIVW9WV}q=
z&u%$MtfxH3UQy(yF|L!`bAc-@kXFBz#W+Iex^7Qvt}!F)plP6p=4Vg*f=_+nbGX?w
zfvi;6j4D7cN=;2w?x@5CV?na*f*fgXyX;z~Q%?%JXZS#$Rt%vTtD(TYzE{k9Uh<r@
zh*hmmL~F5|C!c?oZ-4jOJp01)2qh6pk*lt*?6OfVVI*);@pB4@czx3*e!FHZ6Yss3
z70Z@${k3ml`I051yfpdluAW)aeo*LPj*EOB%Mwtg>`R>bgL!<tKpq>san3eENI?j6
z_-)7{J!G<V)iubZqdg+(<;6F$@A)g8a3c!jeZ6GW-@=cfUVv?>qyOGXJ{SSC6}$M<
z7ypB%jyAHjxys`iZGet4IG#PWE1B~l7oT$;%covI78kn@dB%vW<<a4po8Iw^A%-A%
zLq3KgA-{O?SKR&eud;UiI*O4`rYeUCO=WkDMQ~3zKV>>gb6YD9|MyS$+2fBf@0>YY
zy?PbbTy-@wrcT9H7NODTD8do~%TfqoPK>@<XtWH`Mk1w%qW~sh1r!2lBK9{OB%R8V
zO{d9-bYfbT?XAjkI}M8946RAvt}lIoSJuBqwypx^qY}`Ciszsgtg$&ZwWjD&n|8Q)
z*;Py+g^e|M>&-au7)q6}Q8E!M1oDLZ?5SUH&)2`kx((~e7mK)_OWJiRU_M^-w{j55
zAuyU(H*Mh6jqCa5x9;PTix+d__1Cj(=`!kTYboSAk;Y(5gfRkbhW`9TX|$$@3*<-)
z$DWv$5JUp-6kSn)Vn>k<*-0*y!xc8RbYr9$u+L6&Lt8l&DdV&>?=<SNP;0b~u%u$g
z{yjYW=p(q*>B^=Yt$?nTK)DWwg+JzQnp=Rdt(%ogSFmK#B64_1sD1p%V389)(OWNU
zT*KX8zlUEv^=sPm-DI;_Je8{KrtvC5V%f1WJ<{3EFMsnSPdxn;Gp9}GrnlX|>MK`r
z&g`@PFMDquXGeC`d4BH_5pT~`sa>insrD)t#x9p#24kDW#@KE!t7*Dtx*3=cLw^_=
znxR>`foXbxVHui+#%>#i0h`9yX0h>7F4yWRsa(5jk*ZXxQfc3FeOoN|-uWZqy?mKU
zNtseg%9o0tK9S1xy@(re@9&&*&-opkjWLM<=P=l_5<sUv_T0qh&hLw^Hn$a>?rt*6
z)38_zQ4*6FL(wZz@C}|)c*4J2)V(NDKf|jPt8YEHl;)C_5+@~X8}qmS_;(ySaSXqd
zuQAJJb1ir2+C;g<t?zp)$H)3F=w53nt`)=l+=u=(Zymgq0sOP7Q`;-O$Sh_Nn)ftV
zAa)U2Xrd&dpbIpB*PF-q*vCK4r$6%<#-}EcTCG~m<Q(Tm95xVGDy1^-eEZ#e;JxqT
zO>cT5wMvaJX)!Z1Ll6X5Yw<mg#28GHq;tjDId$qb`@B=rKEGV8(_dS3_HAvNe5aJ6
zsC~*_5nn2lNdHpJ>2EmOug_kp`t^Cug}QUz_Iy9fDd=Q~pLHItKm%ZD9U3nF^(AQ(
zaMHAR{||jXdk^l<bt+iNWov;-d*FQs6951p07*naRN?m7E_zKCFf%i}`Hq{oWpHbz
zjJ-;bc^Hl~u_eMGbii?%{LMf8J%93NALF%GU!`2BP^#qh<5xSpAbkc}ahuP7;Y-|m
z@BQ3%>&?9XgYV<p-tldWtr;VXLrfInq$CR4U>!w2z$RwS-0!N+^^p34kElq0%VmAE
z6B`moG3|Dnk{?hC3i!(JmX3DH-Ofcn%a%1S7Ff*$;2ep|DgY2zT(_H`>~vwwllkTm
zyhWmT_N5m&c<e|{=8KJNT&XvfzK7>2(v*k(fo#WYAKS$H-})|U_yn0E^`*98FL{h+
zo`;aul1rZ5_X5B9d%weuC%%pY2CB7u*5sJ`2+0CowSXhx$rqmIiRYi?`v37M-ucdV
z^1=6ifa|W=N)(4k>7isNmSvEx*F*1ly~S#~3yTygEt^x0R?;RkAzEmPL6JcFD4{d|
zeC{lj=ZvRaz|0kMU!&9JSBlQHNt(2I{osD~yu62UIo-low|*_#uDO;1olb$`%m4{N
z_P#T`2(9~NTlcPjZ=n$EcytF-Q&W@&@^xoL6S`I!sroB*q|h)FoyWJ_@n)_sZefTD
zaVpc%|4A@nR{AjpCgKKv{>i`Mk3RkpX4)-+VD+^o&9U5GmBuTi3-9i|uky-k`}q5R
z{5*HR?Jj=o!yo468*f55h#HMlzg=8>bk4a{)67^yOxkqBiUbqZX`6sRd-z)8F&l<Y
zg={lLLpN(2TnbV$fWgwB#b12t6a2$J{2ixGokB@Tz0qL%_U(Mzx4wfPc>h0R>)Nf^
zIrf~Pbs(<3c_)!+Thu*!@bjijE1%H)Krh&|WF@1bi>$X*zV(JTQN{z8dKp&scUEg`
z3_?j9f+i7PfALv<`~Uepo_O|Yq}G&ze4jkW(oiZ70dQ)3f-l_j6~21^1HAKF-@*5P
z--meHo8N>)Fg-I#(GM`jpj6hx$R-$TQZnlyvNM|*xjCM_>{eo=>2n4_6kFPH3*n$z
ztfWFUqL}&W^UB_qk%&5`LEA)V<<lbMBY*WV{@cesf-wmOMU19E#EW}(^WvUeJn+ba
z{EHv?QNI5@--nNfo0kP}wIL>9I&89g_in7oMPxF3eZ>-bZ+L21NjG%V3KimJgi;;}
zj<$`c7cNe{sE`P}w&Cr!eG}K0H{c@?R-$BQap+Gg+Bt`(6m=}qw#A?Q<)8B>|NSG3
z&rDGp96Y0|QjQ!;GTaLl0Gh2j|M<l(^6(=&xb4=P`JaC5U+~5|ZbubMM9n59Nzhqm
zw%%m9MXw}cKG!=0219CWPqn7-l)_g{d=*gk%2^_-#9)^_`s8r<$|nXs`^C@k`+xLb
za2lMPExl?JfCH`CJo)_7>^txpi8cJtcmE(oB(aV0q(3LI?rMQT(x^9>nwlc0<mGAr
z6FYXjb;T0;f|;HdOXf{SxvqHq(HCh=G!a5ExPFw8>&B2yFkQUxh(HyOVZX>*uD_ij
zifQwSRU#PE!t&TF&+)r|{6~E4k%tI8pGvKklX;G1C3YWZnuMKCJ;hVsc#dzr;|+Z9
z{qN_!-}zk>JRcK>I4AKvk0?nNRnOf`rpu&2WyiMe>H20xDo1KeOl)Ez71D|t6ucrO
zzl?{+Tt)hYvSQ?-Toc*tKIo7r#@iG8?PornzPemE(v{c(GAJ<9n&Ef<@DI>d@}ckf
z5EWURee0`C+Cd>Xa`Z^wMRBh*Rz>Qd=U_A`F>&}LyPn#MtQ)F{PiSLKoOqoR`wy_;
zE!(JVs4`u+FcuD6z%83^;HGug;rA>gD;;N}<iuG#A!%ay$NRp-ul&L9u<ytLhHEuk
zV)B`h<I*fRLZf|+!?5%5r}+94PxH5b`x!p`gCFAE?|cW9a)m~-nJN>WWsb>(UE(uH
zzSnb?o}v>=i>)C_5+Y-0v|IQppj0T}Ne?Y_SGZX&d5+DUZ80&2j~?QM-Mgq(Ys`e_
z*4#)$mD5v`{K238F`G7Q=523$3jtmld>3c7JMDef)h1*Uk>IQ&iX!lH?f%6ZLW@Lk
z^O|2@R-zf!jBFia%D*`BC`!d(%Olz|$>E)QU@E3&0)$Ij`W2lbah9p^an`L}hvx~x
zC7LmVwm_*};0NCR0lvAmog!ISP|W75xbyrIm)M=}B(#YIzSqgSjZK1-3IilUaN4!_
z#ozule*3@v0Z|-L^!%)AM~)nq76OU(e3a50J$8%-9(kCZPd*M>vuVo~s+B6vK@=qf
zen1jOcv@qU1SKRIk(GR<M;bm)Kc^G@>pfhi`|d>A@KdO)7l9*khISkinixZZ6#^|J
z))|;rFF!lCMAmmHon;1xz>;R7xGbqFVb{Jr+;jiEOh@tJqGr;g9W{C8>1Wus{d%^p
z-;%XHnmvbJX<R47s?e@+3wY><PafrOKlk?-l_%q#ul{^-aio=Oi8v@HlHs_(sXa$|
z?eX1IlYp8yGpto@Yl4R3_@0A!X6cu#tmK-3_1v<48(!A^w;wRCZ3RxG`s+;$`=^id
z;h+3heDd!;jqwyYa$Ff^7kEJt<rR71<vskL|JQHv<3ITmeEPGWVPblU;lW{ya|q?(
ztibmRnB>e-*Iut&xU<cM9)X#xoXki_gdr3O%_L$fY%$%gbGk7>XcL?i#I~c6=z7eN
zUQ>C#cW#MEy>S!8gkiX(A&H&h<^B8lcfa~eyl~)^tY^Y(yV;JB(s2?5t5a&WTq<Yn
zwR0?W&0jVPVe#|$;`Y!>2-bT8oc_iUjz6^@8ZkCLdriC7Qp}v3A@G)#v8@mktmd1y
z-oW*84QheSEV)8%<QY4EE;W48LKuOQ9x;M{{Mx;I&xe1IXLh}S@B0KIC-fXw+C>w1
zqKJ}3_P(}{U;B;!#Q*wJKh2+i@~=2OF@^RE;CUn#gdbpp#3H-IY=y)L+0}(V!=n~+
zk5p>TVuj5-^|a$#Y-3tUo9U>|vD3#nHgSSR)TCjXgszPt#t^05;j)Z+x*qhb39V2l
zBx{Gqs05WIWvn{~_&&!@o#fyA{LgZD`~*=FXM#^+PFrT_ShdY$J>Mga<9u$w?=POO
zmVo69ySrhJk*#A)dP^6UDO(sy3LJdq6^?!5AVZ=|a30TFBC$1(fosQTc#9A7*R022
z=<#EBe~``PVLa!MF0Bo<EWX*3xJ&`Dh2F)Aw4d-qT<6a|`$>NDcYmAH(^L3TT(<LC
zO)wfFU(oIx1xKr3X$LMn3JG>V6PLw;M_3U=Jx5X&v}8o$8=~IBgU~a?UaE60t-LDk
zmQn#aDAAai=FvwU<$;GEW_)sz^_w;^I5bQU_{539iOyD5uQ0spIt+8|g@s4Xbv_EZ
z8)FtwQldQ#5?XOc7`2H_LhNE<m!Or`-A*I>C^Du^J?8Z1g-VexeCdl!%}kLj)qzox
zqsNZ1ckf=l<K5qZ@B3MVkQFZ#yJS9C;5+47g-?C{?>Tw;6zVGW)F*cAdi!F3_lm`i
z)6Ps6wqH9Uikx`vATuwYW<Zspe*Tcwq-Zl(9YU+6d836;aQlYqxPEj!1uIbwkg~@!
zw{yJom7?7qMNwCfAqI|x)BN5a{UM+D)c-(eMM33>CTByUEuoi?NSCEiIb;x^d=DLX
z2u~vdk09^}ibZ5Wp^FMX(D<H@!QuNpQc9GP*m-#gvmRu64}^pEOdXL}tg#qtX}4QM
zk)hpgVWNbv6%s}k7aNEZTsuO<Ag!Yi`)IrRqAan{P|zGdJ<dn}?9cg!fBFLN{m$>=
z1Mhzy*I%~{?Ma$54Wt7<P}octLMoMN#-E{=F3%8<>2`E;AY@9+o$$SJY1v!q_BdKL
zq!p!W&G^hXN^6RKfL0zQuab2mOkY!F#9j+3eEYlK#Wz0sC+N!3)XpprR7yPZ^yB>J
zKl~kj?H7L;Usr*&3mL1r2*siC*tBsI&%gXq-k4>j6Z%~GTRg7OWlp?!n5lgyQB4rh
z`N`Z02PKcOYc}APz+)q>L@_elee0VT6cw}+sg`5Mq+CH(aW~U7TZ}qnZh%wq3_tn5
z{~I2A>It-`JN8J94E0(<OoH+i%J-1IPq{pVEcgV)0y@wH#R5_*@HBV|T?{}9tdcnC
zNJN@Y6=#{qZI=>4dIuJcnsiCUfi46okvNC4j^SVwXI&<?Vi5_rc0|$&aZy4v(;{hw
zM2!}v71L-Xn8;w-Aw&rU=TS^nhgXvz@JnS*PfqZOPyG$|eDz-5dgq&Y?|a_E-FLl}
zKx<m9DXcXl#-NNs&Uwh?xdq}$o5jrac*UGQnV%~v0)?}dX550XN!yFlIG{^sW2sys
zHin`q@~(G(8-MzjA15&pPAyIK%s7YiG=KS-PvNBCw|?o@Q&FpqHL^-`SS13B;r3f^
z<%{=y<!biMm&7txJiALQ;h7x6qp@#_BTw(cZz_Ulao5_^mg?qFDw~Em;7u-ma1zU=
z>Kbm^cwH(y(M#s@Nd0md%L_#Sdb8O(-#0iy94{T)&oBMvuk-NE9TdvN?j>B!Xp~)=
zIqL~j!3V#<;8+E(=2NZJ2r6Za1fe8W37m9Tm+qE|Y@v@_gmWq38k3QB&+{RKz{<sh
z7Qu*Y;Rd8iNntvg0n*Sf0)z%t5$IYG;Us|@0PE5{R3~Xn)@e6ew5Dc=8!cKBb>c9B
zFhPW%<NhajsXS0HJ~PFq{_gL%|DlI@^BcdJ?|$!h@&5O|8xu#}=+s%;nD!V^y)(+4
zCx$)W9#EbK#t_E|))|bMTRhgRw@6|`p-|w48@KbF-}&wQ{XhK^L22nSrq&o_G2qYs
z`mY!n9Of5)>Ssywz#T#?HX7JpR(vaJgYWUCH@%r42y!xC>4YwwL^`=>LLU_#;qeBq
zKKcTM&?9Isaxw^rb;6cy8)(YKXPXvK=-6`O#;t7e)-qe2x<o7FQhVg{m!B-br-k6L
z7oOr5e&avz+{?RIvt|uZyLDAg3@2dHYk((^1s?*B(T(fy%SFlqHN0AYDL9Na2&FJm
z(2PT@NF{MQMwD|Yfm)Yfdk8oU?aBrDqx+a-q2BqPdFOQ<4kradfRzHJ6vkST%yU#S
z?Fk-Zz$Qddgq9vc3KRl4;!_+AsJS70tMDwu^%jk(Y2xXKspHeMr$bteW|l}L2oi~(
z^q~}mlT-(W2;+!*A9{dCc0R&qKl?X)&v(C<cfb4H)GAeyESX9yNaBkzna{nJ8WZ8H
zKuU>}X)<1Kgx@*PfhG)F7z`i&;UDJVN54iZY-3oul(H6*!8N1&;Ya?2iHUK3_m}@O
znshgycP;2_V~Rf4e=qt)+AiWPZ+IiOU4IiV?%hM7ns<0SAC|Q7);@UhH<l|gE-4Gf
zuH8UANH|}L+K3XACwz9_{{qwv)z;!qyH#)uZ5w0o#x<NQES}JZonSDQ{K#GJ<Hmul
z_$Xvndn)FI=F)VS&OdjSrC@m`n49-`mpGDiQnwRJq6GIn|2RMO@Bb~Y?cYzWQd+Ro
zXSJghB-9HD(Xd3XEi!QJ2xB*FWc2zCc<U;tks?V|(DY*xnUG+KF(fugw`OEkA%sio
zk#Qhgw?acm(QP-I=4QFGA3aY&dRT;W*=zQcOXINFzw~cs|HuiK9yp|y-Hc}^98RVG
zC(;o~N1`02pwI&)ytM-iZQDR)>j>oy0~FU*5oJkJwP}hvZJ8jHLYqF@ixCpf^ASRD
z`1o<|f8b%hwsR+~cEp;s>lqvv#`k@aD3z79i9t94LZ){>x-78{gm6fa5n(1bXFKKV
zVs`d+`=Qyi>fL2GPG;5cbN_)<X<f{Q_3KFDm<Jzxh*G75wM$<QtTA{+pBHz($m@p=
zaOYd!LRFVg2%IqpV?d^v|DCm=^XOfOobKh0)b<{UwFoDu_(jG~o#w$EU%RUI(J!>B
zY{{84%SGr>L9qVXjZ7Efvl6-%j%pyO#6GWmZ4c4$7K7o^PPy(IHr#d%3~5?w@qzJL
zY}pcw@&k9hm$hoJJ6$_OD#Y1%+MVN(U7iQuoh6_aT1VnZ?tA*{{PZvW90!jcVxWBW
z=^#%PLR!UyWGJAzWsK2nYZ=+Tj>?7syx|hAtO&Is(w5k>nZ|Z!@pj!~c3C|0uvzH6
zTP8K{>+{`h;pUS3`Tn5S<C;}B?KxMG=89O65|zowJ(iAGLQ5ssg21Z<l!hu)*9@@!
z+6`3KkK&aJw3C>`7c^x=n+TNapF}$$5mKW(pHrt#vUA5{Jn+B+96NS`TCK*$jT_Ng
zVT{2zmqt4}gPs{|DbZ)%ZBKo7C)7S?y1SkdweHWwx#z5N+;a2HytH>Od-m+X3odM4
zItM7h-o3B##1l_)=iPTvD^=4ZxlDk?GOH*zTe{v~#+tDfPbriTj0}(PkN13mFpdyc
zM>6lH+Xqj6x~~X54lHZ8ZD6K&b`RYbl8vIoz9(L0;<Zx@w3gOF!6=YxN^HFK8jh70
z@0}M7)MCv$Z@G(iZFw7|ED5D|(w==0US2}CJv7ptoNk^)E7DB%L<v6g(7pW3FaHA5
z)00#RSI^#)6OOQ!V23qov_Nh9TE=eK%E<QhPz#_aF`gh6j>wucysackq`sBvc-=iJ
zV{^Vf<1UM{67FK|wwV8%EP>D$`t{kLr%#LMi4F)MP+FxC1u4?J0ACSlhpTuL*A6nc
zX)UF7BNRp|6o$)$E+iCfnq~&y`G`K*gO$odc|MK$49`FR9QQr=AiH+&LV1dH8#gde
z9VWrytjP@FjLdOJ*BfC=P5AVC0^!7LiCoVen4N>-JT`~G4+?C(=31V7>S?BCrjb%#
z=)+Fp5)K?W$d0e?<d!>bWq4$e03RV7&L$|4iQi<+<@=4$k*Vrm+zuHU9c8*P%|nkq
zf>&DoogXK5?7Ho;gxr^t&|4~I-E|w7tk?x9Pym~~3a4H;z~QI%Qj%44xU`MymT#$S
z8f56&HB6~!(SJ7-2?j!sAAa{gV@oiGp9xJaZv9<eLZ2UE7YiihnanHv#6SH5Kl>kl
ziOKpTmBQ80LpafnMj;}s#+269SabbG*50^@^5#*fXkwip3!0V*F#_-uLd#is(6ihf
zci#K5QVIRcpF3;QmZa9C(PkxZN~GHh!es=n@hSo3(HbM`Mi^K-L{JMLP?&<DPDm^h
zgaXwEp?RS+Li@B@bza|pfcx&hpZgwskeOzk!J#1r1_sh?l*}_1h-^EfL*BC<`eL@w
z&PV9R8sa2j&6+U=28Vd~YmeZthzk^T5<;RpkCRiUx$l7oxar0lS-)W&9vUYcayE33
zk$L~@sXOOzA~mU$Ovh*2P1p04`|sn_#Q3VNNxxVDw<|{IZ9;}NjNnE*7NXj%vPgWq
z$*Yg;Ml~hH=F+X%hL<pU%LW+qY3jv`$&8u;H`F%qp*OvkAqsd-X8UfJpU~%r*hTj(
z9AO+GwWfvTukZOhKl3ZUfL4-HL9^NsdI^nkLRb?NHVv}j4cn+~8>6scn4~C)mBGju
zge9>tXp!zSyDSev&J_kaAEAqR9=kh_2Y)FEU8I}s=XrnI<E_)p2XM|}t-(2iaOu7=
z0;KFHrzON9fr2C$sW7l*EhF1DA<G4HwLmjz(<UZKB7C><7gnh}kQysACr_Q=vBw{0
z$Bv!6xNA4Xa+x(_W0Wctl=cupq=Geo(i$fOK~NwHBb3qzA$yK<-~WX?bSVVR39j3|
z9pT{Xk3XI!TB-}5uL4Qz629<-FA^p(cf9GF5JKPyO>AP6^t0!@e+XR&F}wE<I4P(V
ztJFpY`07``inA7>SD)^}a;ULh2%%SjyD#>QV;NIfTcfhM%FMh5_8Vk?m`Hf#u@`aU
z5#{j0!Yu6|V(o2P86RBy-g)34m@&L_`&+nk>+K8>AdN&waVD`|211`t>YY%(#i2cq
z1o)dTeU_j955J7^HENZsxLWC$)OF&Tq_%Yp>u%Y~==B>2)>JV?MJx>w2^NFJq~%D$
zrA;h)_DSY9w76Ig{c;leVoq@W>x(mvc@4xfIaDVtR;F^OiF72&Vx*%sHpIxfQAXB}
zQK%G%lZ2V}3{E>d(;p9=(mqoAOxLG*an~;Hf9N3|d2|N{4jlj~sSebr4GyBTm$q85
z4r6R)2)PA?uoj(7-f@_-u>PCxypxlsPVwr#eHd$y^1{c^8b=~5UwiaXUfA^_x7~g_
z<ywV;Dqt`@?Q8lEz1xa6UVkHrGd#L;C(c@=w|X3x<&suk@>A44c=9XD;ibnaMhyfE
zY#U{IUIzAH7;x~(J=70QP-$KGo{1guS$o?i>i*&hy&5})Rh57KEgxW8c^w73wASbf
z68anh>SjC(LLB!z`4B(-3qMDcL}-6?%Og&D4Z;CIVe=px-?*L1mJ#%5fyi@MoraK|
zH3&DGFxJUbmQJ8-rz6*ycVvE^LjMzb`k-|8fP3pOM7pQy=5!>RZ{TG6@1)^Rp#*J0
zRJBNPq{hgGwFpl!dHOUci|(WHHz8E24KFpvP9Nvl=bqyW_k4vXpM9DWCr%=yq*SR;
zsnrPlB1sY>Wa?!LmgbqCLFk#ltOM@4>uo&u;*0D*cmS;~cJ2zia)CXszQT^j9%Ieg
zF}7c`9fd^EUm^E1hApc;Xq%8X-2Mh8XQp`U=_m2Ew<?n4ma|XF1(}7*6?PX@$>>cR
znM`Jb?i(p{dhZF2J-d&Aq&Q!xanYDjElTTaRIVAO=`DWmy<!yC4{hPYZ~7pE6jMPN
z$BH2I&MRA>jpLbDckyFC@vmsb(W)-#Xci1%DWSAsfU%plu;zx%1Y=d=z|nRwp=~3S
z?23a3Y?gWMGOt{AYmh}ZvzfEzZme`dmt@(_i+KNqUe<}8CLcY9qUbSdx_ieWB{Gwh
z^hGYgD1}$>7#JR4aA<%NM~~x#Lnr+g9#T@LVR<1qaQG09J^ln={L&YB`k7~VZU5`E
zq7Xj_s0|Gvv_>h7)RM%RxfKoPsch(YnjH-QfuvTha_eok^2{?&b9($VLSEeXIqOi`
zV`^rKd+zxPM@}5&4c~kRzF+8w44+}RF3yX%@`N5GAxbH#UYWPteHX`%pWwL{p2t%f
z`kT~0)INCfrM@S0<rJZ37}~y`rZi|F*x<@E4otD{Yu}(OO6c&yU%#c>tiNe9YPhs$
zLie1YSa*Eu4R`X6O>d;?bT$jc8DYys1c?^?7mIzcB@nu_H0im6ukbH_>c=@XHA$hk
zI?3D!OQU2l1Crs}Hd5X;OnJi~t|)2C7%Lq@f!4Zf@^n1P4taNr4TYTJiJp0<Y|nD%
z=*?+fi2P+%d3?4*2*>=E+@dQ!(rE_bW*6A`No{U!U2|`pGuhV?Nt(DWdX7##wVcxv
zTxOnSDqfTJ1{Xb9-J<Ko&7M>G(9L!*6G9_pT4|D)2;mEg!xdr-lLt>ywEbIEA%w)!
z0iG8iq~!3?BRu}(lic^<Lwxmt`*`}f=Qw!e2+q^Uz@t>H;)DdHkXj?N<Ti=K+VmbP
zDO06C>v~p!j&W&7!WNsx#`xB|-^Rl`9^?4QQ+U32@uF2iqJw~Eo`0SPcRosOXn^al
z-3~n(2Wn1|Z`NSOrP>HM*ORQ1Wy;U5-@D}ZV{WyH%qmjA5lEkRzU$kVoS5M0XP?Dd
zi|Wtt`^JeKyPjB91NBOJ=uOdP%Nw>aBNDdwBQ%ao@$$~+P@$mIx;Se!D#Q$LT}yK;
zAX%gVHxz3IO_A@t>pQrqdJTSNe%loiuxdL;EMVWMqx>&F`@iw({(Y26tFz9$RY_<R
z47Dw5*mB496gF33z{3R!D;>65D}HWAx4V#@H#~YC>CYwm;BLta*xXlNWETAyW3aGW
zC3?K`xiR4R%3^NLD|N(k(yY47ND>aEB#|>D!ZJ`9VCwagc<oi9D=Z{Z`*=YSq+)Vv
zf<1d*<&hna@TGh1;Y;`2!=sNq#;#XhVti_X$(iZ2OPjU$<r3v$1?~HIUIFR(I3*FD
zhwwbK?;(AS@;sEUkwQ|g*7&|3`Vme~PV(yBSF!fug`|zOAO$DJPjl}B_jBmbA+Fng
z9ktpZ9vXwqgt9D25+jA2_b7=o-Q+9it<Of^(!&=X?|#R-s0>!w`PgIB8+H8tD%1V+
z#ExBmzT7W*p=M15s9*F$7bVb!^+AF5(FtCAW;ZlqYORZ}H59&wE(SzPunVLSY#mz1
zt?Rd=nQf7}g4_tEk|zK5SN=UOy!axOfy$~Qaw{z}r4T(_X6p^tP~A96OUH;HU7&1M
zKkS^FEBvuan^Y`^rvqRw((UWKj?6NUrH~{hAu)!*(jY^lBg{;k#B-~!!omx>?N9(X
zH9pDlQ%~^7jvWXg@O__wYK_6c0Y=xXVX#_b&6+iA*|LSPv9Se`=_FwoViJS)G~=ho
zIezLip68)GO|nd?jzXjo!VdWB&;K1y?s|^zde^t}6aVwSW?f;p+sj>PedgAtSfc%U
znIOs9+XBiNe)>m$ob6k$<u`x-|7Q2AuVAI1u=2MbH%{!>b>vdK@CD7ji5<HdLwDbD
z(QobxjhPCm4wZTC*%ydT&M?%t_?uxRsYUE-7OSu*9B2dA4sT$D>a1q_N+3BPAr+7L
zg<tzszWS9fGq7&Ws#`c`N+GJ|QyLm(%k4KHY96ugh+Uk90(&bDJKG?AM&uXTGI*sS
zP7-|2Cv3H`7)qrQ6IiZ>uGLcbNaf@8I14lNi1DdIy!_fethK4;znwLL=C4DZr*T#g
zMG-*|q_VV`aUhqu9ijzP;Pc|%J?!28I``i9RsQ9V{&T+X{U2o18z3T~&{Hb5;>SNT
zP&E>b<a^%!?cDX|JNe^}eU!iWn@@6TW{N_oxa{M&99Yf-xP@@RaqVTvbhn0e>(?Pd
zIK1msN_8(&ZMrx_o}kTer6vFXAOJ~3K~%P7gzCm&>cz!9rGv4cmS{e7=eKkF&^Ekm
zFZ4?0g@j><lA6dGn!@r&fBsSa>qq~D+WK`Uv3i;zI|0+RHl_?~Z{NnIJ8mE<Sz>Ll
zBnauS%B3?|$h1zFx#Ay-iEf<dEY9hYTxiIBAp&1a`O}4l+=b}uKgu&|*XJIcTIzWT
zcTz0yyFI_3y|<Q<#29?fqvn+f8jA6Qr;vuL7D{S7<>P02@xGrPp6BDwJG9hjr3w51
ztyJorYkf(Zs%WhdQZQAY;l2kS<bg*XX3Dl$w_!a4#R^KOj#vQ*1=h~$T)Qh9a_{7N
zbkr4OW+;*Mpf4zocii=M-tlekAc{hc9y`Xw^i)dxE2Nh9Qj_@=Cv@#8W~OI2efR{)
zOoU37$D&G<VCcHF1S4hYg~btHH5RP%YkcsVznyi#0A7}gbR`L0Yn|q#D9LB<{UX2m
zTmK2KQpS_3hs?vGWJWd!HdWbl$98I)hlvA6C}WH?AWb)0Jrl9)5=$?+otM;C$R7IH
zJoM!x^u?Xu!ukC3hiO(5Tz3B|P0&p5gOU;*E5f67PVPU7c2|Ygc7Getq-)C2@l!m!
z^HCmn_(AsVdyR6X%+Q+QENk4QiGCeHEpcTDy=x%%UPI5bEQQ25%lhH9yziaw;hXM!
zBg4bPwA*cF>UE5>S2W;yImrBq6S^=0+eomDWLf1TBQ02W%NAP0f^d-yS*k6^&1<jW
z{kOlH0xFezb#i`U^d*DEk_k_yUt621NJ+sfhYs@NKmRkFZcI}ute&7|Be1kR!P;A{
zVe=cdQe0P|?b<k%jfYIj&uk|ttEc4bY{_qDCHAW%DQ-TY%gnPrd%y2<6S|ZgPrqjm
zoh+kXrHNEBgcEy?P(L-Dsw(E_kBEXuGsh?Eb)NjjH~8{H5Af(SPeI^O9U8()fmR;2
z6AcrKTget~Xmqiw=q#Zd&Q#B|)}o|F0AbQ*>)K6x%bj=g{onh&06hNmQ>&iL;UfB>
zPwdzwhVH&)Mee#dnSi!T`HMR}?LdW=O~V_gQl?XYg0N|4r7K|CNhvW78j0l>f9*eV
z`1nz3gR7?>@Puk2N=3HZaxH6b*hp9oY0EaTvIrM<$NX$}(2B+Ow_c|E0cRvgcHV#S
zoiJ0+r^CUr=YJ{0?DaU=)77i9_=*MJyK`2Za}eDo>#|GeHj{ik+d0{6`^E{|^~5bO
zCsQh$3sz*Nl@J6%gSCjzaP+_-%665@6s}STXVHOXJZf<N&PRE0=c8;K8RJcFxP$M0
z&wKc$Ti?L8wVUS{(sJJCm)B39eez{S@R0<+V+t$DkyA%`^4Vwj@_k?B>)&|#svz@=
zBJ`Dv!J#V3U;H=@H6=ys@#Y)enC{IQGaI|O%%pDTk=E~g<Rg6Pk%y@atqwAG0;WqL
z!ElA^-gqNJTSu8P4ca!sq_IF;XB^y_UU#oU+Dq#8T-y+CAv!+aA~*lMZA$8?xHPh-
z&AAc+neEdhF2)+0YQ{T<lLBYceLk}6aD_lSg@-^P(FnX)K%9^y24fPO6&PbNCc(xA
z6DJ5eds3}1oa+;1k&F(p`@TkNMGypOophEU)cJX(Qo&h=!KQ@nIh=H94Yd>)2?m2P
z4ks<1R5&HN3%G|y#e$OcdEwb-(2+wqL5@E5*sVo*>2q>${22T0Ilz}5xsNp?quhSe
zZQOSAExi3LZ{^1A*E1H>5YUqZnLbOMEhQlYswV(!yT9cYj6iW7<G}Q6ekuf!i!s)s
zq(llIgXHC@BfRp;o~*2JCr6GSquFXwD3`B@qTJ;s^Toss&rO6Y(L+~Ix~9tLom)6O
zvbdYLwl3MO*793F{>xm$FvYC3g<RC5w){lyfY8A+yI<x5KlUS7-y&7g|0{-o$x4gT
z`a!nbz8!DaC-fo`VK72s&oRblD^FV#q0>p7St_B+?%i=+Z#C<M?Rx8WCBn|t`W6nP
zli9*15Ke-z*d)QlhH$2ZX&a(e8`q9V8WApv3B!;$j&UY?FXzA*h%MN8)=cj#K10LE
zf|THSpd`NU&-s&5DZux9f>IIXD@ua_cmh@Mky_)Ii#RDjL*kN5=RMWKS5{I|1w=h&
z_hZjcKX95-qkv5EaQkXR=nO7S>(*<<GK1wRw_JY%H*LS38@FA@&D(BZ^Tth-%O!m2
zV{s@XF);uEJ`pxcWEE!!HO=+9T~~0aM-~c)>FHCS$~@0BXV|-UFE8!g!+kp+;f0rX
zbNJ{{8to><av606li{uenXgI@J<$fgTtq9qXs=8;ST{UM2@i=QOhN*EdHe46E`>2L
z-U|6Ye*Hf%)tY9Y*#A9%t*|soA;J0qw!iIGqN1Ztf-{bwT*QR&InB$nmDE_VT<14y
z9EhH9c4|oUB-HeXW~J(B3T0EhY~>_cD6|6`#l($>u->563~5hHle9wGjW%Jc4RHcS
zq+YibNFym(kFpaBOv~k1nBqALsF4vfo}n%kD2LM)={c0|A+^RU6{rl<7#JGFDu*n2
zUBx(O;mFZLOddQzcyfY5D?r+u%vUP{p}<d{!L|u`{lp9hjvnSK4?RGoRz@1f<_#Md
zstvGt%O=*ZU(XHOZeVnDl;PnKip2tzN)=BjbQUcVJ<qi3@!n%=NRkADqup-PY&2-M
z+nhLkf)giBaNxiJPMkQw{sa3teDo-%PMyM9OJWU3iSRWQzjj5(>q?RNMHBi;+((Zw
z=t9sFqFDr)I@mZeMiGyeX)>rQbG)<5N_?byLjUC>|Bc6<dxpU^Rh*6cdO?T+K}*LB
zY+b{~JFdl46iw5>c_6K%)sC>@%C>l1Xg_{7f-KW;dFGW%C$rDf(7Q4U-+DBsnv9<w
zr#U@Cb8?!v)rOfiv_cSyk}Fbh9!2NP307W-u$;C69qOL%%o4Jd5i@?Bh8*W84yP4~
zc5`a~b>dKALb1L2#Eo*C8-;@3{k&}xgcQ7T_y8P+oi99%iDI-4&{|O_6et%<6pKYX
zt?_*yPiYE;(i~%2NlBO_L{UU+6I#s{VHnbEHq-yZM!JQSMX8k51VKQe1!)oMmCxU}
zl0?30J#^uFc%=euX;@5{JoSeJ-*n?GC=v=Pm}@p(qFZDa@XVX-2*2R-;Nws5XMg=k
zN&{7#4g30jB-+x@38S}fW#g?|NdiM7t|R<ZcGBUpE>@S<!#iiaZ>ELrti#&0d?)Y&
zL;{|X1VSR)mT0QU)bVj<PS<Iit`jyR2tz;+SjAAHfl_w#52Tfp+lz?`T@5laInIYp
zt_XmTKH5tOKLP4-NIec=YP?Ix)|xarB?Tf2iyN0}$-9i)m7LqnPW%3uYl~euq6aI1
z%vUF&D+!)vy1Y1o7>d%Y<Bdb3_@vDhu1I7dj`0dU<B{bLKl0ycn~*}#-}UBkMbZ=z
z!`H24{jFP=mQ9=kSx^{EYHiEeL>aDN$x|oH-s#R}W6(|$NKGI-lIa*1TI%DI96vol
z{n$9|$tKj>U?f#nqLfNp<STrR9A{e4seXh6xqvq<=S7M72`h!nmxa(*T-e={sDfIw
zhP$<nq1pgz{9!x<`U*W%p68JOANh+<aQ|bE;q`e^d!j9M88LR_X2x#bgbgeRhv#`T
z;t(NHRWc`%luVs}g%_Nxnt?Qw?j@2EK4QucPfT+9&~awQr)f@3L1>V|XDIgR6wBnu
zk>l#aN+R=B>7h$cp*)W?;B$Vs$gpw420S$S3eb5+h9SoBjaOdfFF*Cycm<EZ@83|n
z@f|Z>#PGH28M}ECNzu?wLR8VC6}1pjW!tf?>lI&89qFvD+lk)0n>8894wdbR<0RT@
zlF1e)4;^9rz%k<S7AkZUUBHknk|Rfss~(k!9lIJU?W9&6p%+R;#1gJ5h!i((yb+%O
z<$}e^Azc)K&qfC<T1pJiM)0S9`4_x?a4)qr{o7aC3CFZ-F?Q263~d|3loAq^fDpts
zL1wa&9inBC-MP+Q;%qZ|K9j_ulk6tbKHyTP29&d1G7nJrP9d5W)3(f<n&8BNqqL5m
zL>cfCNjWOz%U6yZIaZ`sekln32(V!#T#yxZ(WOk)L=YIoSaleM&N3x0&%U)JRf9{i
z3d;wcdYmuZ_Z5njJ`Ujum<$>WT(gFe>&B2n9-)e`Iuk58>qu}>`{!N7s$S)`tZqD$
zgCUi<5IAeFu_aJG16~1JkC-_=&iKL8j2{`tO-`eAz+kJqERBM4<hayivQia0b29H!
zLZ8^NYvam#s1`@cl~_;-0@e<XqAq#Kl+EZ%&iRf-Fyjm#|M*9#H>N07`Zs7&uSS&D
zjj-XiYfwWTk+L8)4s*#2CDHN3v02!DR?*FgRB%RGiB=ky!~`Os?EARskducFGQR&P
z?Nbe8WGO`wKdwQPFI+iR1QyjdyF)TLv0uGJzT6)AiojA^0K{?3P-&E*VkOJ6ynHZO
zS#Jn@`M!I3@R5foSIb!XQxR^u*hUW&*l^1h${U85iD$4XjXqd=>BhEq|9!qgEwYZQ
z%7JUd3<NdIbjZm=$2j@QA)<)}G#x`G52@$qf8xlA{puz1RY~aJ&gcVuE+kRR`VFJ3
z_l9Tv=J}!D&es=wTW$BF?D@=)I)dZPIv@G?$B<fJMSqfcRB?!k$Cfv2r?PQ~sd$=1
z+O)1zDx7nRxF_Pme%x&=A`v1Ldcj(RNx!d!M}S5&VovXRo$-A~Xq|3Qv_9oHPjJhz
z`iP_VwQ_R5ddPfP34KMBul4MmF6!ciWT;fd<8o9$&OI-gWnAC;zymz_jb|tg^=JLE
z6VQ;Btv6pwb;AIOw8Sp$VV*WJ>4-n5OFF7TfEEIb!G)GuP{y~4`os(;4;^D_-znrw
zglr@XM7g?Ij;n((a<BdBAo5k}p{EL9DOsLhMMw$3y1`*|M|AX(+{R9)ug)<$<dadv
z|Myp)Om}@ne?CKvvZT6xfT3$gi9JIS8x#^Fvz}?)sKccZj*w2KEkgxhVgdrHev$go
zNyd*%Fn;hP?eQjs#KUi^OJ-Q)$gz@1Blp@@H<7POLSIT!aw)NBAsH+W;9a)r^Vy(#
z%Ng!{@IIb?;b}^P1)%@tSXh&&p#s<6c{52lp=CoH7Q0;8;XTooPJi%)URoLfEyqBi
zhMNgFao`|_cfF3Aj*yY076;_Wk&{O5wXa4Jzhs2I62k6IEUp8WZ!Cl5LAH!tgF;_o
z$ybTQC$<ruOq&Qs0{-96{57Fy5y<}2#BTWsvRYun9h*r8q2WRjl}1Rq<1baW^lPrD
z%RJt8v);DNNL&fGfZB}12{mW)LJ5bTXo8lezITG7uk5FB^du!&APDn4@*FvF<X-#g
zC-PP4p|iveYX$954a!KTKwNq+-IG3sEVKQQ`+4N?$EXgLE_Xw>i$>xJOj$CvZ9Riq
zM;N#DR3k=!QyGC<m+fGje_T76>Rm%XSkAuxVUQ@41z&g&8RT@rzNhvP9jhbT2}5x;
zXOJ8@dF14NRgn1VC3KN`h>OW`*9b~pk)cX0Z4x5R&8y2n_n~!IDF`uq?sK0boSC6i
z9_hPbj=Y4Ct?O8O!)B(E7EU{yoI83#iY{3%21Wu{I@{r$CMk3J(q*rujiKlQWWzAN
z?-<8kIf|Gx6j~CQi^1f`31nH%yI%?ZY9R1SPUu%Q>@Mbb;O7dxD+C4QQKksiT@D8w
zAyX~77xwJotM}heX{gqB4@_8$2(@MHjhhI4hgD0<T{t^z_ZB+Rd)JX|?c6bC!870|
zn&#0-j_)~0{qO`8S3ouMWVakSnOv;|e>IZ#>i5urR<niYX~cQtzDzq}Xnhq+LPb}5
z>clURSDVDdQW8qVCqDHln(aEpf&Sa$jf=4P*6T1eO<P99Bv@gWJa+S=C|<8@D<Gvx
z`zAx0<6s;$QN-0F4m|fN<F6jYPb9T=DVJ!?krT@bxW=KoZ~0r`2QTs4FG@WxC-hYS
zX#~a^;`samE!x3grP`Hzz0?l6(i(%{wZjMb@_qN>`TeKaKIzR+8XjU`%P6s*5Xodo
zb^nX<(2-aH))}NzC?P0VO~GiU4xZ-Fb9;$SHK;@ZI?lcF966b<pzHsk{3*D?9JtyZ
z>?BTzlNck;cj1cBfl+*Vx_@0tLeB>Kz6T!Qz>y>9Vt<j5krrJISbM`3)KGy~#RzE-
z!lfDM=R?+-bYUV-8|qk*zK;VG5{)2;1b*Fe<jL1KxbtP)c*tO*l#_XmoXm6NSj`?f
zfHMvgnRD7IDr=oNP^ls>gV2ZtVi$94YKqT&`STPj{ig~y?KK%(KgP&4Ync`;T-Mc2
zE|V?foWo^_bOIoPky4GB6Q|hy<jaJI>QpJBTYf%kbL3>6BgfT1=z$9`^#tDrL}y_e
z?HpPv)~s0rmq}Dc2#@Dq+QswFKSQC?UqUiTU{GT|8*bl7Bts$_VO1uQ)7kSrTO`C~
z29xL*HxesNcJ;O=Vj_@e;v~Vdia}lF#7oCG{M26J(@lo*n(`bg4_}|yvFok*FyvVE
zgnp&6-9;=Qb`%pq<h!$wzC$U6_B8G?6@gpeo_oJSXhJmorCipMF+-cja04EZG)OBJ
zZIARO8`>TN!1a*4LgFb8WhK7wDB*Kr*Fg?HzmH(rF%%Z^nVKW_%5&tn+B|fd7~(LZ
zc#f8szH@jwpy(Azu$Mf;-2q2V9p}sUeg&=iYsgz(NMW?hz@{~bf=}$yP`eOwH!Ga8
zb3FE03(JrQz^Saf&2$}h=OhS=!6L0iCz4X6IrxoNIJIj(C08WK%h7V=WS%3(q99k>
zgYS&R#4+j|j<<5)DTS{t?S8Ctvw`LNzxEKPrzQz1{ndNh6a|Bu*H9d;(MlqaV$tns
zdkNkNGfU=DB8BYgvnwl6Ap~v7>rcGQsb^oIV#@^6GM}M2ax%}6<7)NLwSng3G^1|p
zoFp?)u2QCmK;Sy@<8y_PFK`;0#Nf1I=hIKnvN1*aC#kDZXyXO~hPSP!EiGt?!GV-r
zne|QyxRY|hVe0tTb4tY>IH6G4Pm5Ne8wvZL-p%BzM=84+-b_9@bL3>6Bga)u=w9TA
z8ZAs5pOb|>-$z}-0EKfdZB*hc<I~eTyXyt;`fIo&8#B6T15`DMj&MCh-XUqb$R$oV
zoBe(^=EmZTrGSEZ$l<5<(L69gHOfoUa;!+)nGZpZm5xgu)4UQ^ZP;pKqjQVPlnX`D
zps$-Hc5#klsjw;Yd7j6MyLa*8?iVN)`zIOBNJF7kWX(0}NVGdc-qm&M#?zzwb16WI
zv{8!yCv0}i)|p#COUa;LLQb@J?a}9$+<Tm2L+50kW2JiMPv)bL<Ekh0D{@gzX0_;N
z|9Mdt@KCr5X6$ph=jlGNa}I;!i(mfIqCMG_g0_wr*f2_Iv_?Iy<Cdx5T)0%Fui`xF
z2TyVM8~X^4%rMX{Ba=L$nPWwgdH!JL$O-*QO^7%)L`}=uWMPlkv?I!@K-!8kW8h^Z
z^UOuZ+L)8|33fdFbv)f)J<pS>$G|mX#GXNy&)oO7-I6nbLLfw@){`l}3E>dJA*Do0
ziINfzP2e<DQKGT`GzXs8OZ)XYLs6}t%JOsMWS%2O?xA1K%WBO;1jajyhYo>MXjFGk
zc-gDbg+M8v-LLN9$jK7~<^B;ynJF36K!L)V8lj6Z_QFTUIhSVpJBhZEAkmo9El#|2
z2r-^ep7A+PADtXIax%}6V}%j=?_aiya!{X~L?j077QSfD_t9vi5ZE5wva=l*!01>U
zUw`5W#-}Dg^v~L0MZ(zT_2`mMV(r{SI4QaktqT%(_VbQ5d&iUa0w3WdUej^>g#$DW
zj#FxS`3%gFlX;FD{YK~$J9hoM%k^HRwj!)I(aG84xSsaVs4Ow=(x92N+4a)yzKSLr
zZL!KSym<{R6XKj*Qr-D%fI`f9%xvhW$P&k2KEn7bhbV+TBF-mZjvP61^rMG<*&rN5
zGY#5PGiRl1Aq5tLLLuC8P_9k)fwLUD*ckR7KEi>chjF@pGPm1)%;=W2sIpI@9ZIG(
z07A?alsVtmN=ba*CkO&eJ7GlCIJM^pCwCvfZ+jG?+&j;ad*?ZF^ev%Z&WR!tOS|4=
zES3v+k1{171QK~c9_V?f9i<fGQ<Lo7|2lpj?Vl&wF|v6bu}ZL6N3{zY1M7(6m?(-E
z9T;Td_2cY+Y&T5Bl*7DZT8^B|bL7Z9^d%7b%*4zk6^}U=4Dj+RuW)Mo^s*Zam&`lY
z38mp0wXs^7h#(yZJ12)=z9-%#Z~<1@9zvh}eCFg7dw0Hwt~&;zQa<Z)tW@OUF*$NV
zUx^m5mw2@64WwK65~WD}b8#u^(1CUm^73o1;1&8uOeT?r!cYZQ(ik}#ZCF%HLd^Y5
z>7Xb)hGd!j&+f$>o1)szJ@XtZ+B?t1V{-I0^lH7Zf(>ZYLmG`11atSW6KlXa95&N&
zcV{H7i3=rpmnx*qL=k&ld$rr3r61rl46Gd>5~iD>F0zdF&Iol!O7#9GAXA1DR-{z~
zUciV~W8b5@iC;KLQC9QWmSZK8c^+!dk$dPXdGaJ-Lf8x`xHI3*Ifv+w`6VFT6Q@sc
z<oL0^3AZ~5UfHKIR0Ut)=6KvoDBKekX(d4f<9m;C?D_o^Wtl>lua`MiEWVx(L5`fz
zS2#>NrZLfEXr91~5CZ2q{`oQzdJktEJ$i&ghYsNt3w<$Gb<v_cGC*;l4AOP?$``Hp
z>Si0aXbWClu;<a|am|oIBX5J6V?}%CZ_P&`M^5M~-AfM*aXrL$b3^VTYxUWwL0=Ma
zor}|)>yrBT_yl1X_Ro_LNQTypkSL46Ejhbg34yd4&u9v<=HSzNF{j!LHY)in%dwKl
zJP#e^ST)eA`QnPY%;b@i(B29?PP&v5W706P!y<$P1Q%B=F1jsK1@P*t`*2p!FRO(p
zdlW}2L?k56AXJ(%h!9BBc?n)Ri6=Y?R?$8-$>~>)P_@N;hULhSBgbm@&@YE|T!<vD
z9pl;wg?ZE(N6RfBKI`H~iDUok`%!%&D3fT5s%T_U;xt&y(jFoQSVswuQrqLTCtt!(
zG`gLK+H>UId5#=c1)*OKxK_;MiBqf*b1yXvLoALoC;Q^#?H%tNpxthBdi*5LnZ6jK
zNE-^(5~}RuG#Ka7q_}Qkob7(>T;u#?zd&fbSa9I!mx+$eP-y6UcIC*CBgfT5=$G6|
zHgNjLX_TEM7$=~WL?oS}HMbmuK6@Eq9P#?W1Gql2|Gko*miI|HM<51LwYYQTxeF)p
zjArK8GzWJdpsLFG%*v5_=Q(oZ9{TcPD5(;S$C!FDOF#-H8&kwsA}mH+eEZZ+hp_}W
zaN-CjrzfD)AA03Zz~IOrRvMaN3n_IsW4)X0E*&z<98{!9gn{QHCCEfjh)TTr)N8mF
z$a+4pa^%R7<EkX|OKvTPmgYpAO)mA)qbQ<nLn1;9W?6cntE{Ts0+Z8I#HPPmi4{u4
zjKC$b6IOS<UO00|9zaQnwNNVzFuDH}?GsIgqFfCwNA8{H$dP;Kmk1^@oIH3Goh8OO
zDG8H=B%^Y@Ov4~DQa^s;1WD3ggkCHbyJT*=TM%cOIzpt82qzVZ1%)E6w>h-?HG<I6
zSG{6$<j9dDC-nZZntdy&pPnX~PBYuRK#{nZ1cSq{+{I-x)6;#U5Z5(&jKMjJR1&*D
zE}wKVJJPS6b^QPB-FK9ob)CoY_tS2fl9@?^6j(uO0wh6N0=tR=x@%qbxE}keh>FHl
zK^J$~0_wUd97V)qU=@^dSS;*@A_^oF6G|XJNC+u}B$MfxKDRvgDZl+=W+E{Jr`&rp
zcjogtC+Bcx?tPx&d++o6Jm07Mo~RH}V^z`9xR?H>cG5Yexu`oAQHNeaUSJdU`t-MT
z@fWEywqubgWa-TA1)yLG`(}(A{x`M`eXyXroA%&`Va3#EzeDSmMIzx1o;$a#eOJ0$
zmV+~Nr@n0<;d&&Di`5;n=eccEp+oH=A`0|!>^=K21A7Mu3k3=of+(Ob+YiJzfNkQU
ztR@69nH;v|RMZzCiX&{>AqpdcApDc=oPC|SZNMfb$oo{`(7JgS^adnzj<zOIcP^qp
zFTG^s(bLv}pUq($k6e(WvuE$%BUFoUczk$&pil@a@{s#L|G>VB;oR4p5XT<;XT?|s
z8mel@v~|<AX$R@N4z-JjDA3Ea7o7@|1bsgJZM~$!kRU41m+cw4GTj>W+~o)Dbfb`L
zE?041f=pK*b^xB`Qk5Khpv+)xY+}nMw&KA`#Wr4K<7N!4FYY2yaB%gUb5VCLqChVv
zCl@iWr-vFljpZ6z`r7Ho-#5X`xH@!VYzAkEYin(*sOO+tu}#O07W}<Arlsoea|Jv*
zfn|AwID}YuDTmk&iQ|~GRZZiw+v(cUMk-R6i-;)D%iX1$G`)K|$+l&%J%{$bPV)GK
z6laRo7>J^nAPlg*%Gp;+796YrL(8V!cv(Z0Nk9-|58Znn$01=MpxQ|>E7d^H&Q6*)
z?xKb?<g^iqx^oc)dYL!EM4W=oJbQPyfwAf8@1=L37m6^o%<wt$C<-YQ3fOLC9sH=y
zC+XkWN#oPoNM|8oENm+#=^4@vBu#>}pQ2}T8#~r)gq{d*Ko`P^h)fhy?g<*{<TSb(
zyEyFlSp-2mcwt=4F~l&g$ERA>;G{B97!idLIF;2DSfRnqJG5-tO%(XdTXZxv_0^at
z#<m;=I`Zsz@g-U}ZYN!EsR=b-yQn)CQJ{}vV{BNqpr|LKQ+bb`j(!H(`k8ik6?@v6
ziRT+)V&Ydlk<A+Ip$s$lrb194h{KBfGC27dFS2Og&`e+Z0I?Ng6Ji_4XA0oQ)Z`O*
zg`}!LUsV7A6j@0`K~%OJ5fKIYq36XmP1~9|V&+`-c6X2?i%0Fam%A_YP32x|=mi#D
z;K9z^emgNKoN*q*kOTGsjUkuI;d(B~WD*nW_CFCRLIzFbF1^^xtd6SbZ|b72rI)>3
z9kd4>2R(~!GsSKNkn-#}c^>(Eo~28d@{x~xL<K30c`AV@(5C<^Owja76Inmc-mXpt
zFN_=hCsI0&Ww64SdvCav)jz(S&h`!!r8Lbzv#KBp^eND#*GILq>}+A@%Z>E(^pL{F
zA;iH9O>g?@;*22Vhn}e(1OWx#*EdUElkfYa5@}lhuz|OpwhVxWA9!fr)Vd-flfFYQ
zMX1}c%g&c~($v&MhW?@89$!gp+rjg6u327VpD&0wykQ27tDf2Svv+*@gZN=UWR&O=
zeY_A+pif{mRt>v$?P0@)O>}haWw<Z5ENk$pbu;>6dY((d)9h)oKgYm~+B#l-;K_YI
z%jR=D{o)2<?Es3%R15S{>~;J3h-aRDp2pTTd;&sKU@Yg+ho^eAZ3oA7utIfQGRO-J
zb|GTxLr?Da^S}GzrwHSigyX76A~N+l^kRp4gEy0{+jsNS`t`(ExK`qTvWz6&_XWCT
zk#s%6Ak?=@u>Fu4FG<_eFCFl^=QeLf_fUw)lnwM!2>h5;k3LFEPdf#ME@&I$ZiDMN
z*ftmiy7(ckvG~8A-hRNZK7G~YgHr@+3oL~TRRU3<Pth*j@e(}$!bYB0zm5pT^yD?m
zvWS6HI)&$X#F1`)o9Y`@6a>8YUGL_k<4-)`_v_ZJ!$H?=m1umpOH~jB`V<ZIq?e$z
zvy<Qb{y}oFPl0f)UHLy$U-(a`>{*kw$dWZn*_RlJvXd}F5-Mb!874!>zI{;HvQ3r{
zvJQhGvNiTymQiBt+i0vazE|JxpYXju-h0mTJm-DR^M3Aq-E*F&S8o@5WxDRJwY15L
z@P`S${oo%lk}dGot*S#l4-b#G<yc`MfZT$vHz_7oy#BB>UPmrUz4|N7EkdB*JgfZa
z&zct!%N#DWte$BB%KLL(({2<>vL__OU|C0*)hstP|3O7*MN#d4i<_@E+pjv=e8~%D
zf<iOIpT*D<H9J`*x95L`VO<uMu0%s?ARvzAV9Rx}N=Lhys$FYtV#yFJpI_DGAjGXV
z<F*stYD>OW`7zjQ?y%xGWBkLTHf7UF(F0>_)cNL6C3_{s^_4A`z7aQyVwpbYIur^$
zaxuCa4$ijuJJPU_k;B)dhR0lWu%M0w+N;0*qjUl!cHCJmH%EW{8bPlbyr~Wz7(u(0
z$VIqr*^n`^hx=|7q6xxdhJaOzUU&wR$`{1KynF%jhASZ3zpjw@(NKrI+Uu82$%s|O
zF-F=By?oMe#^FN+jk*?f<p&+hjeFm!m*uKm23jp5HN$y)!<=o@1J-7PNwq3kvG0dD
zH_xzr@R@q%=sUG~i+8)AEChXzZ7D2rj<;}Z1yx^M!+KSjFsg8G52zkh5gH9x4vuKt
zTl2&wiN{228sN7!_oyH1MteG1IB11UDY&wdUTkOY%?5Bd(X#H_!-+Y_jbMC$WW(27
zlvTHJbJTexo5vu$JoqiJ=kS#uwR(i5M8~g4{=(Rt!Z*r{DumtwVZ_EN)QwIUDFy<C
z*pHhEZVm?@jO1L7sK}-#&1W5XrDl`N`Jj74Gze{6zKabP^PSVz<UU~p(oSEp{FA6T
z09Rzbg+s%RK{mo=Rvhn~ra<t5E~kKD*V<9E4EiTWy{+e>K|0~=0O2<<!B<j)w<Iu)
zjrw~6uFDB~3kjOc1LN}=>3VltrSXSDQ4V-~j>zyv8~~M;A_T+Fd&f`Fn>_G}d+hz1
zFQHHPz2OS)9fPY*Y48K^(m=Y}?|opm)DSBiSbc&SrszoH)L{6chk6~XFAA>|ObJ}-
z%hb<vu)b|_4<J7!X&d>HeVPy~10Y_|^K*`7wlkw3!hy0O`Fv}c+stgOq*Qq|N|+AG
z^gAWVb?RhwmGcwAgnKoE9+00nf!Tqry?X9n&=R`^-bc1|H@RGojD10M`&F`D7k^@D
zDTip5c#N_S>7!he30xxzz<&mUs1&G0EC}y!&#y*O+|BseiG>!%-$cjJ?!z96Tt(8h
zC>@|7*)$v>hw*!3ayl{bVrJw3Q&B4wn_{9Fovz@*7P;Ch%02*;IN6odCu_31sm`-u
zOhwKd+#=3&izyHb-PperIzJzVmQz$z^!lEpfB8jddQbcL30RsL{?;n`US-1gJFiCU
zKUNr>Ip{+EJ>D=W`(6I}kwD-!vu=s`n3Qb|H-7)GQRWSwW-_0~X}4VS#B%m+VAv*K
zOa(Rff`(WqSp<83O0B~}05_x9M=$m4QvG6ME(6(bJD%z;?w*e#Wq`M=<aDJu)0P8=
z79G3S$5bt7?vI4y_3D8<Y+m+bw3HD&P~)1nyva8FG7$7=)`l~?h(St<O{24&Ruh4|
zEniO^p<&lU`pgsv)!S(cmmCOzjg}X1Rre8eeEK8k7ywbBh@*NF_qpBg)H8l-vZUkm
zFe4DC4FvwWSFue*+(8t?E~EtzI|EHG>J#fzAGTM~`dZPN<vuX$FACluOjIpJ*B-<D
zDz8VkuM|lYmX}<>J!+7&xqP8FTh6z43$9_U#{sNVk+(-;rwhZ@vpJdv3OJv~P5yKY
z30fiA5QMX*)CJA$g#EZfGDi7q`E#<ZN;d?_9CvauK9kpV)U2<6yWq9j6D$7AN5Y4e
z2u|F`Zty#84MMKW){6oN(O-hT!DIIrwJ0klQ49X!gG_YO3!zFm4|J`{=)vET?L$i}
z5xrX#rKRmO7-$(N!xD%ExFDVn()Af~#=<Ir%jC=!Z1k}p;>mJRn3fu{r?@xkcBXQX
zfs2IIm~xJ1&K}$4Ws=?*AD8O3xT}xcXO27)qY&5Jr|LMl1CMNxFL`kNwuYLe?VInr
zxpn_4V|?FCRlBn5tq$q|EU@`RaN=+e%(uJmfK4l#MpIp8-$`}NF|txE`~4{Q7QI1y
zwXPPSMq%%g6`;fV>F1VVe8+Li-ix!!hOv%2ZQ-M16Y_!F_7cx^E8Sm~lyud`#cCax
zp&o~vt&kX|zb%JtU6b`M6e9Uy+(g2F>otYkwnyAJZJ{LY3Hg%J5`zFbP746q_dKhw
z$x>U#yLwIAzg>*g78v7(0!9rL=X5vEF^%wA-UsvxN-*KL;?}quczIOGQi4Z6Tvt}s
zI-s|m9v8@U#x?3*Oq;qDcB?{-|BT?g`HxC<o4W>xYk0f~24kz2g)&z4rV9V)!YDPA
zu#YdHM`@>4g=2Vm2FtoR#bky#Jgt#CZuKATG_oDW8(yRLyJ`0sH_H6?Fmj;4Q2#j~
zv)nZGhqWCfjCW=H406fQg7vuQ9?lqFxoMkNldg#XzkhcZ2fLXy^gNqh9a9pciL{(G
zG{A)V>i}UIBR;yAD}_TfR-m8bG9OvQZn%xtvng8u4*u_v`h;+150^(kk&KN_UKEb~
zpE&2YF#&V0JCrIy?mO`QpW3!t*J5H6qFZO$3AdWD*`T{4=YZe`$&+z@k0Ugk{<;`j
z*W{EKBus8bO1LM*!%JLPX))^zP}<`g8-rnQ)V3UKY8GeVYqD0BfW%U}RG$a=7VDD@
z)z5K6aH`FS>-@g6CHQ}pxl3h^Cy-DwyU8YCnk3PE**pBO)SD`xVj3Rsvp+NLAtYBc
zCp4XC?4S*Id}C=;M*oHXB`b89^VV1JXG2S%ppk&TJJc+-;UGW7JHAREG@1t}+}+XT
z5`Z!$l6U7&GO(qap5IFif2m1SV*G%vJWulX*qAF6Z*w6lU9(^p4&9Caasu~PM+@9}
zjmotbfb)|D!+MZS$Jj*L38DK4i7FUMZ#2((_}ZtCLixq8H!UrHP$=2`4Nr~4IMEE&
zv%Wy7&zWvhYpeD;D-%xSl&`U7#9+v0)nc8}2f(*z`L}z9H~pl3Vn|iaT_lw3an9+E
zybm>kJ~QgGu62>jBHiDn0hE);pGvh&nWL)Ik8tMr4e9T-H#u$9`i1EIXdB-pGo^t;
z`u|QFR-LHCCUhA4|6%(H;#?LI7EA?EC&rmG{`vG@qWw`rveao)OP~U^Mzcf>>>XgX
z+qvZANCdZBpYhk@9VQVQN}F@h@Xy)sbo;WWZmu>UenbI_CeItu?al>NKN#G5N~v7D
zXIH5VlE`^)u!zpJCPfORZEbyB#LCJVH_JjPe}-$BpF#hkk*hOfzB#JLu}lxWnciKy
za`V|?;u_X2c@ZDf-p6-*#k19O&8$-I5A@~@iHgR0cK;R$xk^$@>FkY00UL)ZC|~UX
z=qOaZ5Nk*~VO#|;ax!frGq3SAiuMP1&T9eq$$V$Bl-3qO<>?Sz+S^aZBb=*37d>P^
z)Jbs`LRnA$F1Q)iomk3uv_N1gX8m0~2NM1}usFg$*P~-yr6)yy^Kq{V8A#vKXnD5w
zIB3XK<y4xGyt3NSM=OEwRxGALX<vb^?TSGV8S!d$-dpV~@7#fdiT(^YV~u!9|0~WW
ze+b6dq36$YDa-Rr#^&nYd?|Grw&U*ND+sQf#&@ZiygM%A#mhhCxPU3XYY>CIJ9USA
zH^EnPyF9s^&@h(h`+Z&IEd-Ngq}DF9I(S>#z<`@UezrOAWJ|L(-Wp;t4CP1rQ$ZT2
zey7(;G{Iu@_%RQ6LyGUc7bn_Rh5TIk`{iWT^8vQJY@oTjclE`02w9>jO4ZK{EmJVh
z{n;pga%WpX#9^YcC<|m^eX&?Y!O9=H0*s2bk;CpIQH8{$U%jc+B72D8%C3D2$&$X|
z3Z&<((t&U+qn@M+RXep`EozEBel%mg3(X3cn^JFF)GKirb+UHLcpQ#-SX_BeWKdhA
zfYWAs-YIc=M-mIP(>R>xne&~S?tzh>94Sa(VS#|r&j*vA%6~A@%v@+=phQel)*?k5
z@bHSph|{J`9(mZqjkv2v=W3{>=>5#TJ{X#0b`%}ZLc&x|eRg(}D`bEvUj34?@`Gfd
z=A>F#&<6>T`Pa}4#C=H!OG=mBmd&xX{{Y1<YIqWoT(h4n&8UFr^aVrz4a79{=_P61
zpldi+trPE{gE2{5RX+=oVsU~e?*sc}*hY$0bWK0Uo`-O(o4+%jjkuOcKwdey4WxF`
zcedNwam_I#&cS9f6dy_CvFQAtW;tltlw}>Xc?-o-jo5JFc=!-VTC;fuEJl2?;Q1Wv
z$UNvU>{Mn=)g+iO?N13O6ld5+Lb8S<b4^p}i;f4KN5j%D)cii)5H79vIuyfU`l0)p
z-x*5Beg5oC?V<gi&?aeK0$5Xg(pf!u<mJJJQ)vL6aGLjJO@orQF!^=W`&A2!wt8e_
zTMcn-ZH=0>Sexg+0&zcaEO+AsSNf*Cj6bnq21%A>?#bCc7%}l4vQ8x$5(U0khCYig
zOhlGt*;w8EH_H>8winntJ_eIA5BtU>nWylTMFr7t<nJ)|pa9<Ma>W?i<evOCu%irn
zgP18@{v`F>VD7$%mD3*B$q}5{7zCHyIxQODuWE6kd<;;BpME-+w)H324TzaVt;~(+
zlozo$)eMNDm?5LJxJ&R_Y58WPx;FtSrSdDEZbwXmvX=rzjB&dEJYoxA2LzU2UQAj%
zH?)B+18ACkO|<3E8!arItVWRE9#6lbjBU*L6Fiz~pbY7O%u4C4P`>rOKN?aMw*cg$
zLXqp&hbM56bH3Nn$hAmzl4tKTg~0XL9LMQ?{`H?D_d5qtJ{vFOv(-n_jNe$E=Uh6|
zQJ)y=DdbY{a;o7aq~oNojNc>h*N=*knQ<K_HwH493>uo(*pz!R#r2r^)o?pZjN+_L
z?`xJDD?S<fZuL4k@Yr@PfTAWr3cemARM%1!mUFtq3|pTwuy~*lbooEY1CF*R@MSi;
zU`9B8fZxxiGYxr4l0G$&8C4L~oY$zJY)yi=oq*bJPIuK6*$|z;;iZ&^Lq~t^#V7u=
z?ur~E`Mjs<66n!vrFn;Vo=#rtrbhgirY!*(2t_15-rO7fURyNdm+nX4^`w_JqY$AH
zM;M-Luy%+uf9r3WTilR7mZ;fQq)B1{lDtI9p!%C@%#D+m^e5IHn9?+W6Cm-80o%W<
zq)vN9c&Gti?ao`BDSBG3R;hVf8H0){-+X2N6BC}fSs$KRZkKoY4CprUAdPvgfT!wH
zZ@!U<iLUa_S@n}h{lj4q9Opb>b#aYXP8?N^VE6VAi^CU|qidnpa?$A2EZ`?<q}cfG
z;y|z&m5fC)_CS8c%BS@T>c5rZmoTj_M8Ylq8ljY)!SSK~2X^RfEy>_M53L4+g*1TE
z(oy^;W32`3SYn)T6`6YGz!RUIoMV?~nj8G&4JiRu_X^*MWFcqsVo!y`(Ljf!iH+YT
z)S|t9?v8odX~ckiHGIcuAfYRzZnKm7L?<L9gbIUEovJNL`a7V7TXdk5bczBVcYmlI
z>mIot1{RQvE3PPCTyhKgZkI~7>bMBw&^y4Ih-T&$6-ADd?$k9mWgQC!L^+Vx@5J8)
zf^ZTY`+-sG%#PHj!4VVFOUh3-!N!`7RPeHT=eCPbzAhTa`+4&zxW%j8jDsU1y07)s
zD%R&Ze!6Cl9(n+ZyWdT+rZEgQlR8}9X!IGm*m_7OEc~9lQ|I9{MVcpeN`H;GGf}DD
z?Cvk)8%9N4DVL@!n&5;|7LCzqyCrn#d}yxr+<woZ&$Ftlh~uN>)lF1wS^P#L%!>>U
j&h^#>{l8y7woa+OOf^oLWW5(T2V4ev#-MVYC!zlXA7ycz

literal 0
HcmV?d00001


From aa32ecb9d31fd60c719810748605919c91682bf1 Mon Sep 17 00:00:00 2001
From: Mathieu Geukens <mr-zwets@protonmail.com>
Date: Fri, 31 May 2024 17:29:23 +0200
Subject: [PATCH 114/171] rewrite optimization guide

---
 website/docs/guides/optimization.md | 132 ++++++++++++++++++----------
 website/docs/language/contracts.md  |   2 +-
 2 files changed, 85 insertions(+), 49 deletions(-)

diff --git a/website/docs/guides/optimization.md b/website/docs/guides/optimization.md
index 64ed1813..7b6393eb 100644
--- a/website/docs/guides/optimization.md
+++ b/website/docs/guides/optimization.md
@@ -3,87 +3,123 @@ title: Optimizing Contracts
 sidebar_label: Optimization
 ---
 
-CashScript contracts are transpiled from a solidity syntax to [Bitcoin Script](https://reference.cash/protocol/blockchain/script) by the `cashc` compiler. Bitcoin Script is a lower level language (a list of stack-based operations) where each available operation is mapped to a single byte.
+CashScript contracts are transpiled from a solidity syntax to [BCH Script](https://reference.cash/protocol/blockchain/script) by the `cashc` compiler. BCH Script is a lower level language (a list of stack-based operations) where each available operation is mapped to a single byte.
 
 Depending on the complexity of the contract or system design, it may sometimes be useful to optimize the Bitcoin Script by tweaking the contract in CashScript before it is compiled. Below are some ideas to get started.
 
-## Tricks and tips.
+## Optimization Tips & Tricks
 
-The `cashc` compiler does some optimisations automatically, but by ordering statements in a specific way, the compiler is better able to optimise it. Trial & error is a big part of it, but here's some tricks that may help:
+The `cashc` compiler does some optimisations automatically, but by writing your CashScript code in a specific way, the compiler is better able to optimise it. Trial & error is a definately part of it, but here are some tricks that may help:
 
-1. It's best to "consume" values as soon as possible ("consume" meaning their final use in the contract). This frees up space on the stack.
-2. Use/consume values as close to their declaration as possible, both for variables and for parameters. This avoids having to do deep stack operations. This [example](https://gitlab.com/GeneralProtocols/anyhedge/contracts/-/blob/development/contracts/v0.11/contract.cash#L61-72) from anyhedge illustrates consuming values immediately.
-3. Avoid if-statements if possible, instead try to "inline" them. This is because the compiler cannot know which branches will be taken, and therefore cannot optimise those branches as well. This [example](https://gitlab.com/GeneralProtocols/anyhedge/contracts/-/blob/development/contracts/v0.11/contract.cash#L128-130) from anyhedge illustrates inlining flow control.
+### 1. Consume stack items
 
-## Example Workflow
+It's best to "consume" values as soon as possible ("consume" meaning their final use in the contract). This frees up space on the stack.
+Use/consume values as close to their declaration as possible, both for variables and for parameters. This avoids having to do deep stack operations. This [example](https://gitlab.com/GeneralProtocols/anyhedge/contracts/-/blob/development/contracts/v0.11/contract.cash#L61-72) from anyhedge illustrates consuming values immediately.
+
+### 2. Declare variables
+
+Declare variables when re-using certain common introspection items to avoid duplicate expressions
+
+```solidity title="Example CashScript code"
+    // do this
+    bytes tokenIdContract = tx.inputs[0].tokenCategory.split(32)[0];
+    require(tx.inputs[1].tokenCategory == tokenIdContract);
+    require(tx.outputs[1].tokenCategory == tokenIdContract);
+
+    // not this
+    require(tx.inputs[1].tokenCategory == tx.inputs[0].tokenCategory.split(32)[0]);
+    ...
+    require(tx.inputs[1].tokenCategory == tx.inputs[0].tokenCategory.split(32)[0]);
+```
+
+### 3. Parse efficiently
+When using `.split()` to use both sides of a `bytes` element, declare both parts immediately to save on opcodes aprsing the byte array.
 
-For simplicity and security, the compiler separates the data and logic of the redeem script. All the data used by the redeem script gets pushed to the stack, and the redeem script is then the same regardless of the parameters being used in a particular instance of a contract.
+```solidity title="Example CashScript code"
+    // do this
+    bytes firstPart, bytes secondPart = tx.inputs[0].nftCommitment.split(10);
 
-As an example, below is a simple [hodl](https://github.com/mainnet-pat/hodl_ec_plugin) contract by mainnet-pat:
+    // not this
+    bytes firstPart = tx.inputs[0].nftCommitment.split(10)[0];
+    ...
+    bytes secondPart = tx.inputs[0].nftCommitment.split(10)[1];
+```
+### 4. Avoid if-else
 
+Avoid if-statements if possible, instead try to "inline" them. This is because the compiler cannot know which branches will be taken, and therefore cannot optimise those branches as well. This [example](https://gitlab.com/GeneralProtocols/anyhedge/contracts/-/blob/development/contracts/v0.11/contract.cash#L128-130) from anyhedge illustrates inlining flow control:
 
-```solidity
-// hodl.cash
-pragma cashscript ^0.9.0;
+```solidity title="AnyHedge CashScript code"
+    // do this
+    bool onOrAfterMaturity = settlementTimestamp >= maturityTimestamp;
+    bool priceOutOfBounds = !within(clampedPrice, lowLiquidationPrice + 1, highLiquidationPrice);
+    require(onOrAfterMaturity || priceOutOfBounds);
 
-contract hodl(
-    int locktime,
-    bytes20 pubkeyHash
-) {
-    function spend(pubkey ownerPubkey, sig ownerSig) {
-        require(tx.time >= locktime);
-        require(hash160(ownerPubkey) == pubkeyHash);
-        require(checkSig(ownerSig, ownerPubkey));
+    // not this
+    if(!(settlementTimestamp >= maturityTimestamp)){
+        bool priceOutOfBounds = !within(clampedPrice, lowLiquidationPrice + 1, highLiquidationPrice);
+        require(priceOutOfBounds);
     }
-}
 ```
 
-For the above script, this  `spend` path transpiles to a redeem script of:
+## Modular Contract Design
 
- `<pubkeyHash> <locktime> b1 75 78 a9 88 ac`
+An alternative to optimizing your contract to shrink it in size is to redesign your contract to use a composable architecture so the contract logic is separated out in to multiple componenets which only some of which can be used in a transaction and hence shrink your contract size.
 
-Here the data are pushed first, and the operations corresponding to the bytes in Bitcoin Script have short names as follows:
+### NFT contract functions
 
-| hex     | Operation Code         |
-|---------| ---------------------- |
-| 0xb1    | OP_CHECKLOCKTIMEVERIFY |
-| 0x17    | OP_DROP                |
-| 0x57    | OP_OVER                |
-| 0xa9    | OP_HASH160             |
-| 0x88    | OP_EQUALVERIFY         |
-| 0xac    | OP_CHECKSIG            |
+The concept of having NFT functions was firt introduced by the [Jedex demo](https://github.com/bitjson/jedex#demonstrated-concepts) and was first implemented in a CashScript contract by the [FexCash DEX](https://github.com/fex-cash/fex/blob/main/whitepaper/fex_whitepaper.md). The concept is that by authenticating NFTs you can make each function a separate contract with the same tokenId. This way you can offload logic from the main contract and one function NFT contract attached to the main contract on spending so the other contract functions exist as unused UTXOs separate from the transaction.
 
-In the artifact generated by `cashc`, the redeem script is listed as follows:
+:::tip
+By using function NFTs you can use a modular contract design where the contract functions are offloaded to different UTXOs, each identifiable by the main contract by using the same tokenId.
+:::
+
+## Example Workflow
 
+When trying to optimizing your contract, you will need to compare the contract size to see if the changes have a positive impact.
+You can easily check the opcode count and bytesize with the compiler CLI directly from the contract (without creating a new artifact).
+It's important to know the minimum fees on the Bitcoin Cash network are based on the bytesize of a transaction (including your contract).
 
 ```bash
-cashc hodl.cash | grep bytecode;
+cashc ./contract.cash --opcount --size
 ```
 
-```json
-"bytecode": "OP_CHECKLOCKTIMEVERIFY OP_DROP OP_OVER OP_HASH160 OP_EQUALVERIFY OP_CHECKSIG"
-```
+:::caution
+The size output of the `cashc` compiler will always be an underestimate, as the contract hasn't been initialized with contract arguments.
+:::
 
-As you can see, in this case, the logic to spend time-locked funds and verify the spender takes up six (6) bytes of information.
+The `cashc` compiler only knows the opcount and bytesize of a contract before it is initialised with function arguments. Because of this, to get an accurate view of a contracts size initialise the contract instance first, then get the size from there. This means you will have to re-compile the artifact before checking with contract size through the Javascript SDK.
 
-The simplest workflow to optimize the redeem script of `hodl.cash`, or any contract, would be to compile it directly from the command line with `cashc` then look at the `bytecode` field on the generated artifact to see if there are any unnecessary or duplicative operations.
+```javascript
+import { ElectrumNetworkProvider, Contract, SignatureTemplate } from 'cashscript';
+import { alicePub, bobPriv, bobPub } from './keys.js';
+import { compileFile } from 'cashc';
 
-In this toy example, the redeem script is so small there isn't a lot of need or use in making it smaller. The [anyhedge contracts](https://gitlab.com/GeneralProtocols/anyhedge/contracts/) are again a great example of a more complex progressive optimization over time.
+// compile contract code on the fly
+const artifact = compileFile(new URL('contract.cash', import.meta.url));
 
-## Lastly
+// Initialise a network provider for network operations
+const provider = new ElectrumNetworkProvider('chipnet');
 
+// Instantiate a new TransferWithTimeout contract
+const contractArguments = [alicePub, bobPub, 100000n]
+const options = { provider }
+const contract = new Contract(artifact, contractArguments, options);
 
-There are two important alternative approaches to optimization to consider.
+console.log(contract.opcount);
+console.log(contract.bytesize);
+```
 
-### OP_NOP
+With this workflow you can make changes to the contract and the run the Javascript program to
 
->We should forget about small efficiencies, say about 97% of the time: premature optimization is the root of all evil. Yet we should not pass up our opportunities in that critical 3%.
+ get an accurate measure of how the bytesize of your contract changes with different optimizations.
 
-It's worth considering whether optimizing the redeem script is necessary at all. If the contract is accepted by the network, and there is no glaring inefficiency in the bytecode, perhaps the best optimization is to not to obsess prematurely about things like blocksize.
+## To optimize or not to optimize?
 
-### Hyper Introspect-imization
+There is a last important alternative approache to optimization contract bytecode to consider:
 
-Finally, there have been a number of novel approaches taken since 2009 to approximate higher level functionality with bitcoin's deliberately restricted instruction set. These techniques include using a cumbersome [old covenant style](https://fc16.ifca.ai/bitcoin/papers/MES16.pdf) of storing data, [`OP_CODESEPARATOR`](https://web.archive.org/web/20210507164307/https://mistcoin.org/#appendix-b) to split contracts around an old 520-byte limitation, and hiding redeem paths in "sidecars".
+### OP_NOP
+
+>We should forget about small efficiencies, say about 97% of the time: premature optimization is the root of all evil. Yet we should not pass up our opportunities in that critical 3%.
 
-It's **very** important to be up-to-date on documentation covering introspection, as it greatly simplifies using state and writing more complex contracts. If a contract has been developed from an old example or a pre-introspection design pattern, the fastest way to achieve significant optimization is to utilize the [the latest introspection design patterns](./covenants).
+It's worth considering whether optimizing the redeem script is necessary at all. If the contract is accepted by the network, and there is no glaring inefficiency in the bytecode, perhaps the best optimization is to not to obsess prematurely about things like blocksize.
 
diff --git a/website/docs/language/contracts.md b/website/docs/language/contracts.md
index 8a54a77e..3bf7f56c 100644
--- a/website/docs/language/contracts.md
+++ b/website/docs/language/contracts.md
@@ -14,7 +14,7 @@ The pragma directive follows regular [semantic versioning rules](https://semver.
 #### Example
 ```solidity
 pragma cashscript ^0.9.0;
-pragma cashscript >= 0.4.0 < 0.5.4;
+pragma cashscript >= 0.7.0 < 0.9.3;
 ```
 
 ## Constructor

From 59de8bc05811054c9b5f0d273a8dc2582ccc9225 Mon Sep 17 00:00:00 2001
From: Mathieu Geukens <mr-zwets@protonmail.com>
Date: Fri, 31 May 2024 20:00:21 +0200
Subject: [PATCH 115/171] remove edit button

---
 website/docusaurus.config.js | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/website/docusaurus.config.js b/website/docusaurus.config.js
index 40a02b63..008386f3 100755
--- a/website/docusaurus.config.js
+++ b/website/docusaurus.config.js
@@ -101,11 +101,6 @@ module.exports = {
     [
       '@docusaurus/preset-classic',
       {
-        docs: {
-          sidebarPath: require.resolve('./sidebars.js'),
-          editUrl:
-            'https://github.com/Bitcoin-com/cashscript/edit/master/website/',
-        },
         theme: {
           customCss: require.resolve('./src/css/custom.css'),
         },

From 0602d05a0ceb6fe5c328f643c77a2d9952b0fb52 Mon Sep 17 00:00:00 2001
From: Mathieu Geukens <mr-zwets@protonmail.com>
Date: Fri, 31 May 2024 20:01:57 +0200
Subject: [PATCH 116/171] change github links docs

---
 packages/cashc/README.md               | 2 +-
 packages/cashscript/README.md          | 2 +-
 website/docs/basics/getting-started.md | 2 +-
 website/docs/language/examples.md      | 2 +-
 website/docs/releases/release-notes.md | 2 +-
 website/docs/sdk/examples.md           | 2 +-
 website/docusaurus.config.js           | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/cashc/README.md b/packages/cashc/README.md
index 6f6165c7..bd336afc 100644
--- a/packages/cashc/README.md
+++ b/packages/cashc/README.md
@@ -8,7 +8,7 @@
 
 CashScript is a high-level programming language for smart contracts on Bitcoin Cash. It offers a strong abstraction layer over Bitcoin Cash' native virtual machine, Bitcoin Script. Its syntax is based on Ethereum's smart contract language Solidity, but its functionality is very different since smart contracts on Bitcoin Cash differ greatly from smart contracts on Ethereum. For a detailed comparison of them, refer to the blog post [*Smart Contracts on Ethereum, Bitcoin and Bitcoin Cash*](https://kalis.me/smart-contracts-eth-btc-bch/).
 
-See the [GitHub repository](https://github.com/Bitcoin-com/cashscript) and the [CashScript website](https://cashscript.org) for full documentation and usage examples.
+See the [GitHub repository](https://github.com/CashScript/cashscript) and the [CashScript website](https://cashscript.org) for full documentation and usage examples.
 
 ## The CashScript Language
 CashScript is a high-level language that allows you to write Bitcoin Cash smart contracts in a straightforward and familiar way. Its syntax is inspired by Ethereum's Solidity language, but its functionality is different since the underlying systems have very different fundamentals. See the [language documentation](https://cashscript.org/docs/language/) for a full reference of the language.
diff --git a/packages/cashscript/README.md b/packages/cashscript/README.md
index 7226c6fa..ba38a3a6 100644
--- a/packages/cashscript/README.md
+++ b/packages/cashscript/README.md
@@ -8,7 +8,7 @@
 
 CashScript is a high-level programming language for smart contracts on Bitcoin Cash. It offers a strong abstraction layer over Bitcoin Cash' native virtual machine, Bitcoin Script. Its syntax is based on Ethereum's smart contract language Solidity, but its functionality is very different since smart contracts on Bitcoin Cash differ greatly from smart contracts on Ethereum. For a detailed comparison of them, refer to the blog post [*Smart Contracts on Ethereum, Bitcoin and Bitcoin Cash*](https://kalis.me/smart-contracts-eth-btc-bch/).
 
-See the [GitHub repository](https://github.com/Bitcoin-com/cashscript) and the [CashScript website](https://cashscript.org) for full documentation and usage examples.
+See the [GitHub repository](https://github.com/CashScript/cashscript) and the [CashScript website](https://cashscript.org) for full documentation and usage examples.
 
 ## The CashScript Language
 CashScript is a high-level language that allows you to write Bitcoin Cash smart contracts in a straightforward and familiar way. Its syntax is inspired by Ethereum's Solidity language, but its functionality is different since the underlying systems have very different fundamentals. See the [language documentation](https://cashscript.org/docs/language/) for a full reference of the language.
diff --git a/website/docs/basics/getting-started.md b/website/docs/basics/getting-started.md
index 02ab6c70..d51116f4 100644
--- a/website/docs/basics/getting-started.md
+++ b/website/docs/basics/getting-started.md
@@ -62,7 +62,7 @@ contract TransferWithTimeout(pubkey sender, pubkey recipient, int timeout) {
 ```
 
 :::tip
-There are some other examples available on the [Examples page](/docs/language/examples), that can be used to take inspiration from. Further examples of the JavaScript integration can be found on [GitHub](https://github.com/Bitcoin-com/cashscript/tree/master/examples).
+There are some other examples available on the [Examples page](/docs/language/examples), that can be used to take inspiration from. Further examples of the JavaScript integration can be found on [GitHub](https://github.com/CashScript/cashscript/tree/master/examples).
 :::
 
 ### Compiling your smart contract
diff --git a/website/docs/language/examples.md b/website/docs/language/examples.md
index 32821f39..5e4f51c7 100644
--- a/website/docs/language/examples.md
+++ b/website/docs/language/examples.md
@@ -2,7 +2,7 @@
 title: Examples
 ---
 
-An extensive collection of examples is available in the [GitHub repository](https://github.com/Bitcoin-com/cashscript/tree/master/examples). Below we discuss a few of these examples in more details and go through the functionality.
+An extensive collection of examples is available in the [GitHub repository](https://github.com/CashScript/cashscript/tree/master/examples). Below we discuss a few of these examples in more details and go through the functionality.
 
 ## Transfer With Timeout
 One interesting use case of Bitcoin Cash is using it for *paper tips*. With paper tips, you send a small amount of money to an address, and print the corresponding private key on a piece of paper. Then you can hand out these pieces of paper as a tip or gift to people in person. In practice, however, people might not know what to do with these gifts or they might lose or forget about it.
diff --git a/website/docs/releases/release-notes.md b/website/docs/releases/release-notes.md
index 8a7960aa..d7d59175 100644
--- a/website/docs/releases/release-notes.md
+++ b/website/docs/releases/release-notes.md
@@ -167,7 +167,7 @@ https://twitter.com/RoscoKalis/status/1529072055756414976
 * :bug: The final statement in a contract now MUST be a require statement (in all branches)
 * :bug: Empty contracts and functions are now considered invalid
 * :bug: Fix bug where certain covenants could become unspendable due to incorrect bytesize calculation
-  * :boom: **BREAKING**: Covenants using `tx.bytecode` now include a placeholder `OP_NOP` that gets replaced when constructor arguments are provided in the CashScript SDK. If you're not using the CashScript SDK, refer to the [`replaceBytecodeNop()` function](https://github.com/Bitcoin-com/cashscript/blob/master/packages/utils/src/script.ts#L130) to see the steps required to do so manually.
+  * :boom: **BREAKING**: Covenants using `tx.bytecode` now include a placeholder `OP_NOP` that gets replaced when constructor arguments are provided in the CashScript SDK. If you're not using the CashScript SDK, refer to the [`replaceBytecodeNop()` function](https://github.com/CashScript/cashscript/blob/master/packages/utils/src/script.ts#L130) to see the steps required to do so manually.
 * :boom: **BREAKING**: Remove `--args` parameter from the CLI, since this is too error prone with the recent changes in mind
 * :boom: **BREAKING**: Restructure exports
 
diff --git a/website/docs/sdk/examples.md b/website/docs/sdk/examples.md
index e856c200..a9534d72 100644
--- a/website/docs/sdk/examples.md
+++ b/website/docs/sdk/examples.md
@@ -131,4 +131,4 @@ console.log(txDetails);
 [bchjs]: https://bchjs.fullstack.cash/
 [bitcore]: https://github.com/bitpay/bitcore/tree/master/packages/bitcore-lib-cash
 [libauth]: https://libauth.org/
-[github-examples]: https://github.com/Bitcoin-com/cashscript/tree/master/examples
+[github-examples]: https://github.com/CashScript/cashscript/tree/master/examples
diff --git a/website/docusaurus.config.js b/website/docusaurus.config.js
index 008386f3..ffe5c2f8 100755
--- a/website/docusaurus.config.js
+++ b/website/docusaurus.config.js
@@ -26,7 +26,7 @@ module.exports = {
           position: 'right',
         },
         {
-          href: 'https://github.com/Bitcoin-com/cashscript',
+          href: 'https://github.com/CashScript/cashscript',
           label: 'GitHub',
           position: 'right',
         },

From bd0f8a2be71519be6efba4559e8dc3a66181be7a Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Tue, 11 Jun 2024 11:09:59 +0200
Subject: [PATCH 117/171] Fix require message handling edge case bug

- Add +1/-1 in several places to fix off-by-one errors
- Document / comment all said +1/-1s so it's clear WHY we have them
- Extract getFinalExecutedVerifyIp in separate function
- Add 2 additional test cases
---
 .../src/generation/GenerateTargetTraversal.ts | 22 +++++---
 packages/cashscript/src/debugging.ts          | 56 +++++++++++++++----
 packages/cashscript/test/debugging.test.ts    | 55 ++++++++++++++++--
 3 files changed, 110 insertions(+), 23 deletions(-)

diff --git a/packages/cashc/src/generation/GenerateTargetTraversal.ts b/packages/cashc/src/generation/GenerateTargetTraversal.ts
index 7513b291..94d33078 100644
--- a/packages/cashc/src/generation/GenerateTargetTraversal.ts
+++ b/packages/cashc/src/generation/GenerateTargetTraversal.ts
@@ -108,9 +108,9 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
     return index;
   }
 
-  private getCurrentInstructionPointer(): number {
-    // instruction pointer is the count of emitted opcodes + number of constructor data pushes
-    return this.output.length + this.constructorParameterCount;
+  private getMostRecentInstructionPointer(): number {
+    // instruction pointer is the count of emitted opcodes + number of constructor data pushes (minus 1 for 0-indexing)
+    return this.output.length + this.constructorParameterCount - 1;
   }
 
   visitSourceFile(node: SourceFileNode): Node {
@@ -126,7 +126,10 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
 
   visitContract(node: ContractNode): Node {
     node.parameters = this.visitList(node.parameters) as ParameterNode[];
+
+    // Keep track of constructor parameter count for instructor pointer calculation
     this.constructorParameterCount = node.parameters.length;
+
     if (node.functions.length === 1) {
       node.functions = this.visitList(node.functions) as FunctionDefinitionNode[];
     } else {
@@ -178,13 +181,13 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
     node.parameters = this.visitList(node.parameters) as ParameterNode[];
     node.body = this.visit(node.body) as BlockNode;
 
-    this.removeFinalVerify(node.body);
+    this.removeFinalVerifyFromFunction(node.body);
     this.cleanStack(node.body);
 
     return node;
   }
 
-  removeFinalVerify(functionBodyNode: Node): void {
+  removeFinalVerifyFromFunction(functionBodyNode: Node): void {
     // After EnsureFinalRequireTraversal, we know that the final opcodes are either
     // "OP_VERIFY", "OP_CHECK{LOCKTIME|SEQUENCE}VERIFY OP_DROP" or "OP_ENDIF"
 
@@ -204,6 +207,7 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
       // At this point there is no verification value left on the stack:
       //  - scoped stack is cleared inside branch ended by OP_ENDIF
       //  - OP_CHECK{LOCKTIME|SEQUENCE}VERIFY OP_DROP does not leave a verification value
+      //  - OP_VERIFY does not leave a verification value
       // so we add OP_1 to the script (indicating success)
       this.emit(Op.OP_1, { location: functionBodyNode.location, positionHint: PositionHint.END });
       this.pushToStack('(value)');
@@ -280,7 +284,7 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
       this.requireMessages.push({
         // We're removing 1 from the IP because the error message needs to match the OP_XXX_VERIFY, not the OP_DROP that
         // is emitted directly after
-        ip: this.getCurrentInstructionPointer() - 1,
+        ip: this.getMostRecentInstructionPointer() - 1,
         line: node.location.start.line,
         message: node.message,
       });
@@ -300,7 +304,7 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
     // TODO: We don't even have to display the Libauth message if we just say "this and this require failed"
     if (node.message) {
       this.requireMessages.push({
-        ip: this.getCurrentInstructionPointer(),
+        ip: this.getMostRecentInstructionPointer(),
         line: node.location.start.line,
         message: node.message,
       });
@@ -311,7 +315,9 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
   }
 
   visitConsoleStatement(node: ConsoleStatementNode): Node {
-    const ip = this.getCurrentInstructionPointer();
+    // We add a plus 1 to the most recent instruction pointer, because we want to log the state
+    // of the stack *after* the most recent instruction has been executed
+    const ip = this.getMostRecentInstructionPointer() + 1;
     const { line } = node.location.start;
 
     const data = node.parameters.map((parameter: ConsoleParameterNode) => {
diff --git a/packages/cashscript/src/debugging.ts b/packages/cashscript/src/debugging.ts
index 62ce9c86..b900afd7 100644
--- a/packages/cashscript/src/debugging.ts
+++ b/packages/cashscript/src/debugging.ts
@@ -1,5 +1,5 @@
-import { AuthenticationErrorCommon, AuthenticationInstruction, AuthenticationProgramCommon, AuthenticationProgramStateBCH, AuthenticationProgramStateCommon, AuthenticationVirtualMachine, ResolvedTransactionCommon, WalletTemplate, binToHex, createCompiler, createVirtualMachineBCH2023, walletTemplateToCompilerConfiguration } from '@bitauth/libauth';
-import { Artifact, LogData, LogEntry, Op, PrimitiveType, decodeBool, decodeInt, decodeString } from '@cashscript/utils';
+import { AuthenticationErrorCommon, AuthenticationInstruction, AuthenticationProgramCommon, AuthenticationProgramStateBCH, AuthenticationProgramStateCommon, AuthenticationVirtualMachine, ResolvedTransactionCommon, WalletTemplate, binToHex, createCompiler, createVirtualMachineBCH2023, encodeAuthenticationInstruction, walletTemplateToCompilerConfiguration } from '@bitauth/libauth';
+import { Artifact, LogData, LogEntry, Op, PrimitiveType, bytecodeToAsm, decodeBool, decodeInt, decodeString } from '@cashscript/utils';
 import { findLastIndex, toRegExp } from './utils.js';
 
 // evaluates the fully defined template, throws upon error
@@ -43,8 +43,16 @@ export const debugTemplate = (template: WalletTemplate, artifact: Artifact): Deb
 
   // If an error is present in the last step, that means a require statement in the middle of the function failed
   if (lastExecutedDebugStep.error) {
+    // In Libauth any thrown error gets registered in the instruction that happens right *after* the instruction that
+    // caused the error (in other words the OP_VERIFY). We need to decrement the instruction pointer to get the correct
+    // failing instruction.
+    const failingIp = lastExecutedDebugStep.ip - 1;
+
+    // Generally speaking, an error is thrown by the OP_VERIFY opcode, but for NULLFAIL, the error is thrown in the
+    // preceding OP_CHECKSIG opcode. The error message is registered in the next instruction, so we need to increment
+    // the instruction pointer to get the correct error message.
     const isNullFail = lastExecutedDebugStep.error === AuthenticationErrorCommon.nonNullSignatureFailure;
-    const messageIp = lastExecutedDebugStep.ip + (isNullFail ? 1 : 0);
+    const messageIp = failingIp + (isNullFail ? 1 : 0);
 
     const requireStatement = (artifact.debug?.requireMessages ?? [])
       .find((message) => message.ip === messageIp);
@@ -62,13 +70,13 @@ export const debugTemplate = (template: WalletTemplate, artifact: Artifact): Deb
     const stackContents = lastExecutedDebugStep.stack.map(item => `0x${binToHex(item)}`).join(', ');
     const stackContentsMessage = `\nStack contents after evaluation: ${lastExecutedDebugStep.stack.length ? stackContents : 'empty'}`;
 
-    const executedInstructions = lastExecutedDebugStep.instructions
-      .filter((_, i) => executedDebugSteps.map((step) => step.ip).includes(i));
+    const finalExecutedVerifyIp = getFinalExecutedVerifyIp(executedDebugSteps);
 
-    const cleanupSize = calculateCleanupSize(executedInstructions);
-    const finalExecutedVerify = executedDebugSteps[executedDebugSteps.length - cleanupSize - 1];
+    // logDebugSteps(executedDebugSteps, lastExecutedDebugStep.instructions);
+    // console.warn('message', finalExecutedVerifyIp);
+    // console.warn(artifact.debug?.requireMessages);
 
-    const finalVerifyMessage = artifact.debug?.requireMessages.find((message) => message.ip === finalExecutedVerify.ip);
+    const finalVerifyMessage = artifact.debug?.requireMessages.find((message) => message.ip === finalExecutedVerifyIp);
 
     if (finalVerifyMessage) {
       throw new Error(`${artifact.contractName}.cash:${finalVerifyMessage.line} Error in evaluating input index ${lastExecutedDebugStep.program.inputIndex} with the following message: ${finalVerifyMessage.message}.\n${evaluationResult.replace(/Error in evaluating input index \d: /, '')}` + stackContentsMessage);
@@ -152,14 +160,16 @@ const failedFinalVerify = (evaluationResult: string | true): evaluationResult is
   ]).test(evaluationResult);
 };
 
-const calculateCleanupSize = (instructions: AuthenticationInstruction[]): number => {
+const calculateCleanupSize = (instructions: Array<AuthenticationInstruction | undefined>): number => {
   // OP_NIP is used for cleanup at the end of a function, OP_ENDIF and OP_ELSE are the end of branches
   // We need to remove all of these to get to the actual last executed instruction of a function
   const cleanupOpcodes = [Op.OP_ENDIF, Op.OP_NIP, Op.OP_ELSE];
 
   let cleanupSize = 0;
   for (const instruction of [...instructions].reverse()) {
-    if (cleanupOpcodes.includes(instruction.opcode)) {
+    // The instructions array may contain undefined elements for the final executed debug steps that are not
+    // technically instructions (e.g. the final *implicit* verify). We still want to get rid of these in the cleanup
+    if (!instruction || cleanupOpcodes.includes(instruction.opcode)) {
       cleanupSize++;
     } else {
       break;
@@ -168,3 +178,29 @@ const calculateCleanupSize = (instructions: AuthenticationInstruction[]): number
 
   return cleanupSize;
 };
+
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const logDebugSteps = (
+  debugSteps: AuthenticationProgramStateCommon[],
+  instructions: AuthenticationInstruction[],
+): void => {
+  debugSteps.map((step) => {
+    const opcode = instructions[step.ip] ? bytecodeToAsm(encodeAuthenticationInstruction(instructions[step.ip])) : 'null';
+    console.warn(step.ip, opcode, step.stack, step.error);
+  });
+};
+
+const getFinalExecutedVerifyIp = (executedDebugSteps: AuthenticationProgramStateCommon[]): number => {
+  // Map every executed debug step to its corresponding instruction
+  // (note that the last executed step(s) may not have a corresponding instruction and will be `undefined`)
+  const executedInstructions = executedDebugSteps.map((step) => step.instructions[step.ip]);
+
+  const finalExecutedDebugStepIndex = executedDebugSteps.length - 1;
+  const cleanupSize = calculateCleanupSize(executedInstructions);
+  const finalExecutedNonCleanupStep = executedDebugSteps[finalExecutedDebugStepIndex - cleanupSize];
+
+  // The final verify in a function is dropped, so after cleanup, we get the final OP that was executed *before* the
+  // final verify, so we need to add one to get the actual final verify instruction
+  const finalExecutedVerifyIp = finalExecutedNonCleanupStep.ip + 1;
+  return finalExecutedVerifyIp;
+};
diff --git a/packages/cashscript/test/debugging.test.ts b/packages/cashscript/test/debugging.test.ts
index 2c7a3e0e..180a3b7b 100644
--- a/packages/cashscript/test/debugging.test.ts
+++ b/packages/cashscript/test/debugging.test.ts
@@ -27,19 +27,16 @@ contract Test() {
     require(1 == 1, "1 should equal 1");
   }
 
-  // TODO: Add test for this
   function test_multiple_require_statements() {
     require(1 == 2, "1 should equal 2");
     require(1 == 1, "1 should equal 1");
   }
 
-  // TODO: Add test for this
   function test_multiple_require_statements_final_fails() {
     require(1 == 1, "1 should equal 1");
     require(1 == 2, "1 should equal 2");
   }
 
-  // TODO: Add test for this
   function test_multiple_require_statements_no_message_final() {
     require(1 == 1, "1 should equal 1");
     require(1 == 2);
@@ -78,6 +75,11 @@ contract Test() {
 
   function test_fail_checksig(sig s, pubkey pk) {
     require(checkSig(s, pk), "Signatures do not match");
+    require(1 == 2, "1 should equal 2");
+  }
+
+  function test_fail_checksig_final_verify(sig s, pubkey pk) {
+    require(checkSig(s, pk), "Signatures do not match");
   }
 
   function test_fail_checkdatasig(datasig s, bytes message, pubkey pk) {
@@ -97,6 +99,29 @@ contract Test() {
   }
 }`;
 
+const CONTRACT_CODE3 = `
+contract Test() {
+  // We test this because the cleanup looks different and the final OP_VERIFY isn't removed for these kinds of functions
+  function test_fail_large_cleanup() {
+    int a = 1;
+    int b = 2;
+    int c = 3;
+    int d = 4;
+    int e = 5;
+    int f = 6;
+    int g = 7;
+    int h = 8;
+
+    // Use all variables inside this if-statement so they do not get OP_ROLL'ed
+    if (1 == 2) {
+      require(a + b + c + d + e + f + g + h == 1, "sum should equal 36");
+    }
+
+    require(1 == 2, "1 should equal 2");
+  }
+}
+`;
+
 describe('Debugging tests', () => {
   describe('console.log statements', () => {
     const BASE_CONTRACT_CODE = `
@@ -281,6 +306,7 @@ describe('Debugging tests', () => {
   describe('require statements', () => {
     const artifact = compileString(CONTRACT_CODE);
     const artifact2 = compileString(CONTRACT_CODE2);
+    const artifact3 = compileString(CONTRACT_CODE3);
     const provider = new MockNetworkProvider();
 
     // test_require
@@ -303,7 +329,7 @@ describe('Debugging tests', () => {
       await expect(transaction).toFailRequireWith(/should have 1 output/);
     });
 
-    // // test_multiple_require_statements
+    // test_multiple_require_statements
     it('it should only fail with correct error message when there are multiple require statements', async () => {
       const contract = new Contract(artifact, [], { provider });
       provider.addUtxo(contract.address, randomUtxo());
@@ -313,7 +339,7 @@ describe('Debugging tests', () => {
       await expect(transaction).not.toFailRequireWith(/1 should equal 1/);
     });
 
-    // // test_multiple_require_statements_final_fails
+    // test_multiple_require_statements_final_fails
     it('it should only fail with correct error message when there are multiple require statements where the final statement fails', async () => {
       const contract = new Contract(artifact, [], { provider });
       provider.addUtxo(contract.address, randomUtxo());
@@ -398,6 +424,16 @@ describe('Debugging tests', () => {
       // await expect(checkSigTransactionNullSignature).toFailRequireWith(/Signatures do not match/);
     });
 
+    // test_fail_checksig_final_verify
+    it('should fail with correct error message when checkSig fails as the final verify', async () => {
+      const contract = new Contract(artifact, [], { provider });
+      provider.addUtxo(contract.address, randomUtxo());
+
+      const checkSigTransaction = contract.functions
+        .test_fail_checksig_final_verify(new SignatureTemplate(alicePriv), bobPub).to(contract.address, 1000n);
+      await expect(checkSigTransaction).toFailRequireWith(/Signatures do not match/);
+    });
+
     // test_fail_checkdatasig
     it('should fail with correct error message when checkDataSig fails', async () => {
       const contract = new Contract(artifact, [], { provider });
@@ -430,6 +466,15 @@ describe('Debugging tests', () => {
         .to(contract.address, 1000n);
       await expect(checkmultiSigTransaction).toFailRequireWith(/Multi Signatures do not match/);
     });
+
+    // test_fail_large_cleanup
+    it('should fail with correct error message when a require statement fails in a function with a large cleanup', async () => {
+      const contract = new Contract(artifact3, [], { provider });
+      provider.addUtxo(contract.address, randomUtxo());
+
+      const transaction = contract.functions.test_fail_large_cleanup().to(contract.address, 1000n);
+      await expect(transaction).toFailRequireWith(/1 should equal 2/);
+    });
   });
 
   describe('JestExtensions', () => {

From 619eaf847843c7c9526155d5d4b875366a1db184 Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Tue, 11 Jun 2024 11:12:56 +0200
Subject: [PATCH 118/171] Document 'quick rebuild' command

---
 DEVELOPMENT.md | 6 +++++-
 package.json   | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
index cb7aed62..cf94c0aa 100644
--- a/DEVELOPMENT.md
+++ b/DEVELOPMENT.md
@@ -1,6 +1,10 @@
 We use yarn workspaces + lerna for monorepo management. So to get started, clone this repository and run `yarn` in the root directory to install all dependencies for all packages.
 
-When updating code in one package, you can run `yarn build` in the root directory to build all packages so the changes get propagated to the other packages as well.
+When updating code in one package, you can run `yarn build` in the root directory to build all packages so the changes get propagated to the other packages as well. If you're already in a package directory, you can run the following command to do so:
+
+```bash
+pushd ../.. && yarn build && popd
+```
 
 ### Publishing a release
 
diff --git a/package.json b/package.json
index d142a139..21549009 100644
--- a/package.json
+++ b/package.json
@@ -35,10 +35,10 @@
     "cashproof": "python3 node_modules/cashproof/run.py",
     "examples": "tsx examples/p2pkh.ts && tsx examples/transfer_with_timeout.ts && tsx examples/hodl_vault.ts",
     "coverage": "codecov",
-    "postinstall": "lerna bootstrap && lerna run build --ignore cashscript-examples --ignore testing-suite",
+    "postinstall": "lerna bootstrap && yarn build",
     "spellcheck": "cspell lint '**' --no-progress --must-find-files",
     "update-version": "tsx update-version.ts",
     "publish-all": "lerna publish from-package",
-    "build": "lerna run build"
+    "build": "lerna run build --ignore cashscript-examples --ignore testing-suite"
   }
 }

From a5edbf7a0bf5c5e59d8de248b597c4b51286a54e Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Tue, 11 Jun 2024 11:55:51 +0200
Subject: [PATCH 119/171] Add failing test for console.log bytecode
 preservation

---
 .../cashc/test/debugging/debugging.test.ts     | 18 ++++++++++++++++++
 packages/cashc/test/debugging/fixtures.ts      | 11 +++++++++++
 .../test/valid-contract-files/p2pkh-logs.cash  |  7 +++++++
 3 files changed, 36 insertions(+)
 create mode 100644 packages/cashc/test/debugging/debugging.test.ts
 create mode 100644 packages/cashc/test/debugging/fixtures.ts
 create mode 100644 packages/cashc/test/valid-contract-files/p2pkh-logs.cash

diff --git a/packages/cashc/test/debugging/debugging.test.ts b/packages/cashc/test/debugging/debugging.test.ts
new file mode 100644
index 00000000..dc392022
--- /dev/null
+++ b/packages/cashc/test/debugging/debugging.test.ts
@@ -0,0 +1,18 @@
+/*   debugging.test.ts
+ *
+ * - This file is used to test the debugging functionality (console.log and require messages)
+ */
+
+import { URL } from 'url';
+import { compileFile } from '../../src/index.js';
+import { fixtures } from './fixtures.js';
+
+describe('Debugging', () => {
+  fixtures.forEach((fixture) => {
+    it(`should compile ${fixture.fn} to the same bytecode as ${fixture.fnWithLogs}`, () => {
+      const artifact = compileFile(new URL(`../valid-contract-files/${fixture.fn}`, import.meta.url));
+      const artifactWithLogs = compileFile(new URL(`../valid-contract-files/${fixture.fnWithLogs}`, import.meta.url));
+      expect(artifactWithLogs.bytecode).toEqual(artifact.bytecode);
+    });
+  });
+});
diff --git a/packages/cashc/test/debugging/fixtures.ts b/packages/cashc/test/debugging/fixtures.ts
new file mode 100644
index 00000000..e2f371fe
--- /dev/null
+++ b/packages/cashc/test/debugging/fixtures.ts
@@ -0,0 +1,11 @@
+interface Fixture {
+  fn: string,
+  fnWithLogs: string,
+}
+
+export const fixtures: Fixture[] = [
+  {
+    fn: 'p2pkh.cash',
+    fnWithLogs: 'p2pkh-logs.cash',
+  },
+];
diff --git a/packages/cashc/test/valid-contract-files/p2pkh-logs.cash b/packages/cashc/test/valid-contract-files/p2pkh-logs.cash
new file mode 100644
index 00000000..fa6f2765
--- /dev/null
+++ b/packages/cashc/test/valid-contract-files/p2pkh-logs.cash
@@ -0,0 +1,7 @@
+contract P2PKH(bytes20 pkh) {
+    function spend(pubkey pk, sig s) {
+        require(hash160(pk) == pkh);
+        console.log(pk, pkh, s);
+        require(checkSig(s, pk));
+    }
+}

From aa4012f93aac831c84dbe1088e754a92d0600485 Mon Sep 17 00:00:00 2001
From: Mathieu Geukens <mr-zwets@protonmail.com>
Date: Thu, 13 Jun 2024 21:00:29 +0200
Subject: [PATCH 120/171] add error message incorrect number function arguments
 to createUnlocker, improve same error message in createFunction and error
 message number constructor args

---
 packages/cashscript/src/Contract.ts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/cashscript/src/Contract.ts b/packages/cashscript/src/Contract.ts
index 1efefc13..c6123abc 100644
--- a/packages/cashscript/src/Contract.ts
+++ b/packages/cashscript/src/Contract.ts
@@ -53,7 +53,7 @@ export class Contract {
     }
 
     if (artifact.constructorInputs.length !== constructorArgs.length) {
-      throw new Error(`Incorrect number of arguments passed to ${artifact.contractName} constructor`);
+      throw new Error(`Incorrect number of arguments passed to ${artifact.contractName} constructor. Expected ${artifact.constructorInputs.length} arguments (${artifact.constructorInputs.map(input => input.type)}) but got ${constructorArgs.length}`);
     }
 
     // Encode arguments (this also performs type checking)
@@ -105,7 +105,7 @@ export class Contract {
   private createFunction(abiFunction: AbiFunction, selector?: number): ContractFunction {
     return (...args: Argument[]) => {
       if (abiFunction.inputs.length !== args.length) {
-        throw new Error(`Incorrect number of arguments passed to function ${abiFunction.name}`);
+        throw new Error(`Incorrect number of arguments passed to function ${abiFunction.name}. Expected ${abiFunction.inputs.length} arguments (${abiFunction.inputs.map(input => input.type)}) but got ${args.length}`);
       }
 
       // Encode passed args (this also performs type checking)
@@ -125,6 +125,10 @@ export class Contract {
 
   private createUnlocker(abiFunction: AbiFunction, selector?: number): ContractUnlocker {
     return (...args: Argument[]) => {
+      if (abiFunction.inputs.length !== args.length) {
+        throw new Error(`Incorrect number of arguments passed to function ${abiFunction.name}. Expected ${abiFunction.inputs.length} arguments (${abiFunction.inputs.map(input => input.type)}) but got ${args.length}`);
+      }
+
       const bytecode = scriptToBytecode(this.redeemScript);
 
       const encodedArgs = args

From a510aafe699afe01e7483bcd953b46e969df411d Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Tue, 18 Jun 2024 11:23:01 +0200
Subject: [PATCH 121/171] Fix console.log bugs

- console.log statements no longer count as statements for "final
  verify" check
- console.log statements no longer change the production bytecode
- add additional fixtures and update tests for these two changes
---
 .../src/generation/GenerateTargetTraversal.ts | 31 ++++++++++++++---
 .../semantic/EnsureFinalRequireTraversal.ts   |  4 ++-
 .../src/semantic/SymbolTableTraversal.ts      | 18 ++++++++--
 packages/cashc/test/debugging/fixtures.ts     |  8 +++++
 packages/cashc/test/generation/fixtures.ts    |  6 ++--
 .../deeply_nested-logs.cash                   | 33 +++++++++++++++++++
 .../if_statement_number_units-logs.cash       | 13 ++++++++
 packages/cashscript/src/debugging.ts          | 20 ++++++-----
 packages/cashscript/test/debugging.test.ts    | 15 +++++++--
 packages/utils/src/artifact.ts                |  1 +
 10 files changed, 128 insertions(+), 21 deletions(-)
 create mode 100644 packages/cashc/test/valid-contract-files/deeply_nested-logs.cash
 create mode 100644 packages/cashc/test/valid-contract-files/if_statement_number_units-logs.cash

diff --git a/packages/cashc/src/generation/GenerateTargetTraversal.ts b/packages/cashc/src/generation/GenerateTargetTraversal.ts
index 94d33078..b6566a4d 100644
--- a/packages/cashc/src/generation/GenerateTargetTraversal.ts
+++ b/packages/cashc/src/generation/GenerateTargetTraversal.ts
@@ -16,6 +16,7 @@ import {
   RequireMessage,
   PositionHint,
   SingleLocationData,
+  StackItem,
 } from '@cashscript/utils';
 import {
   ContractNode,
@@ -65,6 +66,7 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
   stack: string[] = [];
   consoleLogs: LogEntry[] = [];
   requireMessages: RequireMessage[] = [];
+  finalStackUsage: Record<string, StackItem> = {};
 
   private scopeDepth = 0;
   private currentFunction: FunctionDefinitionNode;
@@ -102,9 +104,13 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
     this.stack.splice(1, 1);
   }
 
-  private getStackIndex(value: string): number {
+  private getStackIndex(value: string, canBeUndefined?: boolean): number {
     const index = this.stack.indexOf(value);
-    if (index === -1) throw new Error(); // Should not happen
+
+    if (index === -1 && !canBeUndefined) {
+      throw new Error(`Expected variable '${value}' does not exist on the stack`);
+    }
+
     return index;
   }
 
@@ -323,9 +329,19 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
     const data = node.parameters.map((parameter: ConsoleParameterNode) => {
       if (parameter instanceof IdentifierNode) {
         const symbol = parameter.definition!;
-        const stackIndex = this.getStackIndex(parameter.name);
+        const stackIndex = this.getStackIndex(parameter.name, true);
+
+        // If the variable is not on the stack, then we add the final stack usage to the console log
+        if (stackIndex === -1) {
+          if (!this.finalStackUsage[parameter.name]) {
+            throw new Error(`Expected variable '${parameter.name}' does not exist on the stack or in final stack usage`);
+          }
+          return this.finalStackUsage[parameter.name];
+        }
+
+        // If the variable is on the stack, we add the stack index and type to the console log
         const type = typeof symbol.type === 'string' ? symbol.type : symbol.toString();
-        return { stackIndex, type };
+        return { stackIndex, type, ip };
       }
 
       return parameter.toString();
@@ -559,6 +575,13 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
     // If the final use is inside an if-statement, we still OP_PICK it
     // We do this so that there's no difference in stack depths between execution paths
     if (this.isOpRoll(node)) {
+      const symbol = node.definition!;
+      this.finalStackUsage[node.name] = {
+        type:  typeof symbol.type === 'string' ? symbol.type : symbol.toString(),
+        stackIndex,
+        ip: this.getMostRecentInstructionPointer(),
+      };
+
       this.emit(Op.OP_ROLL, { location: node.location });
       this.removeFromStack(stackIndex);
     } else {
diff --git a/packages/cashc/src/semantic/EnsureFinalRequireTraversal.ts b/packages/cashc/src/semantic/EnsureFinalRequireTraversal.ts
index b484d795..52f29685 100644
--- a/packages/cashc/src/semantic/EnsureFinalRequireTraversal.ts
+++ b/packages/cashc/src/semantic/EnsureFinalRequireTraversal.ts
@@ -6,6 +6,7 @@ import {
   StatementNode,
   TimeOpNode,
   BranchNode,
+  ConsoleStatementNode,
 } from '../ast/AST.js';
 import AstTraversal from '../ast/AstTraversal.js';
 import { EmptyContractError, EmptyFunctionError, FinalRequireStatementError } from '../Errors.js';
@@ -37,7 +38,8 @@ export default class EnsureFinalRequireTraversal extends AstTraversal {
 }
 
 function ensureFinalStatementIsRequire(statements: StatementNode[] = []): void {
-  const finalStatement = statements[statements.length - 1];
+  const statementsWithoutLogs = statements.filter((statement) => !(statement instanceof ConsoleStatementNode));
+  const finalStatement = statementsWithoutLogs[statements.length - 1];
 
   if (!finalStatement) return;
 
diff --git a/packages/cashc/src/semantic/SymbolTableTraversal.ts b/packages/cashc/src/semantic/SymbolTableTraversal.ts
index 3e7f2e92..0fd0601e 100644
--- a/packages/cashc/src/semantic/SymbolTableTraversal.ts
+++ b/packages/cashc/src/semantic/SymbolTableTraversal.ts
@@ -12,6 +12,8 @@ import {
   InstantiationNode,
   AssignNode,
   TupleAssignmentNode,
+  ConsoleStatementNode,
+  ConsoleParameterNode,
 } from '../ast/AST.js';
 import AstTraversal from '../ast/AstTraversal.js';
 import { SymbolTable, Symbol, SymbolType } from '../ast/SymbolTable.js';
@@ -29,6 +31,7 @@ export default class SymbolTableTraversal extends AstTraversal {
   private functionNames: Map<string, boolean> = new Map<string, boolean>();
   private currentFunction: FunctionDefinitionNode;
   private expectedSymbolType: SymbolType = SymbolType.VARIABLE;
+  private insideConsoleStatement: boolean = false;
 
   visitContract(node: ContractNode): Node {
     node.symbolTable = new SymbolTable(this.symbolTables[0]);
@@ -150,6 +153,15 @@ export default class SymbolTableTraversal extends AstTraversal {
     return node;
   }
 
+  // When we enter a console statement,
+  visitConsoleStatement(node: ConsoleStatementNode): Node {
+    this.insideConsoleStatement = true;
+    node.parameters = this.visitList(node.parameters) as ConsoleParameterNode[];
+    this.insideConsoleStatement = false;
+
+    return node;
+  }
+
   visitIdentifier(node: IdentifierNode): Node {
     const definition = this.symbolTables[0].get(node.name);
     if (!definition) {
@@ -163,8 +175,10 @@ export default class SymbolTableTraversal extends AstTraversal {
     node.definition = definition;
     node.definition.references.push(node);
 
-    // Keep track of final use of variables for code generation
-    this.currentFunction.opRolls.set(node.name, node);
+    // Keep track of final use of variables for code generation (excluding console statements)
+    if (!this.insideConsoleStatement) {
+      this.currentFunction.opRolls.set(node.name, node);
+    }
 
     return node;
   }
diff --git a/packages/cashc/test/debugging/fixtures.ts b/packages/cashc/test/debugging/fixtures.ts
index e2f371fe..cfff07f5 100644
--- a/packages/cashc/test/debugging/fixtures.ts
+++ b/packages/cashc/test/debugging/fixtures.ts
@@ -8,4 +8,12 @@ export const fixtures: Fixture[] = [
     fn: 'p2pkh.cash',
     fnWithLogs: 'p2pkh-logs.cash',
   },
+  {
+    fn: 'if_statement_number_units.cash',
+    fnWithLogs: 'if_statement_number_units-logs.cash',
+  },
+  {
+    fn: 'deeply_nested.cash',
+    fnWithLogs: 'deeply_nested-logs.cash',
+  },
 ];
diff --git a/packages/cashc/test/generation/fixtures.ts b/packages/cashc/test/generation/fixtures.ts
index 438b341c..3e6a1788 100644
--- a/packages/cashc/test/generation/fixtures.ts
+++ b/packages/cashc/test/generation/fixtures.ts
@@ -653,10 +653,10 @@ export const fixtures: Fixture[] = [
       debug: {
         bytecode: '0079519c69007a5193529c',
         logs: [
-          { data: [{ stackIndex: 0, type: 'int' }, 'test'], ip: 5, line: 4 },
-          { data: [{ stackIndex: 0, type: 'int' }, 'test2'], ip: 5, line: 5 },
+          { data: [{ stackIndex: 0, type: 'int', ip: 5 }, 'test'], ip: 5, line: 4 },
+          { data: [{ stackIndex: 0, type: 'int', ip: 5 }, 'test2'], ip: 5, line: 5 },
         ],
-        requireMessages: [{ ip: 5, line: 3, message: 'Wrong value passed' }, { ip: 12, line: 6, message: 'Sum doesn\'t work' }],
+        requireMessages: [{ ip: 4, line: 3, message: 'Wrong value passed' }, { ip: 11, line: 6, message: 'Sum doesn\'t work' }],
         sourceMap: '3:12:3:17;;:21::22;:12:::1;:4::46;6:12:6:17:0;;:20::21;:12:::1;:25::26:0;:12:::1',
       },
       source: fs.readFileSync(new URL('../valid-contract-files/debug_messages.cash', import.meta.url), { encoding: 'utf-8' }),
diff --git a/packages/cashc/test/valid-contract-files/deeply_nested-logs.cash b/packages/cashc/test/valid-contract-files/deeply_nested-logs.cash
new file mode 100644
index 00000000..d6664825
--- /dev/null
+++ b/packages/cashc/test/valid-contract-files/deeply_nested-logs.cash
@@ -0,0 +1,33 @@
+pragma cashscript >=0.8.0;
+
+contract TransferWithTimeout(
+    pubkey sender,
+    pubkey recipient,
+    int timeout
+) {
+    // Require recipient's signature to match
+    function transfer(sig recipientSig) {
+        require(checkSig(recipientSig, recipient));
+        console.log('recipientSig is', recipientSig);
+    }
+
+    // Require timeout time to be reached and sender's signature to match
+    function timeout(sig senderSig) {
+        require(checkSig(senderSig, sender));
+        if (timeout > 0) {
+            if (timeout < 10) {
+                require(timeout == 5);
+                console.log('timeout is', timeout);
+                console.log('senderSig is', senderSig);
+            } else {
+                console.log('timeout is', timeout);
+                require(timeout == 15);
+            }
+        } else {
+            require(timeout == 0);
+            console.log('timeout is', timeout);
+        }
+
+        console.log('timeout is', timeout, 'and senderSig is', senderSig);
+    }
+}
diff --git a/packages/cashc/test/valid-contract-files/if_statement_number_units-logs.cash b/packages/cashc/test/valid-contract-files/if_statement_number_units-logs.cash
new file mode 100644
index 00000000..e3994579
--- /dev/null
+++ b/packages/cashc/test/valid-contract-files/if_statement_number_units-logs.cash
@@ -0,0 +1,13 @@
+contract Test() {
+    function hello(int a, int b) {
+        if (a == b - 2 minutes) {
+            require(false);
+        } else if (b == 2 weeks)
+            require(a == 20 seconds);
+        else {
+            require(true == !!!false);
+        }
+
+        console.log(a, b);
+    }
+}
diff --git a/packages/cashscript/src/debugging.ts b/packages/cashscript/src/debugging.ts
index b900afd7..1bc2a9fc 100644
--- a/packages/cashscript/src/debugging.ts
+++ b/packages/cashscript/src/debugging.ts
@@ -1,5 +1,5 @@
 import { AuthenticationErrorCommon, AuthenticationInstruction, AuthenticationProgramCommon, AuthenticationProgramStateBCH, AuthenticationProgramStateCommon, AuthenticationVirtualMachine, ResolvedTransactionCommon, WalletTemplate, binToHex, createCompiler, createVirtualMachineBCH2023, encodeAuthenticationInstruction, walletTemplateToCompilerConfiguration } from '@bitauth/libauth';
-import { Artifact, LogData, LogEntry, Op, PrimitiveType, bytecodeToAsm, decodeBool, decodeInt, decodeString } from '@cashscript/utils';
+import { Artifact, LogEntry, Op, PrimitiveType, StackItem, bytecodeToAsm, decodeBool, decodeInt, decodeString } from '@cashscript/utils';
 import { findLastIndex, toRegExp } from './utils.js';
 
 // evaluates the fully defined template, throws upon error
@@ -35,8 +35,7 @@ export const debugTemplate = (template: WalletTemplate, artifact: Artifact): Deb
     .filter((debugStep) => executedDebugSteps.some((log) => log.ip === debugStep.ip));
 
   for (const log of executedLogs) {
-    const correspondingDebugStep = executedDebugSteps.find((debugStep) => debugStep.ip === log.ip)!;
-    logConsoleLogStatement(log, correspondingDebugStep, artifact);
+    logConsoleLogStatement(log, executedDebugSteps, artifact);
   }
 
   const lastExecutedDebugStep = executedDebugSteps[executedDebugSteps.length - 1];
@@ -122,22 +121,25 @@ const createProgram = (template: WalletTemplate): CreateProgramResult => {
 
 const logConsoleLogStatement = (
   log: LogEntry,
-  debugStep: AuthenticationProgramStateCommon,
+  debugSteps: AuthenticationProgramStateCommon[],
   artifact: Artifact,
 ): void => {
   let line = `${artifact.contractName}.cash:${log.line}`;
-  const decodedData = log.data.map((element) => decodeLogData(element, debugStep.stack, log.ip));
+  const decodedData = log.data.map((element) => {
+    if (typeof element === 'string') return element;
+
+    const debugStep = debugSteps.find((step) => step.ip === element.ip)!;
+    return decodeStackItem(element, debugStep.stack);
+  });
   console.log(`${line} ${decodedData.join(' ')}`);
 };
 
-const decodeLogData = (element: LogData, stack: Uint8Array[], ip: number): any => {
-  if (typeof element === 'string') return element;
-
+const decodeStackItem = (element: StackItem, stack: Uint8Array[]): any => {
   // Reversed since stack is in reverse order
   const stackItem = [...stack].reverse()[element.stackIndex];
 
   if (!stackItem) {
-    throw Error(`Stack item at index ${element.stackIndex} not found at instruction pointer ${ip}`);
+    throw Error(`Stack item at index ${element.stackIndex} not found at instruction pointer ${element.ip}`);
   }
 
   if (element.type === PrimitiveType.BOOL) return decodeBool(stackItem);
diff --git a/packages/cashscript/test/debugging.test.ts b/packages/cashscript/test/debugging.test.ts
index 180a3b7b..f04d347a 100644
--- a/packages/cashscript/test/debugging.test.ts
+++ b/packages/cashscript/test/debugging.test.ts
@@ -144,12 +144,19 @@ describe('Debugging tests', () => {
         }
 
         function functionWithIfStatement(int a) {
+          int b = 0;
+
           if (a == 1) {
             console.log("a is 1");
+            b = a;
           } else {
             console.log("a is not 1");
+            b = 2;
           }
 
+          console.log('a equals', a);
+          console.log('b equals', b);
+
           require(1 == 1);
         }
 
@@ -222,14 +229,18 @@ describe('Debugging tests', () => {
         .functionWithIfStatement(1n)
         .to(contract.address, 10000n);
 
-      await expect(transaction1).toLog(new RegExp('^Test.cash:22 a is 1$'));
+      await expect(transaction1).toLog(new RegExp('^Test.cash:24 a is 1$'));
+      await expect(transaction1).toLog(new RegExp('^Test.cash:31 a equals 1$'));
+      await expect(transaction1).toLog(new RegExp('^Test.cash:32 b equals 1$'));
       await expect(transaction1).not.toLog(/a is not 1/);
 
       const transaction2 = contract.functions
         .functionWithIfStatement(2n)
         .to(contract.address, 10000n);
 
-      await expect(transaction2).toLog(new RegExp('^Test.cash:24 a is not 1$'));
+      await expect(transaction2).toLog(new RegExp('^Test.cash:27 a is not 1$'));
+      await expect(transaction2).toLog(new RegExp('^Test.cash:31 a equals 2$'));
+      await expect(transaction2).toLog(new RegExp('^Test.cash:32 b equals 2$'));
       await expect(transaction2).not.toLog(/a is 1/);
     });
 
diff --git a/packages/utils/src/artifact.ts b/packages/utils/src/artifact.ts
index d3735c46..3279ba69 100644
--- a/packages/utils/src/artifact.ts
+++ b/packages/utils/src/artifact.ts
@@ -27,6 +27,7 @@ export interface LogEntry {
 export interface StackItem {
   type: string;
   stackIndex: number;
+  ip: number;
 }
 
 export type LogData = StackItem | string;

From 4d8ee07a8572d230327a81fd01ac7c91271b5482 Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Tue, 18 Jun 2024 11:37:19 +0200
Subject: [PATCH 122/171] Remove cashproof git dependency

---
 DEVELOPMENT.md | 18 ++++++++++++++++++
 package.json   |  7 -------
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
index cf94c0aa..e3a966ff 100644
--- a/DEVELOPMENT.md
+++ b/DEVELOPMENT.md
@@ -38,6 +38,24 @@ When updating the grammar file in `src/grammar/CashScript.g4`, we also need to m
 yarn antlr
 ```
 
+### Running `cashproof`
+
+Most of the bytecode optimisations that the `cashc` compiler uses can be verified for correctness using the [`cashproof` tool](https://github.com/EyeOfPython/cashproof). This tool needs to be installed separately by installing its dependencies using `pip` and cloning its repository from GitHub.
+
+From there, you can run `python <cashproof_path> [filenames]` to verify that the optimisations contained in these files are provably correct.
+
+Example:
+```bash
+python <cashproof_path> packages/cashc/test/cashproof/0.1.2=0.2.0.equiv
+```
+
+Note that if you want to run `cashproof` on the "main" CashScript optimisations file, you need to first extract the optimisations from the `cashc` compiler and save them in a separate file. This can be done using the following commands:
+
+```bash
+cp packages/utils/src/cashproof-optimisations.ts opt.equiv && sed -i '' '/`/d' opt.equiv
+python <cashproof_path> opt.equiv
+```
+
 ## cashscript
 
 ### Running tests
diff --git a/package.json b/package.json
index 21549009..ebe88dd6 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,6 @@
     "@types/node": "^14.14.28",
     "@typescript-eslint/eslint-plugin": "^6.12.0",
     "@typescript-eslint/parser": "^6.12.0",
-    "cashproof": "https://github.com/eyeofpython/cashproof",
     "chalk": "^4.1.0",
     "codecov": "^3.8.1",
     "cspell": "^5.2.4",
@@ -27,12 +26,6 @@
   "scripts": {
     "test": "lerna run test --ignore cashscript-examples --ignore testing-suite",
     "lint": "lerna run lint --ignore cashscript-examples --ignore testing-suite",
-    "preproof:opt": "cp packages/utils/src/cashproof-optimisations.ts opt.equiv && sed -i '' '/`/d' opt.equiv",
-    "proof:opt": "yarn cashproof opt.equiv",
-    "postproof:opt": "rm opt.equiv",
-    "proof:0.2.0": "yarn cashproof packages/cashc/test/cashproof/0.1.2=0.2.0.equiv",
-    "proof": "yarn proof:opt && yarn proof:0.2.0",
-    "cashproof": "python3 node_modules/cashproof/run.py",
     "examples": "tsx examples/p2pkh.ts && tsx examples/transfer_with_timeout.ts && tsx examples/hodl_vault.ts",
     "coverage": "codecov",
     "postinstall": "lerna bootstrap && yarn build",

From f91bfa2df42dd70ad9b797b7c7a2d3989b7505f2 Mon Sep 17 00:00:00 2001
From: Frederic Aerts <info@fredericaerts.com>
Date: Tue, 18 Jun 2024 12:10:31 +0200
Subject: [PATCH 123/171] docs: typos and grammar (#194)

---
 website/docs/basics/about.md              |  2 +-
 website/docs/basics/compiler.md           |  2 +-
 website/docs/basics/getting-started.md    | 52 +++++++++++------------
 website/docs/guides/covenants.md          | 30 ++++++-------
 website/docs/guides/debugging.md          | 20 ++++-----
 website/docs/guides/optimization.md       | 29 ++++++-------
 website/docs/language/contracts.md        |  6 +--
 website/docs/language/examples.md         | 12 +++---
 website/docs/language/functions.md        |  2 +-
 website/docs/language/globals.md          |  4 +-
 website/docs/language/types.md            |  8 ++--
 website/docs/sdk/examples.md              | 17 +++++---
 website/docs/sdk/instantiation.md         | 18 ++++----
 website/docs/sdk/network-provider.md      | 10 +++--
 website/docs/sdk/testing-setup.md         |  6 +--
 website/docs/sdk/transactions-advanced.md | 13 ++++--
 website/docs/sdk/transactions.md          | 25 ++++++-----
 website/docs/showcase.md                  |  6 +--
 website/src/pages/index.js                | 10 ++---
 19 files changed, 145 insertions(+), 127 deletions(-)

diff --git a/website/docs/basics/about.md b/website/docs/basics/about.md
index 26247d1c..1f7aadf9 100644
--- a/website/docs/basics/about.md
+++ b/website/docs/basics/about.md
@@ -5,7 +5,7 @@ sidebar_label: About CashScript
 
 CashScript is a high-level programming language for smart contracts on Bitcoin Cash. It offers a strong abstraction layer over Bitcoin Cash' native virtual machine, BCH Script. The CashScript syntax is based on Ethereum's smart contract language Solidity, but its functionality is very different since smart contracts on Bitcoin Cash differ greatly from smart contracts on Ethereum.
 
-CashScript was created in 2019 and has seen major upgrades over the years, including support for the new script functionality enabled with the different Bitcoin Cash network upgrades, including native introspection and CashTokens. Unrelated to the network upgrades, CashScript has also been upgraded with an advanced transaction builder and integrated debug tooling.
+CashScript was created in 2019 and has seen major upgrades over the years, thereby supporting new script functionalities enabled with the different Bitcoin Cash network upgrades — including native introspection and CashTokens. Unrelated to the network upgrades, CashScript has also been upgraded with an advanced transaction builder and integrated debug tooling.
 
 CashScript aims to make programming Bitcoin Cash accessible to a wide range of developers and enable the next-generation of UTXO smart contract applications.
 
diff --git a/website/docs/basics/compiler.md b/website/docs/basics/compiler.md
index 39085d65..5d6786c0 100644
--- a/website/docs/basics/compiler.md
+++ b/website/docs/basics/compiler.md
@@ -32,7 +32,7 @@ Options:
   -?, --help           Display help
 ```
 
-## Javascript Compilation
+## JavaScript Compilation
 Generally CashScript contracts are compiled to an Artifact JSON file using the CLI compiler. As an alternative to this, CashScript contracts can be compiled from within JavaScript apps using the `cashc` package. This package exports two compilation functions.
 
 ```bash
diff --git a/website/docs/basics/getting-started.md b/website/docs/basics/getting-started.md
index d51116f4..d7f5df8c 100644
--- a/website/docs/basics/getting-started.md
+++ b/website/docs/basics/getting-started.md
@@ -4,30 +4,30 @@ title: Getting Started
 
 ## Try CashScript Online
 
-To get started with writing CashScript smart contracts quickly, it is recommended to try out the [CashScript Playground](https://playground.cashscript.org/), a web application which lets you easily write and create contracts easily!
+To get started with writing CashScript smart contracts quickly, it is recommended to try out the [CashScript Playground](https://playground.cashscript.org/), a web application which lets you easily write and create contracts!
 
-Here you will learn what CashScript contract looks like through the `TransferWithTimeout` example contract. Then you can compile the contract and provide the contract arguments to create a smart contract address. To actually create the smart contract itself you fund the address so it has a UTXO on the contract address. After setting up the smart contract, you can try spending from the smart contract by invoking a contract funcion!
+Here you will learn what a CashScript contract looks like through the `TransferWithTimeout` example contract. Then you can compile the contract and provide the contract arguments to create a smart contract address. To actually create the smart contract itself, you fund the address so that it has a UTXO on the contract address. After setting up the smart contract, you can try spending from the smart contract by invoking a contract function!
 
 :::tip
-The [CashScript Playground](https://playground.cashscript.org/) is a great way to get started without doing any Javascript coding to setup up wallets, fetch balances and invoke contract functions. This way you can focus on learning one thing at a time!
+The [CashScript Playground](https://playground.cashscript.org/) is a great way to get started without doing any JavaScript coding to set up wallets, fetch balances and invoke contract functions. This way you can focus on learning one thing at a time!
 :::
 
 ## Creating a CashScript Smart Contract
 
-With the CashScript playground there's a nice integrated editor to get started, as well as an integrated compiler to change your CashScript contract into a Contract `Artifact` behind the screens. Now, to get started we will have to get set up with a CashScript editor outside of the Playground and learn how to work with the `cashc` compiler to create CashScript contract artifacts.
+With the CashScript playground there's a nice integrated editor to get started, as well as an integrated compiler to change your CashScript contract into a Contract `Artifact` behind the scenes. Now, to get started we will have to set up a CashScript editor — outside of the Playground — and learn how to work with the `cashc` compiler to create CashScript contract artifacts.
 
 ### Prerequisites
 
-To write CashScript smart contracts contracts locally you use a code-editor. For the best developer experience is recommended to use VS Code with the CashScript extension. This way it will automatically recognize `.cash` files and offer highlighting and auto-completion.
+To write CashScript smart contracts locally you use a code editor. For the best developer experience, we recommend to use VS Code with the CashScript extension. This way it will automatically recognize `.cash` files and offer highlighting and autocompletion.
 
 :::note prerequisties
 - Basic familiarity with the command line
 - Node.js installed
-- A code editor (VS code recommended)
+- A code editor (VS Code recommended)
 :::
 
 :::tip
-See the [Syntax Highlighting](/docs/guides/syntax-highlighting) guide for how to get set-up for the best CashScript developer environment.
+To set up your CashScript developer environment, see the [Syntax Highlighting](/docs/guides/syntax-highlighting) guide.
 :::
 
 ### Installing the CashScript compiler
@@ -39,8 +39,8 @@ npm install -g cashc
 
 ### Writing your first smart contract
 
-Open your code-editor to start writing your first CashScript smart contract.
-We can start from a basic `TransferWithTimeout` smart contract, create a new file `TransferWithTimeout.cash` for the file.
+Open your code editor to start writing your first CashScript smart contract.
+We can start from a basic `TransferWithTimeout` smart contract. Create a new file `TransferWithTimeout.cash`.
 
 The `TransferWithTimeout` contract takes in 3 contract arguments and has 2 contract functions: `transfer` and `timeout`.
 
@@ -62,12 +62,12 @@ contract TransferWithTimeout(pubkey sender, pubkey recipient, int timeout) {
 ```
 
 :::tip
-There are some other examples available on the [Examples page](/docs/language/examples), that can be used to take inspiration from. Further examples of the JavaScript integration can be found on [GitHub](https://github.com/CashScript/cashscript/tree/master/examples).
+There are some other examples available on the [Examples page](/docs/language/examples) that can be used to take inspiration from. Further examples of the JavaScript integration can be found on [GitHub](https://github.com/CashScript/cashscript/tree/master/examples).
 :::
 
 ### Compiling your smart contract
 
-The next step after writing your smart contract is using the command line compiler to create a contract artifact so it can be imported into the CashScript SDK.
+The next step after writing your smart contract is using the command line compiler to create a contract artifact, so that it can be imported into the CashScript SDK.
 
 ```bash
 cashc ./TransferWithTimeout.cash --output ./TransferWithTimeout.json
@@ -77,10 +77,10 @@ This will create an artifact file `TransferWithTimeout.json` from your CashScrip
 
 ## Creating a CashScript Transaction
 
-After creating a contract artifact we can now use the JavaScript SDK to initialise the smart contract and to invoke spending functions on the smart contract UTXOs. We'll continue with the `TransferWithTimeout` artifact generated in the previous steps.
+After creating a contract artifact, we can now use the JavaScript SDK to initialise the smart contract and to invoke spending functions on the smart contract UTXOs. We'll continue with the `TransferWithTimeout` artifact generated in the previous steps.
 
 ### Installing the JavaScript SDK
-The JavaScript SDK can be installed into your project with NPM. Note that CashScript is a [Pure ESM package](https://gist.github.com/sindresorhus/a39789f98801d908bbc7ff3ecc99d99c).
+The JavaScript SDK can be installed into your project with NPM. Note that CashScript is a [pure ESM package](https://gist.github.com/sindresorhus/a39789f98801d908bbc7ff3ecc99d99c).
 
 ```bash
 npm install cashscript
@@ -88,35 +88,34 @@ npm install cashscript
 
 ### Initialising a Contract
 
-Now to initialise a contract we will import the ElectrumNetworkProvider and contract classes from the CashScript SDK. We of course also need the contract arifact, and lastly we need public keys from a generated key-pair to use as arguments to initialise the contract.
+Now to initialise a contract we will import the `ElectrumNetworkProvider` and `Contract` classes from the CashScript SDK. We also need to import the contract artifact. Lastly, we need public keys from a generated key-pair to use as arguments for contract initialisation.
 
 ```javascript
 import { ElectrumNetworkProvider, Contract } from 'cashscript';
-import { alicePub, bobPub } from './keys.js';
 import artifact from './TransferWithTimeout.json';
+import { alicePub, bobPub } from './keys.js';
 
 // Initialise a network provider for network operations
 const provider = new ElectrumNetworkProvider('chipnet');
 
 // Instantiate a new TransferWithTimeout contract
-const contractArguments = [alicePub, bobPub, 100000n]
-const ptions = { provider }
+const contractArguments = [alicePub, bobPub, 100000n];
+const options = { provider };
 const contract = new Contract(artifact, contractArguments, options);
 
 // Get the contract address and info about its balance
-console.log("Contract address:" + contract.address)
-console.log("Contract balance:" + await contract.getBalance())
-console.log("Contract Utxos:")
-console.log(await contract.getUtxos())
+console.log("Contract address: " + contract.address);
+console.log("Contract balance: " + await contract.getBalance());
+console.log("Contract UTXOs: " + await contract.getUtxos());
 ```
 
 :::tip
-For a code example of how to generate key-pairs with Libauth see the [CashScript Examples](https://github.com/CashScript/cashscript/blob/master/examples/common.ts) `common-ts` file where Alice and Bob's key-pairs are created!
+For a code example of how to generate key-pairs with Libauth, see the [CashScript Examples' `common.ts`](https://github.com/CashScript/cashscript/blob/master/examples/common.ts) file where Alice and Bob's key-pairs are created.
 :::
 
 ### Creating a Transaction
 
-Lastly to spend from the smart contract we've initialised you need to make sure there is an actual contract balance on the smart contract address. Or in other words, you need to make sure there's at least one UTXO with the smart contract locking bytecode so we can spend from it!
+Lastly, to spend from the smart contract we've initialised, you need to make sure there is an actual contract balance on the smart contract address. In other words, we need to make sure there's at least one UTXO with the smart contract locking bytecode, so that we can spend from it!
 
 ```javascript
 import { ElectrumNetworkProvider, Contract, SignatureTemplate } from 'cashscript';
@@ -127,8 +126,8 @@ import artifact from './TransferWithTimeout.json';
 const provider = new ElectrumNetworkProvider('chipnet');
 
 // Instantiate a new TransferWithTimeout contract
-const contractArguments = [alicePub, bobPub, 100000n]
-const options = { provider }
+const contractArguments = [alicePub, bobPub, 100000n];
+const options = { provider };
 const contract = new Contract(artifact, contractArguments, options);
 
 // Call the transfer function with Bob's signature
@@ -137,7 +136,8 @@ const transferDetails = await contract.functions
   .transfer(new SignatureTemplate(bobPriv))
   .to('bitcoincash:qrhea03074073ff3zv9whh0nggxc7k03ssh8jv9mkx', 10000n)
   .send();
+
 console.log(transferDetails);
 ```
 
-Congrats 🎉! You've succesfully created a transaction spending from a Bitcoin Cash smart contract! 
+Congrats 🎉! You've successfully created a transaction spending from a Bitcoin Cash smart contract! 
diff --git a/website/docs/guides/covenants.md b/website/docs/guides/covenants.md
index 2897a985..bd08db0e 100644
--- a/website/docs/guides/covenants.md
+++ b/website/docs/guides/covenants.md
@@ -3,7 +3,7 @@ title: Writing Covenants & Introspection
 sidebar_label: Covenants & Introspection
 ---
 
-Covenants are all the rage in Bitcoin Cash smart contracts. But what are they, and how do you use them? In one sentence: **a covenant is a constraint on how money can be spent**. A simple example is creating a smart contract that may **only** send money to one specific address and nowhere else. The term *Covenant* originates in property law, where it is used to constrain the use of any object - or in the case of BCH, the use of money.
+Covenants are all the rage in Bitcoin Cash smart contracts. But what are they, and how do you use them? In one sentence: **a covenant is a constraint on how money can be spent**. A simple example is creating a smart contract that may **only** send money to one specific address and nowhere else. The term *Covenant* originates in property law, where it is used to constrain the use of any object — or in the case of BCH, the use of money.
 
 Bitcoin covenants were first proposed in a paper titled [Bitcoin Covenants][bitcoin-covenants], but several other proposals have been created over the years. In May of 2022 Bitcoin Cash implemented so-called *Native Introspection* which enables efficient and accessible covenants. This was extended with token introspection opcodes with the *CashTokens* upgrade in May of 2023.
 
@@ -32,10 +32,10 @@ When using CashScript, you can access a lot of *introspection data* that can be
 - **`int tx.outputs[i].tokenAmount`** - Amount of fungible tokens of a specific output.
 
 ## Using introspection data
-While we know the individual data fields, it's not immediately clear how this can be used to create useful smart contracts on Bitcoin Cash. But there are several constraints that can be created using these fields, most important of which are constraints on the recipients of funds, so that is what we discuss.
+While we know the individual data fields, it's not immediately clear how this can be used to create useful smart contracts on Bitcoin Cash. However, there are several constraints that can be created using these fields — most important of which are constraints on the recipients of funds — so that is what we discuss.
 
 ### Restricting P2PKH recipients
-One interesting technique in Bitcoin Cash is called blind escrow, meaning that funds are placed in an escrow contract. This contract can only release the funds to one of the escrow participants, and has no other control over the funds. Non-custodial local exchange [LocalCryptos](https://localcryptos.com) uses `OP_CHECKDATASIG` to do this, but we can also achieve something similar by restricting recipients with a covenant.
+One interesting technique in Bitcoin Cash is called blind escrow, meaning that funds are placed in an escrow contract. This contract can only release the funds to one of the escrow participants, and has no other control over the funds. Non-custodial local exchange [LocalCryptos](https://localcryptos.com) used `OP_CHECKDATASIG` to do this. We can achieve something similar by restricting recipients with a covenant.
 
 ```solidity
 contract Escrow(bytes20 arbiter, bytes20 buyer, bytes20 seller) {
@@ -61,7 +61,7 @@ contract Escrow(bytes20 arbiter, bytes20 buyer, bytes20 seller) {
 The contract starts by doing some checks to make sure the transaction is signed by the arbiter. Next up it checks that the full contract balance (`tx.inputs[this.activeInputIndex].value`) is sent to the first output by accessing `tx.outputs[0].value`. Finally it checks that the receiver of that money is either the buyer or the seller using `LockingBytecodeP2PKH` and `tx.outputs[0].lockingBytecode`. Note that we use a hardcoded fee as it is difficult to calculate the exact transaction fee inside the smart contract.
 
 ### Restricting P2SH recipients
-Besides sending money to `P2PKH` addresses, it is also possible to send money to a smart contract (`P2SH`) address. This can be used in the same way as a `P2PKH` address if the script hash is known beforehand, but this can also be used to make sure that money has to be sent back to the current smart contract.
+Besides sending money to `P2PKH` addresses, it is also possible to send money to a smart contract (`P2SH`) address. A smart contract address can be used in the same way as a `P2PKH` address (if the script hash is known beforehand), and it can also be used to make sure that money has to be sent back to the current smart contract.
 
 This is especially effective when used together with time constraints. An example is the *Licho's Last Will* contract. This contract puts a dead man's switch on the contract's holdings, and requires the owner to send a heartbeat to the contract every six months. If the contract hasn't received this heartbeat, an inheritor can claim the funds instead.
 
@@ -88,7 +88,7 @@ contract LastWill(bytes20 inheritor, bytes20 cold, bytes20 hot) {
         require(tx.outputs[0].value == amount);
 
         // Check that the funds are sent back to the contract
-        bytes23 contractLock = tx.inputs[this.activeInputIndex].lockingBytecode;
+        bytes contractLock = tx.inputs[this.activeInputIndex].lockingBytecode;
         require(tx.outputs[0].lockingBytecode == contractLock);
     }
 }
@@ -97,7 +97,7 @@ contract LastWill(bytes20 inheritor, bytes20 cold, bytes20 hot) {
 This contract has three functions, but only the `refresh()` function uses a covenant. Again it performs necessary checks to verify that the transaction is signed by the owner, after which it checks that the entire contract balance is sent. It then uses `tx.inputs[this.activeInputIndex].lockingBytecode` to access its own locking bytecode, which can be used as the locking bytecode of this output. Sending the full value back to the same contract effectively resets the `tx.age` counter, so the owner of the contract needs to do this every 180 days.
 
 ### Restricting P2PKH and P2SH
-The earlier examples showed sending money to only a single output of either `P2PKH` or `P2SH`. But there nothing preventing us from writing a contract that can send to multiple outputs, including a combination of `P2PKH` and `P2SH` outputs. A good example is the *Licho's Mecenas* contract that allows you to set up recurring payments where the recipient is able to claim the same amount every month, while the remainder has to be sent back to the contract.
+The earlier examples showed sending money to only a single output of either `P2PKH` or `P2SH`. But there's nothing preventing us from writing a contract that can send to multiple outputs, including a combination of `P2PKH` and `P2SH` outputs. A good example is the *Licho's Mecenas* contract that allows you to set up recurring payments where the recipient is able to claim the same amount every month, while the remainder has to be sent back to the contract.
 
 ```solidity
 contract Mecenas(bytes20 recipient, bytes20 funder, int pledge, int period) {
@@ -116,7 +116,7 @@ contract Mecenas(bytes20 recipient, bytes20 funder, int pledge, int period) {
         // If there is not enough left for *another* pledge after this one,
         // we send the remainder to the recipient. Otherwise we send the
         // pledge to the recipient and the change back to the contract
-        if (changeValue <= pledge + minerFees) {
+        if (changeValue <= pledge + minerFee) {
             require(tx.outputs[0].value == currentValue - minerFee);
         } else {
             require(tx.outputs[0].value == pledge);
@@ -137,7 +137,7 @@ This contract applies similar techniques as the previous two examples to verify
 
 ## Local State
 
-Smart contracts which persist for multiple transactions might want to keep data for later use, this is called local state. With the CashTokens upgrade local state can be kept in the commitment field of the NFT of the smart contract UTXO. Because the state is not kept in the script of the smart contract itself, the address can remain the same. 
+Smart contracts which persist for multiple transactions might want to keep data for later use. This is called local state. With the CashTokens upgrade, local state can be kept in the commitment field of the NFT of the smart contract UTXO. Because the state is not kept in the script of the smart contract itself, the address can remain the same. 
 
 :::info
 Covenants can also use 'simulated state', where state is kept in the contract script and the contract enforces a new P2SH locking bytecode of the contract with a different state update. This method causes the contract address to change with each state update.
@@ -203,7 +203,7 @@ contract StreamingMecenas(
 }
 ```
 
-Instead of having a pledge per 30 day period, we define a pledge per block. At any point in time we can calculate how much money the recipient has earned. Then the covenant **enforces that this amount is withdrawn from the contract**. The remainder is sent to a new stream that **starts at the end of of the previous one**. The locktime used for the last withdrawal from the covenant is kept in the local state to calculate the amount of money the recipient has earned over the passed time. This process of changing the local state in the NFT associated with the smart contractUTXO can be applied to the new stream until the money in the stream runs out.
+Instead of having a pledge per 30 day period, we define a pledge per block. At any point in time we can calculate how much money the recipient has earned. Then the covenant **enforces that this amount is withdrawn from the contract**. The remainder is sent to a new stream that **starts at the end of the previous one**. The locktime used for the last withdrawal from the covenant is kept in the local state to calculate the amount of money the recipient has earned over the passed time. This process of changing the local state in the NFT associated with the smart contract UTXO can be applied to the new stream until the money in the stream runs out.
 
 :::tip
 We use `tx.locktime` to introspect the value of the timelock, and to write the value to the contract local state: the NFT commitment field.
@@ -211,12 +211,12 @@ We use `tx.locktime` to introspect the value of the timelock, and to write the v
 
 ### Issuing NFTs as receipts
 
-A covenant that manages funds (BCH + fungible tokens of a certain category) which are pooled together from different people often wants to enable its participants to also exit the covenants with their funds. It would be incredibly hard continuously updating a data structure to keep track of which address contributed how much in the local state of the contract. A much better solution is to issue receipts each time funds are added to the pool! This way the contract does not have a 'global view' of who owns what at any time, but it can validate the receipts when invocing a withdrawal. 
+A covenant that manages funds (BCH + fungible tokens of a certain category) which are pooled together from different people often wants to enable its participants to also exit the covenants with their funds. It would be incredibly hard continuously updating a data structure to keep track of which address contributed how much in the local state of the contract. A much better solution is to issue receipts each time funds are added to the pool! This way the contract does not have a 'global view' of who owns what at any time, but it can validate the receipts when invoking a withdrawal. 
 
-Technically this happens by minting a new NFT with in the commitment field the amount of satoshis or fungible tokens that were contributed to the pool and sending this to the address of the contributor.
+Technically this happens by minting a new NFT, with in the commitment field the amount of satoshis or fungible tokens that were contributed to the pool, and sending this to the address of the contributor.
 
 :::tip
-Minting NFT receipts allows the contract to offload state to an NFT helf by a user. By default these receipts are easily transferable and tradable because they are generic NFTs.
+Minting NFT receipts allows the contract to offload state to an NFT held by a user. By default, these receipts are easily transferable and tradable because they are generic NFTs.
 :::
 
 Let's take a look at an example contract called `PooledFunds` which has two contract functions: `addFunds` and `withdrawFunds`
@@ -307,15 +307,15 @@ contract PooledFunds(
 }
 ```
 
-All outputs of the `PooledFunds` contract need to be carefully controlled in the contract code so no additional NFTs can be minted in other outputs as this would allow 'fake' receipts to be created. The user receipt NFTs only differ from the covenant's minting NFT in that there is no minting capability added to the token's categoryID when calling `.tokenCategory`. At withdrawal the receipt needs to be validated and then the NFT commitment data is read to understand the contents of the receipt. In the current contract the receipt NFT also needs to be burned (simply not re-created in the outputs) ensuring the same receipt cannot be used to withdraw twice.
+All outputs of the `PooledFunds` contract need to be carefully controlled in the contract code so no additional NFTs can be minted in other outputs, as this would allow 'fake' receipts to be created. The user receipt NFTs only differ from the covenant's minting NFT in that there is no minting capability added to the token's categoryID when calling `.tokenCategory`. At withdrawal, the receipt needs to be validated, and then the NFT commitment data is read to understand the contents of the receipt. In the current contract the receipt NFT also needs to be burned (simply not re-created in the outputs) ensuring the same receipt cannot be used to withdraw twice.
 
 :::caution
-With contracts holding minting NFTs, all outputs need to be carefully controlled in the covenant contract code so no additional (minting) NFTs can un-intentionally be created in other outputs.
+With contracts holding minting NFTs, all outputs need to be carefully controlled in the covenant contract code, so no additional (minting) NFTs can un-intentionally be created in other outputs.
 :::
 
 
 ## Conclusion
-We have discussed the main uses for covenants as they exist on Bitcoin Cash today. We've seen how we can achieve different use case by combining transaction output restrictions to `P2SH` and `P2PKH` outputs. We also touched on more advanced subjects such as keeping local state in NFTs. Covenants and CashTokens are the **main differentiating factor** for BCH smart contracts when compared to BTC, while keeping the same **efficient, atomic verification**.
+We have discussed the main uses for covenants as they exist on Bitcoin Cash today. We've seen how we can achieve different use cases by combining transaction output restrictions to `P2SH` and `P2PKH` outputs. We also touched on more advanced subjects such as keeping local state in NFTs. Covenants and CashTokens are the **main differentiating factor** for BCH smart contracts when compared to BTC, while keeping the same **efficient, atomic verification**.
 
 Keeping local state in NFTs and issuing NFTs as receipts are two strategies which can be used to create much more sophisticated decentralized applications such as the AMM-style DEX named [Jedex](https://blog.bitjson.com/jedex-decentralized-exchanges-on-bitcoin-cash/).
 
diff --git a/website/docs/guides/debugging.md b/website/docs/guides/debugging.md
index ebe2b167..9930cb33 100644
--- a/website/docs/guides/debugging.md
+++ b/website/docs/guides/debugging.md
@@ -2,18 +2,18 @@
 title: Debugging
 ---
 
-Debugging is no walk in the park, this is especially true for debugging complex smart contracts. Luckily there is a handful of startegies that can make it easier for developers to discover bugs with their contracts.
+Debugging is no walk in the park. This is especially true for debugging complex smart contracts. Luckily there is a handful of strategies that can make it easier for developers to discover bugs in their contracts.
 
-Generally there are 2 broad categories of smart contract bugs
+Generally there are 2 broad categories of smart contract bugs:
 
 - A bug in your invocation making the transaction invalid
 - A bug in the smart contract which prohibits valid spending
 
-Whatever category your bug falls into, the first step is discovering what line in your CashScript contract is making your transaction get rejected. Afterwards, investigation needs to start whether it's a contract bug, or a invocation bug.
+Whatever category your bug falls into, the first step is discovering what line in your CashScript contract is making your transaction get rejected. Afterwards, investigation needs to start whether it's a contract bug, or an invocation bug.
 
 ## Simple Transaction Builder
 
-The [Simple Transaction Builder](/docs/sdk/transactions) has deep integration with libauth to enable local transaction evaluation without actual interaction with the Bitcoin Cash network. This allows for advanced debugging functionality.
+The [Simple Transaction Builder](/docs/sdk/transactions) has deep integration with libauth to enable local transaction evaluation, without actual interaction with the Bitcoin Cash network. This allows for advanced debugging functionality.
 
 :::note
 Currently the CashScript debugging tools only work with the [Simple Transaction Builder](/docs/sdk/transactions). We plan to extend the debugging tools to work with the [Advanced Transaction Builder](/docs/sdk/transactions-advanced) in the future.
@@ -23,15 +23,15 @@ Currently the CashScript debugging tools only work with the [Simple Transaction
 
 If a CashScript transaction is sent using any network provider and is rejected by the network (or the `MockNetworkProvider`), the transaction will be evaluated locally using libauth to provide failure reasons and debug information in addition to the failure reason communicated by the network.
 
-Read the error message to see which line in the CashScript contract causes the transcation validation to fail. Investigate whether the contract function invocation is the issue (on the javascript SDK side) or whether the issue is in the CashScript contract itself (so you'd need to update your contract and recompile the artifact). If it is not clear **why** the CashScript contract is failing on that line, then you can use the following two strategies: console logging & Bitauth IDE stack trace.
+Read the error message to see which line in the CashScript contract causes the transaction validation to fail. Investigate whether the contract function invocation is the issue (on the JavaScript SDK side) or whether the issue is in the CashScript contract itself (so you'd need to update your contract and recompile the artifact). If it is not clear **why** the CashScript contract is failing on that line, then you can use the following two strategies: console logging & Bitauth IDE stack trace.
 
 ### Console Logging
 
-To help with debugging you can add `console.log` statements to your CashScript contract file to log variables. This way you investigate whether the variable have the expected values when they get to the failing `require` statement in the CashScript file. After adding the `console.log` statements, recompile your contract so they are added to your contract's Arifact. 
+To help with debugging you can add `console.log` statements to your CashScript contract file to log variables. This way you investigate whether the variables have the expected values when they get to the failing `require` statement in the CashScript file. After adding the `console.log` statements, recompile your contract so they are added to your contract's Artifact. 
 
 ### Bitauth IDE
 
-Whenever a transaction fails there will be a link in the console to open your smart contract trnasaction in the BitAuth IDE. This will allow you to inspect the transaction in detail, and see exactly why the transaction failed. In the BitAuth IDE you will see the raw BCH Script mapping to each line in your CashScript contract. Find the failing line and investigate the failing OpCode. You can break up the failing line, one opcode at a time to see how the stack evolves and ends with your `require` failure.
+Whenever a transaction fails, there will be a link in the console to open your smart contract transaction in the BitAuth IDE. This will allow you to inspect the transaction in detail, and see exactly why the transaction failed. In the BitAuth IDE you will see the raw BCH Script mapping to each line in your CashScript contract. Find the failing line and investigate the failing OpCode. You can break up the failing line, one opcode at a time, to see how the stack evolves and ends with your `require` failure.
 
 It's also possible to export the transaction for step-by-step debugging in the BitAuth IDE without failure. To do so, you can call the `bitauthUri()` function on the transaction. This will return a URI that can be opened in the BitAuth IDE.
 
@@ -50,14 +50,14 @@ Because the advanced transaction builder does not yet support the advanced debug
 
 ### Failing Opcode
 
-When a transaction gets rejected by a full node it will return a cryptic error message, read the message carefully to investigate whether the issue is a failing script (failing OpCode) or whether a standarness rule like minimum-relay-fee is violated. If the cause is a failing OpCode, you can check the contract's Artifact to see how many appearances this OpCode has. Sometimes the OpCode only appears once or twice, indicating where the failing `require` statement is. Other times you might see 15 appearances of the OpCode leaving you to try the next strategies.
+When a transaction gets rejected by a full node, it will return a cryptic error message. Read the message carefully to investigate whether the issue is a failing script (failing OpCode) or whether a standardness rule like minimum-relay-fee is violated. If the cause is a failing OpCode, you can check the contract's Artifact to see how many appearances this OpCode has. Sometimes the OpCode only appears once or twice, indicating where the failing `require` statement is. Other times you might see 15 appearances of the OpCode leaving you to try the next strategies.
 
 ### Removing Contract Checks
 
-If your contract fails, you can remove (or comment out) the lines that are the likely cause of the error. After recompiling to a new Artifact you can test whether the remaining subcontract works or fails with a different error. If this is the case then you learned that there is an issue in the removed CashScript code block. In the worst case when you have no indication from the failing opcode (previous strategy) then you will have to try remove different parts of your contract and trying different sub-contracts repeatedly. 
+If your contract fails, you can remove (or comment out) the lines that are the likely cause of the error. After recompiling to a new Artifact you can test whether the remaining subcontract works or fails with a different error. If this is the case, then you learned that there is an issue in the removed CashScript code block. In the worst case, when you have no indication from the failing opcode (previous strategy), then you will have to try to remove different parts of your contract and try different sub-contracts repeatedly. 
 
 To use this strategy effectively, the contract setup with funding should be automated as to avoid having to send testnet coins manually to each different subcontract. However inefficient, this strategy should always be able to get you to find the failing line in your CashScript contract. Then you can investigate whether the issue is the contract invocation or the `require` statement in the CashScript file.
 
 ### Single Check Contract
 
-If it is unclear whether the issue is the contract invocation or the `require` statement in the CashScript file, it might prove handy to create a 'single-check Contract' which has only the previously failing require statement. The goal then is to discover if your transaction is the issue and you are violating a correct contract requirement or whether the contract is enforcing an incorrect/impossible condition to hold in the spending transaction.
+If it is unclear whether the issue is the contract invocation or the `require` statement in the CashScript file, it might prove handy to create a 'single-check' contract, which has only the previously failing `require` statement. The goal then is to discover if your transaction is the issue, and you are violating a correct contract requirement, or whether the contract is enforcing an incorrect/impossible condition to hold in the spending transaction.
diff --git a/website/docs/guides/optimization.md b/website/docs/guides/optimization.md
index 7b6393eb..8ef2a0a4 100644
--- a/website/docs/guides/optimization.md
+++ b/website/docs/guides/optimization.md
@@ -9,16 +9,16 @@ Depending on the complexity of the contract or system design, it may sometimes b
 
 ## Optimization Tips & Tricks
 
-The `cashc` compiler does some optimisations automatically, but by writing your CashScript code in a specific way, the compiler is better able to optimise it. Trial & error is a definately part of it, but here are some tricks that may help:
+The `cashc` compiler does some optimisations automatically. By writing your CashScript code in a specific way, the compiler is better able to optimise it. Trial & error is definitely part of it, but here are some tricks that may help:
 
 ### 1. Consume stack items
 
-It's best to "consume" values as soon as possible ("consume" meaning their final use in the contract). This frees up space on the stack.
-Use/consume values as close to their declaration as possible, both for variables and for parameters. This avoids having to do deep stack operations. This [example](https://gitlab.com/GeneralProtocols/anyhedge/contracts/-/blob/development/contracts/v0.11/contract.cash#L61-72) from anyhedge illustrates consuming values immediately.
+It's best to "consume" values (i.e. their final use in the contract) as soon as possible. This frees up space on the stack.
+Use/consume values as close to their declaration as possible, both for variables and for parameters. This avoids having to do deep stack operations. This [example](https://gitlab.com/GeneralProtocols/anyhedge/contracts/-/blob/development/contracts/v0.11/contract.cash#L61-72) from AnyHedge illustrates consuming values immediately.
 
 ### 2. Declare variables
 
-Declare variables when re-using certain common introspection items to avoid duplicate expressions
+Declare variables when re-using certain common introspection items to avoid duplicate expressions.
 
 ```solidity title="Example CashScript code"
     // do this
@@ -33,7 +33,7 @@ Declare variables when re-using certain common introspection items to avoid dupl
 ```
 
 ### 3. Parse efficiently
-When using `.split()` to use both sides of a `bytes` element, declare both parts immediately to save on opcodes aprsing the byte array.
+When using `.split()` to use both sides of a `bytes` element, declare both parts immediately to save on opcodes parsing the byte array.
 
 ```solidity title="Example CashScript code"
     // do this
@@ -46,7 +46,7 @@ When using `.split()` to use both sides of a `bytes` element, declare both parts
 ```
 ### 4. Avoid if-else
 
-Avoid if-statements if possible, instead try to "inline" them. This is because the compiler cannot know which branches will be taken, and therefore cannot optimise those branches as well. This [example](https://gitlab.com/GeneralProtocols/anyhedge/contracts/-/blob/development/contracts/v0.11/contract.cash#L128-130) from anyhedge illustrates inlining flow control:
+Avoid if-statements when possible. Instead, try to "inline" them. This is because the compiler cannot know which branches will be taken, and therefore cannot optimise those branches as well. This [example](https://gitlab.com/GeneralProtocols/anyhedge/contracts/-/blob/development/contracts/v0.11/contract.cash#L128-130) from AnyHedge illustrates inlining flow control:
 
 ```solidity title="AnyHedge CashScript code"
     // do this
@@ -63,11 +63,11 @@ Avoid if-statements if possible, instead try to "inline" them. This is because t
 
 ## Modular Contract Design
 
-An alternative to optimizing your contract to shrink it in size is to redesign your contract to use a composable architecture so the contract logic is separated out in to multiple componenets which only some of which can be used in a transaction and hence shrink your contract size.
+An alternative to optimizing your contract to shrink in size is to redesign your contract to use a composable architecture. The contract logic is separated out in to multiple components of which only some can be used in a transaction, and hence shrink your contract size.
 
 ### NFT contract functions
 
-The concept of having NFT functions was firt introduced by the [Jedex demo](https://github.com/bitjson/jedex#demonstrated-concepts) and was first implemented in a CashScript contract by the [FexCash DEX](https://github.com/fex-cash/fex/blob/main/whitepaper/fex_whitepaper.md). The concept is that by authenticating NFTs you can make each function a separate contract with the same tokenId. This way you can offload logic from the main contract and one function NFT contract attached to the main contract on spending so the other contract functions exist as unused UTXOs separate from the transaction.
+The concept of having NFT functions was first introduced by the [Jedex demo](https://github.com/bitjson/jedex#demonstrated-concepts) and was first implemented in a CashScript contract by the [FexCash DEX](https://github.com/fex-cash/fex/blob/main/whitepaper/fex_whitepaper.md). The concept is that by authenticating NFTs, you can make each function a separate contract with the same tokenId. This way, you can offload logic from the main contract. One function NFT contract is attached to the main contract during spending, while the other contract functions exist as unused UTXOs, separate from the transaction.
 
 :::tip
 By using function NFTs you can use a modular contract design where the contract functions are offloaded to different UTXOs, each identifiable by the main contract by using the same tokenId.
@@ -75,8 +75,8 @@ By using function NFTs you can use a modular contract design where the contract
 
 ## Example Workflow
 
-When trying to optimizing your contract, you will need to compare the contract size to see if the changes have a positive impact.
-You can easily check the opcode count and bytesize with the compiler CLI directly from the contract (without creating a new artifact).
+When trying to optimize your contract, you will need to compare the contract size to see if the changes have a positive impact.
+With the compiler CLI, you can easily check the opcode count and bytesize directly from the contract (without creating a new artifact).
 It's important to know the minimum fees on the Bitcoin Cash network are based on the bytesize of a transaction (including your contract).
 
 ```bash
@@ -87,7 +87,7 @@ cashc ./contract.cash --opcount --size
 The size output of the `cashc` compiler will always be an underestimate, as the contract hasn't been initialized with contract arguments.
 :::
 
-The `cashc` compiler only knows the opcount and bytesize of a contract before it is initialised with function arguments. Because of this, to get an accurate view of a contracts size initialise the contract instance first, then get the size from there. This means you will have to re-compile the artifact before checking with contract size through the Javascript SDK.
+The `cashc` compiler only knows the opcount and bytesize of a contract before it is initialised with function arguments. Because of this, to get an accurate view of a contracts size, initialise the contract instance first, then get the size from there. This means you will have to re-compile the artifact before checking the contract size through the JavaScript SDK.
 
 ```javascript
 import { ElectrumNetworkProvider, Contract, SignatureTemplate } from 'cashscript';
@@ -109,13 +109,12 @@ console.log(contract.opcount);
 console.log(contract.bytesize);
 ```
 
-With this workflow you can make changes to the contract and the run the Javascript program to
-
- get an accurate measure of how the bytesize of your contract changes with different optimizations.
+With this workflow, you can make changes to the contract and the run the JavaScript program to 
+get an accurate measure of how the bytesize of your contract changes with different optimizations.
 
 ## To optimize or not to optimize?
 
-There is a last important alternative approache to optimization contract bytecode to consider:
+In the context of optimizing contract bytecode, there's an important remark to consider:
 
 ### OP_NOP
 
diff --git a/website/docs/language/contracts.md b/website/docs/language/contracts.md
index 3bf7f56c..b89f468b 100644
--- a/website/docs/language/contracts.md
+++ b/website/docs/language/contracts.md
@@ -34,7 +34,7 @@ Upon initialization of the contract, constructor parameters are encoded and adde
 :::
 
 ## Functions
-The main construct in a CashScript contract is the function. A contract can contain one or multiple functions that can be executed to trigger transactions that spend money from the contract. In the basics the result of a function is just a yes or no answer to the question 'Can money be sent out of this contract?'. But by using a technique called covenants, it is possible to specify other conditions, like restricting *where* money can be sent. To read more about this technique, refer to the [CashScript Covenants Guide](/docs/guides/covenants).
+The main construct in a CashScript contract is the function. A contract can contain one or multiple functions that can be executed to trigger transactions that spend money from the contract. At its core, the result of a function is just a yes or no answer to the question 'Can money be sent out of this contract?'. However, by using a technique called covenants, it's possible to specify additional conditions — like restricting *where* money can be sent. To read more about this technique, refer to the [CashScript Covenants Guide](/docs/guides/covenants).
 
 #### Example
 ```solidity
@@ -80,7 +80,7 @@ contract P2PKH(bytes20 pkh) {
 ```
 
 ### Variable declaration
-Variables can be declared by specifying their type and name. All variables need to be initialised at the time of their declaration, but can be reassigned later on - unless specifying the `constant` keyword. Since CashScript is strongly typed and has no type inference, it is not possible to use keywords such as `var` or `let` to declare variables.
+Variables can be declared by specifying their type and name. All variables need to be initialised at the time of their declaration, but can be reassigned later on — unless specifying the `constant` keyword. Since CashScript is strongly typed and has no type inference, it is not possible to use keywords such as `var` or `let` to declare variables.
 
 :::caution
 CashScript disallows variable shadowing and unused variables.
@@ -103,7 +103,7 @@ myString = 'Cash';
 ```
 
 ### Control structures
-The only control structures in CashScript are `if` and `else` statements. This is due to limitations in the underlying Bitcoin Script which prevent loops, recursion, and `return` statements. If-else statements follow usual semantics known from languages like C or JavaScript.
+The only control structures in CashScript are `if...else` statements. This is due to limitations in the underlying Bitcoin Script which prevents loops, recursion, and `return` statements. If-else statements follow usual semantics known from languages like C or JavaScript.
 
 :::note
 There is no implicit type conversion from non-boolean to boolean types. So `if (1) { ... }` is not valid CashScript and should instead be written as `if (bool(1)) { ... }`
diff --git a/website/docs/language/examples.md b/website/docs/language/examples.md
index 5e4f51c7..325d3141 100644
--- a/website/docs/language/examples.md
+++ b/website/docs/language/examples.md
@@ -2,7 +2,7 @@
 title: Examples
 ---
 
-An extensive collection of examples is available in the [GitHub repository](https://github.com/CashScript/cashscript/tree/master/examples). Below we discuss a few of these examples in more details and go through the functionality.
+An extensive collection of examples is available in the [GitHub repository](https://github.com/CashScript/cashscript/tree/master/examples). Below we discuss a few of these examples in more details and go through their functionality. These examples focus mainly on the CashScript syntax, while the [Examples page](/docs/sdk/examples) in the sdk section focuses more on the use of the SDK.
 
 ## Transfer With Timeout
 One interesting use case of Bitcoin Cash is using it for *paper tips*. With paper tips, you send a small amount of money to an address, and print the corresponding private key on a piece of paper. Then you can hand out these pieces of paper as a tip or gift to people in person. In practice, however, people might not know what to do with these gifts or they might lose or forget about it.
@@ -26,10 +26,12 @@ contract TransferWithTimeout(pubkey sender, pubkey recipient, int timeout) {
 }
 ```
 
+For an example of how to put this contract to use in a JavaScript application, see the [SDK examples page](/docs/sdk/examples#transfer-with-timeout)
+
 ## HodlVault
 For better or worse, HODLing and waiting for price increases is one of the main things people want to do with their cryptocurrency. But it can be difficult to hold on to your cryptocurrency when the price is going down. So to prevent weak hands from getting the best of you, it's better to store your stash in a smart contract that enforces HODLing for you.
 
-This smart contract works by connecting with a price oracle. This price oracle is a trusted entity that publishes the BCH/USD price every block. This price is passed into the contract, and only if the price is higher than your target price you can spend the coins.
+This smart contract works by connecting with a price oracle. This price oracle is a trusted entity that publishes the BCH/USD price every block. This price is passed into the contract, and only if the price is higher than your target price, you can spend the coins.
 
 This involves some degree of trust in the price oracle, but since the oracle produces price data for everyone to use, their incentive to attack *your* smart contract is minimised. To improve this situation, you can also choose to connect with multiple oracle providers so you do not have to trust a single party.
 
@@ -65,11 +67,11 @@ contract HodlVault(pubkey ownerPk, pubkey oraclePk, int minBlock, int priceTarge
 ```
 
 ## Licho's Mecenas
-Donations are a great way to support the projects you love and periodic donations can incentivise continuous improvement to the product. But platforms like Patreon generally take fees of 10%+ and don't accept cryptocurrencies. Instead you can create a peer-to-peer smart contract that allows a recipient to withdraw a specific amount every month.
+Donations are a great way to support the projects you love, and periodic donations can incentivise continuous improvement to the product. But platforms like Patreon generally take fees of 10%+ and don't accept cryptocurrencies. Instead you can create a peer-to-peer smart contract that allows a recipient to withdraw a specific amount every month.
 
-The contract works by checking that a UTXO is at least 30 days old, after which it uses a covenant to enforce that the `pledge` amount is sent to the recipient, while the remainder is sent back to the contract itself. By sending it back the `tx.age` counter is effectively reset, meaning this process can only be repeated when another 30 days have past.
+The contract works by checking that a UTXO is at least 30 days old, after which it uses a covenant to enforce that the `pledge` amount is sent to the recipient, while the remainder is sent back to the contract itself. By sending it back, the `tx.age` counter is effectively reset, meaning this process can only be repeated when another 30 days have past.
 
-Due to the nature of covenants we have to be very specific about the outputs (amounts and destinations) of the transaction. This also means that we have to account for the special case where the remaining contract balance is lower than the `pledge` amount, meaning no remainder should be sent back. Finally we have to account for a small fee that has to be taken from the contract's balance to pay the miners.
+Due to the nature of covenants, we have to be very specific about the outputs (amounts and destinations) of the transaction. This also means that we have to account for the special case where the remaining contract balance is lower than the `pledge` amount, meaning no remainder should be sent back. Finally, we have to account for a small fee that has to be taken from the contract's balance to pay the miners.
 
 ```solidity
 contract Mecenas(bytes20 recipient, bytes20 funder, int pledge, int period) {
diff --git a/website/docs/language/functions.md b/website/docs/language/functions.md
index 9f9a6aa2..61b105b9 100644
--- a/website/docs/language/functions.md
+++ b/website/docs/language/functions.md
@@ -2,7 +2,7 @@
 title: Global Functions & Operators
 ---
 
-CashScript has several builtin functions for things like cryptographic and arithmetic applications, and it includes many common arithmetic and other operators that you would expect in a programming language.
+CashScript has several built-in functions for things like cryptographic and arithmetic applications, and it includes many common arithmetic and other operators that you would expect in a programming language.
 
 ## Arithmetic functions
 ### abs()
diff --git a/website/docs/language/globals.md b/website/docs/language/globals.md
index fef449fa..7ee90d52 100644
--- a/website/docs/language/globals.md
+++ b/website/docs/language/globals.md
@@ -155,7 +155,7 @@ bytes tx.inputs[i].tokenCategory
 Represents the `tokenCategory` of a specific input. Returns 0 when that specific input contains no tokens. When the input contains an NFT with a capability, the 32-byte `tokenCategory` is concatenated together with `0x01` for a mutable NFT and `0x02` for a minting NFT.
 
 :::note
-The `tokenCategory` is returned in the original un-reversed order. Explorers and wallets change the byte order by default but for Cashscript you need to be careful to use the un-reversed order.
+The `tokenCategory` is returned in the original unreversed order. Explorers and wallets change the byte order by default but for CashScript you need to be careful to use the unreversed order.
 :::
 
 #### tx.inputs[i].nftCommitment
@@ -204,7 +204,7 @@ bytes tx.output[i].tokenCategory
 Represents the `tokenCategory` of a specific output. Returns 0 when that specific output contains no tokens. When the output contains an NFT with a capability, the 32-byte `tokenCategory` is concatenated together with `0x01` for a mutable NFT and `0x02` for a minting NFT.
 
 :::note
-The `tokenCategory` is returned in the original un-reversed order. Explorers and wallets change the byte order by default but for Cashscript you need to be careful to use the un-reversed order.
+The `tokenCategory` is returned in the original unreversed order. Explorers and wallets change the byte order by default but for CashScript you need to be careful to use the unreversed order.
 :::
 
 #### tx.output[i].nftCommitment
diff --git a/website/docs/language/types.md b/website/docs/language/types.md
index be16cb6c..63068a11 100644
--- a/website/docs/language/types.md
+++ b/website/docs/language/types.md
@@ -31,7 +31,7 @@ Note the lack of the `**` (exponentiation) operator as well as any bitwise opera
 
 ### Over- & Underflows
 
-The maximum range for 64-bit integers is `-9223372036854775807` to `9223372036854775807`, operations exceeding these limits will fail the transaction. So operations like summation, subtraction and multiplation should take in to account these boundry cases with over- or underflows.
+The maximum range for 64-bit integers is `-9223372036854775807` to `9223372036854775807`, operations exceeding these limits will fail the transaction. So operations like summation, subtraction and multiplication should take into account these boundary cases with over- or underflows.
 
 :::caution
 Contract authors should always consider whether `+`, `-` and `*` operations can cause under- or overflows and how this would impact contract security.
@@ -104,7 +104,7 @@ bytes noCapability = 0x;
 ```
 
 ## Bytes types with semantic meaning
-Some byte sequences hold specific meanings inside Bitcoin Cash contracts. These have been granted their own types separate from the regular `bytes` type.
+Some byte sequences hold specific meanings inside Bitcoin Cash contracts. These have been granted their own types, separate from the regular `bytes` type.
 
 ### Public Key
 `pubkey`: Byte sequence representing a public key. Generally 33 bytes long.
@@ -176,10 +176,10 @@ bytes4 integer = bytes4(25);
 
 ### Int to Byte Casting
 
-When casting integer types to bytes of a certain size, the integer value is padded with zeros. e.g. `bytes4(0) == 0x00000000`. It is also possible to pad with a variable number of zeros, by passing in a `size` parameter, which indicates the size of the output. e.g. `bytes(0, 4 - 2) == 0x0000`. The size casting can be a very important feature when keeping local state in an nftCommitment or in the simulated state.
+When casting integer types to bytes of a certain size, the integer value is padded with zeros, e.g. `bytes4(0) == 0x00000000`. It is also possible to pad with a variable number of zeros by passing in a `size` parameter, which indicates the size of the output, e.g. `bytes(0, 4 - 2) == 0x0000`. The size casting can be a very important feature when keeping local state in an nftCommitment or in the simulated state.
 
 :::note
-VM numbers follow Script Number format (A.K.A. CSCriptNum), to convert VM number to bytes or the revserse, it's recommended to use helperfunctions for these conversions from libraries like Libauth.
+VM numbers follow Script Number format (A.K.A. CSCriptNum), to convert VM number to bytes or the reverse, it's recommended to use helper functions for these conversions from libraries like Libauth.
 :::
 
 
diff --git a/website/docs/sdk/examples.md b/website/docs/sdk/examples.md
index a9534d72..79028e61 100644
--- a/website/docs/sdk/examples.md
+++ b/website/docs/sdk/examples.md
@@ -2,7 +2,7 @@
 title: Examples
 ---
 
-An extensive collection of examples is available in the [GitHub repository][github-examples]. Below we discuss a few of these examples in more details. These examples focus mainly on the use of the SDK, while the [Examples page](/docs/language/examples) in the language section focuses more on the CashScript syntax.
+An extensive collection of examples is available in the [GitHub repository][github-examples]. Below we discuss a few of these examples in more detail. These examples focus mainly on the use of the SDK, while the [Examples page](/docs/language/examples) in the language section focuses more on the CashScript syntax.
 
 ## Transfer With Timeout
 The idea of this smart contract is explained on the [Language Examples page](/docs/language/examples#transfer-with-timeout). The gist is that it allows you to send an amount of BCH to someone, but if they don't claim the sent amount, it can be recovered by the sender.
@@ -21,17 +21,18 @@ contract TransferWithTimeout(pubkey sender, pubkey recipient, int timeout) {
 }
 ```
 
-Now to put this smart contract in use in a JavaScript application we have to use the CashScript SDK in combination with a BCH library such as [BCHJS][bchjs], [bitcore-lib-cash][bitcore] or [Libauth][libauth]. These libraries are used to generate public/private keys for the contract participants. Then these keys can be used in the CashScript SDK. The key generation code is left out of this example, since this works differently for every library.
+Now to put this smart contract to use in a JavaScript application, we have to use the CashScript SDK in combination with a BCH library such as [BCHJS][bchjs], [bitcore-lib-cash][bitcore] or [Libauth][libauth]. These libraries are used to generate public/private keys for the contract participants. Then these keys can be used in the CashScript SDK. The key generation code is left out of this example, since this works differently for every library.
 
 ```ts title="TransferWithTimeout.js"
 import { Contract, SignatureTemplate } from 'cashscript';
-import { alicePriv, alicePub, bobPriv, bobPub } from './somewhere.js';
+import { alicePub, bobPriv, bobPub } from './somewhere.js';
 import artifact from './transfer_with_timeout.json';
 
 // Instantiate a new contract using the artifact and constructor arguments:
 // { sender: alicePub, recipient: bobPub, timeout: 1000000 }
 // No network provider is provided, so the default ElectrumNetworkProvider is used
-const contract = new Contract(artifact, [alicePub, bobPub, 1000000n], options:{addressType: 'p2sh20'});
+const options = { addressType: 'p2sh20' };
+const contract = new Contract(artifact, [alicePub, bobPub, 1000000n], options);
 
 // Display contract address and balance
 console.log('contract address:', contract.address);
@@ -43,13 +44,14 @@ const txDetails = await contract.functions
   .transfer(new SignatureTemplate(bobPriv))
   .to('bitcoincash:qrhea03074073ff3zv9whh0nggxc7k03ssh8jv9mkx', 10000n)
   .send();
+
 console.log(txDetails);
 ```
 
 ## Memo.cash Announcement
 [Memo.cash](https://memo.cash) is a Twitter-like social network based on Bitcoin Cash. It uses `OP_RETURN` outputs to post messages on-chain. By using a covenant we can create an example contract whose only job is to post Isaac Asimov's first law of smart contracts to Memo.cash. Just to remind its fellow smart contracts.
 
-This contract expects a hardcoded transaction fee of 1000 satoshis. This is necessary due to the nature of covenants (See the [Licho's Mecenas example](/docs/language/examples#lichos-mecenas) for more information on this). The remaining balance after this transaction fee might end up being lower than 1000 satoshis, which means that the contract does not have enough leftover to make another announcement.
+This contract expects a hardcoded transaction fee of 1000 satoshis. This is necessary due to the nature of covenants (See the [Licho's Mecenas example](/docs/language/examples#lichos-mecenas) for more information on this). The remaining balance after this transaction fee might end up being lower than 1000 satoshis, which means that the contract does not have enough left over to make another announcement.
 
 To ensure that this leftover money does not get lost in the contract, the contract performs an extra check, and adds the remainder to the transaction fee if it's too low.
 
@@ -85,7 +87,7 @@ contract Announcement() {
 }
 ```
 
-The CashScript code above ensures that the smart contract **can only** be used in the way specified in the code. But the transaction needs to be created by the SDK, and to ensure that it complies with the rules of the smart contract, we need to use some of the more advanced options of the SDK.
+The CashScript code above ensures that the smart contract **can only** be used in the way specified in the code. But the transaction needs to be created by the SDK. To ensure that it complies with the rules of the smart contract, we need to use some of the more advanced options of the SDK.
 
 ```ts title="Announcement.js"
 import { ElectrumNetworkProvider, Contract, SignatureTemplate } from 'cashscript';
@@ -98,7 +100,8 @@ const addressType = 'p2sh20';
 
 // Instantiate a new contract using the compiled artifact and network provider
 // AND providing the constructor parameters (none)
-const contract = new Contract(artifact, [], , options:{ provider, addressType});
+const options = { provider, addressType};
+const contract = new Contract(artifact, [], options);
 
 // Display contract address, balance, opcount, and bytesize
 console.log('contract address:', contract.address);
diff --git a/website/docs/sdk/instantiation.md b/website/docs/sdk/instantiation.md
index 4d08108a..71d8fd26 100644
--- a/website/docs/sdk/instantiation.md
+++ b/website/docs/sdk/instantiation.md
@@ -2,14 +2,14 @@
 title: Contract Instantiation
 ---
 
-Before interacting with smart contracts on the BCH network, the CashScript SDK needs to instantiate a `Contract` object. This is done by providing the contract's information and constructor arguments. After this instantiation, the CashScript SDK can interact with BCH contracts.
+Before interacting with a smart contract on the BCH network, the CashScript SDK needs to instantiate a `Contract` object. This is done by providing the contract's information and constructor arguments. After this instantiation, the CashScript SDK can interact with the BCH contract.
 
 :::note
 CashScript only offers a JavaScript SDK, but CashScript contracts can be integrated into other languages as well. Because there are no ready-to-use SDKs available for them, this is considered advanced usage.
 :::
 
 ## Contract class
-The `Contract` class is used to represent a CashScript contract in a JavaScript object. These objects can be used to retrieve information such as the contract's address and balance. They can be used to interact with the contract by calling the contract's functions.
+The `Contract` class is used to represent a CashScript contract in a JavaScript object. These objects can be used to retrieve information such as the contract's address and balance. They can also be used to interact with the contract by calling the contract's functions.
 
 ### Constructor
 ```ts
@@ -25,14 +25,14 @@ new Contract(
 
 A CashScript contract can be instantiated by providing an `Artifact` object, a list of constructor arguments, and optionally an options object configuring `NetworkProvider` and `addressType`.
 
-An `Artifact` object is the result of compiling a CashScript contract. See the [Language Documentation](/docs/language/artifacts) for more information on Artifacts. Compilation can be done using the standalone [`cashc` CLI](/docs/basics/compiler) or programmatically with the `cashc` NPM package (see [CashScript Compiler](#cashscript-compiler)).
+An `Artifact` object is the result of compiling a CashScript contract. See the [Language Documentation](/docs/language/artifacts) for more information on Artifacts. Compilation can be done using the standalone [`cashc` CLI](/docs/basics/compiler) or programmatically with the `cashc` NPM package (see [CashScript Compiler](/docs/basics/compiler#javascript-compilation)).
 
 The `NetworkProvider` option is used to manage network operations for the CashScript contract. By default, a mainnet `ElectrumNetworkProvider` is used, but the network providers can be configured. See the docs on [NetworkProvider](/docs/sdk/network-provider).
 
-The `addressType` option is used to choose between a `p2sh32` and `p2sh20` address for the CashScript contract. By default `p2sh32` is used because it has increased cryptographic security but it is not yet supported by all wallets.
+The `addressType` option is used to choose between a `p2sh20` and `p2sh32` address type for the CashScript contract. By default `p2sh32` is used because it has increased cryptographic security — but it is not yet supported by all wallets.
 
 :::caution
-P2sh32 was introduced because p2sh20 is cryptographically insecure for a large subset of smart contracts. For contracts holding large sums of BCH this provides an incentive to find a hash collision and hack the contract.
+p2sh32 was introduced because p2sh20 is cryptographically insecure for a large subset of smart contracts. For contracts holding large sums of BCH this provides an incentive to find a hash collision and hack the contract.
 :::
 
 #### Example
@@ -61,7 +61,7 @@ contract.address: string
 A contract's regular address (without token-support) can be retrieved through the `address` member field.
 
 :::note
-Wallets will not allow you to send CashTokens to this address, for that you must use the tokenAddress below. Wallets which have not upgraded might not recognize this new address type.
+Wallets will not allow you to send CashTokens to this address. For that you must use the [tokenAddress](#tokenaddress) below. Wallets which have not upgraded might not recognize this new address type.
 :::
 
 #### Example
@@ -156,7 +156,7 @@ contract.functions.<functionName>(...args: Argument[]): Transaction
 ```
 
 Once a smart contract has been instantiated, you can invoke a contract function to spend from the contract with the '[Simple transaction-builder](/docs/sdk/transactions)' by calling the function name under the `functions` member field of a contract object.
-To call these functions succesfully, the parameters provided to the function need to match ones defined in the CashScript code.
+To call these functions successfully, the provided parameters must match the function signature defined in the CashScript code.
 
 These contract functions return an incomplete `Transaction` object, which needs to be completed by providing outputs of the transaction. For more information see the [Simple transaction-builder](/docs/sdk/transactions) page.
 
@@ -177,7 +177,7 @@ contract.unlock.<functionName>(...args: Argument[]): Unlocker
 ```
 
 Once a smart contract has been instantiated, you can invoke a contract function on a smart contract UTXO to use the '[Advanced transaction-builder](/docs/sdk/transactions-advanced)' by calling the function name under the `unlock` member field of a contract object.
-To call these functions succesfully, the parameters provided to the function need to match ones defined in the CashScript code.
+To call these functions successfully, the provided parameters must match the function signature defined in the CashScript code.
 
 These contract functions return an incomplete `transactionBuilder` object, which needs to be completed by providing outputs of the transaction. For more information see the [Advanced transaction-builder](/docs/sdk/transactions-advanced) page.
 
@@ -194,7 +194,7 @@ transactionBuilder.addInput(contractUtxos[0], contract.unlock.spend());
 new SignatureTemplate(signer: Keypair | Uint8Array | string, hashtype?: HashType)
 ```
 
-You may notice the `SignatureTemplate` object in the example above. When a contract function has a `sig` parameter, it requires a cryptographic signature over the spending transaction. But to generate this signature, the transaction needs to be built first, which is not yet the case when a contract function is first called.
+You may notice the `SignatureTemplate` object in the [example](#example-8) above. When a contract function has a `sig` parameter, it requires a cryptographic signature over the spending transaction. But to generate this signature, the transaction needs to be built first, which is not yet the case when a contract function is first called.
 
 So in the place of a signature, a `SignatureTemplate` can be passed, which will automatically generate the correct signature using the `signer` parameter. This signer can be any representation of a private key, including [BCHJS' `ECPair`][ecpair], [bitcore-lib-cash' `PrivateKey`][privatekey], [WIF strings][wif], or raw private key buffers. This ensures that any BCH library can be used.
 
diff --git a/website/docs/sdk/network-provider.md b/website/docs/sdk/network-provider.md
index d4a8d08e..52edc1e3 100644
--- a/website/docs/sdk/network-provider.md
+++ b/website/docs/sdk/network-provider.md
@@ -97,7 +97,7 @@ All network functionality that the CashScript SDK needs is encapsulated in a net
 new MockNetworkProvider()
 ```
 
-The `MockNetworkProvider` is a special network provider that allows you to evaluate transactions locally without interacting with the Bitcoin Cash network. This is useful when writing automated tests for your contracts, or when debugging your contract locally. You can read more about the `MockNetworkProvider` and automated tests on the [testing-setup](/docs/sdk/testing-setup) page.
+The `MockNetworkProvider` is a special network provider that allows you to evaluate transactions locally without interacting with the Bitcoin Cash network. This is useful when writing automated tests for your contracts, or when debugging your contract locally. You can read more about the `MockNetworkProvider` and automated tests on the [testing setup](/docs/sdk/testing-setup) page.
 
 #### Example
 ```ts
@@ -108,13 +108,17 @@ provider.addUtxo(contractAddress, newUtxo);
 
 ### Other NetworkProviders
 
-There are two alternative network providers implemented. There is the `FullStackNetworkProvider` which uses [FullStack.cash][fullstack]' infrastructure to connect to the BCH network. There's also the `BitcoinRpcNetworkProvider` uses a direct connection to a Bitcoin Cash node. Currently neither supports CashTokens, so it is recommended to use the ElectrumNetworkProvider.
+There are two alternative network providers implemented:
+- `FullStackNetworkProvider`: uses [FullStack.cash][fullstack]' infrastructure to connect to the BCH network. 
+- `BitcoinRpcNetworkProvider`: uses a direct connection to a Bitcoin Cash node. 
+
+Currently neither supports CashTokens, so it is recommended to use the `ElectrumNetworkProvider`.
 
 ### Custom NetworkProviders
 A big strength of the NetworkProvider setup is that it allows you to implement custom providers. So if new BCH libraries are created in the future, it is simple to use them with CashScript. Custom NetworkProviders also potentially enables the CashScript SDK to be used with other (partially) compatible networks, such as BTC or BSV.
 
 :::info
-To implement a Custom NetworkProvider refer to the [NetworkProvider interface](https://github.com/CashScript/cashscript/blob/master/packages/cashscript/src/network/NetworkProvider.ts).
+To implement a Custom NetworkProvider, refer to the [NetworkProvider interface](https://github.com/CashScript/cashscript/blob/master/packages/cashscript/src/network/NetworkProvider.ts).
 :::
 
 
diff --git a/website/docs/sdk/testing-setup.md b/website/docs/sdk/testing-setup.md
index 5fe11b4c..6bd3d362 100644
--- a/website/docs/sdk/testing-setup.md
+++ b/website/docs/sdk/testing-setup.md
@@ -40,14 +40,14 @@ If you're using a different testing framework, you can test for `console.log` va
 
 ## Automated testing
 
-With local transaction evaluation and debugging, it is possible to write efficient automated tests for CashScript contracts and test specific contract behaviour and check `console.log` values and `require` error messages.
+With local transaction evaluation and debugging, it is possible to write efficient automated tests for CashScript contracts to test specific contract behaviour and check `console.log` values and `require` error messages.
 
 ### Logging values
 
-You can log values during debug evaluation using the `console.log` statement. Any variables or primitive values (such as ints, strings, bytes, etc) can be logged.
+You can log values during debug evaluation using the `console.log` statement. Any variables or primitive values (such as ints, strings, bytes, ...) can be logged.
 
 :::note
-Logging is only available in debug evaluation of a transaction, but has no impact on the compiled bytecode or regular (non-debug) execution.
+Logging is only available in debug evaluation of a transaction. It has no impact on the compiled bytecode or regular (non-debug) execution.
 :::
 
 ### Error messages
diff --git a/website/docs/sdk/transactions-advanced.md b/website/docs/sdk/transactions-advanced.md
index e3a4642e..1a29522d 100644
--- a/website/docs/sdk/transactions-advanced.md
+++ b/website/docs/sdk/transactions-advanced.md
@@ -2,7 +2,7 @@
 title: Advanced Transaction Builder
 ---
 
-With the introduction of newer smart contract features to BCH, such as native introspection and CashTokens, we've seen use cases for combining UTXOs of multiple different smart contracts within a single transaction - such as [Fex][fex]. The [simplified transaction builder][transactions-simple] only operates on a single smart contract, so to support more advanced use cases, you can use the Advanced Transaction Builder.
+With the introduction of newer smart contract features to BCH, such as native introspection and CashTokens, we've seen use cases for combining UTXOs of multiple different smart contracts within a single transaction — such as [Fex][fex]. The [simple transaction builder][transactions-simple] only operates on a single smart contract. To support more advanced use cases, you can use the Advanced Transaction Builder.
 
 The Advanced Transaction Builder supports adding UTXOs from any number of different smart contracts and P2PKH UTXOs. While the simplified transaction builder automatically selects UTXOs for you and adds change outputs, the advanced transaction builder requires you to provide the UTXOs yourself and manage change carefully.
 
@@ -35,7 +35,7 @@ const transactionBuilder = new TransactionBuilder({ provider });
 transactionBuilder.addInput(utxo: Utxo, unlocker: Unlocker, options?: InputOptions): this
 ```
 
-Adds a single input UTXOs to the transaction that can be unlocked using the provided unlocker. The unlocker can be derived from a `SignatureTemplate` or a `Contract` instance's spending functions. The `InputOptions` object can be used to specify the sequence number of the input.
+Adds a single input UTXO to the transaction that can be unlocked using the provided unlocker. The unlocker can be derived from a `SignatureTemplate` or a `Contract` instance's spending functions. The `InputOptions` object can be used to specify the sequence number of the input.
 
 :::note
 It is possible to create custom unlockers by implementing the `Unlocker` interface. Most use cases are covered by the `SignatureTemplate` and `Contract` classes.
@@ -125,7 +125,7 @@ transactionBuilder.addOutput({
 });
 
 transactionBuilder.addOutputs([
-  { to: aliceAddress, amount: 50_000n }
+  { to: aliceAddress, amount: 50_000n },
   { to: bobAddress, amount: 50_000n },
 ]);
 ```
@@ -135,7 +135,7 @@ transactionBuilder.addOutputs([
 transactionBuilder.addOpReturnOutput(chunks: string[]): this
 ```
 
-Adds an OP_RETURN output to the transaction with the provided data chunks in string format. If the string is `0x`-prefixed, it is treated as a hex string, otherwise it is treated as a UTF-8 string.
+Adds an OP_RETURN output to the transaction with the provided data chunks in string format. If the string is `0x`-prefixed, it is treated as a hex string. Otherwise it is treated as a UTF-8 string.
 
 #### Example
 ```ts
@@ -151,6 +151,11 @@ transactionBuilder.setLocktime(locktime: number): this
 
 Sets the locktime for the transaction to set a transaction-level absolute timelock (see [Timelock documentation][bitcoin-wiki-timelocks] for more information). The locktime can be set to a specific block height or a unix timestamp.
 
+#### Example
+```ts
+// Set locktime one day from now
+transactionBuilder.setLocktime(((Date.now() / 1000) + 24 * 60 * 60) * 1000);
+```
 
 ### setMaxFee()
 ```ts
diff --git a/website/docs/sdk/transactions.md b/website/docs/sdk/transactions.md
index bf78e786..7a2d8f1e 100644
--- a/website/docs/sdk/transactions.md
+++ b/website/docs/sdk/transactions.md
@@ -72,19 +72,19 @@ The built-in UTXO selection is generally sufficient. But there are specific use
 
 ### fromP2PKH()
 ```ts
-fromP2PKH(input: Utxo, template: SignatureTemplate): this;
-fromP2PKH(inputs: Utxo[], template: SignatureTemplate): this;
+transaction.fromP2PKH(input: Utxo, template: SignatureTemplate): this;
+transaction.fromP2PKH(inputs: Utxo[], template: SignatureTemplate): this;
 ```
 
 The `fromP2PKH()` function allows you to provide a list of P2PKH UTXOs to be used in the transaction. The passed `SignatureTemplate` is used to sign these UTXOs. This function can be called any number of times, and the provided UTXOs will be added to the list of earlier added UTXOs.
 
 :::note
-If you are using meep to debug a `fromP2PKH()` transaction, meep will always use the first input for the debugging. So if you want to debug the smart contract bytecode, make sure that the first input is not a P2PKH input.
+If you are using [meep](https://github.com/gcash/meep) to debug a `fromP2PKH()` transaction, meep will always use the first input for the debugging. So if you want to debug the smart contract bytecode, make sure that the first input is not a P2PKH input.
 :::
 
 #### Example
 ```ts
-import { bobAddress, bobPrivateKey } from 'somewhere';
+import { bobAddress, bobPrivateKey } from './somewhere';
 import { ElectrumNetworkProvider, SignatureTemplate } from 'cashscript';
 
 const provider = new ElectrumNetworkProvider();
@@ -165,12 +165,17 @@ The `withoutTokenChange()` function allows you to disable the change output for
 Be sure to check that the remaining amount (sum of inputs - sum of outputs) is not too high. The difference will be burned and cannot be reclaimed.
 :::
 
+#### Example
+```ts
+.withoutTokenChange()
+```
+
 ### withAge()
 ```ts
 transaction.withAge(age: number): this
 ```
 
-The `withAge()` function allows you to specify the minimum age of the transaction inputs. This is necessary if you want to to use the `tx.age` CashScript functionality, and the `age` parameter passed into this function will be the value of `tx.age` inside the smart contract. For more information, refer to [BIP68][bip68].
+The `withAge()` function allows you to specify the minimum age of the transaction inputs. This is necessary if you want to use the `tx.age` CashScript functionality. The `age` parameter passed into this function will be the value of `tx.age` inside the smart contract. For more information, refer to [BIP68][bip68].
 
 #### Example
 ```ts
@@ -248,7 +253,7 @@ If you want to debug a transaction locally instead of sending it to the network,
 
 If you prefer a lower-level debugging experience, you can call the `bitauthUri()` function on the transaction. This will return a URI that can be opened in the BitAuth IDE. This URI is also displayed in the console whenever a transaction fails.
 
-You can read more about debugging transactions [here](/docs/guides/debugging).
+You can read more about debugging transactions on the [debugging page](/docs/guides/debugging).
 
 :::caution
 It is unsafe to debug transactions on mainnet as private keys will be exposed to BitAuth IDE and transmitted over the network.
@@ -259,7 +264,7 @@ Transactions can fail for a number of reasons. Most of these are related to the
 
 This `Reason` enum only includes errors that are related to smart contract execution, so other reasons have to be caught separately. Besides the `Reason` enum, there are also several error classes that can be caught and acted on:
 
-* **`FailedRequireError`**, signifies a failed require statement. This includes the following reasons:
+* **`FailedRequireError`** signifies a failed require statement. This includes the following reasons:
   * `Reason.EVAL_FALSE`
   * `Reason.VERIFY`
   * `Reason.EQUALVERIFY`
@@ -267,10 +272,10 @@ This `Reason` enum only includes errors that are related to smart contract execu
   * `Reason.CHECKSIGVERIFY`
   * `Reason.CHECKDATASIGVERIFY`
   * `Reason.NUMEQUALVERIFY`
-* **`FailedTimeCheckError`**, signifies a failed time check using `tx.time` or `tx.age`. This includes the following reasons:
+* **`FailedTimeCheckError`** signifies a failed time check using `tx.time` or `tx.age`. This includes the following reasons:
   * `Reason.NEGATIVE_LOCKTIME`
   * `Reason.UNSATISFIED_LOCKTIME`
-* **`FailedSigCHeckError`**, signifies a failed signature check. This includes the following reasons:
+* **`FailedSigCHeckError`** signifies a failed signature check. This includes the following reasons:
   * `Reason.SIG_COUNT`
   * `Reason.PUBKEY_COUNT`
   * `Reason.SIG_HASHTYPE`
@@ -279,7 +284,7 @@ This `Reason` enum only includes errors that are related to smart contract execu
   * `Reason.SIG_NULLFAIL`
   * `Reason.SIG_BADLENGTH`
   * `Reason.SIG_NONSCHNORR`
-* **`FailedTransactionError`**, signifies a general fallback error. This includes all remaining reasons listed in the `Reason` enum as well as any other reasons unrelated to the smart contract execution.
+* **`FailedTransactionError`** signifies a general fallback error. This includes all remaining reasons listed in the `Reason` enum as well as any other reasons unrelated to the smart contract execution.
 
 ```ts
 enum Reason {
diff --git a/website/docs/showcase.md b/website/docs/showcase.md
index a404c1fd..3557b3be 100644
--- a/website/docs/showcase.md
+++ b/website/docs/showcase.md
@@ -26,7 +26,7 @@ Tapswap is the first non-custodial marketplace to trade CashTokens, both fungibl
     <a href="https://bitcatsheroes.club/" target="_blank"><img src="/img/bitcats.png" /></a>
 </div>
 
-Bitcats Heroes is the first collectibele NFT series on Bitcoin Cash. The project uses CashScript for its non-custodial minting contract. This way the NFT minting guarantees fair access and a transparent NFT launch. The minting page uses a web3 wallet connect feature to allow minting directly from the user's smart contract wallet.
+Bitcats Heroes is the first collectible NFT series on Bitcoin Cash. The project uses CashScript for its non-custodial minting contract. This way the NFT minting guarantees fair access and a transparent NFT launch. The minting page uses a web3 wallet connect feature to allow minting directly from the user's smart contract wallet.
 
 ## Cash-Ninjas
 
@@ -34,7 +34,7 @@ Bitcats Heroes is the first collectibele NFT series on Bitcoin Cash. The project
     <a href="https://ninjas.cash/" target="_blank"><img style={{borderRadius: '100%'}} src="/img/cashninjas.jpg" /></a>
 </div>
 
-Cash-Ninjas is a collectibele NFT project on Bitcoin Cash which focuses on building open-source tooling! The Cash-Ninjas project uses CashScript for its non-custodial, multi-threaded minting contract. The contract is open source for others to inspect and use the contract code. The Cash-Ninjas minting page uses wallet connect to allow minting directly from the user's smart contract wallet.
+Cash-Ninjas is a collectible NFT project on Bitcoin Cash which focuses on building open-source tooling! The Cash-Ninjas project uses CashScript for its non-custodial, multi-threaded minting contract. The contract is open source for others to inspect and use the contract code. The Cash-Ninjas minting page uses wallet connect to allow minting directly from the user's smart contract wallet.
 
 ## BCH Guru
 
@@ -58,7 +58,7 @@ The CashTokens Studio is an application for creating CashTokens and for their ma
     <a href="https://badgers.cash/" target="_blank"><img style={{borderRadius: '100%'}} src="/img/badgers.png" /></a>
 </div>
 
-BadgerCoin is a fungible CashToken using a novel distibution mechanism. BadgerCoins are earned through staking Bitcoin Cash in the Badgers Smart Contract. The staking duration is predetermined, and depending on the stake amount and period you earn tokens. The website allows for anyone to invoce contract unlocks.
+BadgerCoin is a fungible CashToken using a novel distibution mechanism. BadgerCoins are earned through staking Bitcoin Cash in the Badgers Smart Contract. The staking duration is predetermined, and depending on the stake amount and period you earn tokens. The website allows for anyone to invoke contract unlocks.
 
 ## BCHouse
 
diff --git a/website/src/pages/index.js b/website/src/pages/index.js
index 56ca1d04..fb588258 100755
--- a/website/src/pages/index.js
+++ b/website/src/pages/index.js
@@ -33,9 +33,9 @@ const features = [
     title: 'DeFi on Bitcoin Cash',
     description: (
       <>
-        Bitcoin Cash has had many script upgrades on such as CashTokens and transaction introspection.
-        Because of this DeFi is very much possible on Bitcoin Cash.
-        However, compared to EVM smart contracts work very differently due to BCH's UTXO
+        Bitcoin Cash has had many script upgrades, such as CashTokens and transaction introspection.
+        Because of this, DeFi is very much possible on Bitcoin Cash.
+        However, compared to EVM, smart contracts work very differently due to BCH's UTXO
         architecture.
       </>
     ),
@@ -44,9 +44,9 @@ const features = [
     title: 'Integrated Tooling',
     description: (
       <>
-        CashScript offers integrated tooling through the Javascript SDK.
+        CashScript offers integrated tooling through the JavaScript SDK.
         The SDK has utilities for easy transaction building and other network functionality.
-        CashScript has built-in debug tooling comaptible with the Bitauth-IDE to offer the best developer experience.  
+        CashScript has built-in debug tooling compatible with the Bitauth-IDE to offer the best developer experience.  
       </>
     ),
   },

From e426857dda701188a7ea34c278bf18ad4d7ce82c Mon Sep 17 00:00:00 2001
From: Mathieu Geukens <mr-zwets@protonmail.com>
Date: Tue, 18 Jun 2024 15:58:04 +0200
Subject: [PATCH 124/171] improve timelock docs

---
 website/docs/language/globals.md | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/website/docs/language/globals.md b/website/docs/language/globals.md
index 7ee90d52..2459b1a9 100644
--- a/website/docs/language/globals.md
+++ b/website/docs/language/globals.md
@@ -32,33 +32,33 @@ It can be difficult to fully grasp the intricacies of time locks, so if you're s
 ### tx.time
 `tx.time` is used to create *absolute* time locks. The value of `tx.time` can either represent the block number of the spending transaction or its timestamp. When comparing it with values below `500,000,000`, it is treated as a blocknumber, while higher values are treated as a timestamp.
 
-Due to limitations in the underlying Bitcoin Script, `tx.time` can only be used in the following way:
+`tx.time` corresponds to the `nLocktime` field of the current transaction using the `OP_CHECKLOCKTIMEVERIFY` opcode. Because of this `tx.time` can only be used in the following way:
 
 ```solidity
 require(tx.time >= <expression>);
 ```
 
-Because of the way time locks work, **a corresponding time lock needs to be added to the transaction**. The CashScript SDK automatically sets this *transaction level* time lock to the most recent block number, as this is the most common use case. If you need to use a different block number or timestamp, this should be passed into the CashScript SDK using the [`withTime()`][withTime()] function. If the default matches your use case, **no additional actions are required**.
-
 :::note
-`tx.time` corresponds to the `nLocktime` field of the current transaction and the `OP_CHECKLOCKTIMEVERIFY` opcode.
+To access the value of the `nLocktime` field for assignment, use the `tx.locktime` introspection variable.
 :::
 
+Because of the way time locks work, **a corresponding time lock needs to be added to the transaction**. The CashScript SDK automatically sets this *transaction level* time lock to the most recent block number, as this is the most common use case. If you need to use a different block number or timestamp, this should be passed into the CashScript SDK using the [`withTime()`][withTime()] function. If the default matches your use case, **no additional actions are required**.
+
 ### tx.age
 `tx.age` is used to create *relative* time locks. The value of `tx.age` can either represent a number of blocks, or a number of *chunks*, which are 512 seconds. The corresponding *transaction level* time lock determines which of the two options is used.
 
-Due to limitations in the underlying Bitcoin Script, `tx.age` can only be used in the following way:
+`tx.age` corresponds to the `nSequence` field of the current *UTXO* using the `OP_CHECKSEQUENCEVERIFY` opcode. Because of this `tx.age` can only be used in the following way:
 
 ```solidity
 require(tx.age >= <expression>);
 ```
 
-Because of the way time locks work, **a corresponding time lock needs to be added to the transaction**. This can be done in the CashScript SDK using the [`withAge()`][withAge()] function. However, the value passed into this function will always be treated as a number of blocks, so **it is currently not supported to use `tx.age` as a number of second chunks**.
-
 :::note
-`tx.age` corresponds to the `nSequence` field of the current *UTXO* and the `OP_CHECKSEQUENCEVERIFY` opcode.
+To access the value of the `nSequence` field for assignment, use the `tx.inputs[i].sequenceNumber` introspection variable.
 :::
 
+Because of the way time locks work, **a corresponding time lock needs to be added to the transaction**. This can be done in the CashScript SDK using the [`withAge()`][withAge()] function. However, the value passed into this function will always be treated as a number of blocks, so **it is currently not supported to use `tx.age` as a number of second chunks**.
+
 ## Introspection variables
 Introspection functionality is used to create *covenant* contracts. Covenants are a technique used to put constraints on spending the money inside a smart contract. The main use case of this is limiting the addresses where money can be sent and the amount sent. To explore the possible uses of covenants inside smart contracts, read the [CashScript Covenants Guide][covenants-guide].
 
@@ -89,10 +89,10 @@ Represents the version of the current transaction. Different transaction version
 int tx.locktime
 ```
 
-Represents the `nLocktime` field of the transaction.
+Represents the `nLocktime` field of the transaction. This is similar to the [`tx.time`][tx.time] global variable but `tx.time` can only be used in `require` statements, not for variable declaration.
 
-:::note
-`tx.locktime` is similar to the [`tx.time`][tx.time] global variable. It is recommended to only use `tx.locktime` for adding `nLocktime` to simulated state and [`tx.time`][tx.time] in all other cases.
+:::tip
+ The usecase for `tx.locktime` is to read the `nLocktime` value and add to the local state. Example usage for this is demonstrated in the [Sablier example](/docs/guides/covenants#keeping-local-state-in-nfts).
 :::
 
 ### tx.inputs

From 136f1b97234dea2b4d67def95b0a76b15663b626 Mon Sep 17 00:00:00 2001
From: Mathieu Geukens <mr-zwets@protonmail.com>
Date: Fri, 21 Jun 2024 19:19:07 +0200
Subject: [PATCH 125/171] add the compiled code for TransferWithTimeout

---
 website/docs/basics/getting-started.md |  6 +++++-
 website/docs/guides/debugging.md       | 28 ++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/website/docs/basics/getting-started.md b/website/docs/basics/getting-started.md
index d7f5df8c..49b393ab 100644
--- a/website/docs/basics/getting-started.md
+++ b/website/docs/basics/getting-started.md
@@ -73,7 +73,11 @@ The next step after writing your smart contract is using the command line compil
 cashc ./TransferWithTimeout.cash --output ./TransferWithTimeout.json
 ```
 
-This will create an artifact file `TransferWithTimeout.json` from your CashScript file. It can be helpful to take a look at the generated artifact file to understand what the `cashc` compiler is generating.
+This will create an artifact file `TransferWithTimeout.json` from your CashScript file. If you look at the `bytecode` property on the artifact you will see the raw BCH script generated by the `cashc` compiler:
+
+```
+OP_3 OP_PICK OP_0 OP_NUMEQUAL OP_IF OP_4 OP_ROLL OP_ROT OP_CHECKSIG OP_NIP OP_NIP OP_NIP OP_ELSE OP_3 OP_ROLL OP_1 OP_NUMEQUALVERIFY OP_3 OP_ROLL OP_SWAP OP_CHECKSIGVERIFY OP_SWAP OP_CHECKLOCKTIMEVERIFY OP_2DROP OP_1 OP_ENDIF
+```
 
 ## Creating a CashScript Transaction
 
diff --git a/website/docs/guides/debugging.md b/website/docs/guides/debugging.md
index 9930cb33..2e041bc0 100644
--- a/website/docs/guides/debugging.md
+++ b/website/docs/guides/debugging.md
@@ -44,6 +44,32 @@ const uri = await transaction.bitauthUri();
 It is unsafe to debug transactions on mainnet as private keys will be exposed to BitAuth IDE and transmitted over the network.
 :::
 
+The Bithauth IDE will show you the two-way mapping between the CashScript contract code generated opcodes. Here is [a Bithauth IDE link][BitauthIDE] for the basic `TransferWithTimeout` contract as an example:
+
+```js
+// "TransferWithTimeout" contract constructor parameters
+<timeout> // int = <0x07>
+<recipient> // pubkey = <0x0262f5c18adf3d9800c18b5e63fa6505ec8eb1d49c65855d62aea698425a39966e>
+<sender> // pubkey = <0x0262f5c18adf3d9800c18b5e63fa6505ec8eb1d49c65855d62aea698425a39966e>
+
+// bytecode
+                                                /* pragma cashscript >= 0.10.0;                                                  */
+                                                /*                                                                              */
+                                                /* contract TransferWithTimeout(pubkey sender, pubkey recipient, int timeout) { */
+                                                /*     // Require recipient's signature to match                                */
+OP_3 OP_PICK OP_0 OP_NUMEQUAL OP_IF             /*     function transfer(sig recipientSig) {                                    */
+OP_4 OP_ROLL OP_2 OP_ROLL OP_CHECKSIG           /*         require(checkSig(recipientSig, recipient));                          */
+OP_NIP OP_NIP OP_NIP OP_ELSE                    /*     }                                                                        */
+                                                /*                                                                              */
+                                                /*     // Require timeout time to be reached and sender's signature to match    */
+OP_3 OP_ROLL OP_1 OP_NUMEQUAL OP_VERIFY         /*     function timeout(sig senderSig) {                                        */
+OP_3 OP_ROLL OP_1 OP_ROLL OP_CHECKSIG OP_VERIFY /*         require(checkSig(senderSig, sender));                                */
+OP_1 OP_ROLL OP_CHECKLOCKTIMEVERIFY OP_DROP     /*         require(tx.time >= timeout);                                         */
+OP_1 OP_NIP                                     /*     }                                                                        */
+OP_ENDIF                                        /* }                                                                            */
+                                                /*      
+```
+
 ## Advanced Transaction Builder
 
 Because the advanced transaction builder does not yet support the advanced debugging tooling, you are left with just a few strategies.
@@ -61,3 +87,5 @@ To use this strategy effectively, the contract setup with funding should be auto
 ### Single Check Contract
 
 If it is unclear whether the issue is the contract invocation or the `require` statement in the CashScript file, it might prove handy to create a 'single-check' contract, which has only the previously failing `require` statement. The goal then is to discover if your transaction is the issue, and you are violating a correct contract requirement, or whether the contract is enforcing an incorrect/impossible condition to hold in the spending transaction.
+
+[BitauthIDE]: https://ide.bitauth.com/import-template/eJzVWG1v2zYQ_isCMWBJ4drUG21lbYAmcRsjaZIl6YqhDgyKomItNuVRVJbA8H_fUe9-qeF06Yfxg0WRvLvnjs9RR8_RLwkb8ylFB2is1Cw56HSigLf9SNFUjdssnnZ0hwsVMaqiWLxVfDqbUMXfPuJ2Ltv-K4kFaqGAJ0xGM70K1A2ms1gqHhihjKcGo8k4n4WFgk45rLiVVCQhl18jNb6NpjxO9WSSznJBdPANHR2fjixs2SPsorsWeuQyybTjFtKQVMQTdDBHMypBpYJZ_baM4zgWSlKmDCZ55oFBBYBKBcteGqIVsKWxXFei0Uxi9gAjqdCdUfamQVEZUX-SI5GcRbMIsI2S6H4dzLBecBPdD1Ft3ojDGtQQqSI2Q1TDaorCqHqe6dEz_owWAJOLgMtNFvOZVVtqHCUGK2JT2yjUVNq_0smEqxOqqDZSIdjq2Y6mamXfsaYKTmywVUztaElV5Npopwz7KALfn9bN3WT9eneyZYaKDf7EWap4bWhF00Z70Bqkmi-xKaNykvCMbfyRTlJItFGpVZOtMJQLVeyEkU5niTWbCD4U75boqdNXxFLqvqAqlbwNOEcQqVmqkkMDVMLMUAwF9Fa8j0QVZ1C77HcmGQllvDfe4cOhqFIG3MpzCCJQ-qufkbi_zQM1s5KxbdUB3ejlhnMDHGZVnsciUTJlKpbLzhc0WIL3hLuHzbhkk7PUf-DPxbxFrNBlZo8GoR14PYyh77uc2CElLnY563HfDByPEbfnugGxKKfE6zmWS23PI4Rr_Xla_Rzl2fb4z4qzOOBDYbywdd4YM0nvp7RxRhuH7w3c7rXxby_VZhhvOj-E4VXbD2KoKLSBYXvFvuU72Sq3sSJOK6NUQbF9Y_5f4gD7ec3_TiPJa_2_JkaVpvrsmVLFxrvE4fJqZBvwczU4PtNPrH8uvnzu__7lw7nuDz5uwlDle3mm7IF5o_kJ0k7u0AoMjjZ1fXmembSaL8en_eOzm8GndQy6yTwQe1BpsAewuteE0KoB7e9v4WqB4WJwZaw9-uc3_U0yBYbFLj7u0v7HeZE9ak4WJM-emoq-pimFDQqy0irPkO_ytcnJkgLmKif_6F8PPv65iqHmZJGTmpK5ud35uBXDGidrLNs4WWFoFXC2snEJw7rZ88vjs9vB535hF4ZPri-vmnFoYlBP7Wwf4MQuD5_dD-0mBp0Ou7SfkRc6DS9OVg6i7RhezX6J4aUyr5-bKK8MuYALRZzVhuslIAwWpVG_mFu7eH0QUJhSuKRxo5DXKfPPmOtE1AVy8Y3Pq9e8RNQ1Z1tr0iUq2CjLCd0vbxboNeoVtHSJeC2V1U1BK-yi9ZIeYV1zslRKsHukq8pTHt2PQcJaHtZfe3Rgds1e1_QcDLPwlc_vmDJ6hHCfFa8rFz3EnYAwSrnjmbbj-TYLzSBgVkg8jK0uDT3sU9-1AuZzjwQMRm2XEmb1HOLTrk1Qdi_IPra02upI6EocLgNzpKvyGEqMQe6Q2apGbmuZU6jgAItHHdMnNMDEcmyn1w2xF1oEguoHDrFcn1gcez4Ofdt1Qs58gu3ANonjEerYZtDTFTccL1wwfpFOfb35juXBdBd-y2IeivajiiXfUDKJFbpb3OWVvcrCaGGX2FaOtPRjTXS-0FfoScpvqIoT4Cc4hzFetHZb27U9Z9H8a8DSSRSnkvHLbWZLxGsKe8TrLu5gN_4FON-z9w==

From 53669cff6f5b39f7fe6241c8294152878aed43e6 Mon Sep 17 00:00:00 2001
From: Mathieu Geukens <mr-zwets@protonmail.com>
Date: Tue, 25 Jun 2024 09:25:15 +0200
Subject: [PATCH 126/171] use sidebars.js instead of auto-generated sidebar

---
 website/docusaurus.config.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/website/docusaurus.config.js b/website/docusaurus.config.js
index ffe5c2f8..ffef06c8 100755
--- a/website/docusaurus.config.js
+++ b/website/docusaurus.config.js
@@ -104,6 +104,9 @@ module.exports = {
         theme: {
           customCss: require.resolve('./src/css/custom.css'),
         },
+        docs: {
+          sidebarPath: './sidebars.js',
+        },
       },
     ],
   ],

From bca4580823640b82e829a3e73f922fcbea67f11c Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Tue, 25 Jun 2024 11:55:19 +0200
Subject: [PATCH 127/171] Add *all* require statements to artifact, not only
 the ones with messages

---
 examples/testing-suite/artifacts/example.json |   4 +-
 packages/cashc/src/compiler.ts                |   2 +-
 .../src/generation/GenerateTargetTraversal.ts |  36 +++---
 packages/cashc/test/generation/fixtures.ts    | 106 +++++++++++++++---
 .../cashscript/test/fixture/announcement.json |  23 +++-
 packages/cashscript/test/fixture/bigint.json  |  15 ++-
 .../test/fixture/bounded_bytes.json           |  11 +-
 .../cashscript/test/fixture/hodl_vault.json   |  27 ++++-
 packages/cashscript/test/fixture/mecenas.json |  35 +++++-
 .../cashscript/test/fixture/p2palindrome.json |  11 +-
 packages/cashscript/test/fixture/p2pkh.json   |  15 ++-
 .../test/fixture/simple_covenant.json         |  31 ++++-
 .../fixture/token_category_comparison.json    |  11 +-
 .../test/fixture/transfer_with_timeout.json   |  19 +++-
 packages/utils/src/artifact.ts                |   6 +-
 website/docs/language/artifacts.md            |   2 +-
 16 files changed, 277 insertions(+), 77 deletions(-)

diff --git a/examples/testing-suite/artifacts/example.json b/examples/testing-suite/artifacts/example.json
index bac84de7..36e61dcd 100644
--- a/examples/testing-suite/artifacts/example.json
+++ b/examples/testing-suite/artifacts/example.json
@@ -30,7 +30,7 @@
         ]
       }
     ],
-    "requireMessages": [
+    "requires": [
       {
         "ip": 4,
         "line": 4,
@@ -43,4 +43,4 @@
     "version": "0.10.0-next.3"
   },
   "updatedAt": "2024-04-15T03:55:07.781Z"
-}
\ No newline at end of file
+}
diff --git a/packages/cashc/src/compiler.ts b/packages/cashc/src/compiler.ts
index adfde685..d1b3d7ef 100644
--- a/packages/cashc/src/compiler.ts
+++ b/packages/cashc/src/compiler.ts
@@ -34,7 +34,7 @@ export function compileString(code: string): Artifact {
     bytecode: binToHex(scriptToBytecode(traversal.output)),
     sourceMap: traversal.sourceMap,
     logs: traversal.consoleLogs,
-    requireMessages: traversal.requireMessages,
+    requires: traversal.requires,
   };
 
   return generateArtifact(ast, optimisedBytecode, code, debug);
diff --git a/packages/cashc/src/generation/GenerateTargetTraversal.ts b/packages/cashc/src/generation/GenerateTargetTraversal.ts
index b6566a4d..55eff7e8 100644
--- a/packages/cashc/src/generation/GenerateTargetTraversal.ts
+++ b/packages/cashc/src/generation/GenerateTargetTraversal.ts
@@ -13,7 +13,7 @@ import {
   generateSourceMap,
   FullLocationData,
   LogEntry,
-  RequireMessage,
+  RequireStatement,
   PositionHint,
   SingleLocationData,
   StackItem,
@@ -65,7 +65,7 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
   output: Script = [];
   stack: string[] = [];
   consoleLogs: LogEntry[] = [];
-  requireMessages: RequireMessage[] = [];
+  requires: RequireStatement[] = [];
   finalStackUsage: Record<string, StackItem> = {};
 
   private scopeDepth = 0;
@@ -285,16 +285,13 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
     node.expression = this.visit(node.expression);
     this.emit(compileTimeOp(node.timeOp), { location: node.location, positionHint: PositionHint.END });
 
-    // TODO: Same comment as in require
-    if (node.message) {
-      this.requireMessages.push({
-        // We're removing 1 from the IP because the error message needs to match the OP_XXX_VERIFY, not the OP_DROP that
-        // is emitted directly after
-        ip: this.getMostRecentInstructionPointer() - 1,
-        line: node.location.start.line,
-        message: node.message,
-      });
-    }
+    this.requires.push({
+      // We're removing 1 from the IP because the error message needs to match the OP_XXX_VERIFY, not the OP_DROP that
+      // is emitted directly after
+      ip: this.getMostRecentInstructionPointer() - 1,
+      line: node.location.start.line,
+      message: node.message,
+    });
 
     this.popFromStack();
     return node;
@@ -305,16 +302,11 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
 
     this.emit(Op.OP_VERIFY, { location: node.location, positionHint: PositionHint.END });
 
-    // TODO: Add *all* require messages to the artifact, so we can report on line number for the failed require(),
-    // even if there is no message in the require() call
-    // TODO: We don't even have to display the Libauth message if we just say "this and this require failed"
-    if (node.message) {
-      this.requireMessages.push({
-        ip: this.getMostRecentInstructionPointer(),
-        line: node.location.start.line,
-        message: node.message,
-      });
-    }
+    this.requires.push({
+      ip: this.getMostRecentInstructionPointer(),
+      line: node.location.start.line,
+      message: node.message,
+    });
 
     this.popFromStack();
     return node;
diff --git a/packages/cashc/test/generation/fixtures.ts b/packages/cashc/test/generation/fixtures.ts
index 3e6a1788..565a6be7 100644
--- a/packages/cashc/test/generation/fixtures.ts
+++ b/packages/cashc/test/generation/fixtures.ts
@@ -23,7 +23,10 @@ export const fixtures: Fixture[] = [
       debug: {
         bytecode: '5179a9517a8769517a517aac',
         logs: [],
-        requireMessages: [],
+        requires: [
+          { ip: 7, line: 3 },
+          { ip: 13, line: 4 },
+        ],
         sourceMap: '3:24:3:26;;:16::27:1;:31::34:0;;:16:::1;:8::36;4:25:4:26:0;;:28::30;;:16::31:1',
       },
       source: fs.readFileSync(new URL('../valid-contract-files/p2pkh.cash', import.meta.url), { encoding: 'utf-8' }),
@@ -59,7 +62,11 @@ export const fixtures: Fixture[] = [
       debug: {
         bytecode: '5a54940114517a529793007a517aa0690b48656c6c6f20576f726c640079527a7e5279a6517aa68769527a527aac77',
         logs: [],
-        requireMessages: [],
+        requires: [
+          { ip: 16, line: 5 },
+          { ip: 30, line: 10 },
+          { ip: 36, line: 11 },
+        ],
         sourceMap: '3:25:3:27;:30::31;:25:::1;4:30:4:32:0;:35::45;;:48::49;:35:::1;:30;5:16:5:31:0;;:34::35;;:16:::1;:8::37;7:20:7:33:0;8:13:8:15;;:18::19;;:13:::1;10:26:10:28:0;;:16::29:1;:43::45:0;;:33::46:1;:16;:8::48;11:25:11:26:0;;:28::30;;:16::31:1;2:4:12:5',
       },
       source: fs.readFileSync(new URL('../valid-contract-files/reassignment.cash', import.meta.url), { encoding: 'utf-8' }),
@@ -101,7 +108,11 @@ export const fixtures: Fixture[] = [
       debug: {
         bytecode: '527954799300795479940079537a52949c6300795579935479517993527a757c00795279a0697567007954799c69680079547a93007a537a9c777777',
         logs: [],
-        requireMessages: [],
+        requires: [
+          { ip: 39, line: 8 },
+          { ip: 47, line: 10 },
+          { ip: 59, line: 13 },
+        ],
         sourceMap: '3:16:3:17;;:20::21;;:16:::1;4:12:4:13:0;;:16::17;;:12:::1;5::5:13:0;;:17::18;;:21::22;:17:::1;:12;:24:9:9:0;6:20:6:21;;:24::25;;:20:::1;7:16:7:17:0;;:20::21;;:16:::1;:12::22:0;;;;8:20:8:21;;:24::25;;:20:::1;:12::27;5:24:9:9;9:15:11::0;10:20:10:21;;:25::26;;:20:::1;:12::28;9:15:11:9;12:12:12:13:0;;:16::17;;:12:::1;13:16:13::0;;:21::22;;:16:::1;2:4:14:5;;',
       },
       source: fs.readFileSync(new URL('../valid-contract-files/if_statement.cash', import.meta.url), { encoding: 'utf-8' }),
@@ -137,7 +148,11 @@ export const fixtures: Fixture[] = [
       debug: {
         bytecode: '5379009c63547a527aac77777767537a519c69537a517aac69517ab175517768',
         logs: [],
-        requireMessages: [],
+        requires: [
+          { ip: 13, line: 7 },
+          { ip: 27, line: 11 },
+          { ip: 30, line: 12 },
+        ],
         sourceMap: '6:4:8:5;;;;;7:25:7:37;;:39::48;;:16::49:1;6:4:8:5;;;;10::13::0;;;;;11:25:11:34;;:36::42;;:16::43:1;:8::45;12:27:12:34:0;;:8::36:1;;10:4:13:5;;1:0:14:1',
       },
       source: fs.readFileSync(new URL('../valid-contract-files/multifunction.cash', import.meta.url), { encoding: 'utf-8' }),
@@ -204,7 +219,12 @@ export const fixtures: Fixture[] = [
       debug: {
         bytecode: '5279009c63537955799300795579940079537a9c6300795679935579517993527a757c00795279a06975675479517a75680079557a93007a537a9c69517777777767527a519c695279007952930079537a9c6300795479930079527993527a757c00795279a0697568537a007a537a9c777768',
         logs: [],
-        requireMessages: [],
+        requires: [
+          { ip: 42, line: 8 },
+          { ip: 61, line: 13 },
+          { ip: 104, line: 22 },
+          { ip: 114, line: 25 },
+        ],
         sourceMap: '2:4:14:5;;;;;3:16:3:17;;:20::21;;:16:::1;4:12:4:13:0;;:16::17;;:12:::1;5::5:13:0;;:17::18;;:12:::1;:20:9:9:0;6::6:21;;:24::25;;:20:::1;7:16:7:17:0;;:20::21;;:16:::1;:12::22:0;;;;8:20:8:21;;:24::25;;:20:::1;:12::27;5:20:9:9;9:15:11::0;10:16:10:17;;:12::18;;;9:15:11:9:1;12:12:12:13:0;;:16::17;;:12:::1;13:16:13::0;;:21::22;;:16:::1;:8::24;2:4:14:5;;;;;;16::26::0;;;;;17:16:17:17;;18:12:18:13;;:16::17;:12:::1;19::19:13:0;;:17::18;;:12:::1;:20:23:9:0;20::20:21;;:24::25;;:20:::1;21:16:21:17:0;;:20::21;;:16:::1;:12::22:0;;;;22:20:22:21;;:24::25;;:20:::1;:12::27;19:20:23:9;;24:12:24:13:0;;25:16:25:17;;:21::22;;:16:::1;16:4:26:5;;1:0:27:1',
       },
       source: fs.readFileSync(new URL('../valid-contract-files/multifunction_if_statements.cash', import.meta.url), { encoding: 'utf-8' }),
@@ -227,7 +247,7 @@ export const fixtures: Fixture[] = [
       debug: {
         bytecode: '00547a557a52547a557a567a53ae',
         logs: [],
-        requireMessages: [],
+        requires: [{ ip: 17, line: 3 }],
         sourceMap: '3:12:3:52;:27::29;;:31::33;;:26::34:1;:37::40:0;;:42::45;;:47::50;;:36::51:1;:12::52',
       },
       source: fs.readFileSync(new URL('../valid-contract-files/2_of_3_multisig.cash', import.meta.url), { encoding: 'utf-8' }),
@@ -254,7 +274,10 @@ export const fixtures: Fixture[] = [
       debug: {
         bytecode: '00795179827752967f7700795279879169517a547f75517a8791',
         logs: [],
-        requireMessages: [],
+        requires: [
+          { ip: 17, line: 4 },
+          { ip: 27, line: 5 },
+        ],
         sourceMap: '3:18:3:19;;:26::27;;:::34;;:37::38;:26:::1;:18::39;:::42;4:16:4:17:0;;:21::22;;:16:::1;;:8::24;5:16:5:17:0;;:24::25;:16::26:1;:::29;:33::34:0;;:16:::1;',
       },
       source: fs.readFileSync(new URL('../valid-contract-files/split_size.cash', import.meta.url), { encoding: 'utf-8' }),
@@ -279,7 +302,10 @@ export const fixtures: Fixture[] = [
       debug: {
         bytecode: '0079a600a98751918769517a517aac',
         logs: [],
-        requireMessages: [],
+        requires: [
+          { ip: 9, line: 3 },
+          { ip: 15, line: 4 },
+        ],
         sourceMap: '3:33:3:35;;:17::37:1;:49::51:0;:41::52:1;:17;:57::61:0;:56;:17:::1;:8::64;4:25:4:26:0;;:28::30;;:16::31:1',
       },
       source: fs.readFileSync(new URL('../valid-contract-files/cast_hash_checksig.cash', import.meta.url), { encoding: 'utf-8' }),
@@ -330,7 +356,13 @@ export const fixtures: Fixture[] = [
       debug: {
         bytecode: '5679547f517a81517a815179557aa269517ab175007a537aa269537a547a537aba69517a517aac',
         logs: [],
-        requireMessages: [],
+        requires: [
+          { ip: 19, line: 19 },
+          { ip: 22, line: 20 },
+          { ip: 29, line: 23 },
+          { ip: 37, line: 26 },
+          { ip: 43, line: 31 },
+        ],
         sourceMap: '14:49:14:62;;:69::70;:49::71:1;15:30:15:44:0;;:26::45:1;16:24:16:32:0;;:20::33:1;19:16:19:27:0;;:31::39;;:16:::1;:8::41;20:27:20:38:0;;:8::40:1;;23:16:23:21:0;;:25::36;;:16:::1;:8::38;27:12:27:21:0;;28::28:25;;29::29:20;;26:16:30:9:1;:8::11;31:25:31:33:0;;:35::42;;:16::43:1',
       },
       source: fs.readFileSync(new URL('../valid-contract-files/hodl_vault.cash', import.meta.url), { encoding: 'utf-8' }),
@@ -362,7 +394,7 @@ export const fixtures: Fixture[] = [
       debug: {
         bytecode: '5152535455565579539f6353567a757c6b7c6b7c6b7c6b7c6c6c6c6c68557a557a557a93547a93537a93527a93a0',
         logs: [],
-        requireMessages: [],
+        requires: [{ ip: 46, line: 14 }],
         sourceMap: '3:16:3:17;4::4;5::5;6::6;7::7;8::8;10:12:10:13;;:16::17;:12:::1;:19:12:9:0;11:16:11:17;:12::18;;;;;;;;;;;;;;;;10:19:12:9:1;14:16:14:17:0;;:20::21;;:24::25;;:20:::1;:28::29:0;;:20:::1;:32::33:0;;:20:::1;:36::37:0;;:20:::1;:16',
       },
       source: fs.readFileSync(new URL('../valid-contract-files/deep_replace.cash', import.meta.url), { encoding: 'utf-8' }),
@@ -383,7 +415,7 @@ export const fixtures: Fixture[] = [
       debug: {
         bytecode: '007a517a548087',
         logs: [],
-        requireMessages: [],
+        requires: [{ ip: 7, line: 3 }],
         sourceMap: '3:16:3:17;;:28::29;;:21::30:1;;:16',
       },
       source: fs.readFileSync(new URL('../valid-contract-files/bounded_bytes.cash', import.meta.url), { encoding: 'utf-8' }),
@@ -413,7 +445,10 @@ export const fixtures: Fixture[] = [
       debug: {
         bytecode: 'c2517a9c69c1010087',
         logs: [],
-        requireMessages: [],
+        requires: [
+          { ip: 5, line: 3 },
+          { ip: 9, line: 4 },
+        ],
         sourceMap: '3:16:3:26;:30::45;;:16:::1;:8::47;4:16:4:35:0;:39::43;:16:::1',
       },
       source: fs.readFileSync(new URL('../valid-contract-files/covenant.cash', import.meta.url), { encoding: 'utf-8' }),
@@ -474,7 +509,28 @@ export const fixtures: Fixture[] = [
       debug: {
         bytecode: 'c2529c69c5009c69c3519c69c4519c69c0009c69c18277022c019c6900c60210279c6900c782770210279c6900c8200000000000000000000000000000000000000000000000000000000000000000876900c9009c6900ca827701649c6900cb009c6900cc0210279c6900cd827701649c6900ce200000000000000000000000000000000000000000000000000000000000000000876900cf0100876900d001649c6900d1200000000000000000000000000000000000000000000000000000000000000000876900d20100876900d301649c',
         logs: [],
-        requireMessages: [],
+        requires: [
+          { ip: 3, line: 3 },
+          { ip: 7, line: 4 },
+          { ip: 11, line: 5 },
+          { ip: 15, line: 6 },
+          { ip: 19, line: 7 },
+          { ip: 25, line: 8 },
+          { ip: 30, line: 9 },
+          { ip: 37, line: 10 },
+          { ip: 42, line: 11 },
+          { ip: 47, line: 12 },
+          { ip: 54, line: 13 },
+          { ip: 59, line: 14 },
+          { ip: 64, line: 15 },
+          { ip: 71, line: 16 },
+          { ip: 76, line: 17 },
+          { ip: 81, line: 18 },
+          { ip: 86, line: 19 },
+          { ip: 91, line: 20 },
+          { ip: 96, line: 21 },
+          { ip: 101, line: 22 },
+        ],
         sourceMap: '3:16:3:26;:30::31;:16:::1;:8::33;4:16:4:27:0;:31::32;:16:::1;:8::34;5:16:5:32:0;:36::37;:16:::1;:8::39;6:16:6:33:0;:37::38;:16:::1;:8::40;7:16:7:37:0;:41::42;:16:::1;:8::44;8:16:8:35:0;:::42;;:46::49;:16:::1;:8::51;9:26:9:27:0;:16::34;:38::43;:16:::1;:8::45;10:26:10:27:0;:16::44;:::51;;:55::60;:16:::1;:8::62;11:26:11:27:0;:16::52;:56::121;:16:::1;:8::123;12:26:12:27:0;:16::42;:46::47;:16:::1;:8::49;13:26:13:27:0;:16::46;:::53;;:57::60;:16:::1;:8::62;14:26:14:27:0;:16::43;:47::48;:16:::1;:8::50;15:27:15:28:0;:16::35;:39::44;:16:::1;:8::46;16:27:16:28:0;:16::45;:::52;;:56::59;:16:::1;:8::61;17:26:17:27:0;:16::42;:46::111;:16:::1;:8::113;18:26:18:27:0;:16::42;:46::50;:16:::1;:8::52;19:26:19:27:0;:16::40;:44::47;:16:::1;:8::49;20:27:20:28:0;:16::43;:47::112;:16:::1;:8::114;21:27:21:28:0;:16::43;:47::51;:16:::1;:8::53;22:27:22:28:0;:16::41;:45::48;:16:::1',
       },
       source: fs.readFileSync(new URL('../valid-contract-files/covenant_all_fields.cash', import.meta.url), { encoding: 'utf-8' }),
@@ -539,7 +595,16 @@ export const fixtures: Fixture[] = [
       debug: {
         bytecode: '5479009c63537ab27500cd0376a914527a7e0288ac7e876902e803c0c6007954799452799400795579547993a16300cc52795479949c696700cc55799c6951cdc0c7876951cc51799c69685177777777777767547a519c695479a9527a8769547a547aac77777768',
         logs: [],
-        requireMessages: [],
+        requires: [
+          { ip: 11, line: 3 },
+          { ip: 22, line: 6 },
+          { ip: 51, line: 15 },
+          { ip: 58, line: 17 },
+          { ip: 64, line: 18 },
+          { ip: 70, line: 19 },
+          { ip: 91, line: 24 },
+          { ip: 97, line: 25 },
+        ],
         sourceMap: '2:4:21:5;;;;;3:26:3:32;;:8::34:1;;6:27:6:28:0;:16::45;:49::84;:74::83;;:49::84;;;:16:::1;:8::86;8:23:8:27:0;9:37:9:58;:27::65;10:26:10:38;;:41::47;;:26:::1;:50::58:0;;:26:::1;14:12:14:23:0;;:27::33;;:36::44;;:27:::1;:12;:46:16:9:0;15:31:15:32;:20::39;:43::55;;:58::66;;:43:::1;:20;:12::68;16:15:20:9:0;17:31:17:32;:20::39;:43::49;;:20:::1;:12::51;18:31:18:32:0;:20::49;:63::84;:53::101;:20:::1;:12::103;19:31:19:32:0;:20::39;:43::54;;:20:::1;:12::56;16:15:20:9;2:4:21:5;;;;;;;;23::26::0;;;;;24:24:24:26;;:16::27:1;:31::37:0;;:16:::1;:8::39;25:25:25:26:0;;:28::30;;:16::31:1;23:4:26:5;;;1:0:27:1',
       },
       source: fs.readFileSync(new URL('../valid-contract-files/mecenas.cash', import.meta.url), { encoding: 'utf-8' }),
@@ -584,7 +649,12 @@ export const fixtures: Fixture[] = [
       debug: {
         bytecode: '016a026d02827c7e7e4c624120636f6e7472616374206d6179206e6f7420696e6a75726520612068756d616e206265696e67206f722c207468726f75676820696e616374696f6e2c20616c6c6f7720612068756d616e206265696e6720746f20636f6d6520746f206861726d2e8276014ba063014c7c7e687c7e7e00cc009c6900cd517a876902e803c0c65179940079527aa26351cdc0c7876951cc51799c69685177',
         logs: [],
-        requireMessages: [],
+        requires: [
+          { ip: 23, line: 16 },
+          { ip: 29, line: 17 },
+          { ip: 47, line: 24 },
+          { ip: 53, line: 25 },
+        ],
         sourceMap: '10:29:13:10;11:12:11:18;;;;;12:18:12:118;:12::119;;;;;;;;;;;;16:27:16:28;:16::35;:39::40;:16:::1;:8::42;17:27:17:28:0;:16::45;:49::61;;:16:::1;:8::63;21:23:21:27:0;22:37:22:58;:27::65;:68::76;;:27:::1;23:12:23:24:0;;:28::36;;:12:::1;:38:26:9:0;24:31:24:32;:20::49;:63::84;:53::101;:20:::1;:12::103;25:31:25:32:0;:20::39;:43::55;;:20:::1;:12::57;23:38:26:9;8:4:27:5;',
       },
       source: fs.readFileSync(new URL('../valid-contract-files/announcement.cash', import.meta.url), { encoding: 'utf-8' }),
@@ -607,7 +677,7 @@ export const fixtures: Fixture[] = [
       debug: {
         bytecode: '0079bc517a87',
         logs: [],
-        requireMessages: [],
+        requires: [{ ip: 6, line: 3 }],
         sourceMap: '3:16:3:26;;:::36;:40::50;;:16:::1',
       },
       source: fs.readFileSync(new URL('../valid-contract-files/p2palindrome.cash', import.meta.url), { encoding: 'utf-8' }),
@@ -630,7 +700,7 @@ export const fixtures: Fixture[] = [
       debug: {
         bytecode: '5a517a80007a815a9c',
         logs: [],
-        requireMessages: [],
+        requires: [{ ip: 9, line: 4 }],
         sourceMap: '3:28:3:30;:32::36;;:22::37;4:20:4:25;;:16::26:1;:30::32:0;:16:::1',
       },
       source: fs.readFileSync(new URL('../valid-contract-files/num2bin_variable.cash', import.meta.url), { encoding: 'utf-8' }),
@@ -656,7 +726,7 @@ export const fixtures: Fixture[] = [
           { data: [{ stackIndex: 0, type: 'int', ip: 5 }, 'test'], ip: 5, line: 4 },
           { data: [{ stackIndex: 0, type: 'int', ip: 5 }, 'test2'], ip: 5, line: 5 },
         ],
-        requireMessages: [{ ip: 4, line: 3, message: 'Wrong value passed' }, { ip: 11, line: 6, message: 'Sum doesn\'t work' }],
+        requires: [{ ip: 4, line: 3, message: 'Wrong value passed' }, { ip: 11, line: 6, message: 'Sum doesn\'t work' }],
         sourceMap: '3:12:3:17;;:21::22;:12:::1;:4::46;6:12:6:17:0;;:20::21;:12:::1;:25::26:0;:12:::1',
       },
       source: fs.readFileSync(new URL('../valid-contract-files/debug_messages.cash', import.meta.url), { encoding: 'utf-8' }),
diff --git a/packages/cashscript/test/fixture/announcement.json b/packages/cashscript/test/fixture/announcement.json
index 5818dacc..55611351 100644
--- a/packages/cashscript/test/fixture/announcement.json
+++ b/packages/cashscript/test/fixture/announcement.json
@@ -13,11 +13,28 @@
     "bytecode": "016a026d02827c7e7e4c624120636f6e7472616374206d6179206e6f7420696e6a75726520612068756d616e206265696e67206f722c207468726f75676820696e616374696f6e2c20616c6c6f7720612068756d616e206265696e6720746f20636f6d6520746f206861726d2e8276014ba063014c7c7e687c7e7e00cc009c6900cd517a876902e803c0c65179940079527aa26351cdc0c7876951cc51799c69685177",
     "sourceMap": "10:29:13:10;11:12:11:18;;;;;12:18:12:118;:12::119;;;;;;;;;;;;16:27:16:28;:16::35;:39::40;:16:::1;:8::42;17:27:17:28:0;:16::45;:49::61;;:16:::1;:8::63;21:23:21:27:0;22:37:22:58;:27::65;:68::76;;:27:::1;23:12:23:24:0;;:28::36;;:12:::1;:38:26:9:0;24:31:24:32;:20::49;:63::84;:53::101;:20:::1;:12::103;25:31:25:32:0;:20::39;:43::55;;:20:::1;:12::57;23:38:26:9;8:4:27:5;",
     "logs": [],
-    "requireMessages": []
+    "requires": [
+      {
+        "ip": 23,
+        "line": 16
+      },
+      {
+        "ip": 29,
+        "line": 17
+      },
+      {
+        "ip": 47,
+        "line": 24
+      },
+      {
+        "ip": 53,
+        "line": 25
+      }
+    ]
   },
   "compiler": {
     "name": "cashc",
-    "version": "0.10.0-next.3"
+    "version": "0.10.0-next.5"
   },
-  "updatedAt": "2024-03-19T06:40:54.938Z"
+  "updatedAt": "2024-06-25T09:01:16.154Z"
 }
\ No newline at end of file
diff --git a/packages/cashscript/test/fixture/bigint.json b/packages/cashscript/test/fixture/bigint.json
index 6823b72a..d55eaebf 100644
--- a/packages/cashscript/test/fixture/bigint.json
+++ b/packages/cashscript/test/fixture/bigint.json
@@ -22,11 +22,20 @@
     "bytecode": "05000000800051795179a269517a527a95517aa2",
     "sourceMap": "3:30:3:40;4:16:4:17;;:21::36;;:16:::1;:8::38;5:16:5:17:0;;:20::21;;:16:::1;:25::40:0;;:16:::1",
     "logs": [],
-    "requireMessages": []
+    "requires": [
+      {
+        "ip": 6,
+        "line": 4
+      },
+      {
+        "ip": 15,
+        "line": 5
+      }
+    ]
   },
   "compiler": {
     "name": "cashc",
-    "version": "0.10.0-next.3"
+    "version": "0.10.0-next.5"
   },
-  "updatedAt": "2024-03-19T06:40:54.678Z"
+  "updatedAt": "2024-06-25T09:01:15.899Z"
 }
\ No newline at end of file
diff --git a/packages/cashscript/test/fixture/bounded_bytes.json b/packages/cashscript/test/fixture/bounded_bytes.json
index e9537cd6..a182d87a 100644
--- a/packages/cashscript/test/fixture/bounded_bytes.json
+++ b/packages/cashscript/test/fixture/bounded_bytes.json
@@ -22,11 +22,16 @@
     "bytecode": "007a517a548087",
     "sourceMap": "3:16:3:17;;:28::29;;:21::30:1;;:16",
     "logs": [],
-    "requireMessages": []
+    "requires": [
+      {
+        "ip": 7,
+        "line": 3
+      }
+    ]
   },
   "compiler": {
     "name": "cashc",
-    "version": "0.10.0-next.3"
+    "version": "0.10.0-next.5"
   },
-  "updatedAt": "2024-03-19T06:40:55.720Z"
+  "updatedAt": "2024-06-25T09:01:10.912Z"
 }
\ No newline at end of file
diff --git a/packages/cashscript/test/fixture/hodl_vault.json b/packages/cashscript/test/fixture/hodl_vault.json
index b82200dc..a3ab0568 100644
--- a/packages/cashscript/test/fixture/hodl_vault.json
+++ b/packages/cashscript/test/fixture/hodl_vault.json
@@ -43,11 +43,32 @@
     "bytecode": "5679547f517a81517a815179557aa269517ab175007a537aa269537a547a537aba69517a517aac",
     "sourceMap": "14:49:14:62;;:69::70;:49::71:1;15:30:15:44:0;;:26::45:1;16:24:16:32:0;;:20::33:1;19:16:19:27:0;;:31::39;;:16:::1;:8::41;20:27:20:38:0;;:8::40:1;;23:16:23:21:0;;:25::36;;:16:::1;:8::38;26:29:26::0;;:40::53;;:55::63;;:16::64:1;:8::66;27:25:27:33:0;;:35::42;;:16::43:1",
     "logs": [],
-    "requireMessages": []
+    "requires": [
+      {
+        "ip": 19,
+        "line": 19
+      },
+      {
+        "ip": 22,
+        "line": 20
+      },
+      {
+        "ip": 29,
+        "line": 23
+      },
+      {
+        "ip": 37,
+        "line": 26
+      },
+      {
+        "ip": 43,
+        "line": 27
+      }
+    ]
   },
   "compiler": {
     "name": "cashc",
-    "version": "0.10.0-next.3"
+    "version": "0.10.0-next.5"
   },
-  "updatedAt": "2024-03-19T06:40:55.179Z"
+  "updatedAt": "2024-06-25T09:01:16.379Z"
 }
\ No newline at end of file
diff --git a/packages/cashscript/test/fixture/mecenas.json b/packages/cashscript/test/fixture/mecenas.json
index 94a8c042..8f162076 100644
--- a/packages/cashscript/test/fixture/mecenas.json
+++ b/packages/cashscript/test/fixture/mecenas.json
@@ -39,11 +39,40 @@
     "bytecode": "5379009c6300cd0376a914527a7e0288ac7e876902e803c0c6007954799452799400795579547993a16300cc52795479949c696700cc55799c6951cdc0c7876951cc51799c69685177777777777767537a519c695379a9527a8769537a537aac777768",
     "sourceMap": "9:4:28:5;;;;;13:27:13:28;:16::45;:49::84;:74::83;;:49::84;;;:16:::1;:8::86;15:23:15:27:0;16:37:16:58;:27::65;17:26:17:38;;:41::47;;:26:::1;:50::58:0;;:26:::1;21:12:21:23:0;;:27::33;;:36::44;;:27:::1;:12;:46:23:9:0;22:31:22:32;:20::39;:43::55;;:58::66;;:43:::1;:20;:12::68;23:15:27:9:0;24:31:24:32;:20::39;:43::49;;:20:::1;:12::51;25:31:25:32:0;:20::49;:63::84;:53::101;:20:::1;:12::103;26:31:26:32:0;:20::39;:43::54;;:20:::1;:12::56;23:15:27:9;9:4:28:5;;;;;;;;30::33::0;;;;;31:24:31:26;;:16::27:1;:31::37:0;;:16:::1;:8::39;32:25:32:26:0;;:28::30;;:16::31:1;30:4:33:5;;8:0:34:1",
     "logs": [],
-    "requireMessages": []
+    "requires": [
+      {
+        "ip": 17,
+        "line": 13
+      },
+      {
+        "ip": 46,
+        "line": 22
+      },
+      {
+        "ip": 53,
+        "line": 24
+      },
+      {
+        "ip": 59,
+        "line": 25
+      },
+      {
+        "ip": 65,
+        "line": 26
+      },
+      {
+        "ip": 86,
+        "line": 31
+      },
+      {
+        "ip": 92,
+        "line": 32
+      }
+    ]
   },
   "compiler": {
     "name": "cashc",
-    "version": "0.10.0-next.3"
+    "version": "0.10.0-next.5"
   },
-  "updatedAt": "2024-03-19T06:40:56.951Z"
+  "updatedAt": "2024-06-25T09:01:12.107Z"
 }
\ No newline at end of file
diff --git a/packages/cashscript/test/fixture/p2palindrome.json b/packages/cashscript/test/fixture/p2palindrome.json
index 2aa03066..017131c3 100644
--- a/packages/cashscript/test/fixture/p2palindrome.json
+++ b/packages/cashscript/test/fixture/p2palindrome.json
@@ -18,11 +18,16 @@
     "bytecode": "0079bc517a87",
     "sourceMap": "3:16:3:26;;:::36;:40::50;;:16:::1",
     "logs": [],
-    "requireMessages": []
+    "requires": [
+      {
+        "ip": 6,
+        "line": 3
+      }
+    ]
   },
   "compiler": {
     "name": "cashc",
-    "version": "0.10.0-next.3"
+    "version": "0.10.0-next.5"
   },
-  "updatedAt": "2024-03-19T06:40:55.474Z"
+  "updatedAt": "2024-06-25T09:01:16.592Z"
 }
\ No newline at end of file
diff --git a/packages/cashscript/test/fixture/p2pkh.json b/packages/cashscript/test/fixture/p2pkh.json
index cab6b31e..9ee43904 100644
--- a/packages/cashscript/test/fixture/p2pkh.json
+++ b/packages/cashscript/test/fixture/p2pkh.json
@@ -27,11 +27,20 @@
     "bytecode": "5179a9517a8769517a517aac",
     "sourceMap": "4:24:4:26;;:16::27:1;:31::34:0;;:16:::1;:8::36;5:25:5:26:0;;:28::30;;:16::31:1",
     "logs": [],
-    "requireMessages": []
+    "requires": [
+      {
+        "ip": 7,
+        "line": 4
+      },
+      {
+        "ip": 13,
+        "line": 5
+      }
+    ]
   },
   "compiler": {
     "name": "cashc",
-    "version": "0.10.0-next.3"
+    "version": "0.10.0-next.5"
   },
-  "updatedAt": "2024-03-19T06:40:56.694Z"
+  "updatedAt": "2024-06-25T09:01:11.867Z"
 }
\ No newline at end of file
diff --git a/packages/cashscript/test/fixture/simple_covenant.json b/packages/cashscript/test/fixture/simple_covenant.json
index 50f98d7f..3c4d8bf8 100644
--- a/packages/cashscript/test/fixture/simple_covenant.json
+++ b/packages/cashscript/test/fixture/simple_covenant.json
@@ -13,11 +13,36 @@
     "bytecode": "c252a269c351a269c451a269c182770208029f6900c6022202a26900cc022202a2",
     "sourceMap": "3:16:3:26;:30::31;:16:::1;:8::33;4:16:4:32:0;:36::37;:16:::1;:8::39;5:16:5:33:0;:37::38;:16:::1;:8::40;6:16:6:35:0;:::42;;:45::48;:16:::1;:8::50;7:26:7:27:0;:16::34;:38::41;:16:::1;:8::43;8:27:8:28:0;:16::35;:39::42;:16:::1",
     "logs": [],
-    "requireMessages": []
+    "requires": [
+      {
+        "ip": 3,
+        "line": 3
+      },
+      {
+        "ip": 7,
+        "line": 4
+      },
+      {
+        "ip": 11,
+        "line": 5
+      },
+      {
+        "ip": 17,
+        "line": 6
+      },
+      {
+        "ip": 22,
+        "line": 7
+      },
+      {
+        "ip": 27,
+        "line": 8
+      }
+    ]
   },
   "compiler": {
     "name": "cashc",
-    "version": "0.10.0-next.3"
+    "version": "0.10.0-next.5"
   },
-  "updatedAt": "2024-03-19T06:40:55.963Z"
+  "updatedAt": "2024-06-25T09:01:11.138Z"
 }
\ No newline at end of file
diff --git a/packages/cashscript/test/fixture/token_category_comparison.json b/packages/cashscript/test/fixture/token_category_comparison.json
index 2cd5d9ef..2c4460e7 100644
--- a/packages/cashscript/test/fixture/token_category_comparison.json
+++ b/packages/cashscript/test/fixture/token_category_comparison.json
@@ -13,11 +13,16 @@
     "bytecode": "51ce0087",
     "sourceMap": "3:26:3:27;:16::42;:46::48;:16:::1",
     "logs": [],
-    "requireMessages": []
+    "requires": [
+      {
+        "ip": 4,
+        "line": 3
+      }
+    ]
   },
   "compiler": {
     "name": "cashc",
-    "version": "0.10.0-next.3"
+    "version": "0.10.0-next.5"
   },
-  "updatedAt": "2024-03-19T06:40:56.440Z"
+  "updatedAt": "2024-06-25T09:01:11.613Z"
 }
\ No newline at end of file
diff --git a/packages/cashscript/test/fixture/transfer_with_timeout.json b/packages/cashscript/test/fixture/transfer_with_timeout.json
index 2ce57cd9..4de9b0a9 100644
--- a/packages/cashscript/test/fixture/transfer_with_timeout.json
+++ b/packages/cashscript/test/fixture/transfer_with_timeout.json
@@ -40,11 +40,24 @@
     "bytecode": "5379009c63547a527aac77777767537a519c69537a517aac69517ab175517768",
     "sourceMap": "7:4:9:5;;;;;8:25:8:37;;:39::48;;:16::49:1;7:4:9:5;;;;12::15::0;;;;;13:25:13:34;;:36::42;;:16::43:1;:8::45;14:27:14:34:0;;:8::36:1;;12:4:15:5;;1:0:16:1",
     "logs": [],
-    "requireMessages": []
+    "requires": [
+      {
+        "ip": 13,
+        "line": 8
+      },
+      {
+        "ip": 27,
+        "line": 13
+      },
+      {
+        "ip": 30,
+        "line": 14
+      }
+    ]
   },
   "compiler": {
     "name": "cashc",
-    "version": "0.10.0-next.3"
+    "version": "0.10.0-next.5"
   },
-  "updatedAt": "2024-03-19T06:40:56.204Z"
+  "updatedAt": "2024-06-25T09:01:11.370Z"
 }
\ No newline at end of file
diff --git a/packages/utils/src/artifact.ts b/packages/utils/src/artifact.ts
index 3279ba69..0c5814ac 100644
--- a/packages/utils/src/artifact.ts
+++ b/packages/utils/src/artifact.ts
@@ -15,7 +15,7 @@ export interface DebugInformation {
   bytecode: string; // unlike `bytecode` property above, this is a hex-encoded binary string
   sourceMap: string; // see documentation for `generateSourceMap`
   logs: LogEntry[]; // log entries generated from `console.log` statements
-  requireMessages: RequireMessage[]; // messages for failing `require` statements
+  requires: RequireStatement[]; // messages for failing `require` statements
 }
 
 export interface LogEntry {
@@ -32,10 +32,10 @@ export interface StackItem {
 
 export type LogData = StackItem | string;
 
-export interface RequireMessage {
+export interface RequireStatement {
   ip: number; // instruction pointer
   line: number; // line in the source code
-  message: string; // custom message for failing `require` statement
+  message?: string; // custom message for failing `require` statement
 }
 
 export interface Artifact {
diff --git a/website/docs/language/artifacts.md b/website/docs/language/artifacts.md
index 4117696a..fcc144f0 100644
--- a/website/docs/language/artifacts.md
+++ b/website/docs/language/artifacts.md
@@ -24,7 +24,7 @@ interface Artifact {
     bytecode: string // unlike `bytecode` property above, this is a hex-encoded binary string
     sourceMap: string // see documentation for `generateSourceMap`
     logs: LogEntry[] // log entries generated from `console.log` statements
-    requireMessages: RequireMessage[] // messages for failing `require` statements
+    requires: RequireStatement[] // messages for failing `require` statements
   }
   updatedAt: string // Last datetime this artifact was updated (in ISO format)
 }

From c760fc0a5ff7ece8a9eec7b694149a70d0c304e8 Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Tue, 25 Jun 2024 12:05:35 +0200
Subject: [PATCH 128/171] Simplify failed require errors

- Always show the line of a failed require statemement and not the full
  libauth error message
- Update FailedRequireError and similar error types to account for this
- Remove old error types that were dependent on Node error messages and
  related buildError function
- Change order of operations for transaction sending so that it is
  always debug-executed before sending
- Update e2e tests with new error messages
- Update docs for new error handling and types
---
 packages/cashscript/src/Errors.ts             | 29 ++++++++----
 packages/cashscript/src/Transaction.ts        | 46 ++++++++-----------
 packages/cashscript/src/TransactionBuilder.ts |  4 +-
 packages/cashscript/src/debugging.ts          | 34 +++++++-------
 packages/cashscript/src/utils.ts              | 40 ----------------
 packages/cashscript/test/debugging.test.ts    |  2 +-
 .../cashscript/test/e2e/Announcement.test.ts  | 25 +++-------
 packages/cashscript/test/e2e/BigInt.test.ts   | 18 ++------
 .../cashscript/test/e2e/FullStack.test.ts     |  6 +--
 .../cashscript/test/e2e/HodlVault.test.ts     | 15 ++----
 packages/cashscript/test/e2e/Mecenas.test.ts  | 25 +++-------
 packages/cashscript/test/e2e/P2PKH.test.ts    | 32 +++++++++----
 .../test/e2e/TokenCategoryCheck.test.ts       |  5 +-
 .../test/e2e/TransferWithTimeout.test.ts      | 30 ++++--------
 .../cashscript/test/e2e/old/Mecenas.test.ts   | 14 +++---
 website/docs/sdk/transactions-advanced.md     |  2 +-
 website/docs/sdk/transactions.md              | 44 ++++++++----------
 17 files changed, 147 insertions(+), 224 deletions(-)

diff --git a/packages/cashscript/src/Errors.ts b/packages/cashscript/src/Errors.ts
index 229885a4..d7034768 100644
--- a/packages/cashscript/src/Errors.ts
+++ b/packages/cashscript/src/Errors.ts
@@ -1,4 +1,4 @@
-import { Type } from '@cashscript/utils';
+import { RequireStatement, Type } from '@cashscript/utils';
 
 export class TypeError extends Error {
   constructor(actual: string, expected: Type) {
@@ -7,7 +7,7 @@ export class TypeError extends Error {
 }
 
 export class OutputSatoshisTooSmallError extends Error {
-  constructor(satoshis: bigint, minimumAmount:bigint) {
+  constructor(satoshis: bigint, minimumAmount: bigint) {
     super(`Tried to add an output with ${satoshis} satoshis, which is less than the required minimum for this output-type (${minimumAmount})`);
   }
 }
@@ -19,17 +19,30 @@ export class TokensToNonTokenAddressError extends Error {
 }
 
 export class FailedTransactionError extends Error {
-  constructor(public reason: string, public debugStr?: string) {
-    super(`Transaction failed with reason: ${reason}${debugStr ? `\n\n${debugStr}` : ''}`);
+  constructor(public reason: string, public bitauthUri?: string) {
+    super(`${reason}\n\nBitauth URI: ${bitauthUri}`);
   }
 }
 
-export class FailedRequireError extends FailedTransactionError {}
-export class FailedTimeCheckError extends FailedTransactionError {}
-export class FailedSigCheckError extends FailedTransactionError {}
+// TODO: Add tests for some non-require evaluation errors (e.g. invalid op_split range)
+
+export class FailedRequireError extends Error {
+  public bitauthUri?: string;
+
+  constructor(
+    public contractName: string,
+    public requireStatement: RequireStatement,
+    public inputIndex: number,
+    public libauthErrorMessage?: string,
+  ) {
+    const baseMessage = `${contractName}.cash:${requireStatement.line} Require statement failed at line ${requireStatement.line}`;
+    const fullMessage = `${baseMessage} with the following message: ${requireStatement.message}`;
+    super(requireStatement.message ? fullMessage : baseMessage);
+  }
+}
 
 // TODO: Expand these reasons with non-script failures (like tx-mempool-conflict)
-export enum Reason {
+export enum NodeErrorReason {
   EVAL_FALSE = 'Script evaluated without error but finished with a false/empty top stack element',
   VERIFY = 'Script failed an OP_VERIFY operation',
   EQUALVERIFY = 'Script failed an OP_EQUALVERIFY operation',
diff --git a/packages/cashscript/src/Transaction.ts b/packages/cashscript/src/Transaction.ts
index 7f6cdf4d..2573e0cd 100644
--- a/packages/cashscript/src/Transaction.ts
+++ b/packages/cashscript/src/Transaction.ts
@@ -28,7 +28,6 @@ import {
   createOpReturnOutput,
   getTxSizeWithoutInputs,
   getPreimageSize,
-  buildError,
   validateOutput,
   utxoComparator,
   calculateDust,
@@ -43,6 +42,7 @@ import MockNetworkProvider from './network/MockNetworkProvider.js';
 import { buildTemplate, getBitauthUri } from './LibauthTemplate.js';
 import { debugTemplate, evaluateTemplate, DebugResult } from './debugging.js';
 import { EncodedArgument } from './Argument.js';
+import { FailedRequireError, FailedTransactionError } from './Errors.js';
 
 export class Transaction {
   public inputs: Utxo[] = [];
@@ -174,7 +174,23 @@ export class Transaction {
   async send(raw?: true): Promise<TransactionDetails | string> {
     const tx = await this.build();
     let template: WalletTemplate | undefined;
+
+    // Debug the transaction locally before sending so any errors are caught early
     try {
+      // Libauth debugging does not work with old-style covenents (or outdated artifacts)
+      if (!this.abiFunction.covenant && this.contract.artifact.debug) {
+        await this.debug();
+      }
+    } catch (error) {
+      if (error instanceof FailedRequireError) {
+        error.bitauthUri = await this.bitauthUri();
+        error.message += `\n\nBitauth URI: ${error.bitauthUri}`;
+      }
+      throw error;
+    }
+
+    try {
+      // TODO: Can we move this to MockNetworkProvider?
       if (this.contract.provider instanceof MockNetworkProvider) {
         template = await buildTemplate({
           transaction: this,
@@ -185,31 +201,9 @@ export class Transaction {
 
       const txid = await this.contract.provider.sendRawTransaction(tx);
       return raw ? await this.getTxDetails(txid, raw) : await this.getTxDetails(txid);
-    } catch (maybeNodeError: any) {
-      if (!template) {
-        template = await buildTemplate({
-          transaction: this,
-          transactionHex: tx,
-        });
-      }
-
-      const reason = maybeNodeError.error ?? maybeNodeError.message ?? maybeNodeError;
-
-      const bitauthUri = getBitauthUri(template);
-
-      try {
-        debugTemplate(template, this.contract.artifact);
-      } catch (libauthError: any) {
-        if (this.contract.provider instanceof MockNetworkProvider) {
-          throw buildError(libauthError, bitauthUri);
-        } else {
-          const message = `${libauthError}\n\nUnderlying node error: ${reason}`;
-          throw buildError(message, bitauthUri);
-        }
-      }
-
-      // this must be unreachable
-      throw buildError(reason, bitauthUri);
+    } catch (error: any) {
+      const reason = error.error ?? error.message ?? error;
+      throw new FailedTransactionError(reason, await this.bitauthUri());
     }
   }
 
diff --git a/packages/cashscript/src/TransactionBuilder.ts b/packages/cashscript/src/TransactionBuilder.ts
index e242814c..562c16a5 100644
--- a/packages/cashscript/src/TransactionBuilder.ts
+++ b/packages/cashscript/src/TransactionBuilder.ts
@@ -13,11 +13,11 @@ import {
 } from './interfaces.js';
 import { NetworkProvider } from './network/index.js';
 import {
-  buildError,
   cashScriptOutputToLibauthOutput,
   createOpReturnOutput,
   validateOutput,
 } from './utils.js';
+import { FailedTransactionError } from './Errors.js';
 
 export interface TransactionBuilderOptions {
   provider: NetworkProvider;
@@ -153,7 +153,7 @@ export class TransactionBuilder {
       return raw ? await this.getTxDetails(txid, raw) : await this.getTxDetails(txid);
     } catch (e: any) {
       const reason = e.error ?? e.message;
-      throw buildError(reason);
+      throw new FailedTransactionError(reason);
     }
   }
 
diff --git a/packages/cashscript/src/debugging.ts b/packages/cashscript/src/debugging.ts
index 1bc2a9fc..60b46958 100644
--- a/packages/cashscript/src/debugging.ts
+++ b/packages/cashscript/src/debugging.ts
@@ -1,6 +1,7 @@
 import { AuthenticationErrorCommon, AuthenticationInstruction, AuthenticationProgramCommon, AuthenticationProgramStateBCH, AuthenticationProgramStateCommon, AuthenticationVirtualMachine, ResolvedTransactionCommon, WalletTemplate, binToHex, createCompiler, createVirtualMachineBCH2023, encodeAuthenticationInstruction, walletTemplateToCompilerConfiguration } from '@bitauth/libauth';
 import { Artifact, LogEntry, Op, PrimitiveType, StackItem, bytecodeToAsm, decodeBool, decodeInt, decodeString } from '@cashscript/utils';
 import { findLastIndex, toRegExp } from './utils.js';
+import { FailedRequireError, FailedTransactionError } from './Errors.js';
 
 // evaluates the fully defined template, throws upon error
 export const evaluateTemplate = (template: WalletTemplate): boolean => {
@@ -8,7 +9,7 @@ export const evaluateTemplate = (template: WalletTemplate): boolean => {
 
   const verifyResult = vm.verify(program);
   if (typeof verifyResult === 'string') {
-    throw new Error(verifyResult);
+    throw new FailedTransactionError(verifyResult);
   }
 
   return verifyResult;
@@ -51,37 +52,38 @@ export const debugTemplate = (template: WalletTemplate, artifact: Artifact): Deb
     // preceding OP_CHECKSIG opcode. The error message is registered in the next instruction, so we need to increment
     // the instruction pointer to get the correct error message.
     const isNullFail = lastExecutedDebugStep.error === AuthenticationErrorCommon.nonNullSignatureFailure;
-    const messageIp = failingIp + (isNullFail ? 1 : 0);
+    const requireStatementIp = failingIp + (isNullFail ? 1 : 0);
 
-    const requireStatement = (artifact.debug?.requireMessages ?? [])
-      .find((message) => message.ip === messageIp);
+    const requireStatement = (artifact.debug?.requires ?? [])
+      .find((statement) => statement.ip === requireStatementIp);
 
+    // TODO: Also log the require statement that failed (e.g. "require(1 == 2, '1 is not equal to 2')")
     if (requireStatement) {
-      throw new Error(`${artifact.contractName}.cash:${requireStatement.line} Error in evaluating input index ${lastExecutedDebugStep.program.inputIndex} with the following message: ${requireStatement.message}.\n${lastExecutedDebugStep.error}`);
+      const { program: { inputIndex }, error } = lastExecutedDebugStep;
+      throw new FailedRequireError(artifact.contractName, requireStatement, inputIndex, error);
     }
 
-    throw new Error(`Error in evaluating input index ${lastExecutedDebugStep.program.inputIndex}.\n${lastExecutedDebugStep.error}`);
+    throw new FailedTransactionError(`Error in evaluating input index ${lastExecutedDebugStep.program.inputIndex}.\n${lastExecutedDebugStep.error}`);
   }
 
   const evaluationResult = vm.verify(program);
 
   if (failedFinalVerify(evaluationResult)) {
-    const stackContents = lastExecutedDebugStep.stack.map(item => `0x${binToHex(item)}`).join(', ');
-    const stackContentsMessage = `\nStack contents after evaluation: ${lastExecutedDebugStep.stack.length ? stackContents : 'empty'}`;
-
     const finalExecutedVerifyIp = getFinalExecutedVerifyIp(executedDebugSteps);
 
     // logDebugSteps(executedDebugSteps, lastExecutedDebugStep.instructions);
     // console.warn('message', finalExecutedVerifyIp);
-    // console.warn(artifact.debug?.requireMessages);
+    // console.warn(artifact.debug?.requires);
 
-    const finalVerifyMessage = artifact.debug?.requireMessages.find((message) => message.ip === finalExecutedVerifyIp);
+    const requireStatement = (artifact.debug?.requires ?? [])
+      .find((message) => message.ip === finalExecutedVerifyIp);
 
-    if (finalVerifyMessage) {
-      throw new Error(`${artifact.contractName}.cash:${finalVerifyMessage.line} Error in evaluating input index ${lastExecutedDebugStep.program.inputIndex} with the following message: ${finalVerifyMessage.message}.\n${evaluationResult.replace(/Error in evaluating input index \d: /, '')}` + stackContentsMessage);
+    if (requireStatement) {
+      const { program: { inputIndex }, error } = lastExecutedDebugStep;
+      throw new FailedRequireError(artifact.contractName, requireStatement, inputIndex, error);
     }
 
-    throw new Error(evaluationResult + stackContentsMessage);
+    throw new FailedTransactionError(`Error in evaluating input index ${lastExecutedDebugStep.program.inputIndex}.\n${evaluationResult}`);
   }
 
   return fullDebugSteps;
@@ -109,11 +111,11 @@ const createProgram = (template: WalletTemplate): CreateProgramResult => {
   });
 
   if (typeof scenarioGeneration === 'string') {
-    throw new Error(scenarioGeneration);
+    throw new FailedTransactionError(scenarioGeneration);
   }
 
   if (typeof scenarioGeneration.scenario === 'string') {
-    throw new Error(scenarioGeneration.scenario);
+    throw new FailedTransactionError(scenarioGeneration.scenario);
   }
 
   return { vm, program: scenarioGeneration.scenario.program };
diff --git a/packages/cashscript/src/utils.ts b/packages/cashscript/src/utils.ts
index a904d9b6..fe037033 100644
--- a/packages/cashscript/src/utils.ts
+++ b/packages/cashscript/src/utils.ts
@@ -13,7 +13,6 @@ import {
   encodeTransactionOutput,
   isHex,
   bigIntToCompactUint,
-  AuthenticationErrorCommon,
   NonFungibleTokenCapability,
   bigIntToVmNumber,
 } from '@bitauth/libauth';
@@ -38,11 +37,6 @@ import { VERSION_SIZE, LOCKTIME_SIZE } from './constants.js';
 import {
   OutputSatoshisTooSmallError,
   TokensToNonTokenAddressError,
-  Reason,
-  FailedTransactionError,
-  FailedRequireError,
-  FailedTimeCheckError,
-  FailedSigCheckError,
 } from './Errors.js';
 
 // ////////// PARAMETER VALIDATION ////////////////////////////////////////////
@@ -210,40 +204,6 @@ export function createSighashPreimage(
   return sighashPreimage;
 }
 
-export function buildError(reason: string, debugStr?: string): FailedTransactionError {
-  const require = [
-    Reason.EVAL_FALSE, Reason.VERIFY, Reason.EQUALVERIFY, Reason.CHECKMULTISIGVERIFY,
-    Reason.CHECKSIGVERIFY, Reason.CHECKDATASIGVERIFY, Reason.NUMEQUALVERIFY,
-
-    AuthenticationErrorCommon.failedVerify,
-  ];
-  const timeCheck = [
-    Reason.NEGATIVE_LOCKTIME, Reason.UNSATISFIED_LOCKTIME,
-
-    AuthenticationErrorCommon.negativeLocktime, AuthenticationErrorCommon.unsatisfiedLocktime,
-  ];
-  const sigCheck = [
-    Reason.SIG_COUNT, Reason.PUBKEY_COUNT, Reason.SIG_HASHTYPE, Reason.SIG_DER,
-    Reason.SIG_HIGH_S, Reason.SIG_NULLFAIL, Reason.SIG_BADLENGTH, Reason.SIG_NONSCHNORR,
-
-    AuthenticationErrorCommon.nonNullSignatureFailure,
-  ];
-
-  if (toRegExp(require).test(reason)) {
-    return new FailedRequireError(reason, debugStr);
-  }
-
-  if (toRegExp(timeCheck).test(reason)) {
-    return new FailedTimeCheckError(reason, debugStr);
-  }
-
-  if (toRegExp(sigCheck).test(reason)) {
-    return new FailedSigCheckError(reason, debugStr);
-  }
-
-  return new FailedTransactionError(reason, debugStr);
-}
-
 export function toRegExp(reasons: string[]): RegExp {
   return new RegExp(reasons.join('|').replace(/\(/g, '\\(').replace(/\)/g, '\\)'));
 }
diff --git a/packages/cashscript/test/debugging.test.ts b/packages/cashscript/test/debugging.test.ts
index f04d347a..10c1ba49 100644
--- a/packages/cashscript/test/debugging.test.ts
+++ b/packages/cashscript/test/debugging.test.ts
@@ -377,7 +377,7 @@ describe('Debugging tests', () => {
       const transaction = contract.functions
         .test_multiple_require_statements_no_message_final().to(contract.address, 1000n);
 
-      await expect(transaction).toFailRequireWith(/Error in evaluating input index 0/);
+      await expect(transaction).toFailRequireWith(new RegExp('^Test\.cash:32 Require statement failed at line 32$'));
       await expect(transaction).not.toFailRequireWith(/1 should equal 1/);
     });
 
diff --git a/packages/cashscript/test/e2e/Announcement.test.ts b/packages/cashscript/test/e2e/Announcement.test.ts
index 57065130..4a40c711 100644
--- a/packages/cashscript/test/e2e/Announcement.test.ts
+++ b/packages/cashscript/test/e2e/Announcement.test.ts
@@ -1,11 +1,10 @@
-import { AuthenticationErrorCommon } from '@bitauth/libauth';
 import {
   Contract, ElectrumNetworkProvider, MockNetworkProvider, Network,
 } from '../../src/index.js';
 import { getTxOutputs } from '../test-util.js';
-import { FailedRequireError, Reason } from '../../src/Errors.js';
+import { FailedRequireError } from '../../src/Errors.js';
 import {
-  createOpReturnOutput, randomUtxo, toRegExp, utxoComparator,
+  createOpReturnOutput, randomUtxo, utxoComparator,
 } from '../../src/utils.js';
 import { aliceAddress } from '../fixture/vars.js';
 import artifact from '../fixture/announcement.json' assert { type: 'json' };
@@ -45,10 +44,7 @@ describe('Announcement', () => {
 
       // then
       await expect(txPromise).rejects.toThrow(FailedRequireError);
-      await expect(txPromise).rejects.toThrow(toRegExp([
-        Reason.NUMEQUALVERIFY,
-        AuthenticationErrorCommon.failedVerify,
-      ]));
+      await expect(txPromise).rejects.toThrow();
     });
 
     it('should fail when trying to announce incorrect announcement', async () => {
@@ -70,10 +66,7 @@ describe('Announcement', () => {
 
       // then
       await expect(txPromise).rejects.toThrow(FailedRequireError);
-      await expect(txPromise).rejects.toThrow(toRegExp([
-        Reason.EQUALVERIFY,
-        AuthenticationErrorCommon.failedVerify,
-      ]));
+      await expect(txPromise).rejects.toThrow('Announcement.cash:17 Require statement failed at line 17');
     });
 
     it('should fail when sending incorrect amount of change', async () => {
@@ -95,10 +88,7 @@ describe('Announcement', () => {
 
       // then
       await expect(txPromise).rejects.toThrow(FailedRequireError);
-      await expect(txPromise).rejects.toThrow(toRegExp([
-        Reason.NUMEQUALVERIFY,
-        AuthenticationErrorCommon.failedVerify,
-      ]));
+      await expect(txPromise).rejects.toThrow('Announcement.cash:25 Require statement failed at line 25');
     });
 
     it('should fail when sending the correct change amount to an incorrect address', async () => {
@@ -122,10 +112,7 @@ describe('Announcement', () => {
 
       // then
       await expect(txPromise).rejects.toThrow(FailedRequireError);
-      await expect(txPromise).rejects.toThrow(toRegExp([
-        Reason.EQUALVERIFY,
-        AuthenticationErrorCommon.failedVerify,
-      ]));
+      await expect(txPromise).rejects.toThrow('Announcement.cash:24 Require statement failed at line 24');
     });
 
     it('should succeed when announcing correct announcement', async () => {
diff --git a/packages/cashscript/test/e2e/BigInt.test.ts b/packages/cashscript/test/e2e/BigInt.test.ts
index f5378f67..f1e9e0d6 100644
--- a/packages/cashscript/test/e2e/BigInt.test.ts
+++ b/packages/cashscript/test/e2e/BigInt.test.ts
@@ -4,13 +4,12 @@ import {
   MockNetworkProvider,
   FailedRequireError,
   FailedTransactionError,
-  Reason,
   ElectrumNetworkProvider,
   Network,
 } from '../../src/index.js';
 import { getTxOutputs } from '../test-util.js';
 import artifact from '../fixture/bigint.json' assert { type: 'json' };
-import { randomUtxo, toRegExp } from '../../src/utils.js';
+import { randomUtxo } from '../../src/utils.js';
 
 describe('BigInt', () => {
   let bigintContract: Contract;
@@ -40,10 +39,7 @@ describe('BigInt', () => {
 
       // then
       await expect(txPromise).rejects.toThrow(FailedRequireError);
-      await expect(txPromise).rejects.toThrow(toRegExp([
-        Reason.VERIFY,
-        AuthenticationErrorCommon.failedVerify,
-      ]));
+      await expect(txPromise).rejects.toThrow('BigInt.cash:4 Require statement failed at line 4');
     });
 
     it('should fail when providing numbers that overflow 64 bits when multiplied', async () => {
@@ -59,10 +55,7 @@ describe('BigInt', () => {
 
       // then
       await expect(txPromise).rejects.toThrow(FailedTransactionError);
-      await expect(txPromise).rejects.toThrow(toRegExp([
-        Reason.INVALID_NUMBER_RANGE,
-        AuthenticationErrorCommon.overflowsVmNumberRange,
-      ]));
+      await expect(txPromise).rejects.toThrow(AuthenticationErrorCommon.overflowsVmNumberRange);
     });
 
     it('should fail when providing a number that does not fit within 64 bits', async () => {
@@ -78,10 +71,7 @@ describe('BigInt', () => {
 
       // then
       await expect(txPromise).rejects.toThrow(FailedTransactionError);
-      await expect(txPromise).rejects.toThrow(toRegExp([
-        Reason.INVALID_NUMBER_RANGE,
-        AuthenticationErrorCommon.invalidVmNumber,
-      ]));
+      await expect(txPromise).rejects.toThrow(AuthenticationErrorCommon.invalidVmNumber);
     });
 
     it('should succeed when providing a number within 32b < x < 64b', async () => {
diff --git a/packages/cashscript/test/e2e/FullStack.test.ts b/packages/cashscript/test/e2e/FullStack.test.ts
index 0b703bbb..7ad62ba8 100644
--- a/packages/cashscript/test/e2e/FullStack.test.ts
+++ b/packages/cashscript/test/e2e/FullStack.test.ts
@@ -7,7 +7,7 @@ import {
   bobPub,
 } from '../fixture/vars.js';
 import { getTxOutputs } from '../test-util.js';
-import { FailedSigCheckError, Reason } from '../../src/Errors.js';
+import { FailedRequireError, NodeErrorReason } from '../../src/Errors.js';
 import artifact from '../fixture/p2pkh.json' assert { type: 'json' };
 
 describe.skip('P2PKH (using FullStackNetworkProvider)', () => {
@@ -33,8 +33,8 @@ describe.skip('P2PKH (using FullStackNetworkProvider)', () => {
         .send();
 
       // then
-      await expect(txPromise).rejects.toThrow(FailedSigCheckError);
-      await expect(txPromise).rejects.toThrow(Reason.SIG_NULLFAIL);
+      await expect(txPromise).rejects.toThrow(FailedRequireError);
+      await expect(txPromise).rejects.toThrow(NodeErrorReason.SIG_NULLFAIL);
     });
 
     it('should succeed when using correct function arguments', async () => {
diff --git a/packages/cashscript/test/e2e/HodlVault.test.ts b/packages/cashscript/test/e2e/HodlVault.test.ts
index 604e3e6e..c8efca47 100644
--- a/packages/cashscript/test/e2e/HodlVault.test.ts
+++ b/packages/cashscript/test/e2e/HodlVault.test.ts
@@ -1,4 +1,3 @@
-import { AuthenticationErrorCommon } from '@bitauth/libauth';
 import {
   Contract,
   SignatureTemplate,
@@ -13,9 +12,9 @@ import {
   oraclePub,
 } from '../fixture/vars.js';
 import { getTxOutputs } from '../test-util.js';
-import { FailedRequireError, Reason } from '../../src/Errors.js';
+import { FailedRequireError } from '../../src/Errors.js';
 import artifact from '../fixture/hodl_vault.json' assert { type: 'json' };
-import { randomUtxo, toRegExp } from '../../src/utils.js';
+import { randomUtxo } from '../../src/utils.js';
 
 describe('HodlVault', () => {
   let hodlVault: Contract;
@@ -46,10 +45,7 @@ describe('HodlVault', () => {
 
       // then
       await expect(txPromise).rejects.toThrow(FailedRequireError);
-      await expect(txPromise).rejects.toThrow(toRegExp([
-        Reason.VERIFY,
-        AuthenticationErrorCommon.failedVerify,
-      ]));
+      await expect(txPromise).rejects.toThrow('HodlVault.cash:26 Require statement failed at line 26');
     });
 
     it('should fail when price is too low', async () => {
@@ -67,10 +63,7 @@ describe('HodlVault', () => {
 
       // then
       await expect(txPromise).rejects.toThrow(FailedRequireError);
-      await expect(txPromise).rejects.toThrow(toRegExp([
-        Reason.VERIFY,
-        AuthenticationErrorCommon.failedVerify,
-      ]));
+      await expect(txPromise).rejects.toThrow('HodlVault.cash:23 Require statement failed at line 23');
     });
 
     it('should succeed when price is high enough', async () => {
diff --git a/packages/cashscript/test/e2e/Mecenas.test.ts b/packages/cashscript/test/e2e/Mecenas.test.ts
index 67efbfcc..6b4cf5a6 100644
--- a/packages/cashscript/test/e2e/Mecenas.test.ts
+++ b/packages/cashscript/test/e2e/Mecenas.test.ts
@@ -1,4 +1,3 @@
-import { AuthenticationErrorCommon } from '@bitauth/libauth';
 import {
   Contract, ElectrumNetworkProvider, MockNetworkProvider, Network,
 } from '../../src/index.js';
@@ -9,9 +8,9 @@ import {
   bobAddress,
 } from '../fixture/vars.js';
 import { getTxOutputs } from '../test-util.js';
-import { FailedRequireError, Reason } from '../../src/Errors.js';
+import { FailedRequireError } from '../../src/Errors.js';
 import artifact from '../fixture/mecenas.json' assert { type: 'json' };
-import { randomUtxo, toRegExp } from '../../src/utils.js';
+import { randomUtxo } from '../../src/utils.js';
 
 // Mecenas has tx.age check omitted for testing
 describe('Mecenas', () => {
@@ -43,10 +42,7 @@ describe('Mecenas', () => {
 
       // then
       await expect(txPromise).rejects.toThrow(FailedRequireError);
-      await expect(txPromise).rejects.toThrow(toRegExp([
-        Reason.NUMEQUALVERIFY,
-        AuthenticationErrorCommon.failedVerify,
-      ]));
+      await expect(txPromise).rejects.toThrow('Mecenas.cash:24 Require statement failed at line 24');
     });
 
     it('should fail when trying to send to wrong person', async () => {
@@ -63,10 +59,7 @@ describe('Mecenas', () => {
 
       // then
       await expect(txPromise).rejects.toThrow(FailedRequireError);
-      await expect(txPromise).rejects.toThrow(toRegExp([
-        Reason.VERIFY,
-        AuthenticationErrorCommon.failedVerify,
-      ]));
+      await expect(txPromise).rejects.toThrow('Mecenas.cash:13 Require statement failed at line 13');
     });
 
     it('should fail when trying to send to multiple people', async () => {
@@ -84,10 +77,7 @@ describe('Mecenas', () => {
 
       // then
       await expect(txPromise).rejects.toThrow(FailedRequireError);
-      await expect(txPromise).rejects.toThrow(toRegExp([
-        Reason.VERIFY,
-        AuthenticationErrorCommon.failedVerify,
-      ]));
+      await expect(txPromise).rejects.toThrow('Mecenas.cash:25 Require statement failed at line 25');
     });
 
     it('should fail when sending incorrect amount of change', async () => {
@@ -104,10 +94,7 @@ describe('Mecenas', () => {
 
       // then
       await expect(txPromise).rejects.toThrow(FailedRequireError);
-      await expect(txPromise).rejects.toThrow(toRegExp([
-        Reason.NUMEQUALVERIFY,
-        AuthenticationErrorCommon.failedVerify,
-      ]));
+      await expect(txPromise).rejects.toThrow('Mecenas.cash:26 Require statement failed at line 26');
     });
 
     it('should succeed when sending pledge to receiver', async () => {
diff --git a/packages/cashscript/test/e2e/P2PKH.test.ts b/packages/cashscript/test/e2e/P2PKH.test.ts
index d6411b86..de4614a8 100644
--- a/packages/cashscript/test/e2e/P2PKH.test.ts
+++ b/packages/cashscript/test/e2e/P2PKH.test.ts
@@ -1,6 +1,7 @@
-import { AuthenticationErrorCommon, binToHex } from '@bitauth/libauth';
+import { binToHex } from '@bitauth/libauth';
 import {
   Contract, SignatureTemplate, MockNetworkProvider, ElectrumNetworkProvider,
+  FailedRequireError,
 } from '../../src/index.js';
 import {
   bobAddress,
@@ -8,13 +9,13 @@ import {
   bobPriv,
   bobPkh,
   alicePriv,
+  alicePub,
 } from '../fixture/vars.js';
 import { getTxOutputs } from '../test-util.js';
 import { Network, Utxo } from '../../src/interfaces.js';
 import {
-  createOpReturnOutput, randomUtxo, toRegExp, utxoComparator,
+  createOpReturnOutput, randomUtxo, utxoComparator,
 } from '../../src/utils.js';
-import { FailedSigCheckError, Reason } from '../../src/Errors.js';
 import artifact from '../fixture/p2pkh.json' assert { type: 'json' };
 
 describe('P2PKH-no-tokens', () => {
@@ -33,7 +34,23 @@ describe('P2PKH-no-tokens', () => {
   });
 
   describe('send', () => {
-    it('should fail when using incorrect function arguments', async () => {
+    it('should fail when using incorrect public key', async () => {
+      // given
+      const to = p2pkhInstance.address;
+      const amount = 10000n;
+
+      // when
+      const txPromise = p2pkhInstance.functions
+        .spend(alicePub, new SignatureTemplate(bobPriv))
+        .to(to, amount)
+        .send();
+
+      // then
+      await expect(txPromise).rejects.toThrow(FailedRequireError);
+      await expect(txPromise).rejects.toThrow('P2PKH.cash:4 Require statement failed at line 4');
+    });
+
+    it('should fail when using incorrect signature', async () => {
       // given
       const to = p2pkhInstance.address;
       const amount = 10000n;
@@ -45,11 +62,8 @@ describe('P2PKH-no-tokens', () => {
         .send();
 
       // then
-      await expect(txPromise).rejects.toThrow(FailedSigCheckError);
-      await expect(txPromise).rejects.toThrow(toRegExp([
-        Reason.SIG_NULLFAIL,
-        AuthenticationErrorCommon.nonNullSignatureFailure,
-      ]));
+      await expect(txPromise).rejects.toThrow(FailedRequireError);
+      await expect(txPromise).rejects.toThrow('P2PKH.cash:5 Require statement failed at line 5');
     });
 
     it('should succeed when using correct function arguments', async () => {
diff --git a/packages/cashscript/test/e2e/TokenCategoryCheck.test.ts b/packages/cashscript/test/e2e/TokenCategoryCheck.test.ts
index ec777a84..1289637f 100644
--- a/packages/cashscript/test/e2e/TokenCategoryCheck.test.ts
+++ b/packages/cashscript/test/e2e/TokenCategoryCheck.test.ts
@@ -1,6 +1,6 @@
 import { randomUtxo, randomToken } from '../../src/utils.js';
 import {
-  Contract, ElectrumNetworkProvider, MockNetworkProvider,
+  Contract, ElectrumNetworkProvider, FailedRequireError, MockNetworkProvider,
 } from '../../src/index.js';
 import { Network, Utxo } from '../../src/interfaces.js';
 import artifact from '../fixture/token_category_comparison.json' assert { type: 'json' };
@@ -48,7 +48,8 @@ describe('TokenCategoryCheck', () => {
         .to(to, amount, token)
         .send();
 
-      await expect(txPromise).rejects.toThrow(/completed with a non-truthy value on top of the stack/);
+      await expect(txPromise).rejects.toThrow(FailedRequireError);
+      await expect(txPromise).rejects.toThrow('Test.cash:3 Require statement failed at line 3');
     });
 
     it('can send if the input at index 1 does not contain tokens', async () => {
diff --git a/packages/cashscript/test/e2e/TransferWithTimeout.test.ts b/packages/cashscript/test/e2e/TransferWithTimeout.test.ts
index f7ddcf7f..1315ccae 100644
--- a/packages/cashscript/test/e2e/TransferWithTimeout.test.ts
+++ b/packages/cashscript/test/e2e/TransferWithTimeout.test.ts
@@ -1,18 +1,17 @@
-import { AuthenticationErrorCommon } from '@bitauth/libauth';
 import {
   Contract,
   SignatureTemplate,
   ElectrumNetworkProvider,
   Network,
   MockNetworkProvider,
+  FailedRequireError,
 } from '../../src/index.js';
 import {
   alicePriv, alicePub, bobPriv, bobPub,
 } from '../fixture/vars.js';
 import { getTxOutputs } from '../test-util.js';
-import { FailedSigCheckError, Reason, FailedTimeCheckError } from '../../src/Errors.js';
 import artifact from '../fixture/transfer_with_timeout.json' assert { type: 'json' };
-import { randomUtxo, toRegExp } from '../../src/utils.js';
+import { randomUtxo } from '../../src/utils.js';
 
 describe('TransferWithTimeout', () => {
   let twtInstancePast: Contract;
@@ -32,7 +31,7 @@ describe('TransferWithTimeout', () => {
   });
 
   describe('send', () => {
-    it('should fail when using incorrect function arguments to transfer', async () => {
+    it('should fail when signing transfer with incorrect private key', async () => {
       // given
       const to = twtInstancePast.address;
       const amount = 10000n;
@@ -44,14 +43,11 @@ describe('TransferWithTimeout', () => {
         .send();
 
       // then
-      await expect(txPromise).rejects.toThrow(FailedSigCheckError);
-      await expect(txPromise).rejects.toThrow(toRegExp([
-        Reason.SIG_NULLFAIL,
-        AuthenticationErrorCommon.nonNullSignatureFailure,
-      ]));
+      await expect(txPromise).rejects.toThrow(FailedRequireError);
+      await expect(txPromise).rejects.toThrow('TransferWithTimeout.cash:8 Require statement failed at line 8');
     });
 
-    it('should fail when using incorrect function arguments to timeout', async () => {
+    it('should fail when signing timeout with incorrect private key', async () => {
       // given
       const to = twtInstancePast.address;
       const amount = 10000n;
@@ -63,11 +59,8 @@ describe('TransferWithTimeout', () => {
         .send();
 
       // then
-      await expect(txPromise).rejects.toThrow(FailedSigCheckError);
-      await expect(txPromise).rejects.toThrow(toRegExp([
-        Reason.SIG_NULLFAIL,
-        AuthenticationErrorCommon.nonNullSignatureFailure,
-      ]));
+      await expect(txPromise).rejects.toThrow(FailedRequireError);
+      await expect(txPromise).rejects.toThrow('TransferWithTimeout.cash:13 Require statement failed at line 13');
     });
 
     it('should fail when timeout is called before timeout block', async () => {
@@ -82,11 +75,8 @@ describe('TransferWithTimeout', () => {
         .send();
 
       // then
-      await expect(txPromise).rejects.toThrow(FailedTimeCheckError);
-      await expect(txPromise).rejects.toThrow(toRegExp([
-        Reason.UNSATISFIED_LOCKTIME,
-        AuthenticationErrorCommon.unsatisfiedLocktime,
-      ]));
+      await expect(txPromise).rejects.toThrow(FailedRequireError);
+      await expect(txPromise).rejects.toThrow('TransferWithTimeout.cash:14 Require statement failed at line 14');
     });
 
     it('should succeed when transfer is called after timeout block', async () => {
diff --git a/packages/cashscript/test/e2e/old/Mecenas.test.ts b/packages/cashscript/test/e2e/old/Mecenas.test.ts
index 46f30850..24c159d4 100644
--- a/packages/cashscript/test/e2e/old/Mecenas.test.ts
+++ b/packages/cashscript/test/e2e/old/Mecenas.test.ts
@@ -14,7 +14,7 @@ import {
   alicePriv,
 } from '../../fixture/vars.js';
 import { getTxOutputs } from '../../test-util.js';
-import { FailedRequireError, Reason } from '../../../src/Errors.js';
+import { FailedTransactionError, NodeErrorReason } from '../../../src/Errors.js';
 import artifact from '../../fixture/old/mecenas.json' assert { type: 'json' };
 
 if (!process.env.TESTS_USE_MOCKNET) {
@@ -45,8 +45,8 @@ if (!process.env.TESTS_USE_MOCKNET) {
           .send();
 
         // then
-        await expect(txPromise).rejects.toThrow(FailedRequireError);
-        await expect(txPromise).rejects.toThrow(Reason.EQUALVERIFY);
+        await expect(txPromise).rejects.toThrow(FailedTransactionError);
+        await expect(txPromise).rejects.toThrow(NodeErrorReason.EQUALVERIFY);
       });
 
       it('should fail when trying to send to wrong person', async () => {
@@ -62,8 +62,8 @@ if (!process.env.TESTS_USE_MOCKNET) {
           .send();
 
         // then
-        await expect(txPromise).rejects.toThrow(FailedRequireError);
-        await expect(txPromise).rejects.toThrow(Reason.EQUALVERIFY);
+        await expect(txPromise).rejects.toThrow(FailedTransactionError);
+        await expect(txPromise).rejects.toThrow(NodeErrorReason.EQUALVERIFY);
       });
 
       it('should fail when trying to send to multiple people', async () => {
@@ -80,8 +80,8 @@ if (!process.env.TESTS_USE_MOCKNET) {
           .send();
 
         // then
-        await expect(txPromise).rejects.toThrow(FailedRequireError);
-        await expect(txPromise).rejects.toThrow(Reason.EQUALVERIFY);
+        await expect(txPromise).rejects.toThrow(FailedTransactionError);
+        await expect(txPromise).rejects.toThrow(NodeErrorReason.EQUALVERIFY);
       });
 
       it('should succeed when sending pledge to receiver', async () => {
diff --git a/website/docs/sdk/transactions-advanced.md b/website/docs/sdk/transactions-advanced.md
index 1a29522d..4eb0c9aa 100644
--- a/website/docs/sdk/transactions-advanced.md
+++ b/website/docs/sdk/transactions-advanced.md
@@ -229,7 +229,7 @@ const txHex = new TransactionBuilder({ provider })
 
 ## Transaction errors
 
-Transactions can fail for a number of reasons. Refer to the [Transaction Errors][transactions-simple-errors] section of the simplified transaction builder documentation for more information.
+Transactions can fail for a number of reasons. Refer to the [Transaction Errors][transactions-simple-errors] section of the simplified transaction builder documentation for more information. Note that the advanced transaction builder does not yet support the `FailedRequireError` mentioned in the simplified transaction builder documentation so any error will be of type `FailedTransactionError` and include any of the mentioned error reasons in its message.
 
 [fex]: https://github.com/fex-cash/fex
 [bitcoin-wiki-timelocks]: https://en.bitcoin.it/wiki/Timelock
diff --git a/website/docs/sdk/transactions.md b/website/docs/sdk/transactions.md
index 7a2d8f1e..4db1a075 100644
--- a/website/docs/sdk/transactions.md
+++ b/website/docs/sdk/transactions.md
@@ -259,35 +259,27 @@ You can read more about debugging transactions on the [debugging page](/docs/gui
 It is unsafe to debug transactions on mainnet as private keys will be exposed to BitAuth IDE and transmitted over the network.
 :::
 
+TODO: Update this section with the new debugging experience
+
 ## Transaction errors
-Transactions can fail for a number of reasons. Most of these are related to the execution of the smart contract (e.g. wrong parameters or a bug in the contract code). But errors can also occur because of other reasons (e.g. a fee that's too low or the same transaction already exists in the mempool). To facilitate error handling in your applications, the CashScript SDK provides an enum of different *reasons* for a failure.
-
-This `Reason` enum only includes errors that are related to smart contract execution, so other reasons have to be caught separately. Besides the `Reason` enum, there are also several error classes that can be caught and acted on:
-
-* **`FailedRequireError`** signifies a failed require statement. This includes the following reasons:
-  * `Reason.EVAL_FALSE`
-  * `Reason.VERIFY`
-  * `Reason.EQUALVERIFY`
-  * `Reason.CHECKMULTISIGVERIFY`
-  * `Reason.CHECKSIGVERIFY`
-  * `Reason.CHECKDATASIGVERIFY`
-  * `Reason.NUMEQUALVERIFY`
-* **`FailedTimeCheckError`** signifies a failed time check using `tx.time` or `tx.age`. This includes the following reasons:
-  * `Reason.NEGATIVE_LOCKTIME`
-  * `Reason.UNSATISFIED_LOCKTIME`
-* **`FailedSigCHeckError`** signifies a failed signature check. This includes the following reasons:
-  * `Reason.SIG_COUNT`
-  * `Reason.PUBKEY_COUNT`
-  * `Reason.SIG_HASHTYPE`
-  * `Reason.SIG_DER`
-  * `Reason.SIG_HIGH_S`
-  * `Reason.SIG_NULLFAIL`
-  * `Reason.SIG_BADLENGTH`
-  * `Reason.SIG_NONSCHNORR`
-* **`FailedTransactionError`** signifies a general fallback error. This includes all remaining reasons listed in the `Reason` enum as well as any other reasons unrelated to the smart contract execution.
+
+When sending a transaction, the CashScript SDK will throw an error if the transaction fails. If you are using an artifact compiled with `cashc@0.10.0` or later, the error will be of the type `FailedRequireError` or `FailedTransactionError`. In case of a `FailedRequireError`, the error will refer to the corresponding `require` statement in the contract code so you know where your contract failed. If you want more information about the underlying error, you can check the `libauthErrorMessage` property of the error.
+
+```ts
+interface FailedRequireError {
+  message: string;
+  contractName: string;
+  requireStatement: { ip: number, line: number, message: string };
+  inputIndex: number,
+  libauthErrorMessage?: string,
+  bitauthUri?: string;
+}
+```
+
+If you are using an artifact compiled with an older version of `cashc`, the error will always be of the type `FailedTransactionError`. In this case, you can use the `reason` property of the error to determine the reason for the failure. A list of possible reasons can be found in the `NodeErrorReason` enum below.
 
 ```ts
-enum Reason {
+enum NodeErrorReason {
   EVAL_FALSE = 'Script evaluated without error but finished with a false/empty top stack element',
   VERIFY = 'Script failed an OP_VERIFY operation',
   EQUALVERIFY = 'Script failed an OP_EQUALVERIFY operation',

From 746063dd4eec912528bccae2b72c41d6986c51b7 Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Tue, 25 Jun 2024 12:14:40 +0200
Subject: [PATCH 129/171] Bump version to 0.10.0-next.6

---
 examples/package.json               | 6 +++---
 examples/testing-suite/package.json | 6 +++---
 packages/cashc/package.json         | 4 ++--
 packages/cashc/src/index.ts         | 2 +-
 packages/cashscript/package.json    | 4 ++--
 packages/utils/package.json         | 2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/examples/package.json b/examples/package.json
index ceaf832f..a1ac1a94 100644
--- a/examples/package.json
+++ b/examples/package.json
@@ -1,7 +1,7 @@
 {
   "name": "cashscript-examples",
   "private": true,
-  "version": "0.10.0-next.5",
+  "version": "0.10.0-next.6",
   "description": "Usage examples of the CashScript SDK",
   "main": "p2pkh.js",
   "type": "module",
@@ -14,8 +14,8 @@
     "@bitauth/libauth": "^2.0.0-alpha.8",
     "@types/node": "^12.7.8",
     "bip39": "^3.0.4",
-    "cashc": "^0.10.0-next.5",
-    "cashscript": "^0.10.0-next.5",
+    "cashc": "^0.10.0-next.6",
+    "cashscript": "^0.10.0-next.6",
     "eslint": "^8.56.0",
     "typescript": "^4.9.5"
   }
diff --git a/examples/testing-suite/package.json b/examples/testing-suite/package.json
index 7cb4d91b..36b5f308 100644
--- a/examples/testing-suite/package.json
+++ b/examples/testing-suite/package.json
@@ -1,6 +1,6 @@
 {
   "name": "testing-suite",
-  "version": "0.10.0-next.5",
+  "version": "0.10.0-next.6",
   "description": "Example project to develop and test CashScript contracts",
   "main": "index.js",
   "type": "module",
@@ -25,8 +25,8 @@
     "test": "NODE_OPTIONS='--experimental-vm-modules --no-warnings' jest"
   },
   "dependencies": {
-    "cashc": "^0.10.0-next.5",
-    "cashscript": "^0.10.0-next.5"
+    "cashc": "^0.10.0-next.6",
+    "cashscript": "^0.10.0-next.6"
   },
   "devDependencies": {
     "@jest/globals": "^29.4.1",
diff --git a/packages/cashc/package.json b/packages/cashc/package.json
index 5b48f4aa..1193d65d 100644
--- a/packages/cashc/package.json
+++ b/packages/cashc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cashc",
-  "version": "0.10.0-next.5",
+  "version": "0.10.0-next.6",
   "description": "Compile Bitcoin Cash contracts to Bitcoin Cash Script or artifacts",
   "keywords": [
     "bitcoin",
@@ -50,7 +50,7 @@
   },
   "dependencies": {
     "@bitauth/libauth": "^2.0.0",
-    "@cashscript/utils": "^0.10.0-next.5",
+    "@cashscript/utils": "^0.10.0-next.6",
     "antlr4": "^4.13.1-patch-1",
     "commander": "^7.1.0",
     "semver": "^7.5.4"
diff --git a/packages/cashc/src/index.ts b/packages/cashc/src/index.ts
index 01e18dc6..e05ef6ec 100644
--- a/packages/cashc/src/index.ts
+++ b/packages/cashc/src/index.ts
@@ -2,4 +2,4 @@ export * from './Errors.js';
 export * as utils from '@cashscript/utils';
 export { compileFile, compileString } from './compiler.js';
 
-export const version = '0.10.0-next.5';
+export const version = '0.10.0-next.6';
diff --git a/packages/cashscript/package.json b/packages/cashscript/package.json
index 0a591dca..0f2f8f65 100644
--- a/packages/cashscript/package.json
+++ b/packages/cashscript/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cashscript",
-  "version": "0.10.0-next.5",
+  "version": "0.10.0-next.6",
   "description": "Easily write and interact with Bitcoin Cash contracts",
   "keywords": [
     "bitcoin cash",
@@ -44,7 +44,7 @@
   },
   "dependencies": {
     "@bitauth/libauth": "^2.0.0",
-    "@cashscript/utils": "^0.10.0-next.5",
+    "@cashscript/utils": "^0.10.0-next.6",
     "bip68": "^1.0.4",
     "bitcoin-rpc-promise-retry": "^1.3.0",
     "delay": "^5.0.0",
diff --git a/packages/utils/package.json b/packages/utils/package.json
index f4465fc9..a73dc4c2 100644
--- a/packages/utils/package.json
+++ b/packages/utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cashscript/utils",
-  "version": "0.10.0-next.5",
+  "version": "0.10.0-next.6",
   "description": "CashScript utilities and types",
   "keywords": [
     "bitcoin cash",

From b26f1f20b89df6d857a5860eebd3bcc7668faa4e Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Tue, 25 Jun 2024 12:16:51 +0200
Subject: [PATCH 130/171] Update development docs and skip failing test for
 publication

---
 DEVELOPMENT.md                                 | 2 +-
 packages/cashscript/test/e2e/HodlVault.test.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
index e3a966ff..54e633eb 100644
--- a/DEVELOPMENT.md
+++ b/DEVELOPMENT.md
@@ -8,7 +8,7 @@ pushd ../.. && yarn build && popd
 
 ### Publishing a release
 
-To publish a new release, we use `yarn update-version 'x.x.x'` in the root directory to bump the version before release, and then `yarn publish-all` in the root directory to publish the release. In case of a tagged release (such as `next`), we use `yarn publish-all --dist-tag <tag name>` to publish the release with the specified tag.
+To publish a new release, we use `yarn update-version 'x.x.x'` in the root directory to bump the version before release, and then `yarn publish-all` in the root directory to publish the release. In case of a tagged release (such as `next`), we use `TESTS_USE_MOCKNET=true yarn publish-all --dist-tag <tag name>` to publish the release with the specified tag.
 
 ## cashc
 
diff --git a/packages/cashscript/test/e2e/HodlVault.test.ts b/packages/cashscript/test/e2e/HodlVault.test.ts
index c8efca47..b76a40cb 100644
--- a/packages/cashscript/test/e2e/HodlVault.test.ts
+++ b/packages/cashscript/test/e2e/HodlVault.test.ts
@@ -29,7 +29,7 @@ describe('HodlVault', () => {
   });
 
   describe('send', () => {
-    it('should fail when oracle sig is incorrect', async () => {
+    it.skip('should fail when oracle sig is incorrect', async () => {
       // given
       const message = oracle.createMessage(100000n, 1000n);
       const wrongMessage = oracle.createMessage(100000n, 1001n);

From 18b08f6a5c3bc7b7085b0903eb3188c5e3391e3b Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Tue, 6 Aug 2024 10:48:16 +0200
Subject: [PATCH 131/171] Add extra test case for P2SH20, fix bug with
 placeholder data & fix failing test for HodlVault

---
 packages/cashscript/src/LibauthTemplate.ts       | 16 +++-------------
 packages/cashscript/test/e2e/HodlVault.test.ts   |  6 +++---
 .../test/fixture/libauth-template/fixtures.ts    |  7 +++----
 3 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/packages/cashscript/src/LibauthTemplate.ts b/packages/cashscript/src/LibauthTemplate.ts
index 38d3650c..9f27a997 100644
--- a/packages/cashscript/src/LibauthTemplate.ts
+++ b/packages/cashscript/src/LibauthTemplate.ts
@@ -52,8 +52,6 @@ export const buildTemplate = async ({
   const contract = transaction.contract;
   const txHex = transactionHex ?? await transaction.build();
 
-  const hasSignatureTemplates = transaction.inputs.filter((input) => isUtxoP2PKH(input)).length > 0;
-
   const template = {
     $schema: 'https://ide.bitauth.com/authentication-template-v0.schema.json',
     description: 'Imported from cashscript',
@@ -76,11 +74,11 @@ export const buildTemplate = async ({
       transaction.abiFunction,
       transaction.encodedFunctionArgs,
       contract.encodedConstructorArgs,
-      hasSignatureTemplates,
     ),
   } as WalletTemplate;
 
   // add extra variables for the p2pkh utxos spent together with our contract
+  const hasSignatureTemplates = transaction.inputs.filter((input) => isUtxoP2PKH(input)).length > 0;
   if (hasSignatureTemplates) {
     template.entities.parameters.scripts!.push('p2pkh_placeholder_lock', 'p2pkh_placeholder_unlock');
     template.entities.parameters.variables = {
@@ -233,7 +231,6 @@ const generateTemplateScenarios = (
   abiFunction: AbiFunction,
   encodedFunctionArgs: EncodedArgument[],
   encodedConstructorArgs: EncodedArgument[],
-  hasSignatureTemplates: boolean,
 ): WalletTemplate['scenarios'] => {
   const libauthTransaction = decodeTransaction(hexToBin(transactionHex));
   if (typeof libauthTransaction === 'string') throw Error(libauthTransaction);
@@ -253,9 +250,7 @@ const generateTemplateScenarios = (
         currentBlockHeight: 2,
         currentBlockTime: Math.round(+new Date() / 1000),
         keys: {
-          privateKeys: generateTemplateScenarioKeys(
-            abiFunction.inputs, encodedFunctionArgs, hasSignatureTemplates,
-          ),
+          privateKeys: generateTemplateScenarioKeys(abiFunction.inputs, encodedFunctionArgs),
         },
       },
       transaction: generateTemplateScenarioTransaction(contract, libauthTransaction, transaction),
@@ -376,7 +371,6 @@ const generateTemplateScenarioParametersValues = (
 const generateTemplateScenarioKeys = (
   types: AbiInput[],
   encodedArgs: EncodedArgument[],
-  hasSignatureTemplates: boolean,
 ): Record<string, string> => {
   const typesAndArguments = zip(types, encodedArgs);
 
@@ -384,11 +378,7 @@ const generateTemplateScenarioKeys = (
     .filter(([, arg]) => arg instanceof SignatureTemplate)
     .map(([input, arg]) => ([snakeCase(input.name), binToHex((arg as SignatureTemplate).privateKey)] as const));
 
-  const placeholderKey = hasSignatureTemplates
-    ? [['placeholder_key', '0x0000000000000000000000000000000000000000000000000000000000000000']]
-    : [];
-
-  return Object.fromEntries([...entries, ...placeholderKey]);
+  return Object.fromEntries(entries);
 };
 
 const formatParametersForDebugging = (types: AbiInput[], args: EncodedArgument[]): string => {
diff --git a/packages/cashscript/test/e2e/HodlVault.test.ts b/packages/cashscript/test/e2e/HodlVault.test.ts
index b76a40cb..31e47a71 100644
--- a/packages/cashscript/test/e2e/HodlVault.test.ts
+++ b/packages/cashscript/test/e2e/HodlVault.test.ts
@@ -29,10 +29,10 @@ describe('HodlVault', () => {
   });
 
   describe('send', () => {
-    it.skip('should fail when oracle sig is incorrect', async () => {
+    it('should fail when oracle sig is incorrect', async () => {
       // given
-      const message = oracle.createMessage(100000n, 1000n);
-      const wrongMessage = oracle.createMessage(100000n, 1001n);
+      const message = oracle.createMessage(100000n, 30000n);
+      const wrongMessage = oracle.createMessage(100000n, 30001n);
       const wrongSig = oracle.signMessage(wrongMessage);
       const to = hodlVault.address;
       const amount = 10000n;
diff --git a/packages/cashscript/test/fixture/libauth-template/fixtures.ts b/packages/cashscript/test/fixture/libauth-template/fixtures.ts
index bb2eb8ba..d1ce7bac 100644
--- a/packages/cashscript/test/fixture/libauth-template/fixtures.ts
+++ b/packages/cashscript/test/fixture/libauth-template/fixtures.ts
@@ -965,9 +965,9 @@ export const fixtures: Fixture[] = [
   //   template: {} as any,
   // },
   {
-    name: 'P2PKH (with P2PKH inputs)',
+    name: 'P2PKH (with P2PKH inputs & P2SH20 address type)',
     transaction: (() => {
-      const contract = new Contract(P2PKH, [alicePkh], { provider });
+      const contract = new Contract(P2PKH, [alicePkh], { provider, addressType: 'p2sh20' });
 
       const regularUtxo = randomUtxo();
       provider.addUtxo(contract.address, regularUtxo);
@@ -1042,7 +1042,6 @@ export const fixtures: Fixture[] = [
             'keys': {
               'privateKeys': {
                 's': '36f8155c559f3a670586bbbf9fd52beef6f96124f5a3a39c167fc24b052d24d7',
-                'placeholder_key': '0x0000000000000000000000000000000000000000000000000000000000000000',
               },
             },
           },
@@ -1118,7 +1117,7 @@ export const fixtures: Fixture[] = [
           'unlocks': 'lock',
         },
         'lock': {
-          'lockingType': 'p2sh32',
+          'lockingType': 'p2sh20',
           'name': 'lock',
           'script': '// "P2PKH" contract constructor parameters\n<pkh> // bytes20 = <0x512dbb2c8c02efbac8d92431aa0ac33f6b0bf970>\n\n// bytecode\n                                                        /* contract P2PKH(bytes20 pkh) {                                */\n                                                        /*     // Require pk to match stored pkh and signature to match */\n                                                        /*     function spend(pubkey pk, sig s) {                       */\nOP_1 OP_PICK OP_HASH160 OP_1 OP_ROLL OP_EQUAL OP_VERIFY /*         require(hash160(pk) == pkh);                         */\nOP_1 OP_ROLL OP_1 OP_ROLL OP_CHECKSIG                   /*         require(checkSig(s, pk));                            */\n                                                        /*     }                                                        */\n                                                        /* }                                                            */\n                                                        /*                                                              */',
         },

From 55acaceb6c19023e299df6d6d5e5577345a24577 Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Tue, 6 Aug 2024 11:08:36 +0200
Subject: [PATCH 132/171] Add test case for zero-encoding

---
 packages/cashscript/test/debugging.test.ts | 25 ++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/packages/cashscript/test/debugging.test.ts b/packages/cashscript/test/debugging.test.ts
index 10c1ba49..5384fc8c 100644
--- a/packages/cashscript/test/debugging.test.ts
+++ b/packages/cashscript/test/debugging.test.ts
@@ -122,6 +122,16 @@ contract Test() {
 }
 `;
 
+const CONTRACT_CODE_ZERO_HANDLING = `
+contract Test(int a) {
+  function test_zero_handling(int b) {
+    require(a == 0, "a should be 0");
+    require(b == 0, "b should be 0");
+    require(a == b, "a should equal b");
+  }
+}
+`;
+
 describe('Debugging tests', () => {
   describe('console.log statements', () => {
     const BASE_CONTRACT_CODE = `
@@ -488,6 +498,21 @@ describe('Debugging tests', () => {
     });
   });
 
+  describe('Template encoding', () => {
+    const artifact = compileString(CONTRACT_CODE_ZERO_HANDLING);
+    const provider = new MockNetworkProvider();
+
+    // test_zero_handling
+    it('should encode a locking and unlocking parameter of value 0 correctly and evaluate the execution', async () => {
+      const contract = new Contract(artifact, [0n], { provider });
+      provider.addUtxo(contract.address, randomUtxo());
+
+      const transaction = contract.functions.test_zero_handling(0n).to(contract.address, 1000n);
+      console.log(await transaction.bitauthUri());
+      await expect(transaction).not.toFailRequireWith(/.*/);
+    });
+  });
+
   describe('JestExtensions', () => {
     const artifact = compileString(CONTRACT_CODE);
     const provider = new MockNetworkProvider();

From 24d77df6789087cbfc5ce494127d51b51b91fadf Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Tue, 6 Aug 2024 11:35:43 +0200
Subject: [PATCH 133/171] Support for different hashtypes / signing algorithms
 in unlocking parameters

---
 packages/cashscript/src/LibauthTemplate.ts    | 35 +++++++++++++++++--
 packages/cashscript/src/SignatureTemplate.ts  |  4 +++
 .../test/fixture/libauth-template/fixtures.ts | 11 +++---
 3 files changed, 44 insertions(+), 6 deletions(-)

diff --git a/packages/cashscript/src/LibauthTemplate.ts b/packages/cashscript/src/LibauthTemplate.ts
index 9f27a997..f74289e8 100644
--- a/packages/cashscript/src/LibauthTemplate.ts
+++ b/packages/cashscript/src/LibauthTemplate.ts
@@ -32,6 +32,8 @@ import {
   LibauthTokenDetails,
   Output,
   AddressType,
+  SignatureAlgorithm,
+  HashType,
 } from './interfaces.js';
 import SignatureTemplate from './SignatureTemplate.js';
 import { Transaction } from './Transaction.js';
@@ -389,8 +391,9 @@ const formatParametersForDebugging = (types: AbiInput[], args: EncodedArgument[]
 
   return typesAndArguments.map(([input, arg]) => {
     if (arg instanceof SignatureTemplate) {
-      // TODO: Different signing algorithms / hashtypes
-      return `<${snakeCase(input.name)}.schnorr_signature.all_outputs> // ${input.type}`;
+      const signatureAlgorithmName = getSignatureAlgorithmName(arg.getSignatureAlgorithm());
+      const hashtypeName = getHashTypeName(arg.getHashType(false));
+      return `<${snakeCase(input.name)}.${signatureAlgorithmName}.${hashtypeName}> // ${input.type}`;
     }
 
     const typeStr = input.type === 'bytes' ? `bytes${arg.length}` : input.type;
@@ -401,6 +404,34 @@ const formatParametersForDebugging = (types: AbiInput[], args: EncodedArgument[]
   }).join('\n');
 };
 
+const getSignatureAlgorithmName = (signatureAlgorithm: SignatureAlgorithm): string => {
+  const signatureAlgorithmNames = {
+    [SignatureAlgorithm.SCHNORR]: 'schnorr_signature',
+    [SignatureAlgorithm.ECDSA]: 'ecdsa_signature',
+  };
+
+  return signatureAlgorithmNames[signatureAlgorithm];
+};
+
+const getHashTypeName = (hashType: HashType): string => {
+  const hashtypeNames = {
+    [HashType.SIGHASH_ALL]: 'all_outputs',
+    [HashType.SIGHASH_ALL | HashType.SIGHASH_ANYONECANPAY]: 'all_outputs_single_input',
+    [HashType.SIGHASH_ALL | HashType.SIGHASH_UTXOS]: 'all_outputs_all_utxos',
+    [HashType.SIGHASH_ALL | HashType.SIGHASH_ANYONECANPAY | HashType.SIGHASH_UTXOS]: 'all_outputs_single_input_INVALID_all_utxos',
+    [HashType.SIGHASH_SINGLE]: 'corresponding_output',
+    [HashType.SIGHASH_SINGLE | HashType.SIGHASH_ANYONECANPAY]: 'corresponding_output_single_input',
+    [HashType.SIGHASH_SINGLE | HashType.SIGHASH_UTXOS]: 'corresponding_output_all_utxos',
+    [HashType.SIGHASH_SINGLE | HashType.SIGHASH_ANYONECANPAY | HashType.SIGHASH_UTXOS]: 'corresponding_output_single_input_INVALID_all_utxos',
+    [HashType.SIGHASH_NONE]: 'no_outputs',
+    [HashType.SIGHASH_NONE | HashType.SIGHASH_ANYONECANPAY]: 'no_outputs_single_input',
+    [HashType.SIGHASH_NONE | HashType.SIGHASH_UTXOS]: 'no_outputs_all_utxos',
+    [HashType.SIGHASH_NONE | HashType.SIGHASH_ANYONECANPAY | HashType.SIGHASH_UTXOS]: 'no_outputs_single_input_INVALID_all_utxos',
+  };
+
+  return hashtypeNames[hashType];
+};
+
 const formatBytecodeForDebugging = (artifact: Artifact): string => {
   if (!artifact.debug) {
     // TODO: See if we can merge this with code from @cashscript/utils -> script.ts
diff --git a/packages/cashscript/src/SignatureTemplate.ts b/packages/cashscript/src/SignatureTemplate.ts
index 0e9de359..6535636a 100644
--- a/packages/cashscript/src/SignatureTemplate.ts
+++ b/packages/cashscript/src/SignatureTemplate.ts
@@ -39,6 +39,10 @@ export default class SignatureTemplate {
     return bchForkId ? (this.hashtype | SigningSerializationFlag.forkId) : this.hashtype;
   }
 
+  getSignatureAlgorithm(): SignatureAlgorithm {
+    return this.signatureAlgorithm;
+  }
+
   getPublicKey(): Uint8Array {
     return secp256k1.derivePublicKeyCompressed(this.privateKey) as Uint8Array;
   }
diff --git a/packages/cashscript/test/fixture/libauth-template/fixtures.ts b/packages/cashscript/test/fixture/libauth-template/fixtures.ts
index d1ce7bac..40710515 100644
--- a/packages/cashscript/test/fixture/libauth-template/fixtures.ts
+++ b/packages/cashscript/test/fixture/libauth-template/fixtures.ts
@@ -1,4 +1,4 @@
-import { Contract, MockNetworkProvider, SignatureTemplate, Transaction, randomNFT, randomToken, randomUtxo } from '../../../src/index.js';
+import { Contract, HashType, MockNetworkProvider, SignatureAlgorithm, SignatureTemplate, Transaction, randomNFT, randomToken, randomUtxo } from '../../../src/index.js';
 import TransferWithTimeout from '../transfer_with_timeout.json' assert { type: 'json' };
 import Mecenas from '../mecenas.json' assert { type: 'json' };
 import P2PKH from '../p2pkh.json' assert { type: 'json' };
@@ -965,7 +965,7 @@ export const fixtures: Fixture[] = [
   //   template: {} as any,
   // },
   {
-    name: 'P2PKH (with P2PKH inputs & P2SH20 address type)',
+    name: 'P2PKH (with P2PKH inputs & P2SH20 address type & ECDSA signature algorithm)',
     transaction: (() => {
       const contract = new Contract(P2PKH, [alicePkh], { provider, addressType: 'p2sh20' });
 
@@ -979,8 +979,11 @@ export const fixtures: Fixture[] = [
       const amount = 1000n;
 
       const tx = contract.functions
-        .spend(alicePub, new SignatureTemplate(alicePriv))
+        .spend(alicePub, new SignatureTemplate(alicePriv, HashType.SIGHASH_NONE, SignatureAlgorithm.ECDSA))
         .fromP2PKH(p2pkhUtxo, new SignatureTemplate(alicePriv))
+        // TODO: Also allow fromP2PKH with different signing algorithms / hashtypes
+        // + support multiple fromP2PKH inputs with different keys
+        // .fromP2PKH(p2pkhUtxo, new SignatureTemplate(bobPriv, HashType.SIGHASH_ALL, SignatureAlgorithm.ECDSA))
         .from(regularUtxo)
         .to(to, amount);
 
@@ -1113,7 +1116,7 @@ export const fixtures: Fixture[] = [
             'evaluate_function',
           ],
           'name': 'unlock',
-          'script': '// "spend" function parameters\n<s.schnorr_signature.all_outputs> // sig\n<pk> // pubkey = <0x0373cc07b54c22da627b572a387a20ea190c9382e5e6d48c1d5b89c5cea2c4c088>\n',
+          'script': '// "spend" function parameters\n<s.ecdsa_signature.no_outputs> // sig\n<pk> // pubkey = <0x0373cc07b54c22da627b572a387a20ea190c9382e5e6d48c1d5b89c5cea2c4c088>\n',
           'unlocks': 'lock',
         },
         'lock': {

From a10040412fabfcaa42ae00bb07d82fbefb0634fa Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Tue, 6 Aug 2024 12:01:48 +0200
Subject: [PATCH 134/171] Allow cashscript/jest import instead of
 cashscript/dist/test/...

---
 .eslintrc.cjs                                 | 2 +-
 examples/testing-suite/artifacts/example.json | 9 +++++----
 examples/testing-suite/test/example.test.ts   | 2 +-
 packages/cashscript/.npmignore                | 1 +
 packages/cashscript/jest/package.json         | 5 +++++
 5 files changed, 13 insertions(+), 6 deletions(-)
 create mode 100644 packages/cashscript/jest/package.json

diff --git a/.eslintrc.cjs b/.eslintrc.cjs
index 527115a7..d05a80a6 100644
--- a/.eslintrc.cjs
+++ b/.eslintrc.cjs
@@ -46,6 +46,6 @@ module.exports = {
     'max-classes-per-file': 0, // Multiple classes in one file are allowed (e.g. Errors)
     '@typescript-eslint/no-redeclare': 0, // I sometimes name variables an types the same
     'linebreak-style': 0, // Ignore linebreak lints https://stackoverflow.com/a/43008668/1129108
-    'import/extensions': ['error', 'always'], // ESM requires file extensions
+    'import/extensions': ['error', 'ignorePackages'], // ESM requires file extensions
   },
 }
diff --git a/examples/testing-suite/artifacts/example.json b/examples/testing-suite/artifacts/example.json
index 36e61dcd..b5b4bd75 100644
--- a/examples/testing-suite/artifacts/example.json
+++ b/examples/testing-suite/artifacts/example.json
@@ -24,7 +24,8 @@
         "data": [
           {
             "stackIndex": 0,
-            "type": "int"
+            "type": "int",
+            "ip": 0
           },
           "test"
         ]
@@ -40,7 +41,7 @@
   },
   "compiler": {
     "name": "cashc",
-    "version": "0.10.0-next.3"
+    "version": "0.10.0-next.6"
   },
-  "updatedAt": "2024-04-15T03:55:07.781Z"
-}
+  "updatedAt": "2024-08-06T09:59:35.164Z"
+}
\ No newline at end of file
diff --git a/examples/testing-suite/test/example.test.ts b/examples/testing-suite/test/example.test.ts
index 1ab83f28..731f5e22 100644
--- a/examples/testing-suite/test/example.test.ts
+++ b/examples/testing-suite/test/example.test.ts
@@ -1,6 +1,6 @@
 import artifact from '../artifacts/example.json' assert { type: 'json' };
 import { Contract, MockNetworkProvider, randomUtxo } from 'cashscript';
-import 'cashscript/dist/test/JestExtensions.js';
+import 'cashscript/jest';
 
 describe('test example contract functions', () => {
   it('should check for output logs and error messages', async () => {
diff --git a/packages/cashscript/.npmignore b/packages/cashscript/.npmignore
index 5be42fa8..4162c3ac 100644
--- a/packages/cashscript/.npmignore
+++ b/packages/cashscript/.npmignore
@@ -1,3 +1,4 @@
 *
 !dist/**
+!jest/package.json
 *.map
diff --git a/packages/cashscript/jest/package.json b/packages/cashscript/jest/package.json
new file mode 100644
index 00000000..f40996b5
--- /dev/null
+++ b/packages/cashscript/jest/package.json
@@ -0,0 +1,5 @@
+{
+  "type": "module",
+  "types": "../dist/test/JestExtensions.d.ts",
+  "main": "../dist/test/JestExtensions.js"
+}

From 392890932be71b438d4ad6d343ec2b34b46712a1 Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Tue, 6 Aug 2024 12:02:42 +0200
Subject: [PATCH 135/171] Update Bitcoin-com/cashscript references to
 CashScript/cashscript

---
 README.md                        | 6 +++---
 packages/cashc/README.md         | 4 ++--
 packages/cashc/package.json      | 4 ++--
 packages/cashscript/README.md    | 2 +-
 packages/cashscript/package.json | 4 ++--
 packages/utils/README.md         | 4 ++--
 packages/utils/package.json      | 4 ++--
 website/docs/basics/compiler.md  | 4 ++--
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/README.md b/README.md
index 9c203d23..a8cb0483 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # CashScript
 
-[![Build Status](https://travis-ci.org/Bitcoin-com/cashscript.svg)](https://travis-ci.org/Bitcoin-com/cashscript)
-[![Coverage Status](https://img.shields.io/codecov/c/github/Bitcoin-com/cashscript.svg)](https://codecov.io/gh/Bitcoin-com/cashscript/)
+[![Build Status](https://travis-ci.org/CashScript/cashscript.svg)](https://travis-ci.org/CashScript/cashscript)
+[![Coverage Status](https://img.shields.io/codecov/c/github/CashScript/cashscript.svg)](https://codecov.io/gh/CashScript/cashscript/)
 [![NPM Version](https://img.shields.io/npm/v/cashscript.svg)](https://www.npmjs.com/package/cashscript)
 [![NPM Monthly Downloads](https://img.shields.io/npm/dm/cashscript.svg)](https://www.npmjs.com/package/cashscript)
 [![NPM License](https://img.shields.io/npm/l/cashscript.svg)](https://www.npmjs.com/package/cashscript)
@@ -94,7 +94,7 @@ The "Hello World" of CashScript contracts is defining the P2PKH pattern inside a
 To run the examples, clone this repository and navigate to the `examples/` directory. Since the examples depend on the SDK, be sure to run `npm install` or `yarn` inside the `examples/` directory, which installs all required packages.
 
 ```bash
-git clone git@github.com:Bitcoin-com/cashscript.git
+git clone git@github.com:CashScript/cashscript.git
 cd cashscript/examples
 npm install
 ```
diff --git a/packages/cashc/README.md b/packages/cashc/README.md
index bd336afc..33cdedae 100644
--- a/packages/cashc/README.md
+++ b/packages/cashc/README.md
@@ -1,7 +1,7 @@
 # CashScript
 
-[![Build Status](https://travis-ci.org/Bitcoin-com/cashscript.svg)](https://travis-ci.org/Bitcoin-com/cashscript)
-[![Coverage Status](https://img.shields.io/codecov/c/github/Bitcoin-com/cashscript.svg)](https://codecov.io/gh/Bitcoin-com/cashscript/)
+[![Build Status](https://travis-ci.org/CashScript/cashscript.svg)](https://travis-ci.org/CashScript/cashscript)
+[![Coverage Status](https://img.shields.io/codecov/c/github/CashScript/cashscript.svg)](https://codecov.io/gh/CashScript/cashscript/)
 [![NPM Version](https://img.shields.io/npm/v/cashscript.svg)](https://www.npmjs.com/package/cashscript)
 [![NPM Monthly Downloads](https://img.shields.io/npm/dm/cashscript.svg)](https://www.npmjs.com/package/cashscript)
 [![NPM License](https://img.shields.io/npm/l/cashscript.svg)](https://www.npmjs.com/package/cashscript)
diff --git a/packages/cashc/package.json b/packages/cashc/package.json
index 1193d65d..f6589e90 100644
--- a/packages/cashc/package.json
+++ b/packages/cashc/package.json
@@ -11,11 +11,11 @@
   ],
   "homepage": "https://cashscript.org",
   "bugs": {
-    "url": "https://github.com/Bitcoin-com/cashscript/issues"
+    "url": "https://github.com/CashScript/cashscript/issues"
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/Bitcoin-com/cashscript.git"
+    "url": "git+https://github.com/CashScript/cashscript.git"
   },
   "license": "MIT",
   "author": "Rosco Kalis <roscokalis@gmail.com>",
diff --git a/packages/cashscript/README.md b/packages/cashscript/README.md
index ba38a3a6..1bbd4376 100644
--- a/packages/cashscript/README.md
+++ b/packages/cashscript/README.md
@@ -1,7 +1,7 @@
 # CashScript
 
 ![Build Status](https://github.com/CashScript/cashscript/actions/workflows/github-actions.yml/badge.svg)
-[![Coverage Status](https://img.shields.io/codecov/c/github/Bitcoin-com/cashscript.svg)](https://codecov.io/gh/Bitcoin-com/cashscript/)
+[![Coverage Status](https://img.shields.io/codecov/c/github/CashScript/cashscript.svg)](https://codecov.io/gh/CashScript/cashscript/)
 [![NPM Version](https://img.shields.io/npm/v/cashscript.svg)](https://www.npmjs.com/package/cashscript)
 [![NPM Monthly Downloads](https://img.shields.io/npm/dm/cashscript.svg)](https://www.npmjs.com/package/cashscript)
 [![NPM License](https://img.shields.io/npm/l/cashscript.svg)](https://www.npmjs.com/package/cashscript)
diff --git a/packages/cashscript/package.json b/packages/cashscript/package.json
index 0f2f8f65..d703f5ea 100644
--- a/packages/cashscript/package.json
+++ b/packages/cashscript/package.json
@@ -10,11 +10,11 @@
   ],
   "homepage": "https://cashscript.org",
   "bugs": {
-    "url": "https://github.com/Bitcoin-com/cashscript/issues"
+    "url": "https://github.com/CashScript/cashscript/issues"
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/Bitcoin-com/cashscript.git"
+    "url": "git+https://github.com/CashScript/cashscript.git"
   },
   "license": "MIT",
   "author": "Rosco Kalis <roscokalis@gmail.com>",
diff --git a/packages/utils/README.md b/packages/utils/README.md
index 2aed4298..bb540adf 100644
--- a/packages/utils/README.md
+++ b/packages/utils/README.md
@@ -1,7 +1,7 @@
 # @cashscript/utils
 
-[![Build Status](https://travis-ci.org/Bitcoin-com/cashscript.svg)](https://travis-ci.org/Bitcoin-com/cashscript)
-[![Coverage Status](https://img.shields.io/codecov/c/github/Bitcoin-com/cashscript.svg)](https://codecov.io/gh/Bitcoin-com/cashscript)
+[![Build Status](https://travis-ci.org/CashScript/cashscript.svg)](https://travis-ci.org/CashScript/cashscript)
+[![Coverage Status](https://img.shields.io/codecov/c/github/CashScript/cashscript.svg)](https://codecov.io/gh/CashScript/cashscript)
 [![NPM Version](https://img.shields.io/npm/v/@cashscript/utils.svg)](https://www.npmjs.com/package/@cashscript/utils)
 [![NPM Monthly Downloads](https://img.shields.io/npm/dm/@cashscript/utils.svg)](hhttps://www.npmjs.com/package/@cashscript/utils)
 [![NPM License](https://img.shields.io/npm/l/@cashscript/utils.svg)](https://www.npmjs.com/package/@cashscript/utils)
diff --git a/packages/utils/package.json b/packages/utils/package.json
index a73dc4c2..416643d7 100644
--- a/packages/utils/package.json
+++ b/packages/utils/package.json
@@ -10,11 +10,11 @@
   ],
   "homepage": "https://cashscript.org",
   "bugs": {
-    "url": "https://github.com/Bitcoin-com/cashscript/issues"
+    "url": "https://github.com/CashScript/cashscript/issues"
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/Bitcoin-com/cashscript.git"
+    "url": "git+https://github.com/CashScript/cashscript.git"
   },
   "license": "MIT",
   "author": "Rosco Kalis <roscokalis@gmail.com>",
diff --git a/website/docs/basics/compiler.md b/website/docs/basics/compiler.md
index 5d6786c0..e451bf16 100644
--- a/website/docs/basics/compiler.md
+++ b/website/docs/basics/compiler.md
@@ -59,9 +59,9 @@ compileString(sourceCode: string): Artifact
 Compiles a CashScript contract from a source code string. This is the recommended compile method if you're building a webapp, because `compileFile()` only works from a Node.js context. This is also the recommended method if no source file is locally available (e.g. the source code is retrieved with a REST API).
 
 ```ts
-const baseUrl = 'https://raw.githubusercontent.com/Bitcoin-com/cashscript'
+const baseUrl = 'https://raw.githubusercontent.com/CashScript/cashscript'
 const result = await fetch(`${baseUrl}/master/examples/p2pkh.cash`);
 const source = await result.text();
 
 const P2PKH = compileString(source);
-```
\ No newline at end of file
+```

From 8ded3dfae9da8b4d33b793a4d67cf9596120c838 Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Tue, 13 Aug 2024 10:55:05 +0200
Subject: [PATCH 136/171] Update dev dependencies

---
 package.json                     |   10 +-
 packages/cashc/package.json      |    2 +-
 packages/cashscript/package.json |    2 +-
 packages/utils/package.json      |    2 +-
 yarn.lock                        | 1843 ++++++++++++++++--------------
 5 files changed, 987 insertions(+), 872 deletions(-)

diff --git a/package.json b/package.json
index ebe88dd6..20554e15 100644
--- a/package.json
+++ b/package.json
@@ -11,17 +11,17 @@
     "@jest/reporters": "^26.6.2",
     "@types/jest": "^29.4.0",
     "@types/node": "^14.14.28",
-    "@typescript-eslint/eslint-plugin": "^6.12.0",
-    "@typescript-eslint/parser": "^6.12.0",
+    "@typescript-eslint/eslint-plugin": "^7.0.0",
+    "@typescript-eslint/parser": "^7.0.0",
     "chalk": "^4.1.0",
     "codecov": "^3.8.1",
     "cspell": "^5.2.4",
     "eslint": "^8.54.0",
-    "eslint-config-airbnb-typescript": "^17.1.0",
-    "eslint-plugin-import": "^2.29.0",
+    "eslint-config-airbnb-typescript": "^18.0.0",
+    "eslint-plugin-import": "^2.29.1",
     "lerna": "^3.22.1",
     "tsx": "^4.7.2",
-    "typescript": "^4.9.5"
+    "typescript": "^5.5.4"
   },
   "scripts": {
     "test": "lerna run test --ignore cashscript-examples --ignore testing-suite",
diff --git a/packages/cashc/package.json b/packages/cashc/package.json
index f6589e90..7142a7e0 100644
--- a/packages/cashc/package.json
+++ b/packages/cashc/package.json
@@ -62,7 +62,7 @@
     "cpy-cli": "^4.2.0",
     "eslint": "^8.54.0",
     "jest": "^29.4.1",
-    "typescript": "^4.1.5",
+    "typescript": "^5.5.4",
     "url-join": "^5.0.0"
   },
   "gitHead": "bf02a4b641d5d03c035d052247a545109c17b708"
diff --git a/packages/cashscript/package.json b/packages/cashscript/package.json
index d703f5ea..d687d0b1 100644
--- a/packages/cashscript/package.json
+++ b/packages/cashscript/package.json
@@ -59,7 +59,7 @@
     "bip39": "^3.0.4",
     "eslint": "^8.54.0",
     "jest": "^29.4.1",
-    "typescript": "^4.1.5"
+    "typescript": "^5.5.4"
   },
   "gitHead": "bf02a4b641d5d03c035d052247a545109c17b708"
 }
diff --git a/packages/utils/package.json b/packages/utils/package.json
index 416643d7..99b90e6f 100644
--- a/packages/utils/package.json
+++ b/packages/utils/package.json
@@ -47,7 +47,7 @@
     "@jest/globals": "^29.4.1",
     "eslint": "^8.54.0",
     "jest": "^29.4.1",
-    "typescript": "^4.1.5"
+    "typescript": "^5.5.4"
   },
   "gitHead": "bf02a4b641d5d03c035d052247a545109c17b708"
 }
diff --git a/yarn.lock b/yarn.lock
index 0fb4e534..f3964ec9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,11 +2,6 @@
 # yarn lockfile v1
 
 
-"@aashutoshrathi/word-wrap@^1.2.3":
-  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz#bd9154aec9983f77b3a034ecaa015c2e4201f6cf"
-  integrity sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==
-
 "@ampproject/remapping@^2.1.0":
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.0.tgz#56c133824780de3174aed5ab6834f3026790154d"
@@ -22,7 +17,15 @@
   dependencies:
     "@babel/highlight" "^7.10.4"
 
-"@babel/code-frame@^7.12.13", "@babel/code-frame@^7.18.6":
+"@babel/code-frame@^7.12.13":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.24.7.tgz#882fd9e09e8ee324e496bd040401c6f046ef4465"
+  integrity sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==
+  dependencies:
+    "@babel/highlight" "^7.24.7"
+    picocolors "^1.0.0"
+
+"@babel/code-frame@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.18.6.tgz#3b25d38c89600baa2dcc219edfa88a74eb2c427a"
   integrity sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==
@@ -261,11 +264,16 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz#a78c7a7251e01f616512d31b10adcf52ada5e0d2"
   integrity sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==
 
-"@babel/helper-validator-identifier@^7.18.6", "@babel/helper-validator-identifier@^7.19.1":
+"@babel/helper-validator-identifier@^7.19.1":
   version "7.19.1"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2"
   integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==
 
+"@babel/helper-validator-identifier@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz#75b889cfaf9e35c2aaf42cf0d72c8e91719251db"
+  integrity sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==
+
 "@babel/helper-validator-option@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz#bf0d2b5a509b1f336099e4ff36e1a63aa5db4db8"
@@ -298,14 +306,15 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/highlight@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.18.6.tgz#81158601e93e2563795adcbfbdf5d64be3f2ecdf"
-  integrity sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==
+"@babel/highlight@^7.18.6", "@babel/highlight@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.24.7.tgz#a05ab1df134b286558aae0ed41e6c5f731bf409d"
+  integrity sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.18.6"
-    chalk "^2.0.0"
+    "@babel/helper-validator-identifier" "^7.24.7"
+    chalk "^2.4.2"
     js-tokens "^4.0.0"
+    picocolors "^1.0.0"
 
 "@babel/parser@^7.1.0", "@babel/parser@^7.10.4", "@babel/parser@^7.11.0", "@babel/parser@^7.11.4":
   version "7.11.4"
@@ -714,120 +723,125 @@
   resolved "https://registry.yarnpkg.com/@cspell/dict-typescript/-/dict-typescript-1.0.16.tgz#18d20a91c4caf52540c795921a50b0e4ce3bc50c"
   integrity sha512-DEKi6vD605ebDhCC4Hrtz29k59TcijPVsmVKheTpMrL1MD/S96Ftb19gW0pEIVK9vwYZIljmGwgz4qYyuM5Liw==
 
-"@esbuild/aix-ppc64@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.19.12.tgz#d1bc06aedb6936b3b6d313bf809a5a40387d2b7f"
-  integrity sha512-bmoCYyWdEL3wDQIVbcyzRyeKLgk2WtWLTWz1ZIAZF/EGbNOwSA6ew3PftJ1PqMiOOGu0OyFMzG53L0zqIpPeNA==
-
-"@esbuild/android-arm64@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.19.12.tgz#7ad65a36cfdb7e0d429c353e00f680d737c2aed4"
-  integrity sha512-P0UVNGIienjZv3f5zq0DP3Nt2IE/3plFzuaS96vihvD0Hd6H/q4WXUGpCxD/E8YrSXfNyRPbpTq+T8ZQioSuPA==
-
-"@esbuild/android-arm@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.19.12.tgz#b0c26536f37776162ca8bde25e42040c203f2824"
-  integrity sha512-qg/Lj1mu3CdQlDEEiWrlC4eaPZ1KztwGJ9B6J+/6G+/4ewxJg7gqj8eVYWvao1bXrqGiW2rsBZFSX3q2lcW05w==
-
-"@esbuild/android-x64@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.19.12.tgz#cb13e2211282012194d89bf3bfe7721273473b3d"
-  integrity sha512-3k7ZoUW6Q6YqhdhIaq/WZ7HwBpnFBlW905Fa4s4qWJyiNOgT1dOqDiVAQFwBH7gBRZr17gLrlFCRzF6jFh7Kew==
-
-"@esbuild/darwin-arm64@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.19.12.tgz#cbee41e988020d4b516e9d9e44dd29200996275e"
-  integrity sha512-B6IeSgZgtEzGC42jsI+YYu9Z3HKRxp8ZT3cqhvliEHovq8HSX2YX8lNocDn79gCKJXOSaEot9MVYky7AKjCs8g==
-
-"@esbuild/darwin-x64@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.19.12.tgz#e37d9633246d52aecf491ee916ece709f9d5f4cd"
-  integrity sha512-hKoVkKzFiToTgn+41qGhsUJXFlIjxI/jSYeZf3ugemDYZldIXIxhvwN6erJGlX4t5h417iFuheZ7l+YVn05N3A==
-
-"@esbuild/freebsd-arm64@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.12.tgz#1ee4d8b682ed363b08af74d1ea2b2b4dbba76487"
-  integrity sha512-4aRvFIXmwAcDBw9AueDQ2YnGmz5L6obe5kmPT8Vd+/+x/JMVKCgdcRwH6APrbpNXsPz+K653Qg8HB/oXvXVukA==
-
-"@esbuild/freebsd-x64@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.19.12.tgz#37a693553d42ff77cd7126764b535fb6cc28a11c"
-  integrity sha512-EYoXZ4d8xtBoVN7CEwWY2IN4ho76xjYXqSXMNccFSx2lgqOG/1TBPW0yPx1bJZk94qu3tX0fycJeeQsKovA8gg==
-
-"@esbuild/linux-arm64@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.19.12.tgz#be9b145985ec6c57470e0e051d887b09dddb2d4b"
-  integrity sha512-EoTjyYyLuVPfdPLsGVVVC8a0p1BFFvtpQDB/YLEhaXyf/5bczaGeN15QkR+O4S5LeJ92Tqotve7i1jn35qwvdA==
-
-"@esbuild/linux-arm@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.19.12.tgz#207ecd982a8db95f7b5279207d0ff2331acf5eef"
-  integrity sha512-J5jPms//KhSNv+LO1S1TX1UWp1ucM6N6XuL6ITdKWElCu8wXP72l9MM0zDTzzeikVyqFE6U8YAV9/tFyj0ti+w==
-
-"@esbuild/linux-ia32@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.19.12.tgz#d0d86b5ca1562523dc284a6723293a52d5860601"
-  integrity sha512-Thsa42rrP1+UIGaWz47uydHSBOgTUnwBwNq59khgIwktK6x60Hivfbux9iNR0eHCHzOLjLMLfUMLCypBkZXMHA==
-
-"@esbuild/linux-loong64@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.19.12.tgz#9a37f87fec4b8408e682b528391fa22afd952299"
-  integrity sha512-LiXdXA0s3IqRRjm6rV6XaWATScKAXjI4R4LoDlvO7+yQqFdlr1Bax62sRwkVvRIrwXxvtYEHHI4dm50jAXkuAA==
-
-"@esbuild/linux-mips64el@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.19.12.tgz#4ddebd4e6eeba20b509d8e74c8e30d8ace0b89ec"
-  integrity sha512-fEnAuj5VGTanfJ07ff0gOA6IPsvrVHLVb6Lyd1g2/ed67oU1eFzL0r9WL7ZzscD+/N6i3dWumGE1Un4f7Amf+w==
-
-"@esbuild/linux-ppc64@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.19.12.tgz#adb67dadb73656849f63cd522f5ecb351dd8dee8"
-  integrity sha512-nYJA2/QPimDQOh1rKWedNOe3Gfc8PabU7HT3iXWtNUbRzXS9+vgB0Fjaqr//XNbd82mCxHzik2qotuI89cfixg==
-
-"@esbuild/linux-riscv64@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.19.12.tgz#11bc0698bf0a2abf8727f1c7ace2112612c15adf"
-  integrity sha512-2MueBrlPQCw5dVJJpQdUYgeqIzDQgw3QtiAHUC4RBz9FXPrskyyU3VI1hw7C0BSKB9OduwSJ79FTCqtGMWqJHg==
-
-"@esbuild/linux-s390x@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.19.12.tgz#e86fb8ffba7c5c92ba91fc3b27ed5a70196c3cc8"
-  integrity sha512-+Pil1Nv3Umes4m3AZKqA2anfhJiVmNCYkPchwFJNEJN5QxmTs1uzyy4TvmDrCRNT2ApwSari7ZIgrPeUx4UZDg==
-
-"@esbuild/linux-x64@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.19.12.tgz#5f37cfdc705aea687dfe5dfbec086a05acfe9c78"
-  integrity sha512-B71g1QpxfwBvNrfyJdVDexenDIt1CiDN1TIXLbhOw0KhJzE78KIFGX6OJ9MrtC0oOqMWf+0xop4qEU8JrJTwCg==
-
-"@esbuild/netbsd-x64@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.19.12.tgz#29da566a75324e0d0dd7e47519ba2f7ef168657b"
-  integrity sha512-3ltjQ7n1owJgFbuC61Oj++XhtzmymoCihNFgT84UAmJnxJfm4sYCiSLTXZtE00VWYpPMYc+ZQmB6xbSdVh0JWA==
-
-"@esbuild/openbsd-x64@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.19.12.tgz#306c0acbdb5a99c95be98bdd1d47c916e7dc3ff0"
-  integrity sha512-RbrfTB9SWsr0kWmb9srfF+L933uMDdu9BIzdA7os2t0TXhCRjrQyCeOt6wVxr79CKD4c+p+YhCj31HBkYcXebw==
-
-"@esbuild/sunos-x64@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.19.12.tgz#0933eaab9af8b9b2c930236f62aae3fc593faf30"
-  integrity sha512-HKjJwRrW8uWtCQnQOz9qcU3mUZhTUQvi56Q8DPTLLB+DawoiQdjsYq+j+D3s9I8VFtDr+F9CjgXKKC4ss89IeA==
-
-"@esbuild/win32-arm64@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.19.12.tgz#773bdbaa1971b36db2f6560088639ccd1e6773ae"
-  integrity sha512-URgtR1dJnmGvX864pn1B2YUYNzjmXkuJOIqG2HdU62MVS4EHpU2946OZoTMnRUHklGtJdJZ33QfzdjGACXhn1A==
-
-"@esbuild/win32-ia32@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.19.12.tgz#000516cad06354cc84a73f0943a4aa690ef6fd67"
-  integrity sha512-+ZOE6pUkMOJfmxmBZElNOx72NKpIa/HFOMGzu8fqzQJ5kgf6aTGrcJaFsNiVMH4JKpMipyK+7k0n2UXN7a8YKQ==
-
-"@esbuild/win32-x64@0.19.12":
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.19.12.tgz#c57c8afbb4054a3ab8317591a0b7320360b444ae"
-  integrity sha512-T1QyPSDCyMXaO3pzBkF96E8xMkiRYbUEZADd29SyPGabqxMViNoii+NcK7eWJAEoU6RZyEm5lVSIjTmcdoB9HA==
+"@esbuild/aix-ppc64@0.23.0":
+  version "0.23.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.23.0.tgz#145b74d5e4a5223489cabdc238d8dad902df5259"
+  integrity sha512-3sG8Zwa5fMcA9bgqB8AfWPQ+HFke6uD3h1s3RIwUNK8EG7a4buxvuFTs3j1IMs2NXAk9F30C/FF4vxRgQCcmoQ==
+
+"@esbuild/android-arm64@0.23.0":
+  version "0.23.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.23.0.tgz#453bbe079fc8d364d4c5545069e8260228559832"
+  integrity sha512-EuHFUYkAVfU4qBdyivULuu03FhJO4IJN9PGuABGrFy4vUuzk91P2d+npxHcFdpUnfYKy0PuV+n6bKIpHOB3prQ==
+
+"@esbuild/android-arm@0.23.0":
+  version "0.23.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.23.0.tgz#26c806853aa4a4f7e683e519cd9d68e201ebcf99"
+  integrity sha512-+KuOHTKKyIKgEEqKbGTK8W7mPp+hKinbMBeEnNzjJGyFcWsfrXjSTNluJHCY1RqhxFurdD8uNXQDei7qDlR6+g==
+
+"@esbuild/android-x64@0.23.0":
+  version "0.23.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.23.0.tgz#1e51af9a6ac1f7143769f7ee58df5b274ed202e6"
+  integrity sha512-WRrmKidLoKDl56LsbBMhzTTBxrsVwTKdNbKDalbEZr0tcsBgCLbEtoNthOW6PX942YiYq8HzEnb4yWQMLQuipQ==
+
+"@esbuild/darwin-arm64@0.23.0":
+  version "0.23.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.23.0.tgz#d996187a606c9534173ebd78c58098a44dd7ef9e"
+  integrity sha512-YLntie/IdS31H54Ogdn+v50NuoWF5BDkEUFpiOChVa9UnKpftgwzZRrI4J132ETIi+D8n6xh9IviFV3eXdxfow==
+
+"@esbuild/darwin-x64@0.23.0":
+  version "0.23.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.23.0.tgz#30c8f28a7ef4e32fe46501434ebe6b0912e9e86c"
+  integrity sha512-IMQ6eme4AfznElesHUPDZ+teuGwoRmVuuixu7sv92ZkdQcPbsNHzutd+rAfaBKo8YK3IrBEi9SLLKWJdEvJniQ==
+
+"@esbuild/freebsd-arm64@0.23.0":
+  version "0.23.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.23.0.tgz#30f4fcec8167c08a6e8af9fc14b66152232e7fb4"
+  integrity sha512-0muYWCng5vqaxobq6LB3YNtevDFSAZGlgtLoAc81PjUfiFz36n4KMpwhtAd4he8ToSI3TGyuhyx5xmiWNYZFyw==
+
+"@esbuild/freebsd-x64@0.23.0":
+  version "0.23.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.23.0.tgz#1003a6668fe1f5d4439e6813e5b09a92981bc79d"
+  integrity sha512-XKDVu8IsD0/q3foBzsXGt/KjD/yTKBCIwOHE1XwiXmrRwrX6Hbnd5Eqn/WvDekddK21tfszBSrE/WMaZh+1buQ==
+
+"@esbuild/linux-arm64@0.23.0":
+  version "0.23.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.23.0.tgz#3b9a56abfb1410bb6c9138790f062587df3e6e3a"
+  integrity sha512-j1t5iG8jE7BhonbsEg5d9qOYcVZv/Rv6tghaXM/Ug9xahM0nX/H2gfu6X6z11QRTMT6+aywOMA8TDkhPo8aCGw==
+
+"@esbuild/linux-arm@0.23.0":
+  version "0.23.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.23.0.tgz#237a8548e3da2c48cd79ae339a588f03d1889aad"
+  integrity sha512-SEELSTEtOFu5LPykzA395Mc+54RMg1EUgXP+iw2SJ72+ooMwVsgfuwXo5Fn0wXNgWZsTVHwY2cg4Vi/bOD88qw==
+
+"@esbuild/linux-ia32@0.23.0":
+  version "0.23.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.23.0.tgz#4269cd19cb2de5de03a7ccfc8855dde3d284a238"
+  integrity sha512-P7O5Tkh2NbgIm2R6x1zGJJsnacDzTFcRWZyTTMgFdVit6E98LTxO+v8LCCLWRvPrjdzXHx9FEOA8oAZPyApWUA==
+
+"@esbuild/linux-loong64@0.23.0":
+  version "0.23.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.23.0.tgz#82b568f5658a52580827cc891cb69d2cb4f86280"
+  integrity sha512-InQwepswq6urikQiIC/kkx412fqUZudBO4SYKu0N+tGhXRWUqAx+Q+341tFV6QdBifpjYgUndV1hhMq3WeJi7A==
+
+"@esbuild/linux-mips64el@0.23.0":
+  version "0.23.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.23.0.tgz#9a57386c926262ae9861c929a6023ed9d43f73e5"
+  integrity sha512-J9rflLtqdYrxHv2FqXE2i1ELgNjT+JFURt/uDMoPQLcjWQA5wDKgQA4t/dTqGa88ZVECKaD0TctwsUfHbVoi4w==
+
+"@esbuild/linux-ppc64@0.23.0":
+  version "0.23.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.23.0.tgz#f3a79fd636ba0c82285d227eb20ed8e31b4444f6"
+  integrity sha512-cShCXtEOVc5GxU0fM+dsFD10qZ5UpcQ8AM22bYj0u/yaAykWnqXJDpd77ublcX6vdDsWLuweeuSNZk4yUxZwtw==
+
+"@esbuild/linux-riscv64@0.23.0":
+  version "0.23.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.23.0.tgz#f9d2ef8356ce6ce140f76029680558126b74c780"
+  integrity sha512-HEtaN7Y5UB4tZPeQmgz/UhzoEyYftbMXrBCUjINGjh3uil+rB/QzzpMshz3cNUxqXN7Vr93zzVtpIDL99t9aRw==
+
+"@esbuild/linux-s390x@0.23.0":
+  version "0.23.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.23.0.tgz#45390f12e802201f38a0229e216a6aed4351dfe8"
+  integrity sha512-WDi3+NVAuyjg/Wxi+o5KPqRbZY0QhI9TjrEEm+8dmpY9Xir8+HE/HNx2JoLckhKbFopW0RdO2D72w8trZOV+Wg==
+
+"@esbuild/linux-x64@0.23.0":
+  version "0.23.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.23.0.tgz#c8409761996e3f6db29abcf9b05bee8d7d80e910"
+  integrity sha512-a3pMQhUEJkITgAw6e0bWA+F+vFtCciMjW/LPtoj99MhVt+Mfb6bbL9hu2wmTZgNd994qTAEw+U/r6k3qHWWaOQ==
+
+"@esbuild/netbsd-x64@0.23.0":
+  version "0.23.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.23.0.tgz#ba70db0114380d5f6cfb9003f1d378ce989cd65c"
+  integrity sha512-cRK+YDem7lFTs2Q5nEv/HHc4LnrfBCbH5+JHu6wm2eP+d8OZNoSMYgPZJq78vqQ9g+9+nMuIsAO7skzphRXHyw==
+
+"@esbuild/openbsd-arm64@0.23.0":
+  version "0.23.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-arm64/-/openbsd-arm64-0.23.0.tgz#72fc55f0b189f7a882e3cf23f332370d69dfd5db"
+  integrity sha512-suXjq53gERueVWu0OKxzWqk7NxiUWSUlrxoZK7usiF50C6ipColGR5qie2496iKGYNLhDZkPxBI3erbnYkU0rQ==
+
+"@esbuild/openbsd-x64@0.23.0":
+  version "0.23.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.23.0.tgz#b6ae7a0911c18fe30da3db1d6d17a497a550e5d8"
+  integrity sha512-6p3nHpby0DM/v15IFKMjAaayFhqnXV52aEmv1whZHX56pdkK+MEaLoQWj+H42ssFarP1PcomVhbsR4pkz09qBg==
+
+"@esbuild/sunos-x64@0.23.0":
+  version "0.23.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.23.0.tgz#58f0d5e55b9b21a086bfafaa29f62a3eb3470ad8"
+  integrity sha512-BFelBGfrBwk6LVrmFzCq1u1dZbG4zy/Kp93w2+y83Q5UGYF1d8sCzeLI9NXjKyujjBBniQa8R8PzLFAUrSM9OA==
+
+"@esbuild/win32-arm64@0.23.0":
+  version "0.23.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.23.0.tgz#b858b2432edfad62e945d5c7c9e5ddd0f528ca6d"
+  integrity sha512-lY6AC8p4Cnb7xYHuIxQ6iYPe6MfO2CC43XXKo9nBXDb35krYt7KGhQnOkRGar5psxYkircpCqfbNDB4uJbS2jQ==
+
+"@esbuild/win32-ia32@0.23.0":
+  version "0.23.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.23.0.tgz#167ef6ca22a476c6c0c014a58b4f43ae4b80dec7"
+  integrity sha512-7L1bHlOTcO4ByvI7OXVI5pNN6HSu6pUQq9yodga8izeuB1KcT2UkHaH6118QJwopExPn0rMHIseCTx1CRo/uNA==
+
+"@esbuild/win32-x64@0.23.0":
+  version "0.23.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.23.0.tgz#db44a6a08520b5f25bbe409f34a59f2d4bcc7ced"
+  integrity sha512-Arm+WgUFLUATuoxCJcahGuk6Yj9Pzxd6l11Zb/2aAuv5kWWvvfhLFo2fni4uSK5vzlUdCGZ/BdV5tH8klj8p8g==
 
 "@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.4.0":
   version "4.4.0"
@@ -836,25 +850,10 @@
   dependencies:
     eslint-visitor-keys "^3.3.0"
 
-"@eslint-community/regexpp@^4.5.1", "@eslint-community/regexpp@^4.6.1":
-  version "4.10.0"
-  resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.10.0.tgz#548f6de556857c8bb73bbee70c35dc82a2e74d63"
-  integrity sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==
-
-"@eslint/eslintrc@^2.1.3":
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.3.tgz#797470a75fe0fbd5a53350ee715e85e87baff22d"
-  integrity sha512-yZzuIG+jnVu6hNSzFEN07e8BxF3uAzYtQb6uDkaYZLo6oYZDCq454c5kB8zxnzfCYyP4MIuyBn10L0DqwujTmA==
-  dependencies:
-    ajv "^6.12.4"
-    debug "^4.3.2"
-    espree "^9.6.0"
-    globals "^13.19.0"
-    ignore "^5.2.0"
-    import-fresh "^3.2.1"
-    js-yaml "^4.1.0"
-    minimatch "^3.1.2"
-    strip-json-comments "^3.1.1"
+"@eslint-community/regexpp@^4.10.0", "@eslint-community/regexpp@^4.6.1":
+  version "4.11.0"
+  resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.11.0.tgz#b0ffd0312b4a3fd2d6f77237e7248a5ad3a680ae"
+  integrity sha512-G/M/tIiMrTAxEWRfLfQJMmGNX28IxBg4PBz8XqQhqUHLFI6TL2htpIB1iQCj144V5ee/JaKyT9/WZ0MGZWfA7A==
 
 "@eslint/eslintrc@^2.1.4":
   version "2.1.4"
@@ -871,16 +870,16 @@
     minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
-"@eslint/js@8.54.0":
-  version "8.54.0"
-  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.54.0.tgz#4fab9a2ff7860082c304f750e94acd644cf984cf"
-  integrity sha512-ut5V+D+fOoWPgGGNj83GGjnntO39xDy6DWxO0wb7Jp3DcMX0TfIqdzHF85VTQkerdyGmuuMD9AKAo5KiNlf/AQ==
-
 "@eslint/js@8.56.0":
   version "8.56.0"
   resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.56.0.tgz#ef20350fec605a7f7035a01764731b2de0f3782b"
   integrity sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A==
 
+"@eslint/js@8.57.0":
+  version "8.57.0"
+  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.57.0.tgz#a5417ae8427873f1dd08b70b3574b453e67b5f7f"
+  integrity sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==
+
 "@evocateur/libnpmaccess@^3.1.2":
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/@evocateur/libnpmaccess/-/libnpmaccess-3.1.2.tgz#ecf7f6ce6b004e9f942b098d92200be4a4b1c845"
@@ -955,13 +954,13 @@
     unique-filename "^1.1.1"
     which "^1.3.1"
 
-"@humanwhocodes/config-array@^0.11.13":
-  version "0.11.13"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.13.tgz#075dc9684f40a531d9b26b0822153c1e832ee297"
-  integrity sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ==
+"@humanwhocodes/config-array@^0.11.13", "@humanwhocodes/config-array@^0.11.14":
+  version "0.11.14"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.14.tgz#d78e481a039f7566ecc9660b4ea7fe6b1fec442b"
+  integrity sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==
   dependencies:
-    "@humanwhocodes/object-schema" "^2.0.1"
-    debug "^4.1.1"
+    "@humanwhocodes/object-schema" "^2.0.2"
+    debug "^4.3.1"
     minimatch "^3.0.5"
 
 "@humanwhocodes/module-importer@^1.0.1":
@@ -969,10 +968,10 @@
   resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c"
   integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==
 
-"@humanwhocodes/object-schema@^2.0.1":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.1.tgz#e5211452df060fa8522b55c7b3c0c4d1981cb044"
-  integrity sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==
+"@humanwhocodes/object-schema@^2.0.2":
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz#4a2868d75d6d6963e423bcf90b7fd1be343409d3"
+  integrity sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==
 
 "@istanbuljs/load-nyc-config@^1.0.0":
   version "1.1.0"
@@ -1065,12 +1064,12 @@
   dependencies:
     jest-get-type "^29.2.0"
 
-"@jest/expect-utils@^29.4.2":
-  version "29.4.2"
-  resolved "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-29.4.2.tgz#cd0065dfdd8e8a182aa350cc121db97b5eed7b3f"
-  integrity sha512-Dd3ilDJpBnqa0GiPN7QrudVs0cczMMHtehSo2CSTjm3zdHx0RcpmhFNVEltuEFeqfLIyWKFI224FsMSQ/nsJQA==
+"@jest/expect-utils@^29.7.0":
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-29.7.0.tgz#023efe5d26a8a70f21677d0a1afc0f0a44e3a1c6"
+  integrity sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==
   dependencies:
-    jest-get-type "^29.4.2"
+    jest-get-type "^29.6.3"
 
 "@jest/expect@^29.4.1":
   version "29.4.1"
@@ -1171,12 +1170,12 @@
   dependencies:
     "@sinclair/typebox" "^0.25.16"
 
-"@jest/schemas@^29.4.2":
-  version "29.4.2"
-  resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-29.4.2.tgz#cf7cfe97c5649f518452b176c47ed07486270fc1"
-  integrity sha512-ZrGzGfh31NtdVH8tn0mgJw4khQuNHiKqdzJAFbCaERbyCP9tHlxWuL/mnMu8P7e/+k4puWjI1NOzi/sFsjce/g==
+"@jest/schemas@^29.6.3":
+  version "29.6.3"
+  resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-29.6.3.tgz#430b5ce8a4e0044a7e3819663305a7b3091c8e03"
+  integrity sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==
   dependencies:
-    "@sinclair/typebox" "^0.25.16"
+    "@sinclair/typebox" "^0.27.8"
 
 "@jest/source-map@^29.2.0":
   version "29.2.0"
@@ -1282,12 +1281,12 @@
     "@types/yargs" "^17.0.8"
     chalk "^4.0.0"
 
-"@jest/types@^29.4.2":
-  version "29.4.2"
-  resolved "https://registry.yarnpkg.com/@jest/types/-/types-29.4.2.tgz#8f724a414b1246b2bfd56ca5225d9e1f39540d82"
-  integrity sha512-CKlngyGP0fwlgC1BRUtPZSiWLBhyS9dKwKmyGxk8Z6M82LBEGB2aLQSg+U1MyLsU+M7UjnlLllBM2BLWKVm/Uw==
+"@jest/types@^29.6.3":
+  version "29.6.3"
+  resolved "https://registry.yarnpkg.com/@jest/types/-/types-29.6.3.tgz#1131f8cf634e7e84c5e77bab12f052af585fba59"
+  integrity sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==
   dependencies:
-    "@jest/schemas" "^29.4.2"
+    "@jest/schemas" "^29.6.3"
     "@types/istanbul-lib-coverage" "^2.0.0"
     "@types/istanbul-reports" "^3.0.0"
     "@types/node" "*"
@@ -2050,14 +2049,6 @@
     call-me-maybe "^1.0.1"
     glob-to-regexp "^0.3.0"
 
-"@nodelib/fs.scandir@2.1.4":
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz#d4b3549a5db5de2683e0c1071ab4f140904bbf69"
-  integrity sha512-33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA==
-  dependencies:
-    "@nodelib/fs.stat" "2.0.4"
-    run-parallel "^1.1.9"
-
 "@nodelib/fs.scandir@2.1.5":
   version "2.1.5"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
@@ -2066,12 +2057,7 @@
     "@nodelib/fs.stat" "2.0.5"
     run-parallel "^1.1.9"
 
-"@nodelib/fs.stat@2.0.4", "@nodelib/fs.stat@^2.0.2":
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz#a3f2dd61bab43b8db8fa108a121cfffe4c676655"
-  integrity sha512-IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q==
-
-"@nodelib/fs.stat@2.0.5":
+"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2":
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b"
   integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==
@@ -2081,15 +2067,7 @@
   resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b"
   integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==
 
-"@nodelib/fs.walk@^1.2.3":
-  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz#cce9396b30aa5afe9e3756608f5831adcb53d063"
-  integrity sha512-8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow==
-  dependencies:
-    "@nodelib/fs.scandir" "2.1.4"
-    fastq "^1.6.0"
-
-"@nodelib/fs.walk@^1.2.8":
+"@nodelib/fs.walk@^1.2.3", "@nodelib/fs.walk@^1.2.8":
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a"
   integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==
@@ -2313,9 +2291,14 @@
     "@psf/bitcoincash-ops" "^2.0.0"
 
 "@sinclair/typebox@^0.25.16":
-  version "0.25.21"
-  resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.25.21.tgz#763b05a4b472c93a8db29b2c3e359d55b29ce272"
-  integrity sha512-gFukHN4t8K4+wVC+ECqeqwzBDeFeTzBXroBTqE6vcWrQGbEUpHO7LYdG0f4xnvYq4VOEwITSlHlp0JBAIFMS/g==
+  version "0.25.24"
+  resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.25.24.tgz#8c7688559979f7079aacaf31aa881c3aa410b718"
+  integrity sha512-XJfwUVUKDHF5ugKwIcxEgc9k8b7HbznCp6eUfWgu710hMPNIO4aw4/zB5RogDQz8nd6gyCDpU9O/m6qYEWY6yQ==
+
+"@sinclair/typebox@^0.27.8":
+  version "0.27.8"
+  resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.27.8.tgz#6667fac16c436b5434a387a34dedb013198f6e6e"
+  integrity sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==
 
 "@sinonjs/commons@^2.0.0":
   version "2.0.0"
@@ -2375,9 +2358,9 @@
     "@babel/types" "^7.3.0"
 
 "@types/color-name@^1.1.1":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"
-  integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.4.tgz#e002611ff627347818d440a05e81650e9a4053b8"
+  integrity sha512-hulKeREDdLFesGQjl96+4aoJSHY5b2GRjagzzcqCfIrWhe5vkCqIvrLbqzBaI1q94Vg8DNJZZqTR5ocdWmWclg==
 
 "@types/glob@^7.1.1":
   version "7.1.3"
@@ -2394,34 +2377,31 @@
   dependencies:
     "@types/node" "*"
 
-"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0", "@types/istanbul-lib-coverage@^2.0.1":
+"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0":
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz#7739c232a1fee9b4d3ce8985f314c0c6d33549d7"
+  integrity sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==
+
+"@types/istanbul-lib-coverage@^2.0.1":
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz#4ba8ddb720221f432e443bd5f9117fd22cfd4762"
   integrity sha512-sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw==
 
 "@types/istanbul-lib-report@*":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#c14c24f18ea8190c118ee7562b7ff99a36552686"
-  integrity sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz#53047614ae72e19fc0401d872de3ae2b4ce350bf"
+  integrity sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==
   dependencies:
     "@types/istanbul-lib-coverage" "*"
 
 "@types/istanbul-reports@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz#508b13aa344fa4976234e75dddcc34925737d821"
-  integrity sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz#0f03e3d2f670fbdac586e34b433783070cc16f54"
+  integrity sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==
   dependencies:
     "@types/istanbul-lib-report" "*"
 
-"@types/jest@^29.4.0":
-  version "29.4.0"
-  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-29.4.0.tgz#a8444ad1704493e84dbf07bb05990b275b3b9206"
-  integrity sha512-VaywcGQ9tPorCX/Jkkni7RWGFfI11whqzs8dvxF41P17Z+z872thvEvlIbznjPJ02kl1HMX3LmLOonsj2n7HeQ==
-  dependencies:
-    expect "^29.0.0"
-    pretty-format "^29.0.0"
-
-"@types/jest@^29.4.1":
+"@types/jest@^29.4.0", "@types/jest@^29.4.1":
   version "29.5.12"
   resolved "https://registry.yarnpkg.com/@types/jest/-/jest-29.5.12.tgz#7f7dc6eb4cf246d2474ed78744b05d06ce025544"
   integrity sha512-eDC8bTvT/QhYdxJAulQikueigY5AsdBRH2yDKW3yveW7svY3+DzN84/2NUgkw10RTiJbWqZrTtoGVdYlvFJdLw==
@@ -2429,15 +2409,10 @@
     expect "^29.0.0"
     pretty-format "^29.0.0"
 
-"@types/json-schema@^7.0.12":
-  version "7.0.15"
-  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841"
-  integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==
-
 "@types/json5@^0.0.29":
   version "0.0.29"
   resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
-  integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4=
+  integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==
 
 "@types/minimatch@*":
   version "3.0.3"
@@ -2454,30 +2429,39 @@
   resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.2.tgz#ee771e2ba4b3dc5b372935d549fd9617bf345b8c"
   integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==
 
-"@types/node@*", "@types/node@>= 8":
-  version "14.6.0"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.6.0.tgz#7d4411bf5157339337d7cff864d9ff45f177b499"
-  integrity sha512-mikldZQitV94akrc4sCcSjtJfsTKt4p+e/s0AGscVA6XArQ9kFclP+ZiYUMnq987rc6QlYxXv/EivqlfSLxpKA==
+"@types/node@*":
+  version "22.2.0"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-22.2.0.tgz#7cf046a99f0ba4d628ad3088cb21f790df9b0c5b"
+  integrity sha512-bm6EG6/pCpkxDf/0gDNDdtDILMOHgaQBVOJGdwsqClnxA3xL6jtMv76rLBc006RVMWbmaf0xbmom4Z/5o2nRkQ==
+  dependencies:
+    undici-types "~6.13.0"
 
 "@types/node@11.11.6":
   version "11.11.6"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-11.11.6.tgz#df929d1bb2eee5afdda598a41930fe50b43eaa6a"
   integrity sha512-Exw4yUWMBXM3X+8oqzJNRqZSwUAaS4+7NdvHqQuFi/d+synz++xmX3QIf+BFqneW8N31R8Ky+sikfZUXq07ggQ==
 
+"@types/node@>= 8":
+  version "14.6.0"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.6.0.tgz#7d4411bf5157339337d7cff864d9ff45f177b499"
+  integrity sha512-mikldZQitV94akrc4sCcSjtJfsTKt4p+e/s0AGscVA6XArQ9kFclP+ZiYUMnq987rc6QlYxXv/EivqlfSLxpKA==
+
 "@types/node@^12.7.8":
   version "12.20.55"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.55.tgz#c329cbd434c42164f846b909bd6f85b5537f6240"
   integrity sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==
 
 "@types/node@^14.14.28":
-  version "14.14.28"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.28.tgz#cade4b64f8438f588951a6b35843ce536853f25b"
-  integrity sha512-lg55ArB+ZiHHbBBttLpzD07akz0QPrZgUODNakeC09i62dnrywr9mFErHuaPlB6I7z+sEbK+IYmplahvplCj2g==
+  version "14.18.63"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.63.tgz#1788fa8da838dbb5f9ea994b834278205db6ca2b"
+  integrity sha512-fAtCfv4jJg+ExtXhvCkCqUKZ+4ok/JQk01qDKhL5BDDoS3AxKXhV5/MAVUZyQnSEd2GT92fkgZl0pz0Q0AzcIQ==
 
 "@types/node@^18.11.18":
-  version "18.11.18"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.11.18.tgz#8dfb97f0da23c2293e554c5a50d61ef134d7697f"
-  integrity sha512-DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA==
+  version "18.19.44"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.19.44.tgz#875a8322d17ff12bf82b3af8c07b9310a00e72f8"
+  integrity sha512-ZsbGerYg72WMXUIE9fYxtvfzLEuq6q8mKERdWFnqTmOvudMxnz+CBNRoOwJ2kNpFOncrKjT1hZwxjlFgQ9qvQA==
+  dependencies:
+    undici-types "~5.26.4"
 
 "@types/normalize-package-data@^2.4.0":
   version "2.4.0"
@@ -2500,19 +2484,14 @@
   integrity sha512-KufADq8uQqo1pYKVIYzfKbJfBAc0sOeXqGbFaSpv8MRmC/zXgowNZmFcbngndGk922QDmOASEXUZCaY48gs4cg==
 
 "@types/semver@^7.3.4":
-  version "7.3.4"
-  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.4.tgz#43d7168fec6fa0988bb1a513a697b29296721afb"
-  integrity sha512-+nVsLKlcUCeMzD2ufHEYuJ9a2ovstb6Dp52A5VsoKxDXgvE051XgHI/33I1EymwkRGQkwnA0LkhnUzituGs4EQ==
-
-"@types/semver@^7.5.0":
-  version "7.5.6"
-  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.6.tgz#c65b2bfce1bec346582c07724e3f8c1017a20339"
-  integrity sha512-dn1l8LaMea/IjDoHNd9J52uBbInB796CDffS6VdIxvqYCPSG0V0DzHp76GpaWnlhg88uYyPbXCDIowa86ybd5A==
+  version "7.5.8"
+  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.8.tgz#8268a8c57a3e4abd25c165ecd36237db7948a55e"
+  integrity sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==
 
 "@types/stack-utils@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.0.tgz#7036640b4e21cc2f259ae826ce843d277dad8cff"
-  integrity sha512-RJJrrySY7A8havqpGObOB4W92QXKJo63/jFLLgpvOtsGUqbQZ9Sbgl35KMm1DjC6j7AvmmU2bIno+3IyEaemaw==
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.3.tgz#6209321eb2c1712a7e7466422b8cb1fc0d9dd5d8"
+  integrity sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==
 
 "@types/ws@^7.4.6":
   version "7.4.7"
@@ -2522,9 +2501,9 @@
     "@types/node" "*"
 
 "@types/yargs-parser@*":
-  version "15.0.0"
-  resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-15.0.0.tgz#cb3f9f741869e20cce330ffbeb9271590483882d"
-  integrity sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw==
+  version "21.0.3"
+  resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.3.tgz#815e30b786d2e8f0dcd85fd5bcf5e1a04d008f15"
+  integrity sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==
 
 "@types/yargs@^15.0.0":
   version "15.0.15"
@@ -2534,96 +2513,92 @@
     "@types/yargs-parser" "*"
 
 "@types/yargs@^17.0.8":
-  version "17.0.22"
-  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.22.tgz#7dd37697691b5f17d020f3c63e7a45971ff71e9a"
-  integrity sha512-pet5WJ9U8yPVRhkwuEIp5ktAeAqRZOq4UdAyWLWzxbtpyXnzbtLdKiXAjJzi/KLmPGS9wk86lUFWZFN6sISo4g==
+  version "17.0.33"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.33.tgz#8c32303da83eec050a84b3c7ae7b9f922d13e32d"
+  integrity sha512-WpxBCKWPLr4xSsHgz511rFJAM+wS28w2zEO1QDNY5zM/S8ok70NNfztH0xwhqKyaK0OHCbN98LDAZuy1ctxDkA==
   dependencies:
     "@types/yargs-parser" "*"
 
-"@typescript-eslint/eslint-plugin@^6.12.0":
-  version "6.12.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.12.0.tgz#2a647d278bb48bf397fef07ba0507612ff9dd812"
-  integrity sha512-XOpZ3IyJUIV1b15M7HVOpgQxPPF7lGXgsfcEIu3yDxFPaf/xZKt7s9QO/pbk7vpWQyVulpJbu4E5LwpZiQo4kA==
+"@typescript-eslint/eslint-plugin@^7.0.0":
+  version "7.18.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.18.0.tgz#b16d3cf3ee76bf572fdf511e79c248bdec619ea3"
+  integrity sha512-94EQTWZ40mzBc42ATNIBimBEDltSJ9RQHCC8vc/PDbxi4k8dVwUAv4o98dk50M1zB+JGFxp43FP7f8+FP8R6Sw==
   dependencies:
-    "@eslint-community/regexpp" "^4.5.1"
-    "@typescript-eslint/scope-manager" "6.12.0"
-    "@typescript-eslint/type-utils" "6.12.0"
-    "@typescript-eslint/utils" "6.12.0"
-    "@typescript-eslint/visitor-keys" "6.12.0"
-    debug "^4.3.4"
+    "@eslint-community/regexpp" "^4.10.0"
+    "@typescript-eslint/scope-manager" "7.18.0"
+    "@typescript-eslint/type-utils" "7.18.0"
+    "@typescript-eslint/utils" "7.18.0"
+    "@typescript-eslint/visitor-keys" "7.18.0"
     graphemer "^1.4.0"
-    ignore "^5.2.4"
+    ignore "^5.3.1"
     natural-compare "^1.4.0"
-    semver "^7.5.4"
-    ts-api-utils "^1.0.1"
-
-"@typescript-eslint/parser@^6.12.0":
-  version "6.12.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.12.0.tgz#9fb21ed7d88065a4a2ee21eb80b8578debb8217c"
-  integrity sha512-s8/jNFPKPNRmXEnNXfuo1gemBdVmpQsK1pcu+QIvuNJuhFzGrpD7WjOcvDc/+uEdfzSYpNu7U/+MmbScjoQ6vg==
-  dependencies:
-    "@typescript-eslint/scope-manager" "6.12.0"
-    "@typescript-eslint/types" "6.12.0"
-    "@typescript-eslint/typescript-estree" "6.12.0"
-    "@typescript-eslint/visitor-keys" "6.12.0"
+    ts-api-utils "^1.3.0"
+
+"@typescript-eslint/parser@^7.0.0":
+  version "7.18.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-7.18.0.tgz#83928d0f1b7f4afa974098c64b5ce6f9051f96a0"
+  integrity sha512-4Z+L8I2OqhZV8qA132M4wNL30ypZGYOQVBfMgxDH/K5UX0PNqTu1c6za9ST5r9+tavvHiTWmBnKzpCJ/GlVFtg==
+  dependencies:
+    "@typescript-eslint/scope-manager" "7.18.0"
+    "@typescript-eslint/types" "7.18.0"
+    "@typescript-eslint/typescript-estree" "7.18.0"
+    "@typescript-eslint/visitor-keys" "7.18.0"
     debug "^4.3.4"
 
-"@typescript-eslint/scope-manager@6.12.0":
-  version "6.12.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.12.0.tgz#5833a16dbe19cfbad639d4d33bcca5e755c7044b"
-  integrity sha512-5gUvjg+XdSj8pcetdL9eXJzQNTl3RD7LgUiYTl8Aabdi8hFkaGSYnaS6BLc0BGNaDH+tVzVwmKtWvu0jLgWVbw==
+"@typescript-eslint/scope-manager@7.18.0":
+  version "7.18.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-7.18.0.tgz#c928e7a9fc2c0b3ed92ab3112c614d6bd9951c83"
+  integrity sha512-jjhdIE/FPF2B7Z1uzc6i3oWKbGcHb87Qw7AWj6jmEqNOfDFbJWtjt/XfwCpvNkpGWlcJaog5vTR+VV8+w9JflA==
   dependencies:
-    "@typescript-eslint/types" "6.12.0"
-    "@typescript-eslint/visitor-keys" "6.12.0"
+    "@typescript-eslint/types" "7.18.0"
+    "@typescript-eslint/visitor-keys" "7.18.0"
 
-"@typescript-eslint/type-utils@6.12.0":
-  version "6.12.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.12.0.tgz#968f7c95162808d69950ab5dff710ad730e58287"
-  integrity sha512-WWmRXxhm1X8Wlquj+MhsAG4dU/Blvf1xDgGaYCzfvStP2NwPQh6KBvCDbiOEvaE0filhranjIlK/2fSTVwtBng==
+"@typescript-eslint/type-utils@7.18.0":
+  version "7.18.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-7.18.0.tgz#2165ffaee00b1fbbdd2d40aa85232dab6998f53b"
+  integrity sha512-XL0FJXuCLaDuX2sYqZUUSOJ2sG5/i1AAze+axqmLnSkNEVMVYLF+cbwlB2w8D1tinFuSikHmFta+P+HOofrLeA==
   dependencies:
-    "@typescript-eslint/typescript-estree" "6.12.0"
-    "@typescript-eslint/utils" "6.12.0"
+    "@typescript-eslint/typescript-estree" "7.18.0"
+    "@typescript-eslint/utils" "7.18.0"
     debug "^4.3.4"
-    ts-api-utils "^1.0.1"
+    ts-api-utils "^1.3.0"
 
-"@typescript-eslint/types@6.12.0":
-  version "6.12.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.12.0.tgz#ffc5297bcfe77003c8b7b545b51c2505748314ac"
-  integrity sha512-MA16p/+WxM5JG/F3RTpRIcuOghWO30//VEOvzubM8zuOOBYXsP+IfjoCXXiIfy2Ta8FRh9+IO9QLlaFQUU+10Q==
+"@typescript-eslint/types@7.18.0":
+  version "7.18.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-7.18.0.tgz#b90a57ccdea71797ffffa0321e744f379ec838c9"
+  integrity sha512-iZqi+Ds1y4EDYUtlOOC+aUmxnE9xS/yCigkjA7XpTKV6nCBd3Hp/PRGGmdwnfkV2ThMyYldP1wRpm/id99spTQ==
 
-"@typescript-eslint/typescript-estree@6.12.0":
-  version "6.12.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.12.0.tgz#764ccc32598549e5b48ec99e3b85f89b1385310c"
-  integrity sha512-vw9E2P9+3UUWzhgjyyVczLWxZ3GuQNT7QpnIY3o5OMeLO/c8oHljGc8ZpryBMIyympiAAaKgw9e5Hl9dCWFOYw==
+"@typescript-eslint/typescript-estree@7.18.0":
+  version "7.18.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-7.18.0.tgz#b5868d486c51ce8f312309ba79bdb9f331b37931"
+  integrity sha512-aP1v/BSPnnyhMHts8cf1qQ6Q1IFwwRvAQGRvBFkWlo3/lH29OXA3Pts+c10nxRxIBrDnoMqzhgdwVe5f2D6OzA==
   dependencies:
-    "@typescript-eslint/types" "6.12.0"
-    "@typescript-eslint/visitor-keys" "6.12.0"
+    "@typescript-eslint/types" "7.18.0"
+    "@typescript-eslint/visitor-keys" "7.18.0"
     debug "^4.3.4"
     globby "^11.1.0"
     is-glob "^4.0.3"
-    semver "^7.5.4"
-    ts-api-utils "^1.0.1"
+    minimatch "^9.0.4"
+    semver "^7.6.0"
+    ts-api-utils "^1.3.0"
 
-"@typescript-eslint/utils@6.12.0":
-  version "6.12.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.12.0.tgz#c6ce8c06fe9b0212620e5674a2036f6f8f611754"
-  integrity sha512-LywPm8h3tGEbgfyjYnu3dauZ0U7R60m+miXgKcZS8c7QALO9uWJdvNoP+duKTk2XMWc7/Q3d/QiCuLN9X6SWyQ==
+"@typescript-eslint/utils@7.18.0":
+  version "7.18.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-7.18.0.tgz#bca01cde77f95fc6a8d5b0dbcbfb3d6ca4be451f"
+  integrity sha512-kK0/rNa2j74XuHVcoCZxdFBMF+aq/vH83CXAOHieC+2Gis4mF8jJXT5eAfyD3K0sAxtPuwxaIOIOvhwzVDt/kw==
   dependencies:
     "@eslint-community/eslint-utils" "^4.4.0"
-    "@types/json-schema" "^7.0.12"
-    "@types/semver" "^7.5.0"
-    "@typescript-eslint/scope-manager" "6.12.0"
-    "@typescript-eslint/types" "6.12.0"
-    "@typescript-eslint/typescript-estree" "6.12.0"
-    semver "^7.5.4"
-
-"@typescript-eslint/visitor-keys@6.12.0":
-  version "6.12.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.12.0.tgz#5877950de42a0f3344261b7a1eee15417306d7e9"
-  integrity sha512-rg3BizTZHF1k3ipn8gfrzDXXSFKyOEB5zxYXInQ6z0hUvmQlhaZQzK+YmHmNViMA9HzW5Q9+bPPt90bU6GQwyw==
-  dependencies:
-    "@typescript-eslint/types" "6.12.0"
-    eslint-visitor-keys "^3.4.1"
+    "@typescript-eslint/scope-manager" "7.18.0"
+    "@typescript-eslint/types" "7.18.0"
+    "@typescript-eslint/typescript-estree" "7.18.0"
+
+"@typescript-eslint/visitor-keys@7.18.0":
+  version "7.18.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-7.18.0.tgz#0564629b6124d67607378d0f0332a0495b25e7d7"
+  integrity sha512-cDF0/Gf81QpY3xYyJKDV14Zwdmid5+uuENhjH2EqFaF0ni+yAyq/LzMaIJdhNJXZI7uLzwIlA+V7oWoyn6Curg==
+  dependencies:
+    "@typescript-eslint/types" "7.18.0"
+    eslint-visitor-keys "^3.4.3"
 
 "@ungap/structured-clone@^1.2.0":
   version "1.2.0"
@@ -2732,9 +2707,9 @@ acorn@^5.5.0:
   integrity sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==
 
 acorn@^8.9.0:
-  version "8.11.2"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.2.tgz#ca0d78b51895be5390a5903c5b3bdcdaf78ae40b"
-  integrity sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==
+  version "8.12.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.12.1.tgz#71616bdccbe25e27a54439e0046e89ca76df2248"
+  integrity sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==
 
 after@0.8.2:
   version "0.8.2"
@@ -2874,7 +2849,7 @@ ansi-styles@^3.2.0, ansi-styles@^3.2.1:
   dependencies:
     color-convert "^1.9.0"
 
-ansi-styles@^4.0.0, ansi-styles@^4.1.0:
+ansi-styles@^4.0.0:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.1.tgz#90ae75c424d008d2624c5bf29ead3177ebfcf359"
   integrity sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==
@@ -2882,6 +2857,13 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0:
     "@types/color-name" "^1.1.1"
     color-convert "^2.0.1"
 
+ansi-styles@^4.1.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
+  integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
+  dependencies:
+    color-convert "^2.0.1"
+
 ansi-styles@^5.0.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-5.2.0.tgz#07449690ad45777d1924ac2abb2fc8895dba836b"
@@ -2975,13 +2957,13 @@ arr-union@^3.1.0:
   resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
   integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=
 
-array-buffer-byte-length@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz#fabe8bc193fea865f317fe7807085ee0dee5aead"
-  integrity sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==
+array-buffer-byte-length@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz#1e5583ec16763540a27ae52eed99ff899223568f"
+  integrity sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==
   dependencies:
-    call-bind "^1.0.2"
-    is-array-buffer "^3.0.1"
+    call-bind "^1.0.5"
+    is-array-buffer "^3.0.4"
 
 array-differ@^2.0.3:
   version "2.1.0"
@@ -3013,14 +2995,15 @@ array-includes@^3.1.1:
     is-string "^1.0.5"
 
 array-includes@^3.1.7:
-  version "3.1.7"
-  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.7.tgz#8cd2e01b26f7a3086cbc87271593fe921c62abda"
-  integrity sha512-dlcsNBIiWhPkHdOEEKnehA+RNUWDc4UqFtnIXU4uuYDPtA4LDkr7qip2p0VvFAEXNDr0yWZ9PJyIRiGjRLQzwQ==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.2.0"
-    es-abstract "^1.22.1"
-    get-intrinsic "^1.2.1"
+  version "3.1.8"
+  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.8.tgz#5e370cbe172fdd5dd6530c1d4aadda25281ba97d"
+  integrity sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==
+  dependencies:
+    call-bind "^1.0.7"
+    define-properties "^1.2.1"
+    es-abstract "^1.23.2"
+    es-object-atoms "^1.0.0"
+    get-intrinsic "^1.2.4"
     is-string "^1.0.7"
 
 array-timsort@^1.0.3:
@@ -3051,15 +3034,16 @@ array-unique@^0.3.2:
   integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
 
 array.prototype.findlastindex@^1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.3.tgz#b37598438f97b579166940814e2c0493a4f50207"
-  integrity sha512-LzLoiOMAxvy+Gd3BAq3B7VeIgPdo+Q8hthvKtXybMvRV0jrXfJM/t8mw7nNlpEcVlVUnCnM2KSX4XU5HmpodOA==
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.5.tgz#8c35a755c72908719453f87145ca011e39334d0d"
+  integrity sha512-zfETvRFA8o7EiNn++N5f/kaCw221hrpGsDmcpndVupkPzEc1Wuf3VgC0qby1BbHs7f5DVYjgtEU2LLh5bqeGfQ==
   dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.2.0"
-    es-abstract "^1.22.1"
-    es-shim-unscopables "^1.0.0"
-    get-intrinsic "^1.2.1"
+    call-bind "^1.0.7"
+    define-properties "^1.2.1"
+    es-abstract "^1.23.2"
+    es-errors "^1.3.0"
+    es-object-atoms "^1.0.0"
+    es-shim-unscopables "^1.0.2"
 
 array.prototype.flat@^1.3.2:
   version "1.3.2"
@@ -3081,17 +3065,18 @@ array.prototype.flatmap@^1.3.2:
     es-abstract "^1.22.1"
     es-shim-unscopables "^1.0.0"
 
-arraybuffer.prototype.slice@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.2.tgz#98bd561953e3e74bb34938e77647179dfe6e9f12"
-  integrity sha512-yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw==
+arraybuffer.prototype.slice@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz#097972f4255e41bc3425e37dc3f6421cf9aefde6"
+  integrity sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==
   dependencies:
-    array-buffer-byte-length "^1.0.0"
-    call-bind "^1.0.2"
-    define-properties "^1.2.0"
-    es-abstract "^1.22.1"
-    get-intrinsic "^1.2.1"
-    is-array-buffer "^3.0.2"
+    array-buffer-byte-length "^1.0.1"
+    call-bind "^1.0.5"
+    define-properties "^1.2.1"
+    es-abstract "^1.22.3"
+    es-errors "^1.2.1"
+    get-intrinsic "^1.2.3"
+    is-array-buffer "^3.0.4"
     is-shared-array-buffer "^1.0.2"
 
 arraybuffer.slice@~0.0.7:
@@ -3180,10 +3165,12 @@ available-typed-arrays@^1.0.0, available-typed-arrays@^1.0.2:
   dependencies:
     array-filter "^1.0.0"
 
-available-typed-arrays@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7"
-  integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==
+available-typed-arrays@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz#a5cc375d6a03c2efc87a553f3e0b1522def14846"
+  integrity sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==
+  dependencies:
+    possible-typed-array-names "^1.0.0"
 
 aws-sign2@~0.7.0:
   version "0.7.0"
@@ -3277,9 +3264,9 @@ backo2@1.0.2:
   integrity sha1-MasayLEpNjRj41s+u2n038+6eUc=
 
 balanced-match@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
-  integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
+  integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
 base-x@^3.0.2:
   version "3.0.8"
@@ -3487,6 +3474,13 @@ brace-expansion@^1.1.7:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
+brace-expansion@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae"
+  integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==
+  dependencies:
+    balanced-match "^1.0.0"
+
 braces@^2.3.1:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
@@ -3503,13 +3497,20 @@ braces@^2.3.1:
     split-string "^3.0.2"
     to-regex "^3.0.1"
 
-braces@^3.0.1, braces@^3.0.2:
+braces@^3.0.1:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
   integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
   dependencies:
     fill-range "^7.0.1"
 
+braces@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
+  integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
+  dependencies:
+    fill-range "^7.1.1"
+
 brorand@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
@@ -3677,22 +3678,16 @@ caching-transform@^4.0.0:
     package-hash "^4.0.0"
     write-file-atomic "^3.0.0"
 
-call-bind@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"
-  integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==
-  dependencies:
-    function-bind "^1.1.1"
-    get-intrinsic "^1.0.2"
-
-call-bind@^1.0.2, call-bind@^1.0.4, call-bind@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.5.tgz#6fa2b7845ce0ea49bf4d8b9ef64727a2c2e2e513"
-  integrity sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==
+call-bind@^1.0.0, call-bind@^1.0.2, call-bind@^1.0.5, call-bind@^1.0.6, call-bind@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.7.tgz#06016599c40c56498c18769d2730be242b6fa3b9"
+  integrity sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==
   dependencies:
+    es-define-property "^1.0.0"
+    es-errors "^1.3.0"
     function-bind "^1.1.2"
-    get-intrinsic "^1.2.1"
-    set-function-length "^1.1.1"
+    get-intrinsic "^1.2.4"
+    set-function-length "^1.2.1"
 
 call-me-maybe@^1.0.1:
   version "1.0.1"
@@ -3827,10 +3822,6 @@ cashaddrjs@^0.3.3:
   dependencies:
     big-integer "1.6.36"
 
-"cashproof@https://github.com/eyeofpython/cashproof":
-  version "0.0.0"
-  resolved "https://github.com/eyeofpython/cashproof#ff92615faa338e025a9d3a5dd98112233f6daf76"
-
 chalk@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
@@ -3851,7 +3842,15 @@ chalk@^2.0.0, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.3.1, chalk@^2.4.2:
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
-chalk@^4.0.0, chalk@^4.1.0:
+chalk@^4.0.0:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
+  integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
+  dependencies:
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
+
+chalk@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a"
   integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==
@@ -3885,9 +3884,9 @@ ci-info@^2.0.0:
   integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==
 
 ci-info@^3.2.0:
-  version "3.7.1"
-  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.7.1.tgz#708a6cdae38915d597afdf3b145f2f8e1ff55f3f"
-  integrity sha512-4jYS4MOAaCIStSRwiuxc4B8MYhIe676yO1sYGzARnjXkWpmzZMMYxY6zu8WYWDhSuth5zhrQ1rhNSibyyvv4/w==
+  version "3.9.0"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.9.0.tgz#4279a62028a7b1f262f3473fc9605f5e218c59b4"
+  integrity sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==
 
 cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
   version "1.0.4"
@@ -4038,7 +4037,7 @@ color-convert@^2.0.1:
 color-name@1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
-  integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
+  integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==
 
 color-name@~1.1.4:
   version "1.1.4"
@@ -4125,7 +4124,7 @@ component-inherit@0.0.3:
 concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
+  integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
 
 concat-stream@^1.5.0, concat-stream@^1.6.0:
   version "1.6.2"
@@ -4523,6 +4522,33 @@ dashdash@^1.12.0:
   dependencies:
     assert-plus "^1.0.0"
 
+data-view-buffer@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/data-view-buffer/-/data-view-buffer-1.0.1.tgz#8ea6326efec17a2e42620696e671d7d5a8bc66b2"
+  integrity sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==
+  dependencies:
+    call-bind "^1.0.6"
+    es-errors "^1.3.0"
+    is-data-view "^1.0.1"
+
+data-view-byte-length@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/data-view-byte-length/-/data-view-byte-length-1.0.1.tgz#90721ca95ff280677eb793749fce1011347669e2"
+  integrity sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==
+  dependencies:
+    call-bind "^1.0.7"
+    es-errors "^1.3.0"
+    is-data-view "^1.0.1"
+
+data-view-byte-offset@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/data-view-byte-offset/-/data-view-byte-offset-1.0.0.tgz#5e0bbfb4828ed2d1b9b400cd8a7d119bca0ff18a"
+  integrity sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==
+  dependencies:
+    call-bind "^1.0.6"
+    es-errors "^1.3.0"
+    is-data-view "^1.0.1"
+
 dateformat@^3.0.0:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae"
@@ -4540,7 +4566,7 @@ debug@3.1.0, debug@~3.1.0:
   dependencies:
     ms "2.0.0"
 
-debug@4, debug@^4.1.0, debug@^4.1.1, debug@~4.1.0:
+debug@4, debug@^4.1.0, debug@~4.1.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
   integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
@@ -4568,10 +4594,10 @@ debug@^3.2.7:
   dependencies:
     ms "^2.1.1"
 
-debug@^4.3.2, debug@^4.3.4:
-  version "4.3.4"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
-  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
+debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4:
+  version "4.3.6"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.6.tgz#2ab2c38fbaffebf8aa95fdfe6d88438c7a13c52b"
+  integrity sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==
   dependencies:
     ms "2.1.2"
 
@@ -4628,7 +4654,12 @@ deep-equal@^2.0.3:
     which-collection "^1.0.1"
     which-typed-array "^1.1.2"
 
-deep-is@^0.1.3, deep-is@~0.1.3:
+deep-is@^0.1.3:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
+  integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
+
+deep-is@~0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
   integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
@@ -4652,23 +4683,23 @@ defaults@^1.0.3:
   dependencies:
     clone "^1.0.2"
 
-define-data-property@^1.0.1, define-data-property@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.1.tgz#c35f7cd0ab09883480d12ac5cb213715587800b3"
-  integrity sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==
+define-data-property@^1.0.1, define-data-property@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.4.tgz#894dc141bb7d3060ae4366f6a0107e68fbe48c5e"
+  integrity sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==
   dependencies:
-    get-intrinsic "^1.2.1"
+    es-define-property "^1.0.0"
+    es-errors "^1.3.0"
     gopd "^1.0.1"
-    has-property-descriptors "^1.0.0"
 
-define-properties@^1.1.2, define-properties@^1.1.3:
+define-properties@^1.1.2:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
   integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
   dependencies:
     object-keys "^1.0.12"
 
-define-properties@^1.1.4, define-properties@^1.2.0:
+define-properties@^1.1.3, define-properties@^1.2.0, define-properties@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.1.tgz#10781cc616eb951a80a034bafcaa7377f6af2b6c"
   integrity sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==
@@ -4759,10 +4790,10 @@ diff-sequences@^29.3.1:
   resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-29.3.1.tgz#104b5b95fe725932421a9c6e5b4bef84c3f2249e"
   integrity sha512-hlM3QR272NXCi4pq+N4Kok4kOp6EsgOM3ZSpJI7Da3UAs+Ttsi8MRmB6trM/lhyzUxGfOgnpkHtgqm5Q/CTcfQ==
 
-diff-sequences@^29.4.2:
-  version "29.4.2"
-  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-29.4.2.tgz#711fe6bd8a5869fe2539cee4a5152425ff671fda"
-  integrity sha512-R6P0Y6PrsH3n4hUXxL3nns0rbRk6Q33js3ygJBeEpbzLzgcNuJ61+u0RXasFpTKISw99TxUzFnumSnRLsjhLaw==
+diff-sequences@^29.6.3:
+  version "29.6.3"
+  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-29.6.3.tgz#4deaf894d11407c51efc8418012f9e70b84ea921"
+  integrity sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==
 
 dijkstrajs@^1.0.1:
   version "1.0.1"
@@ -5028,50 +5059,69 @@ es-abstract@^1.18.0-next.0:
     string.prototype.trimend "^1.0.1"
     string.prototype.trimstart "^1.0.1"
 
-es-abstract@^1.22.1:
-  version "1.22.3"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.22.3.tgz#48e79f5573198de6dee3589195727f4f74bc4f32"
-  integrity sha512-eiiY8HQeYfYH2Con2berK+To6GrK2RxbPawDkGq4UiCQQfZHb6wX9qQqkbpPqaxQFcl8d9QzZqo0tGE0VcrdwA==
-  dependencies:
-    array-buffer-byte-length "^1.0.0"
-    arraybuffer.prototype.slice "^1.0.2"
-    available-typed-arrays "^1.0.5"
-    call-bind "^1.0.5"
-    es-set-tostringtag "^2.0.1"
+es-abstract@^1.22.1, es-abstract@^1.22.3, es-abstract@^1.23.0, es-abstract@^1.23.2:
+  version "1.23.3"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.23.3.tgz#8f0c5a35cd215312573c5a27c87dfd6c881a0aa0"
+  integrity sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==
+  dependencies:
+    array-buffer-byte-length "^1.0.1"
+    arraybuffer.prototype.slice "^1.0.3"
+    available-typed-arrays "^1.0.7"
+    call-bind "^1.0.7"
+    data-view-buffer "^1.0.1"
+    data-view-byte-length "^1.0.1"
+    data-view-byte-offset "^1.0.0"
+    es-define-property "^1.0.0"
+    es-errors "^1.3.0"
+    es-object-atoms "^1.0.0"
+    es-set-tostringtag "^2.0.3"
     es-to-primitive "^1.2.1"
     function.prototype.name "^1.1.6"
-    get-intrinsic "^1.2.2"
-    get-symbol-description "^1.0.0"
+    get-intrinsic "^1.2.4"
+    get-symbol-description "^1.0.2"
     globalthis "^1.0.3"
     gopd "^1.0.1"
-    has-property-descriptors "^1.0.0"
-    has-proto "^1.0.1"
+    has-property-descriptors "^1.0.2"
+    has-proto "^1.0.3"
     has-symbols "^1.0.3"
-    hasown "^2.0.0"
-    internal-slot "^1.0.5"
-    is-array-buffer "^3.0.2"
+    hasown "^2.0.2"
+    internal-slot "^1.0.7"
+    is-array-buffer "^3.0.4"
     is-callable "^1.2.7"
-    is-negative-zero "^2.0.2"
+    is-data-view "^1.0.1"
+    is-negative-zero "^2.0.3"
     is-regex "^1.1.4"
-    is-shared-array-buffer "^1.0.2"
+    is-shared-array-buffer "^1.0.3"
     is-string "^1.0.7"
-    is-typed-array "^1.1.12"
+    is-typed-array "^1.1.13"
     is-weakref "^1.0.2"
     object-inspect "^1.13.1"
     object-keys "^1.1.1"
-    object.assign "^4.1.4"
-    regexp.prototype.flags "^1.5.1"
-    safe-array-concat "^1.0.1"
-    safe-regex-test "^1.0.0"
-    string.prototype.trim "^1.2.8"
-    string.prototype.trimend "^1.0.7"
-    string.prototype.trimstart "^1.0.7"
-    typed-array-buffer "^1.0.0"
-    typed-array-byte-length "^1.0.0"
-    typed-array-byte-offset "^1.0.0"
-    typed-array-length "^1.0.4"
+    object.assign "^4.1.5"
+    regexp.prototype.flags "^1.5.2"
+    safe-array-concat "^1.1.2"
+    safe-regex-test "^1.0.3"
+    string.prototype.trim "^1.2.9"
+    string.prototype.trimend "^1.0.8"
+    string.prototype.trimstart "^1.0.8"
+    typed-array-buffer "^1.0.2"
+    typed-array-byte-length "^1.0.1"
+    typed-array-byte-offset "^1.0.2"
+    typed-array-length "^1.0.6"
     unbox-primitive "^1.0.2"
-    which-typed-array "^1.1.13"
+    which-typed-array "^1.1.15"
+
+es-define-property@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.0.tgz#c7faefbdff8b2696cf5f46921edfb77cc4ba3845"
+  integrity sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==
+  dependencies:
+    get-intrinsic "^1.2.4"
+
+es-errors@^1.2.1, es-errors@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f"
+  integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==
 
 es-get-iterator@^1.1.0:
   version "1.1.0"
@@ -5086,16 +5136,23 @@ es-get-iterator@^1.1.0:
     is-string "^1.0.5"
     isarray "^2.0.5"
 
-es-set-tostringtag@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.0.2.tgz#11f7cc9f63376930a5f20be4915834f4bc74f9c9"
-  integrity sha512-BuDyupZt65P9D2D2vA/zqcI3G5xRsklm5N3xCwuiy+/vKy8i0ifdsQP1sLgO4tZDSCaQUSnmC48khknGMV3D2Q==
+es-object-atoms@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/es-object-atoms/-/es-object-atoms-1.0.0.tgz#ddb55cd47ac2e240701260bc2a8e31ecb643d941"
+  integrity sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==
   dependencies:
-    get-intrinsic "^1.2.2"
-    has-tostringtag "^1.0.0"
-    hasown "^2.0.0"
+    es-errors "^1.3.0"
+
+es-set-tostringtag@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz#8bb60f0a440c2e4281962428438d58545af39777"
+  integrity sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==
+  dependencies:
+    get-intrinsic "^1.2.4"
+    has-tostringtag "^1.0.2"
+    hasown "^2.0.1"
 
-es-shim-unscopables@^1.0.0:
+es-shim-unscopables@^1.0.0, es-shim-unscopables@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz#1f6942e71ecc7835ed1c8a83006d8771a63a3763"
   integrity sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==
@@ -5133,34 +5190,35 @@ es6-promisify@^5.0.0:
   dependencies:
     es6-promise "^4.0.3"
 
-esbuild@~0.19.10:
-  version "0.19.12"
-  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.19.12.tgz#dc82ee5dc79e82f5a5c3b4323a2a641827db3e04"
-  integrity sha512-aARqgq8roFBj054KvQr5f1sFu0D65G+miZRCuJyJ0G13Zwx7vRar5Zhn2tkQNzIXcBrNVsv/8stehpj+GAjgbg==
+esbuild@~0.23.0:
+  version "0.23.0"
+  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.23.0.tgz#de06002d48424d9fdb7eb52dbe8e95927f852599"
+  integrity sha512-1lvV17H2bMYda/WaFb2jLPeHU3zml2k4/yagNMG8Q/YtfMjCwEUZa2eXXMgZTVSL5q1n4H7sQ0X6CdJDqqeCFA==
   optionalDependencies:
-    "@esbuild/aix-ppc64" "0.19.12"
-    "@esbuild/android-arm" "0.19.12"
-    "@esbuild/android-arm64" "0.19.12"
-    "@esbuild/android-x64" "0.19.12"
-    "@esbuild/darwin-arm64" "0.19.12"
-    "@esbuild/darwin-x64" "0.19.12"
-    "@esbuild/freebsd-arm64" "0.19.12"
-    "@esbuild/freebsd-x64" "0.19.12"
-    "@esbuild/linux-arm" "0.19.12"
-    "@esbuild/linux-arm64" "0.19.12"
-    "@esbuild/linux-ia32" "0.19.12"
-    "@esbuild/linux-loong64" "0.19.12"
-    "@esbuild/linux-mips64el" "0.19.12"
-    "@esbuild/linux-ppc64" "0.19.12"
-    "@esbuild/linux-riscv64" "0.19.12"
-    "@esbuild/linux-s390x" "0.19.12"
-    "@esbuild/linux-x64" "0.19.12"
-    "@esbuild/netbsd-x64" "0.19.12"
-    "@esbuild/openbsd-x64" "0.19.12"
-    "@esbuild/sunos-x64" "0.19.12"
-    "@esbuild/win32-arm64" "0.19.12"
-    "@esbuild/win32-ia32" "0.19.12"
-    "@esbuild/win32-x64" "0.19.12"
+    "@esbuild/aix-ppc64" "0.23.0"
+    "@esbuild/android-arm" "0.23.0"
+    "@esbuild/android-arm64" "0.23.0"
+    "@esbuild/android-x64" "0.23.0"
+    "@esbuild/darwin-arm64" "0.23.0"
+    "@esbuild/darwin-x64" "0.23.0"
+    "@esbuild/freebsd-arm64" "0.23.0"
+    "@esbuild/freebsd-x64" "0.23.0"
+    "@esbuild/linux-arm" "0.23.0"
+    "@esbuild/linux-arm64" "0.23.0"
+    "@esbuild/linux-ia32" "0.23.0"
+    "@esbuild/linux-loong64" "0.23.0"
+    "@esbuild/linux-mips64el" "0.23.0"
+    "@esbuild/linux-ppc64" "0.23.0"
+    "@esbuild/linux-riscv64" "0.23.0"
+    "@esbuild/linux-s390x" "0.23.0"
+    "@esbuild/linux-x64" "0.23.0"
+    "@esbuild/netbsd-x64" "0.23.0"
+    "@esbuild/openbsd-arm64" "0.23.0"
+    "@esbuild/openbsd-x64" "0.23.0"
+    "@esbuild/sunos-x64" "0.23.0"
+    "@esbuild/win32-arm64" "0.23.0"
+    "@esbuild/win32-ia32" "0.23.0"
+    "@esbuild/win32-x64" "0.23.0"
 
 escalade@^3.1.1:
   version "3.1.1"
@@ -5197,10 +5255,10 @@ eslint-config-airbnb-base@^15.0.0:
     object.entries "^1.1.5"
     semver "^6.3.0"
 
-eslint-config-airbnb-typescript@^17.1.0:
-  version "17.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-airbnb-typescript/-/eslint-config-airbnb-typescript-17.1.0.tgz#fda960eee4a510f092a9a1c139035ac588937ddc"
-  integrity sha512-GPxI5URre6dDpJ0CtcthSZVBAfI+Uw7un5OYNVxP2EYi3H81Jw701yFP7AU+/vCE7xBtFmjge7kfhhk4+RAiig==
+eslint-config-airbnb-typescript@^18.0.0:
+  version "18.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-airbnb-typescript/-/eslint-config-airbnb-typescript-18.0.0.tgz#b1646db4134858d704b1d2bee47e1d72c180315f"
+  integrity sha512-oc+Lxzgzsu8FQyFVa4QFaVKiitTYiiW3frB9KYW5OWdPrqFc7FzxgB20hP4cHMlr+MBzGcLl3jnCOVOydL9mIg==
   dependencies:
     eslint-config-airbnb-base "^15.0.0"
 
@@ -5240,16 +5298,16 @@ eslint-module-utils@^2.1.1:
     pkg-dir "^2.0.0"
 
 eslint-module-utils@^2.8.0:
-  version "2.8.0"
-  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz#e439fee65fc33f6bba630ff621efc38ec0375c49"
-  integrity sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==
+  version "2.8.1"
+  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.8.1.tgz#52f2404300c3bd33deece9d7372fb337cc1d7c34"
+  integrity sha512-rXDXR3h7cs7dy9RNpUlQf80nX31XWJEyGq1tRMo+6GsO5VmTe4UTwtmonAD4ZkAsrfMVDA2wlGJ3790Ys+D49Q==
   dependencies:
     debug "^3.2.7"
 
-eslint-plugin-import@^2.29.0:
-  version "2.29.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.29.0.tgz#8133232e4329ee344f2f612885ac3073b0b7e155"
-  integrity sha512-QPOO5NO6Odv5lpoTkddtutccQjysJuFxoPS7fAHO+9m9udNHvTCPSAMW9zGAYj8lAIdr40I8yPCdUYrncXtrwg==
+eslint-plugin-import@^2.29.1:
+  version "2.29.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.29.1.tgz#d45b37b5ef5901d639c15270d74d46d161150643"
+  integrity sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw==
   dependencies:
     array-includes "^3.1.7"
     array.prototype.findlastindex "^1.2.3"
@@ -5267,7 +5325,7 @@ eslint-plugin-import@^2.29.0:
     object.groupby "^1.0.1"
     object.values "^1.1.7"
     semver "^6.3.1"
-    tsconfig-paths "^3.14.2"
+    tsconfig-paths "^3.15.0"
 
 eslint-plugin-import@~2.9.0:
   version "2.9.0"
@@ -5342,15 +5400,15 @@ eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4
   integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==
 
 eslint@^8.54.0:
-  version "8.54.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.54.0.tgz#588e0dd4388af91a2e8fa37ea64924074c783537"
-  integrity sha512-NY0DfAkM8BIZDVl6PgSa1ttZbx3xHgJzSNJKYcQglem6CppHyMhRIQkBVSSMaSRnLhig3jsDbEzOjwCVt4AmmA==
+  version "8.57.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.57.0.tgz#c786a6fd0e0b68941aaf624596fb987089195668"
+  integrity sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==
   dependencies:
     "@eslint-community/eslint-utils" "^4.2.0"
     "@eslint-community/regexpp" "^4.6.1"
-    "@eslint/eslintrc" "^2.1.3"
-    "@eslint/js" "8.54.0"
-    "@humanwhocodes/config-array" "^0.11.13"
+    "@eslint/eslintrc" "^2.1.4"
+    "@eslint/js" "8.57.0"
+    "@humanwhocodes/config-array" "^0.11.14"
     "@humanwhocodes/module-importer" "^1.0.1"
     "@nodelib/fs.walk" "^1.2.8"
     "@ungap/structured-clone" "^1.2.0"
@@ -5502,9 +5560,9 @@ esquery@^1.0.0:
     estraverse "^5.1.0"
 
 esquery@^1.4.2:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.5.0.tgz#6ce17738de8577694edd7361c57182ac8cb0db0b"
-  integrity sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.6.0.tgz#91419234f804d852a82dceec3e16cdc22cf9dae7"
+  integrity sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==
   dependencies:
     estraverse "^5.1.0"
 
@@ -5528,9 +5586,9 @@ estraverse@^4.1.0, estraverse@^4.1.1:
   integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
 
 estraverse@^5.1.0, estraverse@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880"
-  integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123"
+  integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==
 
 esutils@^2.0.2:
   version "2.0.3"
@@ -5602,15 +5660,15 @@ expand-brackets@^2.1.4:
     to-regex "^3.0.1"
 
 expect@^29.0.0:
-  version "29.4.2"
-  resolved "https://registry.yarnpkg.com/expect/-/expect-29.4.2.tgz#2ae34eb88de797c64a1541ad0f1e2ea8a7a7b492"
-  integrity sha512-+JHYg9O3hd3RlICG90OPVjRkPBoiUH7PxvDVMnRiaq1g6JUgZStX514erMl0v2Dc5SkfVbm7ztqbd6qHHPn+mQ==
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/expect/-/expect-29.7.0.tgz#578874590dcb3214514084c08115d8aee61e11bc"
+  integrity sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==
   dependencies:
-    "@jest/expect-utils" "^29.4.2"
-    jest-get-type "^29.4.2"
-    jest-matcher-utils "^29.4.2"
-    jest-message-util "^29.4.2"
-    jest-util "^29.4.2"
+    "@jest/expect-utils" "^29.7.0"
+    jest-get-type "^29.6.3"
+    jest-matcher-utils "^29.7.0"
+    jest-message-util "^29.7.0"
+    jest-util "^29.7.0"
 
 expect@^29.4.1:
   version "29.4.1"
@@ -5740,9 +5798,9 @@ fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6:
   integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
 
 fastq@^1.6.0:
-  version "1.10.1"
-  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.10.1.tgz#8b8f2ac8bf3632d67afcd65dac248d5fdc45385e"
-  integrity sha512-AWuv6Ery3pM+dY7LYS8YIaCiQvUaos9OB1RyNgaOWnaX+Tik7Onvcsf8x8c+YtDeT0maYLniBip2hox5KtEXXA==
+  version "1.17.1"
+  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.17.1.tgz#2a523f07a4e7b1e81a42b91b8bf2254107753b47"
+  integrity sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==
   dependencies:
     reusify "^1.0.4"
 
@@ -5800,10 +5858,10 @@ fill-range@^4.0.0:
     repeat-string "^1.6.1"
     to-regex-range "^2.1.0"
 
-fill-range@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
-  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+fill-range@^7.0.1, fill-range@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292"
+  integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==
   dependencies:
     to-regex-range "^5.0.1"
 
@@ -5870,17 +5928,18 @@ flat-cache@^1.2.1:
     write "^0.2.1"
 
 flat-cache@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11"
-  integrity sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.2.0.tgz#2c0c2d5040c99b1632771a9d105725c0115363ee"
+  integrity sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==
   dependencies:
-    flatted "^3.1.0"
+    flatted "^3.2.9"
+    keyv "^4.5.3"
     rimraf "^3.0.2"
 
-flatted@^3.1.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.1.1.tgz#c4b489e80096d9df1dfc97c79871aea7c617c469"
-  integrity sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA==
+flatted@^3.2.9:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.3.1.tgz#21db470729a6734d4997002f439cb308987f567a"
+  integrity sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==
 
 flush-write-stream@^1.0.0:
   version "1.1.1"
@@ -5993,7 +6052,7 @@ fs-write-stream-atomic@^1.0.8:
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
+  integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
 
 fsevents@^2.1.2, fsevents@^2.3.2:
   version "2.3.2"
@@ -6005,12 +6064,7 @@ fsevents@~2.3.3:
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"
   integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==
 
-function-bind@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
-  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
-
-function-bind@^1.1.2:
+function-bind@^1.1.1, function-bind@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c"
   integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==
@@ -6074,20 +6128,12 @@ get-caller-file@^2.0.1, get-caller-file@^2.0.5:
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
-get-intrinsic@^1.0.2:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6"
-  integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==
-  dependencies:
-    function-bind "^1.1.1"
-    has "^1.0.3"
-    has-symbols "^1.0.1"
-
-get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@^1.2.0, get-intrinsic@^1.2.1, get-intrinsic@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.2.tgz#281b7622971123e1ef4b3c90fd7539306da93f3b"
-  integrity sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==
+get-intrinsic@^1.1.3, get-intrinsic@^1.2.1, get-intrinsic@^1.2.3, get-intrinsic@^1.2.4:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.4.tgz#e385f5a4b5227d449c3eabbad05494ef0abbeadd"
+  integrity sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==
   dependencies:
+    es-errors "^1.3.0"
     function-bind "^1.1.2"
     has-proto "^1.0.1"
     has-symbols "^1.0.3"
@@ -6141,18 +6187,19 @@ get-stream@^6.0.0:
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7"
   integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==
 
-get-symbol-description@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz#7fdb81c900101fbd564dd5f1a30af5aadc1e58d6"
-  integrity sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==
+get-symbol-description@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.2.tgz#533744d5aa20aca4e079c8e5daf7fd44202821f5"
+  integrity sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==
   dependencies:
-    call-bind "^1.0.2"
-    get-intrinsic "^1.1.1"
+    call-bind "^1.0.5"
+    es-errors "^1.3.0"
+    get-intrinsic "^1.2.4"
 
-get-tsconfig@^4.7.2:
-  version "4.7.3"
-  resolved "https://registry.yarnpkg.com/get-tsconfig/-/get-tsconfig-4.7.3.tgz#0498163d98f7b58484dd4906999c0c9d5f103f83"
-  integrity sha512-ZvkrzoUA0PQZM6fy6+/Hce561s+faD1rsNwhnO5FelNjyy7EMGJ3Rz1AQ8GYDWjhRs/7dBLOEJvhK8MiEJOAFg==
+get-tsconfig@^4.7.5:
+  version "4.7.6"
+  resolved "https://registry.yarnpkg.com/get-tsconfig/-/get-tsconfig-4.7.6.tgz#118fd5b7b9bae234cc7705a00cd771d7eb65d62a"
+  integrity sha512-ZAqrLlu18NbDdRaHq+AKXzAmqIUPswPWKUchfytdAjiRFnCe5ojG2bstg6mRiZabkKfCoL/e98pbBELIV/YCeA==
   dependencies:
     resolve-pkg-maps "^1.0.0"
 
@@ -6256,7 +6303,7 @@ glob-to-regexp@^0.3.0:
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
   integrity sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=
 
-glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
+glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@^7.1.4, glob@^7.1.6:
   version "7.1.6"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
   integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
@@ -6268,6 +6315,18 @@ glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
+glob@^7.1.3:
+  version "7.2.3"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
+  integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.1.1"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
 global-dirs@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-0.1.1.tgz#b319c0dd4607f353f3be9cca4c72fc148c49f445"
@@ -6281,18 +6340,19 @@ globals@^11.0.1, globals@^11.1.0:
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
 globals@^13.19.0:
-  version "13.23.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-13.23.0.tgz#ef31673c926a0976e1f61dab4dca57e0c0a8af02"
-  integrity sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==
+  version "13.24.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-13.24.0.tgz#8432a19d78ce0c1e833949c36adb345400bb1171"
+  integrity sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==
   dependencies:
     type-fest "^0.20.2"
 
 globalthis@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.3.tgz#5852882a52b80dc301b0660273e1ed082f0b6ccf"
-  integrity sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.4.tgz#7430ed3a975d97bfb59bcce41f5cabbafa651236"
+  integrity sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==
   dependencies:
-    define-properties "^1.1.3"
+    define-properties "^1.2.1"
+    gopd "^1.0.1"
 
 globby@^11.1.0:
   version "11.1.0"
@@ -6343,11 +6403,16 @@ graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
   integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
 
-graceful-fs@^4.2.4, graceful-fs@^4.2.9:
+graceful-fs@^4.2.4:
   version "4.2.10"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
   integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
 
+graceful-fs@^4.2.9:
+  version "4.2.11"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
+  integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
+
 graphemer@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/graphemer/-/graphemer-1.4.0.tgz#fb2f1d55e0e3a1849aeffc90c4fa0dd53a0e66c6"
@@ -6415,7 +6480,7 @@ has-cors@1.1.0:
 has-flag@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
-  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
+  integrity sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==
 
 has-flag@^4.0.0:
   version "4.0.0"
@@ -6427,34 +6492,34 @@ has-own-prop@^2.0.0:
   resolved "https://registry.yarnpkg.com/has-own-prop/-/has-own-prop-2.0.0.tgz#f0f95d58f65804f5d218db32563bb85b8e0417af"
   integrity sha512-Pq0h+hvsVm6dDEa8x82GnLSYHOzNDt7f0ddFa3FqcQlgzEiptPqL+XrOJNavjOzSYiYWIrgeVYYgGlLmnxwilQ==
 
-has-property-descriptors@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz#52ba30b6c5ec87fd89fa574bc1c39125c6f65340"
-  integrity sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg==
+has-property-descriptors@^1.0.0, has-property-descriptors@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz#963ed7d071dc7bf5f084c5bfbe0d1b6222586854"
+  integrity sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==
   dependencies:
-    get-intrinsic "^1.2.2"
+    es-define-property "^1.0.0"
 
-has-proto@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.1.tgz#1885c1305538958aff469fef37937c22795408e0"
-  integrity sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==
+has-proto@^1.0.1, has-proto@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.3.tgz#b31ddfe9b0e6e9914536a6ab286426d0214f77fd"
+  integrity sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==
 
-has-symbols@^1.0.0, has-symbols@^1.0.1:
+has-symbols@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8"
   integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==
 
-has-symbols@^1.0.2, has-symbols@^1.0.3:
+has-symbols@^1.0.1, has-symbols@^1.0.2, has-symbols@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8"
   integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==
 
-has-tostringtag@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25"
-  integrity sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==
+has-tostringtag@^1.0.0, has-tostringtag@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.2.tgz#2cdc42d40bef2e5b4eeab7c01a73c54ce7ab5abc"
+  integrity sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==
   dependencies:
-    has-symbols "^1.0.2"
+    has-symbols "^1.0.3"
 
 has-unicode@^2.0.0, has-unicode@^2.0.1:
   version "2.0.1"
@@ -6492,13 +6557,18 @@ has-values@^1.0.0:
     is-number "^3.0.0"
     kind-of "^4.0.0"
 
-has@^1.0.1, has@^1.0.3:
+has@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
   integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
   dependencies:
     function-bind "^1.1.1"
 
+has@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/has/-/has-1.0.4.tgz#2eb2860e000011dae4f1406a86fe80e530fb2ec6"
+  integrity sha512-qdSAmqLF6209RFj4VVItywPMbm3vWylknmB3nvNiUIs72xAimcM8nVYxYr7ncvZq5qzk9MKIZR8ijqD/1QuYjQ==
+
 hash-base@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.1.0.tgz#55c381d9e06e1d2997a883b4a3fddfe7f0d3af33"
@@ -6524,10 +6594,10 @@ hasha@^5.0.0:
     is-stream "^2.0.0"
     type-fest "^0.8.0"
 
-hasown@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.0.tgz#f4c513d454a57b7c7e1650778de226b11700546c"
-  integrity sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==
+hasown@^2.0.0, hasown@^2.0.1, hasown@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.2.tgz#003eaf91be7adc372e84ec59dc37252cedb80003"
+  integrity sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==
   dependencies:
     function-bind "^1.1.2"
 
@@ -6657,15 +6727,10 @@ ignore@^4.0.3:
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
   integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
 
-ignore@^5.2.0:
-  version "5.2.4"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324"
-  integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==
-
-ignore@^5.2.4:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.0.tgz#67418ae40d34d6999c95ff56016759c718c82f78"
-  integrity sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg==
+ignore@^5.2.0, ignore@^5.3.1:
+  version "5.3.2"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.2.tgz#3cd40e729f3643fd87cb04e50bf0eb722bc596f5"
+  integrity sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==
 
 import-fresh@^2.0.0:
   version "2.0.0"
@@ -6702,7 +6767,7 @@ import-local@^3.0.2:
 imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
-  integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
+  integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==
 
 indent-string@^2.1.0:
   version "2.1.0"
@@ -6739,7 +6804,7 @@ infer-owner@^1.0.3, infer-owner@^1.0.4:
 inflight@^1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
+  integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==
   dependencies:
     once "^1.3.0"
     wrappy "1"
@@ -6812,12 +6877,12 @@ inquirer@^6.2.0:
     strip-ansi "^5.1.0"
     through "^2.3.6"
 
-internal-slot@^1.0.5:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.6.tgz#37e756098c4911c5e912b8edbf71ed3aa116f930"
-  integrity sha512-Xj6dv+PsbtwyPpEflsejS+oIZxmMlV44zAhG479uYu89MsjcYOhCFnNyKrkJrihbsiasQyY0afoCl/9BLR65bg==
+internal-slot@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.7.tgz#c06dcca3ed874249881007b0a5523b172a190802"
+  integrity sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==
   dependencies:
-    get-intrinsic "^1.2.2"
+    es-errors "^1.3.0"
     hasown "^2.0.0"
     side-channel "^1.0.4"
 
@@ -6845,14 +6910,13 @@ is-arguments@^1.0.4:
   resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.0.4.tgz#3faf966c7cba0ff437fb31f6250082fcf0448cf3"
   integrity sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==
 
-is-array-buffer@^3.0.1, is-array-buffer@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.2.tgz#f2653ced8412081638ecb0ebbd0c41c6e0aecbbe"
-  integrity sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==
+is-array-buffer@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.4.tgz#7a1f92b3d61edd2bc65d24f130530ea93d7fae98"
+  integrity sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==
   dependencies:
     call-bind "^1.0.2"
-    get-intrinsic "^1.2.0"
-    is-typed-array "^1.1.10"
+    get-intrinsic "^1.2.1"
 
 is-arrayish@^0.2.1:
   version "0.2.1"
@@ -6889,16 +6953,16 @@ is-buffer@^1.1.5:
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
   integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
 
-is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.0.tgz#83336560b54a38e35e3a2df7afd0454d691468bb"
-  integrity sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw==
-
-is-callable@^1.2.7:
+is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.7:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055"
   integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==
 
+is-callable@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.0.tgz#83336560b54a38e35e3a2df7afd0454d691468bb"
+  integrity sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw==
+
 is-ci@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c"
@@ -6907,11 +6971,11 @@ is-ci@^2.0.0:
     ci-info "^2.0.0"
 
 is-core-module@^2.13.0, is-core-module@^2.13.1:
-  version "2.13.1"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.13.1.tgz#ad0d7532c6fea9da1ebdc82742d74525c6273384"
-  integrity sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==
+  version "2.15.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.15.0.tgz#71c72ec5442ace7e76b306e9d48db361f22699ea"
+  integrity sha512-Dd+Lb2/zvk9SKy1TGCt1wFJFo/MWBPMX5x7KcvLajWTGuomczdQX61PvY5yK6SVACwpoexWo81IfFyoKY2QnTA==
   dependencies:
-    hasown "^2.0.0"
+    hasown "^2.0.2"
 
 is-core-module@^2.5.0, is-core-module@^2.9.0:
   version "2.11.0"
@@ -6934,7 +6998,21 @@ is-data-descriptor@^1.0.0:
   dependencies:
     kind-of "^6.0.0"
 
-is-date-object@^1.0.1, is-date-object@^1.0.2:
+is-data-view@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-data-view/-/is-data-view-1.0.1.tgz#4b4d3a511b70f3dc26d42c03ca9ca515d847759f"
+  integrity sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==
+  dependencies:
+    is-typed-array "^1.1.13"
+
+is-date-object@^1.0.1:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f"
+  integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==
+  dependencies:
+    has-tostringtag "^1.0.0"
+
+is-date-object@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz#bda736f2cd8fd06d32844e7743bfa7494c3bfd7e"
   integrity sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==
@@ -7023,14 +7101,7 @@ is-glob@^3.1.0:
   dependencies:
     is-extglob "^2.1.0"
 
-is-glob@^4.0.0, is-glob@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
-  integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==
-  dependencies:
-    is-extglob "^2.1.1"
-
-is-glob@^4.0.3:
+is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
   integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
@@ -7054,10 +7125,10 @@ is-negative-zero@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.0.tgz#9553b121b0fac28869da9ed459e20c7543788461"
   integrity sha1-lVOxIbD6wohp2p7UWeIMdUN4hGE=
 
-is-negative-zero@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150"
-  integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==
+is-negative-zero@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.3.tgz#ced903a027aca6381b777a5743069d7376a49747"
+  integrity sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==
 
 is-number-object@^1.0.3:
   version "1.0.4"
@@ -7140,12 +7211,12 @@ is-set@^2.0.1:
   resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.1.tgz#d1604afdab1724986d30091575f54945da7e5f43"
   integrity sha512-eJEzOtVyenDs1TMzSQ3kU3K+E0GUS9sno+F0OBT97xsgcJsF9nXMBtkT9/kut5JEpM7oL7X/0qxR17K3mcwIAA==
 
-is-shared-array-buffer@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz#8f259c573b60b6a32d4058a1a07430c0a7344c79"
-  integrity sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==
+is-shared-array-buffer@^1.0.2, is-shared-array-buffer@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz#1237f1cba059cdb62431d378dcc37d9680181688"
+  integrity sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==
   dependencies:
-    call-bind "^1.0.2"
+    call-bind "^1.0.7"
 
 is-ssh@^1.3.0:
   version "1.3.2"
@@ -7164,26 +7235,19 @@ is-stream@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3"
   integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==
 
-is-string@^1.0.4, is-string@^1.0.5:
+is-string@^1.0.4:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz#40493ed198ef3ff477b8c7f92f644ec82a5cd3a6"
   integrity sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==
 
-is-string@^1.0.7:
+is-string@^1.0.5, is-string@^1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd"
   integrity sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==
   dependencies:
     has-tostringtag "^1.0.0"
 
-is-symbol@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz#38e1014b9e6329be0de9d24a414fd7441ec61937"
-  integrity sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==
-  dependencies:
-    has-symbols "^1.0.1"
-
-is-symbol@^1.0.3:
+is-symbol@^1.0.2, is-symbol@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c"
   integrity sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==
@@ -7197,12 +7261,12 @@ is-text-path@^1.0.1:
   dependencies:
     text-extensions "^1.0.0"
 
-is-typed-array@^1.1.10, is-typed-array@^1.1.12, is-typed-array@^1.1.9:
-  version "1.1.12"
-  resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.12.tgz#d0bab5686ef4a76f7a73097b95470ab199c57d4a"
-  integrity sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==
+is-typed-array@^1.1.13:
+  version "1.1.13"
+  resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.13.tgz#d6c5ca56df62334959322d7d7dd1cca50debe229"
+  integrity sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==
   dependencies:
-    which-typed-array "^1.1.11"
+    which-typed-array "^1.1.14"
 
 is-typed-array@^1.1.3:
   version "1.1.3"
@@ -7271,7 +7335,7 @@ isarray@^2.0.1, isarray@^2.0.5:
 isexe@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
-  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
+  integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
 
 isobject@^2.0.0:
   version "2.1.0"
@@ -7474,15 +7538,15 @@ jest-diff@^29.4.1:
     jest-get-type "^29.2.0"
     pretty-format "^29.4.1"
 
-jest-diff@^29.4.2:
-  version "29.4.2"
-  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-29.4.2.tgz#b88502d5dc02d97f6512d73c37da8b36f49b4871"
-  integrity sha512-EK8DSajVtnjx9sa1BkjZq3mqChm2Cd8rIzdXkQMA8e0wuXq53ypz6s5o5V8HRZkoEt2ywJ3eeNWFKWeYr8HK4g==
+jest-diff@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-29.7.0.tgz#017934a66ebb7ecf6f205e84699be10afd70458a"
+  integrity sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==
   dependencies:
     chalk "^4.0.0"
-    diff-sequences "^29.4.2"
-    jest-get-type "^29.4.2"
-    pretty-format "^29.4.2"
+    diff-sequences "^29.6.3"
+    jest-get-type "^29.6.3"
+    pretty-format "^29.7.0"
 
 jest-docblock@^29.2.0:
   version "29.2.0"
@@ -7519,10 +7583,10 @@ jest-get-type@^29.2.0:
   resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-29.2.0.tgz#726646f927ef61d583a3b3adb1ab13f3a5036408"
   integrity sha512-uXNJlg8hKFEnDgFsrCjznB+sTxdkuqiCL6zMgA75qEbAJjJYTs9XPrvDctrEig2GDow22T/LvHgO57iJhXB/UA==
 
-jest-get-type@^29.4.2:
-  version "29.4.2"
-  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-29.4.2.tgz#7cb63f154bca8d8f57364d01614477d466fa43fe"
-  integrity sha512-vERN30V5i2N6lqlFu4ljdTqQAgrkTFMC9xaIIfOPYBw04pufjXRty5RuXBiB1d72tGbURa/UgoiHB90ruOSivg==
+jest-get-type@^29.6.3:
+  version "29.6.3"
+  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-29.6.3.tgz#36f499fdcea197c1045a127319c0481723908fd1"
+  integrity sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==
 
 jest-haste-map@^26.6.2:
   version "26.6.2"
@@ -7582,15 +7646,15 @@ jest-matcher-utils@^29.4.1:
     jest-get-type "^29.2.0"
     pretty-format "^29.4.1"
 
-jest-matcher-utils@^29.4.2:
-  version "29.4.2"
-  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-29.4.2.tgz#08d0bf5abf242e3834bec92c7ef5071732839e85"
-  integrity sha512-EZaAQy2je6Uqkrm6frnxBIdaWtSYFoR8SVb2sNLAtldswlR/29JAgx+hy67llT3+hXBaLB0zAm5UfeqerioZyg==
+jest-matcher-utils@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz#ae8fec79ff249fd592ce80e3ee474e83a6c44f12"
+  integrity sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==
   dependencies:
     chalk "^4.0.0"
-    jest-diff "^29.4.2"
-    jest-get-type "^29.4.2"
-    pretty-format "^29.4.2"
+    jest-diff "^29.7.0"
+    jest-get-type "^29.6.3"
+    pretty-format "^29.7.0"
 
 jest-message-util@^26.6.2:
   version "26.6.2"
@@ -7622,18 +7686,18 @@ jest-message-util@^29.4.1:
     slash "^3.0.0"
     stack-utils "^2.0.3"
 
-jest-message-util@^29.4.2:
-  version "29.4.2"
-  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-29.4.2.tgz#309a2924eae6ca67cf7f25781a2af1902deee717"
-  integrity sha512-SElcuN4s6PNKpOEtTInjOAA8QvItu0iugkXqhYyguRvQoXapg5gN+9RQxLAkakChZA7Y26j6yUCsFWN+hlKD6g==
+jest-message-util@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-29.7.0.tgz#8bc392e204e95dfe7564abbe72a404e28e51f7f3"
+  integrity sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==
   dependencies:
     "@babel/code-frame" "^7.12.13"
-    "@jest/types" "^29.4.2"
+    "@jest/types" "^29.6.3"
     "@types/stack-utils" "^2.0.0"
     chalk "^4.0.0"
     graceful-fs "^4.2.9"
     micromatch "^4.0.4"
-    pretty-format "^29.4.2"
+    pretty-format "^29.7.0"
     slash "^3.0.0"
     stack-utils "^2.0.3"
 
@@ -7816,12 +7880,12 @@ jest-util@^29.4.1:
     graceful-fs "^4.2.9"
     picomatch "^2.2.3"
 
-jest-util@^29.4.2:
-  version "29.4.2"
-  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.4.2.tgz#3db8580b295df453a97de4a1b42dd2578dabd2c2"
-  integrity sha512-wKnm6XpJgzMUSRFB7YF48CuwdzuDIHenVuoIb1PLuJ6F+uErZsuDkU+EiExkChf6473XcawBrSfDSnXl+/YG4g==
+jest-util@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.7.0.tgz#23c2b62bfb22be82b44de98055802ff3710fc0bc"
+  integrity sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==
   dependencies:
-    "@jest/types" "^29.4.2"
+    "@jest/types" "^29.6.3"
     "@types/node" "*"
     chalk "^4.0.0"
     ci-info "^3.2.0"
@@ -7928,6 +7992,11 @@ jsesc@^2.5.1:
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
   integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==
 
+json-buffer@3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13"
+  integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==
+
 json-parse-better-errors@^1.0.0, json-parse-better-errors@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
@@ -7956,7 +8025,7 @@ json-schema@0.2.3:
 json-stable-stringify-without-jsonify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
-  integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=
+  integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==
 
 json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1:
   version "5.0.1"
@@ -8036,6 +8105,13 @@ keccak@^1.3.0:
     nan "^2.2.1"
     safe-buffer "^5.1.0"
 
+keyv@^4.5.3:
+  version "4.5.4"
+  resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.4.tgz#a879a99e29452f942439f2a405e3af8b31d4de93"
+  integrity sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==
+  dependencies:
+    json-buffer "3.0.1"
+
 kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
@@ -8545,11 +8621,11 @@ micromatch@^4.0.2:
     picomatch "^2.0.5"
 
 micromatch@^4.0.4:
-  version "4.0.5"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
-  integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
+  version "4.0.7"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.7.tgz#33e8190d9fe474a9895525f5618eee136d46c2e5"
+  integrity sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==
   dependencies:
-    braces "^3.0.2"
+    braces "^3.0.3"
     picomatch "^2.3.1"
 
 mime-db@1.44.0:
@@ -8596,20 +8672,27 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
   integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
 
-minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4:
+minimatch@^3.0.2, minimatch@^3.0.3:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
   dependencies:
     brace-expansion "^1.1.7"
 
-minimatch@^3.0.5, minimatch@^3.1.2:
+minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
   integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
   dependencies:
     brace-expansion "^1.1.7"
 
+minimatch@^9.0.4:
+  version "9.0.5"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.5.tgz#d74f9dd6b57d83d8e98cfb82133b03978bc929e5"
+  integrity sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==
+  dependencies:
+    brace-expansion "^2.0.1"
+
 minimist-options@4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619"
@@ -8627,12 +8710,12 @@ minimist-options@^3.0.1:
     arrify "^1.0.1"
     is-plain-obj "^1.1.0"
 
-minimist@^1.1.0, minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.5:
+minimist@^1.1.0, minimist@^1.1.3, minimist@^1.2.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
   integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
 
-minimist@^1.1.1, minimist@^1.2.6:
+minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.6:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
   integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
@@ -8717,11 +8800,16 @@ ms@2.0.0:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
   integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
 
-ms@2.1.2, ms@^2.0.0, ms@^2.1.1:
+ms@2.1.2, ms@^2.0.0:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
+ms@^2.1.1:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
+  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
+
 multimatch@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/multimatch/-/multimatch-3.0.0.tgz#0e2534cc6bc238d9ab67e1b9cd5fcd85a6dbf70b"
@@ -8781,7 +8869,7 @@ nanomatch@^1.2.9:
 natural-compare@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
-  integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
+  integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==
 
 negotiator@0.6.2:
   version "0.6.2"
@@ -9072,10 +9160,10 @@ object-copy@^0.1.0:
     define-property "^0.2.5"
     kind-of "^3.0.3"
 
-object-inspect@^1.13.1, object-inspect@^1.9.0:
-  version "1.13.1"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.1.tgz#b96c6109324ccfef6b12216a956ca4dc2ff94bc2"
-  integrity sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==
+object-inspect@^1.13.1:
+  version "1.13.2"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.2.tgz#dea0088467fb991e67af4058147a24824a3043ff"
+  integrity sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==
 
 object-inspect@^1.7.0, object-inspect@^1.8.0:
   version "1.8.0"
@@ -9122,13 +9210,13 @@ object.assign@^4.1.2:
     has-symbols "^1.0.1"
     object-keys "^1.1.1"
 
-object.assign@^4.1.4:
-  version "4.1.4"
-  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.4.tgz#9673c7c7c351ab8c4d0b516f4343ebf4dfb7799f"
-  integrity sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==
+object.assign@^4.1.5:
+  version "4.1.5"
+  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.5.tgz#3a833f9ab7fdb80fc9e8d2300c803d216d8fdbb0"
+  integrity sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==
   dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.4"
+    call-bind "^1.0.5"
+    define-properties "^1.2.1"
     has-symbols "^1.0.3"
     object-keys "^1.1.1"
 
@@ -9142,13 +9230,14 @@ object.entries@^1.1.5:
     es-abstract "^1.22.1"
 
 object.fromentries@^2.0.7:
-  version "2.0.7"
-  resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.7.tgz#71e95f441e9a0ea6baf682ecaaf37fa2a8d7e616"
-  integrity sha512-UPbPHML6sL8PI/mOqPwsH4G6iyXcCGzLin8KvEPenOZN5lpCNBZZQ+V62vdjB1mQHrmqGQt5/OJzemUA+KJmEA==
+  version "2.0.8"
+  resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.8.tgz#f7195d8a9b97bd95cbc1999ea939ecd1a2b00c65"
+  integrity sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==
   dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.2.0"
-    es-abstract "^1.22.1"
+    call-bind "^1.0.7"
+    define-properties "^1.2.1"
+    es-abstract "^1.23.2"
+    es-object-atoms "^1.0.0"
 
 object.getownpropertydescriptors@^2.0.3:
   version "2.1.0"
@@ -9159,14 +9248,13 @@ object.getownpropertydescriptors@^2.0.3:
     es-abstract "^1.17.0-next.1"
 
 object.groupby@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/object.groupby/-/object.groupby-1.0.1.tgz#d41d9f3c8d6c778d9cbac86b4ee9f5af103152ee"
-  integrity sha512-HqaQtqLnp/8Bn4GL16cj+CUYbnpe1bh0TtEaWvybszDG4tgxCJuRpV8VGuvNaI1fAnI4lUJzDG55MXcOH4JZcQ==
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/object.groupby/-/object.groupby-1.0.3.tgz#9b125c36238129f6f7b61954a1e7176148d5002e"
+  integrity sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==
   dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.2.0"
-    es-abstract "^1.22.1"
-    get-intrinsic "^1.2.1"
+    call-bind "^1.0.7"
+    define-properties "^1.2.1"
+    es-abstract "^1.23.2"
 
 object.pick@^1.3.0:
   version "1.3.0"
@@ -9176,13 +9264,13 @@ object.pick@^1.3.0:
     isobject "^3.0.1"
 
 object.values@^1.1.7:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.7.tgz#617ed13272e7e1071b43973aa1655d9291b8442a"
-  integrity sha512-aU6xnDFYT3x17e/f0IiiwlGPTy2jzMySGfUB4fq6z7CV8l85CWHDk5ErhyhpfDHhrOMwGFhSQkhMGHaIotA6Ng==
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.2.0.tgz#65405a9d92cee68ac2d303002e0b8470a4d9ab1b"
+  integrity sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ==
   dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.2.0"
-    es-abstract "^1.22.1"
+    call-bind "^1.0.7"
+    define-properties "^1.2.1"
+    es-object-atoms "^1.0.0"
 
 octokit-pagination-methods@^1.1.0:
   version "1.1.0"
@@ -9223,16 +9311,16 @@ optionator@^0.8.2:
     word-wrap "~1.2.3"
 
 optionator@^0.9.3:
-  version "0.9.3"
-  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.3.tgz#007397d44ed1872fdc6ed31360190f81814e2c64"
-  integrity sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==
+  version "0.9.4"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.4.tgz#7ea1c1a5d91d764fb282139c88fe11e182a3a734"
+  integrity sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==
   dependencies:
-    "@aashutoshrathi/word-wrap" "^1.2.3"
     deep-is "^0.1.3"
     fast-levenshtein "^2.0.6"
     levn "^0.4.1"
     prelude-ls "^1.2.1"
     type-check "^0.4.0"
+    word-wrap "^1.2.5"
 
 os-homedir@^1.0.0:
   version "1.0.2"
@@ -9528,7 +9616,7 @@ path-exists@^4.0.0:
 path-is-absolute@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
+  integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
 
 path-is-inside@^1.0.2:
   version "1.0.2"
@@ -9699,6 +9787,11 @@ posix-character-classes@^0.1.0:
   resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
   integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=
 
+possible-typed-array-names@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz#89bb63c6fada2c3e90adc4a647beeeb39cc7bf8f"
+  integrity sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==
+
 preact@8.2.9:
   version "8.2.9"
   resolved "https://registry.yarnpkg.com/preact/-/preact-8.2.9.tgz#813ba9dd45e5d97c5ea0d6c86d375b3be711cc40"
@@ -9724,12 +9817,12 @@ pretty-format@^26.6.2:
     ansi-styles "^4.0.0"
     react-is "^17.0.1"
 
-pretty-format@^29.0.0, pretty-format@^29.4.2:
-  version "29.4.2"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-29.4.2.tgz#64bf5ccc0d718c03027d94ac957bdd32b3fb2401"
-  integrity sha512-qKlHR8yFVCbcEWba0H0TOC8dnLlO4vPlyEjRPw31FZ2Rupy9nLa8ZLbYny8gWEl8CkEhJqAE6IzdNELTBVcBEg==
+pretty-format@^29.0.0, pretty-format@^29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-29.7.0.tgz#ca42c758310f365bfa71a0bda0a807160b776812"
+  integrity sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==
   dependencies:
-    "@jest/schemas" "^29.4.2"
+    "@jest/schemas" "^29.6.3"
     ansi-styles "^5.0.0"
     react-is "^18.0.0"
 
@@ -9856,7 +9949,12 @@ pumpify@^1.3.3:
     inherits "^2.0.3"
     pump "^2.0.0"
 
-punycode@^2.1.0, punycode@^2.1.1:
+punycode@^2.1.0:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.1.tgz#027422e2faec0b25e1549c3e1bd8309b9133b6e5"
+  integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==
+
+punycode@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
   integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
@@ -9895,9 +9993,9 @@ querystringify@^2.1.1:
   integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==
 
 queue-microtask@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.2.tgz#abf64491e6ecf0f38a6502403d4cda04f372dfd3"
-  integrity sha512-dB15eXv3p2jDlbOiNLyMabYg1/sXvppd8DP2J3EOCQ0AkuSXCW2tP7mnVouVLJKgUMY6yP0kcQDVpLCN13h4Xg==
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
+  integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
 
 quick-lru@^1.0.0:
   version "1.1.0"
@@ -9937,9 +10035,9 @@ react-is@^17.0.1:
   integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==
 
 react-is@^18.0.0:
-  version "18.2.0"
-  resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b"
-  integrity sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==
+  version "18.3.1"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.3.1.tgz#e83557dc12eae63a99e003a46388b1dcbb44db7e"
+  integrity sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==
 
 read-cmd-shim@^1.0.1:
   version "1.0.5"
@@ -10143,14 +10241,15 @@ regexp.prototype.flags@^1.3.0:
     define-properties "^1.1.3"
     es-abstract "^1.17.0-next.1"
 
-regexp.prototype.flags@^1.5.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz#90ce989138db209f81492edd734183ce99f9677e"
-  integrity sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg==
+regexp.prototype.flags@^1.5.2:
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz#138f644a3350f981a858c44f6bb1a61ff59be334"
+  integrity sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==
   dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.2.0"
-    set-function-name "^2.0.0"
+    call-bind "^1.0.6"
+    define-properties "^1.2.1"
+    es-errors "^1.3.0"
+    set-function-name "^2.0.1"
 
 release-zalgo@^1.0.0:
   version "1.0.0"
@@ -10423,13 +10522,13 @@ rxjs@^6.4.0:
   dependencies:
     tslib "^1.9.0"
 
-safe-array-concat@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.0.1.tgz#91686a63ce3adbea14d61b14c99572a8ff84754c"
-  integrity sha512-6XbUAseYE2KtOuGueyeobCySj9L4+66Tn6KQMOPQJrAJEowYKW/YR/MGJZl7FdydUdaFu4LYyDZjxf4/Nmo23Q==
+safe-array-concat@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.1.2.tgz#81d77ee0c4e8b863635227c721278dd524c20edb"
+  integrity sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==
   dependencies:
-    call-bind "^1.0.2"
-    get-intrinsic "^1.2.1"
+    call-bind "^1.0.7"
+    get-intrinsic "^1.2.4"
     has-symbols "^1.0.3"
     isarray "^2.0.5"
 
@@ -10443,13 +10542,13 @@ safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
   integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
-safe-regex-test@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.0.0.tgz#793b874d524eb3640d1873aad03596db2d4f2295"
-  integrity sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==
+safe-regex-test@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.0.3.tgz#a5b4c0f06e0ab50ea2c395c14d8371232924c377"
+  integrity sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==
   dependencies:
-    call-bind "^1.0.2"
-    get-intrinsic "^1.1.3"
+    call-bind "^1.0.6"
+    es-errors "^1.3.0"
     is-regex "^1.1.4"
 
 safe-regex@^1.1.0:
@@ -10539,36 +10638,37 @@ semver@^7.3.5:
   dependencies:
     lru-cache "^6.0.0"
 
-semver@^7.5.4:
-  version "7.5.4"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
-  integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
-  dependencies:
-    lru-cache "^6.0.0"
+semver@^7.5.4, semver@^7.6.0:
+  version "7.6.3"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143"
+  integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==
 
 set-blocking@^2.0.0, set-blocking@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
   integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
 
-set-function-length@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.1.1.tgz#4bc39fafb0307224a33e106a7d35ca1218d659ed"
-  integrity sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ==
+set-function-length@^1.2.1:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.2.2.tgz#aac72314198eaed975cf77b2c3b6b880695e5449"
+  integrity sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==
   dependencies:
-    define-data-property "^1.1.1"
-    get-intrinsic "^1.2.1"
+    define-data-property "^1.1.4"
+    es-errors "^1.3.0"
+    function-bind "^1.1.2"
+    get-intrinsic "^1.2.4"
     gopd "^1.0.1"
-    has-property-descriptors "^1.0.0"
+    has-property-descriptors "^1.0.2"
 
-set-function-name@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/set-function-name/-/set-function-name-2.0.1.tgz#12ce38b7954310b9f61faa12701620a0c882793a"
-  integrity sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==
+set-function-name@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/set-function-name/-/set-function-name-2.0.2.tgz#16a705c5a0dc2f5e638ca96d8a8cd4e1c2b90985"
+  integrity sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==
   dependencies:
-    define-data-property "^1.0.1"
+    define-data-property "^1.1.4"
+    es-errors "^1.3.0"
     functions-have-names "^1.2.3"
-    has-property-descriptors "^1.0.0"
+    has-property-descriptors "^1.0.2"
 
 set-value@^2.0.0, set-value@^2.0.1:
   version "2.0.1"
@@ -10633,13 +10733,14 @@ side-channel@^1.0.2:
     object-inspect "^1.8.0"
 
 side-channel@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf"
-  integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.6.tgz#abd25fb7cd24baf45466406b1096b7831c9215f2"
+  integrity sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==
   dependencies:
-    call-bind "^1.0.0"
-    get-intrinsic "^1.0.2"
-    object-inspect "^1.9.0"
+    call-bind "^1.0.7"
+    es-errors "^1.3.0"
+    get-intrinsic "^1.2.4"
+    object-inspect "^1.13.1"
 
 signal-exit@^3.0.0, signal-exit@^3.0.2:
   version "3.0.3"
@@ -11056,14 +11157,15 @@ string.prototype.trim@^1.2.1:
     es-abstract "^1.17.0-next.1"
     function-bind "^1.1.1"
 
-string.prototype.trim@^1.2.8:
-  version "1.2.8"
-  resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz#f9ac6f8af4bd55ddfa8895e6aea92a96395393bd"
-  integrity sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ==
+string.prototype.trim@^1.2.9:
+  version "1.2.9"
+  resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.9.tgz#b6fa326d72d2c78b6df02f7759c73f8f6274faa4"
+  integrity sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw==
   dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.2.0"
-    es-abstract "^1.22.1"
+    call-bind "^1.0.7"
+    define-properties "^1.2.1"
+    es-abstract "^1.23.0"
+    es-object-atoms "^1.0.0"
 
 string.prototype.trimend@^1.0.1:
   version "1.0.1"
@@ -11073,14 +11175,14 @@ string.prototype.trimend@^1.0.1:
     define-properties "^1.1.3"
     es-abstract "^1.17.5"
 
-string.prototype.trimend@^1.0.7:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.7.tgz#1bb3afc5008661d73e2dc015cd4853732d6c471e"
-  integrity sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA==
+string.prototype.trimend@^1.0.8:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.8.tgz#3651b8513719e8a9f48de7f2f77640b26652b229"
+  integrity sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ==
   dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.2.0"
-    es-abstract "^1.22.1"
+    call-bind "^1.0.7"
+    define-properties "^1.2.1"
+    es-object-atoms "^1.0.0"
 
 string.prototype.trimstart@^1.0.1:
   version "1.0.1"
@@ -11090,14 +11192,14 @@ string.prototype.trimstart@^1.0.1:
     define-properties "^1.1.3"
     es-abstract "^1.17.5"
 
-string.prototype.trimstart@^1.0.7:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.7.tgz#d4cdb44b83a4737ffbac2d406e405d43d0184298"
-  integrity sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg==
+string.prototype.trimstart@^1.0.8:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz#7ee834dda8c7c17eff3118472bb35bfedaa34dde"
+  integrity sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==
   dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.2.0"
-    es-abstract "^1.22.1"
+    call-bind "^1.0.7"
+    define-properties "^1.2.1"
+    es-object-atoms "^1.0.0"
 
 string_decoder@^1.1.1:
   version "1.3.0"
@@ -11158,7 +11260,7 @@ strip-bom@^2.0.0:
 strip-bom@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
-  integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=
+  integrity sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==
 
 strip-bom@^4.0.0:
   version "4.0.0"
@@ -11237,20 +11339,13 @@ supports-color@^5.3.0:
   dependencies:
     has-flag "^3.0.0"
 
-supports-color@^7.0.0:
+supports-color@^7.0.0, supports-color@^7.1.0:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
   integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
   dependencies:
     has-flag "^4.0.0"
 
-supports-color@^7.1.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz#68e32591df73e25ad1c4b49108a2ec507962bfd1"
-  integrity sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==
-  dependencies:
-    has-flag "^4.0.0"
-
 supports-color@^8.0.0:
   version "8.1.1"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c"
@@ -11510,15 +11605,15 @@ trim-off-newlines@^1.0.0:
   resolved "https://registry.yarnpkg.com/trim-off-newlines/-/trim-off-newlines-1.0.1.tgz#9f9ba9d9efa8764c387698bcbfeb2c848f11adb3"
   integrity sha1-n5up2e+odkw4dpi8v+sshI8RrbM=
 
-ts-api-utils@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.0.3.tgz#f12c1c781d04427313dbac808f453f050e54a331"
-  integrity sha512-wNMeqtMz5NtwpT/UZGY5alT+VoKdSsOOP/kqHFcUW1P/VRhH2wJ48+DN2WwUliNbQ976ETwDL0Ifd2VVvgonvg==
+ts-api-utils@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.3.0.tgz#4b490e27129f1e8e686b45cc4ab63714dc60eea1"
+  integrity sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==
 
-tsconfig-paths@^3.14.2:
-  version "3.14.2"
-  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz#6e32f1f79412decd261f92d633a9dc1cfa99f088"
-  integrity sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g==
+tsconfig-paths@^3.15.0:
+  version "3.15.0"
+  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz#5299ec605e55b1abb23ec939ef15edaf483070d4"
+  integrity sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==
   dependencies:
     "@types/json5" "^0.0.29"
     json5 "^1.0.2"
@@ -11536,12 +11631,12 @@ tslib@^2.3.1:
   integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==
 
 tsx@^4.7.2:
-  version "4.7.2"
-  resolved "https://registry.yarnpkg.com/tsx/-/tsx-4.7.2.tgz#a108b1a6e16876cd4c9a4b4ba263f2a07f9cf562"
-  integrity sha512-BCNd4kz6fz12fyrgCTEdZHGJ9fWTGeUzXmQysh0RVocDY3h4frk05ZNCXSy4kIenF7y/QnrdiVpTsyNRn6vlAw==
+  version "4.17.0"
+  resolved "https://registry.yarnpkg.com/tsx/-/tsx-4.17.0.tgz#6ffd9851a0c7aa4ecacf4dc19f28d82112af25c5"
+  integrity sha512-eN4mnDA5UMKDt4YZixo9tBioibaMBpoxBkD+rIPAjVmYERSG0/dWEY1CEFuV89CgASlKL499q8AhmkMnnjtOJg==
   dependencies:
-    esbuild "~0.19.10"
-    get-tsconfig "^4.7.2"
+    esbuild "~0.23.0"
+    get-tsconfig "^4.7.5"
   optionalDependencies:
     fsevents "~2.3.3"
 
@@ -11623,44 +11718,49 @@ type-fest@^1.0.1, type-fest@^1.2.1, type-fest@^1.2.2:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-1.4.0.tgz#e9fb813fe3bf1744ec359d55d1affefa76f14be1"
   integrity sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==
 
-typed-array-buffer@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz#18de3e7ed7974b0a729d3feecb94338d1472cd60"
-  integrity sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==
+typed-array-buffer@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/typed-array-buffer/-/typed-array-buffer-1.0.2.tgz#1867c5d83b20fcb5ccf32649e5e2fc7424474ff3"
+  integrity sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==
   dependencies:
-    call-bind "^1.0.2"
-    get-intrinsic "^1.2.1"
-    is-typed-array "^1.1.10"
+    call-bind "^1.0.7"
+    es-errors "^1.3.0"
+    is-typed-array "^1.1.13"
 
-typed-array-byte-length@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz#d787a24a995711611fb2b87a4052799517b230d0"
-  integrity sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==
+typed-array-byte-length@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/typed-array-byte-length/-/typed-array-byte-length-1.0.1.tgz#d92972d3cff99a3fa2e765a28fcdc0f1d89dec67"
+  integrity sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==
   dependencies:
-    call-bind "^1.0.2"
+    call-bind "^1.0.7"
     for-each "^0.3.3"
-    has-proto "^1.0.1"
-    is-typed-array "^1.1.10"
+    gopd "^1.0.1"
+    has-proto "^1.0.3"
+    is-typed-array "^1.1.13"
 
-typed-array-byte-offset@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz#cbbe89b51fdef9cd6aaf07ad4707340abbc4ea0b"
-  integrity sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==
+typed-array-byte-offset@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/typed-array-byte-offset/-/typed-array-byte-offset-1.0.2.tgz#f9ec1acb9259f395093e4567eb3c28a580d02063"
+  integrity sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==
   dependencies:
-    available-typed-arrays "^1.0.5"
-    call-bind "^1.0.2"
+    available-typed-arrays "^1.0.7"
+    call-bind "^1.0.7"
     for-each "^0.3.3"
-    has-proto "^1.0.1"
-    is-typed-array "^1.1.10"
+    gopd "^1.0.1"
+    has-proto "^1.0.3"
+    is-typed-array "^1.1.13"
 
-typed-array-length@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/typed-array-length/-/typed-array-length-1.0.4.tgz#89d83785e5c4098bec72e08b319651f0eac9c1bb"
-  integrity sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==
+typed-array-length@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/typed-array-length/-/typed-array-length-1.0.6.tgz#57155207c76e64a3457482dfdc1c9d1d3c4c73a3"
+  integrity sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==
   dependencies:
-    call-bind "^1.0.2"
+    call-bind "^1.0.7"
     for-each "^0.3.3"
-    is-typed-array "^1.1.9"
+    gopd "^1.0.1"
+    has-proto "^1.0.3"
+    is-typed-array "^1.1.13"
+    possible-typed-array-names "^1.0.0"
 
 typedarray-to-buffer@^3.1.5:
   version "3.1.5"
@@ -11679,16 +11779,16 @@ typeforce@^1.18.0:
   resolved "https://registry.yarnpkg.com/typeforce/-/typeforce-1.18.0.tgz#d7416a2c5845e085034d70fcc5b6cc4a90edbfdc"
   integrity sha512-7uc1O8h1M1g0rArakJdf0uLRSSgFcYexrVoKo+bzJd32gd4gDy2L/Z+8/FjPnU9ydY3pEnVPtr9FyscYY60K1g==
 
-typescript@^4.1.5:
-  version "4.6.4"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.6.4.tgz#caa78bbc3a59e6a5c510d35703f6a09877ce45e9"
-  integrity sha512-9ia/jWHIEbo49HfjrLGfKbZSuWo9iTMwXO+Ca3pRsSpbsMbc7/IU8NKdCZVRRBafVPGnoJeFL76ZOAA84I9fEg==
-
 typescript@^4.9.5:
   version "4.9.5"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a"
   integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==
 
+typescript@^5.5.4:
+  version "5.5.4"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.5.4.tgz#d9852d6c82bad2d2eda4fd74a5762a8f5909e9ba"
+  integrity sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==
+
 uglify-js@^3.1.4:
   version "3.10.2"
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.10.2.tgz#8cfa1209fd04199cc8a7f9930ddedb30b0f1912d"
@@ -11714,6 +11814,16 @@ unbox-primitive@^1.0.2:
     has-symbols "^1.0.3"
     which-boxed-primitive "^1.0.2"
 
+undici-types@~5.26.4:
+  version "5.26.5"
+  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
+  integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
+
+undici-types@~6.13.0:
+  version "6.13.0"
+  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.13.0.tgz#e3e79220ab8c81ed1496b5812471afd7cf075ea5"
+  integrity sha512-xtFJHudx8S2DSoujjMd1WeWvn7KKWFRESZTMeL1RptAYERu29D6jphMjjY+vn96jvN3kVPDNxU/E13VTaXj6jg==
+
 union-value@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847"
@@ -11794,9 +11904,9 @@ update-browserslist-db@^1.0.10:
     picocolors "^1.0.0"
 
 uri-js@^4.2.2:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0"
-  integrity sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==
+  version "4.4.1"
+  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
+  integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==
   dependencies:
     punycode "^2.1.0"
 
@@ -11981,16 +12091,16 @@ which-module@^2.0.0:
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
   integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
 
-which-typed-array@^1.1.11, which-typed-array@^1.1.13:
-  version "1.1.13"
-  resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.13.tgz#870cd5be06ddb616f504e7b039c4c24898184d36"
-  integrity sha512-P5Nra0qjSncduVPEAr7xhoF5guty49ArDTwzJ/yNuPIbZppyRxFQsRCWrocxIY+CnMVG+qfbU2FmDKyvSGClow==
+which-typed-array@^1.1.14, which-typed-array@^1.1.15:
+  version "1.1.15"
+  resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.15.tgz#264859e9b11a649b388bfaaf4f767df1f779b38d"
+  integrity sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==
   dependencies:
-    available-typed-arrays "^1.0.5"
-    call-bind "^1.0.4"
+    available-typed-arrays "^1.0.7"
+    call-bind "^1.0.7"
     for-each "^0.3.3"
     gopd "^1.0.1"
-    has-tostringtag "^1.0.0"
+    has-tostringtag "^1.0.2"
 
 which-typed-array@^1.1.2:
   version "1.1.2"
@@ -12044,6 +12154,11 @@ windows-release@^3.1.0:
   dependencies:
     execa "^1.0.0"
 
+word-wrap@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34"
+  integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==
+
 word-wrap@~1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
@@ -12084,7 +12199,7 @@ wrap-ansi@^7.0.0:
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
+  integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
 
 write-file-atomic@^2.0.0, write-file-atomic@^2.3.0, write-file-atomic@^2.4.2:
   version "2.4.3"

From f9b108c1e314f693cf77ce362c0afa0ec9c64b85 Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Tue, 13 Aug 2024 10:55:37 +0200
Subject: [PATCH 137/171] Fix several failing tests

---
 packages/cashscript/test/debugging.test.ts        | 15 +++++++--------
 packages/cashscript/test/e2e/misc.test.ts         |  2 +-
 .../test/fixture/libauth-template/fixtures.ts     | 10 +++++-----
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/packages/cashscript/test/debugging.test.ts b/packages/cashscript/test/debugging.test.ts
index 5384fc8c..9f31bed7 100644
--- a/packages/cashscript/test/debugging.test.ts
+++ b/packages/cashscript/test/debugging.test.ts
@@ -508,7 +508,6 @@ describe('Debugging tests', () => {
       provider.addUtxo(contract.address, randomUtxo());
 
       const transaction = contract.functions.test_zero_handling(0n).to(contract.address, 1000n);
-      console.log(await transaction.bitauthUri());
       await expect(transaction).not.toFailRequireWith(/.*/);
     });
   });
@@ -528,7 +527,7 @@ describe('Debugging tests', () => {
       // Note: We're wrapping the expect call in another expect, since we expect the inner expect to throw
       await expect(
         expect(transaction).toLog('^This is definitely not the log$'),
-      ).rejects.toThrow(/Expected: .*This is definitely not the log.*\nReceived: .*Test.cash:4 Hello World/);
+      ).rejects.toThrow(/Expected: .*This is definitely not the log.*\nReceived: (.|\n)*?Test.cash:4 Hello World/);
     });
 
     it('should fail the JestExtensions test if a log is logged that is NOT expected', async () => {
@@ -540,11 +539,11 @@ describe('Debugging tests', () => {
       // Note: We're wrapping the expect call in another expect, since we expect the inner expect to throw
       await expect(
         expect(transaction).not.toLog('^Test.cash:4 Hello World$'),
-      ).rejects.toThrow(/Expected: not .*Test.cash:4 Hello World.*\nReceived: .*Test.cash:4 Hello World/);
+      ).rejects.toThrow(/Expected: not .*Test.cash:4 Hello World.*\nReceived: (.|\n)*?Test.cash:4 Hello World/);
 
       await expect(
         expect(transaction).not.toLog(),
-      ).rejects.toThrow(/Expected: not .*undefined.*\nReceived: .*Test.cash:4 Hello World/);
+      ).rejects.toThrow(/Expected: not .*undefined.*\nReceived: (.|\n)*?Test.cash:4 Hello World/);
     });
 
     it('should fail the JestExtensions test if a log is expected where no log is logged', async () => {
@@ -556,7 +555,7 @@ describe('Debugging tests', () => {
       // Note: We're wrapping the expect call in another expect, since we expect the inner expect to throw
       await expect(
         expect(transaction).toLog('Hello World'),
-      ).rejects.toThrow(/Expected: .*Hello World.*\nReceived: .*undefined/);
+      ).rejects.toThrow(/Expected: .*Hello World.*\nReceived: (.|\n)*?undefined/);
     });
 
     it('should fail the JestExtensions test if an incorrect require error message is expected', async () => {
@@ -568,7 +567,7 @@ describe('Debugging tests', () => {
       // Note: We're wrapping the expect call in another expect, since we expect the inner expect to throw
       await expect(
         expect(transaction).toFailRequireWith('1 should equal 3'),
-      ).rejects.toThrow(/Expected pattern: .*1 should equal 3.*\nReceived string: .*1 should equal 2.*/);
+      ).rejects.toThrow(/Expected pattern: .*1 should equal 3.*\nReceived string: (.|\n)*?1 should equal 2/);
     });
 
     // TODO: Fix this
@@ -593,11 +592,11 @@ describe('Debugging tests', () => {
       // Note: We're wrapping the expect call in another expect, since we expect the inner expect to throw
       await expect(
         expect(transaction).not.toFailRequireWith('1 should equal 2'),
-      ).rejects.toThrow(/Expected pattern: not .*1 should equal 2.*\nReceived string: .*1 should equal 2.*/);
+      ).rejects.toThrow(/Expected pattern: not .*1 should equal 2.*\nReceived string: (.|\n)*?1 should equal 2/);
 
       await expect(
         expect(transaction).not.toFailRequireWith(/.*/),
-      ).rejects.toThrow(/Expected pattern: not .*\nReceived string: .*1 should equal 2.*/);
+      ).rejects.toThrow(/Expected pattern: not .*\nReceived string: (.|\n)*?1 should equal 2/);
     });
   });
 });
diff --git a/packages/cashscript/test/e2e/misc.test.ts b/packages/cashscript/test/e2e/misc.test.ts
index b976e3ed..97b4c115 100644
--- a/packages/cashscript/test/e2e/misc.test.ts
+++ b/packages/cashscript/test/e2e/misc.test.ts
@@ -47,7 +47,7 @@ describe('Simple Covenant', () => {
       const utxo1Info: any = await provider.performRequest('blockchain.utxo.get_info', utxos[1].txid, utxos[1].vout);
       const currentBlockHeight = await provider.getBlockHeight();
 
-      const age = Math.max(utxo0Info.confirmed_height, utxo1Info.confirmed_height) - currentBlockHeight;
+      const age = (Math.max(utxo0Info.confirmed_height, utxo1Info.confirmed_height) - currentBlockHeight) || 0;
 
       // when
       const tx = await covenant.functions.spend()
diff --git a/packages/cashscript/test/fixture/libauth-template/fixtures.ts b/packages/cashscript/test/fixture/libauth-template/fixtures.ts
index 40710515..8204dd52 100644
--- a/packages/cashscript/test/fixture/libauth-template/fixtures.ts
+++ b/packages/cashscript/test/fixture/libauth-template/fixtures.ts
@@ -128,7 +128,7 @@ export const fixtures: Fixture[] = [
             'evaluate_function',
           ],
           'name': 'unlock',
-          'script': '// "transfer" function parameters\n<recipient_sig.schnorr_signature.all_outputs> // sig\n\n// function index in contract\n<function_index> // int = <0>\n',
+          'script': '// "transfer" function parameters\n<recipient_sig.schnorr_signature.all_outputs_all_utxos> // sig\n\n// function index in contract\n<function_index> // int = <0>\n',
           'unlocks': 'lock',
         },
         'lock': {
@@ -252,7 +252,7 @@ export const fixtures: Fixture[] = [
             'evaluate_function',
           ],
           'name': 'unlock',
-          'script': '// "timeout\" function parameters\n<sender_sig.schnorr_signature.all_outputs> // sig\n\n// function index in contract\n<function_index> // int = <1>\n',
+          'script': '// "timeout\" function parameters\n<sender_sig.schnorr_signature.all_outputs_all_utxos> // sig\n\n// function index in contract\n<function_index> // int = <1>\n',
           'unlocks': 'lock',
         },
         'lock': {
@@ -515,7 +515,7 @@ export const fixtures: Fixture[] = [
             'evaluate_function',
           ],
           'name': 'unlock',
-          'script': '// "spend" function parameters\n<s.schnorr_signature.all_outputs> // sig\n<pk> // pubkey = <0x0373cc07b54c22da627b572a387a20ea190c9382e5e6d48c1d5b89c5cea2c4c088>\n',
+          'script': '// "spend" function parameters\n<s.schnorr_signature.all_outputs_all_utxos> // sig\n<pk> // pubkey = <0x0373cc07b54c22da627b572a387a20ea190c9382e5e6d48c1d5b89c5cea2c4c088>\n',
           'unlocks': 'lock',
         },
         'lock': {
@@ -786,7 +786,7 @@ export const fixtures: Fixture[] = [
             'evaluate_function',
           ],
           'name': 'unlock',
-          'script': '// "spend" function parameters\n<s.schnorr_signature.all_outputs> // sig\n<pk> // pubkey = <0x0373cc07b54c22da627b572a387a20ea190c9382e5e6d48c1d5b89c5cea2c4c088>\n',
+          'script': '// "spend" function parameters\n<s.schnorr_signature.all_outputs_all_utxos> // sig\n<pk> // pubkey = <0x0373cc07b54c22da627b572a387a20ea190c9382e5e6d48c1d5b89c5cea2c4c088>\n',
           'unlocks': 'lock',
         },
         'lock': {
@@ -932,7 +932,7 @@ export const fixtures: Fixture[] = [
             'evaluate_function',
           ],
           'name': 'unlock',
-          'script': '// "spend" function parameters\n<oracle_message> // bytes8 = <0xa086010030750000>\n<oracle_sig> // datasig = <0x569e137142ebdb96127b727787d605e427a858e8b17dc0605092d0019e5fc9d58810ee74c8ba9f9a5605268c9913e50f780f4c3780e06aea7f50766829895b4b>\n<owner_sig.schnorr_signature.all_outputs> // sig\n',
+          'script': '// "spend" function parameters\n<oracle_message> // bytes8 = <0xa086010030750000>\n<oracle_sig> // datasig = <0x569e137142ebdb96127b727787d605e427a858e8b17dc0605092d0019e5fc9d58810ee74c8ba9f9a5605268c9913e50f780f4c3780e06aea7f50766829895b4b>\n<owner_sig.schnorr_signature.all_outputs_all_utxos> // sig\n',
           'unlocks': 'lock',
         },
         'lock': {

From 95ebd52aafdab181cfec65a98e550450e552bd17 Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Tue, 13 Aug 2024 10:59:13 +0200
Subject: [PATCH 138/171] Add eslint rule for throwing Error objects and fix
 two incorrect cases

---
 .eslintrc.cjs                          | 1 +
 packages/cashscript/src/Transaction.ts | 2 +-
 packages/cashscript/src/utils.ts       | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.eslintrc.cjs b/.eslintrc.cjs
index d05a80a6..9e77dd1f 100644
--- a/.eslintrc.cjs
+++ b/.eslintrc.cjs
@@ -47,5 +47,6 @@ module.exports = {
     '@typescript-eslint/no-redeclare': 0, // I sometimes name variables an types the same
     'linebreak-style': 0, // Ignore linebreak lints https://stackoverflow.com/a/43008668/1129108
     'import/extensions': ['error', 'ignorePackages'], // ESM requires file extensions
+    '@typescript-eslint/only-throw-error': 'error', // We should only throw Error objects
   },
 }
diff --git a/packages/cashscript/src/Transaction.ts b/packages/cashscript/src/Transaction.ts
index 2573e0cd..82324ad0 100644
--- a/packages/cashscript/src/Transaction.ts
+++ b/packages/cashscript/src/Transaction.ts
@@ -246,7 +246,7 @@ export class Transaction {
 
   private async setInputsAndOutputs(): Promise<void> {
     if (this.outputs.length === 0) {
-      throw Error('Attempted to build a transaction without outputs');
+      throw new Error('Attempted to build a transaction without outputs');
     }
 
     // Fetched utxos are only used when no inputs are available, so only fetch in that case.
diff --git a/packages/cashscript/src/utils.ts b/packages/cashscript/src/utils.ts
index fe037033..acc36cea 100644
--- a/packages/cashscript/src/utils.ts
+++ b/packages/cashscript/src/utils.ts
@@ -297,7 +297,7 @@ function getPushDataOpcode(data: Uint8Array): Uint8Array {
   if (byteLength === 0) return Uint8Array.from([0x4c, 0x00]);
   if (byteLength < 76) return Uint8Array.from([byteLength]);
   if (byteLength < 256) return Uint8Array.from([0x4c, byteLength]);
-  throw Error('Pushdata too large');
+  throw new Error('Pushdata too large');
 }
 
 const randomInt = (): bigint => BigInt(Math.floor(Math.random() * 10000));

From a57af592194fba88125b2a4307248a6fb81ee140 Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Tue, 13 Aug 2024 11:24:06 +0200
Subject: [PATCH 139/171] Simplify some failed transaction error handling

---
 packages/cashscript/src/Errors.ts      | 12 +++++++++---
 packages/cashscript/src/Transaction.ts | 18 +++++-------------
 packages/cashscript/src/debugging.ts   | 15 ++++++++-------
 3 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/packages/cashscript/src/Errors.ts b/packages/cashscript/src/Errors.ts
index d7034768..38103e84 100644
--- a/packages/cashscript/src/Errors.ts
+++ b/packages/cashscript/src/Errors.ts
@@ -18,21 +18,27 @@ export class TokensToNonTokenAddressError extends Error {
   }
 }
 
+export class NoDebugInformationInArtifactError extends Error {
+  constructor() {
+    super('No debug information found in artifact, please recompile with cashc version 0.10.0 or newer.');
+  }
+}
+
 export class FailedTransactionError extends Error {
+  // TODO: Make bitauthUri required once the advanced transaction builder supports debugging
   constructor(public reason: string, public bitauthUri?: string) {
-    super(`${reason}\n\nBitauth URI: ${bitauthUri}`);
+    super(`${reason}${bitauthUri ? `\n\nBitauth URI: ${bitauthUri}` : ''}`);
   }
 }
 
 // TODO: Add tests for some non-require evaluation errors (e.g. invalid op_split range)
 
 export class FailedRequireError extends Error {
-  public bitauthUri?: string;
-
   constructor(
     public contractName: string,
     public requireStatement: RequireStatement,
     public inputIndex: number,
+    public bitauthUri: string,
     public libauthErrorMessage?: string,
   ) {
     const baseMessage = `${contractName}.cash:${requireStatement.line} Require statement failed at line ${requireStatement.line}`;
diff --git a/packages/cashscript/src/Transaction.ts b/packages/cashscript/src/Transaction.ts
index 82324ad0..dbaa8a99 100644
--- a/packages/cashscript/src/Transaction.ts
+++ b/packages/cashscript/src/Transaction.ts
@@ -42,7 +42,7 @@ import MockNetworkProvider from './network/MockNetworkProvider.js';
 import { buildTemplate, getBitauthUri } from './LibauthTemplate.js';
 import { debugTemplate, evaluateTemplate, DebugResult } from './debugging.js';
 import { EncodedArgument } from './Argument.js';
-import { FailedRequireError, FailedTransactionError } from './Errors.js';
+import { FailedTransactionError } from './Errors.js';
 
 export class Transaction {
   public inputs: Utxo[] = [];
@@ -176,17 +176,9 @@ export class Transaction {
     let template: WalletTemplate | undefined;
 
     // Debug the transaction locally before sending so any errors are caught early
-    try {
-      // Libauth debugging does not work with old-style covenents (or outdated artifacts)
-      if (!this.abiFunction.covenant && this.contract.artifact.debug) {
-        await this.debug();
-      }
-    } catch (error) {
-      if (error instanceof FailedRequireError) {
-        error.bitauthUri = await this.bitauthUri();
-        error.message += `\n\nBitauth URI: ${error.bitauthUri}`;
-      }
-      throw error;
+    // Libauth debugging does not work with outdated artifacts)
+    if (this.contract.artifact.debug) {
+      await this.debug();
     }
 
     try {
@@ -203,7 +195,7 @@ export class Transaction {
       return raw ? await this.getTxDetails(txid, raw) : await this.getTxDetails(txid);
     } catch (error: any) {
       const reason = error.error ?? error.message ?? error;
-      throw new FailedTransactionError(reason, await this.bitauthUri());
+      throw new FailedTransactionError(reason, await this.bitauthUri()); // TODO
     }
   }
 
diff --git a/packages/cashscript/src/debugging.ts b/packages/cashscript/src/debugging.ts
index 60b46958..d6f5ad41 100644
--- a/packages/cashscript/src/debugging.ts
+++ b/packages/cashscript/src/debugging.ts
@@ -2,6 +2,7 @@ import { AuthenticationErrorCommon, AuthenticationInstruction, AuthenticationPro
 import { Artifact, LogEntry, Op, PrimitiveType, StackItem, bytecodeToAsm, decodeBool, decodeInt, decodeString } from '@cashscript/utils';
 import { findLastIndex, toRegExp } from './utils.js';
 import { FailedRequireError, FailedTransactionError } from './Errors.js';
+import { getBitauthUri } from './LibauthTemplate.js';
 
 // evaluates the fully defined template, throws upon error
 export const evaluateTemplate = (template: WalletTemplate): boolean => {
@@ -9,7 +10,7 @@ export const evaluateTemplate = (template: WalletTemplate): boolean => {
 
   const verifyResult = vm.verify(program);
   if (typeof verifyResult === 'string') {
-    throw new FailedTransactionError(verifyResult);
+    throw new FailedTransactionError(verifyResult, getBitauthUri(template));
   }
 
   return verifyResult;
@@ -60,10 +61,10 @@ export const debugTemplate = (template: WalletTemplate, artifact: Artifact): Deb
     // TODO: Also log the require statement that failed (e.g. "require(1 == 2, '1 is not equal to 2')")
     if (requireStatement) {
       const { program: { inputIndex }, error } = lastExecutedDebugStep;
-      throw new FailedRequireError(artifact.contractName, requireStatement, inputIndex, error);
+      throw new FailedRequireError(artifact.contractName, requireStatement, inputIndex, error, getBitauthUri(template));
     }
 
-    throw new FailedTransactionError(`Error in evaluating input index ${lastExecutedDebugStep.program.inputIndex}.\n${lastExecutedDebugStep.error}`);
+    throw new FailedTransactionError(`Error in evaluating input index ${lastExecutedDebugStep.program.inputIndex}.\n${lastExecutedDebugStep.error}`, getBitauthUri(template));
   }
 
   const evaluationResult = vm.verify(program);
@@ -80,10 +81,10 @@ export const debugTemplate = (template: WalletTemplate, artifact: Artifact): Deb
 
     if (requireStatement) {
       const { program: { inputIndex }, error } = lastExecutedDebugStep;
-      throw new FailedRequireError(artifact.contractName, requireStatement, inputIndex, error);
+      throw new FailedRequireError(artifact.contractName, requireStatement, inputIndex, getBitauthUri(template), error);
     }
 
-    throw new FailedTransactionError(`Error in evaluating input index ${lastExecutedDebugStep.program.inputIndex}.\n${evaluationResult}`);
+    throw new FailedTransactionError(`Error in evaluating input index ${lastExecutedDebugStep.program.inputIndex}.\n${evaluationResult}`, getBitauthUri(template));
   }
 
   return fullDebugSteps;
@@ -111,11 +112,11 @@ const createProgram = (template: WalletTemplate): CreateProgramResult => {
   });
 
   if (typeof scenarioGeneration === 'string') {
-    throw new FailedTransactionError(scenarioGeneration);
+    throw new FailedTransactionError(scenarioGeneration, getBitauthUri(template));
   }
 
   if (typeof scenarioGeneration.scenario === 'string') {
-    throw new FailedTransactionError(scenarioGeneration.scenario);
+    throw new FailedTransactionError(scenarioGeneration.scenario, getBitauthUri(template));
   }
 
   return { vm, program: scenarioGeneration.scenario.program };

From 3c3045a0d306cdfa2c0c01bfe2bdd8563753a431 Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Tue, 13 Aug 2024 11:46:07 +0200
Subject: [PATCH 140/171] Add warning when debugging without proper debug
 information & remove MockNetworkProvider evaluation step (already covered in
 debug step)

---
 packages/cashscript/src/Transaction.ts | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/packages/cashscript/src/Transaction.ts b/packages/cashscript/src/Transaction.ts
index dbaa8a99..9df57c86 100644
--- a/packages/cashscript/src/Transaction.ts
+++ b/packages/cashscript/src/Transaction.ts
@@ -38,9 +38,8 @@ import SignatureTemplate from './SignatureTemplate.js';
 import { P2PKH_INPUT_SIZE } from './constants.js';
 import { TransactionBuilder } from './TransactionBuilder.js';
 import { Contract } from './Contract.js';
-import MockNetworkProvider from './network/MockNetworkProvider.js';
 import { buildTemplate, getBitauthUri } from './LibauthTemplate.js';
-import { debugTemplate, evaluateTemplate, DebugResult } from './debugging.js';
+import { debugTemplate, DebugResult } from './debugging.js';
 import { EncodedArgument } from './Argument.js';
 import { FailedTransactionError } from './Errors.js';
 
@@ -173,34 +172,28 @@ export class Transaction {
 
   async send(raw?: true): Promise<TransactionDetails | string> {
     const tx = await this.build();
-    let template: WalletTemplate | undefined;
 
     // Debug the transaction locally before sending so any errors are caught early
-    // Libauth debugging does not work with outdated artifacts)
-    if (this.contract.artifact.debug) {
+    // Libauth debugging does not work with old-style covenants
+    if (!this.abiFunction.covenant) {
       await this.debug();
     }
 
     try {
-      // TODO: Can we move this to MockNetworkProvider?
-      if (this.contract.provider instanceof MockNetworkProvider) {
-        template = await buildTemplate({
-          transaction: this,
-          transactionHex: tx,
-        });
-        evaluateTemplate(template);
-      }
-
       const txid = await this.contract.provider.sendRawTransaction(tx);
       return raw ? await this.getTxDetails(txid, raw) : await this.getTxDetails(txid);
     } catch (error: any) {
       const reason = error.error ?? error.message ?? error;
-      throw new FailedTransactionError(reason, await this.bitauthUri()); // TODO
+      throw new FailedTransactionError(reason, await this.bitauthUri());
     }
   }
 
   // method to debug the transaction with libauth VM, throws upon evaluation error
   async debug(): Promise<DebugResult> {
+    if (!this.contract.artifact.debug) {
+      console.warn('No debug information found in artifact. Recompile with cashc version 0.10.0 or newer to get better debugging information.');
+    }
+
     const template = await this.getLibauthTemplate();
     return debugTemplate(template, this.contract.artifact);
   }

From 250e329e25e4b6ab8f68bf098c14dda3625c5518 Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Tue, 13 Aug 2024 12:03:25 +0200
Subject: [PATCH 141/171] Move and resolve some outstanding TODOs

---
 packages/cashscript/src/Argument.ts        | 10 ----------
 packages/cashscript/src/Errors.ts          |  2 --
 packages/cashscript/src/LibauthTemplate.ts | 14 ++++----------
 packages/cashscript/src/debugging.ts       |  1 -
 4 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/packages/cashscript/src/Argument.ts b/packages/cashscript/src/Argument.ts
index 43bb57d2..7a772dd1 100644
--- a/packages/cashscript/src/Argument.ts
+++ b/packages/cashscript/src/Argument.ts
@@ -102,13 +102,3 @@ export const encodeFunctionArguments = (
 
   return encodedArgs;
 };
-
-// Note: BitAuth IDE requires 0 to be encoded as a single byte (rather than the default empty byte array)
-// TODO: Double check this with Pat
-export function encodeArgumentForLibauthTemplate(
-  argument: Argument,
-  typeStr: string,
-): Uint8Array | SignatureTemplate {
-  if (typeStr === PrimitiveType.INT && argument === 0n) return Uint8Array.from([0]);
-  return encodeArgument(argument, typeStr);
-}
diff --git a/packages/cashscript/src/Errors.ts b/packages/cashscript/src/Errors.ts
index 38103e84..45fa93b1 100644
--- a/packages/cashscript/src/Errors.ts
+++ b/packages/cashscript/src/Errors.ts
@@ -31,8 +31,6 @@ export class FailedTransactionError extends Error {
   }
 }
 
-// TODO: Add tests for some non-require evaluation errors (e.g. invalid op_split range)
-
 export class FailedRequireError extends Error {
   constructor(
     public contractName: string,
diff --git a/packages/cashscript/src/LibauthTemplate.ts b/packages/cashscript/src/LibauthTemplate.ts
index f74289e8..1b90d4f7 100644
--- a/packages/cashscript/src/LibauthTemplate.ts
+++ b/packages/cashscript/src/LibauthTemplate.ts
@@ -46,7 +46,6 @@ interface BuildTemplateOptions {
   transactionHex?: string;
 }
 
-// TODO: Can we change this so we don't need to pass in both the transaction and the transactionHex?
 export const buildTemplate = async ({
   transaction,
   transactionHex = undefined, // set this argument to prevent unnecessary call `transaction.build()`
@@ -277,15 +276,11 @@ const generateTemplateScenarioTransaction = (
   const slotIndex = csTransaction.inputs.findIndex((input) => !isUtxoP2PKH(input));
 
   const inputs = libauthTransaction.inputs.map((input, index) => {
-    const csInput = csTransaction.inputs[index] as Utxo; // TODO: Change
+    const csInput = csTransaction.inputs[index] as Utxo; // TODO: Improve code quality here (see zip in other places)
 
     return {
       outpointIndex: input.outpointIndex,
-      outpointTransactionHash:
-      // TODO: This should always be Uint8Array according to the libauth transaction types
-        input.outpointTransactionHash instanceof Uint8Array
-          ? binToHex(input.outpointTransactionHash)
-          : input.outpointTransactionHash,
+      outpointTransactionHash: binToHex(input.outpointTransactionHash),
       sequenceNumber: input.sequenceNumber,
       unlockingBytecode: generateTemplateScenarioBytecode(csInput, 'p2pkh_placeholder_unlock', index === slotIndex),
     } as WalletTemplateScenarioInput;
@@ -294,7 +289,7 @@ const generateTemplateScenarioTransaction = (
   const locktime = libauthTransaction.locktime;
 
   const outputs = libauthTransaction.outputs.map((output, index) => {
-    const csOutput = csTransaction.outputs[index]; // TODO: Change
+    const csOutput = csTransaction.outputs[index]; // TODO: Improve code quality here (see zip in other places)
 
     return {
       lockingBytecode: generateTemplateScenarioTransactionOutputLockingBytecode(csOutput, contract),
@@ -362,8 +357,7 @@ const generateTemplateScenarioParametersValues = (
     .filter(([, arg]) => !(arg instanceof SignatureTemplate))
     .map(([input, arg]) => {
       const encodedArgumentHex = binToHex(arg as Uint8Array);
-      // TODO: Is this really necessary?
-      const prefixedEncodedArgument = encodedArgumentHex.length ? `0x${encodedArgumentHex}` : encodedArgumentHex;
+      const prefixedEncodedArgument = encodedArgumentHex.length > 0 ? `0x${encodedArgumentHex}` : '';
       return [snakeCase(input.name), prefixedEncodedArgument] as const;
     });
 
diff --git a/packages/cashscript/src/debugging.ts b/packages/cashscript/src/debugging.ts
index d6f5ad41..0b097065 100644
--- a/packages/cashscript/src/debugging.ts
+++ b/packages/cashscript/src/debugging.ts
@@ -58,7 +58,6 @@ export const debugTemplate = (template: WalletTemplate, artifact: Artifact): Deb
     const requireStatement = (artifact.debug?.requires ?? [])
       .find((statement) => statement.ip === requireStatementIp);
 
-    // TODO: Also log the require statement that failed (e.g. "require(1 == 2, '1 is not equal to 2')")
     if (requireStatement) {
       const { program: { inputIndex }, error } = lastExecutedDebugStep;
       throw new FailedRequireError(artifact.contractName, requireStatement, inputIndex, error, getBitauthUri(template));

From 0791f7069b94f04c90c6dce6b3e0ebb860d6e72c Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Tue, 20 Aug 2024 10:43:01 +0200
Subject: [PATCH 142/171] Make templates support multiple P2PKH inputs with
 custom signing parameters

---
 packages/cashscript/src/LibauthTemplate.ts    | 68 +++++++++-------
 .../test/fixture/libauth-template/fixtures.ts | 77 +++++++++++++++----
 2 files changed, 99 insertions(+), 46 deletions(-)

diff --git a/packages/cashscript/src/LibauthTemplate.ts b/packages/cashscript/src/LibauthTemplate.ts
index 1b90d4f7..c535a894 100644
--- a/packages/cashscript/src/LibauthTemplate.ts
+++ b/packages/cashscript/src/LibauthTemplate.ts
@@ -78,34 +78,44 @@ export const buildTemplate = async ({
     ),
   } as WalletTemplate;
 
-  // add extra variables for the p2pkh utxos spent together with our contract
-  const hasSignatureTemplates = transaction.inputs.filter((input) => isUtxoP2PKH(input)).length > 0;
-  if (hasSignatureTemplates) {
-    template.entities.parameters.scripts!.push('p2pkh_placeholder_lock', 'p2pkh_placeholder_unlock');
-    template.entities.parameters.variables = {
-      ...template.entities.parameters.variables,
-      placeholder_key: {
-        description: 'placeholder_key',
-        name: 'placeholder_key',
-        type: 'Key',
-      },
-    };
 
-    // add extra unlocking and locking script for P2PKH inputs spent alongside our contract
-    // this is needed for correct cross-referrences in the template
-    template.scripts.p2pkh_placeholder_unlock = {
-      name: 'p2pkh_placeholder_unlock',
-      script:
-          '<placeholder_key.schnorr_signature.all_outputs>\n<placeholder_key.public_key>',
-      unlocks: 'p2pkh_placeholder_lock',
-    };
-    template.scripts.p2pkh_placeholder_lock = {
-      lockingType: 'standard',
-      name: 'p2pkh_placeholder_lock',
-      script:
-          'OP_DUP\nOP_HASH160 <$(<placeholder_key.public_key> OP_HASH160\n)> OP_EQUALVERIFY\nOP_CHECKSIG',
-    };
-  }
+  transaction.inputs
+    .forEach((input, index) => {
+      if (!isUtxoP2PKH(input)) return;
+
+      const lockScriptName = `p2pkh_placeholder_lock_${index}`;
+      const unlockScriptName = `p2pkh_placeholder_unlock_${index}`;
+      const placeholderKeyName = `placeholder_key_${index}`;
+
+      const signatureAlgorithmName = getSignatureAlgorithmName(input.template.getSignatureAlgorithm());
+      const hashtypeName = getHashTypeName(input.template.getHashType(false));
+      const signatureString = `${placeholderKeyName}.${signatureAlgorithmName}.${hashtypeName}`;
+
+      template.entities.parameters.scripts!.push(lockScriptName, unlockScriptName);
+      template.entities.parameters.variables = {
+        ...template.entities.parameters.variables,
+        [placeholderKeyName]: {
+          description: placeholderKeyName,
+          name: placeholderKeyName,
+          type: 'Key',
+        },
+      };
+
+      // add extra unlocking and locking script for P2PKH inputs spent alongside our contract
+      // this is needed for correct cross-referrences in the template
+      template.scripts[unlockScriptName] = {
+        name: unlockScriptName,
+        script:
+            `<${signatureString}>\n<${placeholderKeyName}.public_key>`,
+        unlocks: lockScriptName,
+      };
+      template.scripts[lockScriptName] = {
+        lockingType: 'standard',
+        name: lockScriptName,
+        script:
+            `OP_DUP\nOP_HASH160 <$(<${placeholderKeyName}.public_key> OP_HASH160\n)> OP_EQUALVERIFY\nOP_CHECKSIG`,
+      };
+    });
 
   return template;
 };
@@ -282,7 +292,7 @@ const generateTemplateScenarioTransaction = (
       outpointIndex: input.outpointIndex,
       outpointTransactionHash: binToHex(input.outpointTransactionHash),
       sequenceNumber: input.sequenceNumber,
-      unlockingBytecode: generateTemplateScenarioBytecode(csInput, 'p2pkh_placeholder_unlock', index === slotIndex),
+      unlockingBytecode: generateTemplateScenarioBytecode(csInput, `p2pkh_placeholder_unlock_${index}`, index === slotIndex),
     } as WalletTemplateScenarioInput;
   });
 
@@ -319,7 +329,7 @@ const generateTemplateScenarioSourceOutputs = (
 
   return csTransaction.inputs.map((input, index) => {
     return {
-      lockingBytecode: generateTemplateScenarioBytecode(input, 'p2pkh_placeholder_lock', index === slotIndex),
+      lockingBytecode: generateTemplateScenarioBytecode(input, `p2pkh_placeholder_lock_${index}`, index === slotIndex),
       valueSatoshis: Number(input.satoshis),
       token: serialiseTokenDetails(input.token),
     };
diff --git a/packages/cashscript/test/fixture/libauth-template/fixtures.ts b/packages/cashscript/test/fixture/libauth-template/fixtures.ts
index 8204dd52..34ae49de 100644
--- a/packages/cashscript/test/fixture/libauth-template/fixtures.ts
+++ b/packages/cashscript/test/fixture/libauth-template/fixtures.ts
@@ -981,10 +981,8 @@ export const fixtures: Fixture[] = [
       const tx = contract.functions
         .spend(alicePub, new SignatureTemplate(alicePriv, HashType.SIGHASH_NONE, SignatureAlgorithm.ECDSA))
         .fromP2PKH(p2pkhUtxo, new SignatureTemplate(alicePriv))
-        // TODO: Also allow fromP2PKH with different signing algorithms / hashtypes
-        // + support multiple fromP2PKH inputs with different keys
-        // .fromP2PKH(p2pkhUtxo, new SignatureTemplate(bobPriv, HashType.SIGHASH_ALL, SignatureAlgorithm.ECDSA))
         .from(regularUtxo)
+        .fromP2PKH(p2pkhUtxo, new SignatureTemplate(bobPriv, HashType.SIGHASH_ALL, SignatureAlgorithm.ECDSA))
         .to(to, amount);
 
       return tx;
@@ -1004,8 +1002,10 @@ export const fixtures: Fixture[] = [
           'scripts': [
             'lock',
             'unlock_lock',
-            'p2pkh_placeholder_lock',
-            'p2pkh_placeholder_unlock',
+            'p2pkh_placeholder_lock_0',
+            'p2pkh_placeholder_unlock_0',
+            'p2pkh_placeholder_lock_2',
+            'p2pkh_placeholder_unlock_2',
           ],
           'variables': {
             's': {
@@ -1023,9 +1023,14 @@ export const fixtures: Fixture[] = [
               'name': 'pkh',
               'type': 'WalletData',
             },
-            'placeholder_key': {
-              'description': 'placeholder_key',
-              'name': 'placeholder_key',
+            'placeholder_key_0': {
+              'description': 'placeholder_key_0',
+              'name': 'placeholder_key_0',
+              'type': 'Key',
+            },
+            'placeholder_key_2': {
+              'description': 'placeholder_key_2',
+              'name': 'placeholder_key_2',
               'type': 'Key',
             },
           },
@@ -1055,7 +1060,7 @@ export const fixtures: Fixture[] = [
                 'outpointTransactionHash': expect.stringMatching(/^[0-9a-f]{64}$/),
                 'sequenceNumber': 4294967294,
                 'unlockingBytecode': {
-                  'script': 'p2pkh_placeholder_unlock',
+                  'script': 'p2pkh_placeholder_unlock_0',
                   'overrides': {
                     'keys': {
                       'privateKeys': {
@@ -1073,6 +1078,21 @@ export const fixtures: Fixture[] = [
                   'slot',
                 ],
               },
+              {
+                'outpointIndex': expect.any(Number),
+                'outpointTransactionHash': expect.stringMatching(/^[0-9a-f]{64}$/),
+                'sequenceNumber': 4294967294,
+                'unlockingBytecode': {
+                  'script': 'p2pkh_placeholder_unlock_2',
+                  'overrides': {
+                    'keys': {
+                      'privateKeys': {
+                        'placeholder_key': '71080d8b52ec7b12adaec909ed54cd989b682ce2c35647eec219a16f5f90c528',
+                      },
+                    },
+                  },
+                },
+              },
             ],
             'locktime': 133700,
             'outputs': [
@@ -1090,7 +1110,7 @@ export const fixtures: Fixture[] = [
           'sourceOutputs': [
             {
               'lockingBytecode': {
-                'script': 'p2pkh_placeholder_lock',
+                'script': 'p2pkh_placeholder_lock_0',
                 'overrides': {
                   'keys': {
                     'privateKeys': {
@@ -1107,6 +1127,19 @@ export const fixtures: Fixture[] = [
               ],
               'valueSatoshis': expect.any(Number),
             },
+            {
+              'lockingBytecode': {
+                'script': 'p2pkh_placeholder_lock_2',
+                'overrides': {
+                  'keys': {
+                    'privateKeys': {
+                      'placeholder_key': '71080d8b52ec7b12adaec909ed54cd989b682ce2c35647eec219a16f5f90c528',
+                    },
+                  },
+                },
+              },
+              'valueSatoshis': expect.any(Number),
+            },
           ],
         },
       },
@@ -1124,15 +1157,25 @@ export const fixtures: Fixture[] = [
           'name': 'lock',
           'script': '// "P2PKH" contract constructor parameters\n<pkh> // bytes20 = <0x512dbb2c8c02efbac8d92431aa0ac33f6b0bf970>\n\n// bytecode\n                                                        /* contract P2PKH(bytes20 pkh) {                                */\n                                                        /*     // Require pk to match stored pkh and signature to match */\n                                                        /*     function spend(pubkey pk, sig s) {                       */\nOP_1 OP_PICK OP_HASH160 OP_1 OP_ROLL OP_EQUAL OP_VERIFY /*         require(hash160(pk) == pkh);                         */\nOP_1 OP_ROLL OP_1 OP_ROLL OP_CHECKSIG                   /*         require(checkSig(s, pk));                            */\n                                                        /*     }                                                        */\n                                                        /* }                                                            */\n                                                        /*                                                              */',
         },
-        'p2pkh_placeholder_unlock': {
-          'name': 'p2pkh_placeholder_unlock',
-          'script': '<placeholder_key.schnorr_signature.all_outputs>\n<placeholder_key.public_key>',
-          'unlocks': 'p2pkh_placeholder_lock',
+        'p2pkh_placeholder_unlock_0': {
+          'name': 'p2pkh_placeholder_unlock_0',
+          'script': '<placeholder_key_0.schnorr_signature.all_outputs_all_utxos>\n<placeholder_key_0.public_key>',
+          'unlocks': 'p2pkh_placeholder_lock_0',
+        },
+        'p2pkh_placeholder_lock_0': {
+          'lockingType': 'standard',
+          'name': 'p2pkh_placeholder_lock_0',
+          'script': 'OP_DUP\nOP_HASH160 <$(<placeholder_key_0.public_key> OP_HASH160\n)> OP_EQUALVERIFY\nOP_CHECKSIG',
+        },
+        'p2pkh_placeholder_unlock_2': {
+          'name': 'p2pkh_placeholder_unlock_2',
+          'script': '<placeholder_key_2.ecdsa_signature.all_outputs>\n<placeholder_key_2.public_key>',
+          'unlocks': 'p2pkh_placeholder_lock_2',
         },
-        'p2pkh_placeholder_lock': {
+        'p2pkh_placeholder_lock_2': {
           'lockingType': 'standard',
-          'name': 'p2pkh_placeholder_lock',
-          'script': 'OP_DUP\nOP_HASH160 <$(<placeholder_key.public_key> OP_HASH160\n)> OP_EQUALVERIFY\nOP_CHECKSIG',
+          'name': 'p2pkh_placeholder_lock_2',
+          'script': 'OP_DUP\nOP_HASH160 <$(<placeholder_key_2.public_key> OP_HASH160\n)> OP_EQUALVERIFY\nOP_CHECKSIG',
         },
       },
     },

From ae3845256370df5ec4004e566c9285ec6607b0c7 Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Tue, 20 Aug 2024 12:31:12 +0200
Subject: [PATCH 143/171] Improve error messages

- Add test cases for non-require transaction evaluation failures
- Create TransactionEvaluationFailedError for these kinds of failures
- Extract failing statement from source code
- Update some debugging tests
- Still some TODOs / bugs left
---
 packages/cashscript/src/Errors.ts          | 64 ++++++++++++++++++++--
 packages/cashscript/src/debugging.ts       | 29 +++++++---
 packages/cashscript/test/debugging.test.ts | 43 ++++++++++++++-
 3 files changed, 121 insertions(+), 15 deletions(-)

diff --git a/packages/cashscript/src/Errors.ts b/packages/cashscript/src/Errors.ts
index 45fa93b1..3895a9a9 100644
--- a/packages/cashscript/src/Errors.ts
+++ b/packages/cashscript/src/Errors.ts
@@ -1,4 +1,4 @@
-import { RequireStatement, Type } from '@cashscript/utils';
+import { Artifact, RequireStatement, sourceMapToLocationData, Type } from '@cashscript/utils';
 
 export class TypeError extends Error {
   constructor(actual: string, expected: Type) {
@@ -31,17 +31,69 @@ export class FailedTransactionError extends Error {
   }
 }
 
-export class FailedRequireError extends Error {
+// TODO: Merge the location stuff with FailedRequireError
+// TODO: Add tests and make sure it works for multiline statements
+// TODO: Fix that failing statement is incorrect when using multi-function contracts
+export class FailedTransactionEvaluationError extends FailedTransactionError {
   constructor(
-    public contractName: string,
+    public artifact: Artifact,
+    public failingInstructionPointer: number,
+    public inputIndex: number,
+    public bitauthUri: string,
+    public libauthErrorMessage: string,
+  ) {
+    let baseMessage = `${artifact.contractName}.cash Error in transaction at input ${inputIndex} in contract ${artifact.contractName}.cash.`;
+
+    if (artifact.debug) {
+      const locationData = sourceMapToLocationData(artifact.debug.sourceMap);
+      const failingLocation = locationData[failingInstructionPointer];
+
+      const failingStatementLineString = artifact.source.split('\n')[failingLocation.location.start.line - 1];
+      const failingStatementString = failingStatementLineString.slice(
+        failingLocation.location.start.column,
+        failingLocation.location.end.column,
+      );
+
+      const failingLine = failingLocation.location.start.line;
+
+      baseMessage = `${artifact.contractName}.cash:${failingLine} Error in transaction at input ${inputIndex} in contract ${artifact.contractName}.cash at line ${failingLine}.\nFailing statement: ${failingStatementString}`;
+    }
+
+    super(`${baseMessage}\nReason: ${libauthErrorMessage}`, bitauthUri);
+  }
+}
+
+export class FailedRequireError extends FailedTransactionError {
+  constructor(
+    public artifact: Artifact,
+    public failingInstructionPointer: number,
     public requireStatement: RequireStatement,
     public inputIndex: number,
     public bitauthUri: string,
     public libauthErrorMessage?: string,
   ) {
-    const baseMessage = `${contractName}.cash:${requireStatement.line} Require statement failed at line ${requireStatement.line}`;
-    const fullMessage = `${baseMessage} with the following message: ${requireStatement.message}`;
-    super(requireStatement.message ? fullMessage : baseMessage);
+    const locationData = sourceMapToLocationData(artifact.debug!.sourceMap);
+    const failingLocation = locationData[failingInstructionPointer];
+
+    const failingStatementLineString = artifact.source.split('\n')[failingLocation.location.start.line - 1];
+    let failingStatementString = failingStatementLineString.slice(
+      failingLocation.location.start.column,
+      failingLocation.location.end.column,
+    );
+
+    if (!failingStatementString.includes('require')) {
+      failingStatementString = requireStatement.message
+        ? `require(${failingStatementString}, "${requireStatement.message}")`
+        : `require(${failingStatementString})`;
+    }
+
+    const failingLine = failingLocation.location.start.line;
+
+    const baseMessage = `${artifact.contractName}.cash:${failingLine} Require statement failed at input ${inputIndex} in contract ${artifact.contractName}.cash at line ${failingLine}`;
+    const baseMessageWithRequireMessage = `${baseMessage} with the following message: ${requireStatement.message}`;
+    const fullMessage = `${requireStatement.message ? baseMessageWithRequireMessage : baseMessage}.\nFailing statement: ${failingStatementString}`;
+
+    super(fullMessage, bitauthUri);
   }
 }
 
diff --git a/packages/cashscript/src/debugging.ts b/packages/cashscript/src/debugging.ts
index 0b097065..e1b89f9f 100644
--- a/packages/cashscript/src/debugging.ts
+++ b/packages/cashscript/src/debugging.ts
@@ -1,7 +1,7 @@
 import { AuthenticationErrorCommon, AuthenticationInstruction, AuthenticationProgramCommon, AuthenticationProgramStateBCH, AuthenticationProgramStateCommon, AuthenticationVirtualMachine, ResolvedTransactionCommon, WalletTemplate, binToHex, createCompiler, createVirtualMachineBCH2023, encodeAuthenticationInstruction, walletTemplateToCompilerConfiguration } from '@bitauth/libauth';
 import { Artifact, LogEntry, Op, PrimitiveType, StackItem, bytecodeToAsm, decodeBool, decodeInt, decodeString } from '@cashscript/utils';
 import { findLastIndex, toRegExp } from './utils.js';
-import { FailedRequireError, FailedTransactionError } from './Errors.js';
+import { FailedRequireError, FailedTransactionError, FailedTransactionEvaluationError } from './Errors.js';
 import { getBitauthUri } from './LibauthTemplate.js';
 
 // evaluates the fully defined template, throws upon error
@@ -58,12 +58,17 @@ export const debugTemplate = (template: WalletTemplate, artifact: Artifact): Deb
     const requireStatement = (artifact.debug?.requires ?? [])
       .find((statement) => statement.ip === requireStatementIp);
 
+    const { program: { inputIndex }, error } = lastExecutedDebugStep;
+
     if (requireStatement) {
-      const { program: { inputIndex }, error } = lastExecutedDebugStep;
-      throw new FailedRequireError(artifact.contractName, requireStatement, inputIndex, error, getBitauthUri(template));
+      throw new FailedRequireError(
+        artifact, requireStatementIp, requireStatement, inputIndex, getBitauthUri(template), error,
+      );
     }
 
-    throw new FailedTransactionError(`Error in evaluating input index ${lastExecutedDebugStep.program.inputIndex}.\n${lastExecutedDebugStep.error}`, getBitauthUri(template));
+    throw new FailedTransactionEvaluationError(
+      artifact, requireStatementIp, inputIndex, getBitauthUri(template), error,
+    );
   }
 
   const evaluationResult = vm.verify(program);
@@ -71,6 +76,11 @@ export const debugTemplate = (template: WalletTemplate, artifact: Artifact): Deb
   if (failedFinalVerify(evaluationResult)) {
     const finalExecutedVerifyIp = getFinalExecutedVerifyIp(executedDebugSteps);
 
+    // The final executed verify instruction points to the "implicit" VERIFY that is added at the end of the script.
+    // This instruction does not exist in the sourcemap, so we need to decrement the instruction pointer to get the
+    // actual final executed statement (which is *not* the require statement, but the evaluation within)
+    const sourcemapInstructionPointer = finalExecutedVerifyIp - 1;
+
     // logDebugSteps(executedDebugSteps, lastExecutedDebugStep.instructions);
     // console.warn('message', finalExecutedVerifyIp);
     // console.warn(artifact.debug?.requires);
@@ -78,12 +88,17 @@ export const debugTemplate = (template: WalletTemplate, artifact: Artifact): Deb
     const requireStatement = (artifact.debug?.requires ?? [])
       .find((message) => message.ip === finalExecutedVerifyIp);
 
+    const { program: { inputIndex } } = lastExecutedDebugStep;
+
     if (requireStatement) {
-      const { program: { inputIndex }, error } = lastExecutedDebugStep;
-      throw new FailedRequireError(artifact.contractName, requireStatement, inputIndex, getBitauthUri(template), error);
+      throw new FailedRequireError(
+        artifact, sourcemapInstructionPointer, requireStatement, inputIndex, getBitauthUri(template),
+      );
     }
 
-    throw new FailedTransactionError(`Error in evaluating input index ${lastExecutedDebugStep.program.inputIndex}.\n${evaluationResult}`, getBitauthUri(template));
+    throw new FailedTransactionEvaluationError(
+      artifact, sourcemapInstructionPointer, inputIndex, getBitauthUri(template), evaluationResult,
+    );
   }
 
   return fullDebugSteps;
diff --git a/packages/cashscript/test/debugging.test.ts b/packages/cashscript/test/debugging.test.ts
index 9f31bed7..1144d4b0 100644
--- a/packages/cashscript/test/debugging.test.ts
+++ b/packages/cashscript/test/debugging.test.ts
@@ -6,7 +6,7 @@ import {
 } from './fixture/vars.js';
 import '../src/test/JestExtensions.js';
 import { randomUtxo } from '../src/utils.js';
-import { binToHex, hexToBin } from '@bitauth/libauth';
+import { AuthenticationErrorCommon, binToHex, hexToBin } from '@bitauth/libauth';
 
 const CONTRACT_CODE = `
 contract Test() {
@@ -73,6 +73,16 @@ contract Test() {
     }
   }
 
+  function test_invalid_split_range() {
+    bytes test = 0x1234;
+    bytes test2 = test.split(4)[0];
+    require(test2 == 0x1234);
+  }
+
+  function test_invalid_input_index() {
+    require(tx.inputs[5].value == 1000);
+  }
+
   function test_fail_checksig(sig s, pubkey pk) {
     require(checkSig(s, pk), "Signatures do not match");
     require(1 == 2, "1 should equal 2");
@@ -387,7 +397,7 @@ describe('Debugging tests', () => {
       const transaction = contract.functions
         .test_multiple_require_statements_no_message_final().to(contract.address, 1000n);
 
-      await expect(transaction).toFailRequireWith(new RegExp('^Test\.cash:32 Require statement failed at line 32$'));
+      await expect(transaction).toFailRequireWith(new RegExp('^Test\.cash:32 Require statement failed at input 0 in contract Test.cash at line 32'));
       await expect(transaction).not.toFailRequireWith(/1 should equal 1/);
     });
 
@@ -498,6 +508,35 @@ describe('Debugging tests', () => {
     });
   });
 
+  describe('Non-require error messages', () => {
+    const artifact = compileString(CONTRACT_CODE);
+    const provider = new MockNetworkProvider();
+
+    // test_invalid_split_range
+    it('should fail with correct error message when an invalid OP_SPLIT range is used', async () => {
+      const contract = new Contract(artifact, [], { provider });
+      provider.addUtxo(contract.address, randomUtxo());
+
+      const transactionPromise = contract.functions.test_invalid_split_range()
+        .to(contract.address, 1000n)
+        .debug();
+
+      await expect(transactionPromise).rejects.toThrow(AuthenticationErrorCommon.invalidSplitIndex);
+    });
+
+    // test_invalid_input_index
+    it('should fail with correct error message when an invalid input index is used', async () => {
+      const contract = new Contract(artifact, [], { provider });
+      provider.addUtxo(contract.address, randomUtxo());
+
+      const transactionPromise = contract.functions.test_invalid_input_index()
+        .to(contract.address, 1000n)
+        .debug();
+
+      await expect(transactionPromise).rejects.toThrow(AuthenticationErrorCommon.invalidTransactionUtxoIndex);
+    });
+  });
+
   describe('Template encoding', () => {
     const artifact = compileString(CONTRACT_CODE_ZERO_HANDLING);
     const provider = new MockNetworkProvider();

From f5038e9e7f5d27d437b8e32d27ae11521b440c94 Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Thu, 22 Aug 2024 16:20:32 +0200
Subject: [PATCH 144/171] Fix bug in IP -> source code statement mapping and
 update tests/fixtures

---
 packages/cashscript/src/Errors.ts             | 26 ++++--
 packages/cashscript/src/debugging.ts          |  9 +-
 .../cashscript/test/e2e/Announcement.test.ts  |  9 +-
 packages/cashscript/test/e2e/BigInt.test.ts   |  3 +-
 .../cashscript/test/e2e/HodlVault.test.ts     |  6 +-
 packages/cashscript/test/e2e/Mecenas.test.ts  | 12 ++-
 packages/cashscript/test/e2e/P2PKH.test.ts    |  6 +-
 .../test/e2e/TokenCategoryCheck.test.ts       |  3 +-
 .../test/e2e/TransferWithTimeout.test.ts      |  9 +-
 .../test/fixtures/bitauth-script.fixture.ts   | 89 ++++++++++++++++++-
 10 files changed, 146 insertions(+), 26 deletions(-)

diff --git a/packages/cashscript/src/Errors.ts b/packages/cashscript/src/Errors.ts
index 3895a9a9..e89857c8 100644
--- a/packages/cashscript/src/Errors.ts
+++ b/packages/cashscript/src/Errors.ts
@@ -1,4 +1,4 @@
-import { Artifact, RequireStatement, sourceMapToLocationData, Type } from '@cashscript/utils';
+import { Artifact, RequireStatement, SingleLocationData, sourceMapToLocationData, Type } from '@cashscript/utils';
 
 export class TypeError extends Error {
   constructor(actual: string, expected: Type) {
@@ -33,7 +33,6 @@ export class FailedTransactionError extends Error {
 
 // TODO: Merge the location stuff with FailedRequireError
 // TODO: Add tests and make sure it works for multiline statements
-// TODO: Fix that failing statement is incorrect when using multi-function contracts
 export class FailedTransactionEvaluationError extends FailedTransactionError {
   constructor(
     public artifact: Artifact,
@@ -45,8 +44,7 @@ export class FailedTransactionEvaluationError extends FailedTransactionError {
     let baseMessage = `${artifact.contractName}.cash Error in transaction at input ${inputIndex} in contract ${artifact.contractName}.cash.`;
 
     if (artifact.debug) {
-      const locationData = sourceMapToLocationData(artifact.debug.sourceMap);
-      const failingLocation = locationData[failingInstructionPointer];
+      const failingLocation = getLocationDataForInstructionPointer(artifact, failingInstructionPointer);
 
       const failingStatementLineString = artifact.source.split('\n')[failingLocation.location.start.line - 1];
       const failingStatementString = failingStatementLineString.slice(
@@ -72,8 +70,7 @@ export class FailedRequireError extends FailedTransactionError {
     public bitauthUri: string,
     public libauthErrorMessage?: string,
   ) {
-    const locationData = sourceMapToLocationData(artifact.debug!.sourceMap);
-    const failingLocation = locationData[failingInstructionPointer];
+    const failingLocation = getLocationDataForInstructionPointer(artifact, failingInstructionPointer);
 
     const failingStatementLineString = artifact.source.split('\n')[failingLocation.location.start.line - 1];
     let failingStatementString = failingStatementLineString.slice(
@@ -87,6 +84,8 @@ export class FailedRequireError extends FailedTransactionError {
         : `require(${failingStatementString})`;
     }
 
+    failingStatementString = failingStatementString.trim().replace(/;$/g, '');
+
     const failingLine = failingLocation.location.start.line;
 
     const baseMessage = `${artifact.contractName}.cash:${failingLine} Require statement failed at input ${inputIndex} in contract ${artifact.contractName}.cash at line ${failingLine}`;
@@ -97,6 +96,21 @@ export class FailedRequireError extends FailedTransactionError {
   }
 }
 
+const getLocationDataForInstructionPointer = (
+  artifact: Artifact,
+  instructionPointer: number,
+): SingleLocationData => {
+  const locationData = sourceMapToLocationData(artifact.debug!.sourceMap);
+
+  // We subtract the constructor inputs because these are present in the evaluation (and thus the instruction pointer)
+  // but they are not present in the source code (and thus the location data)
+  const modifiedInstructionPointer = instructionPointer - artifact.constructorInputs.length;
+
+  const location = locationData[modifiedInstructionPointer];
+
+  return location;
+};
+
 // TODO: Expand these reasons with non-script failures (like tx-mempool-conflict)
 export enum NodeErrorReason {
   EVAL_FALSE = 'Script evaluated without error but finished with a false/empty top stack element',
diff --git a/packages/cashscript/src/debugging.ts b/packages/cashscript/src/debugging.ts
index e1b89f9f..6e3e69fd 100644
--- a/packages/cashscript/src/debugging.ts
+++ b/packages/cashscript/src/debugging.ts
@@ -51,7 +51,8 @@ export const debugTemplate = (template: WalletTemplate, artifact: Artifact): Deb
 
     // Generally speaking, an error is thrown by the OP_VERIFY opcode, but for NULLFAIL, the error is thrown in the
     // preceding OP_CHECKSIG opcode. The error message is registered in the next instruction, so we need to increment
-    // the instruction pointer to get the correct error message.
+    // the instruction pointer to get the correct error message from the require messages in the artifact.
+    // Note that we do NOT use this adjusted IP when passing the failing IP into the FailedRequireError
     const isNullFail = lastExecutedDebugStep.error === AuthenticationErrorCommon.nonNullSignatureFailure;
     const requireStatementIp = failingIp + (isNullFail ? 1 : 0);
 
@@ -61,13 +62,15 @@ export const debugTemplate = (template: WalletTemplate, artifact: Artifact): Deb
     const { program: { inputIndex }, error } = lastExecutedDebugStep;
 
     if (requireStatement) {
+      // Note that we use failingIp here rather than requireStatementIp, see comment above
       throw new FailedRequireError(
-        artifact, requireStatementIp, requireStatement, inputIndex, getBitauthUri(template), error,
+        artifact, failingIp, requireStatement, inputIndex, getBitauthUri(template), error,
       );
     }
 
+    // Note that we use failingIp here rather than requireStatementIp, see comment above
     throw new FailedTransactionEvaluationError(
-      artifact, requireStatementIp, inputIndex, getBitauthUri(template), error,
+      artifact, failingIp, inputIndex, getBitauthUri(template), error,
     );
   }
 
diff --git a/packages/cashscript/test/e2e/Announcement.test.ts b/packages/cashscript/test/e2e/Announcement.test.ts
index 4a40c711..7ab3a048 100644
--- a/packages/cashscript/test/e2e/Announcement.test.ts
+++ b/packages/cashscript/test/e2e/Announcement.test.ts
@@ -66,7 +66,8 @@ describe('Announcement', () => {
 
       // then
       await expect(txPromise).rejects.toThrow(FailedRequireError);
-      await expect(txPromise).rejects.toThrow('Announcement.cash:17 Require statement failed at line 17');
+      await expect(txPromise).rejects.toThrow('Announcement.cash:17 Require statement failed at input 0 in contract Announcement.cash at line 17.');
+      await expect(txPromise).rejects.toThrow('Failing statement: require(tx.outputs[0].lockingBytecode == announcement)');
     });
 
     it('should fail when sending incorrect amount of change', async () => {
@@ -88,7 +89,8 @@ describe('Announcement', () => {
 
       // then
       await expect(txPromise).rejects.toThrow(FailedRequireError);
-      await expect(txPromise).rejects.toThrow('Announcement.cash:25 Require statement failed at line 25');
+      await expect(txPromise).rejects.toThrow('Announcement.cash:25 Require statement failed at input 0 in contract Announcement.cash at line 25.');
+      await expect(txPromise).rejects.toThrow('Failing statement: require(tx.outputs[1].value == changeAmount)');
     });
 
     it('should fail when sending the correct change amount to an incorrect address', async () => {
@@ -112,7 +114,8 @@ describe('Announcement', () => {
 
       // then
       await expect(txPromise).rejects.toThrow(FailedRequireError);
-      await expect(txPromise).rejects.toThrow('Announcement.cash:24 Require statement failed at line 24');
+      await expect(txPromise).rejects.toThrow('Announcement.cash:24 Require statement failed at input 0 in contract Announcement.cash at line 24.');
+      await expect(txPromise).rejects.toThrow('Failing statement: require(tx.outputs[1].lockingBytecode == tx.inputs[this.activeInputIndex].lockingBytecode)');
     });
 
     it('should succeed when announcing correct announcement', async () => {
diff --git a/packages/cashscript/test/e2e/BigInt.test.ts b/packages/cashscript/test/e2e/BigInt.test.ts
index f1e9e0d6..da006313 100644
--- a/packages/cashscript/test/e2e/BigInt.test.ts
+++ b/packages/cashscript/test/e2e/BigInt.test.ts
@@ -39,7 +39,8 @@ describe('BigInt', () => {
 
       // then
       await expect(txPromise).rejects.toThrow(FailedRequireError);
-      await expect(txPromise).rejects.toThrow('BigInt.cash:4 Require statement failed at line 4');
+      await expect(txPromise).rejects.toThrow('BigInt.cash:4 Require statement failed at input 0 in contract BigInt.cash at line 4');
+      await expect(txPromise).rejects.toThrow('Failing statement: require(x >= maxInt32PlusOne)');
     });
 
     it('should fail when providing numbers that overflow 64 bits when multiplied', async () => {
diff --git a/packages/cashscript/test/e2e/HodlVault.test.ts b/packages/cashscript/test/e2e/HodlVault.test.ts
index 31e47a71..6dcd2f8e 100644
--- a/packages/cashscript/test/e2e/HodlVault.test.ts
+++ b/packages/cashscript/test/e2e/HodlVault.test.ts
@@ -45,7 +45,8 @@ describe('HodlVault', () => {
 
       // then
       await expect(txPromise).rejects.toThrow(FailedRequireError);
-      await expect(txPromise).rejects.toThrow('HodlVault.cash:26 Require statement failed at line 26');
+      await expect(txPromise).rejects.toThrow('HodlVault.cash:26 Require statement failed at input 0 in contract HodlVault.cash at line 26.');
+      await expect(txPromise).rejects.toThrow('Failing statement: require(checkDataSig(oracleSig, oracleMessage, oraclePk))');
     });
 
     it('should fail when price is too low', async () => {
@@ -63,7 +64,8 @@ describe('HodlVault', () => {
 
       // then
       await expect(txPromise).rejects.toThrow(FailedRequireError);
-      await expect(txPromise).rejects.toThrow('HodlVault.cash:23 Require statement failed at line 23');
+      await expect(txPromise).rejects.toThrow('HodlVault.cash:23 Require statement failed at input 0 in contract HodlVault.cash at line 23.');
+      await expect(txPromise).rejects.toThrow('Failing statement: require(price >= priceTarget)');
     });
 
     it('should succeed when price is high enough', async () => {
diff --git a/packages/cashscript/test/e2e/Mecenas.test.ts b/packages/cashscript/test/e2e/Mecenas.test.ts
index 6b4cf5a6..8f85709f 100644
--- a/packages/cashscript/test/e2e/Mecenas.test.ts
+++ b/packages/cashscript/test/e2e/Mecenas.test.ts
@@ -42,7 +42,8 @@ describe('Mecenas', () => {
 
       // then
       await expect(txPromise).rejects.toThrow(FailedRequireError);
-      await expect(txPromise).rejects.toThrow('Mecenas.cash:24 Require statement failed at line 24');
+      await expect(txPromise).rejects.toThrow('Mecenas.cash:24 Require statement failed at input 0 in contract Mecenas.cash at line 24.');
+      await expect(txPromise).rejects.toThrow('Failing statement: require(tx.outputs[0].value == pledge)');
     });
 
     it('should fail when trying to send to wrong person', async () => {
@@ -59,7 +60,8 @@ describe('Mecenas', () => {
 
       // then
       await expect(txPromise).rejects.toThrow(FailedRequireError);
-      await expect(txPromise).rejects.toThrow('Mecenas.cash:13 Require statement failed at line 13');
+      await expect(txPromise).rejects.toThrow('Mecenas.cash:13 Require statement failed at input 0 in contract Mecenas.cash at line 13.');
+      await expect(txPromise).rejects.toThrow('Failing statement: require(tx.outputs[0].lockingBytecode == new LockingBytecodeP2PKH(recipient))');
     });
 
     it('should fail when trying to send to multiple people', async () => {
@@ -77,7 +79,8 @@ describe('Mecenas', () => {
 
       // then
       await expect(txPromise).rejects.toThrow(FailedRequireError);
-      await expect(txPromise).rejects.toThrow('Mecenas.cash:25 Require statement failed at line 25');
+      await expect(txPromise).rejects.toThrow('Mecenas.cash:25 Require statement failed at input 0 in contract Mecenas.cash at line 25.');
+      await expect(txPromise).rejects.toThrow('Failing statement: require(tx.outputs[1].lockingBytecode == tx.inputs[this.activeInputIndex].lockingBytecode)');
     });
 
     it('should fail when sending incorrect amount of change', async () => {
@@ -94,7 +97,8 @@ describe('Mecenas', () => {
 
       // then
       await expect(txPromise).rejects.toThrow(FailedRequireError);
-      await expect(txPromise).rejects.toThrow('Mecenas.cash:26 Require statement failed at line 26');
+      await expect(txPromise).rejects.toThrow('Mecenas.cash:26 Require statement failed at input 0 in contract Mecenas.cash at line 26.');
+      await expect(txPromise).rejects.toThrow('Failing statement: require(tx.outputs[1].value == changeValue)');
     });
 
     it('should succeed when sending pledge to receiver', async () => {
diff --git a/packages/cashscript/test/e2e/P2PKH.test.ts b/packages/cashscript/test/e2e/P2PKH.test.ts
index de4614a8..5444f39f 100644
--- a/packages/cashscript/test/e2e/P2PKH.test.ts
+++ b/packages/cashscript/test/e2e/P2PKH.test.ts
@@ -47,7 +47,8 @@ describe('P2PKH-no-tokens', () => {
 
       // then
       await expect(txPromise).rejects.toThrow(FailedRequireError);
-      await expect(txPromise).rejects.toThrow('P2PKH.cash:4 Require statement failed at line 4');
+      await expect(txPromise).rejects.toThrow('P2PKH.cash:4 Require statement failed at input 0 in contract P2PKH.cash at line 4.');
+      await expect(txPromise).rejects.toThrow('Failing statement: require(hash160(pk) == pkh)');
     });
 
     it('should fail when using incorrect signature', async () => {
@@ -63,7 +64,8 @@ describe('P2PKH-no-tokens', () => {
 
       // then
       await expect(txPromise).rejects.toThrow(FailedRequireError);
-      await expect(txPromise).rejects.toThrow('P2PKH.cash:5 Require statement failed at line 5');
+      await expect(txPromise).rejects.toThrow('P2PKH.cash:5 Require statement failed at input 0 in contract P2PKH.cash at line 5.');
+      await expect(txPromise).rejects.toThrow('Failing statement: require(checkSig(s, pk))');
     });
 
     it('should succeed when using correct function arguments', async () => {
diff --git a/packages/cashscript/test/e2e/TokenCategoryCheck.test.ts b/packages/cashscript/test/e2e/TokenCategoryCheck.test.ts
index 1289637f..ef6f9466 100644
--- a/packages/cashscript/test/e2e/TokenCategoryCheck.test.ts
+++ b/packages/cashscript/test/e2e/TokenCategoryCheck.test.ts
@@ -49,7 +49,8 @@ describe('TokenCategoryCheck', () => {
         .send();
 
       await expect(txPromise).rejects.toThrow(FailedRequireError);
-      await expect(txPromise).rejects.toThrow('Test.cash:3 Require statement failed at line 3');
+      await expect(txPromise).rejects.toThrow('Test.cash:3 Require statement failed at input 0 in contract Test.cash at line 3.');
+      await expect(txPromise).rejects.toThrow('Failing statement: require(tx.inputs[1].tokenCategory == 0x)');
     });
 
     it('can send if the input at index 1 does not contain tokens', async () => {
diff --git a/packages/cashscript/test/e2e/TransferWithTimeout.test.ts b/packages/cashscript/test/e2e/TransferWithTimeout.test.ts
index 1315ccae..9d07407b 100644
--- a/packages/cashscript/test/e2e/TransferWithTimeout.test.ts
+++ b/packages/cashscript/test/e2e/TransferWithTimeout.test.ts
@@ -44,7 +44,8 @@ describe('TransferWithTimeout', () => {
 
       // then
       await expect(txPromise).rejects.toThrow(FailedRequireError);
-      await expect(txPromise).rejects.toThrow('TransferWithTimeout.cash:8 Require statement failed at line 8');
+      await expect(txPromise).rejects.toThrow('TransferWithTimeout.cash:8 Require statement failed at input 0 in contract TransferWithTimeout.cash at line 8.');
+      await expect(txPromise).rejects.toThrow('Failing statement: require(checkSig(recipientSig, recipient))');
     });
 
     it('should fail when signing timeout with incorrect private key', async () => {
@@ -60,7 +61,8 @@ describe('TransferWithTimeout', () => {
 
       // then
       await expect(txPromise).rejects.toThrow(FailedRequireError);
-      await expect(txPromise).rejects.toThrow('TransferWithTimeout.cash:13 Require statement failed at line 13');
+      await expect(txPromise).rejects.toThrow('TransferWithTimeout.cash:13 Require statement failed at input 0 in contract TransferWithTimeout.cash at line 13.');
+      await expect(txPromise).rejects.toThrow('Failing statement: require(checkSig(senderSig, sender))');
     });
 
     it('should fail when timeout is called before timeout block', async () => {
@@ -76,7 +78,8 @@ describe('TransferWithTimeout', () => {
 
       // then
       await expect(txPromise).rejects.toThrow(FailedRequireError);
-      await expect(txPromise).rejects.toThrow('TransferWithTimeout.cash:14 Require statement failed at line 14');
+      await expect(txPromise).rejects.toThrow('TransferWithTimeout.cash:14 Require statement failed at input 0 in contract TransferWithTimeout.cash at line 14.');
+      await expect(txPromise).rejects.toThrow('Failing statement: require(tx.time >= timeout)');
     });
 
     it('should succeed when transfer is called after timeout block', async () => {
diff --git a/packages/utils/test/fixtures/bitauth-script.fixture.ts b/packages/utils/test/fixtures/bitauth-script.fixture.ts
index 29b65ec9..363a6d25 100644
--- a/packages/utils/test/fixtures/bitauth-script.fixture.ts
+++ b/packages/utils/test/fixtures/bitauth-script.fixture.ts
@@ -15,7 +15,7 @@ export interface Fixture {
 
 export const fixtures: Fixture[] = [
   {
-    name: 'TransferWithTimeout',
+    name: 'TransferWithTimeout (Modified with random extra statements)',
     sourceCode: `
 contract TransferWithTimeout(bytes20 senderPkh, bytes20 recipientPkh, int timeout) {
   function transfer(pubkey signingPk, sig s) {
@@ -202,6 +202,93 @@ OP_3 OP_PICK OP_HASH160 OP_2 OP_ROLL OP_EQUAL OP_VERIFY
 OP_3 OP_ROLL OP_3 OP_ROLL OP_CHECKSIG                                                    /*         require(checkSig(s, pk));                                                                                  */
 OP_NIP OP_NIP                                                                            /*     }                                                                                                              */
 OP_ENDIF                                                                                 /* }                                                                                                                  */
+`.replace(/^\n+/, '').replace(/\n+$/, ''),
+  },
+  {
+    name: 'HodlVault',
+    sourceCode: `
+// This contract forces HODLing until a certain price target has been reached
+// A minimum block is provided to ensure that oracle price entries from before this block are disregarded
+// i.e. when the BCH price was $1000 in the past, an oracle entry with the old block number and price can not be used.
+// Instead, a message with a block number and price from after the minBlock needs to be passed.
+// This contract serves as a simple example for checkDataSig-based contracts.
+contract HodlVault(
+    pubkey ownerPk,
+    pubkey oraclePk,
+    int minBlock,
+    int priceTarget
+) {
+    function spend(sig ownerSig, datasig oracleSig, bytes8 oracleMessage) {
+        // message: { blockHeight, price }
+        bytes4 blockHeightBin, bytes4 priceBin = oracleMessage.split(4);
+        int blockHeight = int(blockHeightBin);
+        int price = int(priceBin);
+
+        // Check that blockHeight is after minBlock and not in the future
+        require(blockHeight >= minBlock);
+        require(tx.time >= blockHeight);
+
+        // Check that current price is at least priceTarget
+        require(price >= priceTarget);
+
+        // Handle necessary signature checks
+        require(checkDataSig(oracleSig, oracleMessage, oraclePk));
+        require(checkSig(ownerSig, ownerPk));
+    }
+}
+`.replace(/^\n+/, '').replace(/\n+$/, ''),
+    asmBytecode: 'OP_6 OP_PICK OP_4 OP_SPLIT OP_1 OP_ROLL OP_BIN2NUM OP_1 OP_ROLL OP_BIN2NUM OP_1 OP_PICK OP_5 OP_ROLL OP_GREATERTHANOREQUAL OP_VERIFY OP_1 OP_ROLL OP_CHECKLOCKTIMEVERIFY OP_DROP OP_0 OP_ROLL OP_3 OP_ROLL OP_GREATERTHANOREQUAL OP_VERIFY OP_3 OP_ROLL OP_4 OP_ROLL OP_3 OP_ROLL OP_CHECKDATASIG OP_VERIFY OP_1 OP_ROLL OP_1 OP_ROLL OP_CHECKSIG',
+    sourceMap: '14:49:14:62;;:69::70;:49::71:1;15:30:15:44:0;;:26::45:1;16:24:16:32:0;;:20::33:1;19:16:19:27:0;;:31::39;;:16:::1;:8::41;20:27:20:38:0;;:8::40:1;;23:16:23:21:0;;:25::36;;:16:::1;:8::38;26:29:26::0;;:40::53;;:55::63;;:16::64:1;:8::66;27:25:27:33:0;;:35::42;;:16::43:1',
+    expectedLineToOpcodeMap: {
+      14: [Op.OP_6, Op.OP_PICK, Op.OP_4, Op.OP_SPLIT],
+      15: [Op.OP_1, Op.OP_ROLL, Op.OP_BIN2NUM],
+      16: [Op.OP_1, Op.OP_ROLL, Op.OP_BIN2NUM],
+      19: [Op.OP_1, Op.OP_PICK, Op.OP_5, Op.OP_ROLL, Op.OP_GREATERTHANOREQUAL, Op.OP_VERIFY],
+      20: [Op.OP_1, Op.OP_ROLL, Op.OP_CHECKLOCKTIMEVERIFY, Op.OP_DROP],
+      23: [new Uint8Array([]), Op.OP_ROLL, Op.OP_3, Op.OP_ROLL, Op.OP_GREATERTHANOREQUAL, Op.OP_VERIFY],
+      26: [Op.OP_3, Op.OP_ROLL, Op.OP_4, Op.OP_ROLL, Op.OP_3, Op.OP_ROLL, Op.OP_CHECKDATASIG, Op.OP_VERIFY],
+      27: [Op.OP_1, Op.OP_ROLL, Op.OP_1, Op.OP_ROLL, Op.OP_CHECKSIG],
+    },
+    expectedLineToAsmMap: {
+      14: 'OP_6 OP_PICK OP_4 OP_SPLIT',
+      15: 'OP_1 OP_ROLL OP_BIN2NUM',
+      16: 'OP_1 OP_ROLL OP_BIN2NUM',
+      19: 'OP_1 OP_PICK OP_5 OP_ROLL OP_GREATERTHANOREQUAL OP_VERIFY',
+      20: 'OP_1 OP_ROLL OP_CHECKLOCKTIMEVERIFY OP_DROP',
+      23: 'OP_0 OP_ROLL OP_3 OP_ROLL OP_GREATERTHANOREQUAL OP_VERIFY',
+      26: 'OP_3 OP_ROLL OP_4 OP_ROLL OP_3 OP_ROLL OP_CHECKDATASIG OP_VERIFY',
+      27: 'OP_1 OP_ROLL OP_1 OP_ROLL OP_CHECKSIG',
+    },
+    expectedBitAuthScript: `
+                                                                 /* // This contract forces HODLing until a certain price target has been reached                                          */
+                                                                 /* // A minimum block is provided to ensure that oracle price entries from before this block are disregarded              */
+                                                                 /* // i.e. when the BCH price was $1000 in the past, an oracle entry with the old block number and price can not be used. */
+                                                                 /* // Instead, a message with a block number and price from after the minBlock needs to be passed.                        */
+                                                                 /* // This contract serves as a simple example for checkDataSig-based contracts.                                          */
+                                                                 /* contract HodlVault(                                                                                                    */
+                                                                 /*     pubkey ownerPk,                                                                                                    */
+                                                                 /*     pubkey oraclePk,                                                                                                   */
+                                                                 /*     int minBlock,                                                                                                      */
+                                                                 /*     int priceTarget                                                                                                    */
+                                                                 /* ) {                                                                                                                    */
+                                                                 /*     function spend(sig ownerSig, datasig oracleSig, bytes8 oracleMessage) {                                            */
+                                                                 /*         // message: { blockHeight, price }                                                                             */
+OP_6 OP_PICK OP_4 OP_SPLIT                                       /*         bytes4 blockHeightBin, bytes4 priceBin = oracleMessage.split(4);                                               */
+OP_1 OP_ROLL OP_BIN2NUM                                          /*         int blockHeight = int(blockHeightBin);                                                                         */
+OP_1 OP_ROLL OP_BIN2NUM                                          /*         int price = int(priceBin);                                                                                     */
+                                                                 /*                                                                                                                        */
+                                                                 /*         // Check that blockHeight is after minBlock and not in the future                                              */
+OP_1 OP_PICK OP_5 OP_ROLL OP_GREATERTHANOREQUAL OP_VERIFY        /*         require(blockHeight >= minBlock);                                                                              */
+OP_1 OP_ROLL OP_CHECKLOCKTIMEVERIFY OP_DROP                      /*         require(tx.time >= blockHeight);                                                                               */
+                                                                 /*                                                                                                                        */
+                                                                 /*         // Check that current price is at least priceTarget                                                            */
+OP_0 OP_ROLL OP_3 OP_ROLL OP_GREATERTHANOREQUAL OP_VERIFY        /*         require(price >= priceTarget);                                                                                 */
+                                                                 /*                                                                                                                        */
+                                                                 /*         // Handle necessary signature checks                                                                           */
+OP_3 OP_ROLL OP_4 OP_ROLL OP_3 OP_ROLL OP_CHECKDATASIG OP_VERIFY /*         require(checkDataSig(oracleSig, oracleMessage, oraclePk));                                                     */
+OP_1 OP_ROLL OP_1 OP_ROLL OP_CHECKSIG                            /*         require(checkSig(ownerSig, ownerPk));                                                                          */
+                                                                 /*     }                                                                                                                  */
+                                                                 /* }                                                                                                                      */
 `.replace(/^\n+/, '').replace(/\n+$/, ''),
   },
 ];

From 55451bdc68f79b0a8ce974052d7cf56a88849486 Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Tue, 27 Aug 2024 10:21:23 +0200
Subject: [PATCH 145/171] Extend debugging tests so they also cover 'Failing
 statement' checks

---
 packages/cashscript/test/debugging.test.ts | 47 ++++++++++++++--------
 1 file changed, 31 insertions(+), 16 deletions(-)

diff --git a/packages/cashscript/test/debugging.test.ts b/packages/cashscript/test/debugging.test.ts
index 1144d4b0..82b58920 100644
--- a/packages/cashscript/test/debugging.test.ts
+++ b/packages/cashscript/test/debugging.test.ts
@@ -346,7 +346,8 @@ describe('Debugging tests', () => {
       provider.addUtxo(contract.address, randomUtxo());
 
       const transaction = contract.functions.test_require().to(contract.address, 1000n);
-      await expect(transaction).toFailRequireWith(/1 should equal 2/);
+      await expect(transaction).toFailRequireWith('Test.cash:13 Require statement failed at input 0 in contract Test.cash at line 13 with the following message: 1 should equal 2.');
+      await expect(transaction).toFailRequireWith('Failing statement: require(1 == 2, "1 should equal 2")');
     });
 
     // test_require_single_function
@@ -357,7 +358,8 @@ describe('Debugging tests', () => {
       const transaction = contract.functions.test_require_single_function()
         .to(contract.address, 1000n)
         .to(contract.address, 1000n);
-      await expect(transaction).toFailRequireWith(/should have 1 output/);
+      await expect(transaction).toFailRequireWith('Test.cash:4 Require statement failed at input 0 in contract Test.cash at line 4 with the following message: should have 1 output.');
+      await expect(transaction).toFailRequireWith('Failing statement: require(tx.outputs.length == 1, "should have 1 output")');
     });
 
     // test_multiple_require_statements
@@ -366,7 +368,8 @@ describe('Debugging tests', () => {
       provider.addUtxo(contract.address, randomUtxo());
 
       const transaction = contract.functions.test_multiple_require_statements().to(contract.address, 1000n);
-      await expect(transaction).toFailRequireWith(/1 should equal 2/);
+      await expect(transaction).toFailRequireWith('Test.cash:21 Require statement failed at input 0 in contract Test.cash at line 21 with the following message: 1 should equal 2.');
+      await expect(transaction).toFailRequireWith('Failing statement: require(1 == 2, "1 should equal 2")');
       await expect(transaction).not.toFailRequireWith(/1 should equal 1/);
     });
 
@@ -376,7 +379,8 @@ describe('Debugging tests', () => {
       provider.addUtxo(contract.address, randomUtxo());
 
       const transaction = contract.functions.test_multiple_require_statements_final_fails().to(contract.address, 1000n);
-      await expect(transaction).toFailRequireWith(/1 should equal 2/);
+      await expect(transaction).toFailRequireWith('Test.cash:27 Require statement failed at input 0 in contract Test.cash at line 27 with the following message: 1 should equal 2.');
+      await expect(transaction).toFailRequireWith('Failing statement: require(1 == 2, "1 should equal 2")');
       await expect(transaction).not.toFailRequireWith(/1 should equal 1/);
     });
 
@@ -397,7 +401,8 @@ describe('Debugging tests', () => {
       const transaction = contract.functions
         .test_multiple_require_statements_no_message_final().to(contract.address, 1000n);
 
-      await expect(transaction).toFailRequireWith(new RegExp('^Test\.cash:32 Require statement failed at input 0 in contract Test.cash at line 32'));
+      await expect(transaction).toFailRequireWith('Test.cash:32 Require statement failed at input 0 in contract Test.cash at line 32.');
+      await expect(transaction).toFailRequireWith('Failing statement: require(1 == 2)');
       await expect(transaction).not.toFailRequireWith(/1 should equal 1/);
     });
 
@@ -408,7 +413,8 @@ describe('Debugging tests', () => {
 
       const transaction = contract.functions.test_timeops_as_final_require().to(contract.address, 1000n);
 
-      await expect(transaction).toFailRequireWith(/time should be HUGE/);
+      await expect(transaction).toFailRequireWith('Test.cash:37 Require statement failed at input 0 in contract Test.cash at line 37 with the following message: time should be HUGE.');
+      await expect(transaction).toFailRequireWith('Failing statement: require(tx.time >= 100000000, "time should be HUGE")');
       await expect(transaction).not.toFailRequireWith(/1 should equal 1/);
     });
 
@@ -419,15 +425,18 @@ describe('Debugging tests', () => {
 
       const transactionIfBranch = contract.functions
         .test_final_require_in_if_statement(1n).to(contract.address, 1000n);
-      await expect(transactionIfBranch).toFailRequireWith(/1 should equal 2/);
+      await expect(transactionIfBranch).toFailRequireWith('Test.cash:43 Require statement failed at input 0 in contract Test.cash at line 43 with the following message: 1 should equal 2.');
+      await expect(transactionIfBranch).toFailRequireWith('Failing statement: require(1 == a, "1 should equal 2")');
 
       const transactionElseIfBranch = contract.functions
         .test_final_require_in_if_statement(2n).to(contract.address, 1000n);
-      await expect(transactionElseIfBranch).toFailRequireWith(/1 should equal 3/);
+      await expect(transactionElseIfBranch).toFailRequireWith('Test.cash:47 Require statement failed at input 0 in contract Test.cash at line 47 with the following message: 1 should equal 3.');
+      await expect(transactionElseIfBranch).toFailRequireWith('Failing statement: require(1 == b, "1 should equal 3")');
 
       const transactionElseBranch = contract.functions
         .test_final_require_in_if_statement(3n).to(contract.address, 1000n);
-      await expect(transactionElseBranch).toFailRequireWith(/switch should equal 4/);
+      await expect(transactionElseBranch).toFailRequireWith('Test.cash:50 Require statement failed at input 0 in contract Test.cash at line 50 with the following message: switch should equal 4.');
+      await expect(transactionElseBranch).toFailRequireWith('Failing statement: require(switch == c, "switch should equal 4")');
     });
 
     // test_final_require_in_if_statement_with_deep_reassignment
@@ -437,7 +446,8 @@ describe('Debugging tests', () => {
 
       const transaction = contract.functions
         .test_final_require_in_if_statement_with_deep_reassignment().to(contract.address, 1000n);
-      await expect(transaction).toFailRequireWith(/sum should equal 10/);
+      await expect(transaction).toFailRequireWith('Test.cash:62 Require statement failed at input 0 in contract Test.cash at line 62 with the following message: sum should equal 10.');
+      await expect(transaction).toFailRequireWith('Failing statement: require(a + b + c + d + e == 10, "sum should equal 10")');
     });
 
     // test_fail_checksig
@@ -447,7 +457,8 @@ describe('Debugging tests', () => {
 
       const checkSigTransaction = contract.functions
         .test_fail_checksig(new SignatureTemplate(alicePriv), bobPub).to(contract.address, 1000n);
-      await expect(checkSigTransaction).toFailRequireWith(/Signatures do not match/);
+      await expect(checkSigTransaction).toFailRequireWith('Test.cash:77 Require statement failed at input 0 in contract Test.cash at line 77 with the following message: Signatures do not match.');
+      await expect(checkSigTransaction).toFailRequireWith('Failing statement: require(checkSig(s, pk), "Signatures do not match")');
 
       // TODO: Add test for checksig with a NULL Signature (after we refactor Libauth Template generation)
       // const checkSigTransactionNullSignature = contract.functions
@@ -462,7 +473,8 @@ describe('Debugging tests', () => {
 
       const checkSigTransaction = contract.functions
         .test_fail_checksig_final_verify(new SignatureTemplate(alicePriv), bobPub).to(contract.address, 1000n);
-      await expect(checkSigTransaction).toFailRequireWith(/Signatures do not match/);
+      await expect(checkSigTransaction).toFailRequireWith('Test.cash:82 Require statement failed at input 0 in contract Test.cash at line 82 with the following message: Signatures do not match.');
+      await expect(checkSigTransaction).toFailRequireWith('Failing statement: require(checkSig(s, pk), "Signatures do not match")');
     });
 
     // test_fail_checkdatasig
@@ -473,12 +485,14 @@ describe('Debugging tests', () => {
       const checkDataSigTransaction = contract.functions
         .test_fail_checkdatasig(new SignatureTemplate(alicePriv).generateSignature(hexToBin('0xbeef')).slice(0, -1), '0xbeef', bobPub)
         .to(contract.address, 1000n);
-      await expect(checkDataSigTransaction).toFailRequireWith(/Data Signatures do not match/);
+      await expect(checkDataSigTransaction).toFailRequireWith('Test.cash:86 Require statement failed at input 0 in contract Test.cash at line 86 with the following message: Data Signatures do not match.');
+      await expect(checkDataSigTransaction).toFailRequireWith('Failing statement: require(checkDataSig(s, message, pk), "Data Signatures do not match")');
 
       const checkDataSigTransactionWrongMessage = contract.functions
         .test_fail_checkdatasig(new SignatureTemplate(alicePriv).generateSignature(hexToBin('0xc0ffee')).slice(0, -1), '0xbeef', alicePub)
         .to(contract.address, 1000n);
-      await expect(checkDataSigTransactionWrongMessage).toFailRequireWith(/Data Signatures do not match/);
+      await expect(checkDataSigTransactionWrongMessage).toFailRequireWith('Test.cash:86 Require statement failed at input 0 in contract Test.cash at line 86 with the following message: Data Signatures do not match.');
+      await expect(checkDataSigTransactionWrongMessage).toFailRequireWith('Failing statement: require(checkDataSig(s, message, pk), "Data Signatures do not match")');
     });
 
     // test_fail_checkmultisig
@@ -495,7 +509,7 @@ describe('Debugging tests', () => {
           alicePub,
         )
         .to(contract.address, 1000n);
-      await expect(checkmultiSigTransaction).toFailRequireWith(/Multi Signatures do not match/);
+      await expect(checkmultiSigTransaction).toFailRequireWith(/Multi Signatures do not match1/);
     });
 
     // test_fail_large_cleanup
@@ -504,7 +518,8 @@ describe('Debugging tests', () => {
       provider.addUtxo(contract.address, randomUtxo());
 
       const transaction = contract.functions.test_fail_large_cleanup().to(contract.address, 1000n);
-      await expect(transaction).toFailRequireWith(/1 should equal 2/);
+      await expect(transaction).toFailRequireWith('Test.cash:19 Require statement failed at input 0 in contract Test.cash at line 19 with the following message: 1 should equal 2.');
+      await expect(transaction).toFailRequireWith('Failing statement: require(1 == 2, "1 should equal 2")');
     });
   });
 

From 2888465ea94d103a1055b727fc9081035f98e6c8 Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Tue, 27 Aug 2024 10:47:16 +0200
Subject: [PATCH 146/171] Update Libauth to v3 and enable checkMultiSig test in
 debugging tests

---
 examples/common-js.js                      |  4 ++--
 examples/common.ts                         |  8 ++++----
 examples/package.json                      |  2 +-
 packages/cashc/package.json                |  2 +-
 packages/cashscript/package.json           |  2 +-
 packages/cashscript/src/utils.ts           | 10 ++++++----
 packages/cashscript/test/debugging.test.ts |  6 +++---
 packages/cashscript/test/fixture/vars.ts   |  8 ++++----
 packages/cashscript/test/test-util.ts      |  5 +++--
 packages/utils/package.json                |  2 +-
 yarn.lock                                  | 13 ++++---------
 11 files changed, 30 insertions(+), 32 deletions(-)

diff --git a/examples/common-js.js b/examples/common-js.js
index 7539c2c1..82e1c1a2 100644
--- a/examples/common-js.js
+++ b/examples/common-js.js
@@ -11,7 +11,7 @@ import bip39 from 'bip39';
 
 // Generate entropy from BIP39 mnemonic phrase and initialise a root HD-wallet node
 const seed = await bip39.mnemonicToSeed('CashScript Examples');
-const rootNode = deriveHdPrivateNodeFromSeed(seed, true);
+const rootNode = deriveHdPrivateNodeFromSeed(seed, { assumeValidity: true, throwErrors: true });
 const baseDerivationPath = "m/44'/145'/0'/0";
 
 // Derive Alice's private key, public key, public key hash and address
@@ -20,4 +20,4 @@ if (typeof aliceNode === 'string') throw new Error();
 export const alicePub = secp256k1.derivePublicKeyCompressed(aliceNode.privateKey);
 export const alicePriv = aliceNode.privateKey;
 export const alicePkh = hash160(alicePub);
-export const aliceAddress = encodeCashAddress('bchtest', 'p2pkh', alicePkh);
+export const aliceAddress = encodeCashAddress({ prefix: 'bchtest', type: 'p2pkh', payload: alicePkh, throwErrors: true }).address;
diff --git a/examples/common.ts b/examples/common.ts
index f1559a40..b3445c49 100644
--- a/examples/common.ts
+++ b/examples/common.ts
@@ -10,7 +10,7 @@ import { PriceOracle } from './PriceOracle.js';
 
 // Generate entropy from BIP39 mnemonic phrase and initialise a root HD-wallet node
 const seed = await bip39.mnemonicToSeed('CashScript Examples');
-const rootNode = deriveHdPrivateNodeFromSeed(seed, true);
+const rootNode = deriveHdPrivateNodeFromSeed(seed, { assumeValidity: true, throwErrors: true });
 const baseDerivationPath = "m/44'/145'/0'/0";
 
 // Derive Alice's private key, public key, public key hash and address
@@ -19,7 +19,7 @@ if (typeof aliceNode === 'string') throw new Error();
 export const alicePub = secp256k1.derivePublicKeyCompressed(aliceNode.privateKey) as Uint8Array;
 export const alicePriv = aliceNode.privateKey;
 export const alicePkh = hash160(alicePub);
-export const aliceAddress = encodeCashAddress('bchtest', 'p2pkhWithTokens', alicePkh);
+export const aliceAddress = encodeCashAddress({ prefix: 'bchtest', type: 'p2pkhWithTokens', payload: alicePkh, throwErrors: true }).address;
 
 // Derive Bob's private key, public key, public key hash and address
 const bobNode = deriveHdPath(rootNode, `${baseDerivationPath}/1`);
@@ -27,7 +27,7 @@ if (typeof bobNode === 'string') throw new Error();
 export const bobPub = secp256k1.derivePublicKeyCompressed(bobNode.privateKey) as Uint8Array;
 export const bobPriv = bobNode.privateKey;
 export const bobPkh = hash160(bobPub);
-export const bobAddress = encodeCashAddress('bchtest', 'p2pkhWithTokens', bobPkh);
+export const bobAddress = encodeCashAddress({ prefix: 'bchtest', type: 'p2pkhWithTokens', payload: bobPkh, throwErrors: true }).address;
 
 // Initialise a price oracle with a private key
 const oracleNode = deriveHdPath(rootNode, `${baseDerivationPath}/2`);
@@ -36,4 +36,4 @@ export const oraclePub = secp256k1.derivePublicKeyCompressed(oracleNode.privateK
 export const oraclePriv = oracleNode.privateKey;
 export const oracle = new PriceOracle(oracleNode.privateKey);
 export const oraclePkh = hash160(oraclePub);
-export const oracleAddress = encodeCashAddress('bchtest', 'p2pkhWithTokens', oraclePkh);
+export const oracleAddress = encodeCashAddress({ prefix: 'bchtest', type: 'p2pkhWithTokens', payload: oraclePkh, throwErrors: true }).address;
diff --git a/examples/package.json b/examples/package.json
index a1ac1a94..0307f788 100644
--- a/examples/package.json
+++ b/examples/package.json
@@ -11,7 +11,7 @@
     "lint": "eslint . --ext .ts --ignore-path ../.eslintignore"
   },
   "dependencies": {
-    "@bitauth/libauth": "^2.0.0-alpha.8",
+    "@bitauth/libauth": "^3.0.0",
     "@types/node": "^12.7.8",
     "bip39": "^3.0.4",
     "cashc": "^0.10.0-next.6",
diff --git a/packages/cashc/package.json b/packages/cashc/package.json
index 7142a7e0..3e3a70b5 100644
--- a/packages/cashc/package.json
+++ b/packages/cashc/package.json
@@ -49,7 +49,7 @@
     "test": "NODE_OPTIONS='--experimental-vm-modules --no-warnings' jest"
   },
   "dependencies": {
-    "@bitauth/libauth": "^2.0.0",
+    "@bitauth/libauth": "^3.0.0",
     "@cashscript/utils": "^0.10.0-next.6",
     "antlr4": "^4.13.1-patch-1",
     "commander": "^7.1.0",
diff --git a/packages/cashscript/package.json b/packages/cashscript/package.json
index d687d0b1..d58f4a61 100644
--- a/packages/cashscript/package.json
+++ b/packages/cashscript/package.json
@@ -43,7 +43,7 @@
     "test": "NODE_OPTIONS='--experimental-vm-modules --no-warnings' jest"
   },
   "dependencies": {
-    "@bitauth/libauth": "^2.0.0",
+    "@bitauth/libauth": "^3.0.0",
     "@cashscript/utils": "^0.10.0-next.6",
     "bip68": "^1.0.4",
     "bitcoin-rpc-promise-retry": "^1.3.0",
diff --git a/packages/cashscript/src/utils.ts b/packages/cashscript/src/utils.ts
index acc36cea..718febb2 100644
--- a/packages/cashscript/src/utils.ts
+++ b/packages/cashscript/src/utils.ts
@@ -211,10 +211,13 @@ export function toRegExp(reasons: string[]): RegExp {
 export function scriptToAddress(
   script: Script, network: string, addressType: AddressType, tokenSupport: boolean,
 ): string {
-  const lockingBytecode = scriptToLockingBytecode(script, addressType);
+  const bytecode = scriptToLockingBytecode(script, addressType);
   const prefix = getNetworkPrefix(network);
-  const address = lockingBytecodeToCashAddress(lockingBytecode, prefix, { tokenSupport }) as string;
-  return address;
+
+  const result = lockingBytecodeToCashAddress({ bytecode, prefix, tokenSupport });
+  if (typeof result === 'string') throw new Error(result);
+
+  return result.address;
 }
 
 export function scriptToLockingBytecode(script: Script, addressType: AddressType): Uint8Array {
@@ -255,7 +258,6 @@ export function utxoTokenComparator(a: Utxo, b: Utxo): number {
 */
 export function addressToLockScript(address: string): Uint8Array {
   const result = cashAddressToLockingBytecode(address);
-
   if (typeof result === 'string') throw new Error(result);
 
   return result.bytecode;
diff --git a/packages/cashscript/test/debugging.test.ts b/packages/cashscript/test/debugging.test.ts
index 82b58920..aed28ae3 100644
--- a/packages/cashscript/test/debugging.test.ts
+++ b/packages/cashscript/test/debugging.test.ts
@@ -496,8 +496,7 @@ describe('Debugging tests', () => {
     });
 
     // test_fail_checkmultisig
-    // TODO: Add test for checkmultisig (requires ECDSA signatures) after refactoring Libauth Template generation
-    it.skip('should fail with correct error message when checkMultiSig fails', async () => {
+    it('should fail with correct error message when checkMultiSig fails', async () => {
       const contract = new Contract(artifact, [], { provider });
       provider.addUtxo(contract.address, randomUtxo());
 
@@ -509,7 +508,8 @@ describe('Debugging tests', () => {
           alicePub,
         )
         .to(contract.address, 1000n);
-      await expect(checkmultiSigTransaction).toFailRequireWith(/Multi Signatures do not match1/);
+      await expect(checkmultiSigTransaction).toFailRequireWith('Test.cash:90 Require statement failed at input 0 in contract Test.cash at line 90 with the following message: Multi Signatures do not match.');
+      await expect(checkmultiSigTransaction).toFailRequireWith('Failing statement: require(checkMultiSig([s1, s2], [pk1, pk2]), "Multi Signatures do not match")');
     });
 
     // test_fail_large_cleanup
diff --git a/packages/cashscript/test/fixture/vars.ts b/packages/cashscript/test/fixture/vars.ts
index 97b75aae..a228270e 100644
--- a/packages/cashscript/test/fixture/vars.ts
+++ b/packages/cashscript/test/fixture/vars.ts
@@ -13,7 +13,7 @@ export const network = Network.CHIPNET;
 
 const seed = await bip39.mnemonicToSeed('CashScript Tests');
 
-const rootNode = deriveHdPrivateNodeFromSeed(seed, true);
+const rootNode = deriveHdPrivateNodeFromSeed(seed, { assumeValidity: true, throwErrors: true });
 const baseDerivationPath = "m/44'/145'/0'/0";
 
 const aliceNode = deriveHdPath(rootNode, `${baseDerivationPath}/0`);
@@ -26,17 +26,17 @@ if (typeof carolNode === 'string') throw new Error();
 export const alicePriv = aliceNode.privateKey;
 export const alicePub = secp256k1.derivePublicKeyCompressed(alicePriv) as Uint8Array;
 export const alicePkh = hash160(alicePub);
-export const aliceAddress = encodeCashAddress('bchtest', 'p2pkh', alicePkh);
+export const aliceAddress = encodeCashAddress({ prefix: 'bchtest', type: 'p2pkh', payload: alicePkh, throwErrors: true }).address;
 
 export const bobPriv = bobNode.privateKey;
 export const bobPub = secp256k1.derivePublicKeyCompressed(bobPriv) as Uint8Array;
 export const bobPkh = hash160(bobPub);
-export const bobAddress = encodeCashAddress('bchtest', 'p2pkh', bobPkh);
+export const bobAddress = encodeCashAddress({ prefix: 'bchtest', type: 'p2pkh', payload: bobPkh, throwErrors: true }).address;
 
 export const carolPriv = carolNode.privateKey;
 export const carolPub = secp256k1.derivePublicKeyCompressed(carolPriv) as Uint8Array;
 export const carolPkh = hash160(carolPub);
-export const carolAddress = encodeCashAddress('bchtest', 'p2pkh', carolPkh);
+export const carolAddress = encodeCashAddress({ prefix: 'bchtest', type: 'p2pkh', payload: carolPkh, throwErrors: true }).address;
 
 export const oracle = new PriceOracle(bobPriv);
 export const oraclePub = bobPub;
diff --git a/packages/cashscript/test/test-util.ts b/packages/cashscript/test/test-util.ts
index 6ed4cff8..fd7e8f90 100644
--- a/packages/cashscript/test/test-util.ts
+++ b/packages/cashscript/test/test-util.ts
@@ -20,10 +20,11 @@ export function getTxOutputs(tx: Transaction, network: Network = defaultNetwork)
     const prefix = getNetworkPrefix(network);
     const cashscriptOutput = libauthOutputToCashScriptOutput(o);
     const hasTokens = Boolean(cashscriptOutput.token);
-    const address = lockingBytecodeToCashAddress(hexToBin(scriptHex), prefix, { tokenSupport: hasTokens }) as string;
+    const result = lockingBytecodeToCashAddress({ bytecode: hexToBin(scriptHex), prefix, tokenSupport: hasTokens });
+    if (typeof result === 'string') throw new Error(result);
 
     return {
-      to: address,
+      to: result.address,
       amount: o.valueSatoshis,
       token: cashscriptOutput.token,
     };
diff --git a/packages/utils/package.json b/packages/utils/package.json
index 99b90e6f..732ee591 100644
--- a/packages/utils/package.json
+++ b/packages/utils/package.json
@@ -40,7 +40,7 @@
     "test": "NODE_OPTIONS='--experimental-vm-modules --no-warnings' jest"
   },
   "dependencies": {
-    "@bitauth/libauth": "^2.0.0",
+    "@bitauth/libauth": "^3.0.0",
     "hash.js": "^1.1.7"
   },
   "devDependencies": {
diff --git a/yarn.lock b/yarn.lock
index f3964ec9..1cfb6b96 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -496,15 +496,10 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@bitauth/libauth@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@bitauth/libauth/-/libauth-2.0.0.tgz#200a3c967bf1ab088a9ea17691ee354283aee0a6"
-  integrity sha512-wFnQtnJvz7S7jU7fQuBJzRQrVHk46DELd5s8D0F61bW567bKVVfMLbwNPCs12pzVckueQTlLwCS//I9skGI1zg==
-
-"@bitauth/libauth@^2.0.0-alpha.8":
-  version "2.0.0-alpha.8"
-  resolved "https://registry.yarnpkg.com/@bitauth/libauth/-/libauth-2.0.0-alpha.8.tgz#352ade2075517f1548e05553e7bb1c5e1023d1fe"
-  integrity sha512-KINAJbzg5pKs+WM8wCjWw6Ct/CeZG1JMrRXsIyPFztjNtwA5eeQL8eFkyquePsf8aZ5peRYK2eFPUDo/1rkg+w==
+"@bitauth/libauth@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@bitauth/libauth/-/libauth-3.0.0.tgz#d88535fc5353d5ecd11db96d9a229e11c06a43d2"
+  integrity sha512-3yoL31XpnhAnf5nDVMFk4xPqebxDwXrgYAwpa31ARJnV5A/eXWlpNYvCd6FTZPFM4VvKfjCBi+jRCrw1hOZ0Jg==
 
 "@cnakazawa/watch@^1.0.3":
   version "1.0.4"

From 4446fc1691b05d2bd50df2189ac75be49f32886f Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Tue, 27 Aug 2024 10:55:24 +0200
Subject: [PATCH 147/171] Mark some re-exports as 'type' so tsx doesn't
 complain + update example pragmas

---
 examples/announcement.cash               |  2 +-
 examples/hodl_vault.cash                 |  2 +-
 examples/mecenas.cash                    |  2 +-
 examples/mecenas_locktime.cash           |  2 +-
 examples/p2pkh.cash                      |  2 +-
 examples/transfer_with_timeout.cash      |  2 +-
 packages/cashscript/src/index.ts         | 12 +++++-------
 packages/cashscript/src/network/index.ts |  2 +-
 8 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/examples/announcement.cash b/examples/announcement.cash
index e10ccea4..6f06492b 100644
--- a/examples/announcement.cash
+++ b/examples/announcement.cash
@@ -1,4 +1,4 @@
-pragma cashscript ^0.9.0;
+pragma cashscript ^0.10.0;
 
 /* This is a contract showcasing covenants outside of regular transactional use.
  * It enforces the contract to make an "announcement" on Memo.cash, and send the
diff --git a/examples/hodl_vault.cash b/examples/hodl_vault.cash
index a687a4c2..3e92be36 100644
--- a/examples/hodl_vault.cash
+++ b/examples/hodl_vault.cash
@@ -1,4 +1,4 @@
-pragma cashscript ^0.9.0;
+pragma cashscript ^0.10.0;
 
 // This contract forces HODLing until a certain price target has been reached
 // A minimum block is provided to ensure that oracle price entries from before this block are disregarded
diff --git a/examples/mecenas.cash b/examples/mecenas.cash
index 82e1a274..268c4cf7 100644
--- a/examples/mecenas.cash
+++ b/examples/mecenas.cash
@@ -1,4 +1,4 @@
-pragma cashscript ^0.9.0;
+pragma cashscript ^0.10.0;
 
 /* This is an unofficial CashScript port of Licho's Mecenas contract. It is
  * not compatible with Licho's EC plugin, but rather meant as a demonstration
diff --git a/examples/mecenas_locktime.cash b/examples/mecenas_locktime.cash
index 471f9173..8ea17dc4 100644
--- a/examples/mecenas_locktime.cash
+++ b/examples/mecenas_locktime.cash
@@ -1,4 +1,4 @@
-pragma cashscript ^0.9.0;
+pragma cashscript ^0.10.0;
 
 // This is an experimental contract for a more "streaming" Mecenas experience
 // Completely untested, just a concept
diff --git a/examples/p2pkh.cash b/examples/p2pkh.cash
index 02e6ad68..974ca04a 100644
--- a/examples/p2pkh.cash
+++ b/examples/p2pkh.cash
@@ -1,4 +1,4 @@
-pragma cashscript ^0.9.0;
+pragma cashscript ^0.10.0;
 
 contract P2PKH(bytes20 pkh) {
     // Require pk to match stored pkh and signature to match
diff --git a/examples/transfer_with_timeout.cash b/examples/transfer_with_timeout.cash
index ea04b5f8..9d4aaa1a 100644
--- a/examples/transfer_with_timeout.cash
+++ b/examples/transfer_with_timeout.cash
@@ -1,4 +1,4 @@
-pragma cashscript ^0.9.0;
+pragma cashscript ^0.10.0;
 
 contract TransferWithTimeout(
     pubkey sender,
diff --git a/packages/cashscript/src/index.ts b/packages/cashscript/src/index.ts
index f485f4bf..4b9d2228 100644
--- a/packages/cashscript/src/index.ts
+++ b/packages/cashscript/src/index.ts
@@ -1,16 +1,14 @@
-import SignatureTemplate from './SignatureTemplate.js';
-
-export { SignatureTemplate };
-export { Contract, ContractFunction } from './Contract.js';
+export { default as SignatureTemplate } from './SignatureTemplate.js';
+export { Contract, type ContractFunction } from './Contract.js';
 export { Transaction } from './Transaction.js';
 export { TransactionBuilder } from './TransactionBuilder.js';
-export { Argument, encodeArgument } from './Argument.js';
-export { Artifact, AbiFunction, AbiInput } from '@cashscript/utils';
+export { type Argument, encodeArgument } from './Argument.js';
+export type { Artifact, AbiFunction, AbiInput } from '@cashscript/utils';
 export * as utils from '@cashscript/utils';
 export * from './interfaces.js';
 export * from './Errors.js';
 export {
-  NetworkProvider,
+  type NetworkProvider,
   BitcoinRpcNetworkProvider,
   ElectrumNetworkProvider,
   FullStackNetworkProvider,
diff --git a/packages/cashscript/src/network/index.ts b/packages/cashscript/src/network/index.ts
index 6feb6217..8d31ddde 100644
--- a/packages/cashscript/src/network/index.ts
+++ b/packages/cashscript/src/network/index.ts
@@ -1,4 +1,4 @@
-export { default as NetworkProvider } from './NetworkProvider.js';
+export type { default as NetworkProvider } from './NetworkProvider.js';
 export { default as BitcoinRpcNetworkProvider } from './BitcoinRpcNetworkProvider.js';
 export { default as ElectrumNetworkProvider } from './ElectrumNetworkProvider.js';
 export { default as FullStackNetworkProvider } from './FullStackNetworkProvider.js';

From a9954ab038a5931b9cdf90d7143beb6dec051b12 Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Tue, 27 Aug 2024 11:03:36 +0200
Subject: [PATCH 148/171] Merge getLocationDataForInstructionPointer logic from
 require/non-require errors

---
 packages/cashscript/src/Errors.ts | 55 +++++++++++--------------------
 1 file changed, 20 insertions(+), 35 deletions(-)

diff --git a/packages/cashscript/src/Errors.ts b/packages/cashscript/src/Errors.ts
index e89857c8..7b52be8b 100644
--- a/packages/cashscript/src/Errors.ts
+++ b/packages/cashscript/src/Errors.ts
@@ -1,4 +1,4 @@
-import { Artifact, RequireStatement, SingleLocationData, sourceMapToLocationData, Type } from '@cashscript/utils';
+import { Artifact, RequireStatement, sourceMapToLocationData, Type } from '@cashscript/utils';
 
 export class TypeError extends Error {
   constructor(actual: string, expected: Type) {
@@ -31,8 +31,6 @@ export class FailedTransactionError extends Error {
   }
 }
 
-// TODO: Merge the location stuff with FailedRequireError
-// TODO: Add tests and make sure it works for multiline statements
 export class FailedTransactionEvaluationError extends FailedTransactionError {
   constructor(
     public artifact: Artifact,
@@ -44,17 +42,8 @@ export class FailedTransactionEvaluationError extends FailedTransactionError {
     let baseMessage = `${artifact.contractName}.cash Error in transaction at input ${inputIndex} in contract ${artifact.contractName}.cash.`;
 
     if (artifact.debug) {
-      const failingLocation = getLocationDataForInstructionPointer(artifact, failingInstructionPointer);
-
-      const failingStatementLineString = artifact.source.split('\n')[failingLocation.location.start.line - 1];
-      const failingStatementString = failingStatementLineString.slice(
-        failingLocation.location.start.column,
-        failingLocation.location.end.column,
-      );
-
-      const failingLine = failingLocation.location.start.line;
-
-      baseMessage = `${artifact.contractName}.cash:${failingLine} Error in transaction at input ${inputIndex} in contract ${artifact.contractName}.cash at line ${failingLine}.\nFailing statement: ${failingStatementString}`;
+      const { statement, lineNumber } = getLocationDataForInstructionPointer(artifact, failingInstructionPointer);
+      baseMessage = `${artifact.contractName}.cash:${lineNumber} Error in transaction at input ${inputIndex} in contract ${artifact.contractName}.cash at line ${lineNumber}.\nFailing statement: ${statement}`;
     }
 
     super(`${baseMessage}\nReason: ${libauthErrorMessage}`, bitauthUri);
@@ -70,45 +59,41 @@ export class FailedRequireError extends FailedTransactionError {
     public bitauthUri: string,
     public libauthErrorMessage?: string,
   ) {
-    const failingLocation = getLocationDataForInstructionPointer(artifact, failingInstructionPointer);
-
-    const failingStatementLineString = artifact.source.split('\n')[failingLocation.location.start.line - 1];
-    let failingStatementString = failingStatementLineString.slice(
-      failingLocation.location.start.column,
-      failingLocation.location.end.column,
-    );
-
-    if (!failingStatementString.includes('require')) {
-      failingStatementString = requireStatement.message
-        ? `require(${failingStatementString}, "${requireStatement.message}")`
-        : `require(${failingStatementString})`;
-    }
+    let { statement, lineNumber } = getLocationDataForInstructionPointer(artifact, failingInstructionPointer);
 
-    failingStatementString = failingStatementString.trim().replace(/;$/g, '');
-
-    const failingLine = failingLocation.location.start.line;
+    if (!statement.includes('require')) {
+      statement = requireStatement.message
+        ? `require(${statement}, "${requireStatement.message}")`
+        : `require(${statement})`;
+    }
 
-    const baseMessage = `${artifact.contractName}.cash:${failingLine} Require statement failed at input ${inputIndex} in contract ${artifact.contractName}.cash at line ${failingLine}`;
+    const baseMessage = `${artifact.contractName}.cash:${lineNumber} Require statement failed at input ${inputIndex} in contract ${artifact.contractName}.cash at line ${lineNumber}`;
     const baseMessageWithRequireMessage = `${baseMessage} with the following message: ${requireStatement.message}`;
-    const fullMessage = `${requireStatement.message ? baseMessageWithRequireMessage : baseMessage}.\nFailing statement: ${failingStatementString}`;
+    const fullMessage = `${requireStatement.message ? baseMessageWithRequireMessage : baseMessage}.\nFailing statement: ${statement}`;
 
     super(fullMessage, bitauthUri);
   }
 }
 
+// TODO: Add tests and make sure it works for multiline statements
 const getLocationDataForInstructionPointer = (
   artifact: Artifact,
   instructionPointer: number,
-): SingleLocationData => {
+): { lineNumber: number, statement: string } => {
   const locationData = sourceMapToLocationData(artifact.debug!.sourceMap);
 
   // We subtract the constructor inputs because these are present in the evaluation (and thus the instruction pointer)
   // but they are not present in the source code (and thus the location data)
   const modifiedInstructionPointer = instructionPointer - artifact.constructorInputs.length;
 
-  const location = locationData[modifiedInstructionPointer];
+  const { location } = locationData[modifiedInstructionPointer];
+
+  const lineString = artifact.source.split('\n')[location.start.line - 1];
+  const statement = lineString.slice(location.start.column, location.end.column);
+
+  const lineNumber = location.start.line;
 
-  return location;
+  return { statement, lineNumber };
 };
 
 // TODO: Expand these reasons with non-script failures (like tx-mempool-conflict)

From 134530874cdb19f4150f5e41824bcdfce67a526e Mon Sep 17 00:00:00 2001
From: Mathieu Geukens <mr-zwets@protonmail.com>
Date: Wed, 28 Aug 2024 14:58:56 +0200
Subject: [PATCH 149/171] update pragma version in documentation

---
 website/docs/basics/getting-started.md |  2 +-
 website/docs/language/contracts.md     | 10 +++++-----
 website/docs/language/examples.md      |  4 ++--
 website/docs/sdk/examples.md           |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/website/docs/basics/getting-started.md b/website/docs/basics/getting-started.md
index 49b393ab..938f38d9 100644
--- a/website/docs/basics/getting-started.md
+++ b/website/docs/basics/getting-started.md
@@ -45,7 +45,7 @@ We can start from a basic `TransferWithTimeout` smart contract. Create a new fil
 The `TransferWithTimeout` contract takes in 3 contract arguments and has 2 contract functions: `transfer` and `timeout`.
 
 ```solidity
-pragma cashscript ^0.9.0;
+pragma cashscript ^0.10.0;
 
 contract TransferWithTimeout(pubkey sender, pubkey recipient, int timeout) {
     // Allow the recipient to claim their received money
diff --git a/website/docs/language/contracts.md b/website/docs/language/contracts.md
index b89f468b..dd07437d 100644
--- a/website/docs/language/contracts.md
+++ b/website/docs/language/contracts.md
@@ -13,7 +13,7 @@ The pragma directive follows regular [semantic versioning rules](https://semver.
 
 #### Example
 ```solidity
-pragma cashscript ^0.9.0;
+pragma cashscript ^0.10.0;
 pragma cashscript >= 0.7.0 < 0.9.3;
 ```
 
@@ -22,7 +22,7 @@ A CashScript constructor works slightly differently than what you might be used
 
 #### Example
 ```solidity
-pragma cashscript ^0.9.0;
+pragma cashscript ^0.10.0;
 
 contract HTLC(pubkey sender, pubkey recipient, int expiration, bytes32 hash) {
     ...
@@ -38,7 +38,7 @@ The main construct in a CashScript contract is the function. A contract can cont
 
 #### Example
 ```solidity
-pragma cashscript ^0.9.0;
+pragma cashscript ^0.10.0;
 
 contract TransferWithTimeout(pubkey sender, pubkey recipient, int timeout) {
     function transfer(sig recipientSig) {
@@ -69,7 +69,7 @@ The error message in a `require` statement is only available in debug evaluation
 
 #### Example
 ```solidity
-pragma cashscript ^0.9.0;
+pragma cashscript ^0.10.0;
 
 contract P2PKH(bytes20 pkh) {
     function spend(pubkey pk, sig s) {
@@ -111,7 +111,7 @@ There is no implicit type conversion from non-boolean to boolean types. So `if (
 
 #### Example
 ```solidity
-pragma cashscript ^0.9.0;
+pragma cashscript ^0.10.0;
 
 contract OneOfTwo(bytes20 pkh1, bytes32 hash1, bytes20 pkh2, bytes32 hash2) {
     function spend(pubkey pk, sig s, bytes message) {
diff --git a/website/docs/language/examples.md b/website/docs/language/examples.md
index 325d3141..47024987 100644
--- a/website/docs/language/examples.md
+++ b/website/docs/language/examples.md
@@ -10,7 +10,7 @@ One interesting use case of Bitcoin Cash is using it for *paper tips*. With pape
 As an alternative, a smart contract can be used for these kinds of gifts. This smart contract allows the recipient to claim their gift at any time, but if they don't claim it in time, the sender can reclaim it.
 
 ```solidity
-pragma cashscript ^0.9.0;
+pragma cashscript ^0.10.0;
 
 contract TransferWithTimeout(pubkey sender, pubkey recipient, int timeout) {
     // Require recipient's signature to match
@@ -36,7 +36,7 @@ This smart contract works by connecting with a price oracle. This price oracle i
 This involves some degree of trust in the price oracle, but since the oracle produces price data for everyone to use, their incentive to attack *your* smart contract is minimised. To improve this situation, you can also choose to connect with multiple oracle providers so you do not have to trust a single party.
 
 ```solidity
-pragma cashscript ^0.9.0;
+pragma cashscript ^0.10.0;
 
 // A minimum block is provided to ensure that oracle price entries from before
 // this block are disregarded. i.e. when the BCH price was $1000 in the past,
diff --git a/website/docs/sdk/examples.md b/website/docs/sdk/examples.md
index 79028e61..bb1214d3 100644
--- a/website/docs/sdk/examples.md
+++ b/website/docs/sdk/examples.md
@@ -56,7 +56,7 @@ This contract expects a hardcoded transaction fee of 1000 satoshis. This is nece
 To ensure that this leftover money does not get lost in the contract, the contract performs an extra check, and adds the remainder to the transaction fee if it's too low.
 
 ```solidity title="Announcement.cash"
-pragma cashscript ^0.9.0;
+pragma cashscript ^0.10.0;
 
 // This contract enforces making an announcement on Memo.cash and sending the
 // remaining balance back to the contract.

From d50b3995dd020b7d2a5eb9a9fd9cc02df74ff5c7 Mon Sep 17 00:00:00 2001
From: Mathieu Geukens <mr-zwets@protonmail.com>
Date: Wed, 28 Aug 2024 15:09:50 +0200
Subject: [PATCH 150/171] add separate category to sidebar for compiler topics

---
 website/docs/{language => compiler}/artifacts.md |  0
 website/docs/{basics => compiler}/compiler.md    |  0
 website/docs/{language => compiler}/grammar.md   |  0
 website/docs/sdk/instantiation.md                |  2 +-
 website/sidebars.js                              | 12 +++++++++---
 5 files changed, 10 insertions(+), 4 deletions(-)
 rename website/docs/{language => compiler}/artifacts.md (100%)
 rename website/docs/{basics => compiler}/compiler.md (100%)
 rename website/docs/{language => compiler}/grammar.md (100%)

diff --git a/website/docs/language/artifacts.md b/website/docs/compiler/artifacts.md
similarity index 100%
rename from website/docs/language/artifacts.md
rename to website/docs/compiler/artifacts.md
diff --git a/website/docs/basics/compiler.md b/website/docs/compiler/compiler.md
similarity index 100%
rename from website/docs/basics/compiler.md
rename to website/docs/compiler/compiler.md
diff --git a/website/docs/language/grammar.md b/website/docs/compiler/grammar.md
similarity index 100%
rename from website/docs/language/grammar.md
rename to website/docs/compiler/grammar.md
diff --git a/website/docs/sdk/instantiation.md b/website/docs/sdk/instantiation.md
index 71d8fd26..68f617d6 100644
--- a/website/docs/sdk/instantiation.md
+++ b/website/docs/sdk/instantiation.md
@@ -25,7 +25,7 @@ new Contract(
 
 A CashScript contract can be instantiated by providing an `Artifact` object, a list of constructor arguments, and optionally an options object configuring `NetworkProvider` and `addressType`.
 
-An `Artifact` object is the result of compiling a CashScript contract. See the [Language Documentation](/docs/language/artifacts) for more information on Artifacts. Compilation can be done using the standalone [`cashc` CLI](/docs/basics/compiler) or programmatically with the `cashc` NPM package (see [CashScript Compiler](/docs/basics/compiler#javascript-compilation)).
+An `Artifact` object is the result of compiling a CashScript contract. See the [Language Documentation](/docs/language/artifacts) for more information on Artifacts. Compilation can be done using the standalone [`cashc` CLI](/docs/compiler/compiler) or programmatically with the `cashc` NPM package (see [CashScript Compiler](/docs/compiler/compiler#javascript-compilation)).
 
 The `NetworkProvider` option is used to manage network operations for the CashScript contract. By default, a mainnet `ElectrumNetworkProvider` is used, but the network providers can be configured. See the docs on [NetworkProvider](/docs/sdk/network-provider).
 
diff --git a/website/sidebars.js b/website/sidebars.js
index 888c1069..676b87db 100755
--- a/website/sidebars.js
+++ b/website/sidebars.js
@@ -7,7 +7,6 @@ module.exports = {
         'basics/about',
         // 'basics/about-bch',
         'basics/getting-started',
-        'basics/compiler',
       ],
     },
     {
@@ -18,11 +17,18 @@ module.exports = {
         'language/types',
         'language/functions',
         'language/globals',
-        'language/artifacts',
-        'language/grammar',
         'language/examples',
       ],
     },
+    {
+      type: 'category',
+      label: 'Compiler',
+      items: [
+        'compiler/compiler',
+        'compiler/artifacts',
+        'compiler/grammar',
+      ],
+    },
     {
       type: 'category',
       label: 'JavaScript SDK',

From 089c5508baf5976d567e65ba0cdfe2a938ba49bb Mon Sep 17 00:00:00 2001
From: Mathieu Geukens <mr-zwets@protonmail.com>
Date: Wed, 28 Aug 2024 15:52:28 +0200
Subject: [PATCH 151/171] fully rewrite intro section to Bitcoin Cash

---
 website/docs/basics/about-bch.md | 43 +++++++++++++-------------------
 website/sidebars.js              |  2 +-
 2 files changed, 18 insertions(+), 27 deletions(-)

diff --git a/website/docs/basics/about-bch.md b/website/docs/basics/about-bch.md
index 9451f43e..47f022b5 100644
--- a/website/docs/basics/about-bch.md
+++ b/website/docs/basics/about-bch.md
@@ -1,43 +1,34 @@
 ---
-title: What is Bitcoin Cash?
+title: Intro to Bitcoin Cash
 sidebar_label: About Bitcoin Cash
 ---
 
-:::warning
-This is a work in progress page, it will be added to the site structure at a later date. If you still somehow arrived at this page, feel free to read it, but note that it is a work in progress.
-:::
-
-Bitcoin Cash (or BCH) is a peer-to-peer electronic cash system. It uses a *blockchain* to distribute its ledger over a network of independent nodes so that there is no single point of failure, and no central control that might be compromised. It uses a consensus algorithm called *Proof-of-Work* that allows these independent nodes to approve correct transactions and reject malicious ones.
+Bitcoin Cash (ticker BCH) is one of the biggest cryptocurrencies. Bitcoin Cash is a fork of Bitcoin started in 2017 because of differences in vision for the future of the Bitcoin project.
 
-## Basics
-The *blockchain* is a data structure that is distributed over a number of independent nodes. It derives its name from the chain of *blocks* that it uses to store its data. All blocks include a *block header* with some metadata and the root of a *Merkle tree* - a special kind of tree that allows quick validation of data. This Merkle tree is then used to store the actual data inside these blocks. To make the chain resistant to
-manipulation, block headers also include a timestamp and a hash of the previous block.
+Bitcoin Cash shares many of the same fundamentals as Bitcoin (BTC) like the *Proof-of-Work* consensus alrgorithm and the *UTXO data-model*. However regarding smart contract programmability, Bitcoin Cash has significantly diverged from Bitcoin (BTC). We will first cover the UTXO data model and then delve into the smart contract capabilities of Bitcoin Cash.
 
-### Proof-of-Work
-Bitcoin Cash and many other public blockchains use a consensus algorithm called *Proof-of-Work (PoW)*. This algorithm works by attaching a nonce to every block header and changing this nonce until the hash of the block header matches a certain prefix. This process is called mining, and is attempted by many nodes at the same time, until one of them has found a correct solution. One of the attributes of this algorithm is that mining is very expensive, but other nodes can verify the solution very quickly.
+:::info
+To learn more about the Bitcoin Basics refer to the book ['Mastering Bitcoin'](https://github.com/bitcoinbook/bitcoinbook). There is also a modified version for BCH specifically called ['Mastering Bitcoin Cash'](https://github.com/Bitcoin-com/mastering-bitcoin-cash).
+:::
 
-Mining is also the process by which new coins are introduced to the total monetary supply. Miners validate transactions and secure the network, for which they are paid new coins - called the *block reward* - in a special transaction called a *coinbase* transaction. The high cost of the mining process attaches a financial risk to incorrectly validating transactions. At the same time the block reward attaches a financial reward to correctly validating transactions. This process ensures that the mutually distrusting nodes can collaborate to validate transactions.
+## UTXO model
+Bitcoin Cash transactions work with in- and outputs. All current balances are so called *Unspent Transaction Outputs (UTXOs)*, which simply means they can be used as inputs for future spending transactions.
 
-### Transactions
-Bitcoin Cash transactions are created using chunks of BCH called transaction outputs. When these outputs are available, they are called *Unspent Transaction Outputs (UTXOs)*. UTXOs are locked using a locking script (or `scriptPubKey`) that specifies the conditions to spend the UTXO. When attempting to spend a UTXO, an unlocking script (or `scriptSig`) is provided. These scripts are then executed together and the transaction is only valid if the scripts execute without errors and the resulting value is `TRUE`.
+When UTXOs are used as inputs to a Bitcoin Cash transaction, they produce new UTXOs as outputs. UTXOs need to be spent in their entirety within a transaction. So whenever the user wishes to use a 10 BCH UTXO to send someone 1 BCH, they need to send 9 BCH back to themselves. Realistically, part of the funds would be reserved for transaction fees as well.
 
 The most used locking/unlocking script pattern is called *Pay-to-Public-Key-Hash (P2PKH)*, where the locking script contains the hash of a public key and expects the unlocking script to contain a public key and transaction signature. The locking script then checks that the provided public key matches the stored hash, and that the transaction signature is valid. This pattern is used in regular Bitcoin Cash wallets. And the user's balance is simply the sum of all UTXOs that can be spent by the user's public keys.
 
-UTXOs are used as inputs to Bitcoin Cash transactions and produce new UTXOs as outputs. UTXOs need to be spent in their entirety within a transaction. So whenever the user wishes to use a 10 BCH UTXO to send someone 1 BCH, they need to send 9 BCH back to themselves. Realistically, part of the funds would be
-reserved for transaction fees as well.
+## Smart Contracts on BCH
+Bitcoin Cash has had many script upgrades, including transaction introspection and CashTokens. Because of these upgrades, DeFi is very much possible on Bitcoin Cash. However, compared to EVM, smart contracts work very differently due to BCH's UTXO architecture.
 
-## Smart Contracts
-Peer-to-peer electronic cash was the first real use case of blockchain technology. But in recent years, smart contracts have grown in popularity. These smart contracts allow people to use the security that blockchains such as Bitcoin, Bitcoin Cash and Ethereum offer and apply it to use cases other than cash. Especially Decentralised Finance (DeFi) applications such as [Maker](https://makerdao.com/), [Uniswap](https://uniswap.org/) and [Aave](https://aave.com/) have skyrocketed.
-
-Most smart contract innovation has happened on Ethereum, but other platforms like Bitcoin and Bitcoin Cash have some support for smart contracts as well. Smart contracts on every platform work differently, and the main differences between smart contracts on Ethereum and Bitcoin Cash is that smart contracts on Ethereum are stateful, while those on Bitcoin Cash are stateless.
-
-This means that Ethereum contracts can record and update variables, while the variables in Bitcoin Cash contracts are immutable. To understand the implications of these differences, refer to the blog post [*Smart Contracts on Ethereum, Bitcoin and Bitcoin Cash*](https://kalis.me/smart-contracts-eth-btc-bch/).
+Smart contracts on Bitcoin Cash only have access to the current transaction context, which enables 'local state'. This model allows transactions to be verified independently and efficiently. Because there is no global state that can impact the execution of these smart contracts, the results are deterministic and predictable.
 
 ### Bitcoin Cash Script
-The locking and unlocking scripts of regular transactions and smart contracts on Bitcoin Cash are written using Bitcoin Cash' transaction scripting language, creatively named Script. To avoid ambiguity, it can also be referred to as Bitcoin Script or Bitcoin Cash Script. Script is a stack based assembly-like language that is intentionally not turing complete as its main use is the validation of programmable money, not general purpose computing.
+UTXOs are locked using a locking script (or `scriptPubKey`) that specifies the conditions to spend the UTXO. When attempting to spend a UTXO, an unlocking script (or `scriptSig`) is provided. These scripts are then executed together and the transaction is only valid if the scripts execute without errors and the resulting value is `TRUE`.
+
+The locking and unlocking scripts of regular transactions and smart contracts on Bitcoin Cash are written using Bitcoin Cash' transaction scripting language, creatively named Script. To avoid ambiguity, it can also be referred to as Bitcoin Cash Script or BCH Script. Script is a stack based assembly-like language, because it is a low-level language and requires stack management it is hard to write complex smart contract in Script directly.
 
-Script is stateless, meaning it only uses the information contained within the locking and unlocking scripts themselves. This statelessness means that a Script can be deterministically validated on any machine. This gives increased performance and predictability, although it does limit the usefulness of the scripting language.
 
-### Bitcoin Cash Contracts
+### CashScript
 
-TODO
+CashScript is a high-level programming language for smart contracts on Bitcoin Cash that offers a strong abstraction for a smoother development experience. The CashScript syntax is based on Ethereum's smart contract language Solidity, but its functionality is very different since smart contracts on Bitcoin Cash differ greatly from smart contracts on Ethereum.
\ No newline at end of file
diff --git a/website/sidebars.js b/website/sidebars.js
index 676b87db..38a347bf 100755
--- a/website/sidebars.js
+++ b/website/sidebars.js
@@ -5,7 +5,7 @@ module.exports = {
       label: 'Basics',
       items: [
         'basics/about',
-        // 'basics/about-bch',
+        'basics/about-bch',
         'basics/getting-started',
       ],
     },

From 4d8093e52de7cdf071a0921b4428e7d268eb9bc0 Mon Sep 17 00:00:00 2001
From: Mathieu Geukens <mr-zwets@protonmail.com>
Date: Wed, 28 Aug 2024 16:06:09 +0200
Subject: [PATCH 152/171] fix broken links

---
 website/docs/compiler/compiler.md | 2 +-
 website/docs/sdk/instantiation.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/website/docs/compiler/compiler.md b/website/docs/compiler/compiler.md
index e451bf16..493900f0 100644
--- a/website/docs/compiler/compiler.md
+++ b/website/docs/compiler/compiler.md
@@ -3,7 +3,7 @@ title: Compiler
 ---
 
 The CashScript compiler is called `cashc` and is used to compile CashScript `.cash` contract files into `.json` artifact files.
-These artifact files can be used to instantiate a CashScript contract with the help of the CashScript SDK. For more information on this artifact format refer to [Artifacts](/docs/language/artifacts).
+These artifact files can be used to instantiate a CashScript contract with the help of the CashScript SDK. For more information on this artifact format refer to [Artifacts](/docs/compiler/artifacts).
 
 ## Command Line Interface
 
diff --git a/website/docs/sdk/instantiation.md b/website/docs/sdk/instantiation.md
index 68f617d6..6ccff29a 100644
--- a/website/docs/sdk/instantiation.md
+++ b/website/docs/sdk/instantiation.md
@@ -25,7 +25,7 @@ new Contract(
 
 A CashScript contract can be instantiated by providing an `Artifact` object, a list of constructor arguments, and optionally an options object configuring `NetworkProvider` and `addressType`.
 
-An `Artifact` object is the result of compiling a CashScript contract. See the [Language Documentation](/docs/language/artifacts) for more information on Artifacts. Compilation can be done using the standalone [`cashc` CLI](/docs/compiler/compiler) or programmatically with the `cashc` NPM package (see [CashScript Compiler](/docs/compiler/compiler#javascript-compilation)).
+An `Artifact` object is the result of compiling a CashScript contract. See the [Language Documentation](/docs/compiler/artifacts) for more information on Artifacts. Compilation can be done using the standalone [`cashc` CLI](/docs/compiler) or programmatically with the `cashc` NPM package (see [CashScript Compiler](/docs/compiler#javascript-compilation)).
 
 The `NetworkProvider` option is used to manage network operations for the CashScript contract. By default, a mainnet `ElectrumNetworkProvider` is used, but the network providers can be configured. See the docs on [NetworkProvider](/docs/sdk/network-provider).
 

From 361868fcda2db6264c2da06b859c8a0629c0177a Mon Sep 17 00:00:00 2001
From: Mathieu Geukens <mr-zwets@protonmail.com>
Date: Wed, 28 Aug 2024 16:30:03 +0200
Subject: [PATCH 153/171] change the features on the homepage

---
 website/src/pages/index.js | 33 ++++++++++++++-------------------
 1 file changed, 14 insertions(+), 19 deletions(-)

diff --git a/website/src/pages/index.js b/website/src/pages/index.js
index fb588258..40ace446 100755
--- a/website/src/pages/index.js
+++ b/website/src/pages/index.js
@@ -8,45 +8,40 @@ import styles from './index.module.css';
 
 const features = [
   {
-    title: 'Efficient and Reliable Verification',
+    title: 'TypeScript SDK',
     description: (
       <>
-        Smart contracts on Bitcoin Cash are UTXO-based with local state. This
-        model allows transactions to be verified independently and efficiently.
-        Because there is no global state that can impact the execution of these smart
-        contracts, the results are deterministic and predictable.
+        The CashScript TypeScript SDK makes it easy to build smart contract transactions, both in browser or on the server.
+        By offering full type-safety, developers can be confident in the quality and reliability of their applications. 
       </>
     ),
   },
   {
-    title: 'Strong Abstraction',
+    title: 'Familiar Syntax',
     description: (
       <>
-        Bitcoin Cash transactions run on a virtual machine called 'BCH Script'.
-        Writing bytecode for this virtual machine is difficult and error-prone.
-        CashScript offers a strong abstraction for writing Bitcoin Cash smart
-        contracts, improving developer experience and reliability of contracts.
+        The CashScript syntax is based on Ethereum's smart contract language Solidity, 
+        which in turn is influenced by C++, Python, and JavaScript. This should make writing 
+        CashScript contracts feel familar even to new developers.
       </>
     ),
   },
   {
-    title: 'DeFi on Bitcoin Cash',
+    title: 'Integrated Network APIs',
     description: (
       <>
-        Bitcoin Cash has had many script upgrades, such as CashTokens and transaction introspection.
-        Because of this, DeFi is very much possible on Bitcoin Cash.
-        However, compared to EVM, smart contracts work very differently due to BCH's UTXO
-        architecture.
+        To make it easy to get blockchain information, the CashScript SDK exports a standardized network provider to query network APIs.
+        The primary class of network providers are the electrum servers but other network providers are also supported. 
       </>
     ),
   },
   {
-    title: 'Integrated Tooling',
+    title: 'Advanced Debug Tooling',
     description: (
       <>
-        CashScript offers integrated tooling through the JavaScript SDK.
-        The SDK has utilities for easy transaction building and other network functionality.
-        CashScript has built-in debug tooling compatible with the Bitauth-IDE to offer the best developer experience.  
+        To offer the best developer experience for debugging and automated testing easy for developers,
+        CashScript has extensive debug tooling built-in.
+        This makes it possible to develop robust contract testing suites, and to debug your contracts with the Bitauth-IDE.  
       </>
     ),
   },

From 51e9fc58c12cf3fc7b3a9821c53708ad35d79c63 Mon Sep 17 00:00:00 2001
From: Mathieu Geukens <mr-zwets@protonmail.com>
Date: Thu, 29 Aug 2024 13:06:49 +0200
Subject: [PATCH 154/171] rename JS SDK to TS SDK

---
 README.md                              |  4 ++--
 packages/cashc/README.md               |  2 +-
 packages/utils/README.md               |  2 +-
 website/docs/basics/getting-started.md | 13 +++++++++----
 website/docs/guides/debugging.md       |  2 +-
 website/docs/guides/optimization.md    |  2 +-
 website/docs/language/functions.md     |  2 +-
 website/docs/sdk/instantiation.md      |  5 +++--
 website/sidebars.js                    |  2 +-
 9 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index a8cb0483..478776e6 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@
 
 CashScript is a high-level programming language for smart contracts on Bitcoin Cash. It offers a strong abstraction layer over Bitcoin Cash' native virtual machine, Bitcoin Script. Its syntax is based on Ethereum's smart contract language Solidity, but its functionality is very different since smart contracts on Bitcoin Cash differ greatly from smart contracts on Ethereum. For a detailed comparison of them, refer to the blog post [_Smart Contracts on Ethereum, Bitcoin and Bitcoin Cash_](https://kalis.me/smart-contracts-eth-btc-bch/).
 
-This repository contains the code for the CashScript compiler & command line tool under [`packages/cashc/`](/packages/cashc). This repository also contains the code for the CashScript JavaScript SDK under [`packages/cashscript/`](/packages/cashscript). The source code of the [CashScript.org](https://cashscript.org) website is included under [`website/`](/website). Visit the website for a detailed [Documentation](https://cashscript.org/docs/) on the CashScript language and SDK.
+This repository contains the code for the CashScript compiler & command line tool under [`packages/cashc/`](/packages/cashc). This repository also contains the code for the CashScript TypeScript SDK under [`packages/cashscript/`](/packages/cashscript). The source code of the [CashScript.org](https://cashscript.org) website is included under [`website/`](/website). Visit the website for a detailed [Documentation](https://cashscript.org/docs/) on the CashScript language and SDK.
 
 ## The CashScript Language
 
@@ -16,7 +16,7 @@ CashScript is a high-level language that allows you to write Bitcoin Cash smart
 
 ## The CashScript Compiler
 
-CashScript features a compiler as a standalone command line tool, called `cashc`. It can be installed through npm and used to compile `.cash` files into `.json` artifact files. These artifact files can be imported into the CashScript JavaScript SDK (or other SDKs in the future). The `cashc` NPM package can also be imported inside JavaScript files to compile `.cash` files without using the command line tool.
+CashScript features a compiler as a standalone command line tool, called `cashc`. It can be installed through npm and used to compile `.cash` files into `.json` artifact files. These artifact files can be imported into the CashScript TypeScript SDK (or other SDKs in the future). The `cashc` NPM package can also be imported inside JavaScript files to compile `.cash` files without using the command line tool.
 
 ### Installation
 
diff --git a/packages/cashc/README.md b/packages/cashc/README.md
index 33cdedae..dd1e0ada 100644
--- a/packages/cashc/README.md
+++ b/packages/cashc/README.md
@@ -14,7 +14,7 @@ See the [GitHub repository](https://github.com/CashScript/cashscript) and the [C
 CashScript is a high-level language that allows you to write Bitcoin Cash smart contracts in a straightforward and familiar way. Its syntax is inspired by Ethereum's Solidity language, but its functionality is different since the underlying systems have very different fundamentals. See the [language documentation](https://cashscript.org/docs/language/) for a full reference of the language.
 
 ## The CashScript Compiler
-CashScript features a compiler as a standalone command line tool, called `cashc`. It can be installed through npm and used to compile `.cash` files into `.json` artifact files. These artifact files can be imported into the CashScript JavaScript SDK (or other SDKs in the future). The `cashc` NPM package can also be imported inside JavaScript files to compile `.cash` files without using the command line tool.
+CashScript features a compiler as a standalone command line tool, called `cashc`. It can be installed through npm and used to compile `.cash` files into `.json` artifact files. These artifact files can be imported into the CashScript TypeScript SDK (or other SDKs in the future). The `cashc` NPM package can also be imported inside JavaScript files to compile `.cash` files without using the command line tool.
 
 ### Installation
 ```bash
diff --git a/packages/utils/README.md b/packages/utils/README.md
index bb540adf..09dfc906 100644
--- a/packages/utils/README.md
+++ b/packages/utils/README.md
@@ -6,4 +6,4 @@
 [![NPM Monthly Downloads](https://img.shields.io/npm/dm/@cashscript/utils.svg)](hhttps://www.npmjs.com/package/@cashscript/utils)
 [![NPM License](https://img.shields.io/npm/l/@cashscript/utils.svg)](https://www.npmjs.com/package/@cashscript/utils)
 
-`@cashscript/utils` is a package containing a number of utilities and types used by both the CashScript compiler and the JavaScript SDK. This package can be used by other applications as well, but it should be considered an unstable API and will not necessarily follow semantic versioning rules. So if you want to use `@cashscript/utils` as a standalone package, it is recommended to specify a specific version (instead of a range) in your `package.json`.
+`@cashscript/utils` is a package containing a number of utilities and types used by both the CashScript compiler and the TypeScript SDK. This package can be used by other applications as well, but it should be considered an unstable API and will not necessarily follow semantic versioning rules. So if you want to use `@cashscript/utils` as a standalone package, it is recommended to specify a specific version (instead of a range) in your `package.json`.
diff --git a/website/docs/basics/getting-started.md b/website/docs/basics/getting-started.md
index 938f38d9..113f0382 100644
--- a/website/docs/basics/getting-started.md
+++ b/website/docs/basics/getting-started.md
@@ -62,7 +62,7 @@ contract TransferWithTimeout(pubkey sender, pubkey recipient, int timeout) {
 ```
 
 :::tip
-There are some other examples available on the [Examples page](/docs/language/examples) that can be used to take inspiration from. Further examples of the JavaScript integration can be found on [GitHub](https://github.com/CashScript/cashscript/tree/master/examples).
+There are some other examples available on the [Examples page](/docs/language/examples) that can be used to take inspiration from. Further examples of the TypeScript and JavaScript integration can be found on [GitHub](https://github.com/CashScript/cashscript/tree/master/examples).
 :::
 
 ### Compiling your smart contract
@@ -81,10 +81,15 @@ OP_3 OP_PICK OP_0 OP_NUMEQUAL OP_IF OP_4 OP_ROLL OP_ROT OP_CHECKSIG OP_NIP OP_NI
 
 ## Creating a CashScript Transaction
 
-After creating a contract artifact, we can now use the JavaScript SDK to initialise the smart contract and to invoke spending functions on the smart contract UTXOs. We'll continue with the `TransferWithTimeout` artifact generated in the previous steps.
+After creating a contract artifact, we can now use the TypeScript SDK to initialise the smart contract and to invoke spending functions on the smart contract UTXOs. We'll continue with the `TransferWithTimeout` artifact generated in the previous steps.
 
-### Installing the JavaScript SDK
-The JavaScript SDK can be installed into your project with NPM. Note that CashScript is a [pure ESM package](https://gist.github.com/sindresorhus/a39789f98801d908bbc7ff3ecc99d99c).
+:::info
+The CashScript SDK is written in TypeScript meaning that you can either use TypeScript or vanilla JavaScript to use the SDK.
+It's recommended to use TypeScript for full type-safety of all you contract logic.
+:::
+
+### Installing the TypeScript SDK
+The TypeScript SDK can be installed into your project with NPM. Note that CashScript is a [pure ESM package](https://gist.github.com/sindresorhus/a39789f98801d908bbc7ff3ecc99d99c).
 
 ```bash
 npm install cashscript
diff --git a/website/docs/guides/debugging.md b/website/docs/guides/debugging.md
index 2e041bc0..5fca9e3b 100644
--- a/website/docs/guides/debugging.md
+++ b/website/docs/guides/debugging.md
@@ -23,7 +23,7 @@ Currently the CashScript debugging tools only work with the [Simple Transaction
 
 If a CashScript transaction is sent using any network provider and is rejected by the network (or the `MockNetworkProvider`), the transaction will be evaluated locally using libauth to provide failure reasons and debug information in addition to the failure reason communicated by the network.
 
-Read the error message to see which line in the CashScript contract causes the transaction validation to fail. Investigate whether the contract function invocation is the issue (on the JavaScript SDK side) or whether the issue is in the CashScript contract itself (so you'd need to update your contract and recompile the artifact). If it is not clear **why** the CashScript contract is failing on that line, then you can use the following two strategies: console logging & Bitauth IDE stack trace.
+Read the error message to see which line in the CashScript contract causes the transaction validation to fail. Investigate whether the contract function invocation is the issue (on the TypeScript SDK side) or whether the issue is in the CashScript contract itself (so you'd need to update your contract and recompile the artifact). If it is not clear **why** the CashScript contract is failing on that line, then you can use the following two strategies: console logging & Bitauth IDE stack trace.
 
 ### Console Logging
 
diff --git a/website/docs/guides/optimization.md b/website/docs/guides/optimization.md
index 8ef2a0a4..ad5f6ec3 100644
--- a/website/docs/guides/optimization.md
+++ b/website/docs/guides/optimization.md
@@ -87,7 +87,7 @@ cashc ./contract.cash --opcount --size
 The size output of the `cashc` compiler will always be an underestimate, as the contract hasn't been initialized with contract arguments.
 :::
 
-The `cashc` compiler only knows the opcount and bytesize of a contract before it is initialised with function arguments. Because of this, to get an accurate view of a contracts size, initialise the contract instance first, then get the size from there. This means you will have to re-compile the artifact before checking the contract size through the JavaScript SDK.
+The `cashc` compiler only knows the opcount and bytesize of a contract before it is initialised with function arguments. Because of this, to get an accurate view of a contracts size, initialise the contract instance first, then get the size from there. This means you will have to re-compile the artifact before checking the contract size through the TypeScript SDK.
 
 ```javascript
 import { ElectrumNetworkProvider, Contract, SignatureTemplate } from 'cashscript';
diff --git a/website/docs/language/functions.md b/website/docs/language/functions.md
index 61b105b9..6f617172 100644
--- a/website/docs/language/functions.md
+++ b/website/docs/language/functions.md
@@ -89,7 +89,7 @@ bool checkMultiSig(sig[] sigs, pubkey[] pks)
 Performs a multi-signature check using a list of transaction signatures and public keys.
 
 :::note
-While this function can be used inside your smart contracts, it is not supported by the JavaScript SDK, so it is recommended not to use it. Instead a `checkMultiSig()` call can be simulated using multiple `checkSig()` calls.
+While this function can be used inside your smart contracts, it is not supported by the TypeScript SDK, so it is recommended not to use it. Instead a `checkMultiSig()` call can be simulated using multiple `checkSig()` calls.
 :::
 
 ### checkDataSig()
diff --git a/website/docs/sdk/instantiation.md b/website/docs/sdk/instantiation.md
index 6ccff29a..87f54c2a 100644
--- a/website/docs/sdk/instantiation.md
+++ b/website/docs/sdk/instantiation.md
@@ -4,8 +4,9 @@ title: Contract Instantiation
 
 Before interacting with a smart contract on the BCH network, the CashScript SDK needs to instantiate a `Contract` object. This is done by providing the contract's information and constructor arguments. After this instantiation, the CashScript SDK can interact with the BCH contract.
 
-:::note
-CashScript only offers a JavaScript SDK, but CashScript contracts can be integrated into other languages as well. Because there are no ready-to-use SDKs available for them, this is considered advanced usage.
+:::info
+CashScript offers a TypeScript SDK, which can also be used easily in vanilla JavaScript codebases. 
+Because of the separation of the compiler and the SDK, CashScript contracts can be integrated into other languages in the future.
 :::
 
 ## Contract class
diff --git a/website/sidebars.js b/website/sidebars.js
index 38a347bf..238673d5 100755
--- a/website/sidebars.js
+++ b/website/sidebars.js
@@ -31,7 +31,7 @@ module.exports = {
     },
     {
       type: 'category',
-      label: 'JavaScript SDK',
+      label: 'TypeScript SDK',
       items: [
         'sdk/instantiation',
         'sdk/network-provider',

From bf6857d3af76113fa5e4101ddbd182b6319fdea0 Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Tue, 3 Sep 2024 11:47:00 +0200
Subject: [PATCH 155/171] Fix multiline failing statement error handling

- Add multiple tests for multiline failing statements
- Add functionality to support multiline failing statements
- Fix issues with incorrect PositionHint in source mapping
- Document PositionHint functionality with examples
- Slightly update FailedTransactionEvaluationError message
---
 .../src/generation/GenerateTargetTraversal.ts |  38 ++--
 packages/cashscript/src/Errors.ts             |  18 +-
 packages/cashscript/test/debugging.test.ts    | 173 ++++++++++++++++--
 packages/utils/src/types.ts                   |   5 +
 4 files changed, 199 insertions(+), 35 deletions(-)

diff --git a/packages/cashc/src/generation/GenerateTargetTraversal.ts b/packages/cashc/src/generation/GenerateTargetTraversal.ts
index 55eff7e8..cd5497e2 100644
--- a/packages/cashc/src/generation/GenerateTargetTraversal.ts
+++ b/packages/cashc/src/generation/GenerateTargetTraversal.ts
@@ -264,7 +264,7 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
   // This algorithm can be optimised for hardcoded depths
   // See thesis for explanation
   emitReplace(index: number, node: Node): void {
-    const locationData = { location: node.location };
+    const locationData = { location: node.location, positionHint: PositionHint.END };
 
     this.emit(encodeInt(BigInt(index)), locationData);
     this.emit(Op.OP_ROLL, locationData);
@@ -387,7 +387,7 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
     // Special case for sized bytes cast, since it has another node to traverse
     if (node.size) {
       node.size = this.visit(node.size);
-      this.emit(Op.OP_NUM2BIN, { location: node.location });
+      this.emit(Op.OP_NUM2BIN, { location: node.location, positionHint: PositionHint.END });
       this.popFromStack();
     }
 
@@ -431,51 +431,53 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
   }
 
   visitInstantiation(node: InstantiationNode): Node {
-    const nodeLocationData = { location: node.location };
 
     if (node.identifier.name === Class.LOCKING_BYTECODE_P2PKH) {
       // OP_DUP OP_HASH160 OP_PUSH<20>
-      this.emit(hexToBin('76a914'), nodeLocationData);
+      this.emit(hexToBin('76a914'), { location: node.location });
       this.pushToStack('(value)');
       // <pkh>
       this.visit(node.parameters[0]);
-      this.emit(Op.OP_CAT, nodeLocationData);
+      this.emit(Op.OP_CAT, { location: node.location, positionHint: PositionHint.END });
       // OP_EQUAL OP_CHECKSIG
-      this.emit(hexToBin('88ac'), nodeLocationData);
-      this.emit(Op.OP_CAT, nodeLocationData);
+      this.emit(hexToBin('88ac'), { location: node.location, positionHint: PositionHint.END });
+      this.emit(Op.OP_CAT, { location: node.location, positionHint: PositionHint.END });
       this.popFromStack(2);
     } else if (node.identifier.name === Class.LOCKING_BYTECODE_P2SH20) {
       // OP_HASH160 OP_PUSH<20>
-      this.emit(hexToBin('a914'), nodeLocationData);
+      this.emit(hexToBin('a914'), { location: node.location });
       this.pushToStack('(value)');
       // <script hash>
       this.visit(node.parameters[0]);
-      this.emit(Op.OP_CAT, nodeLocationData);
+      this.emit(Op.OP_CAT, { location: node.location, positionHint: PositionHint.END });
       // OP_EQUAL
-      this.emit(hexToBin('87'), nodeLocationData);
-      this.emit(Op.OP_CAT, nodeLocationData);
+      this.emit(hexToBin('87'), { location: node.location, positionHint: PositionHint.END });
+      this.emit(Op.OP_CAT, { location: node.location, positionHint: PositionHint.END });
       this.popFromStack(2);
     } else if (node.identifier.name === Class.LOCKING_BYTECODE_P2SH32) {
       // OP_HASH256 OP_PUSH<32>
-      this.emit(hexToBin('aa20'), nodeLocationData);
+      this.emit(hexToBin('aa20'), { location: node.location });
       this.pushToStack('(value)');
       // <script hash>
       this.visit(node.parameters[0]);
-      this.emit(Op.OP_CAT, nodeLocationData);
+      this.emit(Op.OP_CAT, { location: node.location, positionHint: PositionHint.END });
       // OP_EQUAL
-      this.emit(hexToBin('87'), nodeLocationData);
-      this.emit(Op.OP_CAT, nodeLocationData);
+      this.emit(hexToBin('87'), { location: node.location, positionHint: PositionHint.END });
+      this.emit(Op.OP_CAT, { location: node.location, positionHint: PositionHint.END });
       this.popFromStack(2);
     } else if (node.identifier.name === Class.LOCKING_BYTECODE_NULLDATA) {
       // Total script = OP_RETURN (<VarInt> <chunk>)+
       // OP_RETURN
-      this.emit(hexToBin('6a'), nodeLocationData);
+      this.emit(hexToBin('6a'), { location: node.location });
       this.pushToStack('(value)');
       const { elements } = node.parameters[0] as ArrayNode;
       // <VarInt data chunk size (dynamic)>
       elements.forEach((element) => {
-        const elementLocationData = { location: element.location };
         this.visit(element);
+
+        // The element comes first, then all other opcodes have PositionHint.END because they come after the element
+        const elementLocationData = { location: element.location, positionHint: PositionHint.END };
+
         // Push the element's size (and calculate VarInt)
         this.emit(Op.OP_SIZE, elementLocationData);
         if (element instanceof HexLiteralNode) {
@@ -541,7 +543,7 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
 
   visitUnaryOp(node: UnaryOpNode): Node {
     node.expression = this.visit(node.expression);
-    this.emit(compileUnaryOp(node.operator), { location: node.location });
+    this.emit(compileUnaryOp(node.operator), { location: node.location, positionHint: PositionHint.END });
     this.popFromStack();
     this.pushToStack('(value)');
     return node;
diff --git a/packages/cashscript/src/Errors.ts b/packages/cashscript/src/Errors.ts
index 7b52be8b..1db1c420 100644
--- a/packages/cashscript/src/Errors.ts
+++ b/packages/cashscript/src/Errors.ts
@@ -39,14 +39,14 @@ export class FailedTransactionEvaluationError extends FailedTransactionError {
     public bitauthUri: string,
     public libauthErrorMessage: string,
   ) {
-    let baseMessage = `${artifact.contractName}.cash Error in transaction at input ${inputIndex} in contract ${artifact.contractName}.cash.`;
+    let message = `${artifact.contractName}.cash Error in transaction at input ${inputIndex} in contract ${artifact.contractName}.cash.\nReason: ${libauthErrorMessage}`;
 
     if (artifact.debug) {
       const { statement, lineNumber } = getLocationDataForInstructionPointer(artifact, failingInstructionPointer);
-      baseMessage = `${artifact.contractName}.cash:${lineNumber} Error in transaction at input ${inputIndex} in contract ${artifact.contractName}.cash at line ${lineNumber}.\nFailing statement: ${statement}`;
+      message = `${artifact.contractName}.cash:${lineNumber} Error in transaction at input ${inputIndex} in contract ${artifact.contractName}.cash at line ${lineNumber}.\nReason: ${libauthErrorMessage}\nFailing statement: ${statement}`;
     }
 
-    super(`${baseMessage}\nReason: ${libauthErrorMessage}`, bitauthUri);
+    super(message, bitauthUri);
   }
 }
 
@@ -65,6 +65,9 @@ export class FailedRequireError extends FailedTransactionError {
       statement = requireStatement.message
         ? `require(${statement}, "${requireStatement.message}")`
         : `require(${statement})`;
+
+      // Sometimes in reconstructed multiline require statements, we get double commas
+      statement = statement.replace(/,,/g, ',');
     }
 
     const baseMessage = `${artifact.contractName}.cash:${lineNumber} Require statement failed at input ${inputIndex} in contract ${artifact.contractName}.cash at line ${lineNumber}`;
@@ -88,9 +91,14 @@ const getLocationDataForInstructionPointer = (
 
   const { location } = locationData[modifiedInstructionPointer];
 
-  const lineString = artifact.source.split('\n')[location.start.line - 1];
-  const statement = lineString.slice(location.start.column, location.end.column);
+  const failingLines = artifact.source.split('\n').slice(location.start.line - 1, location.end.line);
+
+  // Slice off the start and end of the statement's start and end lines to only return the failing part
+  // Note that we first slice off the end, to avoid shifting the end column index
+  failingLines[failingLines.length - 1] = failingLines[failingLines.length - 1].slice(0, location.end.column);
+  failingLines[0] = failingLines[0].slice(location.start.column);
 
+  const statement = failingLines.join('\n');
   const lineNumber = location.start.line;
 
   return { statement, lineNumber };
diff --git a/packages/cashscript/test/debugging.test.ts b/packages/cashscript/test/debugging.test.ts
index aed28ae3..42d3c689 100644
--- a/packages/cashscript/test/debugging.test.ts
+++ b/packages/cashscript/test/debugging.test.ts
@@ -68,7 +68,8 @@ contract Test() {
     int d = 3;
     int e = 4;
     if (a == 0) {
-      a = 10;
+      a =
+        10 + 10;
       require(a + b + c + d + e == 10, "sum should equal 10");
     }
   }
@@ -123,12 +124,73 @@ contract Test() {
     int h = 8;
 
     // Use all variables inside this if-statement so they do not get OP_ROLL'ed
-    if (1 == 2) {
+    if (
+    1
+      == 2
+    ) {
       require(a + b + c + d + e + f + g + h == 1, "sum should equal 36");
     }
 
     require(1 == 2, "1 should equal 2");
   }
+
+  function test_fail_multiline_require() {
+    require(
+      1 == 2,
+      "1 should equal 2"
+    );
+
+    require(1 == 1);
+  }
+
+  function test_fail_multiline_final_require() {
+    require(
+      1 == 2,
+      "1 should equal 2"
+    );
+  }
+
+  function test_multiline_non_require_error() {
+    int x =
+      tx.outputs[
+        5
+      ].value +
+      tx.inputs[5].value;
+    require(x == 1000);
+  }
+
+  function test_multiline_require_with_unary_op() {
+    require(
+      !(
+        0x000000
+        .reverse()
+        .length
+        !=
+        -(
+          30
+            +
+          15
+        )
+      )
+    );
+
+    require(1 == 1);
+  }
+
+  function test_multiline_require_with_instantiation() {
+    require(
+      new LockingBytecodeP2PKH(
+        hash160(0x000000)
+      )
+        ==
+      new LockingBytecodeNullData([
+        0x00,
+        bytes("hello world")
+      ])
+    );
+
+    require(1 == 1);
+  }
 }
 `;
 
@@ -341,7 +403,7 @@ describe('Debugging tests', () => {
     const provider = new MockNetworkProvider();
 
     // test_require
-    it('should fail with error message when require statement fails', async () => {
+    it('should fail with error message when require statement fails in a multi-function contract', async () => {
       const contract = new Contract(artifact, [], { provider });
       provider.addUtxo(contract.address, randomUtxo());
 
@@ -446,7 +508,7 @@ describe('Debugging tests', () => {
 
       const transaction = contract.functions
         .test_final_require_in_if_statement_with_deep_reassignment().to(contract.address, 1000n);
-      await expect(transaction).toFailRequireWith('Test.cash:62 Require statement failed at input 0 in contract Test.cash at line 62 with the following message: sum should equal 10.');
+      await expect(transaction).toFailRequireWith('Test.cash:63 Require statement failed at input 0 in contract Test.cash at line 63 with the following message: sum should equal 10.');
       await expect(transaction).toFailRequireWith('Failing statement: require(a + b + c + d + e == 10, "sum should equal 10")');
     });
 
@@ -457,7 +519,7 @@ describe('Debugging tests', () => {
 
       const checkSigTransaction = contract.functions
         .test_fail_checksig(new SignatureTemplate(alicePriv), bobPub).to(contract.address, 1000n);
-      await expect(checkSigTransaction).toFailRequireWith('Test.cash:77 Require statement failed at input 0 in contract Test.cash at line 77 with the following message: Signatures do not match.');
+      await expect(checkSigTransaction).toFailRequireWith('Test.cash:78 Require statement failed at input 0 in contract Test.cash at line 78 with the following message: Signatures do not match.');
       await expect(checkSigTransaction).toFailRequireWith('Failing statement: require(checkSig(s, pk), "Signatures do not match")');
 
       // TODO: Add test for checksig with a NULL Signature (after we refactor Libauth Template generation)
@@ -473,7 +535,7 @@ describe('Debugging tests', () => {
 
       const checkSigTransaction = contract.functions
         .test_fail_checksig_final_verify(new SignatureTemplate(alicePriv), bobPub).to(contract.address, 1000n);
-      await expect(checkSigTransaction).toFailRequireWith('Test.cash:82 Require statement failed at input 0 in contract Test.cash at line 82 with the following message: Signatures do not match.');
+      await expect(checkSigTransaction).toFailRequireWith('Test.cash:83 Require statement failed at input 0 in contract Test.cash at line 83 with the following message: Signatures do not match.');
       await expect(checkSigTransaction).toFailRequireWith('Failing statement: require(checkSig(s, pk), "Signatures do not match")');
     });
 
@@ -485,13 +547,13 @@ describe('Debugging tests', () => {
       const checkDataSigTransaction = contract.functions
         .test_fail_checkdatasig(new SignatureTemplate(alicePriv).generateSignature(hexToBin('0xbeef')).slice(0, -1), '0xbeef', bobPub)
         .to(contract.address, 1000n);
-      await expect(checkDataSigTransaction).toFailRequireWith('Test.cash:86 Require statement failed at input 0 in contract Test.cash at line 86 with the following message: Data Signatures do not match.');
+      await expect(checkDataSigTransaction).toFailRequireWith('Test.cash:87 Require statement failed at input 0 in contract Test.cash at line 87 with the following message: Data Signatures do not match.');
       await expect(checkDataSigTransaction).toFailRequireWith('Failing statement: require(checkDataSig(s, message, pk), "Data Signatures do not match")');
 
       const checkDataSigTransactionWrongMessage = contract.functions
         .test_fail_checkdatasig(new SignatureTemplate(alicePriv).generateSignature(hexToBin('0xc0ffee')).slice(0, -1), '0xbeef', alicePub)
         .to(contract.address, 1000n);
-      await expect(checkDataSigTransactionWrongMessage).toFailRequireWith('Test.cash:86 Require statement failed at input 0 in contract Test.cash at line 86 with the following message: Data Signatures do not match.');
+      await expect(checkDataSigTransactionWrongMessage).toFailRequireWith('Test.cash:87 Require statement failed at input 0 in contract Test.cash at line 87 with the following message: Data Signatures do not match.');
       await expect(checkDataSigTransactionWrongMessage).toFailRequireWith('Failing statement: require(checkDataSig(s, message, pk), "Data Signatures do not match")');
     });
 
@@ -508,7 +570,7 @@ describe('Debugging tests', () => {
           alicePub,
         )
         .to(contract.address, 1000n);
-      await expect(checkmultiSigTransaction).toFailRequireWith('Test.cash:90 Require statement failed at input 0 in contract Test.cash at line 90 with the following message: Multi Signatures do not match.');
+      await expect(checkmultiSigTransaction).toFailRequireWith('Test.cash:91 Require statement failed at input 0 in contract Test.cash at line 91 with the following message: Multi Signatures do not match.');
       await expect(checkmultiSigTransaction).toFailRequireWith('Failing statement: require(checkMultiSig([s1, s2], [pk1, pk2]), "Multi Signatures do not match")');
     });
 
@@ -518,13 +580,79 @@ describe('Debugging tests', () => {
       provider.addUtxo(contract.address, randomUtxo());
 
       const transaction = contract.functions.test_fail_large_cleanup().to(contract.address, 1000n);
-      await expect(transaction).toFailRequireWith('Test.cash:19 Require statement failed at input 0 in contract Test.cash at line 19 with the following message: 1 should equal 2.');
+      await expect(transaction).toFailRequireWith('Test.cash:22 Require statement failed at input 0 in contract Test.cash at line 22 with the following message: 1 should equal 2.');
       await expect(transaction).toFailRequireWith('Failing statement: require(1 == 2, "1 should equal 2")');
     });
+
+    // test_fail_multiline_require
+    it('should fail with correct error message and statement when a multiline require statement fails', async () => {
+      const contract = new Contract(artifact3, [], { provider });
+      provider.addUtxo(contract.address, randomUtxo());
+
+      const transaction = contract.functions.test_fail_multiline_require().to(contract.address, 1000n);
+      await expect(transaction).toFailRequireWith('Test.cash:26 Require statement failed at input 0 in contract Test.cash at line 26 with the following message: 1 should equal 2.');
+      await expect(transaction).toFailRequireWith(`Failing statement: require(
+      1 == 2,
+      "1 should equal 2"
+    );`);
+    });
+
+    // test_fail_multiline_final_require
+    it('should fail with correct error message and statement when a multiline final require statement fails', async () => {
+      const contract = new Contract(artifact3, [], { provider });
+      provider.addUtxo(contract.address, randomUtxo());
+
+      const transaction = contract.functions.test_fail_multiline_final_require().to(contract.address, 1000n);
+      await expect(transaction).toFailRequireWith('Test.cash:36 Require statement failed at input 0 in contract Test.cash at line 36 with the following message: 1 should equal 2.');
+      await expect(transaction).toFailRequireWith('Failing statement: require(1 == 2, "1 should equal 2")');
+    });
+
+    // test_multiline_require_with_unary_op
+    // Note that we add this test, because we changed the LocationHint for all Unary Ops to "END"
+    it('should fail with correct error message and statement when a multiline require statement with a unary op fails', async () => {
+      const contract = new Contract(artifact3, [], { provider });
+      provider.addUtxo(contract.address, randomUtxo());
+
+      const transaction = contract.functions.test_multiline_require_with_unary_op().to(contract.address, 1000n);
+      await expect(transaction).toFailRequireWith('Test.cash:51 Require statement failed at input 0 in contract Test.cash at line 51.');
+      await expect(transaction).toFailRequireWith(`Failing statement: require(
+      !(
+        0x000000
+        .reverse()
+        .length
+        !=
+        -(
+          30
+            +
+          15
+        )
+      )
+    );`);
+    });
+
+    // test_multiline_require_with_instantiation
+    it('should fail with correct error message and statement when a multiline require statement with an instantiation fails', async () => {
+      const contract = new Contract(artifact3, [], { provider });
+      provider.addUtxo(contract.address, randomUtxo());
+
+      const transaction = contract.functions.test_multiline_require_with_instantiation().to(contract.address, 1000n);
+      await expect(transaction).toFailRequireWith('Test.cash:69 Require statement failed at input 0 in contract Test.cash at line 69.');
+      await expect(transaction).toFailRequireWith(`Failing statement: require(
+      new LockingBytecodeP2PKH(
+        hash160(0x000000)
+      )
+        ==
+      new LockingBytecodeNullData([
+        0x00,
+        bytes(\"hello world\")
+      ])
+    );`);
+    });
   });
 
   describe('Non-require error messages', () => {
     const artifact = compileString(CONTRACT_CODE);
+    const artifact3 = compileString(CONTRACT_CODE3);
     const provider = new MockNetworkProvider();
 
     // test_invalid_split_range
@@ -536,7 +664,9 @@ describe('Debugging tests', () => {
         .to(contract.address, 1000n)
         .debug();
 
-      await expect(transactionPromise).rejects.toThrow(AuthenticationErrorCommon.invalidSplitIndex);
+      await expect(transactionPromise).rejects.toThrow('Test.cash:69 Error in transaction at input 0 in contract Test.cash at line 69.');
+      await expect(transactionPromise).rejects.toThrow('Failing statement: test.split(4)');
+      await expect(transactionPromise).rejects.toThrow(`Reason: ${AuthenticationErrorCommon.invalidSplitIndex}`);
     });
 
     // test_invalid_input_index
@@ -548,7 +678,26 @@ describe('Debugging tests', () => {
         .to(contract.address, 1000n)
         .debug();
 
-      await expect(transactionPromise).rejects.toThrow(AuthenticationErrorCommon.invalidTransactionUtxoIndex);
+      await expect(transactionPromise).rejects.toThrow('Test.cash:74 Error in transaction at input 0 in contract Test.cash at line 74.');
+      await expect(transactionPromise).rejects.toThrow('Failing statement: tx.inputs[5].value');
+      await expect(transactionPromise).rejects.toThrow(`Reason: ${AuthenticationErrorCommon.invalidTransactionUtxoIndex}`);
+    });
+
+    // test_multiline_non_require_error
+    it('should fail with correct error message and statament when a multiline non-require statement fails', async () => {
+      const contract = new Contract(artifact3, [], { provider });
+
+      provider.addUtxo(contract.address, randomUtxo());
+
+      const transactionPromise = contract.functions.test_multiline_non_require_error()
+        .to(contract.address, 1000n)
+        .debug();
+
+      await expect(transactionPromise).rejects.toThrow('Test.cash:43 Error in transaction at input 0 in contract Test.cash at line 43.');
+      await expect(transactionPromise).rejects.toThrow(`Failing statement: tx.outputs[
+        5
+      ].value`);
+      await expect(transactionPromise).rejects.toThrow(`Reason: ${AuthenticationErrorCommon.invalidTransactionOutputIndex}`);
     });
   });
 
diff --git a/packages/utils/src/types.ts b/packages/utils/src/types.ts
index f5e598aa..7eb3199b 100644
--- a/packages/utils/src/types.ts
+++ b/packages/utils/src/types.ts
@@ -205,6 +205,11 @@ export type SingleLocationData = {
 export type FullLocationData = Array<SingleLocationData>;
 
 // Denotes whether an opcode belongs to the "start" or "end" of the statement it's in (defaults to "start")
+// Examples:
+// require(true); --> the OP_VERIFY comes after the condition (OP_TRUE), so it should get a PositionHint.END
+// !true --> the OP_NOT comes after the condition (OP_TRUE), so it should get a PositionHint.END
+// if (true) { ... } --> the OP_IF comes before the body, so it should get a PositionHint.START,
+//                       the OP_ENDIF comes after the body, so it should get a PositionHint.END
 export enum PositionHint {
   START = 0,
   END = 1,

From d516a69fd2babe05f8d71850b59c3f2cfae2b4d5 Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Thu, 5 Sep 2024 15:26:46 +0200
Subject: [PATCH 156/171] Make positionHint mandatory and update fixtures

---
 .../src/generation/GenerateTargetTraversal.ts | 37 ++++++++++---------
 .../cashscript/test/fixture/announcement.json |  6 +--
 packages/cashscript/test/fixture/bigint.json  |  4 +-
 .../test/fixture/bounded_bytes.json           |  4 +-
 .../cashscript/test/fixture/hodl_vault.json   |  4 +-
 packages/cashscript/test/fixture/mecenas.json |  6 +--
 .../cashscript/test/fixture/p2palindrome.json |  6 +--
 packages/cashscript/test/fixture/p2pkh.json   |  4 +-
 .../test/fixture/simple_covenant.json         |  6 +--
 .../fixture/token_category_comparison.json    |  6 +--
 .../test/fixture/transfer_with_timeout.json   |  4 +-
 packages/utils/src/source-map.ts              |  6 +--
 packages/utils/src/types.ts                   |  2 +-
 13 files changed, 48 insertions(+), 47 deletions(-)

diff --git a/packages/cashc/src/generation/GenerateTargetTraversal.ts b/packages/cashc/src/generation/GenerateTargetTraversal.ts
index cd5497e2..8e38541d 100644
--- a/packages/cashc/src/generation/GenerateTargetTraversal.ts
+++ b/packages/cashc/src/generation/GenerateTargetTraversal.ts
@@ -141,7 +141,7 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
     } else {
       this.pushToStack('$$', true);
       node.functions = node.functions.map((f, i) => {
-        const locationData = { location: f.location };
+        const locationData = { location: f.location, positionHint: PositionHint.START };
 
         const stackCopy = [...this.stack];
         const selectorIndex = this.getStackIndex('$$');
@@ -154,10 +154,10 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
           this.emit(Op.OP_PICK, locationData);
         }
 
-        // All functions are if-else statements, except the final one which is
-        // enforced with NUMEQUALVERIFY
+        // All functions are if-else statements, except the final one which is enforced with NUMEQUALVERIFY
         this.emit(encodeInt(BigInt(i)), locationData);
         this.emit(Op.OP_NUMEQUAL, locationData);
+
         if (i < node.functions.length - 1) {
           this.emit(Op.OP_IF, locationData);
         } else {
@@ -173,6 +173,7 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
         this.stack = [...stackCopy];
         return f;
       });
+
       for (let i = 0; i < node.functions.length - 1; i += 1) {
         this.emit(Op.OP_ENDIF, { location: node.location, positionHint: PositionHint.END });
       }
@@ -349,14 +350,14 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
     this.popFromStack();
 
     this.scopeDepth += 1;
-    this.emit(Op.OP_IF, { location: node.ifBlock.location });
+    this.emit(Op.OP_IF, { location: node.ifBlock.location, positionHint: PositionHint.START });
 
     let stackDepth = this.stack.length;
     node.ifBlock = this.visit(node.ifBlock);
     this.removeScopedVariables(stackDepth, node.ifBlock);
 
     if (node.elseBlock) {
-      this.emit(Op.OP_ELSE, { location: node.elseBlock.location });
+      this.emit(Op.OP_ELSE, { location: node.elseBlock.location, positionHint: PositionHint.START });
       stackDepth = this.stack.length;
       node.elseBlock = this.visit(node.elseBlock);
       this.removeScopedVariables(stackDepth, node.elseBlock);
@@ -418,7 +419,7 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
   }
 
   visitMultiSig(node: FunctionCallNode): Node {
-    this.emit(encodeBool(false), { location: node.location });
+    this.emit(encodeBool(false), { location: node.location, positionHint: PositionHint.START });
     this.pushToStack('(value)');
     node.parameters = this.visitList(node.parameters);
     this.emit(Op.OP_CHECKMULTISIG, { location: node.location, positionHint: PositionHint.END });
@@ -434,7 +435,7 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
 
     if (node.identifier.name === Class.LOCKING_BYTECODE_P2PKH) {
       // OP_DUP OP_HASH160 OP_PUSH<20>
-      this.emit(hexToBin('76a914'), { location: node.location });
+      this.emit(hexToBin('76a914'), { location: node.location, positionHint: PositionHint.START });
       this.pushToStack('(value)');
       // <pkh>
       this.visit(node.parameters[0]);
@@ -445,7 +446,7 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
       this.popFromStack(2);
     } else if (node.identifier.name === Class.LOCKING_BYTECODE_P2SH20) {
       // OP_HASH160 OP_PUSH<20>
-      this.emit(hexToBin('a914'), { location: node.location });
+      this.emit(hexToBin('a914'), { location: node.location, positionHint: PositionHint.START });
       this.pushToStack('(value)');
       // <script hash>
       this.visit(node.parameters[0]);
@@ -456,7 +457,7 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
       this.popFromStack(2);
     } else if (node.identifier.name === Class.LOCKING_BYTECODE_P2SH32) {
       // OP_HASH256 OP_PUSH<32>
-      this.emit(hexToBin('aa20'), { location: node.location });
+      this.emit(hexToBin('aa20'), { location: node.location, positionHint: PositionHint.START });
       this.pushToStack('(value)');
       // <script hash>
       this.visit(node.parameters[0]);
@@ -468,7 +469,7 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
     } else if (node.identifier.name === Class.LOCKING_BYTECODE_NULLDATA) {
       // Total script = OP_RETURN (<VarInt> <chunk>)+
       // OP_RETURN
-      this.emit(hexToBin('6a'), { location: node.location });
+      this.emit(hexToBin('6a'), { location: node.location, positionHint: PositionHint.START });
       this.pushToStack('(value)');
       const { elements } = node.parameters[0] as ArrayNode;
       // <VarInt data chunk size (dynamic)>
@@ -550,7 +551,7 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
   }
 
   visitNullaryOp(node: NullaryOpNode): Node {
-    this.emit(compileNullaryOp(node.operator), { location: node.location });
+    this.emit(compileNullaryOp(node.operator), { location: node.location, positionHint: PositionHint.START });
     this.pushToStack('(value)');
     return node;
   }
@@ -564,7 +565,7 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
 
   visitIdentifier(node: IdentifierNode): Node {
     const stackIndex = this.getStackIndex(node.name);
-    this.emit(encodeInt(BigInt(stackIndex)), { location: node.location });
+    this.emit(encodeInt(BigInt(stackIndex)), { location: node.location, positionHint: PositionHint.START });
 
     // If the final use is inside an if-statement, we still OP_PICK it
     // We do this so that there's no difference in stack depths between execution paths
@@ -576,10 +577,10 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
         ip: this.getMostRecentInstructionPointer(),
       };
 
-      this.emit(Op.OP_ROLL, { location: node.location });
+      this.emit(Op.OP_ROLL, { location: node.location, positionHint: PositionHint.START });
       this.removeFromStack(stackIndex);
     } else {
-      this.emit(Op.OP_PICK, { location: node.location });
+      this.emit(Op.OP_PICK, { location: node.location, positionHint: PositionHint.START });
     }
 
     this.pushToStack('(value)');
@@ -591,25 +592,25 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
   }
 
   visitBoolLiteral(node: BoolLiteralNode): Node {
-    this.emit(encodeBool(node.value), { location: node.location });
+    this.emit(encodeBool(node.value), { location: node.location, positionHint: PositionHint.START });
     this.pushToStack('(value)');
     return node;
   }
 
   visitIntLiteral(node: IntLiteralNode): Node {
-    this.emit(encodeInt(node.value), { location: node.location });
+    this.emit(encodeInt(node.value), { location: node.location, positionHint: PositionHint.START });
     this.pushToStack('(value)');
     return node;
   }
 
   visitStringLiteral(node: StringLiteralNode): Node {
-    this.emit(encodeString(node.value), { location: node.location });
+    this.emit(encodeString(node.value), { location: node.location, positionHint: PositionHint.START });
     this.pushToStack('(value)');
     return node;
   }
 
   visitHexLiteral(node: HexLiteralNode): Node {
-    this.emit(node.value, { location: node.location });
+    this.emit(node.value, { location: node.location, positionHint: PositionHint.START });
     this.pushToStack('(value)');
     return node;
   }
diff --git a/packages/cashscript/test/fixture/announcement.json b/packages/cashscript/test/fixture/announcement.json
index 55611351..39c9e255 100644
--- a/packages/cashscript/test/fixture/announcement.json
+++ b/packages/cashscript/test/fixture/announcement.json
@@ -11,7 +11,7 @@
   "source": "pragma cashscript >=0.8.0;\n\n/* This is a contract showcasing covenants outside of regular transactional use.\n * It enforces the contract to make an \"announcement\" on Memo.cash, and send the\n * remainder of contract funds back to the contract.\n */\ncontract Announcement() {\n    function announce() {\n        // Create the memo.cash announcement output\n        bytes announcement = new LockingBytecodeNullData([\n            0x6d02,\n            bytes('A contract may not injure a human being or, through inaction, allow a human being to come to harm.')\n        ]);\n\n        // Check that the first tx output matches the announcement\n        require(tx.outputs[0].value == 0);\n        require(tx.outputs[0].lockingBytecode == announcement);\n\n        // Calculate leftover money after fee (1000 sats)\n        // Check that the second tx output sends the change back if there's enough leftover for another announcement\n        int minerFee = 1000;\n        int changeAmount = tx.inputs[this.activeInputIndex].value - minerFee;\n        if (changeAmount >= minerFee) {\n            require(tx.outputs[1].lockingBytecode == tx.inputs[this.activeInputIndex].lockingBytecode);\n            require(tx.outputs[1].value == changeAmount);\n        }\n    }\n}\n",
   "debug": {
     "bytecode": "016a026d02827c7e7e4c624120636f6e7472616374206d6179206e6f7420696e6a75726520612068756d616e206265696e67206f722c207468726f75676820696e616374696f6e2c20616c6c6f7720612068756d616e206265696e6720746f20636f6d6520746f206861726d2e8276014ba063014c7c7e687c7e7e00cc009c6900cd517a876902e803c0c65179940079527aa26351cdc0c7876951cc51799c69685177",
-    "sourceMap": "10:29:13:10;11:12:11:18;;;;;12:18:12:118;:12::119;;;;;;;;;;;;16:27:16:28;:16::35;:39::40;:16:::1;:8::42;17:27:17:28:0;:16::45;:49::61;;:16:::1;:8::63;21:23:21:27:0;22:37:22:58;:27::65;:68::76;;:27:::1;23:12:23:24:0;;:28::36;;:12:::1;:38:26:9:0;24:31:24:32;:20::49;:63::84;:53::101;:20:::1;:12::103;25:31:25:32:0;:20::39;:43::55;;:20:::1;:12::57;23:38:26:9;8:4:27:5;",
+    "sourceMap": "10:29:13:10;11:12:11:18;::::1;;;;12:18:12:118:0;:12::119:1;;;;;;;;;;;;16:27:16:28:0;:16::35:1;:39::40:0;:16:::1;:8::42;17:27:17:28:0;:16::45:1;:49::61:0;;:16:::1;:8::63;21:23:21:27:0;22:37:22:58;:27::65:1;:68::76:0;;:27:::1;23:12:23:24:0;;:28::36;;:12:::1;:38:26:9:0;24:31:24:32;:20::49:1;:63::84:0;:53::101:1;:20;:12::103;25:31:25:32:0;:20::39:1;:43::55:0;;:20:::1;:12::57;23:38:26:9;8:4:27:5;",
     "logs": [],
     "requires": [
       {
@@ -34,7 +34,7 @@
   },
   "compiler": {
     "name": "cashc",
-    "version": "0.10.0-next.5"
+    "version": "0.10.0-next.6"
   },
-  "updatedAt": "2024-06-25T09:01:16.154Z"
+  "updatedAt": "2024-09-05T13:25:22.357Z"
 }
\ No newline at end of file
diff --git a/packages/cashscript/test/fixture/bigint.json b/packages/cashscript/test/fixture/bigint.json
index d55eaebf..3313e9bb 100644
--- a/packages/cashscript/test/fixture/bigint.json
+++ b/packages/cashscript/test/fixture/bigint.json
@@ -35,7 +35,7 @@
   },
   "compiler": {
     "name": "cashc",
-    "version": "0.10.0-next.5"
+    "version": "0.10.0-next.6"
   },
-  "updatedAt": "2024-06-25T09:01:15.899Z"
+  "updatedAt": "2024-09-05T13:25:22.095Z"
 }
\ No newline at end of file
diff --git a/packages/cashscript/test/fixture/bounded_bytes.json b/packages/cashscript/test/fixture/bounded_bytes.json
index a182d87a..7f4a9550 100644
--- a/packages/cashscript/test/fixture/bounded_bytes.json
+++ b/packages/cashscript/test/fixture/bounded_bytes.json
@@ -31,7 +31,7 @@
   },
   "compiler": {
     "name": "cashc",
-    "version": "0.10.0-next.5"
+    "version": "0.10.0-next.6"
   },
-  "updatedAt": "2024-06-25T09:01:10.912Z"
+  "updatedAt": "2024-09-05T13:25:23.083Z"
 }
\ No newline at end of file
diff --git a/packages/cashscript/test/fixture/hodl_vault.json b/packages/cashscript/test/fixture/hodl_vault.json
index a3ab0568..8937fdea 100644
--- a/packages/cashscript/test/fixture/hodl_vault.json
+++ b/packages/cashscript/test/fixture/hodl_vault.json
@@ -68,7 +68,7 @@
   },
   "compiler": {
     "name": "cashc",
-    "version": "0.10.0-next.5"
+    "version": "0.10.0-next.6"
   },
-  "updatedAt": "2024-06-25T09:01:16.379Z"
+  "updatedAt": "2024-09-05T13:25:22.594Z"
 }
\ No newline at end of file
diff --git a/packages/cashscript/test/fixture/mecenas.json b/packages/cashscript/test/fixture/mecenas.json
index 8f162076..916d7620 100644
--- a/packages/cashscript/test/fixture/mecenas.json
+++ b/packages/cashscript/test/fixture/mecenas.json
@@ -37,7 +37,7 @@
   "source": "pragma cashscript >=0.8.0;\n\n/* This is an unofficial CashScript port of Licho's Mecenas contract. It is\n * not compatible with Licho's EC plugin, but rather meant as a demonstration\n * of covenants in CashScript.\n * The time checking has been removed so it can be tested without time requirements.\n */\ncontract Mecenas(bytes20 recipient, bytes20 funder, int pledge/*, int period */) {\n    function receive() {\n        // require(tx.age >= period);\n\n        // Check that the first output sends to the recipient\n        require(tx.outputs[0].lockingBytecode == new LockingBytecodeP2PKH(recipient));\n\n        int minerFee = 1000;\n        int currentValue = tx.inputs[this.activeInputIndex].value;\n        int changeValue = currentValue - pledge - minerFee;\n\n        // If there is not enough left for *another* pledge after this one, we send the remainder to the recipient\n        // Otherwise we send the remainder to the recipient and the change back to the contract\n        if (changeValue <= pledge + minerFee) {\n            require(tx.outputs[0].value == currentValue - minerFee);\n        } else {\n            require(tx.outputs[0].value == pledge);\n            require(tx.outputs[1].lockingBytecode == tx.inputs[this.activeInputIndex].lockingBytecode);\n            require(tx.outputs[1].value == changeValue);\n        }\n    }\n\n    function reclaim(pubkey pk, sig s) {\n        require(hash160(pk) == funder);\n        require(checkSig(s, pk));\n    }\n}\n",
   "debug": {
     "bytecode": "5379009c6300cd0376a914527a7e0288ac7e876902e803c0c6007954799452799400795579547993a16300cc52795479949c696700cc55799c6951cdc0c7876951cc51799c69685177777777777767537a519c695379a9527a8769537a537aac777768",
-    "sourceMap": "9:4:28:5;;;;;13:27:13:28;:16::45;:49::84;:74::83;;:49::84;;;:16:::1;:8::86;15:23:15:27:0;16:37:16:58;:27::65;17:26:17:38;;:41::47;;:26:::1;:50::58:0;;:26:::1;21:12:21:23:0;;:27::33;;:36::44;;:27:::1;:12;:46:23:9:0;22:31:22:32;:20::39;:43::55;;:58::66;;:43:::1;:20;:12::68;23:15:27:9:0;24:31:24:32;:20::39;:43::49;;:20:::1;:12::51;25:31:25:32:0;:20::49;:63::84;:53::101;:20:::1;:12::103;26:31:26:32:0;:20::39;:43::54;;:20:::1;:12::56;23:15:27:9;9:4:28:5;;;;;;;;30::33::0;;;;;31:24:31:26;;:16::27:1;:31::37:0;;:16:::1;:8::39;32:25:32:26:0;;:28::30;;:16::31:1;30:4:33:5;;8:0:34:1",
+    "sourceMap": "9:4:28:5;;;;;13:27:13:28;:16::45:1;:49::84:0;:74::83;;:49::84:1;;;:16;:8::86;15:23:15:27:0;16:37:16:58;:27::65:1;17:26:17:38:0;;:41::47;;:26:::1;:50::58:0;;:26:::1;21:12:21:23:0;;:27::33;;:36::44;;:27:::1;:12;:46:23:9:0;22:31:22:32;:20::39:1;:43::55:0;;:58::66;;:43:::1;:20;:12::68;23:15:27:9:0;24:31:24:32;:20::39:1;:43::49:0;;:20:::1;:12::51;25:31:25:32:0;:20::49:1;:63::84:0;:53::101:1;:20;:12::103;26:31:26:32:0;:20::39:1;:43::54:0;;:20:::1;:12::56;23:15:27:9;9:4:28:5;;;;;;;;30::33::0;;;;;31:24:31:26;;:16::27:1;:31::37:0;;:16:::1;:8::39;32:25:32:26:0;;:28::30;;:16::31:1;30:4:33:5;;8:0:34:1",
     "logs": [],
     "requires": [
       {
@@ -72,7 +72,7 @@
   },
   "compiler": {
     "name": "cashc",
-    "version": "0.10.0-next.5"
+    "version": "0.10.0-next.6"
   },
-  "updatedAt": "2024-06-25T09:01:12.107Z"
+  "updatedAt": "2024-09-05T13:25:24.222Z"
 }
\ No newline at end of file
diff --git a/packages/cashscript/test/fixture/p2palindrome.json b/packages/cashscript/test/fixture/p2palindrome.json
index 017131c3..67c2b49c 100644
--- a/packages/cashscript/test/fixture/p2palindrome.json
+++ b/packages/cashscript/test/fixture/p2palindrome.json
@@ -16,7 +16,7 @@
   "source": "contract P2Palindrome() {\n    function spend(string palindrome) {\n        require(palindrome.reverse() == palindrome);\n    }\n}\n",
   "debug": {
     "bytecode": "0079bc517a87",
-    "sourceMap": "3:16:3:26;;:::36;:40::50;;:16:::1",
+    "sourceMap": "3:16:3:26;;:::36:1;:40::50:0;;:16:::1",
     "logs": [],
     "requires": [
       {
@@ -27,7 +27,7 @@
   },
   "compiler": {
     "name": "cashc",
-    "version": "0.10.0-next.5"
+    "version": "0.10.0-next.6"
   },
-  "updatedAt": "2024-06-25T09:01:16.592Z"
+  "updatedAt": "2024-09-05T13:25:22.851Z"
 }
\ No newline at end of file
diff --git a/packages/cashscript/test/fixture/p2pkh.json b/packages/cashscript/test/fixture/p2pkh.json
index 9ee43904..35574b7a 100644
--- a/packages/cashscript/test/fixture/p2pkh.json
+++ b/packages/cashscript/test/fixture/p2pkh.json
@@ -40,7 +40,7 @@
   },
   "compiler": {
     "name": "cashc",
-    "version": "0.10.0-next.5"
+    "version": "0.10.0-next.6"
   },
-  "updatedAt": "2024-06-25T09:01:11.867Z"
+  "updatedAt": "2024-09-05T13:25:23.980Z"
 }
\ No newline at end of file
diff --git a/packages/cashscript/test/fixture/simple_covenant.json b/packages/cashscript/test/fixture/simple_covenant.json
index 3c4d8bf8..0573f08d 100644
--- a/packages/cashscript/test/fixture/simple_covenant.json
+++ b/packages/cashscript/test/fixture/simple_covenant.json
@@ -11,7 +11,7 @@
   "source": "contract Covenant() {\n    function spend() {\n        require(tx.version >= 2);\n        require(tx.inputs.length >= 1);\n        require(tx.outputs.length >= 1);\n        require(this.activeBytecode.length < 520);\n        require(tx.inputs[0].value >= 546);\n        require(tx.outputs[0].value >= 546);\n    }\n}\n",
   "debug": {
     "bytecode": "c252a269c351a269c451a269c182770208029f6900c6022202a26900cc022202a2",
-    "sourceMap": "3:16:3:26;:30::31;:16:::1;:8::33;4:16:4:32:0;:36::37;:16:::1;:8::39;5:16:5:33:0;:37::38;:16:::1;:8::40;6:16:6:35:0;:::42;;:45::48;:16:::1;:8::50;7:26:7:27:0;:16::34;:38::41;:16:::1;:8::43;8:27:8:28:0;:16::35;:39::42;:16:::1",
+    "sourceMap": "3:16:3:26;:30::31;:16:::1;:8::33;4:16:4:32:0;:36::37;:16:::1;:8::39;5:16:5:33:0;:37::38;:16:::1;:8::40;6:16:6:35:0;:::42:1;;:45::48:0;:16:::1;:8::50;7:26:7:27:0;:16::34:1;:38::41:0;:16:::1;:8::43;8:27:8:28:0;:16::35:1;:39::42:0;:16:::1",
     "logs": [],
     "requires": [
       {
@@ -42,7 +42,7 @@
   },
   "compiler": {
     "name": "cashc",
-    "version": "0.10.0-next.5"
+    "version": "0.10.0-next.6"
   },
-  "updatedAt": "2024-06-25T09:01:11.138Z"
+  "updatedAt": "2024-09-05T13:25:23.302Z"
 }
\ No newline at end of file
diff --git a/packages/cashscript/test/fixture/token_category_comparison.json b/packages/cashscript/test/fixture/token_category_comparison.json
index 2c4460e7..28b9b243 100644
--- a/packages/cashscript/test/fixture/token_category_comparison.json
+++ b/packages/cashscript/test/fixture/token_category_comparison.json
@@ -11,7 +11,7 @@
   "source": "contract Test() {\n    function send() {\n        require(tx.inputs[1].tokenCategory == 0x);\n    }\n}\n",
   "debug": {
     "bytecode": "51ce0087",
-    "sourceMap": "3:26:3:27;:16::42;:46::48;:16:::1",
+    "sourceMap": "3:26:3:27;:16::42:1;:46::48:0;:16:::1",
     "logs": [],
     "requires": [
       {
@@ -22,7 +22,7 @@
   },
   "compiler": {
     "name": "cashc",
-    "version": "0.10.0-next.5"
+    "version": "0.10.0-next.6"
   },
-  "updatedAt": "2024-06-25T09:01:11.613Z"
+  "updatedAt": "2024-09-05T13:25:23.764Z"
 }
\ No newline at end of file
diff --git a/packages/cashscript/test/fixture/transfer_with_timeout.json b/packages/cashscript/test/fixture/transfer_with_timeout.json
index 4de9b0a9..6064fd4f 100644
--- a/packages/cashscript/test/fixture/transfer_with_timeout.json
+++ b/packages/cashscript/test/fixture/transfer_with_timeout.json
@@ -57,7 +57,7 @@
   },
   "compiler": {
     "name": "cashc",
-    "version": "0.10.0-next.5"
+    "version": "0.10.0-next.6"
   },
-  "updatedAt": "2024-06-25T09:01:11.370Z"
+  "updatedAt": "2024-09-05T13:25:23.528Z"
 }
\ No newline at end of file
diff --git a/packages/utils/src/source-map.ts b/packages/utils/src/source-map.ts
index e1d7dda5..db7ab5a3 100644
--- a/packages/utils/src/source-map.ts
+++ b/packages/utils/src/source-map.ts
@@ -84,7 +84,7 @@ export const sourceMapToLocationData = (sourceMap: string): FullLocationData =>
   let prevStartColumn = 0;
   let prevEndLine = 0;
   let prevEndColumn = 0;
-  let prevHint: PositionHint | undefined;
+  let prevHint: PositionHint = PositionHint.START;
 
   return sourceMap.split(';').map((entry: string) => {
     const [startLineStr, startColumnStr, endLineStr, endColumnStr, positionHintStr] = entry.split(':');
@@ -101,7 +101,7 @@ export const sourceMapToLocationData = (sourceMap: string): FullLocationData =>
     const endColumn = endColumnStr ? Number(endColumnStr) : prevEndColumn;
     prevEndColumn = endColumn;
 
-    const hint: PositionHint | undefined = parsePositionHint(positionHintStr) ?? prevHint;
+    const hint: PositionHint = parsePositionHint(positionHintStr) ?? prevHint;
     prevHint = hint;
 
     return {
@@ -109,7 +109,7 @@ export const sourceMapToLocationData = (sourceMap: string): FullLocationData =>
         start: { line: startLine, column: startColumn },
         end: { line: endLine, column: endColumn },
       },
-      ...(hint ? { positionHint: hint } : {}),
+      positionHint: hint,
     };
   });
 };
diff --git a/packages/utils/src/types.ts b/packages/utils/src/types.ts
index 7eb3199b..7b68e923 100644
--- a/packages/utils/src/types.ts
+++ b/packages/utils/src/types.ts
@@ -199,7 +199,7 @@ export interface LocationI {
 
 export type SingleLocationData = {
   location: LocationI;
-  positionHint?: PositionHint;
+  positionHint: PositionHint;
 };
 
 export type FullLocationData = Array<SingleLocationData>;

From d8bfa2becd0d418d671fbebf53b237d1ecd8e6db Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Thu, 5 Sep 2024 15:37:39 +0200
Subject: [PATCH 157/171] Separate out ConstructorArgument and FunctionArgument
 (breaking)

---
 packages/cashscript/src/Argument.ts        | 22 ++++++++++++----------
 packages/cashscript/src/Contract.ts        | 14 +++++++-------
 packages/cashscript/src/LibauthTemplate.ts | 20 ++++++++++----------
 packages/cashscript/src/Transaction.ts     |  4 ++--
 packages/cashscript/src/index.ts           |  8 +++++++-
 website/docs/sdk/instantiation.md          |  8 ++++----
 6 files changed, 42 insertions(+), 34 deletions(-)

diff --git a/packages/cashscript/src/Argument.ts b/packages/cashscript/src/Argument.ts
index 7a772dd1..915fe84d 100644
--- a/packages/cashscript/src/Argument.ts
+++ b/packages/cashscript/src/Argument.ts
@@ -12,13 +12,15 @@ import {
 import { TypeError } from './Errors.js';
 import SignatureTemplate from './SignatureTemplate.js';
 
-// TODO: Separate ConstructorArgument (no SignatureTemplate) and FunctionArgument (with SignatureTemplate)
-export type Argument = bigint | boolean | string | Uint8Array | SignatureTemplate;
-export type EncodedArgument = Uint8Array | SignatureTemplate;
+export type ConstructorArgument = bigint | boolean | string | Uint8Array;
+export type FunctionArgument = ConstructorArgument | SignatureTemplate;
 
-export type EncodeFunction = (arg: Argument, typeStr: string) => EncodedArgument;
+export type EncodedConstructorArgument = Uint8Array;
+export type EncodedFunctionArgument = Uint8Array | SignatureTemplate;
 
-export function encodeArgument(argument: Argument, typeStr: string): EncodedArgument {
+export type EncodeFunction = (arg: FunctionArgument, typeStr: string) => EncodedFunctionArgument;
+
+export function encodeFunctionArgument(argument: FunctionArgument, typeStr: string): EncodedFunctionArgument {
   let type = parseType(typeStr);
 
   if (type === PrimitiveType.BOOL) {
@@ -79,8 +81,8 @@ export function encodeArgument(argument: Argument, typeStr: string): EncodedArgu
 
 export const encodeConstructorArguments = (
   artifact: Artifact,
-  constructorArgs: Argument[],
-  encodeFunction: EncodeFunction = encodeArgument,
+  constructorArgs: ConstructorArgument[],
+  encodeFunction: EncodeFunction = encodeFunctionArgument,
 ): Uint8Array[] => {
   // Check there's no signature templates in the constructor
   if (constructorArgs.some((arg) => arg instanceof SignatureTemplate)) {
@@ -95,9 +97,9 @@ export const encodeConstructorArguments = (
 
 export const encodeFunctionArguments = (
   abiFunction: AbiFunction,
-  functionArgs: Argument[],
-  encodeFunction: EncodeFunction = encodeArgument,
-): EncodedArgument[] => {
+  functionArgs: FunctionArgument[],
+  encodeFunction: EncodeFunction = encodeFunctionArgument,
+): EncodedFunctionArgument[] => {
   const encodedArgs = functionArgs.map((arg, i) => encodeFunction(arg, abiFunction.inputs[i].type));
 
   return encodedArgs;
diff --git a/packages/cashscript/src/Contract.ts b/packages/cashscript/src/Contract.ts
index c6123abc..b6334963 100644
--- a/packages/cashscript/src/Contract.ts
+++ b/packages/cashscript/src/Contract.ts
@@ -11,7 +11,7 @@ import {
   scriptToBytecode,
 } from '@cashscript/utils';
 import { Transaction } from './Transaction.js';
-import { Argument, encodeArgument, encodeConstructorArguments, encodeFunctionArguments } from './Argument.js';
+import { ConstructorArgument, encodeFunctionArgument, encodeConstructorArguments, encodeFunctionArguments, FunctionArgument } from './Argument.js';
 import {
   Unlocker, ContractOptions, GenerateUnlockingBytecodeOptions, Utxo,
   AddressType,
@@ -41,7 +41,7 @@ export class Contract {
 
   constructor(
     public artifact: Artifact,
-    constructorArgs: Argument[],
+    constructorArgs: ConstructorArgument[],
     private options?: ContractOptions,
   ) {
     this.provider = this.options?.provider ?? new ElectrumNetworkProvider();
@@ -103,7 +103,7 @@ export class Contract {
   }
 
   private createFunction(abiFunction: AbiFunction, selector?: number): ContractFunction {
-    return (...args: Argument[]) => {
+    return (...args: FunctionArgument[]) => {
       if (abiFunction.inputs.length !== args.length) {
         throw new Error(`Incorrect number of arguments passed to function ${abiFunction.name}. Expected ${abiFunction.inputs.length} arguments (${abiFunction.inputs.map(input => input.type)}) but got ${args.length}`);
       }
@@ -124,7 +124,7 @@ export class Contract {
   }
 
   private createUnlocker(abiFunction: AbiFunction, selector?: number): ContractUnlocker {
-    return (...args: Argument[]) => {
+    return (...args: FunctionArgument[]) => {
       if (abiFunction.inputs.length !== args.length) {
         throw new Error(`Incorrect number of arguments passed to function ${abiFunction.name}. Expected ${abiFunction.inputs.length} arguments (${abiFunction.inputs.map(input => input.type)}) but got ${args.length}`);
       }
@@ -132,7 +132,7 @@ export class Contract {
       const bytecode = scriptToBytecode(this.redeemScript);
 
       const encodedArgs = args
-        .map((arg, i) => encodeArgument(arg, abiFunction.inputs[i].type));
+        .map((arg, i) => encodeFunctionArgument(arg, abiFunction.inputs[i].type));
 
       const generateUnlockingBytecode = (
         { transaction, sourceOutputs, inputIndex }: GenerateUnlockingBytecodeOptions,
@@ -169,5 +169,5 @@ export class Contract {
   }
 }
 
-export type ContractFunction = (...args: Argument[]) => Transaction;
-export type ContractUnlocker = (...args: Argument[]) => Unlocker;
+export type ContractFunction = (...args: FunctionArgument[]) => Transaction;
+export type ContractUnlocker = (...args: FunctionArgument[]) => Unlocker;
diff --git a/packages/cashscript/src/LibauthTemplate.ts b/packages/cashscript/src/LibauthTemplate.ts
index c535a894..eb89c221 100644
--- a/packages/cashscript/src/LibauthTemplate.ts
+++ b/packages/cashscript/src/LibauthTemplate.ts
@@ -37,7 +37,7 @@ import {
 } from './interfaces.js';
 import SignatureTemplate from './SignatureTemplate.js';
 import { Transaction } from './Transaction.js';
-import { EncodedArgument } from './Argument.js';
+import { EncodedConstructorArgument, EncodedFunctionArgument } from './Argument.js';
 import { addressToLockScript, extendedStringify, snakeCase, zip } from './utils.js';
 import { Contract } from './Contract.js';
 
@@ -181,8 +181,8 @@ const generateTemplateScripts = (
   artifact: Artifact,
   addressType: AddressType,
   abiFunction: AbiFunction,
-  encodedFunctionArgs: EncodedArgument[],
-  encodedConstructorArgs: EncodedArgument[],
+  encodedFunctionArgs: EncodedFunctionArgument[],
+  encodedConstructorArgs: EncodedConstructorArgument[],
 ): WalletTemplate['scripts'] => {
   // definition of locking scripts and unlocking scripts with their respective bytecode
   return {
@@ -194,7 +194,7 @@ const generateTemplateScripts = (
 const generateTemplateLockScript = (
   artifact: Artifact,
   addressType: AddressType,
-  constructorArguments: EncodedArgument[],
+  constructorArguments: EncodedFunctionArgument[],
 ): WalletTemplateScriptLocking => {
   return {
     lockingType: addressType,
@@ -212,7 +212,7 @@ const generateTemplateLockScript = (
 const generateTemplateUnlockScript = (
   artifact: Artifact,
   abiFunction: AbiFunction,
-  encodedFunctionArgs: EncodedArgument[],
+  encodedFunctionArgs: EncodedFunctionArgument[],
 ): WalletTemplateScriptUnlocking => {
   const functionIndex = artifact.abi.findIndex((func) => func.name === abiFunction.name);
 
@@ -240,8 +240,8 @@ const generateTemplateScenarios = (
   transactionHex: string,
   artifact: Artifact,
   abiFunction: AbiFunction,
-  encodedFunctionArgs: EncodedArgument[],
-  encodedConstructorArgs: EncodedArgument[],
+  encodedFunctionArgs: EncodedFunctionArgument[],
+  encodedConstructorArgs: EncodedConstructorArgument[],
 ): WalletTemplate['scenarios'] => {
   const libauthTransaction = decodeTransaction(hexToBin(transactionHex));
   if (typeof libauthTransaction === 'string') throw Error(libauthTransaction);
@@ -358,7 +358,7 @@ const generateTemplateScenarioBytecode = (
 
 const generateTemplateScenarioParametersValues = (
   types: AbiInput[],
-  encodedArgs: EncodedArgument[],
+  encodedArgs: EncodedFunctionArgument[],
 ): Record<string, string> => {
   const typesAndArguments = zip(types, encodedArgs);
 
@@ -376,7 +376,7 @@ const generateTemplateScenarioParametersValues = (
 
 const generateTemplateScenarioKeys = (
   types: AbiInput[],
-  encodedArgs: EncodedArgument[],
+  encodedArgs: EncodedFunctionArgument[],
 ): Record<string, string> => {
   const typesAndArguments = zip(types, encodedArgs);
 
@@ -387,7 +387,7 @@ const generateTemplateScenarioKeys = (
   return Object.fromEntries(entries);
 };
 
-const formatParametersForDebugging = (types: AbiInput[], args: EncodedArgument[]): string => {
+const formatParametersForDebugging = (types: AbiInput[], args: EncodedFunctionArgument[]): string => {
   if (types.length === 0) return '// none';
 
   // We reverse the arguments because the order of the arguments in the bytecode is reversed
diff --git a/packages/cashscript/src/Transaction.ts b/packages/cashscript/src/Transaction.ts
index 9df57c86..11a9e60a 100644
--- a/packages/cashscript/src/Transaction.ts
+++ b/packages/cashscript/src/Transaction.ts
@@ -40,7 +40,7 @@ import { TransactionBuilder } from './TransactionBuilder.js';
 import { Contract } from './Contract.js';
 import { buildTemplate, getBitauthUri } from './LibauthTemplate.js';
 import { debugTemplate, DebugResult } from './debugging.js';
-import { EncodedArgument } from './Argument.js';
+import { EncodedFunctionArgument } from './Argument.js';
 import { FailedTransactionError } from './Errors.js';
 
 export class Transaction {
@@ -58,7 +58,7 @@ export class Transaction {
     public contract: Contract,
     private unlocker: Unlocker,
     public abiFunction: AbiFunction,
-    public encodedFunctionArgs: EncodedArgument[],
+    public encodedFunctionArgs: EncodedFunctionArgument[],
     private selector?: number,
   ) {}
 
diff --git a/packages/cashscript/src/index.ts b/packages/cashscript/src/index.ts
index 4b9d2228..53c364bb 100644
--- a/packages/cashscript/src/index.ts
+++ b/packages/cashscript/src/index.ts
@@ -2,7 +2,13 @@ export { default as SignatureTemplate } from './SignatureTemplate.js';
 export { Contract, type ContractFunction } from './Contract.js';
 export { Transaction } from './Transaction.js';
 export { TransactionBuilder } from './TransactionBuilder.js';
-export { type Argument, encodeArgument } from './Argument.js';
+export {
+  type ConstructorArgument,
+  type FunctionArgument,
+  type EncodedConstructorArgument,
+  type EncodedFunctionArgument,
+  encodeFunctionArgument,
+} from './Argument.js';
 export type { Artifact, AbiFunction, AbiInput } from '@cashscript/utils';
 export * as utils from '@cashscript/utils';
 export * from './interfaces.js';
diff --git a/website/docs/sdk/instantiation.md b/website/docs/sdk/instantiation.md
index 87f54c2a..7522f7ef 100644
--- a/website/docs/sdk/instantiation.md
+++ b/website/docs/sdk/instantiation.md
@@ -5,7 +5,7 @@ title: Contract Instantiation
 Before interacting with a smart contract on the BCH network, the CashScript SDK needs to instantiate a `Contract` object. This is done by providing the contract's information and constructor arguments. After this instantiation, the CashScript SDK can interact with the BCH contract.
 
 :::info
-CashScript offers a TypeScript SDK, which can also be used easily in vanilla JavaScript codebases. 
+CashScript offers a TypeScript SDK, which can also be used easily in vanilla JavaScript codebases.
 Because of the separation of the compiler and the SDK, CashScript contracts can be integrated into other languages in the future.
 :::
 
@@ -16,7 +16,7 @@ The `Contract` class is used to represent a CashScript contract in a JavaScript
 ```ts
 new Contract(
   artifact: Artifact,
-  constructorArgs: Argument[],
+  constructorArgs: ConstructorArgument[],
   options? : {
     provider: NetworkProvider,
     addressType: 'p2sh20' | 'p2sh32',
@@ -153,7 +153,7 @@ const utxos = await contract.getUtxos()
 
 ### Contract functions
 ```ts
-contract.functions.<functionName>(...args: Argument[]): Transaction
+contract.functions.<functionName>(...args: FunctionArgument[]): Transaction
 ```
 
 Once a smart contract has been instantiated, you can invoke a contract function to spend from the contract with the '[Simple transaction-builder](/docs/sdk/transactions)' by calling the function name under the `functions` member field of a contract object.
@@ -174,7 +174,7 @@ const tx = await contract.functions
 ### Contract unlockers
 
 ```ts
-contract.unlock.<functionName>(...args: Argument[]): Unlocker
+contract.unlock.<functionName>(...args: FunctionArgument[]): Unlocker
 ```
 
 Once a smart contract has been instantiated, you can invoke a contract function on a smart contract UTXO to use the '[Advanced transaction-builder](/docs/sdk/transactions-advanced)' by calling the function name under the `unlock` member field of a contract object.

From f4e2a3e1303dd8a4cc4debacc4e5d0ba371f050f Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Thu, 5 Sep 2024 15:46:27 +0200
Subject: [PATCH 158/171] Remove NodeErrorReason (breaking)

---
 packages/cashscript/src/Errors.ts             | 50 -----------------
 .../cashscript/test/e2e/FullStack.test.ts     |  4 +-
 .../cashscript/test/e2e/old/Mecenas.test.ts   |  8 +--
 website/docs/sdk/transactions.md              | 55 +------------------
 4 files changed, 8 insertions(+), 109 deletions(-)

diff --git a/packages/cashscript/src/Errors.ts b/packages/cashscript/src/Errors.ts
index 1db1c420..616c1520 100644
--- a/packages/cashscript/src/Errors.ts
+++ b/packages/cashscript/src/Errors.ts
@@ -103,53 +103,3 @@ const getLocationDataForInstructionPointer = (
 
   return { statement, lineNumber };
 };
-
-// TODO: Expand these reasons with non-script failures (like tx-mempool-conflict)
-export enum NodeErrorReason {
-  EVAL_FALSE = 'Script evaluated without error but finished with a false/empty top stack element',
-  VERIFY = 'Script failed an OP_VERIFY operation',
-  EQUALVERIFY = 'Script failed an OP_EQUALVERIFY operation',
-  CHECKMULTISIGVERIFY = 'Script failed an OP_CHECKMULTISIGVERIFY operation',
-  CHECKSIGVERIFY = 'Script failed an OP_CHECKSIGVERIFY operation',
-  CHECKDATASIGVERIFY = 'Script failed an OP_CHECKDATASIGVERIFY operation',
-  NUMEQUALVERIFY = 'Script failed an OP_NUMEQUALVERIFY operation',
-  SCRIPT_SIZE = 'Script is too big',
-  PUSH_SIZE = 'Push value size limit exceeded',
-  OP_COUNT = 'Operation limit exceeded',
-  STACK_SIZE = 'Stack size limit exceeded',
-  SIG_COUNT = 'Signature count negative or greater than pubkey count',
-  PUBKEY_COUNT = 'Pubkey count negative or limit exceeded',
-  INVALID_OPERAND_SIZE = 'Invalid operand size',
-  INVALID_NUMBER_RANGE = 'Given operand is not a number within the valid range',
-  IMPOSSIBLE_ENCODING = 'The requested encoding is impossible to satisfy',
-  INVALID_SPLIT_RANGE = 'Invalid OP_SPLIT range',
-  INVALID_BIT_COUNT = 'Invalid number of bit set in OP_CHECKMULTISIG',
-  BAD_OPCODE = 'Opcode missing or not understood',
-  DISABLED_OPCODE = 'Attempted to use a disabled opcode',
-  INVALID_STACK_OPERATION = 'Operation not valid with the current stack size',
-  INVALID_ALTSTACK_OPERATION = 'Operation not valid with the current altstack size',
-  OP_RETURN = 'OP_RETURN was encountered',
-  UNBALANCED_CONDITIONAL = 'Invalid OP_IF construction',
-  DIV_BY_ZERO = 'Division by zero error',
-  MOD_BY_ZERO = 'Modulo by zero error',
-  INVALID_BITFIELD_SIZE = 'Bitfield of unexpected size error',
-  INVALID_BIT_RANGE = 'Bitfield\'s bit out of the expected range',
-  NEGATIVE_LOCKTIME = 'Negative locktime',
-  UNSATISFIED_LOCKTIME = 'Locktime requirement not satisfied',
-  SIG_HASHTYPE = 'Signature hash type missing or not understood',
-  SIG_DER = 'Non-canonical DER signature',
-  MINIMALDATA = 'Data push larger than necessary',
-  SIG_PUSHONLY = 'Only push operators allowed in signature scripts',
-  SIG_HIGH_S = 'Non-canonical signature: S value is unnecessarily high',
-  MINIMALIF = 'OP_IF/NOTIF argument must be minimal',
-  SIG_NULLFAIL = 'Signature must be zero for failed CHECK(MULTI)SIG operation',
-  SIG_BADLENGTH = 'Signature cannot be 65 bytes in CHECKMULTISIG',
-  SIG_NONSCHNORR = 'Only Schnorr signatures allowed in this operation',
-  DISCOURAGE_UPGRADABLE_NOPS = 'NOPx reserved for soft-fork upgrades',
-  PUBKEYTYPE = 'Public key is neither compressed or uncompressed',
-  CLEANSTACK = 'Script did not clean its stack',
-  NONCOMPRESSED_PUBKEY = 'Using non-compressed public key',
-  ILLEGAL_FORKID = 'Illegal use of SIGHASH_FORKID',
-  MUST_USE_FORKID = 'Signature must use SIGHASH_FORKID',
-  UNKNOWN = 'unknown error',
-}
diff --git a/packages/cashscript/test/e2e/FullStack.test.ts b/packages/cashscript/test/e2e/FullStack.test.ts
index 7ad62ba8..e4c576a0 100644
--- a/packages/cashscript/test/e2e/FullStack.test.ts
+++ b/packages/cashscript/test/e2e/FullStack.test.ts
@@ -7,7 +7,7 @@ import {
   bobPub,
 } from '../fixture/vars.js';
 import { getTxOutputs } from '../test-util.js';
-import { FailedRequireError, NodeErrorReason } from '../../src/Errors.js';
+import { FailedRequireError } from '../../src/Errors.js';
 import artifact from '../fixture/p2pkh.json' assert { type: 'json' };
 
 describe.skip('P2PKH (using FullStackNetworkProvider)', () => {
@@ -34,7 +34,7 @@ describe.skip('P2PKH (using FullStackNetworkProvider)', () => {
 
       // then
       await expect(txPromise).rejects.toThrow(FailedRequireError);
-      await expect(txPromise).rejects.toThrow(NodeErrorReason.SIG_NULLFAIL);
+      await expect(txPromise).rejects.toThrow('Signature must be zero for failed CHECK(MULTI)SIG operation');
     });
 
     it('should succeed when using correct function arguments', async () => {
diff --git a/packages/cashscript/test/e2e/old/Mecenas.test.ts b/packages/cashscript/test/e2e/old/Mecenas.test.ts
index 24c159d4..4abf09eb 100644
--- a/packages/cashscript/test/e2e/old/Mecenas.test.ts
+++ b/packages/cashscript/test/e2e/old/Mecenas.test.ts
@@ -14,7 +14,7 @@ import {
   alicePriv,
 } from '../../fixture/vars.js';
 import { getTxOutputs } from '../../test-util.js';
-import { FailedTransactionError, NodeErrorReason } from '../../../src/Errors.js';
+import { FailedTransactionError } from '../../../src/Errors.js';
 import artifact from '../../fixture/old/mecenas.json' assert { type: 'json' };
 
 if (!process.env.TESTS_USE_MOCKNET) {
@@ -46,7 +46,7 @@ if (!process.env.TESTS_USE_MOCKNET) {
 
         // then
         await expect(txPromise).rejects.toThrow(FailedTransactionError);
-        await expect(txPromise).rejects.toThrow(NodeErrorReason.EQUALVERIFY);
+        await expect(txPromise).rejects.toThrow('Script failed an OP_EQUALVERIFY operation');
       });
 
       it('should fail when trying to send to wrong person', async () => {
@@ -63,7 +63,7 @@ if (!process.env.TESTS_USE_MOCKNET) {
 
         // then
         await expect(txPromise).rejects.toThrow(FailedTransactionError);
-        await expect(txPromise).rejects.toThrow(NodeErrorReason.EQUALVERIFY);
+        await expect(txPromise).rejects.toThrow('Script failed an OP_EQUALVERIFY operation');
       });
 
       it('should fail when trying to send to multiple people', async () => {
@@ -81,7 +81,7 @@ if (!process.env.TESTS_USE_MOCKNET) {
 
         // then
         await expect(txPromise).rejects.toThrow(FailedTransactionError);
-        await expect(txPromise).rejects.toThrow(NodeErrorReason.EQUALVERIFY);
+        await expect(txPromise).rejects.toThrow('Script failed an OP_EQUALVERIFY operation');
       });
 
       it('should succeed when sending pledge to receiver', async () => {
diff --git a/website/docs/sdk/transactions.md b/website/docs/sdk/transactions.md
index 4db1a075..bda4ae6a 100644
--- a/website/docs/sdk/transactions.md
+++ b/website/docs/sdk/transactions.md
@@ -263,7 +263,7 @@ TODO: Update this section with the new debugging experience
 
 ## Transaction errors
 
-When sending a transaction, the CashScript SDK will throw an error if the transaction fails. If you are using an artifact compiled with `cashc@0.10.0` or later, the error will be of the type `FailedRequireError` or `FailedTransactionError`. In case of a `FailedRequireError`, the error will refer to the corresponding `require` statement in the contract code so you know where your contract failed. If you want more information about the underlying error, you can check the `libauthErrorMessage` property of the error.
+When sending a transaction, the CashScript SDK will throw an error if the transaction fails. If you are using an artifact compiled with `cashc@0.10.0` or later, the error will be of the type `FailedRequireError` or `FailedTransactionEvaluationError`. In case of a `FailedRequireError`, the error will refer to the corresponding `require` statement in the contract code so you know where your contract failed. If you want more information about the underlying error, you can check the `libauthErrorMessage` property of the error.
 
 ```ts
 interface FailedRequireError {
@@ -276,58 +276,7 @@ interface FailedRequireError {
 }
 ```
 
-If you are using an artifact compiled with an older version of `cashc`, the error will always be of the type `FailedTransactionError`. In this case, you can use the `reason` property of the error to determine the reason for the failure. A list of possible reasons can be found in the `NodeErrorReason` enum below.
-
-```ts
-enum NodeErrorReason {
-  EVAL_FALSE = 'Script evaluated without error but finished with a false/empty top stack element',
-  VERIFY = 'Script failed an OP_VERIFY operation',
-  EQUALVERIFY = 'Script failed an OP_EQUALVERIFY operation',
-  CHECKMULTISIGVERIFY = 'Script failed an OP_CHECKMULTISIGVERIFY operation',
-  CHECKSIGVERIFY = 'Script failed an OP_CHECKSIGVERIFY operation',
-  CHECKDATASIGVERIFY = 'Script failed an OP_CHECKDATASIGVERIFY operation',
-  NUMEQUALVERIFY = 'Script failed an OP_NUMEQUALVERIFY operation',
-  SCRIPT_SIZE = 'Script is too big',
-  PUSH_SIZE = 'Push value size limit exceeded',
-  OP_COUNT = 'Operation limit exceeded',
-  STACK_SIZE = 'Stack size limit exceeded',
-  SIG_COUNT = 'Signature count negative or greater than pubkey count',
-  PUBKEY_COUNT = 'Pubkey count negative or limit exceeded',
-  INVALID_OPERAND_SIZE = 'Invalid operand size',
-  INVALID_NUMBER_RANGE = 'Given operand is not a number within the valid range',
-  IMPOSSIBLE_ENCODING = 'The requested encoding is impossible to satisfy',
-  INVALID_SPLIT_RANGE = 'Invalid OP_SPLIT range',
-  INVALID_BIT_COUNT = 'Invalid number of bit set in OP_CHECKMULTISIG',
-  BAD_OPCODE = 'Opcode missing or not understood',
-  DISABLED_OPCODE = 'Attempted to use a disabled opcode',
-  INVALID_STACK_OPERATION = 'Operation not valid with the current stack size',
-  INVALID_ALTSTACK_OPERATION = 'Operation not valid with the current altstack size',
-  OP_RETURN = 'OP_RETURN was encountered',
-  UNBALANCED_CONDITIONAL = 'Invalid OP_IF construction',
-  DIV_BY_ZERO = 'Division by zero error',
-  MOD_BY_ZERO = 'Modulo by zero error',
-  INVALID_BITFIELD_SIZE = 'Bitfield of unexpected size error',
-  INVALID_BIT_RANGE = 'Bitfield\'s bit out of the expected range',
-  NEGATIVE_LOCKTIME = 'Negative locktime',
-  UNSATISFIED_LOCKTIME = 'Locktime requirement not satisfied',
-  SIG_HASHTYPE = 'Signature hash type missing or not understood',
-  SIG_DER = 'Non-canonical DER signature',
-  MINIMALDATA = 'Data push larger than necessary',
-  SIG_PUSHONLY = 'Only push operators allowed in signature scripts',
-  SIG_HIGH_S = 'Non-canonical signature: S value is unnecessarily high',
-  MINIMALIF = 'OP_IF/NOTIF argument must be minimal',
-  SIG_NULLFAIL = 'Signature must be zero for failed CHECK(MULTI)SIG operation',
-  SIG_BADLENGTH = 'Signature cannot be 65 bytes in CHECKMULTISIG',
-  SIG_NONSCHNORR = 'Only Schnorr signatures allowed in this operation',
-  DISCOURAGE_UPGRADABLE_NOPS = 'NOPx reserved for soft-fork upgrades',
-  PUBKEYTYPE = 'Public key is neither compressed or uncompressed',
-  CLEANSTACK = 'Script did not clean its stack',
-  NONCOMPRESSED_PUBKEY = 'Using non-compressed public key',
-  ILLEGAL_FORKID = 'Illegal use of SIGHASH_FORKID',
-  MUST_USE_FORKID = 'Signature must use SIGHASH_FORKID',
-  UNKNOWN = 'unknown error',
-}
-```
+If you are using an artifact compiled with an older version of `cashc`, the error will always be of the type `FailedTransactionError`. In this case, you can use the `reason` property of the error to determine the reason for the failure.
 
 [fetch-api]: https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API
 [bip68]: https://github.com/bitcoin/bips/blob/master/bip-0068.mediawiki

From 3022848621e663f89b5243c226577130d59211a9 Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Thu, 5 Sep 2024 16:13:08 +0200
Subject: [PATCH 159/171] Support literal values for sig parameters in addition
 to SignatureTemplate

---
 packages/cashscript/src/LibauthTemplate.ts | 14 +++---
 packages/cashscript/test/debugging.test.ts | 51 +++++++++++++---------
 2 files changed, 39 insertions(+), 26 deletions(-)

diff --git a/packages/cashscript/src/LibauthTemplate.ts b/packages/cashscript/src/LibauthTemplate.ts
index eb89c221..ed0b7901 100644
--- a/packages/cashscript/src/LibauthTemplate.ts
+++ b/packages/cashscript/src/LibauthTemplate.ts
@@ -2,7 +2,6 @@ import {
   AbiFunction,
   AbiInput,
   Artifact,
-  PrimitiveType,
   bytecodeToScript,
   formatBitAuthScript,
 } from '@cashscript/utils';
@@ -59,7 +58,7 @@ export const buildTemplate = async ({
     name: contract.artifact.contractName,
     supported: ['BCH_2023_05'],
     version: 0,
-    entities: generateTemplateEntities(contract.artifact, transaction.abiFunction),
+    entities: generateTemplateEntities(contract.artifact, transaction.abiFunction, transaction.encodedFunctionArgs),
     scripts: generateTemplateScripts(
       contract.artifact,
       contract.addressType,
@@ -127,14 +126,18 @@ export const getBitauthUri = (template: WalletTemplate): string => {
 };
 
 
-const generateTemplateEntities = (artifact: Artifact, abiFunction: AbiFunction): WalletTemplate['entities'] => {
+const generateTemplateEntities = (
+  artifact: Artifact,
+  abiFunction: AbiFunction,
+  encodedFunctionArgs: EncodedFunctionArgument[],
+): WalletTemplate['entities'] => {
   const functionParameters = Object.fromEntries<WalletTemplateVariable>(
-    abiFunction.inputs.map((input) => ([
+    abiFunction.inputs.map((input, index) => ([
       snakeCase(input.name),
       {
         description: `"${input.name}" parameter of function "${abiFunction.name}"`,
         name: input.name,
-        type: input.type === PrimitiveType.SIG ? 'Key' : 'WalletData',
+        type: encodedFunctionArgs[index] instanceof SignatureTemplate ? 'Key' : 'WalletData',
       },
     ])),
   );
@@ -269,7 +272,6 @@ const generateTemplateScenarios = (
     },
   };
 
-
   if (artifact.abi.length > 1) {
     const functionIndex = artifact.abi.findIndex((func) => func.name === transaction.abiFunction.name);
     scenarios!.evaluate_function!.data!.bytecode!.function_index = functionIndex.toString();
diff --git a/packages/cashscript/test/debugging.test.ts b/packages/cashscript/test/debugging.test.ts
index 42d3c689..9e0e452a 100644
--- a/packages/cashscript/test/debugging.test.ts
+++ b/packages/cashscript/test/debugging.test.ts
@@ -51,7 +51,6 @@ contract Test() {
     if (switch == 1) {
       int a = 2;
       require(1 == a, "1 should equal 2");
-    // TODO: Check if it's better test with or without this else
     } else if (switch == 2) {
       int b = 3;
       require(1 == b, "1 should equal 3");
@@ -486,18 +485,24 @@ describe('Debugging tests', () => {
       provider.addUtxo(contract.address, randomUtxo());
 
       const transactionIfBranch = contract.functions
-        .test_final_require_in_if_statement(1n).to(contract.address, 1000n);
+        .test_final_require_in_if_statement(1n)
+        .to(contract.address, 1000n);
+
       await expect(transactionIfBranch).toFailRequireWith('Test.cash:43 Require statement failed at input 0 in contract Test.cash at line 43 with the following message: 1 should equal 2.');
       await expect(transactionIfBranch).toFailRequireWith('Failing statement: require(1 == a, "1 should equal 2")');
 
       const transactionElseIfBranch = contract.functions
-        .test_final_require_in_if_statement(2n).to(contract.address, 1000n);
-      await expect(transactionElseIfBranch).toFailRequireWith('Test.cash:47 Require statement failed at input 0 in contract Test.cash at line 47 with the following message: 1 should equal 3.');
+        .test_final_require_in_if_statement(2n)
+        .to(contract.address, 1000n);
+
+      await expect(transactionElseIfBranch).toFailRequireWith('Test.cash:46 Require statement failed at input 0 in contract Test.cash at line 46 with the following message: 1 should equal 3.');
       await expect(transactionElseIfBranch).toFailRequireWith('Failing statement: require(1 == b, "1 should equal 3")');
 
       const transactionElseBranch = contract.functions
-        .test_final_require_in_if_statement(3n).to(contract.address, 1000n);
-      await expect(transactionElseBranch).toFailRequireWith('Test.cash:50 Require statement failed at input 0 in contract Test.cash at line 50 with the following message: switch should equal 4.');
+        .test_final_require_in_if_statement(3n)
+        .to(contract.address, 1000n);
+
+      await expect(transactionElseBranch).toFailRequireWith('Test.cash:49 Require statement failed at input 0 in contract Test.cash at line 49 with the following message: switch should equal 4.');
       await expect(transactionElseBranch).toFailRequireWith('Failing statement: require(switch == c, "switch should equal 4")');
     });
 
@@ -507,8 +512,10 @@ describe('Debugging tests', () => {
       provider.addUtxo(contract.address, randomUtxo());
 
       const transaction = contract.functions
-        .test_final_require_in_if_statement_with_deep_reassignment().to(contract.address, 1000n);
-      await expect(transaction).toFailRequireWith('Test.cash:63 Require statement failed at input 0 in contract Test.cash at line 63 with the following message: sum should equal 10.');
+        .test_final_require_in_if_statement_with_deep_reassignment()
+        .to(contract.address, 1000n);
+
+      await expect(transaction).toFailRequireWith('Test.cash:62 Require statement failed at input 0 in contract Test.cash at line 62 with the following message: sum should equal 10.');
       await expect(transaction).toFailRequireWith('Failing statement: require(a + b + c + d + e == 10, "sum should equal 10")');
     });
 
@@ -518,14 +525,18 @@ describe('Debugging tests', () => {
       provider.addUtxo(contract.address, randomUtxo());
 
       const checkSigTransaction = contract.functions
-        .test_fail_checksig(new SignatureTemplate(alicePriv), bobPub).to(contract.address, 1000n);
-      await expect(checkSigTransaction).toFailRequireWith('Test.cash:78 Require statement failed at input 0 in contract Test.cash at line 78 with the following message: Signatures do not match.');
+        .test_fail_checksig(new SignatureTemplate(alicePriv), bobPub)
+        .to(contract.address, 1000n);
+
+      await expect(checkSigTransaction).toFailRequireWith('Test.cash:77 Require statement failed at input 0 in contract Test.cash at line 77 with the following message: Signatures do not match.');
       await expect(checkSigTransaction).toFailRequireWith('Failing statement: require(checkSig(s, pk), "Signatures do not match")');
 
-      // TODO: Add test for checksig with a NULL Signature (after we refactor Libauth Template generation)
-      // const checkSigTransactionNullSignature = contract.functions
-      //   .test_fail_checksig('', bobPub).to(contract.address, 1000n);
-      // await expect(checkSigTransactionNullSignature).toFailRequireWith(/Signatures do not match/);
+      const checkSigTransactionNullSignature = contract.functions
+        .test_fail_checksig(hexToBin(''), bobPub)
+        .to(contract.address, 1000n);
+
+      await expect(checkSigTransactionNullSignature).toFailRequireWith('Test.cash:77 Require statement failed at input 0 in contract Test.cash at line 77 with the following message: Signatures do not match.');
+      await expect(checkSigTransactionNullSignature).toFailRequireWith('Failing statement: require(checkSig(s, pk), "Signatures do not match")');
     });
 
     // test_fail_checksig_final_verify
@@ -535,7 +546,7 @@ describe('Debugging tests', () => {
 
       const checkSigTransaction = contract.functions
         .test_fail_checksig_final_verify(new SignatureTemplate(alicePriv), bobPub).to(contract.address, 1000n);
-      await expect(checkSigTransaction).toFailRequireWith('Test.cash:83 Require statement failed at input 0 in contract Test.cash at line 83 with the following message: Signatures do not match.');
+      await expect(checkSigTransaction).toFailRequireWith('Test.cash:82 Require statement failed at input 0 in contract Test.cash at line 82 with the following message: Signatures do not match.');
       await expect(checkSigTransaction).toFailRequireWith('Failing statement: require(checkSig(s, pk), "Signatures do not match")');
     });
 
@@ -547,13 +558,13 @@ describe('Debugging tests', () => {
       const checkDataSigTransaction = contract.functions
         .test_fail_checkdatasig(new SignatureTemplate(alicePriv).generateSignature(hexToBin('0xbeef')).slice(0, -1), '0xbeef', bobPub)
         .to(contract.address, 1000n);
-      await expect(checkDataSigTransaction).toFailRequireWith('Test.cash:87 Require statement failed at input 0 in contract Test.cash at line 87 with the following message: Data Signatures do not match.');
+      await expect(checkDataSigTransaction).toFailRequireWith('Test.cash:86 Require statement failed at input 0 in contract Test.cash at line 86 with the following message: Data Signatures do not match.');
       await expect(checkDataSigTransaction).toFailRequireWith('Failing statement: require(checkDataSig(s, message, pk), "Data Signatures do not match")');
 
       const checkDataSigTransactionWrongMessage = contract.functions
         .test_fail_checkdatasig(new SignatureTemplate(alicePriv).generateSignature(hexToBin('0xc0ffee')).slice(0, -1), '0xbeef', alicePub)
         .to(contract.address, 1000n);
-      await expect(checkDataSigTransactionWrongMessage).toFailRequireWith('Test.cash:87 Require statement failed at input 0 in contract Test.cash at line 87 with the following message: Data Signatures do not match.');
+      await expect(checkDataSigTransactionWrongMessage).toFailRequireWith('Test.cash:86 Require statement failed at input 0 in contract Test.cash at line 86 with the following message: Data Signatures do not match.');
       await expect(checkDataSigTransactionWrongMessage).toFailRequireWith('Failing statement: require(checkDataSig(s, message, pk), "Data Signatures do not match")');
     });
 
@@ -570,7 +581,7 @@ describe('Debugging tests', () => {
           alicePub,
         )
         .to(contract.address, 1000n);
-      await expect(checkmultiSigTransaction).toFailRequireWith('Test.cash:91 Require statement failed at input 0 in contract Test.cash at line 91 with the following message: Multi Signatures do not match.');
+      await expect(checkmultiSigTransaction).toFailRequireWith('Test.cash:90 Require statement failed at input 0 in contract Test.cash at line 90 with the following message: Multi Signatures do not match.');
       await expect(checkmultiSigTransaction).toFailRequireWith('Failing statement: require(checkMultiSig([s1, s2], [pk1, pk2]), "Multi Signatures do not match")');
     });
 
@@ -664,7 +675,7 @@ describe('Debugging tests', () => {
         .to(contract.address, 1000n)
         .debug();
 
-      await expect(transactionPromise).rejects.toThrow('Test.cash:69 Error in transaction at input 0 in contract Test.cash at line 69.');
+      await expect(transactionPromise).rejects.toThrow('Test.cash:68 Error in transaction at input 0 in contract Test.cash at line 68.');
       await expect(transactionPromise).rejects.toThrow('Failing statement: test.split(4)');
       await expect(transactionPromise).rejects.toThrow(`Reason: ${AuthenticationErrorCommon.invalidSplitIndex}`);
     });
@@ -678,7 +689,7 @@ describe('Debugging tests', () => {
         .to(contract.address, 1000n)
         .debug();
 
-      await expect(transactionPromise).rejects.toThrow('Test.cash:74 Error in transaction at input 0 in contract Test.cash at line 74.');
+      await expect(transactionPromise).rejects.toThrow('Test.cash:73 Error in transaction at input 0 in contract Test.cash at line 73.');
       await expect(transactionPromise).rejects.toThrow('Failing statement: tx.inputs[5].value');
       await expect(transactionPromise).rejects.toThrow(`Reason: ${AuthenticationErrorCommon.invalidTransactionUtxoIndex}`);
     });

From 9b1d858707b2db279c3030b7e488f453b99917ec Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Thu, 5 Sep 2024 16:22:36 +0200
Subject: [PATCH 160/171] Remove TODOs and move some of them to a GitHub issue

---
 packages/cashscript/src/Errors.ts                      | 2 --
 packages/cashscript/src/LibauthTemplate.ts             | 7 ++-----
 packages/cashscript/test/Contract.test.ts              | 2 --
 packages/cashscript/test/debugging.test.ts             | 2 --
 packages/utils/src/script.ts                           | 5 +----
 packages/utils/test/fixtures/bitauth-script.fixture.ts | 1 -
 website/docs/sdk/transactions.md                       | 2 --
 7 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/packages/cashscript/src/Errors.ts b/packages/cashscript/src/Errors.ts
index 616c1520..e2aae1db 100644
--- a/packages/cashscript/src/Errors.ts
+++ b/packages/cashscript/src/Errors.ts
@@ -25,7 +25,6 @@ export class NoDebugInformationInArtifactError extends Error {
 }
 
 export class FailedTransactionError extends Error {
-  // TODO: Make bitauthUri required once the advanced transaction builder supports debugging
   constructor(public reason: string, public bitauthUri?: string) {
     super(`${reason}${bitauthUri ? `\n\nBitauth URI: ${bitauthUri}` : ''}`);
   }
@@ -78,7 +77,6 @@ export class FailedRequireError extends FailedTransactionError {
   }
 }
 
-// TODO: Add tests and make sure it works for multiline statements
 const getLocationDataForInstructionPointer = (
   artifact: Artifact,
   instructionPointer: number,
diff --git a/packages/cashscript/src/LibauthTemplate.ts b/packages/cashscript/src/LibauthTemplate.ts
index ed0b7901..d7abb633 100644
--- a/packages/cashscript/src/LibauthTemplate.ts
+++ b/packages/cashscript/src/LibauthTemplate.ts
@@ -260,7 +260,6 @@ const generateTemplateScenarios = (
           ...generateTemplateScenarioParametersValues(abiFunction.inputs, encodedFunctionArgs),
           ...generateTemplateScenarioParametersValues(artifact.constructorInputs, encodedConstructorArgs),
         },
-        // TODO: Don't hardcode these values
         currentBlockHeight: 2,
         currentBlockTime: Math.round(+new Date() / 1000),
         keys: {
@@ -288,7 +287,7 @@ const generateTemplateScenarioTransaction = (
   const slotIndex = csTransaction.inputs.findIndex((input) => !isUtxoP2PKH(input));
 
   const inputs = libauthTransaction.inputs.map((input, index) => {
-    const csInput = csTransaction.inputs[index] as Utxo; // TODO: Improve code quality here (see zip in other places)
+    const csInput = csTransaction.inputs[index] as Utxo;
 
     return {
       outpointIndex: input.outpointIndex,
@@ -301,7 +300,7 @@ const generateTemplateScenarioTransaction = (
   const locktime = libauthTransaction.locktime;
 
   const outputs = libauthTransaction.outputs.map((output, index) => {
-    const csOutput = csTransaction.outputs[index]; // TODO: Improve code quality here (see zip in other places)
+    const csOutput = csTransaction.outputs[index];
 
     return {
       lockingBytecode: generateTemplateScenarioTransactionOutputLockingBytecode(csOutput, contract),
@@ -440,7 +439,6 @@ const getHashTypeName = (hashType: HashType): string => {
 
 const formatBytecodeForDebugging = (artifact: Artifact): string => {
   if (!artifact.debug) {
-    // TODO: See if we can merge this with code from @cashscript/utils -> script.ts
     return artifact.bytecode
       .split(' ')
       .map((asmElement) => (isHex(asmElement) ? `<0x${asmElement}>` : asmElement))
@@ -454,7 +452,6 @@ const formatBytecodeForDebugging = (artifact: Artifact): string => {
   );
 };
 
-// TODO: Maybe move / refactor
 const serialiseTokenDetails = (token?: TokenDetails | LibauthTokenDetails): LibauthTemplateTokenDetails | undefined => {
   if (!token) return undefined;
 
diff --git a/packages/cashscript/test/Contract.test.ts b/packages/cashscript/test/Contract.test.ts
index ad995a6e..2f1508e1 100644
--- a/packages/cashscript/test/Contract.test.ts
+++ b/packages/cashscript/test/Contract.test.ts
@@ -15,8 +15,6 @@ import hodlVaultArtifact from './fixture/hodl_vault.json' assert { type: 'json'
 import mecenasArtifact from './fixture/mecenas.json' assert { type: 'json' };
 import boundedBytesArtifact from './fixture/bounded_bytes.json' assert { type: 'json' };
 
-// This is failing due to limitations between Jest and bigint (https://github.com/facebook/jest/issues/11617)
-// TODO: Fix this somehow by changing the test, or move away from Jest
 describe('Contract', () => {
   describe('new', () => {
     it('should fail with incorrect constructor args', () => {
diff --git a/packages/cashscript/test/debugging.test.ts b/packages/cashscript/test/debugging.test.ts
index 9e0e452a..ffabec2e 100644
--- a/packages/cashscript/test/debugging.test.ts
+++ b/packages/cashscript/test/debugging.test.ts
@@ -450,7 +450,6 @@ describe('Debugging tests', () => {
       provider.addUtxo(contract.address, randomUtxo());
 
       const transaction = contract.functions.test_require_no_failure().to(contract.address, 1000n);
-      // TODO: add `toFailRequire` without any arguments to JestExtensions
       await expect(transaction).not.toFailRequireWith(/.*/);
     });
 
@@ -784,7 +783,6 @@ describe('Debugging tests', () => {
       ).rejects.toThrow(/Expected pattern: .*1 should equal 3.*\nReceived string: (.|\n)*?1 should equal 2/);
     });
 
-    // TODO: Fix this
     it('should fail the JestExtensions test if a require error message is expected where no error is thrown', async () => {
       const contract = new Contract(artifact, [], { provider });
       provider.addUtxo(contract.address, randomUtxo());
diff --git a/packages/utils/src/script.ts b/packages/utils/src/script.ts
index 63095d4d..a0b8fa32 100644
--- a/packages/utils/src/script.ts
+++ b/packages/utils/src/script.ts
@@ -19,12 +19,10 @@ export function scriptToAsm(script: Script): string {
   return bytecodeToAsm(scriptToBytecode(script));
 }
 
-// TODO: See note at bytecodeToAsm
 export function scriptToBitAuthAsm(script: Script): string {
   return bytecodeToBitAuthAsm(scriptToBytecode(script));
 }
 
-// TODO: Figure out why OP_0 is decoded to an empty Uint8Array (while e.g. OP_3 is just OP_3)
 export function asmToScript(asm: string): Script {
   return bytecodeToScript(asmToBytecode(asm));
 }
@@ -94,8 +92,7 @@ export function bytecodeToAsm(bytecode: Uint8Array): string {
   return asm;
 }
 
-// TODO: If we decide to change the ASM / artifact format, we can remove this function and merge it
-// with bytecodeToAsm
+// TODO: If we decide to change the ASM / artifact format, we can remove this function and merge it with bytecodeToAsm
 export function bytecodeToBitAuthAsm(bytecode: Uint8Array): string {
   // Convert the bytecode to libauth's ASM format
   let asm = disassembleBytecodeBCH(bytecode);
diff --git a/packages/utils/test/fixtures/bitauth-script.fixture.ts b/packages/utils/test/fixtures/bitauth-script.fixture.ts
index 363a6d25..cc3ef35a 100644
--- a/packages/utils/test/fixtures/bitauth-script.fixture.ts
+++ b/packages/utils/test/fixtures/bitauth-script.fixture.ts
@@ -88,7 +88,6 @@ OP_ENDIF                                                /* }
 `.replace(/^\n+/, '').replace(/\n+$/, ''),
   },
   {
-    // TODO: These fixtures were copied from the current output of the compiler, but there are some small inaccuracies that we should fix later
     name: 'Mecenas',
     sourceCode: `
 pragma cashscript >=0.8.0;
diff --git a/website/docs/sdk/transactions.md b/website/docs/sdk/transactions.md
index bda4ae6a..66f0e44f 100644
--- a/website/docs/sdk/transactions.md
+++ b/website/docs/sdk/transactions.md
@@ -259,8 +259,6 @@ You can read more about debugging transactions on the [debugging page](/docs/gui
 It is unsafe to debug transactions on mainnet as private keys will be exposed to BitAuth IDE and transmitted over the network.
 :::
 
-TODO: Update this section with the new debugging experience
-
 ## Transaction errors
 
 When sending a transaction, the CashScript SDK will throw an error if the transaction fails. If you are using an artifact compiled with `cashc@0.10.0` or later, the error will be of the type `FailedRequireError` or `FailedTransactionEvaluationError`. In case of a `FailedRequireError`, the error will refer to the corresponding `require` statement in the contract code so you know where your contract failed. If you want more information about the underlying error, you can check the `libauthErrorMessage` property of the error.

From a714dc45fc89281f366f619cbf1e3e123e2f18f8 Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Thu, 5 Sep 2024 16:30:18 +0200
Subject: [PATCH 161/171] Add JestExtensions toFailRequire() without message +
 update relevant tests

---
 packages/cashscript/src/test/JestExtensions.ts | 17 ++++++++++++++++-
 packages/cashscript/test/debugging.test.ts     |  8 ++++----
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/packages/cashscript/src/test/JestExtensions.ts b/packages/cashscript/src/test/JestExtensions.ts
index e96cf81d..54d61fbb 100644
--- a/packages/cashscript/src/test/JestExtensions.ts
+++ b/packages/cashscript/src/test/JestExtensions.ts
@@ -10,6 +10,7 @@ declare global {
     interface Matchers<R> {
       toLog(value?: RegExp | string): Promise<void>;
       toFailRequireWith(value: RegExp | string): Promise<void>;
+      toFailRequire(): Promise<void>;
     }
   }
 }
@@ -57,7 +58,7 @@ expect.extend({
       await transaction.debug();
 
       const matcherHint = this.utils.matcherHint('.toFailRequireWith', undefined, match.toString(), { isNot: this.isNot });
-      const message = (): string => `${matcherHint}\n\nContract function did not fail a require statement`;
+      const message = (): string => `${matcherHint}\n\nContract function did not fail a require statement.`;
       return { message, pass: false };
     } catch (transactionError: any) {
       const matcherHint = this.utils.matcherHint('toFailRequireWith', 'received', 'expected', { isNot: this.isNot });
@@ -73,4 +74,18 @@ expect.extend({
       }
     }
   },
+  async toFailRequire(
+    this: MatcherContext,
+    transaction: Transaction,
+  ): Promise<SyncExpectationResult> {
+    try {
+      await transaction.debug();
+      const message = (): string => 'Contract function did not fail a require statement.';
+      return { message, pass: false };
+    } catch (transactionError: any) {
+      const receivedText = `Received string: ${this.utils.printReceived(transactionError?.message ?? '')}`;
+      const message = (): string => `Contract function failed a require statement.\n${receivedText}`;
+      return { message, pass: true };
+    }
+  },
 });
diff --git a/packages/cashscript/test/debugging.test.ts b/packages/cashscript/test/debugging.test.ts
index ffabec2e..6e8a87db 100644
--- a/packages/cashscript/test/debugging.test.ts
+++ b/packages/cashscript/test/debugging.test.ts
@@ -450,7 +450,7 @@ describe('Debugging tests', () => {
       provider.addUtxo(contract.address, randomUtxo());
 
       const transaction = contract.functions.test_require_no_failure().to(contract.address, 1000n);
-      await expect(transaction).not.toFailRequireWith(/.*/);
+      await expect(transaction).not.toFailRequire();
     });
 
     // test_multiple_require_statements_no_message_final
@@ -721,7 +721,7 @@ describe('Debugging tests', () => {
       provider.addUtxo(contract.address, randomUtxo());
 
       const transaction = contract.functions.test_zero_handling(0n).to(contract.address, 1000n);
-      await expect(transaction).not.toFailRequireWith(/.*/);
+      await expect(transaction).not.toFailRequire();
     });
   });
 
@@ -807,8 +807,8 @@ describe('Debugging tests', () => {
       ).rejects.toThrow(/Expected pattern: not .*1 should equal 2.*\nReceived string: (.|\n)*?1 should equal 2/);
 
       await expect(
-        expect(transaction).not.toFailRequireWith(/.*/),
-      ).rejects.toThrow(/Expected pattern: not .*\nReceived string: (.|\n)*?1 should equal 2/);
+        expect(transaction).not.toFailRequire(),
+      ).rejects.toThrow(/Contract function failed a require statement\.*\nReceived string: (.|\n)*?1 should equal 2/);
     });
   });
 });

From 6f5f8e698fb11a8263224b0b2778c7474f3e2755 Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Thu, 5 Sep 2024 16:51:23 +0200
Subject: [PATCH 162/171] Add example for console.log + small docs changes

---
 website/docs/language/contracts.md | 18 ++++++++++++++++++
 website/docs/language/types.md     |  6 +++---
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/website/docs/language/contracts.md b/website/docs/language/contracts.md
index dd07437d..271c8a6b 100644
--- a/website/docs/language/contracts.md
+++ b/website/docs/language/contracts.md
@@ -136,6 +136,24 @@ The `console.log` statement can be used to log values during debug evaluation of
 Logging is only available in debug evaluation of a transaction, but has no impact on the compiled bytecode or regular (non-debug) execution.
 :::
 
+#### Example
+```solidity
+pragma cashscript ^0.10.0;
+
+contract P2PKH(bytes20 pkh) {
+    function spend(pubkey pk, sig s) {
+        bytes20 hashedPk = hash160(pk);
+
+        // console.log can access any variable in the function scope
+        console.log("passed public key: ", pk, ", hashed: ", hashedPk);
+        console.log("expected pkh: ", pkh);
+
+        require(hashedPk == pkh);
+        require(checkSig(s, pk));
+    }
+}
+```
+
 ## Comments
 Comments can be added anywhere in the contract file. Comment semantics are similar to languages like JavaScript or C. This means that single-line comments can be added with `// ...`, while multiline comments can be added with `/* ... */`.
 
diff --git a/website/docs/language/types.md b/website/docs/language/types.md
index 63068a11..2b8d5807 100644
--- a/website/docs/language/types.md
+++ b/website/docs/language/types.md
@@ -29,7 +29,7 @@ Operators:
 
 Note the lack of the `**` (exponentiation) operator as well as any bitwise operators.
 
-### Over- & Underflows
+#### Over- & Underflows
 
 The maximum range for 64-bit integers is `-9223372036854775807` to `9223372036854775807`, operations exceeding these limits will fail the transaction. So operations like summation, subtraction and multiplication should take into account these boundary cases with over- or underflows.
 
@@ -37,7 +37,7 @@ The maximum range for 64-bit integers is `-9223372036854775807` to `922337203685
 Contract authors should always consider whether `+`, `-` and `*` operations can cause under- or overflows and how this would impact contract security.
 :::
 
-### Division by Zero
+#### Division by Zero
 
 The script will fail when the right hand side of division or modulo operations is zero.
 
@@ -45,7 +45,7 @@ The script will fail when the right hand side of division or modulo operations i
 Contract authors should always consider whether `/` and `%` operations have division-by-zero edge cases and how this would impact contract security.
 :::
 
-### Date Parsing
+#### Date Parsing
 Dates and times are always represented as integers. To get the UTC timestamp of a date use the built-in parser to avoid any potential errors. This will take a date in the format `date("YYYY-MM-DDThh:mm:ss")` and convert it to an integer timestamp.
 
 #### Example

From c2ab68fe82304f759332b098e4c3ab0a0f6b4a15 Mon Sep 17 00:00:00 2001
From: Mathieu Geukens <mr-zwets@protonmail.com>
Date: Fri, 6 Sep 2024 07:21:02 +0200
Subject: [PATCH 163/171] remove note meep

---
 website/docs/sdk/transactions.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/website/docs/sdk/transactions.md b/website/docs/sdk/transactions.md
index 66f0e44f..f491a7b8 100644
--- a/website/docs/sdk/transactions.md
+++ b/website/docs/sdk/transactions.md
@@ -78,10 +78,6 @@ transaction.fromP2PKH(inputs: Utxo[], template: SignatureTemplate): this;
 
 The `fromP2PKH()` function allows you to provide a list of P2PKH UTXOs to be used in the transaction. The passed `SignatureTemplate` is used to sign these UTXOs. This function can be called any number of times, and the provided UTXOs will be added to the list of earlier added UTXOs.
 
-:::note
-If you are using [meep](https://github.com/gcash/meep) to debug a `fromP2PKH()` transaction, meep will always use the first input for the debugging. So if you want to debug the smart contract bytecode, make sure that the first input is not a P2PKH input.
-:::
-
 #### Example
 ```ts
 import { bobAddress, bobPrivateKey } from './somewhere';

From c30e89d2c5ac5b550ace44ebac24206765d8631b Mon Sep 17 00:00:00 2001
From: Mathieu Geukens <mr-zwets@protonmail.com>
Date: Fri, 6 Sep 2024 22:13:52 +0200
Subject: [PATCH 164/171] move global units

---
 website/docs/language/globals.md | 54 +++++++++++++++++++-------------
 1 file changed, 33 insertions(+), 21 deletions(-)

diff --git a/website/docs/language/globals.md b/website/docs/language/globals.md
index 2459b1a9..37c546c1 100644
--- a/website/docs/language/globals.md
+++ b/website/docs/language/globals.md
@@ -2,27 +2,6 @@
 title: Global Variables
 ---
 
-## Globally available units
-An integer literal can take a suffix of either monetary or temporary units to add semantic value to these integers and to simplify arithmetic. When these units are used, the underlying integer is automatically multiplied by the value of the unit. The units `sats`, `finney`, `bits` and `bitcoin` are used to denote monetary value, while the units `seconds`, `minutes`, `hours`, `days` and `weeks` are used to denote time.
-
-:::caution
-Be careful when using these units in precise calendar calculations though, because not every year equals 365 days and not even every minute has 60 seconds because of [leap seconds](https://en.wikipedia.org/wiki/Leap_second).
-:::
-
-### Example
-```solidity
-require(1 sats == 1);
-require(1 finney == 10);
-require(1 bit == 100);
-require(1 bitcoin == 1e8);
-
-require(1 seconds == 1);
-require(1 minutes == 60 seconds);
-require(1 hours == 60 minutes);
-require(1 days == 24 hours);
-require(1 weeks == 7 days);
-```
-
 ## Global time lock variables
 Bitcoin Cash has support for different kinds of time locks, which can be used to specify time-based conditions inside Bitcoin Cash contracts. These time locks can be separated by **three main attributes**: location, targeting and metric. The *location* can be the *transaction level* or the *contract level*, but *contract level* locks also require you to use a corresponding *transaction level* lock. The targeting can be *relative* (e.g. at least 4 hours have passed) or *absolute* (e.g. the block number is at least 600,000). The metric can be blocks or seconds.
 
@@ -264,6 +243,39 @@ new LockingBytecodeNullData(bytes[] chunks): bytes
 
 Creates new OP_RETURN locking bytecode with `chunks` as its OP_RETURN data.
 
+## Globally available units
+
+An integer literal can take a suffix of either monetary or temporary units to add semantic value to these integers and to simplify arithmetic. When these units are used, the underlying integer is automatically multiplied by the value of the unit.
+
+### BCH Units
+
+The units `sats`, `finney`, `bits` and `bitcoin` are used to Bitcoin Cash amounts.
+
+#### Example
+```solidity
+require(1 sats == 1);
+require(1 finney == 10);
+require(1 bit == 100);
+require(1 bitcoin == 1e8);
+```
+
+### Time Units
+
+The units `seconds`, `minutes`, `hours`, `days` and `weeks` are used to denote time.
+
+:::caution
+Be careful when using these units in precise calendar calculations though, because not every year equals 365 days and not even every minute has 60 seconds because of [leap seconds](https://en.wikipedia.org/wiki/Leap_second).
+:::
+
+#### Example
+```solidity
+require(1 seconds == 1);
+require(1 minutes == 60 seconds);
+require(1 hours == 60 minutes);
+require(1 days == 24 hours);
+require(1 weeks == 7 days);
+```
+
 [bip68]: https://github.com/bitcoin/bips/blob/master/bip-0068.mediawiki
 [withAge()]: /docs/sdk/transactions#withage
 [withTime()]: /docs/sdk/transactions#withtime

From 4a8e33fbb60ee79e36d76f4c895289d1a484712c Mon Sep 17 00:00:00 2001
From: Mathieu Geukens <mr-zwets@protonmail.com>
Date: Fri, 6 Sep 2024 22:40:38 +0200
Subject: [PATCH 165/171] add docs performRequest

---
 website/docs/sdk/network-provider.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/website/docs/sdk/network-provider.md b/website/docs/sdk/network-provider.md
index 52edc1e3..b16ef636 100644
--- a/website/docs/sdk/network-provider.md
+++ b/website/docs/sdk/network-provider.md
@@ -88,6 +88,16 @@ Broadcast a raw hex transaction to the network.
 const txId = await provider.sendRawTransaction(txHex)
 ```
 
+### performRequest
+
+Perform an arbitrary electrum request, refer to the docs at [electrum-cash-protocol](https://electrum-cash-protocol.readthedocs.io/en/latest/).
+
+#### Example
+```ts
+const verbose = true // get parsed transaction as json result
+const txId = await provider.performRequest('blockchain.transaction.get', txid, verbose)
+```
+
 ## Advanced Options
 
 All network functionality that the CashScript SDK needs is encapsulated in a network provider. This allows different network providers to be used and makes it easy to swap out dependencies.

From 12647243e10a3293b15aff71b954231889f51dcf Mon Sep 17 00:00:00 2001
From: Mathieu Geukens <mr-zwets@protonmail.com>
Date: Fri, 6 Sep 2024 23:16:28 +0200
Subject: [PATCH 166/171] re-add the examples page for the SDK

---
 website/docs/language/globals.md |   4 +-
 website/docs/sdk/examples.md     | 237 +++++++++++++++++--------------
 website/sidebars.js              |   1 +
 3 files changed, 136 insertions(+), 106 deletions(-)

diff --git a/website/docs/language/globals.md b/website/docs/language/globals.md
index 37c546c1..a7780193 100644
--- a/website/docs/language/globals.md
+++ b/website/docs/language/globals.md
@@ -249,7 +249,7 @@ An integer literal can take a suffix of either monetary or temporary units to ad
 
 ### BCH Units
 
-The units `sats`, `finney`, `bits` and `bitcoin` are used to Bitcoin Cash amounts.
+The units `sats`, `finney`, `bits` and `bitcoin` can be used to denominate Bitcoin Cash amounts.
 
 #### Example
 ```solidity
@@ -261,7 +261,7 @@ require(1 bitcoin == 1e8);
 
 ### Time Units
 
-The units `seconds`, `minutes`, `hours`, `days` and `weeks` are used to denote time.
+The units `seconds`, `minutes`, `hours`, `days` and `weeks` can be used to denote time.
 
 :::caution
 Be careful when using these units in precise calendar calculations though, because not every year equals 365 days and not even every minute has 60 seconds because of [leap seconds](https://en.wikipedia.org/wiki/Leap_second).
diff --git a/website/docs/sdk/examples.md b/website/docs/sdk/examples.md
index bb1214d3..583013c0 100644
--- a/website/docs/sdk/examples.md
+++ b/website/docs/sdk/examples.md
@@ -2,136 +2,165 @@
 title: Examples
 ---
 
-An extensive collection of examples is available in the [GitHub repository][github-examples]. Below we discuss a few of these examples in more detail. These examples focus mainly on the use of the SDK, while the [Examples page](/docs/language/examples) in the language section focuses more on the CashScript syntax.
+An extensive collection of examples is available in the [GitHub repository][github-examples]. Below we discuss the HodlVault example from the repository in full detail. The focus of this page is on the use of the SDK, while the [Examples page](/docs/language/examples) in the language section focuses on the CashScript syntax.
+
+## HodlVault
+
+We will break up the development of the smart contract application in 4 manageable steps:
+1. Creating the keypairs
+2. Generating a Contract
+3. Building the Oracle
+4. Sending a Transaction
+
+### Creating the keypairs
+
+To put the `HodlVault.cash` contract to use in a TypeScript application, we have to use the CashScript SDK in combination with a BCH library such as [Libauth][libauth], [Mainnetjs][mainnetjs] or [BCHJS][bchjs]. These libraries are used to generate public/private keys for the contract participants. 
+In this example we'll use [Libauth][libauth] to generate the keys `alicePriv`, `alicePub`, `oracle` & `oraclePub`. Then we can use these keys to create the smart contract.
+
+:::caution
+These 'private keys' are public just for testing, in other contexts you want to very carefully treat private keys as `environment variables`. You would also make sure to use a secure seed phrase and not 'CashScript Examples'... 
+:::
+
+```ts title="common.ts"
+import { hash160 } from '@cashscript/utils';
+import {
+  deriveHdPrivateNodeFromSeed,
+  deriveHdPath,
+  secp256k1,
+  encodeCashAddress,
+} from '@bitauth/libauth';
+import bip39 from 'bip39';
+import { PriceOracle } from './PriceOracle.js';
+
+// Generate entropy from BIP39 mnemonic phrase and initialise a root HD-wallet node
+const seed = await bip39.mnemonicToSeed('CashScript Examples');
+const rootNode = deriveHdPrivateNodeFromSeed(seed, true);
+const baseDerivationPath = "m/44'/145'/0'/0";
+
+// Derive Alice's private key, public key, public key hash and address
+const aliceNode = deriveHdPath(rootNode, `${baseDerivationPath}/0`);
+if (typeof aliceNode === 'string') throw new Error();
+export const alicePub = secp256k1.derivePublicKeyCompressed(aliceNode.privateKey) as Uint8Array;
+export const alicePriv = aliceNode.privateKey;
+export const alicePkh = hash160(alicePub);
+export const aliceAddress = encodeCashAddress('bchtest', 'p2pkhWithTokens', alicePkh);
+
+// Initialise a price oracle with a private key
+const oracleNode = deriveHdPath(rootNode, `${baseDerivationPath}/2`);
+if (typeof oracleNode === 'string') throw new Error();
+export const oraclePub = secp256k1.derivePublicKeyCompressed(oracleNode.privateKey) as Uint8Array;
+export const oraclePriv = oracleNode.privateKey;
+export const oracle = new PriceOracle(oracleNode.privateKey);
+export const oraclePkh = hash160(oraclePub);
+export const oracleAddress = encodeCashAddress('bchtest', 'p2pkhWithTokens', oraclePkh);
+```
 
-## Transfer With Timeout
-The idea of this smart contract is explained on the [Language Examples page](/docs/language/examples#transfer-with-timeout). The gist is that it allows you to send an amount of BCH to someone, but if they don't claim the sent amount, it can be recovered by the sender.
+### Generating a Contract
 
+For the networkprovider, we'll use the `ElectrumNetworkProvider` from the SDK and for `Simple Transaction Builder` for this example. Once you have a smart contract address you can send funds to it. To spend the Bitcoin cash locked in the contract you will have to satisfy the spending conditions on the contract.
 
-```solidity title="TransferWithTimeout.cash"
-contract TransferWithTimeout(pubkey sender, pubkey recipient, int timeout) {
-    function transfer(sig recipientSig) {
-        require(checkSig(recipientSig, recipient));
-    }
+```ts title="hodl_vault.ts"
+import { stringify } from '@bitauth/libauth';
+import { Contract, SignatureTemplate, ElectrumNetworkProvider } from 'cashscript';
+import { compileFile } from 'cashc';
+import { URL } from 'url';
 
-    function timeout(sig senderSig) {
-        require(checkSig(senderSig, sender));
-        require(tx.time >= timeout);
-    }
-}
-```
+// Import keys and price oracle from common.ts
+import {
+  alicePub,
+  oraclePub,
+} from './common.ts';
 
-Now to put this smart contract to use in a JavaScript application, we have to use the CashScript SDK in combination with a BCH library such as [BCHJS][bchjs], [bitcore-lib-cash][bitcore] or [Libauth][libauth]. These libraries are used to generate public/private keys for the contract participants. Then these keys can be used in the CashScript SDK. The key generation code is left out of this example, since this works differently for every library.
+// Compile the HodlVault contract to an artifact object
+const artifact = compileFile(new URL('hodl_vault.cash', import.meta.url));
 
-```ts title="TransferWithTimeout.js"
-import { Contract, SignatureTemplate } from 'cashscript';
-import { alicePub, bobPriv, bobPub } from './somewhere.js';
-import artifact from './transfer_with_timeout.json';
+// Initialise a network provider for network operations on CHIPNET
+const provider = new ElectrumNetworkProvider('chipnet');
 
-// Instantiate a new contract using the artifact and constructor arguments:
-// { sender: alicePub, recipient: bobPub, timeout: 1000000 }
-// No network provider is provided, so the default ElectrumNetworkProvider is used
-const options = { addressType: 'p2sh20' };
-const contract = new Contract(artifact, [alicePub, bobPub, 1000000n], options);
+// Instantiate a new contract using the compiled artifact and network provider
+// AND providing the constructor parameters
+const parameters = [alicePub, oraclePub, 100000n, 30000n];
+const contract = new Contract(artifact, parameters, { provider });
 
-// Display contract address and balance
+// Get contract balance & output address + balance
 console.log('contract address:', contract.address);
 console.log('contract balance:', await contract.getBalance());
+```
 
-// Call the transfer function with Bob's signature
-// i.e. Bob claims the money that Alice has sent him
-const txDetails = await contract.functions
-  .transfer(new SignatureTemplate(bobPriv))
-  .to('bitcoincash:qrhea03074073ff3zv9whh0nggxc7k03ssh8jv9mkx', 10000n)
-  .send();
+### Building the Oracle
 
-console.log(txDetails);
-```
+We need the create the functionality for generating and signing the oracle message to use in the HodlVault contract:
+
+```ts title="PriceOracle.ts"
+import { padMinimallyEncodedVmNumber, flattenBinArray, secp256k1 } from '@bitauth/libauth';
+import { encodeInt, sha256 } from '@cashscript/utils';
 
-## Memo.cash Announcement
-[Memo.cash](https://memo.cash) is a Twitter-like social network based on Bitcoin Cash. It uses `OP_RETURN` outputs to post messages on-chain. By using a covenant we can create an example contract whose only job is to post Isaac Asimov's first law of smart contracts to Memo.cash. Just to remind its fellow smart contracts.
-
-This contract expects a hardcoded transaction fee of 1000 satoshis. This is necessary due to the nature of covenants (See the [Licho's Mecenas example](/docs/language/examples#lichos-mecenas) for more information on this). The remaining balance after this transaction fee might end up being lower than 1000 satoshis, which means that the contract does not have enough left over to make another announcement.
-
-To ensure that this leftover money does not get lost in the contract, the contract performs an extra check, and adds the remainder to the transaction fee if it's too low.
-
-```solidity title="Announcement.cash"
-pragma cashscript ^0.10.0;
-
-// This contract enforces making an announcement on Memo.cash and sending the
-// remaining balance back to the contract.
-contract Announcement() {
-    function announce() {
-        // Create the memo.cash announcement output
-        bytes announcement = new LockingBytecodeNullData([
-            0x6d02,
-            bytes('A contract may not injure a human being or, '
-             + 'through inaction, allow a human being to come to harm.')
-        ]);
-
-        // Check that the first tx output matches the announcement
-        require(tx.outputs[0].value == 0);
-        require(tx.outputs[0].lockingBytecode == announcement);
-
-        // Calculate leftover money after fee (1000 sats)
-        // Check that the second tx output sends the change back if there's
-        // enough leftover for another announcement
-        int minerFee = 1000;
-        int changeAmount = tx.inputs[this.activeInputIndex].value - minerFee;
-        if (changeAmount >= minerFee) {
-            bytes changeLock = tx.inputs[this.activeInputIndex].lockingBytecode;
-            require(tx.outputs[1].lockingBytecode == changeLock);
-            require(tx.outputs[1].value == changeAmount);
-        }
-    }
+export class PriceOracle {
+  constructor(public privateKey: Uint8Array) {}
+
+  // Encode a blockHeight and bchUsdPrice into a byte sequence of 8 bytes (4 bytes per value)
+  createMessage(blockHeight: bigint, bchUsdPrice: bigint): Uint8Array {
+    const encodedBlockHeight = padMinimallyEncodedVmNumber(encodeInt(blockHeight), 4);
+    const encodedBchUsdPrice = padMinimallyEncodedVmNumber(encodeInt(bchUsdPrice), 4);
+
+    return flattenBinArray([encodedBlockHeight, encodedBchUsdPrice]);
+  }
+
+  signMessage(message: Uint8Array): Uint8Array {
+    const signature = secp256k1.signMessageHashSchnorr(this.privateKey, sha256(message));
+    if (typeof signature === 'string') throw new Error();
+    return signature;
+  }
 }
 ```
 
-The CashScript code above ensures that the smart contract **can only** be used in the way specified in the code. But the transaction needs to be created by the SDK. To ensure that it complies with the rules of the smart contract, we need to use some of the more advanced options of the SDK.
+### Sending a Transaction
+
+Finnally, we can put all of this together to create a working smart contract application. We use the generated keys as a contract arguments directly or in a `SignatureTemplate` to create a transaction signature.
 
-```ts title="Announcement.js"
-import { ElectrumNetworkProvider, Contract, SignatureTemplate } from 'cashscript';
-import { alicePriv, alicePub } from './somewhere.js';
-import artifact from './announcement.json';
+```ts title="hodl_vault.ts"
+import { stringify } from '@bitauth/libauth';
+import { Contract, SignatureTemplate, ElectrumNetworkProvider } from 'cashscript';
+import { compileFile } from 'cashc';
+import { URL } from 'url';
 
-// Initialise a network provider for network operations on MAINNET
-const provider = new ElectrumNetworkProvider('mainnet');
-const addressType = 'p2sh20';
+// Import keys and price oracle from common.ts
+import {
+  alicePriv,
+  alicePub,
+  oracle,
+  oraclePub,
+} from './common.ts';
+
+// Compile the HodlVault contract to an artifact object
+const artifact = compileFile(new URL('hodl_vault.cash', import.meta.url));
+
+// Initialise a network provider for network operations on CHIPNET
+const provider = new ElectrumNetworkProvider('chipnet');
 
 // Instantiate a new contract using the compiled artifact and network provider
-// AND providing the constructor parameters (none)
-const options = { provider, addressType};
-const contract = new Contract(artifact, [], options);
+// AND providing the constructor parameters
+const parameters = [alicePub, oraclePub, 100000n, 30000n];
+const contract = new Contract(artifact, parameters, { provider });
 
-// Display contract address, balance, opcount, and bytesize
+// Get contract balance & output address + balance
 console.log('contract address:', contract.address);
 console.log('contract balance:', await contract.getBalance());
-console.log('contract opcount:', contract.opcount);
-console.log('contract bytesize:', contract.bytesize);
-
-// Create the announcement string. Any other announcement will fail because
-// it does not comply with the smart contract.
-const str = 'A contract may not injure a human being or, '
-  + 'through inaction, allow a human being to come to harm.';
-
-// Send the announcement transaction
-const txDetails = await contract.functions
-  .announce(alicePub, new SignatureTemplate(alicePriv))
-  // Add the announcement string as an OP_RETURN output
-  .withOpReturn(['0x6d02', str])
-  // Hardcodes the transaction fee (like the contract expects)
-  .withHardcodedFee(1000n)
-  // Only add a "change" output if the remainder is higher than 1000
-  .withMinChange(1000n)
+
+// Produce new oracle message and signature
+const oracleMessage = oracle.createMessage(100000n, 30000n);
+const oracleSignature = oracle.signMessage(oracleMessage);
+
+// Spend from the vault
+const tx = await contract.functions
+  .spend(new SignatureTemplate(alicePriv), oracleSignature, oracleMessage)
+  .to(contract.address, 1000n)
   .send();
 
-console.log(txDetails);
+console.log(stringify(tx));
 ```
 
-[bitbox]: https://developer.bitcoin.com/bitbox/
-[electrum-cash]: https://www.npmjs.com/package/electrum-cash
-[fullstack]: https://fullstack.cash/
 [bchjs]: https://bchjs.fullstack.cash/
-[bitcore]: https://github.com/bitpay/bitcore/tree/master/packages/bitcore-lib-cash
+[mainnetjs]: https://mainnet.cash/
 [libauth]: https://libauth.org/
-[github-examples]: https://github.com/CashScript/cashscript/tree/master/examples
+[github-examples]: https://github.com/CashScript/cashscript/tree/master/examples
\ No newline at end of file
diff --git a/website/sidebars.js b/website/sidebars.js
index 238673d5..5b16c91c 100755
--- a/website/sidebars.js
+++ b/website/sidebars.js
@@ -38,6 +38,7 @@ module.exports = {
         'sdk/transactions',
         'sdk/transactions-advanced',
         'sdk/testing-setup',
+        'sdk/examples',
       ],
     },
     {

From 24c300040c60efa0b0140f3a298241cc68bbae72 Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Tue, 10 Sep 2024 11:02:08 +0200
Subject: [PATCH 167/171] Update testing setup and network provider docs pages

---
 website/docs/sdk/network-provider.md | 13 ++---
 website/docs/sdk/testing-setup.md    | 78 +++++++++++++++++++++-------
 2 files changed, 63 insertions(+), 28 deletions(-)

diff --git a/website/docs/sdk/network-provider.md b/website/docs/sdk/network-provider.md
index b16ef636..88cfbc6f 100644
--- a/website/docs/sdk/network-provider.md
+++ b/website/docs/sdk/network-provider.md
@@ -7,20 +7,15 @@ The CashScript SDK needs to connect to the BCH network to perform certain operat
 ## ElectrumNetworkProvider
 
 The ElectrumNetworkProvider uses [electrum-cash][electrum-cash] to connect to the BCH network. Both `network` and `electrum` parameters are optional, and they default to mainnet and a 2-of-3 ElectrumCluster with a number of reliable electrum servers.
-```ts
-new ElectrumNetworkProvider(network?: Network, electrum?: ElectrumCluster)
-```
 
-#### Example
 ```ts
-const provider = new ElectrumProvider('chipnet');
+new ElectrumNetworkProvider(network?: Network, electrum?: ElectrumCluster)
 ```
 
 :::note
 In some cases it might be desirable to overwrite the 2-of-3 ElectrumCluster default to use only a 1-of-1 cluster because of network latency.
 :::
 
-## Interface NetworkProvider
 
 ### Network
 ```ts
@@ -119,8 +114,8 @@ provider.addUtxo(contractAddress, newUtxo);
 ### Other NetworkProviders
 
 There are two alternative network providers implemented:
-- `FullStackNetworkProvider`: uses [FullStack.cash][fullstack]' infrastructure to connect to the BCH network. 
-- `BitcoinRpcNetworkProvider`: uses a direct connection to a Bitcoin Cash node. 
+- `FullStackNetworkProvider`: uses [FullStack.cash][fullstack]' infrastructure to connect to the BCH network.
+- `BitcoinRpcNetworkProvider`: uses a direct connection to a Bitcoin Cash node.
 
 Currently neither supports CashTokens, so it is recommended to use the `ElectrumNetworkProvider`.
 
@@ -134,4 +129,4 @@ To implement a Custom NetworkProvider, refer to the [NetworkProvider interface](
 
 [electrum-cash]: https://www.npmjs.com/package/electrum-cash
 [fullstack]: https://fullstack.cash/
-[bchjs]: https://bchjs.fullstack.cash/
\ No newline at end of file
+[bchjs]: https://bchjs.fullstack.cash/
diff --git a/website/docs/sdk/testing-setup.md b/website/docs/sdk/testing-setup.md
index 6bd3d362..82a001d1 100644
--- a/website/docs/sdk/testing-setup.md
+++ b/website/docs/sdk/testing-setup.md
@@ -30,16 +30,18 @@ provider.addUtxo(aliceAddress, randomUtxo({
 The `MockNetworkProvider` only evaluates the transactions locally, so any UTXOs added to a transaction still count as "unspent", even after mocking a `sendTransaction` using the provider.
 :::
 
-## Jest extension
+## Automated testing
+
+To make writing automated tests for CashScript contracts easier, we provide a Jest extension that enables easy testing of `console.log` values and `require` error messages. To use the extension, you can import it from `cashscript/jest`.
 
-To make writing automated tests for CashScript contracts easier, we provide a Jest extension that enables easy testing of `console.log` values and `require` error messages. To use the extension, you can import it from `cashscript/dist/test/JestExtensions`.
+```ts
+import 'cashscript/jest';
+```
 
-:::tip
+:::note
 If you're using a different testing framework, you can test for `console.log` values by spying on the console output, and test for `require` error messages by asserting that an error is thrown with a specific error message.
 :::
 
-## Automated testing
-
 With local transaction evaluation and debugging, it is possible to write efficient automated tests for CashScript contracts to test specific contract behaviour and check `console.log` values and `require` error messages.
 
 ### Logging values
@@ -50,6 +52,16 @@ You can log values during debug evaluation using the `console.log` statement. An
 Logging is only available in debug evaluation of a transaction. It has no impact on the compiled bytecode or regular (non-debug) execution.
 :::
 
+```ts
+describe('Example contract', () => {
+  it('should log the passed parameter', async () => {
+    const contract = new Contract(artifact, [], { provider });
+    const transaction = contract.functions.exampleFunction(1000n).to(contract.address, 10000n);
+    await expect(transaction).toLog('passed parameter: 1000');
+  });
+});
+```
+
 ### Error messages
 
 The `require` statement accepts an optional error message as a second argument. If the condition in the require statement is not met during debug evaluation, the error message is returned. This allows you to write automated tests that check for specific error messages.
@@ -58,13 +70,29 @@ The `require` statement accepts an optional error message as a second argument.
 Similar to `console.log`, the error message in a `require` statement is only available in debug evaluation of a transaction, so the error message has no impact on the compiled bytecode or regular (non-debug) execution.
 :::
 
-## Example
+```ts
+describe('Example contract', () => {
+  const contract = new Contract(artifact, [], { provider });
+
+  it('should fail require statement when incorrect parameter is passed', async () => {
+    const transaction = contract.functions.exampleFunction(999n).to(contract.address, 10000n);
+    await expect(transaction).toFailRequireWith('passed parameter is not 1000');
+  });
+
+  it('should pass require statement when correct parameter is passed', async () => {
+    const transaction = contract.functions.exampleFunction(1000n).to(contract.address, 10000n);
+    await expect(transaction).not.toFailRequire();
+  });
+});
+```
+
+## Full Example
 
 ```solidity title="Example contract"
 contract Example() {
   function exampleFunction(int value) {
-    console.log(value, "test");
-    require(value == 1, "Wrong value passed");
+    console.log("passed parameter:", value);
+    require(value == 1000, "passed parameter is not 1000");
   }
 }
 ```
@@ -72,16 +100,28 @@ contract Example() {
 ```ts title="Example test file"
 import artifact from '../artifacts/example.json' assert { type: "json" };
 import { Contract, MockNetworkProvider, randomUtxo } from 'cashscript';
-import 'cashscript/dist/test/JestExtensions';
-
-const provider = new MockNetworkProvider();
-const contract = new Contract(artifact, [], { provider });
-provider.addUtxo(contract.address, randomUtxo());
-
-let transaction = contract.functions.exampleFunction(0n).to(contract.address, 10000n);
-await (expect(transaction)).toLog(/0 test/);
-await (expect(transaction)).toFailRequireWith(/Wrong value passed/);
+import 'cashscript/jest';
+
+describe('Example contract', () => {
+  const contract = new Contract(artifact, [], { provider });
+  const provider = new MockNetworkProvider();
+  provider.addUtxo(contract.address, randomUtxo());
+
+  it('should log the passed parameter', async () => {
+    const contract = new Contract(artifact, [], { provider });
+    const transaction = contract.functions.exampleFunction(1000n).to(contract.address, 10000n);
+    await expect(transaction).toLog('passed parameter: 1000');
+  });
+
+  it('should fail require statement when incorrect parameter is passed', async () => {
+    const transaction = contract.functions.exampleFunction(999n).to(contract.address, 10000n);
+    await expect(transaction).toFailRequireWith('passed parameter is not 1000');
+  });
+
+  it('should pass require statement when correct parameter is passed', async () => {
+    const transaction = contract.functions.exampleFunction(1000n).to(contract.address, 10000n);
+    await expect(transaction).not.toFailRequire();
+  });
+});
 
-transaction = contract.functions.exampleFunction(1n).to(contract.address, 10000n);
-await expect(transaction.send()).resolves.not.toThrow();
 ```

From a23b10c1938f9c88c189b0b77f9edd17ce0c7d86 Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Tue, 10 Sep 2024 11:45:38 +0200
Subject: [PATCH 168/171] Change some fields on TransactionBuilder to public

---
 packages/cashc/src/generation/GenerateTargetTraversal.ts | 2 +-
 packages/cashscript/src/TransactionBuilder.ts            | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/cashc/src/generation/GenerateTargetTraversal.ts b/packages/cashc/src/generation/GenerateTargetTraversal.ts
index 8e38541d..ed4b0159 100644
--- a/packages/cashc/src/generation/GenerateTargetTraversal.ts
+++ b/packages/cashc/src/generation/GenerateTargetTraversal.ts
@@ -322,9 +322,9 @@ export default class GenerateTargetTraversalWithLocation extends AstTraversal {
     const data = node.parameters.map((parameter: ConsoleParameterNode) => {
       if (parameter instanceof IdentifierNode) {
         const symbol = parameter.definition!;
-        const stackIndex = this.getStackIndex(parameter.name, true);
 
         // If the variable is not on the stack, then we add the final stack usage to the console log
+        const stackIndex = this.getStackIndex(parameter.name, true);
         if (stackIndex === -1) {
           if (!this.finalStackUsage[parameter.name]) {
             throw new Error(`Expected variable '${parameter.name}' does not exist on the stack or in final stack usage`);
diff --git a/packages/cashscript/src/TransactionBuilder.ts b/packages/cashscript/src/TransactionBuilder.ts
index 562c16a5..f9c02e92 100644
--- a/packages/cashscript/src/TransactionBuilder.ts
+++ b/packages/cashscript/src/TransactionBuilder.ts
@@ -26,9 +26,9 @@ export interface TransactionBuilderOptions {
 const DEFAULT_SEQUENCE = 0xfffffffe;
 
 export class TransactionBuilder {
-  private provider: NetworkProvider;
-  private inputs: UnlockableUtxo[] = [];
-  private outputs: Output[] = [];
+  public provider: NetworkProvider;
+  public inputs: UnlockableUtxo[] = [];
+  public outputs: Output[] = [];
 
   private locktime: number;
   private maxFee?: bigint;

From d0c0bd8640c874afd1806ac37a0aec1453c4a011 Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Tue, 10 Sep 2024 11:45:55 +0200
Subject: [PATCH 169/171] Update migration and release notes

---
 website/docs/releases/migration-notes.md | 10 ++++
 website/docs/releases/release-notes.md   | 71 ++++++++++++++++--------
 2 files changed, 57 insertions(+), 24 deletions(-)

diff --git a/website/docs/releases/migration-notes.md b/website/docs/releases/migration-notes.md
index fc3e995c..8c3d9765 100644
--- a/website/docs/releases/migration-notes.md
+++ b/website/docs/releases/migration-notes.md
@@ -2,6 +2,16 @@
 title: Migration Notes
 ---
 
+## v0.9 to 0.10
+
+### CashScript SDK
+
+The `Reason` enum + `FailedTimeCheckError` and `FailedSigCheckError` errors have been removed. If you were using these to check your transaction errors, you should now use the new error classes `FailedRequireError`, `FailedTransactionEvaluationError` and `FailedTransactionError`.
+
+If you were using `transaction.meep()` or using the `meep` string in errors, you should now use `transaction.bitauthUri()` to get a BitAuth URI for debugging or use the `bitauthUri` string in errors.
+
+The `Argument` type has been split into `FunctionArgument` and `ConstructorArgument` and the `encodeArgument` function has been renamed to `encodeFunctionArgument`. If you were using these types in your code, you should update your code to use the new types, depending on whether you were using them as function arguments or constructor arguments.
+
 ## v0.7 to v0.8
 
 ### cashc compiler
diff --git a/website/docs/releases/release-notes.md b/website/docs/releases/release-notes.md
index d7d59175..37debfbf 100644
--- a/website/docs/releases/release-notes.md
+++ b/website/docs/releases/release-notes.md
@@ -4,22 +4,37 @@ title: Release Notes
 
 ## v0.10.0
 
+In this version we added proper debugging support for transactions and integration with the BitAuth IDE.
+
+Thanks [mainnet_pat](https://x.com/mainnet_pat) for the initiative and significant contributions!
+
 #### cashc compiler
 - :sparkles: Add `console.log()` statements for debugging.
 - :sparkles: Extend `require()` statements to allow custom error messages for debugging.
 - :hammer_and_wrench: Update artifact format to allow for new debugging features.
+- :hammer_and_wrench: Update dependencies to new major versions.
 
 #### CashScript SDK
-- :sparkles: Add `MockNetworkProvider` to simulate network interaction for debugging and testing.
 - :sparkles: Add support for transaction evaluation and debugging using libauth templates.
-- :sparkles: Add extended Jest utilities specifically crafted for CashScript:
-  * `await expect(transaction).toLog(message)`
-  * `await expect(transaction).toFailRequireWith(message)`
-- :sparkles: Output BitAuth IDE URI for debugging when transaction is rejected.
-
-We also added a new example project with a full testing suite to demonstrate the new debugging features under `examples/testing-suite`.
-
-Thanks [mainnet_pat](https://twitter.com/mainnet_pat) for the contributions!
+  - `transaction.debug()` & `transaction.bitauthUri()`
+  - Output BitAuth IDE URI for debugging when transaction is rejected.
+- :sparkles: Add `MockNetworkProvider` to simulate network interaction for debugging and testing.
+  - Add `randomUtxo()`, `randomToken()` and `randomNft()` functions to generate dummy UTXOs for testing.
+- :sparkles: Add CashScript Jest utilities for automated testing.
+  * `expect(transaction).toLog(message)`
+  * `expect(transaction).toFailRequire()`
+  * `expect(transaction).toFailRequireWith(message)`
+- :bug: Fix bug with type exports.
+- :hammer_and_wrench: Update visibility of several classes.
+  - Make `artifact`, `networkProvider`, `addressType` and `encodedConstructorArgs` public on `Contract` class.
+  - Make `contract`, `abiFunction`, `encodedFunctionArgs`, `inputs` and `outputs` public on `Transaction` class.
+  - Make `networkProvider`, `inputs` and `outputs` public on `TransactionBuilder` class.
+  - Make `privateKey` public on `SignatureTemplate` class and add `getSignatureAlgorithm()` method.
+- :hammer_and_wrench: Improve some error messages.
+- :hammer_and_wrench: Add new `FailedRequireError`, `FailedTransactionEvaluationError` and `FailedTransactionError` classes.
+- :boom: **BREAKING**: Remove exported transaction error `Reason` enum + `FailedTimeCheckError` and `FailedSigCheckError` classes in favour of the new error classes.
+- :boom: **BREAKING**: Remove all deprecated references to `meep` including `meep` strings from errors and `transaction.meep()`.
+- :boom: **BREAKING**: Separate the `Argument` type into `FunctionArgument` and `ConstructorArgument` and rename `encodeArgument` to `encodeFunctionArgument`.
 
 ## v0.9.3
 
@@ -47,6 +62,10 @@ Thanks [mainnet_pat](https://twitter.com/mainnet_pat) for the contributions!
 - :sparkles: Add new advanced `TransactionBuilder` class that allows combining UTXOs from multiple different smart contracts and P2PKH UTXOs in a single transaction.
 - :hammer_and_wrench: Deprecate all `meep` functionality. Meep has been unmaintained for years and does not support many new CashScript features. Meep functionality will be removed in a future release.
 
+---
+
+https://x.com/CashScriptBCH/status/1713928572677583023
+
 ## v0.8.2
 
 #### CashScript SDK
@@ -91,6 +110,10 @@ This release also contains several breaking changes, please refer to the [migrat
 - :boom: **BREAKING**: Remove `BitboxNetworkProvider`.
 - :boom: **BREAKING**: All signature templates use  `SIGHASH_ALL | SIGHASH_UTXOS` now, this new default can be overwritten in the constructor of the `SignatureTemplate`.
 
+---
+
+https://x.com/CashScriptBCH/status/1662092546372255744
+
 ## v0.7.5
 
 #### CashScript SDK
@@ -139,7 +162,7 @@ This release also contains several breaking changes, please refer to the [migrat
 - :bug: Small fixes
 
 ---
-https://twitter.com/RoscoKalis/status/1529072055756414976
+https://x.com/RoscoKalis/status/1529072055756414976
 
 ## v0.6.5
 #### cashc compiler
@@ -176,7 +199,7 @@ https://twitter.com/RoscoKalis/status/1529072055756414976
 * :boom: **BREAKING**: Remove dependency on `cashc` and remove `CashCompiler` export
 
 ---
-https://twitter.com/RoscoKalis/status/1371896417443282956
+https://x.com/RoscoKalis/status/1371896417443282956
 
 ## v0.5.7
 #### cashc compiler
@@ -212,7 +235,7 @@ https://twitter.com/RoscoKalis/status/1371896417443282956
 - :bug: Improve reliability of the `ElectrumNetworkProvider` when sending multiple concurrent requests.
 
 ---
-https://twitter.com/RoscoKalis/status/1301521593399685121
+https://x.com/RoscoKalis/status/1301521593399685121
 
 ## v0.5.0
 #### CashScript SDK
@@ -230,7 +253,7 @@ CashScript used to be very tightly coupled with BITBOX. This proved to be proble
 - :hammer_and_wrench: Removed BITBOX as a dependency in favour of libauth for utility functions.
 
 ---
-https://twitter.com/RoscoKalis/status/1298645699559596033
+https://x.com/RoscoKalis/status/1298645699559596033
 
 ## v0.4.4
 #### cashc compiler
@@ -256,7 +279,7 @@ https://twitter.com/RoscoKalis/status/1298645699559596033
   - `Sig` still exists for backward compatibility, but is deprecated and will be removed in a later release.
 
 ---
-https://twitter.com/RoscoKalis/status/1267440143624884227
+https://x.com/RoscoKalis/status/1267440143624884227
 
 ## v0.4.0
 #### cashc compiler
@@ -283,14 +306,14 @@ https://twitter.com/RoscoKalis/status/1267440143624884227
 This update contains several breaking changes. See the [migration notes](/docs/releases/migration-notes#v03-to-v04) for a full migration guide.
 
 ---
-https://twitter.com/RoscoKalis/status/1264921879346917376
+https://x.com/RoscoKalis/status/1264921879346917376
 
 ## v0.3.3
 #### cashc compiler
 - :bug: Fix bug where variables could not reliably be used inside `OutputNullData` instantiation.
 
 ---
-https://twitter.com/RoscoKalis/status/1224389493769342979
+https://x.com/RoscoKalis/status/1224389493769342979
 
 ## v0.3.2
 #### cashc compiler
@@ -309,7 +332,7 @@ https://twitter.com/RoscoKalis/status/1224389493769342979
 - :purse: Add `minChange` to transaction options. If this `minChange` is not reached, the change will be added to the transaction fee instead.
 
 ---
-https://twitter.com/RoscoKalis/status/1223280232343515136
+https://x.com/RoscoKalis/status/1223280232343515136
 
 ## v0.3.1
 #### cashc compiler
@@ -324,7 +347,7 @@ https://twitter.com/RoscoKalis/status/1223280232343515136
 * :bug: Fix a bug where the size of a preimage was not accounted for in fee calculation for covenants.
 
 ---
-https://twitter.com/RoscoKalis/status/1217101473743544320
+https://x.com/RoscoKalis/status/1217101473743544320
 
 ## v0.3.0
 #### cashc compiler
@@ -345,14 +368,14 @@ https://twitter.com/RoscoKalis/status/1217101473743544320
 * :dizzy: Better fee estimation for transactions with many inputs.
 
 ---
-https://twitter.com/RoscoKalis/status/1204765863062188033
+https://x.com/RoscoKalis/status/1204765863062188033
 
 ## v0.2.3
 #### cashc compiler
 * :bug: Fix a bug where unequal bytes types (e.g. `bytes3` & `bytes8`) could not be concatenated together, as they were considered different types.
 
 ---
-https://twitter.com/RoscoKalis/status/1202220857566908416
+https://x.com/RoscoKalis/status/1202220857566908416
 
 ## v0.2.2
 #### CashScript SDK
@@ -367,7 +390,7 @@ https://twitter.com/RoscoKalis/status/1202220857566908416
   * If it is provided, the artifact is written to the file, if not, it is returned as an object.
 
 ---
-https://twitter.com/RoscoKalis/status/1192900277105389568
+https://x.com/RoscoKalis/status/1192900277105389568
 
 ## v0.2.1
 #### cashc compiler
@@ -380,7 +403,7 @@ https://twitter.com/RoscoKalis/status/1192900277105389568
 * :hammer:  Make the `hashtype` parameter in signature placeholders optional.
 
 ---
-https://twitter.com/RoscoKalis/status/1186554051720167424
+https://x.com/RoscoKalis/status/1186554051720167424
 
 ## v0.2.0
 #### cashc compiler
@@ -401,7 +424,7 @@ https://twitter.com/RoscoKalis/status/1186554051720167424
 * :arrow_up: Update `cashc` and other dependencies.
 
 ---
-https://twitter.com/RoscoKalis/status/1178843657069154305
+https://x.com/RoscoKalis/status/1178843657069154305
 
 ## v0.1.2
 #### CashScript SDK
@@ -413,7 +436,7 @@ https://twitter.com/RoscoKalis/status/1178843657069154305
 * :rotating_light: Improve Transaction testing
 
 ---
-https://twitter.com/RoscoKalis/status/1174910060691984385
+https://x.com/RoscoKalis/status/1174910060691984385
 
 ## v0.1.1
 #### CashScript SDK

From c5731c30ae7b4d4f70e4042d625e09666a783c6d Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Tue, 10 Sep 2024 11:52:33 +0200
Subject: [PATCH 170/171] Update docs

---
 website/docs/sdk/instantiation.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/website/docs/sdk/instantiation.md b/website/docs/sdk/instantiation.md
index 7522f7ef..bfeb15cb 100644
--- a/website/docs/sdk/instantiation.md
+++ b/website/docs/sdk/instantiation.md
@@ -199,6 +199,8 @@ You may notice the `SignatureTemplate` object in the [example](#example-8) above
 
 So in the place of a signature, a `SignatureTemplate` can be passed, which will automatically generate the correct signature using the `signer` parameter. This signer can be any representation of a private key, including [BCHJS' `ECPair`][ecpair], [bitcore-lib-cash' `PrivateKey`][privatekey], [WIF strings][wif], or raw private key buffers. This ensures that any BCH library can be used.
 
+The default `hashtype` is `HashType.SIGHASH_ALL | HashType.SIGHASH_UTXOS` because this is the most secure option for smart contract use cases.
+
 ```ts
 export enum HashType {
   SIGHASH_ALL = 0x01,

From 59162f03fc6e834eadf56bbc1159e4446c94cbc4 Mon Sep 17 00:00:00 2001
From: Rosco Kalis <roscokalis@gmail.com>
Date: Tue, 10 Sep 2024 11:56:45 +0200
Subject: [PATCH 171/171] Bump version to 0.10.0

---
 examples/package.json                                      | 6 +++---
 examples/testing-suite/artifacts/example.json              | 4 ++--
 examples/testing-suite/package.json                        | 7 ++++---
 packages/cashc/package.json                                | 4 ++--
 packages/cashc/src/index.ts                                | 2 +-
 packages/cashscript/package.json                           | 4 ++--
 packages/cashscript/test/fixture/announcement.json         | 4 ++--
 packages/cashscript/test/fixture/bigint.json               | 4 ++--
 packages/cashscript/test/fixture/bounded_bytes.json        | 4 ++--
 packages/cashscript/test/fixture/hodl_vault.json           | 4 ++--
 packages/cashscript/test/fixture/mecenas.json              | 4 ++--
 packages/cashscript/test/fixture/p2palindrome.json         | 4 ++--
 packages/cashscript/test/fixture/p2pkh.json                | 4 ++--
 packages/cashscript/test/fixture/simple_covenant.json      | 4 ++--
 .../cashscript/test/fixture/token_category_comparison.json | 4 ++--
 .../cashscript/test/fixture/transfer_with_timeout.json     | 4 ++--
 packages/utils/package.json                                | 2 +-
 17 files changed, 35 insertions(+), 34 deletions(-)

diff --git a/examples/package.json b/examples/package.json
index 0307f788..c379660e 100644
--- a/examples/package.json
+++ b/examples/package.json
@@ -1,7 +1,7 @@
 {
   "name": "cashscript-examples",
   "private": true,
-  "version": "0.10.0-next.6",
+  "version": "0.10.0",
   "description": "Usage examples of the CashScript SDK",
   "main": "p2pkh.js",
   "type": "module",
@@ -14,8 +14,8 @@
     "@bitauth/libauth": "^3.0.0",
     "@types/node": "^12.7.8",
     "bip39": "^3.0.4",
-    "cashc": "^0.10.0-next.6",
-    "cashscript": "^0.10.0-next.6",
+    "cashc": "^0.10.0",
+    "cashscript": "^0.10.0",
     "eslint": "^8.56.0",
     "typescript": "^4.9.5"
   }
diff --git a/examples/testing-suite/artifacts/example.json b/examples/testing-suite/artifacts/example.json
index b5b4bd75..7104e362 100644
--- a/examples/testing-suite/artifacts/example.json
+++ b/examples/testing-suite/artifacts/example.json
@@ -41,7 +41,7 @@
   },
   "compiler": {
     "name": "cashc",
-    "version": "0.10.0-next.6"
+    "version": "0.10.0"
   },
-  "updatedAt": "2024-08-06T09:59:35.164Z"
+  "updatedAt": "2024-09-10T09:55:42.448Z"
 }
\ No newline at end of file
diff --git a/examples/testing-suite/package.json b/examples/testing-suite/package.json
index 36b5f308..7c0582ce 100644
--- a/examples/testing-suite/package.json
+++ b/examples/testing-suite/package.json
@@ -1,6 +1,6 @@
 {
   "name": "testing-suite",
-  "version": "0.10.0-next.6",
+  "version": "0.10.0",
   "description": "Example project to develop and test CashScript contracts",
   "main": "index.js",
   "type": "module",
@@ -25,8 +25,9 @@
     "test": "NODE_OPTIONS='--experimental-vm-modules --no-warnings' jest"
   },
   "dependencies": {
-    "cashc": "^0.10.0-next.6",
-    "cashscript": "^0.10.0-next.6"
+    "cashc": "^0.10.0",
+    "cashscript": "^0.10.0",
+    "url-join": "^5.0.0"
   },
   "devDependencies": {
     "@jest/globals": "^29.4.1",
diff --git a/packages/cashc/package.json b/packages/cashc/package.json
index 3e3a70b5..b9ec4434 100644
--- a/packages/cashc/package.json
+++ b/packages/cashc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cashc",
-  "version": "0.10.0-next.6",
+  "version": "0.10.0",
   "description": "Compile Bitcoin Cash contracts to Bitcoin Cash Script or artifacts",
   "keywords": [
     "bitcoin",
@@ -50,7 +50,7 @@
   },
   "dependencies": {
     "@bitauth/libauth": "^3.0.0",
-    "@cashscript/utils": "^0.10.0-next.6",
+    "@cashscript/utils": "^0.10.0",
     "antlr4": "^4.13.1-patch-1",
     "commander": "^7.1.0",
     "semver": "^7.5.4"
diff --git a/packages/cashc/src/index.ts b/packages/cashc/src/index.ts
index e05ef6ec..72b37416 100644
--- a/packages/cashc/src/index.ts
+++ b/packages/cashc/src/index.ts
@@ -2,4 +2,4 @@ export * from './Errors.js';
 export * as utils from '@cashscript/utils';
 export { compileFile, compileString } from './compiler.js';
 
-export const version = '0.10.0-next.6';
+export const version = '0.10.0';
diff --git a/packages/cashscript/package.json b/packages/cashscript/package.json
index d58f4a61..4a8d48ba 100644
--- a/packages/cashscript/package.json
+++ b/packages/cashscript/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cashscript",
-  "version": "0.10.0-next.6",
+  "version": "0.10.0",
   "description": "Easily write and interact with Bitcoin Cash contracts",
   "keywords": [
     "bitcoin cash",
@@ -44,7 +44,7 @@
   },
   "dependencies": {
     "@bitauth/libauth": "^3.0.0",
-    "@cashscript/utils": "^0.10.0-next.6",
+    "@cashscript/utils": "^0.10.0",
     "bip68": "^1.0.4",
     "bitcoin-rpc-promise-retry": "^1.3.0",
     "delay": "^5.0.0",
diff --git a/packages/cashscript/test/fixture/announcement.json b/packages/cashscript/test/fixture/announcement.json
index 39c9e255..0b1d40dc 100644
--- a/packages/cashscript/test/fixture/announcement.json
+++ b/packages/cashscript/test/fixture/announcement.json
@@ -34,7 +34,7 @@
   },
   "compiler": {
     "name": "cashc",
-    "version": "0.10.0-next.6"
+    "version": "0.10.0"
   },
-  "updatedAt": "2024-09-05T13:25:22.357Z"
+  "updatedAt": "2024-09-10T09:54:01.248Z"
 }
\ No newline at end of file
diff --git a/packages/cashscript/test/fixture/bigint.json b/packages/cashscript/test/fixture/bigint.json
index 3313e9bb..ae33572a 100644
--- a/packages/cashscript/test/fixture/bigint.json
+++ b/packages/cashscript/test/fixture/bigint.json
@@ -35,7 +35,7 @@
   },
   "compiler": {
     "name": "cashc",
-    "version": "0.10.0-next.6"
+    "version": "0.10.0"
   },
-  "updatedAt": "2024-09-05T13:25:22.095Z"
+  "updatedAt": "2024-09-10T09:54:00.989Z"
 }
\ No newline at end of file
diff --git a/packages/cashscript/test/fixture/bounded_bytes.json b/packages/cashscript/test/fixture/bounded_bytes.json
index 7f4a9550..dadf6205 100644
--- a/packages/cashscript/test/fixture/bounded_bytes.json
+++ b/packages/cashscript/test/fixture/bounded_bytes.json
@@ -31,7 +31,7 @@
   },
   "compiler": {
     "name": "cashc",
-    "version": "0.10.0-next.6"
+    "version": "0.10.0"
   },
-  "updatedAt": "2024-09-05T13:25:23.083Z"
+  "updatedAt": "2024-09-10T09:54:01.995Z"
 }
\ No newline at end of file
diff --git a/packages/cashscript/test/fixture/hodl_vault.json b/packages/cashscript/test/fixture/hodl_vault.json
index 8937fdea..d5a511cd 100644
--- a/packages/cashscript/test/fixture/hodl_vault.json
+++ b/packages/cashscript/test/fixture/hodl_vault.json
@@ -68,7 +68,7 @@
   },
   "compiler": {
     "name": "cashc",
-    "version": "0.10.0-next.6"
+    "version": "0.10.0"
   },
-  "updatedAt": "2024-09-05T13:25:22.594Z"
+  "updatedAt": "2024-09-10T09:54:01.493Z"
 }
\ No newline at end of file
diff --git a/packages/cashscript/test/fixture/mecenas.json b/packages/cashscript/test/fixture/mecenas.json
index 916d7620..484b62c0 100644
--- a/packages/cashscript/test/fixture/mecenas.json
+++ b/packages/cashscript/test/fixture/mecenas.json
@@ -72,7 +72,7 @@
   },
   "compiler": {
     "name": "cashc",
-    "version": "0.10.0-next.6"
+    "version": "0.10.0"
   },
-  "updatedAt": "2024-09-05T13:25:24.222Z"
+  "updatedAt": "2024-09-10T09:54:03.279Z"
 }
\ No newline at end of file
diff --git a/packages/cashscript/test/fixture/p2palindrome.json b/packages/cashscript/test/fixture/p2palindrome.json
index 67c2b49c..9fbf038d 100644
--- a/packages/cashscript/test/fixture/p2palindrome.json
+++ b/packages/cashscript/test/fixture/p2palindrome.json
@@ -27,7 +27,7 @@
   },
   "compiler": {
     "name": "cashc",
-    "version": "0.10.0-next.6"
+    "version": "0.10.0"
   },
-  "updatedAt": "2024-09-05T13:25:22.851Z"
+  "updatedAt": "2024-09-10T09:54:01.764Z"
 }
\ No newline at end of file
diff --git a/packages/cashscript/test/fixture/p2pkh.json b/packages/cashscript/test/fixture/p2pkh.json
index 35574b7a..b17bf5fc 100644
--- a/packages/cashscript/test/fixture/p2pkh.json
+++ b/packages/cashscript/test/fixture/p2pkh.json
@@ -40,7 +40,7 @@
   },
   "compiler": {
     "name": "cashc",
-    "version": "0.10.0-next.6"
+    "version": "0.10.0"
   },
-  "updatedAt": "2024-09-05T13:25:23.980Z"
+  "updatedAt": "2024-09-10T09:54:03.012Z"
 }
\ No newline at end of file
diff --git a/packages/cashscript/test/fixture/simple_covenant.json b/packages/cashscript/test/fixture/simple_covenant.json
index 0573f08d..614c0fbd 100644
--- a/packages/cashscript/test/fixture/simple_covenant.json
+++ b/packages/cashscript/test/fixture/simple_covenant.json
@@ -42,7 +42,7 @@
   },
   "compiler": {
     "name": "cashc",
-    "version": "0.10.0-next.6"
+    "version": "0.10.0"
   },
-  "updatedAt": "2024-09-05T13:25:23.302Z"
+  "updatedAt": "2024-09-10T09:54:02.299Z"
 }
\ No newline at end of file
diff --git a/packages/cashscript/test/fixture/token_category_comparison.json b/packages/cashscript/test/fixture/token_category_comparison.json
index 28b9b243..657da061 100644
--- a/packages/cashscript/test/fixture/token_category_comparison.json
+++ b/packages/cashscript/test/fixture/token_category_comparison.json
@@ -22,7 +22,7 @@
   },
   "compiler": {
     "name": "cashc",
-    "version": "0.10.0-next.6"
+    "version": "0.10.0"
   },
-  "updatedAt": "2024-09-05T13:25:23.764Z"
+  "updatedAt": "2024-09-10T09:54:02.765Z"
 }
\ No newline at end of file
diff --git a/packages/cashscript/test/fixture/transfer_with_timeout.json b/packages/cashscript/test/fixture/transfer_with_timeout.json
index 6064fd4f..1e94abcc 100644
--- a/packages/cashscript/test/fixture/transfer_with_timeout.json
+++ b/packages/cashscript/test/fixture/transfer_with_timeout.json
@@ -57,7 +57,7 @@
   },
   "compiler": {
     "name": "cashc",
-    "version": "0.10.0-next.6"
+    "version": "0.10.0"
   },
-  "updatedAt": "2024-09-05T13:25:23.528Z"
+  "updatedAt": "2024-09-10T09:54:02.536Z"
 }
\ No newline at end of file
diff --git a/packages/utils/package.json b/packages/utils/package.json
index 732ee591..c8806c62 100644
--- a/packages/utils/package.json
+++ b/packages/utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cashscript/utils",
-  "version": "0.10.0-next.6",
+  "version": "0.10.0",
   "description": "CashScript utilities and types",
   "keywords": [
     "bitcoin cash",