@tari-project/tarijs 0.5.5 → 0.8.0

package/packages/tarijs/test/integration-tests/wallet_daemon/json_rpc_provider.spec.ts

@@ -12,7 +12,6 @@ import {
   waitForTransactionResult,
   WalletDaemonTariSigner,
 } from "../../../src";
-import { inspect } from "util";
 
 function buildSigner(): Promise<WalletDaemonTariSigner> {
   const permissions = new TariPermissions().addPermission("Admin");
@@ -156,6 +155,50 @@ describe("WalletDaemonTariSigner", () => {
 
       expect(txResult.status).toEqual(TransactionStatus.DryRun);
     });
+
+    it("submits a transaction, that uses workspaces", async () => {
+      const workspaceId = "bucket";
+      const signer = await buildSigner();
+      const account = await signer.getAccount();
+      const xtrAddress = account.resources[0].resource_address;
+
+      const fee = new Amount(2000);
+      const builder = new TransactionBuilder();
+      builder.feeTransactionPayFromComponent(account.address, fee.getStringValue());
+
+      builder.callMethod(
+        {
+          componentAddress: account.address,
+          methodName: "withdraw",
+        },
+        [xtrAddress, 10],
+      );
+      builder.saveVar(workspaceId);
+      builder.callMethod(
+        {
+          componentAddress: account.address,
+          methodName: "deposit",
+        },
+        [workspaceId],
+      );
+      const transaction = builder.build();
+
+      const isDryRun = false;
+      const inputRefs = undefined;
+      const network = Network.LocalNet;
+      const requiredSubstates = [{ substate_id: account.address }];
+      const submitTransactionRequest = buildTransactionRequest(
+        transaction,
+        account.account_id,
+        requiredSubstates,
+        inputRefs,
+        isDryRun,
+        network,
+      );
+
+      const txResult = await submitAndWaitForTransaction(signer, submitTransactionRequest);
+      expect(txResult.result.status).toBe(TransactionStatus.Accepted);
+    });
   });
 
   describe("getAccountBalances", () => {
@@ -294,4 +337,40 @@ describe("WalletDaemonTariSigner", () => {
       expect(failure).toEqual("1 dangling address allocations remain after transaction execution");
     });
   });
+
+  describe("assertBucketContains", () => {
+    it("fails if bucket does not exist", async () => {
+      const signer = await buildSigner();
+      const account = await signer.getAccount();
+
+      const fee = new Amount(2000);
+      const builder = new TransactionBuilder();
+      builder.feeTransactionPayFromComponent(account.address, fee.getStringValue());
+      builder.assertBucketContains("not_exist", "resource_0000000000000000000000000000000000000000000000000000000000000000", Amount.newAmount(1));
+      const transaction = builder.build();
+
+      const isDryRun = false;
+      const inputRefs = undefined;
+      const network = Network.LocalNet;
+      const requiredSubstates = [{ substate_id: account.address }];
+      const submitTransactionRequest = buildTransactionRequest(
+        transaction,
+        account.account_id,
+        requiredSubstates,
+        inputRefs,
+        isDryRun,
+        network,
+      );
+
+      const txResult = await submitAndWaitForTransaction(signer, submitTransactionRequest);
+
+      expect(txResult.result.status).toBe(TransactionStatus.OnlyFeeAccepted);
+
+      const executionResult = txResult.result.result?.result;
+      const reason =
+        executionResult && "AcceptFeeRejectRest" in executionResult && executionResult.AcceptFeeRejectRest[1];
+      const failure = reason && typeof reason === "object" && "ExecutionFailure" in reason && reason.ExecutionFailure;
+      expect(failure).toContain("Item at id 0 does not exist on the workspace");
+    });
+  });
 });

package/packages/tarijs_types/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tari-project/tarijs-types",
-  "version": "0.5.5",
+  "version": "0.8.0",
   "description": "",
   "type": "module",
   "publishConfig": {

package/packages/tarijs_types/src/Instruction.ts

@@ -1,4 +1,4 @@
-import { ComponentAddress, LogLevel, PublishedTemplateAddress, SubstateType } from "@tari-project/typescript-bindings";
+import { ComponentAddress, ResourceAddress, LogLevel, PublishedTemplateAddress, SubstateType, WorkspaceOffsetId } from "@tari-project/typescript-bindings";
 import { TransactionArg } from "./TransactionArg";
 import { ConfidentialClaim } from "./ConfidentialClaim";
 import { Amount } from "./Amount";
@@ -14,7 +14,8 @@ export type Instruction =
   | ClaimValidatorFees
   | DropAllProofsInWorkspace
   | CreateFreeTestCoins
-  | AllocateAddress;
+  | AllocateAddress
+  | AssertBucketContains;
 
 export type CreateAccount = { CreateAccount: { owner_public_key: string; workspace_bucket: string | null } };
 export type CallFunction = {
@@ -23,7 +24,7 @@ export type CallFunction = {
 export type CallMethod = {
   CallMethod: { component_address: ComponentAddress; method: string; args: Array<TransactionArg> };
 };
-export type PutLastInstructionOutputOnWorkspace = { PutLastInstructionOutputOnWorkspace: { key: number[] } };
+export type PutLastInstructionOutputOnWorkspace = { PutLastInstructionOutputOnWorkspace: { key: string } };
 export type EmitLog = { EmitLog: { level: LogLevel; message: string } };
 export type ClaimBurn = { ClaimBurn: { claim: ConfidentialClaim } };
 export type ClaimValidatorFees = { ClaimValidatorFees: { epoch: number; validator_public_key: string } };
@@ -34,3 +35,6 @@ export type CreateFreeTestCoins = {
 export type AllocateAddress = {
   AllocateAddress: { substate_type: SubstateType; workspace_id: string };
 };
+export type AssertBucketContains = {
+  AssertBucketContains: { key: WorkspaceOffsetId; resource_address: ResourceAddress; min_amount: Amount };
+}

package/packages/tarijs_types/src/SubstateType.ts

@@ -1 +1 @@
-export type SubstateType = "Component" | "Resource" | "Vault" | "UnclaimedConfidentialOutput" | "NonFungible" | "TransactionReceipt" | "NonFungibleIndex" | "ValidatorFeePool" | "Template";
+export type SubstateType = "Component" | "Resource" | "Vault" | "UnclaimedConfidentialOutput" | "NonFungible" | "TransactionReceipt" | "ValidatorFeePool" | "Template";

package/packages/tarijs_types/src/Workspace.ts

@@ -1,3 +1,3 @@
 export interface WorkspaceArg {
-  Workspace: number[];
+  Workspace: string;
 }

package/packages/wallet_daemon/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tari-project/wallet-daemon-signer",
-  "version": "0.5.3",
+  "version": "0.8.0",
   "description": "",
   "type": "module",
   "publishConfig": {

package/packages/wallet_daemon/src/signer.ts

@@ -184,6 +184,7 @@ export class WalletDaemonTariSigner implements TariSigner {
           })),
           min_epoch: null,
           max_epoch: null,
+          dry_run: req.is_dry_run,
           is_seal_signer_authorized: req.is_seal_signer_authorized,
         },
       },

package/packages/walletconnect/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tari-project/wallet-connect-signer",
-  "version": "0.5.3",
+  "version": "0.8.0",
   "description": "",
   "type": "module",
   "publishConfig": {

package/packages/walletconnect/src/index.ts

@@ -207,6 +207,7 @@ export class WalletConnectTariSigner implements TariSigner {
           })),
           min_epoch: null,
           max_epoch: null,
+          dry_run: req.is_dry_run,
           is_seal_signer_authorized: req.is_seal_signer_authorized,
         },
       },

package/pnpm-workspace.yaml

@@ -8,8 +8,8 @@ catalog:
   vitest: ^3.0.4
   vite: ^6.1.0
   "@types/node": ^22.13.1
-  "@tari-project/typescript-bindings": ^1.5.5
-  "@tari-project/wallet_jrpc_client": ^1.5.4
+  "@tari-project/typescript-bindings": ">=1.9.0"
+  "@tari-project/wallet_jrpc_client": ^1.6.0
   "@metamask/providers": ^18.2.0
   "@walletconnect/universal-provider": ^2.13.3
   "@walletconnect/modal": ^2.6.2

package/scripts/check_versions.sh

@@ -0,0 +1,42 @@
+#!/bin/bash
+set -euo pipefail
+IFS=$'\n\t'
+
+echo "Finding all package.json files and extracting versions..."
+
+declare -a versions
+
+# Find all package.json files, excluding node_modules, and extract the version
+while IFS= read -r file; do
+    version=$(jq -r '.version' "$file")
+    if [[ -z "$version" || "$version" == "null" ]]; then
+        echo "::error::Could not find 'version' field in $file"
+        exit 1
+    fi
+    echo "Found version '$version' in $file"
+    versions+=("$version")
+done < <(find . -name 'package.json' -not -path '*/node_modules/*')
+
+if [ ${#versions[@]} -eq 0 ]; then
+    echo "Error: No package.json files with a 'version' field were found."
+    exit 1
+fi
+
+reference_version=${versions[0]}
+echo "Reference version: $reference_version"
+
+all_same=true
+for version in "${versions[@]}"; do
+    if [ "$version" != "$reference_version" ]; then
+        echo "Error: Mismatched version found! '$version' does not match '$reference_version'."
+        all_same=false
+        break
+    fi
+done
+
+if [ "$all_same" = false ]; then
+    echo "❌ ::error::All package.json versions are NOT the same. Please unify them."
+    exit 1
+else
+    echo "✅ All package.json versions are consistent: $reference_version"
+fi

package/scripts/set_package_versions.sh

@@ -0,0 +1,39 @@
+#!/bin/bash
+set -euo pipefail
+
+# This script sets the package versions in all package.json files for the workspace.
+
+# Usage: ./scripts/set_package_versions.sh <version>
+if [ "$#" -ne 1 ]; then
+    echo "Usage: $0 <version>"
+    exit 1
+fi
+
+gitroot=$(git rev-parse --show-toplevel)
+
+VERSION=$1
+# Find all package.json files in the workspace
+pushd "${gitroot}/packages" > /dev/null
+find . -depth -maxdepth 2 -name 'package.json' | while read -r package_json; do
+    # Update the version in the package.json file
+    jq --arg version "$VERSION" '.version = $version' "$package_json" > "$package_json.tmp" && mv "$package_json.tmp" "$package_json"
+    echo "Updated version in $package_json to $VERSION"
+done
+popd > /dev/null
+
+pushd "${gitroot}/docusaurus/tari-docs" > /dev/null
+jq --arg version "$VERSION" '.version = $version' package.json > package.json.tmp && mv package.json.tmp package.json
+echo "Updated docusaurus package.json version to $VERSION"
+popd > /dev/null
+
+pushd "${gitroot}" > /dev/null
+# Update the version in the root package.json
+jq --arg version "$VERSION" '.version = $version' package.json > package.json.tmp && mv package.json.tmp package.json
+echo "Updated root package.json version to $VERSION"
+
+pnpm install
+
+echo "Running check_versions script to verify versions..."
+./scripts/check_versions.sh
+popd > /dev/null
+