@tari-project/tarijs 0.6.0 → 0.9.0

package/packages/walletconnect/src/index.ts

@@ -5,17 +5,16 @@ import {
   convertStringToTransactionStatus,
   GetTransactionResultResponse,
   SubmitTransactionRequest,
-  SubmitTransactionResponse,
   VaultBalances,
   TemplateDefinition,
   Substate,
   AccountData,
   ListSubstatesResponse,
   ListSubstatesRequest,
+  SubmitTransactionResponse,
 } from "@tari-project/tarijs-types";
 import {
   ConfidentialViewVaultBalanceRequest,
-  Instruction,
   KeyBranch,
   ListAccountNftRequest,
   ListAccountNftResponse,
@@ -40,7 +39,7 @@ const walletConnectParams = {
         "tari_getNftsList",
       ],
       chains: ["tari:devnet"],
-      events: ['chainChanged", "accountsChanged'],
+      events: ["chainChanged\", \"accountsChanged"],
     },
   },
 };
@@ -152,11 +151,11 @@ export class WalletConnectTariSigner implements TariSigner {
   }
 
   public async listSubstates({
-    filter_by_template,
-    filter_by_type,
-    limit,
-    offset,
-  }: ListSubstatesRequest): Promise<ListSubstatesResponse> {
+                               filter_by_template,
+                               filter_by_type,
+                               limit,
+                               offset,
+                             }: ListSubstatesRequest): Promise<ListSubstatesResponse> {
     const method = "tari_listSubstates";
     const params = {
       filter_by_template,
@@ -193,25 +192,12 @@ export class WalletConnectTariSigner implements TariSigner {
   }
 
   async submitTransaction(req: SubmitTransactionRequest): Promise<SubmitTransactionResponse> {
-    const method = req.is_dry_run ? "tari_submitTransactionDryRun" : "tari_submitTransaction";
+    const method = req.transaction.dry_run ? "tari_submitTransactionDryRun" : "tari_submitTransaction";
     const params: TransactionSubmitRequest = {
       transaction: {
-        V1: {
-          network: req.network,
-          fee_instructions: req.fee_instructions as Instruction[],
-          instructions: req.instructions as Instruction[],
-          inputs: req.required_substates.map((s) => ({
-            // TODO: Hmm The bindings want a SubstateId object, but the wallet only wants a string. Any is used to skip type checking here
-            substate_id: s.substate_id as any,
-            version: s.version ?? null,
-          })),
-          min_epoch: null,
-          max_epoch: null,
-          is_seal_signer_authorized: req.is_seal_signer_authorized,
-        },
+        V1: req.transaction,
       },
       signing_key_index: req.account_id,
-      autofill_inputs: [],
       detect_inputs: true,
       proof_ids: [],
       detect_inputs_use_unversioned: req.detect_inputs_use_unversioned,
@@ -243,11 +229,11 @@ export class WalletConnectTariSigner implements TariSigner {
   }
 
   async getConfidentialVaultBalances({
-    vault_id,
-    view_key_id,
-    maximum_expected_value = null,
-    minimum_expected_value = null,
-  }: ConfidentialViewVaultBalanceRequest): Promise<VaultBalances> {
+                                       vault_id,
+                                       view_key_id,
+                                       maximum_expected_value = null,
+                                       minimum_expected_value = null,
+                                     }: ConfidentialViewVaultBalanceRequest): Promise<VaultBalances> {
     const method = "tari_viewConfidentialVaultBalance";
     const params = {
       view_key_id,

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.1"
+  "@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

@@ -35,8 +35,8 @@ for version in "${versions[@]}"; do
 done
 
 if [ "$all_same" = false ]; then
-    echo "::error::All package.json versions are NOT the same. Please unify them."
+    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"
+    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
+

package/packages/tarijs_types/src/FinalizeResult.ts

@@ -1,17 +0,0 @@
-import { FeeReceipt, InstructionResult, LogEntry, RejectReason } from "@tari-project/typescript-bindings";
-import { SubstateDiff } from "./SubstateDiff";
-
-export type TxResultAccept = { Accept: SubstateDiff };
-export type TxResultAcceptFeeRejectRest = { AcceptFeeRejectRest: [SubstateDiff, RejectReason] };
-export type TxResultReject = { Reject: RejectReason };
-
-export type FinalizeResultStatus = TxResultAccept | TxResultAcceptFeeRejectRest | TxResultReject;
-
-export interface FinalizeResult {
-  transaction_hash: Uint8Array;
-  events: Array<Event>;
-  logs: Array<LogEntry>;
-  execution_results: Array<InstructionResult>;
-  result: FinalizeResultStatus;
-  fee_receipt: FeeReceipt;
-}

package/packages/tarijs_types/src/Instruction.ts

@@ -1,36 +0,0 @@
-import { ComponentAddress, LogLevel, PublishedTemplateAddress, SubstateType } from "@tari-project/typescript-bindings";
-import { TransactionArg } from "./TransactionArg";
-import { ConfidentialClaim } from "./ConfidentialClaim";
-import { Amount } from "./Amount";
-import { ConfidentialOutput } from "./ConfidentialOutput";
-
-export type Instruction =
-  | CreateAccount
-  | CallFunction
-  | CallMethod
-  | PutLastInstructionOutputOnWorkspace
-  | EmitLog
-  | ClaimBurn
-  | ClaimValidatorFees
-  | DropAllProofsInWorkspace
-  | CreateFreeTestCoins
-  | AllocateAddress;
-
-export type CreateAccount = { CreateAccount: { owner_public_key: string; workspace_bucket: string | null } };
-export type CallFunction = {
-  CallFunction: { template_address: PublishedTemplateAddress; function: string; args: Array<TransactionArg> };
-};
-export type CallMethod = {
-  CallMethod: { component_address: ComponentAddress; method: string; args: Array<TransactionArg> };
-};
-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 } };
-export type DropAllProofsInWorkspace = "DropAllProofsInWorkspace";
-export type CreateFreeTestCoins = {
-  CreateFreeTestCoins: { revealed_amount: Amount; output: ConfidentialOutput | null };
-};
-export type AllocateAddress = {
-  AllocateAddress: { substate_type: SubstateType; workspace_id: string };
-};

package/packages/tarijs_types/src/SubstateRequirement.ts

@@ -1,6 +0,0 @@
-import { SubstateId } from "@tari-project/typescript-bindings";
-
-export interface SubstateRequirement {
-  substateId: SubstateId;
-  version?: number;
-}

package/packages/tarijs_types/src/Transaction.ts

@@ -1,16 +0,0 @@
-import { Instruction } from "./Instruction";
-import { SubstateRequirement } from "./SubstateRequirement";
-import { VersionedSubstateId } from "./VersionedSubstateId";
-import { TransactionSignature } from "./TransactionSignature";
-import { Epoch } from "@tari-project/typescript-bindings";
-
-export interface Transaction {
-  id: string;
-  feeInstructions: Array<Instruction>;
-  instructions: Array<Instruction>;
-  inputs: Array<SubstateRequirement>;
-  minEpoch?: Epoch;
-  maxEpoch?: Epoch;
-  signatures: Array<TransactionSignature>;
-  filledInputs: Array<VersionedSubstateId>;
-}

package/packages/tarijs_types/src/UnsignedTransaction.ts

@@ -1,14 +0,0 @@
-import { Epoch } from "@tari-project/typescript-bindings";
-import { Instruction } from "./Instruction";
-import { SubstateRequirement } from "./SubstateRequirement";
-import { VersionedSubstateId } from "./VersionedSubstateId";
-
-// differs from bindings implementation because of 'Instruction'
-export interface UnsignedTransaction {
-  feeInstructions: Instruction[];
-  instructions: Instruction[];
-  inputs: SubstateRequirement[];
-  filledInputs: VersionedSubstateId[];
-  minEpoch?: Epoch;
-  maxEpoch?: Epoch;
-}

package/packages/tarijs_types/src/VersionedSubstateId.ts

@@ -1,6 +0,0 @@
-import { SubstateId } from "@tari-project/typescript-bindings";
-
-export interface VersionedSubstateId {
-  substateId: SubstateId;
-  version: number;
-}