Apply updates from core

Author: joon9823

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@initia/initia.js",
-  "version": "0.2.28",
+  "version": "0.2.29",
   "description": "The JavaScript SDK for Initia",
   "license": "Apache-2.0",
   "author": "Initia Foundation",
@@ -57,7 +57,7 @@
   },
   "dependencies": {
     "@bitcoinerlab/secp256k1": "^1.1.1",
-    "@initia/initia.proto": "^0.2.5",
+    "@initia/initia.proto": "^0.2.6",
     "@initia/opinit.proto": "^0.0.11",
     "@ledgerhq/hw-transport": "^6.31.4",
     "@ledgerhq/hw-transport-webhid": "^6.29.4",

package.json

@@ -30,6 +30,15 @@ export class MarketmapAPI extends BaseAPI {
       })
   }
 
+  /**
+   * Query all stored markets in the marketmap module as a sorted list.
+   */
+  public async markets(params: APIParams = {}): Promise<Market[]> {
+    return this.c
+      .get<{ markets: Market.Data[] }>(`/connect/marketmap/v2/markets`, params)
+      .then((d) => d.markets.map(Market.fromData))
+  }
+
   /**
    * Query the market stored in the marketmap module.
    * @param pair the currency pair associated with the market being requested

src/client/rest/api/MarketmapAPI.ts

@@ -131,6 +131,7 @@ import {
   MsgCreateMarkets,
   MsgUpdateMarkets,
   MsgUpsertMarkets,
+  MsgRemoveMarkets,
   MsgRemoveMarketAuthorities,
   MsgUpdateMarketmapParams,
 } from './marketmap/msgs'
@@ -202,7 +203,6 @@ import {
   MsgChangeAdmin,
   MsgSetDenomMetadataWasm,
   MsgSetBeforeSendHook,
-  MsgForceTransfer,
   MsgUpdateTokenfactoryParams,
 } from './tokenfactory'
 import { UpgradeMsg, MsgSoftwareUpgrade, MsgCancelUpgrade } from './upgrade'
@@ -537,6 +537,8 @@ export namespace Msg {
         return MsgUpdateMarkets.fromAmino(data)
       case 'connect/x/marketmap/MsgUpsertMarkets':
         return MsgUpsertMarkets.fromAmino(data)
+      case 'connect/x/marketmap/MsgRemoveMarkets':
+        return MsgRemoveMarkets.fromAmino(data)
       case 'connect/x/marketmap/MsgRemoveMarketAuthorities':
         return MsgRemoveMarketAuthorities.fromAmino(data)
       case 'connect/x/marketmap/MsgParams':
@@ -661,8 +663,6 @@ export namespace Msg {
         return MsgSetDenomMetadataWasm.fromAmino(data)
       case 'tokenfactory/MsgSetBeforeSendHook':
         return MsgSetBeforeSendHook.fromAmino(data)
-      case 'tokenfactory/MsgForceTransfer':
-        return MsgForceTransfer.fromAmino(data)
       case 'tokenfactory/MsgUpdateParams':
         return MsgUpdateTokenfactoryParams.fromAmino(data)
 
@@ -947,6 +947,8 @@ export namespace Msg {
         return MsgUpdateMarkets.fromData(data)
       case '/connect.marketmap.v2.MsgUpsertMarkets':
         return MsgUpsertMarkets.fromData(data)
+      case '/connect.marketmap.v2.MsgRemoveMarkets':
+        return MsgRemoveMarkets.fromData(data)
       case '/connect.marketmap.v2.MsgRemoveMarketAuthorities':
         return MsgRemoveMarketAuthorities.fromData(data)
       case '/connect.marketmap.v2.MsgParams':
@@ -1071,8 +1073,6 @@ export namespace Msg {
         return MsgSetDenomMetadataWasm.fromData(data)
       case '/miniwasm.tokenfactory.v1.MsgSetBeforeSendHook':
         return MsgSetBeforeSendHook.fromData(data)
-      case '/miniwasm.tokenfactory.v1.MsgForceTransfer':
-        return MsgForceTransfer.fromData(data)
       case '/miniwasm.tokenfactory.v1.MsgUpdateParams':
         return MsgUpdateTokenfactoryParams.fromData(data)
 
@@ -1357,6 +1357,8 @@ export namespace Msg {
         return MsgUpdateMarkets.unpackAny(proto)
       case '/connect.marketmap.v2.MsgUpsertMarkets':
         return MsgUpsertMarkets.unpackAny(proto)
+      case '/connect.marketmap.v2.MsgRemoveMarkets':
+        return MsgRemoveMarkets.unpackAny(proto)
       case '/connect.marketmap.v2.MsgRemoveMarketAuthorities':
         return MsgRemoveMarketAuthorities.unpackAny(proto)
       case '/connect.marketmap.v2.MsgParams':
@@ -1481,8 +1483,6 @@ export namespace Msg {
         return MsgSetDenomMetadataWasm.unpackAny(proto)
       case '/miniwasm.tokenfactory.v1.MsgSetBeforeSendHook':
         return MsgSetBeforeSendHook.unpackAny(proto)
-      case '/miniwasm.tokenfactory.v1.MsgForceTransfer':
-        return MsgForceTransfer.unpackAny(proto)
       case '/miniwasm.tokenfactory.v1.MsgUpdateParams':
         return MsgUpdateTokenfactoryParams.unpackAny(proto)
 

src/core/Msg.ts

@@ -0,0 +1,101 @@
+import { JSONSerializable } from '../../../util/json'
+import { AccAddress } from '../../bech32'
+import { Any } from '@initia/initia.proto/google/protobuf/any'
+import { MsgRemoveMarkets as MsgRemoveMarkets_pb } from '@initia/initia.proto/connect/marketmap/v2/tx'
+import { Market } from '../Market'
+
+/**
+ * MsgRemoveMarkets removes the given markets from the marketmap if they exist in the map and if they are disabled.
+ */
+export class MsgRemoveMarkets extends JSONSerializable<
+  MsgRemoveMarkets.Amino,
+  MsgRemoveMarkets.Data,
+  MsgRemoveMarkets.Proto
+> {
+  /**
+   * @param authority the signer of this transaction
+   * @param markets the list of markets to remove
+   */
+  constructor(
+    public authority: AccAddress,
+    public markets: string[]
+  ) {
+    super()
+  }
+
+  public static fromAmino(data: MsgRemoveMarkets.Amino): MsgRemoveMarkets {
+    const {
+      value: { authority, markets },
+    } = data
+    return new MsgRemoveMarkets(authority, markets)
+  }
+
+  public toAmino(): MsgRemoveMarkets.Amino {
+    const { authority, markets } = this
+    return {
+      type: 'connect/x/marketmap/MsgRemoveMarkets',
+      value: {
+        authority,
+        markets,
+      },
+    }
+  }
+
+  public static fromData(data: MsgRemoveMarkets.Data): MsgRemoveMarkets {
+    const { authority, markets } = data
+    return new MsgRemoveMarkets(authority, markets)
+  }
+
+  public toData(): MsgRemoveMarkets.Data {
+    const { authority, markets } = this
+    return {
+      '@type': '/connect.marketmap.v2.MsgRemoveMarkets',
+      authority,
+      markets,
+    }
+  }
+
+  public static fromProto(data: MsgRemoveMarkets.Proto): MsgRemoveMarkets {
+    return new MsgRemoveMarkets(
+      data.authority,
+      data.markets
+    )
+  }
+
+  public toProto(): MsgRemoveMarkets.Proto {
+    const { authority, markets } = this
+    return MsgRemoveMarkets_pb.fromPartial({
+      authority,
+      markets,
+    })
+  }
+
+  public packAny(): Any {
+    return Any.fromPartial({
+      typeUrl: '/connect.marketmap.v2.MsgRemoveMarkets',
+      value: MsgRemoveMarkets_pb.encode(this.toProto()).finish(),
+    })
+  }
+
+  public static unpackAny(msgAny: Any): MsgRemoveMarkets {
+    return MsgRemoveMarkets.fromProto(MsgRemoveMarkets_pb.decode(msgAny.value))
+  }
+}
+
+export namespace MsgRemoveMarkets {
+  export interface Amino {
+    type: 'connect/x/marketmap/MsgRemoveMarkets'
+    value: {
+      authority: AccAddress
+      markets: string[]
+    }
+  }
+
+  export interface Data {
+    '@type': '/connect.marketmap.v2.MsgRemoveMarkets'
+    authority: AccAddress
+    markets: string[]
+  }
+
+  export type Proto = MsgRemoveMarkets_pb
+}

src/core/marketmap/msgs/MsgRemoveMarkets.ts

@@ -1,19 +1,22 @@
 import { MsgCreateMarkets } from './MsgCreateMarkets'
 import { MsgUpdateMarkets } from './MsgUpdateMarkets'
 import { MsgUpsertMarkets } from './MsgUpsertMarkets'
+import { MsgRemoveMarkets } from './MsgRemoveMarkets'
 import { MsgRemoveMarketAuthorities } from './MsgRemoveMarketAuthorities'
 import { MsgUpdateMarketmapParams } from './MsgUpdateMarketmapParams'
 
 export * from './MsgCreateMarkets'
 export * from './MsgUpdateMarkets'
 export * from './MsgUpsertMarkets'
+export * from './MsgRemoveMarkets'
 export * from './MsgRemoveMarketAuthorities'
 export * from './MsgUpdateMarketmapParams'
 
 export type MarketmapMsg =
   | MsgCreateMarkets
   | MsgUpdateMarkets
   | MsgUpsertMarkets
+  | MsgRemoveMarkets
   | MsgRemoveMarketAuthorities
   | MsgUpdateMarketmapParams
 
@@ -22,20 +25,23 @@ export namespace MarketmapMsg {
     | MsgCreateMarkets.Amino
     | MsgUpdateMarkets.Amino
     | MsgUpsertMarkets.Amino
+    | MsgRemoveMarkets.Amino
     | MsgRemoveMarketAuthorities.Amino
     | MsgUpdateMarketmapParams.Amino
 
   export type Data =
     | MsgCreateMarkets.Data
     | MsgUpdateMarkets.Data
     | MsgUpsertMarkets.Data
+    | MsgRemoveMarkets.Data
     | MsgRemoveMarketAuthorities.Data
     | MsgUpdateMarketmapParams.Data
 
   export type Proto =
     | MsgCreateMarkets.Proto
     | MsgUpdateMarkets.Proto
     | MsgUpsertMarkets.Proto
+    | MsgRemoveMarkets.Proto
     | MsgRemoveMarketAuthorities.Proto
     | MsgUpdateMarketmapParams.Proto
 }

src/core/marketmap/msgs/index.ts

@@ -17,65 +17,59 @@ export class MsgBurn extends JSONSerializable<
   /**
    * @param sender
    * @param amount
-   * @param burn_from_address
    */
   constructor(
     public sender: AccAddress,
     public amount: Coin,
-    public burn_from_address: AccAddress
   ) {
     super()
   }
 
   public static fromAmino(data: MsgBurn.Amino): MsgBurn {
     const {
-      value: { sender, amount, burn_from_address },
+      value: { sender, amount },
     } = data
 
-    return new MsgBurn(sender, Coin.fromAmino(amount), burn_from_address)
+    return new MsgBurn(sender, Coin.fromAmino(amount))
   }
 
   public toAmino(): MsgBurn.Amino {
-    const { sender, amount, burn_from_address } = this
+    const { sender, amount } = this
     return {
       type: 'tokenfactory/MsgBurn',
       value: {
         sender,
         amount: amount.toAmino(),
-        burn_from_address,
       },
     }
   }
 
   public static fromData(data: MsgBurn.Data): MsgBurn {
-    const { sender, amount, burn_from_address } = data
-    return new MsgBurn(sender, Coin.fromData(amount), burn_from_address)
+    const { sender, amount } = data
+    return new MsgBurn(sender, Coin.fromData(amount))
   }
 
   public toData(): MsgBurn.Data {
-    const { sender, amount, burn_from_address } = this
+    const { sender, amount } = this
     return {
       '@type': '/miniwasm.tokenfactory.v1.MsgBurn',
       sender,
       amount: amount.toData(),
-      burn_from_address,
     }
   }
 
   public static fromProto(data: MsgBurn.Proto): MsgBurn {
     return new MsgBurn(
       data.sender,
-      Coin.fromProto(data.amount as Coin.Proto),
-      data.burnFromAddress
+      Coin.fromProto(data.amount as Coin.Proto)
     )
   }
 
   public toProto(): MsgBurn.Proto {
-    const { sender, amount, burn_from_address } = this
+    const { sender, amount } = this
     return MsgBurn_pb.fromPartial({
       sender,
       amount: amount.toProto(),
-      burnFromAddress: burn_from_address,
     })
   }
 
@@ -97,15 +91,13 @@ export namespace MsgBurn {
     value: {
       sender: AccAddress
       amount: Coin.Amino
-      burn_from_address: AccAddress
     }
   }
 
   export interface Data {
     '@type': '/miniwasm.tokenfactory.v1.MsgBurn'
     sender: AccAddress
     amount: Coin.Data
-    burn_from_address: AccAddress
   }
 
   export type Proto = MsgBurn_pb