@tari-project/tarijs 0.4.2 → 0.5.1

package/packages/tari_permissions/src/tari_permissions.ts

@@ -26,11 +26,10 @@ export class Tagged {
     this.value = value;
   }
   toJSON() {
-    return { "@@TAGGED@@": [this.tag, this.value] }
+    return { "@@TAGGED@@": [this.tag, this.value] };
   }
 }
 
-
 export class ResourceAddress {
   private tagged: Tagged;
   constructor(hash: Hash) {
@@ -72,12 +71,12 @@ export class NonFungibleId {
   }
   toJSON() {
     switch (typeof this.value) {
-      case 'string':
-        return { 'string': this.value };
-      case 'number':
-        return { 'Uint64': this.value };
+      case "string":
+        return { string: this.value };
+      case "number":
+        return { Uint64: this.value };
     }
-    return { 'U256': this.value };
+    return { U256: this.value };
   }
 }
 
@@ -89,14 +88,14 @@ export class NonFungibleAddressContents {
     this.id = id;
   }
   toJSON() {
-    return { "resource_address": this.resource_address, "id": this.id }
+    return { resource_address: this.resource_address, id: this.id };
   }
 }
 
 export class NonFungibleAddress {
   private tagged: Tagged;
   constructor(value: NonFungibleAddressContents) {
-    this.tagged = new Tagged(TAG.NonFungibleAddress, value)
+    this.tagged = new Tagged(TAG.NonFungibleAddress, value);
   }
   toJSON() {
     return this.tagged.toJSON();
@@ -111,7 +110,7 @@ export class NonFungibleIndexAddress {
     this.index = index;
   }
   toJSON() {
-    return { "resource_address": this.resource_address, "index": this.index }
+    return { resource_address: this.resource_address, index: this.index };
   }
 }
 
@@ -121,7 +120,7 @@ export class ComponentAddress {
     this.tagged = new Tagged(TAG.ComponentAddress, hash);
   }
   toJSON() {
-    return this.tagged.toJSON()
+    return this.tagged.toJSON();
   }
 }
 
@@ -131,12 +130,17 @@ export class VaultId {
     this.tagged = new Tagged(TAG.VaultId, hash);
   }
   toJSON() {
-    return this.tagged.toJSON()
+    return this.tagged.toJSON();
   }
 }
 
-export type SubstateAddressType = ResourceAddress | ComponentAddress | VaultId | UnclaimedConfidentialOutputAddress | NonFungibleAddress | NonFungibleIndexAddress;
-
+export type SubstateAddressType =
+  | ResourceAddress
+  | ComponentAddress
+  | VaultId
+  | UnclaimedConfidentialOutputAddress
+  | NonFungibleAddress
+  | NonFungibleIndexAddress;
 
 export class SubstateAddress {
   private value: SubstateAddressType;
@@ -145,19 +149,19 @@ export class SubstateAddress {
   }
   toJSON() {
     if (this.value instanceof ComponentAddress) {
-      return { "Component": this.value }
+      return { Component: this.value };
     } else if (this.value instanceof ResourceAddress) {
-      return { "Resource": this.value }
+      return { Resource: this.value };
     } else if (this.value instanceof VaultId) {
-      return { "Vault": this.value }
+      return { Vault: this.value };
     } else if (this.value instanceof UnclaimedConfidentialOutputAddress) {
-      return { "UnclaimedConfidentialOutput": this.value }
+      return { UnclaimedConfidentialOutput: this.value };
     } else if (this.value instanceof NonFungibleAddress) {
-      return { "NonFungible": this.value }
+      return { NonFungible: this.value };
     } else if (this.value instanceof NonFungibleIndexAddress) {
-      return { "NonFungibleIndex": this.value }
+      return { NonFungibleIndex: this.value };
     }
-    throw "Unknown type"
+    throw "Unknown type";
   }
 }
 
@@ -167,15 +171,15 @@ export class TariPermissionAccountBalance {
     this.value = value;
   }
   toJSON() {
-    console.log("stringify", this.value)
-    return { "AccountBalance": this.value }
+    console.log("stringify", this.value);
+    return { AccountBalance: this.value };
   }
 }
 
 export class TariPermissionAccountInfo {
   constructor() {}
   toJSON() {
-    return "AccountInfo"
+    return "AccountInfo";
   }
 }
 
@@ -189,11 +193,11 @@ export class TariPermissionAccountList {
     }
   }
   toJSON() {
-    console.log('JSON TariPermissionAccountList', this.value)
+    console.log("JSON TariPermissionAccountList", this.value);
     if (this.value === undefined) {
-      return { "AccountList": null }
+      return { AccountList: null };
     } else {
-      return { "AccountList": this.value }
+      return { AccountList: this.value };
     }
   }
 }
@@ -201,14 +205,14 @@ export class TariPermissionAccountList {
 export class TariPermissionKeyList {
   constructor() {}
   toJSON() {
-    return "KeyList"
+    return "KeyList";
   }
 }
 
 export class TariPermissionTransactionGet {
   constructor() {}
   toJSON() {
-    return "TransactionGet"
+    return "TransactionGet";
   }
 }
 export class TariPermissionTransactionSend {
@@ -217,11 +221,11 @@ export class TariPermissionTransactionSend {
     this.value = value;
   }
   toJSON() {
-    console.log('JSON TariPermissionTransactionSend', this.value)
+    console.log("JSON TariPermissionTransactionSend", this.value);
     if (this.value === undefined) {
-      return { "TransactionSend": null }
+      return { TransactionSend: null };
     } else {
-      return { "TransactionSend": this.value }
+      return { TransactionSend: this.value };
     }
   }
 }
@@ -234,7 +238,7 @@ export class TariPermissionGetNft {
     this.value1 = value1;
   }
   toJSON() {
-    return { "GetNft": [this.value0, this.value1] }
+    return { GetNft: [this.value0, this.value1] };
   }
 }
 
@@ -244,32 +248,44 @@ export class TariPermissionNftGetOwnershipProof {
     this.value = value;
   }
   toJSON() {
-    return { "NftGetOwnershipProof": this.value }
+    return { NftGetOwnershipProof: this.value };
   }
 }
 
 export class TariPermissionTransactionsGet {
   constructor() {}
   toJSON() {
-    return "TransactionGet"
+    return "TransactionGet";
   }
 }
 
 export class TariPermissionSubstatesRead {
   constructor() {}
   toJSON() {
-    return "SubstatesRead"
+    return "SubstatesRead";
   }
 }
 
 export class TariPermissionTemplatesRead {
   constructor() {}
   toJSON() {
-    return "TemplatesRead"
+    return "TemplatesRead";
   }
 }
 
-export type TariPermission = TariPermissionNftGetOwnershipProof | TariPermissionAccountBalance | TariPermissionAccountInfo | TariPermissionAccountList | TariPermissionKeyList | TariPermissionTransactionGet | TariPermissionTransactionSend | TariPermissionGetNft | TariPermissionTransactionsGet | TariPermissionSubstatesRead | TariPermissionTemplatesRead | string;
+export type TariPermission =
+  | TariPermissionNftGetOwnershipProof
+  | TariPermissionAccountBalance
+  | TariPermissionAccountInfo
+  | TariPermissionAccountList
+  | TariPermissionKeyList
+  | TariPermissionTransactionGet
+  | TariPermissionTransactionSend
+  | TariPermissionGetNft
+  | TariPermissionTransactionsGet
+  | TariPermissionSubstatesRead
+  | TariPermissionTemplatesRead
+  | string;
 
 // export enum TariPermission {
 //   AccountBalance = "AccountBalance",
@@ -289,7 +305,7 @@ export class TariPermissions {
   private permissions: TariPermission[];
 
   constructor() {
-    this.permissions = []
+    this.permissions = [];
   }
 
   addPermission(permission: TariPermission): this {
@@ -307,6 +323,7 @@ export class TariPermissions {
   }
 }
 
-// TariPermissionType.prototype.toString = function () {
-//   return "wtf"
-// }
+export type TappletPermissions = {
+  requiredPermissions: TariPermission[];
+  optionalPermissions: TariPermission[];
+};

package/packages/tari_provider/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tari-project/tari-provider",
-  "version": "0.4.1",
+  "version": "0.5.1",
   "description": "",
   "type": "module",
   "publishConfig": {
@@ -13,7 +13,8 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@tari-project/typescript-bindings": "catalog:"
+    "@tari-project/typescript-bindings": "catalog:",
+    "@tari-project/tarijs-types": "workspace:^"
   },
   "devDependencies": {
     "@types/node": "catalog:",

package/packages/tari_provider/src/TariProvider.ts

@@ -1,34 +1,19 @@
-import type { SubstateType } from "@tari-project/typescript-bindings";
+import type { GetTemplateDefinitionResponse, ListTemplatesResponse } from "@tari-project/typescript-bindings";
 import {
-  Account,
-  SubmitTransactionRequest,
-  TransactionResult,
-  SubmitTransactionResponse,
-  VaultBalances,
+  GetTransactionResultResponse,
   TemplateDefinition,
   Substate,
   ListSubstatesResponse,
-} from "./types";
+  GetSubstateRequest,
+  ListSubstatesRequest,
+} from "@tari-project/tarijs-types";
 
 export interface TariProvider {
   providerName: string;
   isConnected(): boolean;
-  getAccount(): Promise<Account>;
-  getSubstate(substate_address: string): Promise<Substate>;
-  submitTransaction(req: SubmitTransactionRequest): Promise<SubmitTransactionResponse>;
-  getTransactionResult(transactionId: string): Promise<TransactionResult>;
-  getTemplateDefinition(template_address: string): Promise<TemplateDefinition>;
-  getPublicKey(branch: string, index: number): Promise<string>;
-  getConfidentialVaultBalances(
-    viewKeyId: number,
-    vaultId: string,
-    min: number | null,
-    max: number | null,
-  ): Promise<VaultBalances>;
-  listSubstates(
-    filter_by_template: string | null,
-    filter_by_type: SubstateType | null,
-    limit: number | null,
-    offset: number | null,
-  ): Promise<ListSubstatesResponse>;
+  getSubstate(req: GetSubstateRequest): Promise<Substate>;
+  getTransactionResult(transactionId: string): Promise<GetTransactionResultResponse>;
+  getTemplateDefinition(template_address: string): Promise<GetTemplateDefinitionResponse>;
+  listSubstates(req: ListSubstatesRequest): Promise<ListSubstatesResponse>;
+  listTemplates(limit?: number): Promise<ListTemplatesResponse>;
 }

package/packages/tari_provider/src/index.ts

@@ -1,3 +1 @@
-export * from "./types";
-
-export { TariProvider } from "./TariProvider";
+export { TariProvider } from "./TariProvider";

package/packages/tari_provider/tsconfig.json

@@ -7,5 +7,12 @@
     "outDir": "./dist",
     "rootDir": "./src"
   },
-  "include": ["src/**/*"]
-}
+  "include": [
+    "src/**/*"
+  ],
+  "references": [
+    {
+      "path": "../tarijs_types"
+    }
+  ]
+}

package/packages/tari_signer/moon.yml

@@ -0,0 +1,55 @@
+language: "typescript"
+platform: "node"
+type: "library"
+
+fileGroups:
+  configs:
+    - "tsconfig.json"
+    - "package.json"
+    - "eslint.config.ts"
+  sources:
+    - "src/**/*"
+  tests:
+    - "integration-tests/**/*"
+
+tasks:
+  build:
+    command: "pnpm run build"
+    inputs:
+      - "@files(sources)"
+      - "@files(configs)"
+    outputs:
+      - "dist"
+  format:
+    command: "pnpm run format"
+    inputs:
+      - "@files(sources)"
+      - "@files(configs)"
+      - "@files(tests)"
+    options:
+      runInCI: false
+  lint:
+    command: "pnpm run lint:fix"
+    inputs:
+      - "@files(sources)"
+      - "@files(configs)"
+      - "@files(tests)"
+    options:
+      runInCI: false
+    deps:
+      - "build"
+
+  lintCheck:
+    command: "pnpm run lint"
+    inputs:
+      - "@files(sources)"
+      - "@files(configs)"
+      - "@files(tests)"
+    deps:
+      - "build"
+  formatCheck:
+    command: "pnpm run format:check"
+    inputs:
+      - "@files(sources)"
+      - "@files(configs)"
+      - "@files(tests)"

package/packages/tari_signer/package.json

@@ -0,0 +1,28 @@
+{
+  "name": "@tari-project/tari-signer",
+  "version": "0.5.1",
+  "description": "",
+  "type": "module",
+  "publishConfig": {
+    "access": "public"
+  },
+  "scripts": {
+    "build": "tsc -b"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "@tari-project/tarijs-types": "workspace:^",
+    "@tari-project/typescript-bindings": "catalog:"
+  },
+  "devDependencies": {
+    "@types/node": "catalog:",
+    "typescript": "catalog:"
+  },
+  "files": [
+    "/dist"
+  ],
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts"
+}

package/packages/tari_signer/src/TariSigner.ts

@@ -0,0 +1,30 @@
+import type {
+  ConfidentialViewVaultBalanceRequest,
+  ListAccountNftRequest,
+  ListAccountNftResponse,
+} from "@tari-project/typescript-bindings";
+import {
+  GetTransactionResultResponse,
+  AccountData,
+  SubmitTransactionRequest,
+  SubmitTransactionResponse,
+  VaultBalances,
+  TemplateDefinition,
+  Substate,
+  ListSubstatesResponse,
+  ListSubstatesRequest,
+} from "@tari-project/tarijs-types";
+
+export interface TariSigner {
+  signerName: string;
+  isConnected(): boolean;
+  getAccount(): Promise<AccountData>;
+  getSubstate(substate_address: string): Promise<Substate>;
+  submitTransaction(req: SubmitTransactionRequest): Promise<SubmitTransactionResponse>;
+  getTransactionResult(transactionId: string): Promise<GetTransactionResultResponse>;
+  getTemplateDefinition(template_address: string): Promise<TemplateDefinition>;
+  getPublicKey(branch: string, index: number): Promise<string>;
+  getConfidentialVaultBalances(req: ConfidentialViewVaultBalanceRequest): Promise<VaultBalances>;
+  listSubstates(req: ListSubstatesRequest): Promise<ListSubstatesResponse>;
+  getNftsList(req: ListAccountNftRequest): Promise<ListAccountNftResponse>;
+}

package/packages/tari_signer/src/index.ts

@@ -0,0 +1 @@
+export { TariSigner } from "./TariSigner";

package/packages/{metamask_provider → tari_signer}/tsconfig.json

@@ -11,9 +11,6 @@
     "src/**/*"
   ],
   "references": [
-    {
-      "path": "../tari_provider"
-    },
     {
       "path": "../tarijs_types"
     }

package/packages/tari_universe/package.json

@@ -1,6 +1,6 @@
 {
-  "name": "@tari-project/tari-universe-provider",
-  "version": "0.4.1",
+  "name": "@tari-project/tari-universe-signer",
+  "version": "0.5.1",
   "description": "",
   "type": "module",
   "publishConfig": {
@@ -14,7 +14,7 @@
   "license": "ISC",
   "dependencies": {
     "@tari-project/tari-permissions": "workspace:^",
-    "@tari-project/tari-provider": "workspace:^",
+    "@tari-project/tari-signer": "workspace:^",
     "@tari-project/tarijs-types": "workspace:^",
     "@tari-project/typescript-bindings": "catalog:",
     "@tari-project/wallet_jrpc_client": "catalog:"

package/packages/tari_universe/src/index.ts

@@ -1,3 +1,3 @@
 export * from "@tari-project/tari-permissions";
-export * from "./provider";
+export * from "./signer";
 export * from "./types";

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

@@ -1,29 +1,30 @@
 import {
   SubmitTransactionResponse,
-  Account,
+  AccountData,
   Substate,
   TemplateDefinition,
   VaultBalances,
   ListSubstatesResponse,
   SubmitTransactionRequest,
-  TariProvider,
-  TransactionResult,
-} from "@tari-project/tari-provider";
+  ListSubstatesRequest,
+  GetTransactionResultResponse,
+  ListAccountNftFromBalancesRequest,
+} from "@tari-project/tarijs-types";
+import { SignerRequest, SignerMethodNames, SignerReturnType, TariUniverseSignerParameters, WindowSize } from "./types";
 import {
-  ProviderRequest,
-  ProviderMethodNames,
-  ProviderReturnType,
-  TariUniverseProviderParameters,
-  WindowSize,
-} from "./types";
-import { AccountsGetBalancesResponse, SubstateType } from "@tari-project/wallet_jrpc_client";
-import { sendProviderCall } from "./utils";
-
-export class TariUniverseProvider implements TariProvider {
-  public providerName = "TariUniverse";
+  AccountsGetBalancesResponse,
+  ConfidentialViewVaultBalanceRequest,
+  ListAccountNftRequest,
+  ListAccountNftResponse,
+} from "@tari-project/wallet_jrpc_client";
+import { sendSignerCall } from "./utils";
+import { TariSigner } from "@tari-project/tari-signer";
+
+export class TariUniverseSigner implements TariSigner {
+  public signerName = "TariUniverse";
   private __id = 0;
 
-  public constructor(public params: TariUniverseProviderParameters) {
+  public constructor(public params: TariUniverseSignerParameters) {
     const filterResizeEvent = function (event: MessageEvent) {
       if (event.data && event.data.type === "resize") {
         const resizeEvent = new CustomEvent("resize", {
@@ -35,11 +36,11 @@ export class TariUniverseProvider implements TariProvider {
     window.addEventListener("message", (event) => filterResizeEvent(event), false);
   }
 
-  private async sendRequest<MethodName extends ProviderMethodNames>(
-    req: Omit<ProviderRequest<MethodName>, "id">,
-  ): Promise<ProviderReturnType<MethodName>> {
+  private async sendRequest<MethodName extends SignerMethodNames>(
+    req: Omit<SignerRequest<MethodName>, "id">,
+  ): Promise<SignerReturnType<MethodName>> {
     const id = ++this.__id;
-    return sendProviderCall(req, id);
+    return sendSignerCall(req, id);
   }
 
   public isConnected(): boolean {
@@ -50,27 +51,27 @@ export class TariUniverseProvider implements TariProvider {
     return this.sendRequest<"getPublicKey">({ methodName: "getPublicKey", args: [] });
   }
 
-  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,
+    filter_by_type,
+    limit,
+    offset,
+  }: ListSubstatesRequest): Promise<ListSubstatesResponse> {
     return this.sendRequest<"listSubstates">({
       methodName: "listSubstates",
-      args: [filter_by_template, filter_by_type, limit, offset],
+      args: [{ filter_by_template, filter_by_type, limit, offset }],
     });
   }
 
-  public getConfidentialVaultBalances(
-    viewKeyId: number,
-    vaultId: string,
-    min: number | null,
-    max: number | null,
-  ): Promise<VaultBalances> {
+  public getConfidentialVaultBalances({
+    vault_id,
+    maximum_expected_value,
+    minimum_expected_value,
+    view_key_id,
+  }: ConfidentialViewVaultBalanceRequest): Promise<VaultBalances> {
     return this.sendRequest({
       methodName: "getConfidentialVaultBalances",
-      args: [viewKeyId, vaultId, min, max],
+      args: [{ view_key_id, vault_id, minimum_expected_value, maximum_expected_value }],
     });
   }
 
@@ -82,7 +83,7 @@ export class TariUniverseProvider implements TariProvider {
     return this.sendRequest({ methodName: "requestParentSize", args: [] });
   }
 
-  public async getAccount(): Promise<Account> {
+  public async getAccount(): Promise<AccountData> {
     return this.sendRequest({ methodName: "getAccount", args: [] });
   }
 
@@ -107,7 +108,7 @@ export class TariUniverseProvider implements TariProvider {
     });
   }
 
-  public async getTransactionResult(transactionId: string): Promise<TransactionResult> {
+  public async getTransactionResult(transactionId: string): Promise<GetTransactionResultResponse> {
     return this.sendRequest({
       methodName: "getTransactionResult",
       args: [transactionId],
@@ -117,4 +118,12 @@ export class TariUniverseProvider implements TariProvider {
   public async getTemplateDefinition(template_address: string): Promise<TemplateDefinition> {
     return this.sendRequest({ methodName: "getTemplateDefinition", args: [template_address] });
   }
+
+  public async getNftsList(req: ListAccountNftRequest): Promise<ListAccountNftResponse> {
+    return this.sendRequest({ methodName: "getNftsList", args: [req] });
+  }
+
+  public async getNftsFromAccountBalances(req: ListAccountNftFromBalancesRequest): Promise<ListAccountNftResponse> {
+    return this.sendRequest({ methodName: "getNftsFromAccountBalances", args: [req] });
+  }
 }

package/packages/tari_universe/src/types.ts

@@ -1,7 +1,7 @@
 import { TariPermissions } from "@tari-project/tari-permissions";
-import { TariUniverseProvider } from "./provider";
+import { TariUniverseSigner } from "./signer";
 
-export type TariUniverseProviderParameters = {
+export type TariUniverseSignerParameters = {
   permissions: TariPermissions;
   optionalPermissions: TariPermissions;
   name?: string;
@@ -15,19 +15,19 @@ export type WindowSize = {
 
 export type PickMatching<T, V> = { [K in keyof T as T[K] extends V ? K : never]: T[K] };
 export type ExtractMethods<T> = PickMatching<T, Function>;
-export type ProviderMethods = ExtractMethods<TariUniverseProvider>;
-export type ProviderMethodNames = keyof ProviderMethods;
-export type ProviderReturnType<T extends ProviderMethodNames> = Awaited<ReturnType<ProviderMethods[T]>>;
+export type SignerMethods = ExtractMethods<TariUniverseSigner>;
+export type SignerMethodNames = keyof SignerMethods;
+export type SignerReturnType<T extends SignerMethodNames> = Awaited<ReturnType<SignerMethods[T]>>;
 
-export type ProviderRequest<T extends ProviderMethodNames> = {
+export type SignerRequest<T extends SignerMethodNames> = {
   id: number;
   methodName: T;
-  args: Parameters<ProviderMethods[T]>;
+  args: Parameters<SignerMethods[T]>;
 };
 
-export type ProviderResponse<T extends ProviderMethodNames> = {
+export type SignerResponse<T extends SignerMethodNames> = {
   id: number;
-  type: "provider-call";
-  result: ProviderReturnType<T>;
+  type: "signer-call";
+  result: SignerReturnType<T>;
   resultError?: string;
 };