@tari-project/tarijs 0.12.1 → 0.13.0

package/packages/wallet_daemon/src/webrtc.ts

@@ -26,12 +26,12 @@ class SignalingServer {
     console.log("jsonRpc", method, token, params);
     let id = 0;
     id += 1;
-    let address = this._server_url;
-    let headers: { [key: string]: string } = { "Content-Type": "application/json" };
+    const address = this._server_url;
+    const headers: { [key: string]: string } = { "Content-Type": "application/json" };
     if (token) {
       headers["Authorization"] = `Bearer ${token}`;
     }
-    let response = await fetch(address, {
+    const response = await fetch(address, {
       method: "POST",
       body: JSON.stringify({
         method: method,
@@ -41,7 +41,7 @@ class SignalingServer {
       }),
       headers: headers,
     });
-    let json = await response.json();
+    const json = await response.json();
     if (json.error) {
       throw json.error;
     }
@@ -99,7 +99,7 @@ export class TariConnection {
     await this._signalingServer.initToken(permissions);
     // Setup our receiving end
     this._dataChannel.onmessage = (message) => {
-      let response = JSON.parse(message.data);
+      const response = JSON.parse(message.data);
       console.log("response", response);
 
       if (!this._callbacks[response.id]) {
@@ -107,7 +107,7 @@ export class TariConnection {
         return;
       }
       // The response should contain id, to identify the Promise.resolve, that is waiting for this result
-      let [resolve, reject] = this._callbacks[response.id];
+      const [resolve, reject] = this._callbacks[response.id];
       delete this._callbacks[response.id];
       if (response.payload?.error) {
         reject(new Error(response.payload.error));
@@ -119,8 +119,8 @@ export class TariConnection {
       // This should be removed before the release, but it's good for debugging.
       console.log("Data channel is open!");
 
-      this.sendMessage({ id: 0, jsonrpc: "2.0", method: "get.token", params: {} }, this._signalingServer.token)
-        .then((walletToken: unknown) => {
+      this.sendMessage({ id: 0, jsonrpc: "2.0", method: "get.token", params: {} }, this._signalingServer.token).then(
+        (walletToken: unknown) => {
           if (typeof walletToken !== "string") {
             throw Error("Received invalid JWT from wallet daemon");
           }
@@ -131,7 +131,8 @@ export class TariConnection {
           if (this.onConnection) {
             this.onConnection(this);
           }
-        });
+        },
+      );
     };
     this._peerConnection.onicecandidate = (event) => {
       console.log("event", event);
@@ -160,13 +161,13 @@ export class TariConnection {
   private async setAnswer() {
     // This is called once the other end got the offer and ices and created and store an answer and its ice candidates
     // We get its answer sdp
-    let sdp = await this._signalingServer.getAnswer();
+    const sdp = await this._signalingServer.getAnswer();
 
     // And its ice candidates
-    let iceCandidates = await this._signalingServer.getIceCandidates();
+    const iceCandidates = await this._signalingServer.getIceCandidates();
 
     // For us the answer is remote sdp
-    let answer = new RTCSessionDescription({ sdp, type: "answer" });
+    const answer = new RTCSessionDescription({ sdp, type: "answer" });
     this._peerConnection.setRemoteDescription(answer);
 
     // We add all the ice candidates to connect, the other end is doing the same with our ice candidates
@@ -199,7 +200,11 @@ export class TariConnection {
   }
 
   // If the last parameter has timeout property e.g. {timeout:1000}, it set the timeout for this call.
-  async sendMessage<T>(request: transports.RpcRequest, token: string | undefined, timeout_secs: number | null = null): Promise<T> {
+  async sendMessage<T>(
+    request: transports.RpcRequest,
+    token: string | undefined,
+    timeout_secs: number | null = null,
+  ): Promise<T> {
     if (!this.isConnected) {
       throw new Error("WALLET_DAEMON_NOT_CONNECTED");
     }

package/packages/walletconnect/package.json

@@ -1,25 +1,25 @@
 {
   "name": "@tari-project/wallet-connect-signer",
-  "version": "0.12.1",
+  "version": "0.13.0",
   "description": "",
   "type": "module",
   "publishConfig": {
     "access": "public"
   },
   "scripts": {
-    "build": "tsc -b"
+    "build": "tsc -b",
+    "lint": "eslint src/"
   },
   "keywords": [],
   "author": "The Tari Community",
   "license": "ISC",
   "dependencies": {
+    "@reown/appkit": "catalog:",
+    "@tari-project/tari-permissions": "workspace:",
     "@tari-project/tari-signer": "workspace:^",
-    "@tari-project/tarijs-builders": "workspace:^",
+    "@tari-project/tarijs-builders": "workspace:*",
     "@tari-project/tarijs-types": "workspace:^",
     "@tari-project/typescript-bindings": "catalog:",
-    "@tari-project/wallet_jrpc_client": "catalog:",
-    "@tari-project/tari-permissions": "workspace:",
-    "@walletconnect/modal": "catalog:",
     "@walletconnect/universal-provider": "catalog:"
   },
   "devDependencies": {

package/packages/walletconnect/src/index.ts

@@ -1,6 +1,7 @@
 import { TariSigner } from "@tari-project/tari-signer";
 import UniversalProvider from "@walletconnect/universal-provider";
-import { WalletConnectModal } from "@walletconnect/modal";
+import { AppKitNetwork, mainnet, sepolia } from "@reown/appkit/networks";
+import { createAppKit } from "@reown/appkit/core";
 import {
   convertStringToTransactionStatus,
   GetTransactionResultResponse,
@@ -14,12 +15,16 @@ import {
   SubmitTransactionResponse,
 } from "@tari-project/tarijs-types";
 import {
+  AccountGetResponse,
+  AccountsListRequest,
+  AccountsListResponse,
   ConfidentialViewVaultBalanceRequest,
   KeyBranch,
   ListAccountNftRequest,
   ListAccountNftResponse,
   substateIdToString,
   TransactionSubmitRequest,
+  WalletGetInfoResponse,
 } from "@tari-project/typescript-bindings";
 import { TariPermission } from "@tari-project/tari-permissions";
 
@@ -38,6 +43,7 @@ const walletConnectParams = {
         "tari_createFreeTestCoins",
         "tari_listSubstates",
         "tari_getNftsList",
+        "tari_getWalletInfo",
       ],
       chains: ["tari:devnet"],
       events: [],
@@ -69,41 +75,54 @@ export class WalletConnectTariSigner implements TariSigner {
   }
 
   async connect(): Promise<() => Promise<void>> {
-    if (this.wcProvider && this.wcSession) return async () => {
-      // No-op if already connected
+    if (this.wcProvider && this.wcSession)
+      return async () => {
+        // No-op if already connected
+      };
+
+    const metadata = {
+      name: "Tari Universe",
+      description: "Tari Universe Wallet",
+      url: "https://www.tari.com",
+      icons: ["https://tari.com/assets/img/node-icon-alt.svg"],
     };
 
-    // initialize WalletConnect
     const projectId = this.params.projectId;
     const provider = await UniversalProvider.init({
       projectId,
       // TODO: parameterize the relay URL
       // relayUrl: "wss://relay.walletconnect.com",
+      metadata,
     });
 
     const sessionProperties = {
-      "required_permissions": JSON.stringify(this.params.requiredPermissions) || "[]",
-      "optional_permissions": JSON.stringify(this.params.optionalPermissions) || "[]",
+      required_permissions: JSON.stringify(this.params.requiredPermissions) || "[]",
+      optional_permissions: JSON.stringify(this.params.optionalPermissions) || "[]",
     };
     const connectParams = {
       ...walletConnectParams,
       sessionProperties,
     };
 
-    // open UI modal with the connection URI
+    const networks: [AppKitNetwork, ...AppKitNetwork[]] = [mainnet, sepolia];
+
     const { uri, approval } = await provider.client.connect(connectParams);
     return async () => {
-      const walletConnectModal = new WalletConnectModal({
-        projectId,
+      const walletConnectModal = createAppKit({
+        projectId: projectId,
+        networks: networks,
+        universalProvider: provider,
+        manualWCControl: true,
       });
+
       if (uri) {
-        await walletConnectModal.openModal({ uri });
+        await walletConnectModal.open({ uri });
       }
 
       // wait for the wallet to approve the connection
       console.log("waiting for session approval from the wallet app");
       const session = await approval();
-      walletConnectModal.closeModal();
+      walletConnectModal.close();
 
       // at this point session is open
       console.log("session approved by the wallet");
@@ -140,6 +159,11 @@ export class WalletConnectTariSigner implements TariSigner {
     return this.wcSession !== null;
   }
 
+  async accountsList(req: AccountsListRequest): Promise<AccountsListResponse> {
+    const res = await this.sendRequest("tari_accountsList", req);
+    return res as AccountsListResponse;
+  }
+
   async getAccount(): Promise<AccountData> {
     const { account, public_key } = await this.sendRequest("tari_getDefaultAccount", {});
     const { balances } = await this.sendRequest("tari_getAccountBalances", {
@@ -163,6 +187,15 @@ export class WalletConnectTariSigner implements TariSigner {
     };
   }
 
+  async getAccountByAddress(address: string): Promise<AccountGetResponse> {
+    const res = await this.sendRequest("tari_getAccountByAddress", {
+      name_or_address: {
+        ComponentAddress: address,
+      },
+    });
+    return res as AccountGetResponse;
+  }
+
   async getSubstate(substate_address: string): Promise<Substate> {
     const method = "tari_getSubstate";
     const params = { substate_id: substate_address };
@@ -177,11 +210,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,
@@ -245,7 +278,7 @@ export class WalletConnectTariSigner implements TariSigner {
   }
 
   async getTemplateDefinition(template_address: string): Promise<TemplateDefinition> {
-    let resp = await this.sendRequest("tari_getTemplate", { template_address });
+    const resp = await this.sendRequest("tari_getTemplate", { template_address });
     return resp.template_definition as TemplateDefinition;
   }
 
@@ -255,11 +288,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,
@@ -282,4 +315,9 @@ export class WalletConnectTariSigner implements TariSigner {
     const res = await this.sendRequest(method, params);
     return res as ListAccountNftResponse;
   }
+
+  public async getWalletInfo(): Promise<WalletGetInfoResponse> {
+    const res = await this.sendRequest("tari_getWalletInfo", {});
+    return res as WalletGetInfoResponse;
+  }
 }

package/pnpm-workspace.yaml

@@ -3,21 +3,21 @@ packages:
   - apps/*
   - docusaurus/*
   - examples/*
-  - '!**/test/**'
+  - "!**/test/**"
 
 catalog:
   typescript: ^5.0.4
   vitest: ^3.0.4
   vite: ^6.1.0
-  '@types/node': ^22.13.1
-  '@tari-project/typescript-bindings': '>=1.14.0'
-  '@tari-project/wallet_jrpc_client': ^1.7.2
-  '@metamask/providers': ^18.2.0
-  '@walletconnect/universal-provider': ^2.13.3
-  '@walletconnect/modal': ^2.6.2
+  "@types/node": ^22.13.1
+  "@tari-project/typescript-bindings": ">=1.15.0"
+  "@tari-project/wallet_jrpc_client": ^1.7.2
+  "@metamask/providers": ^18.2.0
+  "@walletconnect/universal-provider": 2.21.3 
+  "@reown/appkit": "1.7.15"
 
 onlyBuiltDependencies:
-  - '@moonrepo/cli'
+  - "@moonrepo/cli"
   - core-js
   - core-js-pure
   - esbuild

package/tsconfig.json

@@ -27,7 +27,7 @@
       "path": "packages/react-mui-connect-button"
     },
     {
-      "path": "packages/tari_permissions"
+      "path": "packages/permissions"
     },
     {
       "path": "packages/tari_provider"

package/typedoc.json

@@ -1,5 +1,6 @@
 {
-  "entryPoints": ["packages/builders/src/index.ts"], 
+  "entryPointStrategy": "packages",
+  "entryPoints": ["packages/*"],
   "out": "tsdocs/api",
   "tsconfig": "./tsconfig.json",
   "excludePrivate": true,
@@ -7,4 +8,4 @@
   "excludeExternals": true,
   "plugin": ["typedoc-plugin-markdown"],
   "includeVersion": true
-}
+}

package/packages/tarijs_types/src/TransactionResult.ts

@@ -1,16 +0,0 @@
-import { DownSubstates, UpSubstates } from "./SubstateDiff";
-import { ComponentAddress, TransactionResult } from "@tari-project/typescript-bindings";
-
-export type SubmitTransactionResponse = {
-  transaction_id: string;
-};
-
-export interface SubmitTxResult {
-  response: SubmitTransactionResponse;
-  result: TransactionResult;
-  upSubstates: UpSubstates;
-  downSubstates: DownSubstates;
-  newComponents: UpSubstates;
-
-  getComponentForTemplate(templateAddress: string): ComponentAddress | null;
-}