@keetanetwork/keetanet-client 0.16.0 → 0.16.1

package/client/builder.d.ts

@@ -3,7 +3,7 @@ import { Account, AccountKeyAlgorithm } from '../lib/account';
 import type { AdjustMethod, BlockHash } from '../lib/block';
 import { Block } from '../lib/block';
 import type { IdentifierCreateArguments, BlockJSONOperations } from '../lib/block/operations';
-import type { AccountInfo } from '../lib/ledger/types';
+import type { AccountInfo, AccountInfoWithoutAccount } from '../lib/ledger/types';
 import type { AcceptedPermissionTypes } from '../lib/permissions';
 import type { UserClient, Client } from '.';
 import { Permissions } from '../lib/permissions';
@@ -91,7 +91,7 @@ export interface PendingOperations {
         method: AdjustMethod;
         permissions: Permissions;
     }[]>>;
-    info?: AccountInfo;
+    info?: AccountInfoWithoutAccount;
     setRep?: Account;
 }
 export interface PendingOperationsJSON {
@@ -187,7 +187,7 @@ export declare class UserClientBuilder {
     modifyCertificate(method: ManageCertificateMethod, certificate: Certificate, intermediateCertificates?: CertificateBundle | null, options?: BuilderBlockOptions): void;
     modifyTokenSupply(amount: bigint, options?: BuilderBlockOptions): void;
     modifyTokenBalance(token: TokenOrPending, amount: bigint, isSet?: boolean, options?: BuilderBlockOptions): void;
-    setInfo(info: AccountInfo, options?: BuilderBlockOptions): void;
+    setInfo(info: AccountInfoWithoutAccount, options?: BuilderBlockOptions): void;
     setRep(to: Account, options?: BuilderBlockOptions): void;
     /**
      * Create a new identifier for the given arguments and add to the pending operations

package/client/client_common_tests.d.ts

@@ -29,7 +29,7 @@ export type NodeCreationOptions = {
 };
 export declare function setup(options?: NodeCreationOptions): Promise<{
     trustedKey: Account<AccountKeyAlgorithm.ECDSA_SECP256K1>;
-    repKeys: Account<AccountKeyAlgorithm.ECDSA_SECP256K1 | AccountKeyAlgorithm.ED25519 | AccountKeyAlgorithm.ECDSA_SECP256R1>[];
+    repKeys: Account<import("../lib/account").KeyPairKeyAlgorithm>[];
     accounts: Account<AccountKeyAlgorithm.ECDSA_SECP256K1>[];
     nodes: LocalNode[];
     trustedClients: KeetaNet.UserClient[];
@@ -40,7 +40,8 @@ export declare function setup(options?: NodeCreationOptions): Promise<{
     cleanupFunctions: (() => Promise<void>)[];
 }>;
 declare function runBasicTests(nodes: LocalNode[], userClient: UserClient, trustedClient: UserClient, params: ClientParams, expect: any, ExpectErrorCode: any): Promise<void>;
-declare function runFeeBlockTests(_ignore_nodes: LocalNode[], userClient: UserClient, trustedClient: UserClient, params: ClientParams, expect: any, ExpectErrorCode: any): Promise<void>;
+declare function runSingleFeeTests(_ignore_nodes: LocalNode[], userClient: UserClient, trustedClient: UserClient, params: ClientParams, expect: any, ExpectErrorCode: any): Promise<void>;
+declare function runMultipleFeeTests(_ignore_nodes: LocalNode[], userClient: UserClient, trustedClient: UserClient, params: ClientParams, expect: any, ExpectErrorCode: any): Promise<void>;
 declare function runBuilderStorageTests(_ignoreNodes: LocalNode[], userClient: UserClient, trustedClient: UserClient, params: ClientParams, expect: any, ExpectErrorCode: any): Promise<void>;
 declare function runMultiSigTests(nodes: LocalNode[], userClient: UserClient, trustedClient: UserClient, params: ClientParams, expect: any, ExpectErrorCode: any): Promise<void>;
 declare function runRecoverAccountTest(nodes: LocalNode[], userClient: UserClient, trustedClient: UserClient, params: ClientParams, expect: any, ExpectErrorCode: any): Promise<void>;
@@ -62,8 +63,8 @@ export declare const clientTests: {
             count: number;
         };
     };
-    'Fee Block Tests': {
-        test: typeof runFeeBlockTests;
+    'Single Fee Tests': {
+        test: typeof runSingleFeeTests;
         options: {
             p2pTested: boolean;
             count: number;
@@ -76,6 +77,24 @@ export declare const clientTests: {
             }[];
         };
     };
+    'Multiple Fee Tests': {
+        test: typeof runMultipleFeeTests;
+        options: {
+            p2pTested: boolean;
+            count: number;
+            customNodeOptions: {
+                ledger: {
+                    computeFeeFromBlocks: (ledger: Ledger, blocks: Block[], effects: ComputedEffectOfBlocks) => ({
+                        amount: bigint;
+                        token?: undefined;
+                    } | {
+                        amount: bigint;
+                        token: Account<AccountKeyAlgorithm.TOKEN>;
+                    })[];
+                };
+            }[];
+        };
+    };
     'Builder/Storage Test': {
         test: typeof runBuilderStorageTests;
         options: {

package/client/index-browser.d.ts

@@ -10,16 +10,17 @@
  */
 import KeetaNet from '../lib';
 import type { GenericAccount, IdentifierKeyAlgorithm, NetworkAddress, TokenAddress } from '../lib/account';
-import Account from '../lib/account';
+import Account, { AccountKeyAlgorithm } from '../lib/account';
 import type { AdjustMethod } from '../lib/block';
 import Block, { BlockHash } from '../lib/block';
+import type { DistributiveOmit } from '../lib/utils/helper';
 import type { P2PSwitchStatistics } from '../lib/p2p';
 import * as Config from '../config';
 import type { BaseNetworkInfo, BaseTokenInfo } from '../lib/utils/initial';
 import type { BuilderOptions, ManageCertificateMethod, PendingAccount } from './builder';
 import { UserClientBuilder } from './builder';
 import { KeetaNetError } from '../lib/error';
-import type { AccountInfo, GetAllBalancesResponse, ACLRow, LedgerStatistics } from '../lib/ledger/types';
+import type { GetAllBalancesResponse, ACLRow, LedgerStatistics, AccountInfoForType, AccountInfoWithoutAccount } from '../lib/ledger/types';
 import type { LedgerSelector, LedgerStorage } from '../lib/ledger';
 import type { AcceptedPermissionTypes } from '../lib/permissions';
 import type { IdentifierCreateArguments, BlockOperations } from '../lib/block/operations';
@@ -33,11 +34,11 @@ type VoteBlocksHash = Vote['blocksHash'];
  * @expandType AccountInfo
  * @expandType GetAllBalancesResponse
  */
-type GetAccountStateAPIResponseFormatted = {
+type GetAccountStateAPIResponseFormatted<AccountType extends AccountKeyAlgorithm = AccountKeyAlgorithm> = {
     /**
      * The account for which this information is for
      */
-    account: GenericAccount;
+    account: Account<AccountType>;
     /**
      * The current head block for the account, if there is one
      * this will be null if the account is not open
@@ -58,7 +59,7 @@ type GetAccountStateAPIResponseFormatted = {
      * Metadata for the account which can be set with the
      * {@link UserClient['setInfo']}() method
      */
-    info: AccountInfo;
+    info: DistributiveOmit<AccountInfoForType<AccountType>, 'account'>;
     /**
      * The balances for the account
      * Each token will have a balance, even if it is 0
@@ -115,7 +116,7 @@ interface PrincipalACLWithInfoParsed {
     /**
      * Metadata for the `entity`
      */
-    info: AccountInfo;
+    info: AccountInfoWithoutAccount;
     /**
      * The balances for the `entity`
      */
@@ -410,7 +411,7 @@ export declare class Client {
      * @param account The account to fetch the information for
      * @return The account information
      */
-    getAccountInfo(account: GenericAccount | string, rep?: ClientRepresentative | 'ANY'): Promise<GetAccountStateAPIResponseFormatted>;
+    getAccountInfo<AccountType extends AccountKeyAlgorithm>(account: Account<AccountType> | string, rep?: ClientRepresentative | 'ANY'): Promise<GetAccountStateAPIResponseFormatted<AccountType>>;
     /**
      * Fetch the account information for multiple accounts.  This will return
      * the account information including the current head block, representative,
@@ -672,14 +673,14 @@ export declare class Client {
             representativeCount: number;
             db: import("../lib/stats").DbStats;
             settlementTimes: import("../lib/stats").TimeStats;
-        };
+        } & {};
         switch: {
             incomingMessages: number;
             outgoingMessagesPeerSuccess: number;
             outgoingMessagesPeerFailure: number;
             outgoingMessagesPeerFiltered: number;
             outgoingMessagesPeerFailureUngreeted: number;
-        };
+        } & {};
     })[]>;
     /**
      * Update this client's view of the network representatives.
@@ -765,7 +766,7 @@ export declare class Client {
         moment: string;
         momentRange: number;
         checksum: string;
-    }>;
+    } & {}>;
     /**
      * Get the version of the node for a given representative, if no
      * representative is specified then the version of the "best"
@@ -1084,7 +1085,7 @@ export declare class UserClient {
      * @param options The options to use for the request
      * @return The vote staple that was generated and whether it was able to be published
      */
-    setInfo(info: AccountInfo, options?: UserClientOptions): Promise<{
+    setInfo(info: AccountInfoWithoutAccount, options?: UserClientOptions): Promise<{
         voteStaple: VoteStaple;
         publish: boolean;
         from: "direct";