@tari-project/tarijs 0.6.0 → 0.9.0

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,
@@ -227,7 +220,7 @@ export class MetamaskTariSigner implements TariSigner {
 }
 
 function convertToStatus(result: any): TransactionStatus {
-  // Ref: https://github.com/tari-project/tari-dan/blob/bb0b31139b770aacd7bb49af865543aa4a9e2de4/dan_layer/wallet/sdk/src/apis/transaction.rs
+  // Ref: https://github.com/tari-project/tari-ootle/blob/bb0b31139b770aacd7bb49af865543aa4a9e2de4/dan_layer/wallet/sdk/src/apis/transaction.rs
   if (result.final_decision !== "Commit") {
     return TransactionStatus.Rejected;
   }

package/packages/tari_permissions/package.json

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

package/packages/tari_permissions/src/tari_permissions.ts

@@ -102,17 +102,6 @@ export class NonFungibleAddress {
   }
 }
 
-export class NonFungibleIndexAddress {
-  private resource_address: ResourceAddress;
-  private index: number;
-  constructor(resource_address: ResourceAddress, index: number) {
-    this.resource_address = resource_address;
-    this.index = index;
-  }
-  toJSON() {
-    return { resource_address: this.resource_address, index: this.index };
-  }
-}
 
 export class ComponentAddress {
   private tagged: Tagged;
@@ -139,8 +128,7 @@ export type SubstateAddressType =
   | ComponentAddress
   | VaultId
   | UnclaimedConfidentialOutputAddress
-  | NonFungibleAddress
-  | NonFungibleIndexAddress;
+  | NonFungibleAddress;
 
 export class SubstateAddress {
   private value: SubstateAddressType;
@@ -156,10 +144,6 @@ export class SubstateAddress {
       return { Vault: this.value };
     } else if (this.value instanceof UnclaimedConfidentialOutputAddress) {
       return { UnclaimedConfidentialOutput: this.value };
-    } else if (this.value instanceof NonFungibleAddress) {
-      return { NonFungible: this.value };
-    } else if (this.value instanceof NonFungibleIndexAddress) {
-      return { NonFungibleIndex: this.value };
     }
     throw "Unknown type";
   }

package/packages/tari_provider/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tari-project/tari-provider",
-  "version": "0.6.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.6.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.6.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.6.0",
+  "version": "0.9.0",
   "description": "",
   "type": "module",
   "publishConfig": {

package/packages/tarijs/src/index.ts

@@ -11,8 +11,6 @@ import {
   buildTransactionRequest,
   submitAndWaitForTransaction,
   waitForTransactionResult,
-  fromWorkspace,
-  toWorkspace,
 } from "@tari-project/tarijs-builders";
 import {
   convertStringToTransactionStatus,
@@ -23,12 +21,10 @@ import {
   TransactionStatus,
   GetTransactionResultResponse,
   AccountData,
-  SubmitTransactionResponse,
   SubmitTransactionRequest,
   VaultBalances,
   VaultData,
   TemplateDefinition,
-  SubstateRequirement,
   Substate,
   Network,
   fromHexString,
@@ -50,12 +46,10 @@ export {
   AccountData,
   TransactionStatus,
   GetTransactionResultResponse,
-  SubmitTransactionResponse,
   SubmitTransactionRequest,
   VaultBalances,
   VaultData,
   TemplateDefinition,
-  SubstateRequirement,
   MetamaskTariSigner,
   WalletDaemonTariSigner,
   WalletDaemonParameters,
@@ -73,8 +67,6 @@ export {
   buildTransactionRequest,
   submitAndWaitForTransaction,
   waitForTransactionResult,
-  fromWorkspace,
-  toWorkspace,
   convertHexStringToU256Array,
   convertU256ToHexString,
   createNftAddressFromResource,

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

@@ -3,7 +3,6 @@ import { assert, describe, expect, it } from "vitest";
 import {
   Amount,
   buildTransactionRequest,
-  fromWorkspace,
   Network,
   submitAndWaitForTransaction,
   SubmitTransactionRequest,
@@ -13,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");
@@ -103,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);
 
@@ -131,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);
@@ -164,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(
@@ -180,21 +181,14 @@ describe("WalletDaemonTariSigner", () => {
           componentAddress: account.address,
           methodName: "deposit",
         },
-        [fromWorkspace(workspaceId)],
+        [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);
@@ -213,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");
@@ -338,4 +332,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.6.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/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/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.6.0",
+  "version": "0.9.0",
   "description": "",
   "type": "module",
   "publishConfig": {

package/packages/wallet_daemon/src/signer.ts

@@ -173,28 +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,
-          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 };
@@ -221,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,
@@ -236,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.6.0",
+  "version": "0.9.0",
   "description": "",
   "type": "module",
   "publishConfig": {