@ritbit/v4-client-js 2.2.2 → 2.2.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ritbit/v4-client-js",
-  "version": "2.2.2",
+  "version": "2.2.4",
   "description": "General client library for the new RITBIT Chain",
   "main": "build/cjs/src/index.js",
   "module": "build/esm/src/index.js",
@@ -57,7 +57,7 @@
     "@cosmjs/tendermint-rpc": "^0.32.4",
     "@cosmjs/utils": "^0.32.4",
     "@osmonauts/lcd": "^0.6.0",
-    "@ritbit/v4-proto": "^2.0.3",
+    "@ritbit/v4-proto": "^2.0.4",
     "@scure/bip32": "^1.1.5",
     "@scure/bip39": "^1.1.1",
     "axios": "1.1.3",

package/scripts/publish-if-not-exists.sh

@@ -12,8 +12,8 @@ if [ $? -eq 0 ]; then
 	# git config --global user.name "gitlab_actions"
 
 	# Get version and tag
-	git tag ritbit-client-js@${VERSION}
-	git push --tags
+	# git tag ritbit-client-js@${VERSION}
+	# git push --tags
 
 	npm publish
 else

package/src/clients/composite-client.ts

@@ -1,3 +1,4 @@
+import { Coin } from '@cosmjs/amino';
 import { EncodeObject } from '@cosmjs/proto-signing';
 import { Account, GasPrice, IndexedTx, StdFee } from '@cosmjs/stargate';
 import { Method, tendermint37 } from '@cosmjs/tendermint-rpc';
@@ -187,6 +188,8 @@ export class CompositeClient {
     memo?: string,
     broadcastMode?: BroadcastMode,
     account?: () => Promise<Account>,
+    gasAdjustment?: number,
+    additionalFeeCoins?: Coin[],
   ): Promise<BroadcastTxAsyncResponse | BroadcastTxSyncResponse | IndexedTx> {
     return this.validatorClient.post.send(
       subaccount,
@@ -196,7 +199,8 @@ export class CompositeClient {
       memo,
       broadcastMode,
       account,
-      undefined,
+      gasAdjustment,
+      additionalFeeCoins,
     );
   }
 

package/src/clients/modules/composer.ts

@@ -69,7 +69,7 @@ import {
   SubaccountId,
   MsgCreateMarketPermissionless,
   MsgCreateTransfer,
-  Transfer,
+  MsgTransfer,
   MsgDepositToSubaccount,
   MsgWithdrawFromSubaccount,
 } from './proto-includes';
@@ -270,7 +270,7 @@ export class Composer {
       number: recipientSubaccountNumber,
     };
 
-    const transfer: Transfer = {
+    const transfer: MsgTransfer = {
       sender,
       recipient,
       assetId,

package/src/clients/modules/get.ts

@@ -468,6 +468,23 @@ export class Get {
     return DistributionModule.QueryDelegationTotalRewardsResponse.decode(data);
   }
 
+  /**
+   * @description Get bridge EventParams (chains, token mappings, withdrawal fees).
+   *
+   * @returns EventParams with bridge config including withdrawal_fee per TokenMapping
+   */
+  async getBridgeEventParams(): Promise<BridgeModule.QueryEventParamsResponse> {
+    const requestData = Uint8Array.from(
+      BridgeModule.QueryEventParamsRequest.encode({}).finish(),
+    );
+
+    const data: Uint8Array = await this.sendQuery(
+      '/ritbit.bridge.Query/EventParams',
+      requestData,
+    );
+    return BridgeModule.QueryEventParamsResponse.decode(data);
+  }
+
   /**
    * @description Get all delayed complete bridge messages, optionally filtered by address.
    *

package/src/clients/modules/markets.ts

@@ -6,6 +6,11 @@ import RestClient from './rest';
  * @description REST endpoints for data unrelated to a particular address.
  */
 export default class MarketsClient extends RestClient {
+  async getAssets(): Promise<Data> {
+    const uri = '/v4/assets';
+    return this.get(uri);
+  }
+
   async getPerpetualMarkets(market?: string): Promise<Data> {
     const uri = '/v4/perpetualMarkets';
     return this.get(uri, { ticker: market });

package/src/clients/modules/post.ts

@@ -188,6 +188,7 @@ export class Post {
     broadcastMode?: BroadcastMode,
     account?: () => Promise<Account>,
     gasAdjustment: number = GAS_MULTIPLIER,
+    additionalFeeCoins?: Coin[],
   ): Promise<BroadcastTxAsyncResponse | BroadcastTxSyncResponse | IndexedTx> {
     const msgsPromise = messaging();
     const accountPromise = account ? await account() : this.account(subaccount.address);
@@ -203,6 +204,7 @@ export class Post {
       memo ?? this.defaultClientMemo,
       broadcastMode ?? this.defaultBroadcastMode(msgs),
       gasAdjustment,
+      additionalFeeCoins,
     );
   }
 
@@ -248,13 +250,14 @@ export class Post {
     gasPrice: GasPrice = this.getGasPrice(),
     memo?: string,
     gasAdjustment: number = GAS_MULTIPLIER,
+    additionalFeeCoins?: Coin[],
   ): Promise<Uint8Array> {
     // protocol expects timestamp nonce in UTC milliseconds, which is the unit returned by Date.now()
     const sequence = this.useTimestampNonce
       ? Date.now() + this.timestampNonceOffsetMs
       : account.sequence;
     // Simulate transaction if no fee is specified.
-    const fee: StdFee = zeroFee
+    let fee: StdFee = zeroFee
       ? {
           amount: [],
           gas: '1000000',
@@ -268,6 +271,22 @@ export class Post {
           gasAdjustment,
         );
 
+    if (additionalFeeCoins && additionalFeeCoins.length > 0) {
+      const byDenom = new Map<string, string>();
+      for (const c of fee.amount) {
+        const cur = byDenom.get(c.denom) ?? '0';
+        byDenom.set(c.denom, (BigInt(cur) + BigInt(c.amount)).toString());
+      }
+      for (const c of additionalFeeCoins) {
+        const cur = byDenom.get(c.denom) ?? '0';
+        byDenom.set(c.denom, (BigInt(cur) + BigInt(c.amount)).toString());
+      }
+      fee = {
+        ...fee,
+        amount: Array.from(byDenom.entries()).map(([denom, amount]) => ({ denom, amount })),
+      };
+    }
+
     const txOptions: TransactionOptions = {
       sequence,
       accountNumber: account.accountNumber,
@@ -310,6 +329,7 @@ export class Post {
     memo?: string,
     broadcastMode?: BroadcastMode,
     gasAdjustment: number = GAS_MULTIPLIER,
+    additionalFeeCoins?: Coin[],
   ): Promise<BroadcastTxAsyncResponse | BroadcastTxSyncResponse | IndexedTx> {
     const signedTransaction = await this.signTransaction(
       subaccount,
@@ -319,6 +339,7 @@ export class Post {
       gasPrice,
       memo,
       gasAdjustment,
+      additionalFeeCoins,
     );
     return this.sendSignedTransaction(signedTransaction, broadcastMode);
   }

package/src/lib/validation.ts

@@ -3,7 +3,7 @@ import Long from 'long';
 
 import { BECH32_PREFIX, MAX_SUBACCOUNT_NUMBER, MAX_UINT_32 } from '../clients/constants';
 import {
-  Transfer,
+  MsgTransfer,
   OrderFlags,
   ICancelOrder,
   IPlaceOrder,
@@ -116,7 +116,7 @@ export function validateBatchCancelOrderMessage(
  * @describe validateTransferMessage validates that a transfer to place has fields that would be
  *  valid on-chain.
  */
-export function validateTransferMessage(transfer: Transfer): UserError | undefined {
+export function validateTransferMessage(transfer: MsgTransfer): UserError | undefined {
   if (!verifySubaccountNumber(transfer.sender!!.number || 0)) {
     return new UserError(
       `senderSubaccountNumber: ${

package/src/lib/vesting.ts

@@ -1,6 +1,14 @@
 import { Any } from 'cosmjs-types/google/protobuf/any';
 import * as Vesting from 'cosmjs-types/cosmos/vesting/v1beta1/vesting';
 
+/** Один период вестинга (для PeriodicVestingAccount). */
+export interface VestingPeriod {
+  /** Длительность периода в секундах. */
+  lengthSec: number;
+  /** Монеты, разблокируемые в конце периода. */
+  amount: Array<{ denom: string; amount: string }>;
+}
+
 /**
  * Нормализованная информация о вестинг-аккаунте, достаточная для расчёта
  * разблокированной суммы. Типы Continuous/Delayed/Periodic/Base сводятся к этому виду.
@@ -12,6 +20,8 @@ export interface VestingInfo {
   startTimeSec: number;
   /** Конец вестинга (Unix секунды). */
   endTimeSec: number;
+  /** Периоды (только для PeriodicVestingAccount). */
+  vestingPeriods?: VestingPeriod[];
 }
 
 const VESTING_TYPE_URLS = [
@@ -74,6 +84,10 @@ export function decodeVestingFromAny(raw: Any): VestingInfo | null {
           })),
           startTimeSec: bigintToNumber(acc.startTime),
           endTimeSec: bigintToNumber(base.endTime),
+          vestingPeriods: acc.vestingPeriods.map((p) => ({
+            lengthSec: bigintToNumber(p.length),
+            amount: p.amount.map((c) => ({ denom: c.denom, amount: c.amount })),
+          })),
         };
       }
       case '/cosmos.vesting.v1beta1.BaseVestingAccount': {
@@ -98,7 +112,10 @@ export function decodeVestingFromAny(raw: Any): VestingInfo | null {
 
 /**
  * Считает разблокированную сумму в base units для денома по VestingInfo.
- * Линейная разблокировка от startTimeSec до endTimeSec.
+ *
+ * - Continuous / Delayed / Base: линейная разблокировка от startTimeSec до endTimeSec.
+ * - Periodic: каждый период — клифф; сумма периода разблокируется целиком
+ *   по истечении его длительности (start + Σ lengths предыдущих + length текущего).
  */
 export function computeUnlockedAmount(
   info: VestingInfo,
@@ -112,6 +129,23 @@ export function computeUnlockedAmount(
   const nowSec = Math.floor(Date.now() / 1000);
   if (nowSec <= startTimeSec) return '0';
   if (nowSec >= endTimeSec) return entry.amount;
+
+  // Periodic: считаем по периодам (клиффы)
+  if (info.vestingPeriods?.length) {
+    let unlocked = BigInt(0);
+    let periodStartSec = startTimeSec;
+    for (const p of info.vestingPeriods) {
+      const periodEndSec = periodStartSec + p.lengthSec;
+      if (nowSec >= periodEndSec) {
+        const periodAmount = p.amount.find((c) => c.denom === denom)?.amount ?? '0';
+        unlocked += BigInt(periodAmount);
+      }
+      periodStartSec = periodEndSec;
+    }
+    return String(unlocked);
+  }
+
+  // Linear (Continuous / Delayed / Base)
   const period = endTimeSec - startTimeSec;
   const elapsed = nowSec - startTimeSec;
   const unlocked = (total * BigInt(elapsed)) / BigInt(period);