@tari-project/tari-extension-query-builder 0.0.8 → 0.0.10

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tari-project/tari-extension-query-builder",
   "private": false,
-  "version": "0.0.8",
+  "version": "0.0.10",
   "type": "module",
   "main": "dist/tari-extension-query-builder.umd.js",
   "module": "dist/tari-extension-query-builder.es.js",
@@ -37,43 +37,43 @@
     "@radix-ui/react-separator": "^1.1.2",
     "@radix-ui/react-slot": "^1.1.2",
     "@radix-ui/react-tooltip": "^1.1.8",
-    "@tari-project/tarijs-all": "^0.6.0",
+    "@tari-project/tarijs-all": "^0.10.1",
     "@xyflow/react": "^12.4.4",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
     "lucide-react": "^0.479.0",
     "next-themes": "^0.4.6",
-    "sonner": "^2.0.3",
-    "tailwind-merge": "^3.0.2",
+    "sonner": "^2.0.5",
+    "tailwind-merge": "^3.3.1",
     "tailwindcss-animate": "^1.0.7",
     "uuid": "^11.1.0",
-    "zod": "^3.24.2",
-    "@tari-project/tari-extension-common": "^0.0.8"
+    "zod": "^3.25.67",
+    "@tari-project/tari-extension-common": "^0.0.10"
   },
   "devDependencies": {
     "@eslint/js": "^9.21.0",
     "@tailwindcss/vite": "^4.0.12",
-    "@tari-project/typescript-bindings": "^1.5.2",
-    "@types/node": "^22.13.5",
-    "@types/react": "^19.0.10",
-    "@types/react-dom": "^19.0.4",
-    "@vitejs/plugin-react": "^4.3.4",
+    "@tari-project/typescript-bindings": "^1.11.1",
+    "@types/node": "^24.0.8",
+    "@types/react": "^19.1.8",
+    "@types/react-dom": "^19.1.6",
+    "@vitejs/plugin-react": "^4.6.0",
     "autoprefixer": "^10.4.21",
     "eslint": "^9.21.0",
     "eslint-plugin-react": "^7.37.4",
     "eslint-plugin-react-hooks": "^5.1.0",
     "eslint-plugin-react-refresh": "^0.4.19",
-    "globals": "^15.15.0",
+    "globals": "^16.3.0",
     "postcss": "^8.5.3",
-    "prettier": "^3.5.2",
+    "prettier": "^3.6.2",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
     "tailwindcss": "^4.0.12",
     "typescript": "^5.7.3",
     "typescript-eslint": "^8.25.0",
-    "vite": "^6.2.0",
+    "vite": "^7.0.0",
     "vite-plugin-dts": "^4.5.3",
-    "vitest": "^3.0.7",
+    "vitest": "^3.2.4",
     "zustand": "^5.0.3"
   },
   "scripts": {

package/src/codegen/BuilderCodegen.ts

@@ -50,19 +50,28 @@ export class BuilderCodegen {
           undefined,
           factory.createNamedImports([
             factory.createImportSpecifier(false, undefined, factory.createIdentifier("buildTransactionRequest")),
-            factory.createImportSpecifier(false, undefined, factory.createIdentifier("fromWorkspace")),
             factory.createImportSpecifier(false, undefined, factory.createIdentifier("Network")),
-            factory.createImportSpecifier(false, undefined, factory.createIdentifier("ReqSubstate")),
             factory.createImportSpecifier(false, undefined, factory.createIdentifier("submitAndWaitForTransaction")),
-            factory.createImportSpecifier(false, undefined, factory.createIdentifier("SubmitTxResult")),
             factory.createImportSpecifier(false, undefined, factory.createIdentifier("TariSigner")),
-            factory.createImportSpecifier(false, undefined, factory.createIdentifier("Transaction")),
             factory.createImportSpecifier(false, undefined, factory.createIdentifier("TransactionBuilder")),
           ]),
         ),
         factory.createStringLiteral("@tari-project/tarijs-all"),
         undefined,
       ),
+      factory.createImportDeclaration(
+        undefined,
+        factory.createImportClause(
+          false,
+          undefined,
+          factory.createNamedImports([
+            factory.createImportSpecifier(false, undefined, factory.createIdentifier("TransactionResult")),
+            factory.createImportSpecifier(false, undefined, factory.createIdentifier("UnsignedTransactionV1")),
+          ]),
+        ),
+        factory.createStringLiteral("@tari-project/typescript-bindings"),
+        undefined,
+      ),
       ...addEmptyCommentToFirstNode(buildInterfaces(this.details.context)),
       ...addEmptyCommentToFirstNode(buildInputVariables(this.details.context)),
       addEmptyComment(
@@ -71,8 +80,18 @@ export class BuilderCodegen {
           undefined,
           factory.createIdentifier("buildTransaction"),
           undefined,
-          buildInputArgs(this.details.context),
-          factory.createTypeReferenceNode(factory.createIdentifier("Transaction"), undefined),
+          [
+            factory.createParameterDeclaration(
+              undefined,
+              undefined,
+              factory.createIdentifier("network"),
+              undefined,
+              factory.createTypeReferenceNode(factory.createIdentifier("Network"), undefined),
+              undefined,
+            ),
+            ...buildInputArgs(this.details.context),
+          ],
+          factory.createTypeReferenceNode(factory.createIdentifier("UnsignedTransactionV1"), undefined),
           factory.createBlock(
             [
               factory.createVariableStatement(
@@ -83,7 +102,9 @@ export class BuilderCodegen {
                       factory.createIdentifier("builder"),
                       undefined,
                       undefined,
-                      factory.createNewExpression(factory.createIdentifier("TransactionBuilder"), undefined, []),
+                      factory.createNewExpression(factory.createIdentifier("TransactionBuilder"), undefined, [
+                        factory.createIdentifier("network"),
+                      ]),
                     ),
                   ],
                   ts.NodeFlags.Const,
@@ -94,7 +115,7 @@ export class BuilderCodegen {
                 factory.createCallExpression(
                   factory.createPropertyAccessExpression(
                     factory.createIdentifier("builder"),
-                    factory.createIdentifier("build"),
+                    factory.createIdentifier("buildUnsignedTransaction"),
                   ),
                   undefined,
                   [],
@@ -136,27 +157,10 @@ export class BuilderCodegen {
               factory.createKeywordTypeNode(ts.SyntaxKind.NumberKeyword),
               undefined,
             ),
-            factory.createParameterDeclaration(
-              undefined,
-              undefined,
-              factory.createIdentifier("requiredSubstates"),
-              undefined,
-              factory.createArrayTypeNode(
-                factory.createTypeReferenceNode(factory.createIdentifier("ReqSubstate"), undefined),
-              ),
-              factory.createArrayLiteralExpression([], false),
-            ),
-            factory.createParameterDeclaration(
-              undefined,
-              undefined,
-              factory.createIdentifier("isDryRun"),
-              undefined,
-              undefined,
-              factory.createFalse(),
-            ),
+            ...buildInputArgs(this.details.context),
           ],
           factory.createTypeReferenceNode(factory.createIdentifier("Promise"), [
-            factory.createTypeReferenceNode(factory.createIdentifier("SubmitTxResult"), undefined),
+            factory.createTypeReferenceNode(factory.createIdentifier("TransactionResult"), undefined),
           ]),
           factory.createBlock(
             [
@@ -169,16 +173,11 @@ export class BuilderCodegen {
                       undefined,
                       undefined,
                       factory.createCallExpression(factory.createIdentifier("buildTransactionRequest"), undefined, [
-                        factory.createCallExpression(
-                          factory.createIdentifier("buildTransaction"),
-                          undefined,
-                          Object.keys(this.details.context.inputParams).map((key) => factory.createIdentifier(key)),
-                        ),
+                        factory.createCallExpression(factory.createIdentifier("buildTransaction"), undefined, [
+                          factory.createIdentifier("network"),
+                          ...Object.keys(this.details.context.inputParams).map((key) => factory.createIdentifier(key)),
+                        ]),
                         factory.createIdentifier("accountId"),
-                        factory.createIdentifier("requiredSubstates"),
-                        factory.createIdentifier("undefined"),
-                        factory.createIdentifier("isDryRun"),
-                        factory.createIdentifier("network"),
                       ]),
                     ),
                   ],
@@ -205,7 +204,12 @@ export class BuilderCodegen {
                   ts.NodeFlags.Const,
                 ),
               ),
-              factory.createReturnStatement(factory.createIdentifier("txResult")),
+              factory.createReturnStatement(
+                factory.createPropertyAccessExpression(
+                  factory.createIdentifier("txResult"),
+                  factory.createIdentifier("result"),
+                ),
+              ),
             ],
             true,
           ),
@@ -254,9 +258,16 @@ export class BuilderCodegen {
   private createArgValueAst(arg: ArgValue): ts.Expression {
     switch (arg.type) {
       case "workspace":
-        return factory.createCallExpression(factory.createIdentifier("fromWorkspace"), undefined, [
-          factory.createStringLiteral(arg.value),
-        ]);
+        // Use { Workspace: "name" } instead of fromWorkspace()
+        return factory.createObjectLiteralExpression(
+          [
+            factory.createPropertyAssignment(
+              factory.createIdentifier("Workspace"),
+              factory.createStringLiteral(arg.value),
+            ),
+          ],
+          false,
+        );
       case "input":
         return factory.createPropertyAccessExpression(
           factory.createIdentifier(arg.reference.name),

package/src/codegen/sample.ts

@@ -1,24 +1,21 @@
 import {
   buildTransactionRequest,
-  fromWorkspace,
   Network,
-  ReqSubstate,
   submitAndWaitForTransaction,
-  SubmitTxResult,
   TariSigner,
-  Transaction,
   TransactionBuilder,
 } from "@tari-project/tarijs-all";
+import { TransactionResult, UnsignedTransactionV1 } from "@tari-project/typescript-bindings";
 
-function buildTransaction(): Transaction {
-  const builder = new TransactionBuilder();
+function buildTransaction(network: Network): UnsignedTransactionV1 {
+  const builder = new TransactionBuilder(network);
   builder.feeTransactionPayFromComponent("ACCOUNT_ADDRESS", "12345");
   builder.callMethod(
     {
       componentAddress: "COMPONENT_ADDRESS",
       methodName: "method_name",
     },
-    ["a1", 2, fromWorkspace("a2")],
+    ["a1", 2, { Workspace: "a2" }],
   );
   builder.saveVar("b3");
   builder.callFunction(
@@ -26,7 +23,7 @@ function buildTransaction(): Transaction {
       templateAddress: "TEMPLATE_ADDRESS",
       functionName: "function_name",
     },
-    ["b2", 3, fromWorkspace("b3")],
+    ["b2", 3, { Workspace: "b3" }],
   );
   builder.addInstruction({
     EmitLog: {
@@ -34,25 +31,16 @@ function buildTransaction(): Transaction {
       message: "Hello, world!",
     },
   });
-  return builder.build();
+  return builder.buildUnsignedTransaction();
 }
 
 export async function executeTransaction(
   signer: TariSigner,
   network: Network,
   accountId: number,
-  requiredSubstates: ReqSubstate[] = [],
-  isDryRun = false,
-): Promise<SubmitTxResult> {
-  const submitTransactionRequest = buildTransactionRequest(
-    buildTransaction(),
-    accountId,
-    requiredSubstates,
-    undefined,
-    isDryRun,
-    network,
-  );
+): Promise<TransactionResult> {
+  const submitTransactionRequest = buildTransactionRequest(buildTransaction(network), accountId);
 
   const txResult = await submitAndWaitForTransaction(signer, submitTransactionRequest);
-  return txResult;
+  return txResult.result;
 }

package/src/components/query-builder/query-builder.tsx

@@ -8,7 +8,12 @@ import {
   Panel,
   MiniMap,
 } from "@xyflow/react";
-import { CALL_NODE_DRAG_DROP_TYPE, GeneratedCodeType, TransactionProps } from "@tari-project/tari-extension-common";
+import {
+  CALL_NODE_DRAG_DROP_TYPE,
+  GeneratedCodeType,
+  TariNetwork,
+  TransactionProps,
+} from "@tari-project/tari-extension-common";
 import useStore from "../../store/store";
 import { useShallow } from "zustand/shallow";
 import { InputConnectionType, GenericNodeType, NodeType, QueryBuilderState } from "@/store/types";
@@ -57,13 +62,14 @@ import {
   AlertDialogHeader,
   AlertDialogTitle,
 } from "../ui/alert-dialog";
-import { Amount, Transaction } from "@tari-project/tarijs-all";
+import { Amount, Network } from "@tari-project/tarijs-all";
 import { MissingDataError } from "@/execute/MissingDataError";
 import { toast } from "sonner";
 import { LoadingSpinner } from "../ui/loading-spinner";
 import { BuilderCodegen } from "@/codegen/BuilderCodegen";
 import { getNextAvailable } from "@/lib/get-next-available";
 import { ALLOCATE_COMPONENT_ADDRESS_RESULT, ALLOCATE_RESOURCE_ADDRESS_RESULT } from "./nodes/generic-node.types";
+import { UnsignedTransactionV1 } from "@tari-project/typescript-bindings";
 
 export type Theme = "dark" | "light";
 
@@ -86,7 +92,7 @@ export interface QueryBuilderProps {
   theme: Theme;
   readOnly?: boolean;
   getTransactionProps?: () => Promise<TransactionProps>;
-  executeTransaction?: (transaction: Transaction, dryRun: boolean) => Promise<void>;
+  executeTransaction?: (transaction: UnsignedTransactionV1) => Promise<void>;
   showGeneratedCode?: (code: string, type: GeneratedCodeType) => Promise<void>;
 }
 
@@ -150,8 +156,9 @@ function Flow({
         const json = JSON.parse(data) as TariFlowNodeDetails;
         const reader = new TemplateReader(json.template, json.templateAddress);
 
-        const flowX = (event.clientX - viewport.x) / viewport.zoom;
-        const flowY = (event.clientY - viewport.y) / viewport.zoom;
+        const reactflowBounds = reactflowRef.current?.getBoundingClientRect();
+        const flowX = (event.clientX - (reactflowBounds?.left ?? 0) - viewport.x) / viewport.zoom;
+        const flowY = (event.clientY - (reactflowBounds?.top ?? 0) - viewport.y) / viewport.zoom;
 
         const nodeData = reader.getGenericNode(json.functionName);
         if (nodeData) {
@@ -167,9 +174,9 @@ function Flow({
       const planner = new ExecutionPlanner(nodes, edges);
       try {
         const executionOrder = planner.getExecutionOrder();
-        const { accountAddress, fee } = await getTransactionProps();
+        const { network, accountAddress, fee } = await getTransactionProps();
         const details = planner.buildTransactionDescription(executionOrder, accountAddress, new Amount(fee));
-        return { planner, details };
+        return { network, planner, details };
       } catch (e) {
         let errorMessage = "Failed to determine execution order";
         if (e instanceof AmbiguousOrderError) {
@@ -205,6 +212,23 @@ function Flow({
     [nodes, edges, getNodeById],
   );
 
+  const getNetwork = (network: TariNetwork) => {
+    switch (network) {
+      case TariNetwork.MainNet:
+        return Network.MainNet;
+      case TariNetwork.StageNet:
+        return Network.StageNet;
+      case TariNetwork.NextNet:
+        return Network.NextNet;
+      case TariNetwork.LocalNet:
+        return Network.LocalNet;
+      case TariNetwork.Igor:
+        return Network.Igor;
+      case TariNetwork.Esmeralda:
+        return Network.Esmeralda;
+    }
+  };
+
   const handleExecute = useCallback(
     async (dryRun: boolean) => {
       if (!getTransactionProps || !executeTransaction) {
@@ -213,9 +237,9 @@ function Flow({
 
       setLoading(true);
       try {
-        const { planner, details } = await buildTransactionDescriptions(getTransactionProps);
-        const transaction = planner.buildTransaction(details);
-        await executeTransaction(transaction, dryRun);
+        const { network, planner, details } = await buildTransactionDescriptions(getTransactionProps);
+        const transaction = planner.buildTransaction(getNetwork(network), details, dryRun);
+        await executeTransaction(transaction);
         toast.success("Transaction executed");
       } catch (e) {
         if (e instanceof Error) {

package/src/execute/ExecutionPlanner.ts

@@ -1,11 +1,11 @@
 import { NODE_ENTRY, NODE_EXIT } from "@/components/query-builder/nodes/generic-node.types";
 import { CustomNode, GenericNode, GenericNodeType, InputParamsNode, NodeType } from "@/store/types";
-import { LogLevel, Type } from "@tari-project/typescript-bindings";
+import { LogLevel, Type, UnsignedTransactionV1 } from "@tari-project/typescript-bindings";
 import { Edge } from "@xyflow/react";
 import { CycleDetectedError } from "./CycleDetectedError";
 import { AmbiguousOrderError } from "./AmbiguousOrderError";
 import { MissingDataError } from "./MissingDataError";
-import { Amount, fromWorkspace, Transaction, TransactionBuilder } from "@tari-project/tarijs-all";
+import { Amount, Network, TransactionBuilder } from "@tari-project/tarijs-all";
 import { COMPONENT_ADDRESS_NAME } from "@/query-builder/template-reader";
 import {
   ArgValue,
@@ -382,8 +382,8 @@ export class ExecutionPlanner {
     };
   }
 
-  public buildTransaction(details: TransactionDetails): Transaction {
-    const builder = new TransactionBuilder();
+  public buildTransaction(network: Network, details: TransactionDetails, dryRun: boolean): UnsignedTransactionV1 {
+    const builder = new TransactionBuilder(network);
     for (const description of details.descriptions) {
       switch (description.type) {
         case "feeTransactionPayFromComponent":
@@ -424,12 +424,14 @@ export class ExecutionPlanner {
           break;
       }
     }
-    return builder.build();
+    const result = builder.buildUnsignedTransaction();
+    result.dry_run = dryRun;
+    return result;
   }
 }
 
 function unwrapArgValue(arg: ArgValue): unknown {
-  return arg.type === "workspace" ? fromWorkspace(arg.value) : arg.value;
+  return arg.type === "workspace" ? { Workspace: arg.value } : arg.value;
 }
 
 function unwrapArgValues(args: ArgValue[]): unknown[] {