@tari-project/tarijs 0.5.0 → 0.5.2

package/packages/walletconnect/src/index.ts

@@ -1,27 +1,27 @@
-import {
-  TariSigner,
-  SubmitTransactionRequest,
-  TransactionResult,
-  SubmitTransactionResponse,
-  VaultBalances,
-  TemplateDefinition,
-  Substate,
-  Account,
-  ListSubstatesResponse,
-} from "@tari-project/tari-signer";
+import { TariSigner } from "@tari-project/tari-signer";
 import UniversalProvider from "@walletconnect/universal-provider";
 import { WalletConnectModal } from "@walletconnect/modal";
 import {
+  ConfidentialViewVaultBalanceRequest,
   Instruction,
   KeyBranch,
   ListAccountNftRequest,
   ListAccountNftResponse,
-  stringToSubstateId,
   substateIdToString,
-  SubstateType,
   TransactionSubmitRequest,
 } from "@tari-project/wallet_jrpc_client";
-import { convertStringToTransactionStatus } from "@tari-project/tarijs-types";
+import {
+  convertStringToTransactionStatus,
+  GetTransactionResultResponse,
+  SubmitTransactionRequest,
+  SubmitTransactionResponse,
+  VaultBalances,
+  TemplateDefinition,
+  Substate,
+  AccountData,
+  ListSubstatesResponse,
+  ListSubstatesRequest,
+} from "@tari-project/tarijs-types";
 
 const walletConnectParams = {
   requiredNamespaces: {
@@ -115,7 +115,7 @@ export class WalletConnectTariSigner implements TariSigner {
     return this.wcSession !== null;
   }
 
-  async getAccount(): Promise<Account> {
+  async getAccount(): Promise<AccountData> {
     const { account, public_key } = await this.sendRequest("tari_getDefaultAccount", {});
     const { balances } = await this.sendRequest("tari_getAccountBalances", {
       account: { ComponentAddress: account.address },
@@ -151,12 +151,12 @@ export class WalletConnectTariSigner implements TariSigner {
     };
   }
 
-  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> {
     const method = "tari_listSubstates";
     const params = {
       filter_by_template,
@@ -175,7 +175,7 @@ export class WalletConnectTariSigner implements TariSigner {
     return { substates };
   }
 
-  public async createFreeTestCoins(): Promise<Account> {
+  public async createFreeTestCoins(): Promise<AccountData> {
     const method = "tari_createFreeTestCoins";
     const params = {
       account: { Name: "template_web" },
@@ -222,7 +222,7 @@ export class WalletConnectTariSigner implements TariSigner {
     return { transaction_id: res.transaction_id };
   }
 
-  async getTransactionResult(transactionId: string): Promise<TransactionResult> {
+  async getTransactionResult(transactionId: string): Promise<GetTransactionResultResponse> {
     const res = await this.sendRequest("tari_getTransactionResult", { transaction_id: transactionId });
 
     return {
@@ -242,18 +242,18 @@ export class WalletConnectTariSigner implements TariSigner {
     return res.public_key;
   }
 
-  async getConfidentialVaultBalances(
-    viewKeyId: number,
-    vaultId: string,
-    min: number | null,
-    max: number | null,
-  ): Promise<VaultBalances> {
+  async getConfidentialVaultBalances({
+    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: viewKeyId,
-      vault_id: vaultId,
-      minimum_expected_value: min,
-      maximum_expected_value: max,
+      view_key_id,
+      vault_id,
+      minimum_expected_value,
+      maximum_expected_value,
     };
 
     const res = await this.sendRequest(method, params);

package/packages/tari_signer/src/types.ts

@@ -1,84 +0,0 @@
-import { FinalizeResult } from "@tari-project/typescript-bindings";
-
-export type SubstateMetadata = {
-  substate_id: string;
-  module_name: string | null;
-  version: number;
-  template_address: string | null;
-};
-
-export type SubstateRequirement = {
-  substate_id: string;
-  version?: number | null;
-};
-
-export type SubmitTransactionRequest = {
-  network: number;
-  account_id: number;
-  instructions: object[];
-  fee_instructions: object[];
-  inputs: object[];
-  input_refs: object[];
-  required_substates: SubstateRequirement[];
-  is_dry_run: boolean;
-  min_epoch: number | null;
-  max_epoch: number | null;
-  is_seal_signer_authorized: boolean;
-  detect_inputs_use_unversioned: boolean;
-};
-
-export type SubmitTransactionResponse = {
-  transaction_id: string;
-};
-
-export type TransactionResult = {
-  transaction_id: string;
-  status: TransactionStatus;
-  result: FinalizeResult | null;
-};
-
-export enum TransactionStatus {
-  New,
-  DryRun,
-  Pending,
-  Accepted,
-  Rejected,
-  InvalidTransaction,
-  OnlyFeeAccepted,
-}
-
-export interface Account {
-  account_id: number;
-  address: string;
-  public_key: string;
-  resources: VaultData[];
-}
-
-export interface VaultData {
-  type: string;
-  balance: number;
-  resource_address: string;
-  token_symbol: string;
-  vault_id: string;
-}
-
-export interface VaultBalances {
-  balances: Map<string, number | null>;
-}
-
-export interface TemplateDefinition {
-  // TODO: Define this type
-  [key: string]: any;
-}
-
-export interface Substate {
-  value: any;
-  address: {
-    substate_id: string;
-    version: number;
-  };
-}
-
-export type ListSubstatesResponse = {
-  substates: Array<SubstateMetadata>;
-};

package/packages/tarijs_types/src/Arg.ts

@@ -1,3 +0,0 @@
-//TODO refactor Arg type (https://github.com/tari-project/tari.js/issues/29)
-// take a look at typescript-bindings first
-export type Arg = any;

package/packages/tarijs_types/src/ComponentAddress.ts

@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-//TODO refactor type (https://github.com/tari-project/tari.js/issues/29)
-export type ComponentAddress = string;

package/packages/tarijs_types/src/ConfidentialOutputStatement.ts

@@ -1,10 +0,0 @@
-import type { Amount } from "./Amount";
-import type { ConfidentialStatement } from "./ConfidentialStatement";
-
-export interface ConfidentialOutputStatement {
-  outputStatement?: ConfidentialStatement;
-  changeStatement?: ConfidentialStatement;
-  rangeProof: Array<number>;
-  outputRevealedAmount: Amount;
-  changeRevealedAmount: Amount;
-}

package/packages/tarijs_types/src/ConfidentialStatement.ts

@@ -1,9 +0,0 @@
-import type { ViewableBalanceProof } from "./ViewableBalanceProof";
-
-export interface ConfidentialStatement {
-  commitment: Array<number>;
-  senderPublicNonce: Array<number>;
-  encryptedData: Array<number>;
-  minimumValuePromise: number;
-  viewableBalanceProof?: ViewableBalanceProof;
-}

package/packages/tarijs_types/src/ElgamalVerifiableBalance.ts

@@ -1,4 +0,0 @@
-export interface ElgamalVerifiableBalance {
-  encrypted: string;
-  public_nonce: string;
-}

package/packages/tarijs_types/src/Epoch.ts

@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-// TODO https://github.com/tari-project/tari.js/issues/29
-export type Epoch = number;

package/packages/tarijs_types/src/ResourceAddress.ts

@@ -1,3 +0,0 @@
-//TODO refactor type (https://github.com/tari-project/tari.js/issues/29)
-
-export type ResourceAddress = string;

package/packages/tarijs_types/src/TemplateAddress.ts

@@ -1,3 +0,0 @@
-//TODO refactor type (https://github.com/tari-project/tari.js/issues/29)
-
-export type TemplateAddress = string;

package/packages/tarijs_types/src/TransactionId.ts

@@ -1,4 +0,0 @@
-//TODO refactor type (https://github.com/tari-project/tari.js/issues/29)
-// for now ts type is string, but rust is different
-// dan_layer/transaction/src/transaction.rs
-export type TransactionId = string;

package/packages/tarijs_types/src/ViewableBalanceProof.ts

@@ -1,12 +0,0 @@
-//TODO refactor type (https://github.com/tari-project/tari.js/issues/29)
-
-export interface ViewableBalanceProof {
-  elgamal_encrypted: Uint8Array;
-  elgamal_public_nonce: Uint8Array;
-  c_prime: Uint8Array;
-  e_prime: Uint8Array;
-  r_prime: Uint8Array;
-  s_v: Uint8Array;
-  s_m: Uint8Array;
-  s_r: Uint8Array;
-}