@ritbit/v4-client-js 2.2.6 → 2.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ritbit/v4-client-js",
-  "version": "2.2.6",
+  "version": "2.3.0",
   "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.4",
+    "@ritbit/v4-proto": "^2.1.0",
     "@scure/bip32": "^1.1.5",
     "@scure/bip39": "^1.1.1",
     "axios": "1.1.3",

package/src/clients/composite-client.ts

@@ -1007,21 +1007,19 @@ export class CompositeClient {
    * @description Create message to withdraw from account to EVM chain (bridge withdrawal).
    *
    * @param sender Cosmos address of the sender
-   * @param ethTokenAddress Address of the token on EVM chain
    * @param amount Amount in min units (string)
    * @param ethRecipient Recipient address on EVM chain
    * @param ethChainId Target EVM chain ID
-   * @param denom Token denom in Cosmos
+   * @param assetId Asset ID in Cosmos
    *
    * @returns The message
    */
   withdrawalMessage(
     sender: string,
-    ethTokenAddress: string,
     amount: string,
     ethRecipient: string,
     ethChainId: number,
-    denom: string,
+    assetId: number,
   ): EncodeObject {
     const validatorClient = this._validatorClient;
     if (validatorClient === undefined) {
@@ -1030,11 +1028,10 @@ export class CompositeClient {
 
     return this.validatorClient.post.composer.composeMsgWithdrawal(
       sender,
-      ethTokenAddress,
       amount,
       ethRecipient,
-      Long.fromNumber(ethChainId),
-      denom,
+      ethChainId,
+      assetId,
     );
   }
 

package/src/clients/constants.ts

@@ -109,7 +109,7 @@ export const TYPE_URL_MSG_WITHDRAW_DELEGATOR_REWARD =
   '/cosmos.distribution.v1beta1.MsgWithdrawDelegatorReward';
 
 // x/bridge
-export const TYPE_URL_MSG_INITIATE_WITHDRAWAL = '/ritbit.bridge.MsgInitiateWithdrawal';
+export const TYPE_URL_MSG_WITHDRAWAL = '/ritbit.bridge.MsgWithdrawal';
 
 // x/accountplus
 export const TYPE_URL_MSG_ADD_AUTHENTICATOR = '/ritbit.accountplus.MsgAddAuthenticator';

package/src/clients/lib/registry.ts

@@ -22,7 +22,7 @@ import {
   MsgDepositToMegavault,
   MsgWithdrawFromMegavault,
 } from '@ritbit/v4-proto/src/codegen/ritbit/vault/tx';
-import { MsgInitiateWithdrawal } from '@ritbit/v4-proto/src/codegen/ritbit/bridge/tx';
+import { MsgWithdrawal } from '@ritbit/v4-proto/src/codegen/ritbit/bridge/tx';
 
 import {
   TYPE_URL_MSG_PLACE_ORDER,
@@ -42,7 +42,7 @@ import {
   TYPE_URL_MSG_CREATE_MARKET_PERMISSIONLESS,
   TYPE_URL_MSG_ADD_AUTHENTICATOR,
   TYPE_URL_MSG_REMOVE_AUTHENTICATOR,
-  TYPE_URL_MSG_INITIATE_WITHDRAWAL,
+  TYPE_URL_MSG_WITHDRAWAL,
 } from '../constants';
 
 export const registry: ReadonlyArray<[string, GeneratedType]> = [];
@@ -85,7 +85,7 @@ export function generateRegistry(): Registry {
     [TYPE_URL_MSG_REMOVE_AUTHENTICATOR, MsgRemoveAuthenticator as GeneratedType],
 
     // bridge
-    [TYPE_URL_MSG_INITIATE_WITHDRAWAL, MsgInitiateWithdrawal as GeneratedType],
+    [TYPE_URL_MSG_WITHDRAWAL, MsgWithdrawal as GeneratedType],
 
     // default types
     ...defaultRegistryTypes,

package/src/clients/modules/composer.ts

@@ -20,7 +20,7 @@ import { MsgDelayMessage } from '@ritbit/v4-proto/src/codegen/ritbit/delaymsg/tx
 import { PerpetualMarketType } from '@ritbit/v4-proto/src/codegen/ritbit/perpetuals/perpetual';
 import { MsgCreatePerpetual } from '@ritbit/v4-proto/src/codegen/ritbit/perpetuals/tx';
 import { MsgCreateOracleMarket } from '@ritbit/v4-proto/src/codegen/ritbit/prices/tx';
-import { MsgInitiateWithdrawal } from '@ritbit/v4-proto/src/codegen/ritbit/bridge/tx';
+import { MsgWithdrawal } from '@ritbit/v4-proto/src/codegen/ritbit/bridge/tx';
 import {
   MsgDepositToMegavault,
   MsgWithdrawFromMegavault,
@@ -56,7 +56,7 @@ import {
   TYPE_URL_MSG_CREATE_MARKET_PERMISSIONLESS,
   TYPE_URL_MSG_ADD_AUTHENTICATOR,
   TYPE_URL_MSG_REMOVE_AUTHENTICATOR,
-  TYPE_URL_MSG_INITIATE_WITHDRAWAL,
+  TYPE_URL_MSG_WITHDRAWAL,
   AuthenticatorType,
 } from '../constants';
 import { DenomConfig, ITwapParameters, IBuilderCodeParameters } from '../types';
@@ -340,23 +340,21 @@ export class Composer {
 
   public composeMsgWithdrawal(
     sender: string,
-    ethTokenAddress: string,
     amount: string,
     ethRecipient: string,
-    ethChainId: Long,
-    denom: string,
+    ethChainId: number,
+    assetId: number,
   ): EncodeObject {
-    const msg: MsgInitiateWithdrawal = {
+    const msg: MsgWithdrawal = {
       sender,
-      ethTokenAddress,
       amount,
       ethRecipient,
-      ethChainId,
-      denom,
+      ethChainId: Long.fromNumber(ethChainId),
+      assetId,
     };
 
     return {
-      typeUrl: TYPE_URL_MSG_INITIATE_WITHDRAWAL,
+      typeUrl: TYPE_URL_MSG_WITHDRAWAL,
       value: msg,
     };
   }