@tari-project/tarijs 0.1.24 → 0.3.0

package/dist/providers/metamask/index.d.ts

@@ -1,6 +1,6 @@
 import { TariProvider } from "../index";
 import { SubmitTransactionRequest, TransactionResult, SubmitTransactionResponse, VaultBalances, TemplateDefinition, Substate, ListSubstatesResponse } from "../types";
-import { MetaMaskInpageProvider } from '@metamask/providers';
+import { MetaMaskInpageProvider } from "@metamask/providers";
 import { Snap } from "./utils";
 import { Account } from "../types";
 import { SubstateType } from "@tari-project/typescript-bindings";

package/dist/providers/metamask/index.js

@@ -1,8 +1,8 @@
 import { TransactionStatus, } from "../types";
 import { connectSnap, getSnap, isFlask } from "./utils";
-export const MetamaskNotInstalled = 'METAMASK_NOT_INSTALLED';
-export const MetamaskIsNotFlask = 'METAMASK_IS_NOT_FLASK';
-export const TariSnapNotInstalled = 'TARI_SNAP_NOT_INSTALLED';
+export const MetamaskNotInstalled = "METAMASK_NOT_INSTALLED";
+export const MetamaskIsNotFlask = "METAMASK_IS_NOT_FLASK";
+export const TariSnapNotInstalled = "TARI_SNAP_NOT_INSTALLED";
 export class MetamaskTariProvider {
     providerName = "Metamask";
     snapId;
@@ -41,32 +41,32 @@ export class MetamaskTariProvider {
         return this.metamaskConnected;
     }
     async createFreeTestCoins(account_id) {
-        const res = await this.metamaskRequest('getFreeTestCoins', {
+        const res = (await this.metamaskRequest("getFreeTestCoins", {
             amount: 1000000,
             account_id,
-            fee: 2000
-        });
+            fee: 2000,
+        }));
         return {
             account_id,
             address: res.address,
             public_key: res.public_key,
-            resources: []
+            resources: [],
         };
     }
     async getAccount() {
-        return await this.metamaskRequest('getAccountData', { account_id: 0 });
+        return (await this.metamaskRequest("getAccountData", { account_id: 0 }));
     }
     async getSubstate(substate_address) {
-        const { substate, address: substate_id, version } = await this.metamaskRequest('getSubstate', { substate_address });
+        const { substate, address: substate_id, version, } = await this.metamaskRequest("getSubstate", { substate_address });
         return { value: substate, address: { substate_id, version } };
     }
     async listSubstates(filter_by_template, filter_by_type, limit, offset) {
-        const res = await this.metamaskRequest('listSubstates', {
+        const res = (await this.metamaskRequest("listSubstates", {
             filter_by_template,
             filter_by_type,
             limit,
             offset,
-        });
+        }));
         return res;
     }
     async submitTransaction(req) {
@@ -77,7 +77,7 @@ export class MetamaskTariProvider {
             required_substates: req.required_substates || [],
             is_dry_run: req.is_dry_run,
         };
-        const resp = await this.metamaskRequest('sendTransaction', params);
+        const resp = await this.metamaskRequest("sendTransaction", params);
         if (!resp) {
             throw new Error("Failed to submit transaction to metamask snap: empty response");
         }
@@ -88,7 +88,7 @@ export class MetamaskTariProvider {
     }
     async getTransactionResult(transactionId) {
         // This request returns the response from the indexer get_transaction_result request
-        const resp = await this.metamaskRequest('getTransactionResult', { transaction_id: transactionId });
+        const resp = await this.metamaskRequest("getTransactionResult", { transaction_id: transactionId });
         if (!resp) {
             throw new Error("Failed to get transaction result from metamask snap: empty response");
         }
@@ -96,7 +96,7 @@ export class MetamaskTariProvider {
             return {
                 transaction_id: transactionId,
                 status: TransactionStatus.Pending,
-                result: null
+                result: null,
             };
         }
         if (!resp?.result?.Finalized) {
@@ -106,28 +106,27 @@ export class MetamaskTariProvider {
         return {
             transaction_id: transactionId,
             status: newStatus,
-            result: resp.result.Finalized.execution_result.finalize
+            result: resp.result.Finalized.execution_result.finalize,
         };
     }
     async getPublicKey(_branch, index) {
-        const resp = await this.metamaskRequest('getPublicKey', { index });
+        const resp = await this.metamaskRequest("getPublicKey", { index });
         if (!resp) {
             throw new Error("Failed to get public key from metamask snap: empty response");
         }
         return resp.public_key;
     }
     async getConfidentialVaultBalances(viewKeyId, vaultId, min = null, max = null) {
-        const res = await this.metamaskRequest('getConfidentialVaultBalances', {
+        const res = (await this.metamaskRequest("getConfidentialVaultBalances", {
             view_key_id: viewKeyId,
             vault_id: vaultId,
             minimum_expected_value: min,
             maximum_expected_value: max,
-        });
+        }));
         return { balances: res };
     }
     getTemplateDefinition(template_address) {
-        return this.metamaskRequest('getTemplateDefinition', { template_address })
-            .then(resp => {
+        return this.metamaskRequest("getTemplateDefinition", { template_address }).then((resp) => {
             if (!resp) {
                 throw new Error("Template not found");
             }
@@ -137,13 +136,13 @@ export class MetamaskTariProvider {
     async metamaskRequest(method, params) {
         console.log("Metamask request:", method, params);
         const resp = await this.metamask.request({
-            method: 'wallet_invokeSnap',
+            method: "wallet_invokeSnap",
             params: {
                 snapId: this.snapId,
                 request: {
                     method,
-                    params
-                }
+                    params,
+                },
             },
         });
         console.log("Metamask response:", resp);

package/dist/providers/tari_universe/provider.js

@@ -1,3 +1,4 @@
+import { sendProviderCall } from "./utils";
 export class TariUniverseProvider {
     params;
     providerName = "TariUniverse";
@@ -16,20 +17,7 @@ export class TariUniverseProvider {
     }
     async sendRequest(req) {
         const id = ++this.__id;
-        return new Promise(function (resolve, reject) {
-            const event_ref = function (resp) {
-                if (resp.data.resultError) {
-                    window.removeEventListener("message", event_ref);
-                    reject(resp.data.resultError);
-                }
-                if (resp && resp.data && resp.data.id && resp.data.id == id && resp.data.type === "provider-call") {
-                    window.removeEventListener("message", event_ref);
-                    resolve(resp.data.result);
-                }
-            };
-            window.addEventListener("message", event_ref, false);
-            window.parent.postMessage({ ...req, id, type: "provider-call" }, "*");
-        });
+        return sendProviderCall(req, id);
     }
     isConnected() {
         return true;
@@ -56,7 +44,20 @@ export class TariUniverseProvider {
         return this.sendRequest({ methodName: "requestParentSize", args: [] });
     }
     async getAccount() {
-        return this.sendRequest({ methodName: "getAccount", args: [] });
+        const { account_id, address, public_key } = await this.sendRequest({ methodName: "getAccount", args: [] });
+        const { balances } = await this.getAccountBalances(address);
+        return {
+            account_id,
+            address,
+            public_key,
+            resources: balances.map((b) => ({
+                type: b.resource_type,
+                resource_address: b.resource_address,
+                balance: b.balance + b.confidential_balance,
+                vault_id: "Vault" in b.vault_address ? b.vault_address.Vault : b.vault_address,
+                token_symbol: b.token_symbol,
+            })),
+        };
     }
     async getAccountBalances(componentAddress) {
         return this.sendRequest({

package/dist/providers/tari_universe/utils.d.ts

@@ -0,0 +1,2 @@
+import { ProviderMethodNames, ProviderRequest, ProviderReturnType } from "./types";
+export declare function sendProviderCall<MethodName extends ProviderMethodNames>(req: Omit<ProviderRequest<MethodName>, "id">, id: number): Promise<ProviderReturnType<MethodName>>;

package/dist/providers/tari_universe/utils.js

@@ -0,0 +1,16 @@
+export function sendProviderCall(req, id) {
+    return new Promise((resolve, reject) => {
+        const event_ref = (resp) => {
+            if (resp.data.resultError) {
+                window.removeEventListener("message", event_ref);
+                reject(resp.data.resultError);
+            }
+            if (resp && resp.data && resp.data.id && resp.data.id === id && resp.data.type === "provider-call") {
+                window.removeEventListener("message", event_ref);
+                resolve(resp.data.result);
+            }
+        };
+        window.addEventListener("message", event_ref, false);
+        window.parent.postMessage({ ...req, id, type: "provider-call" }, "*");
+    });
+}

package/dist/providers/wallet_daemon/provider.js

@@ -91,21 +91,21 @@ export class WalletDaemonTariProvider {
     }
     async submitTransaction(req) {
         const params = {
-            transaction: null,
+            transaction: {
+                instructions: req.instructions,
+                fee_instructions: req.fee_instructions,
+                inputs: req.required_substates.map((s) => ({
+                    // TODO: Hmm The bindings want a SubstateId object, but the wallet only wants a string. Any is used to skip type checking here
+                    substate_id: s.substate_id,
+                    version: s.version
+                })),
+                min_epoch: null,
+                max_epoch: null,
+            },
             signing_key_index: req.account_id,
-            fee_instructions: req.fee_instructions,
-            instructions: req.instructions,
-            inputs: req.required_substates.map((s) => ({
-                // TODO: Hmm The bindings want a SubstateId object, but the wallet only wants a string. Any is used to skip type checking here
-                substate_id: s.substate_id,
-                version: s.version
-            })),
-            input_refs: [],
-            override_inputs: false,
-            is_dry_run: req.is_dry_run,
+            autofill_inputs: [],
+            detect_inputs: true,
             proof_ids: [],
-            min_epoch: null,
-            max_epoch: null,
         };
         const res = await this.client.submitTransaction(params);
         return { transaction_id: res.transaction_id };

package/dist/providers/walletconnect/index.js

@@ -148,21 +148,21 @@ export class WalletConnectTariProvider {
     async submitTransaction(req) {
         const method = 'tari_submitTransaction';
         const params = {
-            transaction: null,
+            transaction: {
+                fee_instructions: req.fee_instructions,
+                instructions: req.instructions,
+                inputs: req.required_substates.map((s) => ({
+                    // TODO: Hmm The bindings want a SubstateId object, but the wallet only wants a string. Any is used to skip type checking here
+                    substate_id: s.substate_id,
+                    version: s.version
+                })),
+                min_epoch: null,
+                max_epoch: null,
+            },
             signing_key_index: req.account_id,
-            fee_instructions: req.fee_instructions,
-            instructions: req.instructions,
-            inputs: req.required_substates.map((s) => ({
-                // TODO: Hmm The bindings want a SubstateId object, but the wallet only wants a string. Any is used to skip type checking here
-                substate_id: s.substate_id,
-                version: s.version
-            })),
-            input_refs: [],
-            override_inputs: false,
-            is_dry_run: req.is_dry_run,
+            autofill_inputs: [],
+            detect_inputs: true,
             proof_ids: [],
-            min_epoch: null,
-            max_epoch: null,
         };
         const res = await this.sendRequest(method, params);
         return { transaction_id: res.transaction_id };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tari-project/tarijs",
-  "version": "0.1.24",
+  "version": "0.3.0",
   "description": "",
   "type": "module",
   "publishConfig": {
@@ -13,9 +13,9 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@metamask/providers": "^9.0.0",
-    "@tari-project/wallet_jrpc_client": "^1.0.8",
-    "@tari-project/typescript-bindings": "^1.0.6",
+    "@metamask/providers": "^18.2.0",
+    "@tari-project/wallet_jrpc_client": "^1.1.0",
+    "@tari-project/typescript-bindings": "^1.1.0",
     "@walletconnect/modal": "^2.6.2",
     "@walletconnect/universal-provider": "^2.13.3"
   },