@tari-project/tarijs 0.8.0 → 0.9.0

package/docusaurus/tari-docs/docs/wallet/submit-transaction/build-execute-request.md

@@ -20,11 +20,9 @@ The transaction request has additional parameters. Therefore, you build it using
 const isDryRun = false;
 const inputRefs = undefined; // Obsolete
 const network = Network.LocalNet;
-const requiredSubstates = []; // Soon to be retired. Use `builder.withInputs()` instead.
 const submitTransactionRequest = buildTransactionRequest(
   transaction,
   account.account_id,
-  requiredSubstates,
   inputRefs,
   isDryRun,
   network

package/docusaurus/tari-docs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tari-docs",
-  "version": "0.8.0",
+  "version": "0.9.0",
   "private": true,
   "scripts": {
     "docusaurus": "docusaurus",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tari-project/tarijs",
-  "version": "0.8.0",
+  "version": "0.9.0",
   "description": "",
   "type": "module",
   "keywords": [],

package/packages/builders/package.json

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

package/packages/builders/src/helpers/submitTransaction.ts

@@ -1,40 +1,28 @@
 import { TariUniverseSigner } from "@tari-project/tari-universe-signer";
 import { TariSigner } from "@tari-project/tari-signer";
 import {
-  Transaction,
+  ComponentAddress,
+  substateIdToString,
   TransactionResult,
-  TransactionStatus,
+  UnsignedTransactionV1,
+} from "@tari-project/typescript-bindings";
+import {
   DownSubstates,
   UpSubstates,
-  SubmitTxResult,
-  ReqSubstate,
+  getSubstateValueFromUpSubstates,
   SubmitTransactionRequest,
-  ComponentAddress,
+  TransactionStatus,
 } from "@tari-project/tarijs-types";
-import { getSubstateValueFromUpSubstates, substateIdToString, txResultCheck } from "@tari-project/tarijs-types";
+import { SubmitTxResult } from "@tari-project/tarijs-types/dist/TransactionResult";
 
 export function buildTransactionRequest(
-  transaction: Transaction,
+  transaction: UnsignedTransactionV1,
   accountId: number,
-  requiredSubstates: ReqSubstate[],
-  inputRefs = [],
-  isDryRun = false,
-  network = 0,
-  isSealSignerAuthorized = true,
   detectInputsUseUnversioned = true,
 ): SubmitTransactionRequest {
   return {
-    network,
+    transaction,
     account_id: accountId,
-    instructions: transaction.instructions as object[],
-    fee_instructions: transaction.feeInstructions as object[],
-    inputs: transaction.inputs,
-    input_refs: inputRefs as object[],
-    required_substates: requiredSubstates,
-    is_dry_run: isDryRun,
-    min_epoch: transaction.minEpoch ?? null,
-    max_epoch: transaction.maxEpoch ?? null,
-    is_seal_signer_authorized: isSealSignerAuthorized,
     detect_inputs_use_unversioned: detectInputsUseUnversioned,
   };
 }
@@ -95,7 +83,7 @@ export async function waitForTransactionResult(
       throw new Error(`Transaction rejected: ${JSON.stringify(resp.result)}`);
     }
     if (FINALIZED_STATUSES.includes(resp.status)) {
-      return resp as TransactionResult;
+      return resp.result?.result!;
     }
     await new Promise((resolve) => setTimeout(resolve, 1000));
   }
@@ -105,16 +93,23 @@ export function getAcceptResultSubstates(txResult: TransactionResult): {
   upSubstates: UpSubstates;
   downSubstates: DownSubstates;
 } {
-  const result = txResult.result?.result;
-
-  if (result && txResultCheck.isAcceptFeeRejectRest(result)) {
+  if ("Accept" in txResult) {
     return {
-      upSubstates: result.AcceptFeeRejectRest[0].up_substates,
-      downSubstates: result.AcceptFeeRejectRest[0].down_substates,
+      upSubstates: txResult.Accept.up_substates,
+      downSubstates: txResult.Accept.down_substates,
     };
   }
-  if (result && txResultCheck.isAccept(result)) {
-    return { upSubstates: result.Accept.up_substates, downSubstates: result.Accept.down_substates };
+
+  if ("Reject" in txResult) {
+    throw new Error(`Transaction rejected: ${txResult.Reject}`);
+  }
+
+  if ("AcceptFeeRejectRest" in txResult) {
+    return {
+      upSubstates: txResult.AcceptFeeRejectRest[0].up_substates,
+      downSubstates: txResult.AcceptFeeRejectRest[0].down_substates,
+    };
   }
-  return { upSubstates: [], downSubstates: [] };
+
+  throw new Error(`Unexpected transaction result: ${JSON.stringify(txResult)}`);
 }

package/packages/builders/src/transaction/TransactionRequest.ts

@@ -10,7 +10,6 @@ import {
 } from "@tari-project/typescript-bindings";
 
 
-
 ///TODO this implementation is not fully done, see:
 /// https://github.com/tari-project/tari-ootle/blob/development/dan_layer/transaction/src/transaction.rs
 export class TransactionRequest implements Transaction {
@@ -29,10 +28,8 @@ export class TransactionRequest implements Transaction {
         signature: {
           public_nonce: "",
           signature: "",
-        }
+        },
       },
-      // Inputs filled by some authority. These are not part of the transaction hash nor the signature
-      filled_inputs: []
     };
   }
 
@@ -60,14 +57,6 @@ export class TransactionRequest implements Transaction {
     return this.V1.body.transaction.inputs;
   }
 
-  getFilledInputs(): VersionedSubstateId[] {
-    return this.V1.filled_inputs;
-  }
-
-  getFilledInputsMut(): VersionedSubstateId[] {
-    return this.V1.filled_inputs;
-  }
-
   getMinEpoch(): Epoch | null {
     return this.V1.body.transaction.min_epoch;
   }

package/packages/indexer_provider/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tari-project/indexer-provider",
-  "version": "0.8.0",
+  "version": "0.9.0",
   "description": "",
   "type": "module",
   "publishConfig": {

package/packages/metamask_signer/package.json

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

package/packages/metamask_signer/src/index.ts

@@ -1,7 +1,6 @@
 import { TariSigner } from "@tari-project/tari-signer";
 import {
   SubmitTransactionRequest,
-  TransactionResult,
   TransactionStatus,
   SubmitTransactionResponse,
   VaultBalances,
@@ -99,11 +98,11 @@ export class MetamaskTariSigner implements TariSigner {
   }
 
   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 res = (await this.metamaskRequest("listSubstates", {
       filter_by_template,
       filter_by_type,
@@ -115,13 +114,7 @@ export class MetamaskTariSigner implements TariSigner {
   }
 
   async submitTransaction(req: SubmitTransactionRequest): Promise<SubmitTransactionResponse> {
-    const params = {
-      instructions: req.instructions,
-      fee_instructions: req.fee_instructions,
-      input_refs: req.input_refs,
-      required_substates: req.required_substates || [],
-      is_dry_run: req.is_dry_run,
-    };
+    const params = req.transaction;
 
     const resp = await this.metamaskRequest<any>("sendTransaction", params);
     if (!resp) {
@@ -173,11 +166,11 @@ export class MetamaskTariSigner implements TariSigner {
   }
 
   public async getConfidentialVaultBalances({
-    vault_id,
-    maximum_expected_value,
-    minimum_expected_value,
-    view_key_id,
-  }: ConfidentialViewVaultBalanceRequest): Promise<VaultBalances> {
+                                              vault_id,
+                                              maximum_expected_value,
+                                              minimum_expected_value,
+                                              view_key_id,
+                                            }: ConfidentialViewVaultBalanceRequest): Promise<VaultBalances> {
     const resp = await this.metamaskRequest("getConfidentialVaultBalances", {
       view_key_id,
       vault_id,

package/packages/tari_permissions/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tari-project/tari-permissions",
-  "version": "0.8.0",
+  "version": "0.9.0",
   "description": "",
   "type": "module",
   "publishConfig": {

package/packages/tari_provider/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tari-project/tari-provider",
-  "version": "0.8.0",
+  "version": "0.9.0",
   "description": "",
   "type": "module",
   "publishConfig": {

package/packages/tari_signer/package.json

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

package/packages/tari_universe/package.json

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

package/packages/tarijs/package.json

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

package/packages/tarijs/src/index.ts

@@ -21,12 +21,10 @@ import {
   TransactionStatus,
   GetTransactionResultResponse,
   AccountData,
-  SubmitTransactionResponse,
   SubmitTransactionRequest,
   VaultBalances,
   VaultData,
   TemplateDefinition,
-  SubstateRequirement,
   Substate,
   Network,
   fromHexString,
@@ -48,12 +46,10 @@ export {
   AccountData,
   TransactionStatus,
   GetTransactionResultResponse,
-  SubmitTransactionResponse,
   SubmitTransactionRequest,
   VaultBalances,
   VaultData,
   TemplateDefinition,
-  SubstateRequirement,
   MetamaskTariSigner,
   WalletDaemonTariSigner,
   WalletDaemonParameters,

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

@@ -12,6 +12,7 @@ import {
   waitForTransactionResult,
   WalletDaemonTariSigner,
 } from "../../../src";
+import { Instruction, SubstateId } from "@tari-project/typescript-bindings";
 
 function buildSigner(): Promise<WalletDaemonTariSigner> {
   const permissions = new TariPermissions().addPermission("Admin");
@@ -102,21 +103,21 @@ describe("WalletDaemonTariSigner", () => {
             args: [`Amount(${fee})`],
           },
         },
-      ];
+      ] as Instruction[];
 
       const request: SubmitTransactionRequest = {
-        network: Network.LocalNet,
-        account_id: account.account_id,
-        fee_instructions,
-        instructions: [],
-        inputs: [],
-        input_refs: [],
-        required_substates: [],
-        is_dry_run: false,
-        min_epoch: null,
-        max_epoch: null,
-        is_seal_signer_authorized: true,
+        transaction: {
+          network: Network.LocalNet,
+          fee_instructions,
+          instructions: [],
+          inputs: [],
+          dry_run: false,
+          min_epoch: null,
+          max_epoch: null,
+          is_seal_signer_authorized: true,
+        },
         detect_inputs_use_unversioned: true,
+        account_id: account.account_id,
       };
       const result = await signer.submitTransaction(request);
 
@@ -130,24 +131,24 @@ describe("WalletDaemonTariSigner", () => {
       const account = await signer.getAccount();
 
       const request: SubmitTransactionRequest = {
-        network: Network.LocalNet,
-        account_id: account.account_id,
-        fee_instructions: [],
-        instructions: [
-          {
-            EmitLog: {
-              level: "Info",
-              message: "From Integration Test",
+        transaction: {
+          network: Network.LocalNet,
+          fee_instructions: [],
+          instructions: [
+            {
+              EmitLog: {
+                level: "Info",
+                message: "From Integration Test",
+              },
             },
-          },
-        ],
-        inputs: [],
-        input_refs: [],
-        required_substates: [],
-        is_dry_run: true,
-        min_epoch: null,
-        max_epoch: null,
-        is_seal_signer_authorized: true,
+          ],
+          inputs: [],
+          dry_run: true,
+          min_epoch: null,
+          max_epoch: null,
+          is_seal_signer_authorized: true,
+        },
+        account_id: account.account_id,
         detect_inputs_use_unversioned: true,
       };
       const result = await signer.submitTransaction(request);
@@ -163,7 +164,8 @@ describe("WalletDaemonTariSigner", () => {
       const xtrAddress = account.resources[0].resource_address;
 
       const fee = new Amount(2000);
-      const builder = new TransactionBuilder();
+      const network = Network.LocalNet;
+      const builder = new TransactionBuilder(network);
       builder.feeTransactionPayFromComponent(account.address, fee.getStringValue());
 
       builder.callMethod(
@@ -181,19 +183,12 @@ describe("WalletDaemonTariSigner", () => {
         },
         [workspaceId],
       );
-      const transaction = builder.build();
+      builder.addInput({ substate_id: { Component: account.address }, version: null });
+      const transaction = builder.buildUnsignedTransaction();
 
-      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);
@@ -212,9 +207,9 @@ describe("WalletDaemonTariSigner", () => {
 
       assert(
         accountBalances &&
-          typeof accountBalances === "object" &&
-          "balances" in accountBalances &&
-          accountBalances.balances,
+        typeof accountBalances === "object" &&
+        "balances" in accountBalances &&
+        accountBalances.balances,
         "accountBalances is not an object",
       );
       assert(Array.isArray(accountBalances.balances), "accountBalances.balances is not an array");

package/packages/tarijs_types/package.json

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

package/packages/tarijs_types/src/SubstateDiff.ts

@@ -3,7 +3,3 @@ import { Substate, SubstateId } from "@tari-project/typescript-bindings";
 export type UpSubstates = Array<[SubstateId, Substate]>;
 export type DownSubstates = Array<[SubstateId, number]>;
 
-export interface SubstateDiff {
-  up_substates: UpSubstates;
-  down_substates: DownSubstates;
-}

package/packages/tarijs_types/src/TransactionResult.ts

@@ -1,7 +1,6 @@
 import { TransactionStatus } from "./TransactionStatus";
-import { FinalizeResult } from "./FinalizeResult";
 import { DownSubstates, UpSubstates } from "./SubstateDiff";
-import { ComponentAddress } from "@tari-project/typescript-bindings";
+import { ComponentAddress, FinalizeResult, TransactionResult } from "@tari-project/typescript-bindings";
 
 export type SubmitTransactionResponse = {
   transaction_id: string;
@@ -13,15 +12,10 @@ export interface SubmitTxResult {
   upSubstates: UpSubstates;
   downSubstates: DownSubstates;
   newComponents: UpSubstates;
+
   getComponentForTemplate(templateAddress: string): ComponentAddress | null;
 }
 
-export type TransactionResult = {
-  transaction_id: string;
-  status: TransactionStatus;
-  result: FinalizeResult | null;
-};
-
 export type TransactionResultResponse = {
   transaction_id: string;
   status: TransactionStatus;

package/packages/tarijs_types/src/TransactionStatus.ts

@@ -1,9 +1,9 @@
 export enum TransactionStatus {
-  New,
-  DryRun,
-  Pending,
-  Accepted,
-  Rejected,
-  InvalidTransaction,
-  OnlyFeeAccepted,
+  New = "New",
+  DryRun = "DryRun",
+  Pending = "Pending",
+  Accepted = "Accepted",
+  Rejected = "Rejected",
+  InvalidTransaction = "InvalidTransaction",
+  OnlyFeeAccepted = "OnlyFeeAccepted",
 }

package/packages/tarijs_types/src/helpers/txResult.ts

@@ -1,5 +1,4 @@
 import {
-  SubstateDiff,
   VaultId,
   Vault,
   SubstateId,
@@ -7,11 +6,9 @@ import {
   ResourceContainer,
   ResourceAddress,
   Amount,
-  RejectReason,
   substateIdToString,
-  ComponentAddress,
+  ComponentAddress, FinalizeResult,
 } from "@tari-project/typescript-bindings";
-import { FinalizeResultStatus } from "../FinalizeResult";
 import { UpSubstates } from "../SubstateDiff";
 
 function isOfType<T extends object>(obj: T, key: keyof T): boolean {
@@ -19,8 +16,8 @@ function isOfType<T extends object>(obj: T, key: keyof T): boolean {
 }
 
 export const txResultCheck = {
-  isAccept: (result: FinalizeResultStatus): result is { Accept: SubstateDiff } => {
-    return "Accept" in result;
+  isAccept: (result: FinalizeResult) => {
+    return "Accept" in result.result;
   },
 
   isVaultId: (substateId: SubstateId): substateId is { Vault: VaultId } => {
@@ -37,13 +34,13 @@ export const txResultCheck = {
     return "Fungible" in resourceContainer;
   },
 
-  isReject: (result: FinalizeResultStatus): result is { Reject: RejectReason } => {
-    return "Reject" in result;
+  isReject: (result: FinalizeResult): boolean => {
+    return "Reject" in result.result;
   },
   isAcceptFeeRejectRest: (
-    result: FinalizeResultStatus,
-  ): result is { AcceptFeeRejectRest: [SubstateDiff, RejectReason] } => {
-    return "AcceptFeeRejectRest" in result;
+    result: FinalizeResult,
+  ): boolean => {
+    return "AcceptFeeRejectRest" in result.result;
   },
 };
 

package/packages/tarijs_types/src/index.ts

@@ -4,29 +4,14 @@ export { TransactionArg } from "./TransactionArg";
 export { ConfidentialClaim } from "./ConfidentialClaim";
 export { ConfidentialOutput } from "./ConfidentialOutput";
 export { ConfidentialWithdrawProof } from "./ConfidentialWithdrawProof";
-export {
-  FinalizeResult,
-  FinalizeResultStatus,
-  TxResultAccept,
-  TxResultAcceptFeeRejectRest,
-  TxResultReject,
-} from "./FinalizeResult";
 export { GetTransactionResultResponse } from "./GetTransactionResultResponse";
-export { Instruction } from "./Instruction";
-export { Transaction } from "./Transaction";
-export { SubstateDiff, DownSubstates, UpSubstates } from "./SubstateDiff";
-export { SubstateRequirement } from "./SubstateRequirement";
+export { DownSubstates, UpSubstates } from "./SubstateDiff";
 export { SubstateType } from "./SubstateType";
 export {
-  TransactionResult,
-  SubmitTxResult,
   SubmitTransactionResponse,
-  TransactionResultResponse,
 } from "./TransactionResult";
 export { TransactionSignature } from "./TransactionSignature";
 export { TransactionStatus } from "./TransactionStatus";
-export { UnsignedTransaction } from "./UnsignedTransaction";
-export { VersionedSubstateId } from "./VersionedSubstateId";
 export { WorkspaceArg } from "./Workspace";
 export { ListAccountNftFromBalancesRequest } from "./ListAccountNftFromBalancesRequest";
 export { Network } from "./network";

package/packages/tarijs_types/src/signer.ts

@@ -1,4 +1,8 @@
-import { SubstateType, TemplateDef } from "@tari-project/typescript-bindings";
+import {
+  SubstateType,
+  TemplateDef,
+  UnsignedTransactionV1,
+} from "@tari-project/typescript-bindings";
 
 export type SubstateMetadata = {
   substate_id: string;
@@ -13,17 +17,8 @@ export type ReqSubstate = {
 };
 
 export type SubmitTransactionRequest = {
-  network: number;
+  transaction: UnsignedTransactionV1,
   account_id: number;
-  instructions: object[];
-  fee_instructions: object[];
-  inputs: object[];
-  input_refs: object[];
-  required_substates: ReqSubstate[];
-  is_dry_run: boolean;
-  min_epoch: number | null;
-  max_epoch: number | null;
-  is_seal_signer_authorized: boolean;
   detect_inputs_use_unversioned: boolean;
 };
 

package/packages/wallet_daemon/package.json

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

package/packages/wallet_daemon/src/signer.ts

@@ -173,29 +173,15 @@ export class WalletDaemonTariSigner implements TariSigner {
   public async submitTransaction(req: SubmitTransactionRequest): Promise<SubmitTransactionResponse> {
     const params = {
       transaction: {
-        V1: {
-          network: req.network,
-          instructions: req.instructions as Instruction[],
-          fee_instructions: req.fee_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,
-          dry_run: req.is_dry_run,
-          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,
     };
 
-    const res = req.is_dry_run
+    const res = req.transaction.dry_run
       ? await this.client.submitTransactionDryRun(params)
       : await this.client.submitTransaction(params);
     return { transaction_id: res.transaction_id };
@@ -222,11 +208,11 @@ export class WalletDaemonTariSigner implements TariSigner {
   }
 
   public 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 res = await this.client.viewVaultBalance({
       view_key_id,
       vault_id,
@@ -237,11 +223,11 @@ export class WalletDaemonTariSigner 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 resp = await this.client.substatesList({
       filter_by_template,
       filter_by_type,

package/packages/wallet_daemon/src/webrtc.ts

@@ -1,7 +1,7 @@
 import { TariPermissions } from "@tari-project/tari-permissions";
 import { transports } from "@tari-project/wallet_jrpc_client";
 
-class SignaligServer {
+class SignalingServer {
   private _token?: string;
   private _server_url: string;
 
@@ -72,7 +72,7 @@ class SignaligServer {
 export class TariConnection {
   private _peerConnection: RTCPeerConnection;
   private _dataChannel: RTCDataChannel;
-  private _signalingServer: SignaligServer;
+  private _signalingServer: SignalingServer;
   private _callbacks: { [key: string]: any[] };
   private _offer?: RTCSessionDescriptionInit;
   private _walletToken: string | undefined;
@@ -83,7 +83,7 @@ export class TariConnection {
   constructor(signalig_server_url?: string, config?: RTCConfiguration) {
     this._peerConnection = new RTCPeerConnection(config || this.config());
     this._dataChannel = this._peerConnection.createDataChannel("tari-data");
-    this._signalingServer = new SignaligServer(signalig_server_url);
+    this._signalingServer = new SignalingServer(signalig_server_url);
     this._callbacks = {};
   }
 

package/packages/walletconnect/package.json

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

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,26 +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,
-          dry_run: req.is_dry_run,
-          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,
@@ -244,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,7 +8,7 @@ catalog:
   vitest: ^3.0.4
   vite: ^6.1.0
   "@types/node": ^22.13.1
-  "@tari-project/typescript-bindings": ">=1.9.0"
+  "@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

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,40 +0,0 @@
-import { ComponentAddress, ResourceAddress, LogLevel, PublishedTemplateAddress, SubstateType, WorkspaceOffsetId } 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
-  | AssertBucketContains;
-
-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 };
-};
-export type AssertBucketContains = {
-  AssertBucketContains: { key: WorkspaceOffsetId; resource_address: ResourceAddress; min_amount: Amount };
-}

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;
-}