@tari-project/tarijs 0.10.1 → 0.12.0

package/packages/walletconnect/src/index.ts

@@ -21,9 +21,10 @@ import {
   substateIdToString,
   TransactionSubmitRequest,
 } from "@tari-project/typescript-bindings";
+import { TariPermission } from "@tari-project/tari-permissions";
 
 const walletConnectParams = {
-  requiredNamespaces: {
+  optionalNamespaces: {
     tari: {
       methods: [
         "tari_getSubstate",
@@ -39,51 +40,76 @@ const walletConnectParams = {
         "tari_getNftsList",
       ],
       chains: ["tari:devnet"],
-      events: ["chainChanged\", \"accountsChanged"],
+      events: [],
+      // events: ["chainChanged", "accountsChanged"],
     },
   },
 };
 
+export interface WalletConnectParameters {
+  requiredPermissions?: TariPermission[];
+  optionalPermissions?: TariPermission[];
+  projectId: string;
+}
+
 export class WalletConnectTariSigner implements TariSigner {
   public signerName = "WalletConnect";
-  projectId: string;
-  wcProvider: UniversalProvider | null;
+  params: WalletConnectParameters;
+  wcProvider: UniversalProvider | undefined;
   wcSession: any | null;
 
-  constructor(projectId: string) {
-    this.projectId = projectId;
-    this.wcProvider = null;
+  constructor(params: WalletConnectParameters) {
+    this.params = params;
+    this.wcProvider = undefined;
     this.wcSession = null;
   }
 
-  async connect(): Promise<void> {
-    if (this.wcProvider && this.wcSession) return;
+  static init(params: WalletConnectParameters): WalletConnectTariSigner {
+    return new WalletConnectTariSigner(params);
+  }
+
+  async connect(): Promise<() => Promise<void>> {
+    if (this.wcProvider && this.wcSession) return async () => {
+      // No-op if already connected
+    };
 
     // initialize WalletConnect
-    const projectId = this.projectId;
-    this.wcProvider = await UniversalProvider.init({
+    const projectId = this.params.projectId;
+    const provider = await UniversalProvider.init({
       projectId,
       // TODO: parameterize the relay URL
-      relayUrl: "wss://relay.walletconnect.com",
+      // relayUrl: "wss://relay.walletconnect.com",
     });
 
+    const sessionProperties = {
+      "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 { uri, approval } = await this.wcProvider.client.connect(walletConnectParams);
-    const walletConnectModal = new WalletConnectModal({
-      projectId,
-    });
-    if (uri) {
-      walletConnectModal.openModal({ uri });
-    }
+    const { uri, approval } = await provider.client.connect(connectParams);
+    return async () => {
+      const walletConnectModal = new WalletConnectModal({
+        projectId,
+      });
+      if (uri) {
+        await walletConnectModal.openModal({ 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();
+      // wait for the wallet to approve the connection
+      console.log("waiting for session approval from the wallet app");
+      const session = await approval();
+      walletConnectModal.closeModal();
 
-    // at this point session is open
-    console.log("session approved by the wallet");
-    this.wcSession = session;
+      // at this point session is open
+      console.log("session approved by the wallet");
+      this.wcProvider = provider;
+      this.wcSession = session;
+    };
   }
 
   private async sendRequest(method: string, params: object): Promise<any> {
@@ -126,7 +152,7 @@ export class WalletConnectTariSigner implements TariSigner {
       address: account.address,
       public_key,
       // TODO: should be vaults not resources
-      resources: balances.map((b: any) => ({
+      vaults: balances.map((b: any) => ({
         type: b.resource_type,
         resource_address: b.resource_address,
         balance: b.balance + b.confidential_balance,
@@ -187,7 +213,7 @@ export class WalletConnectTariSigner implements TariSigner {
       account_id: res.account.key_index,
       address: (res.account.address as { Component: string }).Component,
       public_key: res.public_key,
-      resources: [],
+      vaults: [],
     };
   }
 

package/packages/walletconnect/tsconfig.json

@@ -14,6 +14,9 @@
     {
       "path": "../builders"
     },
+    {
+      "path": "../permissions"
+    },
     {
       "path": "../tari_signer"
     },

package/pnpm-workspace.yaml

@@ -2,14 +2,22 @@ packages:
   - packages/*
   - apps/*
   - docusaurus/*
-  - "!**/test/**"
+  - examples/*
+  - '!**/test/**'
+
 catalog:
   typescript: ^5.0.4
   vitest: ^3.0.4
   vite: ^6.1.0
-  "@types/node": ^22.13.1
-  "@tari-project/typescript-bindings": ">=1.10.2"
-  "@tari-project/wallet_jrpc_client": ^1.6.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.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
+
+onlyBuiltDependencies:
+  - '@moonrepo/cli'
+  - core-js
+  - core-js-pure
+  - esbuild

package/scripts/check_versions.sh

@@ -6,6 +6,8 @@ echo "Finding all package.json files and extracting versions..."
 
 declare -a versions
 
+gitroot=$(git rev-parse --show-toplevel)
+pushd "${gitroot}/packages" > /dev/null
 # Find all package.json files, excluding node_modules, and extract the version
 while IFS= read -r file; do
     version=$(jq -r '.version' "$file")
@@ -40,3 +42,5 @@ if [ "$all_same" = false ]; then
 else
     echo "✅ All package.json versions are consistent: $reference_version"
 fi
+
+popd > /dev/null

package/scripts/clean_everything.sh

@@ -0,0 +1,38 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+# This script cleans up the dist and node_modules directories in all packages
+
+gitroot=$(git rev-parse --show-toplevel)
+pushd "${gitroot}" > /dev/null
+echo "Cleaning up the root node_modules"
+rm -fr node_modules
+popd > /dev/null
+
+pushd "${gitroot}/packages" > /dev/null
+
+# Loop through all subdirectories
+for dir in */; do
+    if [ -d "$dir" ]; then
+        echo "Cleaning up $dir"
+        # Remove dist directory if it exists
+        if [ -d "${dir}dist" ]; then
+            echo "Removing ${dir}dist"
+            rm -rf "${dir}dist"
+        fi
+        # Remove node_modules directory if it exists
+        if [ -d "${dir}node_modules" ]; then
+            echo "Removing ${dir}node_modules"
+            rm -rf "${dir}node_modules"
+        fi
+        # Remove tsconfig.tsbuildinfo file if it exists
+        if [ -f "${dir}tsconfig.tsbuildinfo" ]; then
+            echo "Removing ${dir}tsconfig.tsbuildinfo"
+            rm -f "${dir}tsconfig.tsbuildinfo"
+        fi
+    fi
+done
+
+echo "Cleanup complete."
+popd > /dev/null

package/tsconfig.json

@@ -20,6 +20,12 @@
     {
       "path": "packages/metamask_signer"
     },
+    {
+      "path": "packages/permissions"
+    },
+    {
+      "path": "packages/react-mui-connect-button"
+    },
     {
       "path": "packages/tari_permissions"
     },

package/typedoc.json

@@ -0,0 +1,10 @@
+{
+  "entryPoints": ["packages/builders/src/index.ts"], 
+  "out": "tsdocs/api",
+  "tsconfig": "./tsconfig.json",
+  "excludePrivate": true,
+  "excludeInternal": true,
+  "excludeExternals": true,
+  "plugin": ["typedoc-plugin-markdown"],
+  "includeVersion": true
+}

package/packages/tari_permissions/src/index.ts

@@ -1,2 +0,0 @@
-export * from "./tari_permissions";
-export * from "./helpers";