@tari-project/tarijs 0.5.3 → 0.5.4

package/docusaurus/tari-docs/docs/signers/wallet-connect.md

@@ -16,10 +16,6 @@ npm install @tari-project/wallet-connect-signer
 
 Establishing connection requires multiple steps.
 
-## Obtain WalletConnect Project ID
-
-Obtain a WalletConnect Project ID by registering your project on the WalletConnect Cloud. This ID is then used to connect your dApp to the WalletConnect infrastructure, facilitating communication between the dApp and user wallets.
-
 ## Request a connection and display wallet connect dialog
 
 ```js

package/package.json

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

package/packages/builders/package.json

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

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

@@ -6,12 +6,12 @@ import {
   TransactionStatus,
   DownSubstates,
   UpSubstates,
-  FinalizeResultStatus,
-  TxResultAccept,
   SubmitTxResult,
   ReqSubstate,
   SubmitTransactionRequest,
+  ComponentAddress,
 } from "@tari-project/tarijs-types";
+import { getSubstateValueFromUpSubstates, substateIdToString, txResultCheck } from "@tari-project/tarijs-types";
 
 export function buildTransactionRequest(
   transaction: Transaction,
@@ -46,10 +46,30 @@ export async function submitAndWaitForTransaction(
   try {
     const response = await signer.submitTransaction(req);
     const result = await waitForTransactionResult(signer, response.transaction_id);
+    const { upSubstates, downSubstates } = getAcceptResultSubstates(result);
+    const newComponents = getSubstateValueFromUpSubstates("Component", upSubstates);
+
+    function getComponentForTemplate(templateAddress: string): ComponentAddress | null {
+      for (const [substateId, substate] of upSubstates) {
+        if ("Component" in substate.substate) {
+          const templateAddr = substate.substate.Component.template_address;
+          const templateString =
+            typeof templateAddr === "string" ? templateAddr : new TextDecoder().decode(templateAddr);
+          if (templateAddress === templateString) {
+            return substateIdToString(substateId);
+          }
+        }
+      }
+      return null;
+    }
 
     return {
       response,
       result,
+      upSubstates,
+      downSubstates,
+      newComponents,
+      getComponentForTemplate,
     };
   } catch (e) {
     throw new Error(`Transaction failed: ${e}`);
@@ -81,17 +101,20 @@ export async function waitForTransactionResult(
   }
 }
 
-export function getAcceptResultSubstates(
-  txResult: TransactionResult,
-): { upSubstates: UpSubstates; downSubstates: DownSubstates } | undefined {
+export function getAcceptResultSubstates(txResult: TransactionResult): {
+  upSubstates: UpSubstates;
+  downSubstates: DownSubstates;
+} {
   const result = txResult.result?.result;
 
-  if (result && isAccept(result)) {
+  if (result && txResultCheck.isAcceptFeeRejectRest(result)) {
+    return {
+      upSubstates: result.AcceptFeeRejectRest[0].up_substates,
+      downSubstates: result.AcceptFeeRejectRest[0].down_substates,
+    };
+  }
+  if (result && txResultCheck.isAccept(result)) {
     return { upSubstates: result.Accept.up_substates, downSubstates: result.Accept.down_substates };
   }
-  return undefined;
-}
-
-function isAccept(result: FinalizeResultStatus): result is TxResultAccept {
-  return "Accept" in result;
+  return { upSubstates: [], downSubstates: [] };
 }

package/packages/tari_universe/package.json

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

package/packages/tari_universe/src/signer.ts

@@ -75,7 +75,7 @@ export class TariUniverseSigner implements TariSigner {
     });
   }
 
-  public async createFreeTestCoins(): Promise<void> {
+  public async createFreeTestCoins(): Promise<AccountData> {
     return this.sendRequest({ methodName: "createFreeTestCoins", args: [] });
   }
 

package/packages/tarijs/package.json

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

package/packages/tarijs_types/package.json

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

package/packages/tarijs_types/src/TransactionResult.ts

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

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

@@ -1,6 +1,7 @@
 import { NonFungibleId, NonFungibleToken, ResourceAddress } from "@tari-project/typescript-bindings";
 import { TransactionStatus } from "../TransactionStatus";
 export { fromHexString, toHexString } from "./hexString";
+export { txResultCheck, getSubstateValueFromUpSubstates, getComponentsForTemplate } from "./txResult";
 export { BinaryTag, CborValue, convertTaggedValue, getCborValueByPath, parseCbor } from "./cbor";
 export {
   substateIdToString,

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

@@ -0,0 +1,75 @@
+import {
+  SubstateDiff,
+  VaultId,
+  Vault,
+  SubstateId,
+  SubstateValue,
+  ResourceContainer,
+  ResourceAddress,
+  Amount,
+  RejectReason,
+  substateIdToString,
+  ComponentAddress,
+} from "@tari-project/typescript-bindings";
+import { FinalizeResultStatus } from "../FinalizeResult";
+import { UpSubstates } from "../SubstateDiff";
+
+function isOfType<T extends object>(obj: T, key: keyof T): boolean {
+  return obj !== null && typeof obj === "object" && key in obj;
+}
+
+export const txResultCheck = {
+  isAccept: (result: FinalizeResultStatus): result is { Accept: SubstateDiff } => {
+    return "Accept" in result;
+  },
+
+  isVaultId: (substateId: SubstateId): substateId is { Vault: VaultId } => {
+    return isOfType(substateId, "Vault" as keyof SubstateId);
+  },
+
+  isVaultSubstate: (substate: SubstateValue): substate is { Vault: Vault } => {
+    return "Vault" in substate;
+  },
+
+  isFungible: (
+    resourceContainer: ResourceContainer,
+  ): resourceContainer is { Fungible: { address: ResourceAddress; amount: Amount; locked_amount: Amount } } => {
+    return "Fungible" in resourceContainer;
+  },
+
+  isReject: (result: FinalizeResultStatus): result is { Reject: RejectReason } => {
+    return "Reject" in result;
+  },
+  isAcceptFeeRejectRest: (
+    result: FinalizeResultStatus,
+  ): result is { AcceptFeeRejectRest: [SubstateDiff, RejectReason] } => {
+    return "AcceptFeeRejectRest" in result;
+  },
+};
+
+export function getSubstateValueFromUpSubstates(
+  substateType: keyof SubstateValue | string,
+  upSubstates: UpSubstates,
+): UpSubstates {
+  const components: UpSubstates = [];
+  for (const [substateId, substate] of upSubstates) {
+    if (substateType in substate.substate) {
+      components.push([substateId, substate]);
+    }
+  }
+  return components;
+}
+
+export function getComponentsForTemplate(templateAddress: string, upSubstates: UpSubstates): ComponentAddress[] | null {
+  const components: ComponentAddress[] = [];
+  const templateAddressBytes = new TextEncoder().encode(templateAddress);
+  for (const [substateId, substate] of upSubstates) {
+    if ("Component" in substate.substate) {
+      const componentHeader = substate.substate.Component;
+      if (componentHeader.template_address === templateAddressBytes) {
+        components.push(substateIdToString(substateId));
+      }
+    }
+  }
+  return components;
+}

package/packages/tarijs_types/src/index.ts

@@ -16,7 +16,12 @@ export { Instruction } from "./Instruction";
 export { Transaction } from "./Transaction";
 export { SubstateDiff, DownSubstates, UpSubstates } from "./SubstateDiff";
 export { SubstateRequirement } from "./SubstateRequirement";
-export { TransactionResult, SubmitTxResult, SubmitTransactionResponse } from "./TransactionResult";
+export {
+  TransactionResult,
+  SubmitTxResult,
+  SubmitTransactionResponse,
+  TransactionResultResponse,
+} from "./TransactionResult";
 export { TransactionSignature } from "./TransactionSignature";
 export { TransactionStatus } from "./TransactionStatus";
 export { UnsignedTransaction } from "./UnsignedTransaction";
@@ -57,6 +62,9 @@ export {
   convertTaggedValue,
   getCborValueByPath,
   parseCbor,
+  getSubstateValueFromUpSubstates,
+  getComponentsForTemplate,
+  txResultCheck,
   BinaryTag,
   CborValue,
 } from "./helpers";

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.1
-  "@tari-project/wallet_jrpc_client": ^1.5.1
+  "@tari-project/typescript-bindings": ^1.5.2
+  "@tari-project/wallet_jrpc_client": ^1.5.2
   "@metamask/providers": ^18.2.0
   "@walletconnect/universal-provider": ^2.13.3
   "@walletconnect/modal": ^2.6.2