@tari-project/tarijs 0.12.1 → 0.12.2

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

@@ -1,23 +1,24 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 export function toHexString(byteArray: any): string {
-    if (Array.isArray(byteArray)) {
-        return Array.from(byteArray, function (byte) {
-            return ('0' + (byte & 0xff).toString(16)).slice(-2);
-        }).join('');
-    }
-    if (byteArray === undefined) {
-        return 'undefined';
-    }
-    // object might be a tagged object
-    if (byteArray['@@TAGGED@@'] !== undefined) {
-        return toHexString(byteArray['@@TAGGED@@'][1]);
-    }
-    return 'Unsupported type';
+  if (Array.isArray(byteArray)) {
+    return Array.from(byteArray, function (byte) {
+      return ("0" + (byte & 0xff).toString(16)).slice(-2);
+    }).join("");
+  }
+  if (byteArray === undefined) {
+    return "undefined";
+  }
+  // object might be a tagged object
+  if (byteArray["@@TAGGED@@"] !== undefined) {
+    return toHexString(byteArray["@@TAGGED@@"][1]);
+  }
+  return "Unsupported type";
 }
 
 export function fromHexString(hexString: string) {
-    let res = [];
-    for (let i = 0; i < hexString.length; i += 2) {
-        res.push(Number('0x' + hexString.substring(i, i + 2)));
-    }
-    return res;
-}
+  const res = [];
+  for (let i = 0; i < hexString.length; i += 2) {
+    res.push(Number("0x" + hexString.substring(i, i + 2)));
+  }
+  return res;
+}

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

@@ -38,7 +38,11 @@ export class SimpleTransactionResult {
     this.finalizeResult = result;
   }
 
-  static new(transaction_id: TransactionId, status: TransactionStatus, result: FinalizeResult): SimpleTransactionResult {
+  static new(
+    transaction_id: TransactionId,
+    status: TransactionStatus,
+    result: FinalizeResult,
+  ): SimpleTransactionResult {
     return new SimpleTransactionResult(transaction_id, status, result);
   }
 
@@ -125,7 +129,10 @@ export class SimpleTransactionResult {
 
     const components = [];
     for (const upSubstate of d.upSubstates()) {
-      if (upSubstate.type === "Component" && (upSubstate.substate as ComponentHeader).template_address === templateAddress) {
+      if (
+        upSubstate.type === "Component" &&
+        (upSubstate.substate as ComponentHeader).template_address === templateAddress
+      ) {
         components.push(SimpleComponent.new(upSubstate.id, upSubstate.version, upSubstate.substate as ComponentHeader));
       }
     }
@@ -164,7 +171,7 @@ export class SimpleTransactionResult {
   }
 
   public get diff(): Option<SimpleSubstateDiff> {
-    return this.accept.or(this.onlyFeeAccepted.map((x => x[0])));
+    return this.accept.or(this.onlyFeeAccepted.map((x) => x[0]));
   }
 
   public get onlyFeeAccepted(): Option<[SimpleSubstateDiff, RejectReason]> {
@@ -173,7 +180,7 @@ export class SimpleTransactionResult {
       return None;
     }
 
-    const [diff, reason] = result?.result.AcceptFeeRejectRest;
+    const [diff, reason] = result.result.AcceptFeeRejectRest;
     return Some([SimpleSubstateDiff.from(diff), reason]);
   }
 
@@ -228,7 +235,6 @@ export class SimpleSubstateDiff {
   constructor(diff: SubstateDiff) {
     this.up_substates = diff.up_substates
       .map(([id, val]: [SubstateId | string, Substate]) => {
-
         if (!val.substate) {
           console.error("Substate is missing in the accept result", id, val);
           return null;
@@ -250,17 +256,15 @@ export class SimpleSubstateDiff {
       })
       .filter((x) => x !== null);
 
-    this.down_substates = diff.down_substates
-      .map(([id, version]: [SubstateId | string, number]) => {
-        const type = (typeof id === "string" ? prefixToSubstateType(splitOnce(id, "_")![0]) : Object.keys(id)[0]);
-        const idVal = substateIdToString(id);
-        return {
-          type: type! as SubstateType,
-          id: idVal,
-          version,
-        } as DownSubstate;
-      });
-
+    this.down_substates = diff.down_substates.map(([id, version]: [SubstateId | string, number]) => {
+      const type = typeof id === "string" ? prefixToSubstateType(splitOnce(id, "_")![0]) : Object.keys(id)[0];
+      const idVal = substateIdToString(id);
+      return {
+        type: type! as SubstateType,
+        id: idVal,
+        version,
+      } as DownSubstate;
+    });
 
     this.fee_withdrawals = diff.fee_withdrawals;
   }
@@ -283,7 +287,7 @@ export class SimpleSubstateDiff {
 }
 
 export type AnySubstate =
-  ComponentHeader
+  | ComponentHeader
   | Resource
   | Vault
   | UnclaimedConfidentialOutput
@@ -296,7 +300,7 @@ export type UpSubstate = {
   type: SubstateType;
   id: string;
   version: number;
-  substate: AnySubstate
+  substate: AnySubstate;
 };
 
 export type DownSubstate = {
@@ -337,9 +341,8 @@ export class SimpleComponent {
   }
 }
 
-
 export interface GetAccountsResult {
   substate_id: string;
   version: number;
   account: BuiltInAccount;
-}
+}

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

@@ -7,7 +7,8 @@ import {
   ResourceAddress,
   Amount,
   substateIdToString,
-  ComponentAddress, FinalizeResult,
+  ComponentAddress,
+  FinalizeResult,
 } from "@tari-project/typescript-bindings";
 import { UpSubstates } from "../SubstateDiff";
 
@@ -37,9 +38,7 @@ export const txResultCheck = {
   isReject: (result: FinalizeResult): boolean => {
     return "Reject" in result.result;
   },
-  isAcceptFeeRejectRest: (
-    result: FinalizeResult,
-  ): boolean => {
+  isAcceptFeeRejectRest: (result: FinalizeResult): boolean => {
     return "AcceptFeeRejectRest" in result.result;
   },
 };

package/packages/tarijs_types/src/index.ts

@@ -1,4 +1,11 @@
-export { ComponentAddress, ResourceAddress, PublishedTemplateAddress, Epoch } from "@tari-project/typescript-bindings";
+export {
+  ComponentAddress,
+  ResourceAddress,
+  PublishedTemplateAddress,
+  Epoch,
+  Transaction,
+  TransactionResult,
+} from "@tari-project/typescript-bindings";
 export { Amount } from "./Amount";
 export { BuiltInAccount, VaultSubstate } from "./Account";
 export { TransactionArg } from "./TransactionArg";
@@ -6,11 +13,9 @@ export { ConfidentialClaim } from "./ConfidentialClaim";
 export { ConfidentialOutput } from "./ConfidentialOutput";
 export { ConfidentialWithdrawProof } from "./ConfidentialWithdrawProof";
 export { GetTransactionResultResponse } from "./GetTransactionResultResponse";
+export { SubmitTransactionResponse } from "./SubmitTransactionResponse";
 export { DownSubstates, UpSubstates } from "./SubstateDiff";
 export { SubstateType } from "./SubstateType";
-export {
-  SubmitTransactionResponse,
-} from "./TransactionResult";
 export { TransactionSignature } from "./TransactionSignature";
 export { TransactionStatus, transactionStatusFromStr } from "./TransactionStatus";
 export { WorkspaceArg } from "./Workspace";

package/packages/tarijs_types/src/signer.ts

@@ -1,8 +1,4 @@
-import {
-  SubstateType,
-  TemplateDef,
-  UnsignedTransactionV1,
-} from "@tari-project/typescript-bindings";
+import { SubstateType, TemplateDef, UnsignedTransactionV1 } from "@tari-project/typescript-bindings";
 
 export type SubstateMetadata = {
   substate_id: string;
@@ -17,7 +13,7 @@ export type ReqSubstate = {
 };
 
 export type SubmitTransactionRequest = {
-  transaction: UnsignedTransactionV1,
+  transaction: UnsignedTransactionV1;
   account_id: number;
   detect_inputs_use_unversioned: boolean;
 };
@@ -44,6 +40,7 @@ export interface VaultBalances {
 export type TemplateDefinition = TemplateDef;
 
 export interface Substate {
+  /* eslint-disable-next-line @typescript-eslint/no-explicit-any */
   value: any;
   address: {
     substate_id: string;

package/packages/wallet_daemon/package.json

@@ -1,13 +1,14 @@
 {
   "name": "@tari-project/wallet-daemon-signer",
-  "version": "0.12.1",
+  "version": "0.12.2",
   "description": "",
   "type": "module",
   "publishConfig": {
     "access": "public"
   },
   "scripts": {
-    "build": "tsc -b"
+    "build": "tsc -b",
+    "lint": "eslint src/"
   },
   "keywords": [],
   "author": "The Tari Community",

package/packages/wallet_daemon/src/provider.ts

@@ -4,13 +4,13 @@ import {
   GetTransactionResultResponse,
   ListSubstatesRequest,
   ListSubstatesResponse,
-  Substate, SubstateMetadata,
+  Substate,
+  SubstateMetadata,
   transactionStatusFromStr,
 } from "@tari-project/tarijs-types";
 import {
   GetTemplateDefinitionResponse,
   ListTemplatesResponse,
-  SubstateId,
   substateIdToString,
 } from "@tari-project/typescript-bindings";
 import { WalletDaemonClient } from "@tari-project/wallet_jrpc_client";
@@ -31,7 +31,7 @@ export class WalletDaemonTariProvider implements TariProvider {
 
   static async buildWebRtc(params: WalletDaemonParameters): Promise<WalletDaemonTariProvider> {
     const allPermissions = WalletDaemonTariProvider.buildPermissions(params);
-    let connection = new TariConnection(params.signalingServerUrl, params.webRtcConfig);
+    const connection = new TariConnection(params.signalingServerUrl, params.webRtcConfig);
     const client = WalletDaemonClient.new(WebRtcRpcTransport.new(connection));
     await connection.init(allPermissions, (conn) => {
       params.onConnection?.();
@@ -42,7 +42,6 @@ export class WalletDaemonTariProvider implements TariProvider {
     return new WalletDaemonTariProvider(params, client);
   }
 
-
   static async buildFetch(params: WalletDaemonFetchParameters) {
     const allPermissions = WalletDaemonTariProvider.buildPermissions(params);
     const client = WalletDaemonClient.usingFetchTransport(params.serverUrl);
@@ -75,9 +74,7 @@ export class WalletDaemonTariProvider implements TariProvider {
 
   async getSubstate(req: GetSubstateRequest): Promise<Substate> {
     // TODO: Substate address cannot be converted to SubstateId directly - Perhaps we need to change the provider interface
-    const {
-      substate,
-    } = await this.client.substatesGet({ substate_id: req.substate_address });
+    const { substate } = await this.client.substatesGet({ substate_id: req.substate_address });
     if (!substate) {
       throw new Error(`Substate not found for address: ${req.substate_address}`);
     }
@@ -115,12 +112,15 @@ export class WalletDaemonTariProvider implements TariProvider {
     const resp = await this.client.substatesList(req);
 
     return {
-      substates: resp.substates.map((s) => ({
-        substate_id: substateIdToString(s.substate_id),
-        module_name: s.module_name,
-        version: s.version,
-        template_address: s.template_address,
-      } as SubstateMetadata)),
+      substates: resp.substates.map(
+        (s) =>
+          ({
+            substate_id: substateIdToString(s.substate_id),
+            module_name: s.module_name,
+            version: s.version,
+            template_address: s.template_address,
+          } as SubstateMetadata),
+      ),
     };
   }
 
@@ -128,6 +128,4 @@ export class WalletDaemonTariProvider implements TariProvider {
     // const resp = await this.client.templatesListAuthored({});
     throw new Error("Listing all templates is not supported by WalletDaemonTariProvider.");
   }
-
-
-}
+}

package/packages/wallet_daemon/src/signer.ts

@@ -43,7 +43,6 @@ export interface WalletDaemonFetchParameters extends WalletDaemonBaseParameters
   serverUrl: string;
 }
 
-
 export class WalletDaemonTariSigner implements TariSigner {
   public signerName = "WalletDaemon";
   params: WalletDaemonParameters;
@@ -56,7 +55,7 @@ export class WalletDaemonTariSigner implements TariSigner {
 
   static async build(params: WalletDaemonParameters): Promise<WalletDaemonTariSigner> {
     const allPermissions = WalletDaemonTariSigner.buildPermissions(params);
-    let connection = new TariConnection(params.signalingServerUrl, params.webRtcConfig);
+    const connection = new TariConnection(params.signalingServerUrl, params.webRtcConfig);
     const client = WalletDaemonClient.new(WebRtcRpcTransport.new(connection));
     await connection.init(allPermissions, (conn) => {
       params.onConnection?.();
@@ -135,6 +134,7 @@ export class WalletDaemonTariSigner implements TariSigner {
   }
 
   public async getAccount(): Promise<AccountData> {
+    /* eslint-disable-next-line @typescript-eslint/no-explicit-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({
@@ -163,9 +163,7 @@ export class WalletDaemonTariSigner implements TariSigner {
   }
 
   public async getSubstate(substateId: string): Promise<Substate> {
-    const {
-      substate,
-    } = await this.client.substatesGet({ substate_id: substateId });
+    const { substate } = await this.client.substatesGet({ substate_id: substateId });
     if (!substate) {
       throw new Error(`Substate not found for address: ${substateId}`);
     }
@@ -212,16 +210,16 @@ export class WalletDaemonTariSigner implements TariSigner {
   }
 
   public async getTemplateDefinition(template_address: string): Promise<TemplateDefinition> {
-    let resp = await this.client.templatesGet({ template_address });
+    const resp = await this.client.templatesGet({ template_address });
     return resp.template_definition as TemplateDefinition;
   }
 
   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,
@@ -232,11 +230,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,
@@ -244,7 +242,7 @@ export class WalletDaemonTariSigner implements TariSigner {
       offset,
     } as SubstatesListRequest);
 
-    const substates = resp.substates.map((s) => ({
+    const substates = resp.substates.map((s: any) => ({
       substate_id: typeof s.substate_id === "string" ? s.substate_id : substateIdToString(s.substate_id),
       module_name: s.module_name,
       version: s.version,

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.12.2",
   "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,
@@ -69,41 +70,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");
@@ -177,11 +191,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 +259,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 +269,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,