@tari-project/tarijs 0.4.1 → 0.5.0

package/packages/wallet_daemon/src/{provider.ts → signer.ts}

@@ -1,15 +1,16 @@
 import { TariPermissions } from "@tari-project/tari-permissions";
 import { TariConnection } from "./webrtc";
-import { TariProvider } from "@tari-project/tari-provider";
 import {
   SubmitTransactionRequest,
   TransactionResult,
-  TransactionStatus,
   SubmitTransactionResponse,
-  VaultBalances, TemplateDefinition, Substate,
+  VaultBalances,
+  TemplateDefinition,
+  Substate,
   ListSubstatesResponse,
-} from "@tari-project/tari-provider";
-import { Account } from "@tari-project/tari-provider";
+  TariSigner,
+} from "@tari-project/tari-signer";
+import { Account } from "@tari-project/tari-signer";
 import {
   WalletDaemonClient,
   substateIdToString,
@@ -18,30 +19,33 @@ import {
   SubstatesListRequest,
   KeyBranch,
   SubstateId,
+  ListAccountNftRequest,
+  ListAccountNftResponse,
 } from "@tari-project/wallet_jrpc_client";
 import { WebRtcRpcTransport } from "./webrtc_transport";
+import { convertStringToTransactionStatus } from "@tari-project/tarijs-types";
 
 export const WalletDaemonNotConnected = "WALLET_DAEMON_NOT_CONNECTED";
 export const Unsupported = "UNSUPPORTED";
 
 export interface WalletDaemonBaseParameters {
-  permissions: TariPermissions,
-  optionalPermissions?: TariPermissions,
-  onConnection?: () => void
+  permissions: TariPermissions;
+  optionalPermissions?: TariPermissions;
+  onConnection?: () => void;
 }
 
 export interface WalletDaemonParameters extends WalletDaemonBaseParameters {
-  signalingServerUrl?: string,
-  webRtcConfig?: RTCConfiguration,
-  name?: string,
-};
+  signalingServerUrl?: string;
+  webRtcConfig?: RTCConfiguration;
+  name?: string;
+}
 
 export interface WalletDaemonFetchParameters extends WalletDaemonBaseParameters {
-  serverUrl: string,
+  serverUrl: string;
 }
 
-export class WalletDaemonTariProvider implements TariProvider {
-  public providerName = "WalletDaemon";
+export class WalletDaemonTariSigner implements TariSigner {
+  public signerName = "WalletDaemon";
   params: WalletDaemonParameters;
   client: WalletDaemonClient;
 
@@ -50,8 +54,8 @@ export class WalletDaemonTariProvider implements TariProvider {
     this.client = connection;
   }
 
-  static async build(params: WalletDaemonParameters): Promise<WalletDaemonTariProvider> {
-    const allPermissions = WalletDaemonTariProvider.buildPermissions(params);
+  static async build(params: WalletDaemonParameters): Promise<WalletDaemonTariSigner> {
+    const allPermissions = WalletDaemonTariSigner.buildPermissions(params);
     let connection = new TariConnection(params.signalingServerUrl, params.webRtcConfig);
     const client = WalletDaemonClient.new(WebRtcRpcTransport.new(connection));
     await connection.init(allPermissions, (conn) => {
@@ -60,19 +64,19 @@ export class WalletDaemonTariProvider implements TariProvider {
         client.setToken(conn.token);
       }
     });
-    return new WalletDaemonTariProvider(params, client);
+    return new WalletDaemonTariSigner(params, client);
   }
 
-  static async buildFetchProvider(params: WalletDaemonFetchParameters) {
-    const allPermissions = WalletDaemonTariProvider.buildPermissions(params);
+  static async buildFetchSigner(params: WalletDaemonFetchParameters) {
+    const allPermissions = WalletDaemonTariSigner.buildPermissions(params);
     const client = WalletDaemonClient.usingFetchTransport(params.serverUrl);
 
-    const plainPermissions = allPermissions.toJSON().flatMap((p) => typeof (p) === "string" ? [p] : []);
+    const plainPermissions = allPermissions.toJSON().flatMap((p) => (typeof p === "string" ? [p] : []));
     const authResponse = await client.authRequest(plainPermissions);
     await client.authAccept(authResponse, "WalletDaemon");
 
     params.onConnection?.();
-    return new WalletDaemonTariProvider(params, client);
+    return new WalletDaemonTariSigner(params, client);
   }
 
   private static buildPermissions(params: WalletDaemonBaseParameters): TariPermissions {
@@ -98,7 +102,7 @@ export class WalletDaemonTariProvider implements TariProvider {
       return undefined;
     }
 
-    const name = this.params.name && encodeURIComponent(this.params.name) || "";
+    const name = (this.params.name && encodeURIComponent(this.params.name)) || "";
     const token = this.token;
     const permissions = JSON.stringify(this.params.permissions);
     const optionalPermissions = JSON.stringify(this.params.optionalPermissions);
@@ -126,7 +130,7 @@ export class WalletDaemonTariProvider implements TariProvider {
   }
 
   public async getAccount(): Promise<Account> {
-    const { account, public_key } = await this.client.accountsGetDefault({}) as any;
+    const { account, public_key } = (await this.client.accountsGetDefault({})) as any;
     const address = typeof account.address === "object" ? account.address.Component : account.address;
     const { balances } = await this.client.accountsGetBalances({
       account: { ComponentAddress: address },
@@ -142,7 +146,8 @@ export class WalletDaemonTariProvider implements TariProvider {
         type: b.resource_type,
         resource_address: b.resource_address,
         balance: b.balance + b.confidential_balance,
-        vault_id: (typeof (b.vault_address) === "object" && "Vault" in b.vault_address) ? b.vault_address.Vault : b.vault_address,
+        vault_id:
+          typeof b.vault_address === "object" && "Vault" in b.vault_address ? b.vault_address.Vault : b.vault_address,
         token_symbol: b.token_symbol,
       })),
     };
@@ -212,7 +217,12 @@ export class WalletDaemonTariProvider implements TariProvider {
     return resp.template_definition as TemplateDefinition;
   }
 
-  public async getConfidentialVaultBalances(viewKeyId: number, vaultId: string, min: number | null = null, max: number | null = null): Promise<VaultBalances> {
+  public async getConfidentialVaultBalances(
+    viewKeyId: number,
+    vaultId: string,
+    min: number | null = null,
+    max: number | null = null,
+  ): Promise<VaultBalances> {
     const res = await this.client.viewVaultBalance({
       view_key_id: viewKeyId,
       vault_id: vaultId,
@@ -222,7 +232,12 @@ export class WalletDaemonTariProvider implements TariProvider {
     return { balances: res.balances as unknown as Map<string, number | null> };
   }
 
-  public async listSubstates(filter_by_template: string | null, filter_by_type: SubstateType | null, limit: number | null, offset: number | null): Promise<ListSubstatesResponse> {
+  public async listSubstates(
+    filter_by_template: string | null,
+    filter_by_type: SubstateType | null,
+    limit: number | null,
+    offset: number | null,
+  ): Promise<ListSubstatesResponse> {
     const resp = await this.client.substatesList({
       filter_by_template,
       filter_by_type,
@@ -239,25 +254,8 @@ export class WalletDaemonTariProvider implements TariProvider {
 
     return { substates };
   }
-}
 
-function convertStringToTransactionStatus(status: string): TransactionStatus {
-  switch (status) {
-    case "New":
-      return TransactionStatus.New;
-    case "DryRun":
-      return TransactionStatus.DryRun;
-    case "Pending":
-      return TransactionStatus.Pending;
-    case "Accepted":
-      return TransactionStatus.Accepted;
-    case "Rejected":
-      return TransactionStatus.Rejected;
-    case "InvalidTransaction":
-      return TransactionStatus.InvalidTransaction;
-    case "OnlyFeeAccepted":
-      return TransactionStatus.OnlyFeeAccepted;
-    default:
-      throw new Error(`Unknown status: ${status}`);
+  public async getNftsList(req: ListAccountNftRequest): Promise<ListAccountNftResponse> {
+    return await this.client.nftsList(req);
   }
-}
+}

package/packages/wallet_daemon/tsconfig.json

@@ -15,7 +15,10 @@
       "path": "../tari_permissions"
     },
     {
-      "path": "../tari_provider"
+      "path": "../tari_signer"
+    },
+    {
+      "path": "../tarijs_types"
     }
   ]
 }

package/packages/walletconnect/package.json

@@ -1,6 +1,6 @@
 {
-  "name": "@tari-project/wallet-connect-provider",
-  "version": "0.4.0",
+  "name": "@tari-project/wallet-connect-signer",
+  "version": "0.5.0",
   "description": "",
   "type": "module",
   "publishConfig": {
@@ -13,8 +13,9 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@tari-project/tari-provider": "workspace:^",
+    "@tari-project/tari-signer": "workspace:^",
     "@tari-project/tarijs-builders": "workspace:^",
+    "@tari-project/tarijs-types": "workspace:^",
     "@tari-project/typescript-bindings": "catalog:",
     "@tari-project/wallet_jrpc_client": "catalog:",
     "@walletconnect/modal": "catalog:",

package/packages/walletconnect/src/index.ts

@@ -1,24 +1,27 @@
 import {
-  TariProvider, SubmitTransactionRequest,
+  TariSigner,
+  SubmitTransactionRequest,
   TransactionResult,
   SubmitTransactionResponse,
-  VaultBalances, TemplateDefinition, Substate,
+  VaultBalances,
+  TemplateDefinition,
+  Substate,
   Account,
   ListSubstatesResponse,
-} from "@tari-project/tari-provider";
-import {
-  TransactionStatus,
-} from "@tari-project/tarijs-builders";
+} from "@tari-project/tari-signer";
 import UniversalProvider from "@walletconnect/universal-provider";
 import { WalletConnectModal } from "@walletconnect/modal";
 import {
   Instruction,
   KeyBranch,
+  ListAccountNftRequest,
+  ListAccountNftResponse,
   stringToSubstateId,
   substateIdToString,
   SubstateType,
   TransactionSubmitRequest,
 } from "@tari-project/wallet_jrpc_client";
+import { convertStringToTransactionStatus } from "@tari-project/tarijs-types";
 
 const walletConnectParams = {
   requiredNamespaces: {
@@ -34,17 +37,16 @@ const walletConnectParams = {
         "tari_viewConfidentialVaultBalance",
         "tari_createFreeTestCoins",
         "tari_listSubstates",
+        "tari_getNftsList",
       ],
-      chains: [
-        "tari:devnet",
-      ],
-      events: ["chainChanged\", \"accountsChanged"],
+      chains: ["tari:devnet"],
+      events: ['chainChanged", "accountsChanged'],
     },
   },
 };
 
-export class WalletConnectTariProvider implements TariProvider {
-  public providerName = "WalletConnect";
+export class WalletConnectTariSigner implements TariSigner {
+  public signerName = "WalletConnect";
   projectId: string;
   wcProvider: UniversalProvider | null;
   wcSession: any | null;
@@ -56,8 +58,7 @@ export class WalletConnectTariProvider implements TariProvider {
   }
 
   async connect(): Promise<void> {
-    if (this.wcProvider && this.wcSession)
-      return;
+    if (this.wcProvider && this.wcSession) return;
 
     // initialize WalletConnect
     const projectId = this.projectId;
@@ -109,7 +110,6 @@ export class WalletConnectTariProvider implements TariProvider {
     return requestResult;
   }
 
-
   isConnected(): boolean {
     // TODO: check status in the session
     return this.wcSession !== null;
@@ -117,11 +117,10 @@ export class WalletConnectTariProvider implements TariProvider {
 
   async getAccount(): Promise<Account> {
     const { account, public_key } = await this.sendRequest("tari_getDefaultAccount", {});
-    const { balances } = await this.sendRequest(
-      "tari_getAccountBalances",
-      {
-        account: { ComponentAddress: account.address }, refresh: false,
-      });
+    const { balances } = await this.sendRequest("tari_getAccountBalances", {
+      account: { ComponentAddress: account.address },
+      refresh: false,
+    });
 
     return {
       account_id: account.key_index,
@@ -132,7 +131,8 @@ export class WalletConnectTariProvider implements TariProvider {
         type: b.resource_type,
         resource_address: b.resource_address,
         balance: b.balance + b.confidential_balance,
-        vault_id: (typeof (b.vault_address) === "object" && "Vault" in b.vault_address) ? b.vault_address.Vault : b.vault_address,
+        vault_id:
+          typeof b.vault_address === "object" && "Vault" in b.vault_address ? b.vault_address.Vault : b.vault_address,
         token_symbol: b.token_symbol,
       })),
     };
@@ -151,7 +151,12 @@ export class WalletConnectTariProvider implements TariProvider {
     };
   }
 
-  public async listSubstates(filter_by_template: string | null, filter_by_type: SubstateType | null, limit: number | null, offset: number | null): Promise<ListSubstatesResponse> {
+  public async listSubstates(
+    filter_by_template: string | null,
+    filter_by_type: SubstateType | null,
+    limit: number | null,
+    offset: number | null,
+  ): Promise<ListSubstatesResponse> {
     const method = "tari_listSubstates";
     const params = {
       filter_by_template,
@@ -237,7 +242,12 @@ export class WalletConnectTariProvider implements TariProvider {
     return res.public_key;
   }
 
-  async getConfidentialVaultBalances(viewKeyId: number, vaultId: string, min: number | null, max: number | null): Promise<VaultBalances> {
+  async getConfidentialVaultBalances(
+    viewKeyId: number,
+    vaultId: string,
+    min: number | null,
+    max: number | null,
+  ): Promise<VaultBalances> {
     const method = "tari_viewConfidentialVaultBalance";
     const params = {
       view_key_id: viewKeyId,
@@ -250,25 +260,14 @@ export class WalletConnectTariProvider implements TariProvider {
     return { balances: res.balances as unknown as Map<string, number | null> };
   }
 
-}
-
-function convertStringToTransactionStatus(status: string): TransactionStatus {
-  switch (status) {
-    case "New":
-      return TransactionStatus.New;
-    case "DryRun":
-      return TransactionStatus.DryRun;
-    case "Pending":
-      return TransactionStatus.Pending;
-    case "Accepted":
-      return TransactionStatus.Accepted;
-    case "Rejected":
-      return TransactionStatus.Rejected;
-    case "InvalidTransaction":
-      return TransactionStatus.InvalidTransaction;
-    case "OnlyFeeAccepted":
-      return TransactionStatus.OnlyFeeAccepted;
-    default:
-      throw new Error(`Unknown status: ${status}`);
+  public async getNftsList(req: ListAccountNftRequest): Promise<ListAccountNftResponse> {
+    const method = "tari_getNftsList";
+    const params = {
+      account: req.account,
+      limit: req.limit,
+      offset: req.offset,
+    };
+    const res = await this.sendRequest(method, params);
+    return res as ListAccountNftResponse;
   }
 }

package/packages/walletconnect/tsconfig.json

@@ -15,7 +15,10 @@
       "path": "../builders"
     },
     {
-      "path": "../tari_provider"
+      "path": "../tari_signer"
+    },
+    {
+      "path": "../tarijs_types"
     }
   ]
 }

package/pnpm-workspace.yaml

@@ -1,14 +1,15 @@
 packages:
   - packages/*
   - apps/*
+  - docusaurus/*
   - "!**/test/**"
 catalog:
   typescript: ^5.0.4
   vitest: ^3.0.4
   vite: ^6.1.0
   "@types/node": ^22.13.1
-  "@tari-project/typescript-bindings": ^1.4.0
-  "@tari-project/wallet_jrpc_client": ^1.4.0
+  "@tari-project/typescript-bindings": ^1.5.1
+  "@tari-project/wallet_jrpc_client": ^1.5.1
   "@metamask/providers": ^18.2.0
   "@walletconnect/universal-provider": ^2.13.3
-  "@walletconnect/modal": ^2.6.2
+  "@walletconnect/modal": ^2.6.2

package/tsconfig.json

@@ -8,11 +8,17 @@
     "composite": true
   },
   "references": [
+    {
+      "path": "docusaurus/tari-docs"
+    },
     {
       "path": "packages/builders"
     },
     {
-      "path": "packages/metamask_provider"
+      "path": "packages/indexer_provider"
+    },
+    {
+      "path": "packages/metamask_signer"
     },
     {
       "path": "packages/tari_permissions"
@@ -20,6 +26,9 @@
     {
       "path": "packages/tari_provider"
     },
+    {
+      "path": "packages/tari_signer"
+    },
     {
       "path": "packages/tari_universe"
     },
@@ -30,7 +39,7 @@
       "path": "packages/tarijs_types"
     },
     {
-      "path": "packages/types"
+      "path": "packages/tarijs_types"
     },
     {
       "path": "packages/wallet_daemon"