feat: token factory refact packaging and extend models

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@terra-money/feather.js",
-  "version": "2.0.0-beta.9",
+  "version": "2.0.0-beta.12",
   "description": "The JavaScript SDK for Terra and Feather chains",
   "license": "MIT",
   "author": "Terraform Labs, PTE.",

src/client/lcd/api/TokenFactoryAPI.ts

@@ -1,4 +1,3 @@
-import { APIParams } from '../APIRequester';
 import { LCDClient } from '../LCDClient';
 import { BaseAPI } from './BaseAPI';
 import { QueryParamsResponse } from '@terra-money/terra.proto/osmosis/tokenfactory/v1beta1/query';

src/core/Msg.ts

@@ -69,6 +69,14 @@ import {
   MsgClearContractAdmin,
   WasmMsg,
 } from './wasm/msgs';
+import {
+  MsgBurn,
+  MsgChangeAdmin,
+  MsgCreateDenom,
+  MsgMint,
+  MsgSetBeforeSendHook,
+  TokenFactoryMsg,
+} from './tokenfactory';
 import { JAXMsgExecuteContract, JAXMsgStoreCode, JaxMsg } from './jax/msgs';
 import { MsgTransfer, IbcTransferMsg } from './ibc/applications/transfer';
 import {
@@ -100,10 +108,6 @@ import {
 } from './ibc/msgs/channel';
 import { MsgVerifyInvariant, CrisisMsg } from './crisis';
 import { Any } from '@terra-money/terra.proto/google/protobuf/any';
-import { MsgCreateDenom } from './wasm/msgs/tokenfactory/MsgCreateDenom';
-import { MsgBurn } from './wasm/msgs/tokenfactory/MsgBurn';
-import { MsgChangeAdmin } from './wasm/msgs/tokenfactory/MsgChangeAdmin';
-import { MsgMint } from './wasm/msgs/tokenfactory/MsgMint';
 import { MsgAuctionBid } from './pob/MsgAuctionBid';
 import {
   FeeshareMsg,
@@ -116,6 +120,8 @@ import {
   MsgRegisterInterchainAccount,
   MsgSendTx,
 } from './ica/controller/v1/msgs';
+import { MsgForceTransfer } from './tokenfactory/MsgForceTransfer';
+import { MsgSetDenomMetadata } from './tokenfactory/MsgSetDenomMetadata';
 
 export type Msg =
   | BankMsg
@@ -138,7 +144,8 @@ export type Msg =
   | CrisisMsg
   | JaxMsg
   | MsgAuctionBid
-  | FeeshareMsg;
+  | FeeshareMsg
+  | TokenFactoryMsg;
 
 export namespace Msg {
   export type Amino =
@@ -158,7 +165,8 @@ export namespace Msg {
     | CrisisMsg.Amino
     | JaxMsg.Amino
     | MsgAuctionBid.Amino
-    | FeeshareMsg.Amino;
+    | FeeshareMsg.Amino
+    | TokenFactoryMsg.Amino;
 
   export type Data =
     | BankMsg.Data
@@ -181,7 +189,8 @@ export namespace Msg {
     | CrisisMsg.Data
     | JaxMsg.Data
     | MsgAuctionBid.Data
-    | FeeshareMsg.Data;
+    | FeeshareMsg.Data
+    | TokenFactoryMsg.Data;
 
   export type Proto =
     | BankMsg.Proto
@@ -203,7 +212,8 @@ export namespace Msg {
     | CrisisMsg.Proto
     | JaxMsg.Proto
     | MsgAuctionBid.Proto
-    | FeeshareMsg.Proto;
+    | FeeshareMsg.Proto
+    | TokenFactoryMsg.Proto;
 
   export function fromAmino(data: Msg.Amino, isClassic?: boolean): Msg {
     switch (data.type) {
@@ -444,6 +454,8 @@ export namespace Msg {
           data as MsgClearContractAdmin.Amino,
           isClassic
         );
+
+      //token-factory
       case 'osmosis/tokenfactory/create-denom':
         return MsgCreateDenom.fromAmino(data as MsgCreateDenom.Amino);
       case 'osmosis/tokenfactory/burn':
@@ -452,9 +464,19 @@ export namespace Msg {
         return MsgChangeAdmin.fromAmino(data as MsgChangeAdmin.Amino);
       case 'osmosis/tokenfactory/mint':
         return MsgMint.fromAmino(data as MsgMint.Amino);
+      case 'osmosis/tokenfactory/set-beforesend-hook':
+        return MsgSetBeforeSendHook.fromAmino(
+          data as MsgSetBeforeSendHook.Amino
+        );
+      case 'osmosis/tokenfactory/force-transfer':
+        return MsgForceTransfer.fromAmino(data as MsgForceTransfer.Amino);
+      case 'osmosis/tokenfactory/set-metadata':
+        return MsgSetDenomMetadata.fromAmino(data as MsgSetDenomMetadata.Amino);
+
       // ibc-transfer
       case 'cosmos-sdk/MsgTransfer':
         return MsgTransfer.fromAmino(data as MsgTransfer.Amino, isClassic);
+
       // crisis
       case 'crisis/MsgVerifyInvariant':
       case 'cosmos-sdk/MsgVerifyInvariant':
@@ -612,6 +634,8 @@ export namespace Msg {
       case '/terra.wasm.v1beta1.MsgClearContractAdmin':
       case '/cosmwasm.wasm.v1.MsgClearAdmin':
         return MsgClearContractAdmin.fromData(data, isClassic);
+
+      // token factory
       case '/osmosis.tokenfactory.v1beta1.MsgCreateDenom':
         return MsgCreateDenom.fromData(data);
       case '/osmosis.tokenfactory.v1beta1.MsgBurn':
@@ -620,6 +644,12 @@ export namespace Msg {
         return MsgChangeAdmin.fromData(data);
       case '/osmosis.tokenfactory.v1beta1.MsgMint':
         return MsgMint.fromData(data);
+      case '/osmosis.tokenfactory.v1beta1.MsgSetBeforeSendHook':
+        return MsgSetBeforeSendHook.fromData(data);
+      case '/osmosis.tokenfactory.v1beta1.MsgForceTransfer':
+        return MsgForceTransfer.fromData(data);
+      case '/osmosis.tokenfactory.v1beta1.MsgSetDenomMetadata':
+        return MsgSetDenomMetadata.fromData(data);
 
       // ibc-transfer
       case '/ibc.applications.transfer.v1.MsgTransfer':
@@ -816,6 +846,8 @@ export namespace Msg {
       case '/terra.wasm.v1beta1.MsgClearContractAdmin':
       case '/cosmwasm.wasm.v1.MsgClearAdmin':
         return MsgClearContractAdmin.unpackAny(proto, isClassic);
+
+      // token factory
       case '/osmosis.tokenfactory.v1beta1.MsgCreateDenom':
         return MsgCreateDenom.unpackAny(proto, isClassic);
       case '/osmosis.tokenfactory.v1beta1.MsgBurn':
@@ -824,6 +856,12 @@ export namespace Msg {
         return MsgChangeAdmin.unpackAny(proto, isClassic);
       case '/osmosis.tokenfactory.v1beta1.MsgMint':
         return MsgMint.unpackAny(proto, isClassic);
+      case '/osmosis.tokenfactory.v1beta1.MsgSetBeforeSendHook':
+        return MsgSetBeforeSendHook.unpackAny(proto);
+      case '/osmosis.tokenfactory.v1beta1.MsgForceTransfer':
+        return MsgForceTransfer.unpackAny(proto);
+      case '/osmosis.tokenfactory.v1beta1.MsgSetDenomMetadata':
+        return MsgSetDenomMetadata.unpackAny(proto);
 
       // ibc-transfer
       case '/ibc.applications.transfer.v1.MsgTransfer':

src/core/index.ts

@@ -109,5 +109,8 @@ export * from './ibc/applications/transfer';
 // Feeshare
 export * from './feeshare';
 
+// token factory
+export * from './tokenfactory';
+
 // bech32 types
 export * from './bech32';

src/core/wasm/msgs/tokenfactory/MsgBurn.spec.ts → src/core/tokenfactory/MsgBurn.spec.ts

@@ -1,4 +1,4 @@
-import { Coin } from '../../../Coin';
+import { Coin } from '../Coin';
 import { MsgBurn } from './MsgBurn';
 
 describe('MsgBurn', () => {

src/core/wasm/msgs/tokenfactory/MsgBurn.ts → src/core/tokenfactory/MsgBurn.ts

@@ -1,8 +1,8 @@
-import { JSONSerializable } from '../../../../util/json';
-import { AccAddress } from '../../../bech32';
+import { JSONSerializable } from '../../util/json';
+import { AccAddress } from '../bech32';
 import { Any } from '@terra-money/terra.proto/google/protobuf/any';
-import { MsgBurn as MsgBurn_pb } from '@terra-money/terra.proto/cosmwasm/tokenfactory/v1beta1/tx';
-import { Coin } from '../../../Coin';
+import { MsgBurn as MsgBurn_pb } from '@terra-money/terra.proto/osmosis/tokenfactory/v1beta1/tx';
+import { Coin } from '../Coin';
 
 /**
  * MsgBurn is the sdk.Msg type for allowing an admin account to burn

src/core/wasm/msgs/tokenfactory/MsgChangeAdmin.ts → src/core/tokenfactory/MsgChangeAdmin.ts

@@ -1,7 +1,7 @@
-import { JSONSerializable } from '../../../../util/json';
-import { AccAddress } from '../../../bech32';
+import { JSONSerializable } from '../../util/json';
+import { AccAddress } from '../bech32';
 import { Any } from '@terra-money/terra.proto/google/protobuf/any';
-import { MsgChangeAdmin as MsgChangeAdmin_pb } from '@terra-money/terra.proto/cosmwasm/tokenfactory/v1beta1/tx';
+import { MsgChangeAdmin as MsgChangeAdmin_pb } from '@terra-money/terra.proto/osmosis/tokenfactory/v1beta1/tx';
 
 // MsgChangeAdmin is the sdk.Msg type for allowing an admin account to reassign
 // adminship of a denom to a new account

src/core/wasm/msgs/tokenfactory/MsgCreateDenom.ts → src/core/tokenfactory/MsgCreateDenom.ts

@@ -1,7 +1,7 @@
-import { JSONSerializable } from '../../../../util/json';
-import { AccAddress } from '../../../bech32';
+import { JSONSerializable } from '../../util/json';
+import { AccAddress } from '../bech32';
 import { Any } from '@terra-money/terra.proto/google/protobuf/any';
-import { MsgCreateDenom as MsgCreateDenom_pb } from '@terra-money/terra.proto/cosmwasm/tokenfactory/v1beta1/tx';
+import { MsgCreateDenom as MsgCreateDenom_pb } from '@terra-money/terra.proto/osmosis/tokenfactory/v1beta1/tx';
 
 /**
  * MsgCreateDenom defines the message structure for the CreateDenom gRPC service

src/core/tokenfactory/MsgForceTransfer.ts

@@ -0,0 +1,144 @@
+import { DenomUnit } from '@terra-money/terra.proto/cosmos/bank/v1beta1/bank';
+import { JSONSerializable } from '../../util/json';
+import { AccAddress } from '../bech32';
+import { Any } from '@terra-money/terra.proto/google/protobuf/any';
+import { Metadata } from '@terra-money/terra.proto/cosmos/bank/v1beta1/bank';
+import { MsgForceTransfer as MsgForceTransfer_pb } from '@terra-money/terra.proto/osmosis/tokenfactory/v1beta1/tx';
+import { Coin } from '../Coin';
+
+/**
+ * MsgForceTransfer allows setting the metadata
+ * for an already existing denom
+ */
+export class MsgForceTransfer extends JSONSerializable<
+  MsgForceTransfer.Amino,
+  MsgForceTransfer.Data,
+  MsgForceTransfer.Proto
+> {
+  /**
+   *
+   * @param sender internal account or external sender address
+   * @param metadata the cosmwasm contract address
+   */
+  constructor(
+    public sender: AccAddress,
+    public amount: Coin,
+    public transferFromAddress: AccAddress,
+    public transferToAddress: AccAddress
+  ) {
+    super();
+  }
+
+  public toAmino(_?: boolean): MsgForceTransfer.Amino {
+    _;
+    const { sender, amount, transferFromAddress, transferToAddress } = this;
+
+    return {
+      type: 'osmosis/tokenfactory/force-transfer',
+      value: {
+        sender,
+        amount: amount.toAmino(),
+        transferFromAddress,
+        transferToAddress,
+      },
+    };
+  }
+
+  public static fromProto(
+    proto: MsgForceTransfer.Proto,
+    _?: boolean
+  ): MsgForceTransfer {
+    _;
+    return new MsgForceTransfer(
+      proto.sender,
+      Coin.fromProto(proto.amount as Coin.Proto),
+      proto.transferFromAddress,
+      proto.transferToAddress
+    );
+  }
+
+  public toProto(_?: boolean): MsgForceTransfer.Proto {
+    _;
+    const { sender, amount, transferFromAddress, transferToAddress } = this;
+    return MsgForceTransfer_pb.fromPartial({
+      sender,
+      amount: amount?.toProto(),
+      transferFromAddress,
+      transferToAddress,
+    });
+  }
+
+  public packAny(_?: boolean): Any {
+    _;
+    return Any.fromPartial({
+      typeUrl: '/osmosis.tokenfactory.v1beta1.MsgForceTransfer',
+      value: MsgForceTransfer_pb.encode(this.toProto()).finish(),
+    });
+  }
+
+  public static unpackAny(msgAny: Any, _?: boolean): MsgForceTransfer {
+    _;
+    return MsgForceTransfer.fromProto(MsgForceTransfer_pb.decode(msgAny.value));
+  }
+
+  public static fromData(
+    data: MsgForceTransfer.Data,
+    _?: boolean
+  ): MsgForceTransfer {
+    _;
+    const { sender, amount, transferFromAddress, transferToAddress } = data;
+    return new MsgForceTransfer(
+      sender,
+      Coin.fromData(amount),
+      transferFromAddress,
+      transferToAddress
+    );
+  }
+
+  public toData(_?: boolean): MsgForceTransfer.Data {
+    _;
+    const { sender, amount, transferFromAddress, transferToAddress } = this;
+    return {
+      '@type': '/osmosis.tokenfactory.v1beta1.MsgForceTransfer',
+      sender,
+      amount: amount.toData(),
+      transferFromAddress,
+      transferToAddress,
+    };
+  }
+
+  public static fromAmino(data: MsgForceTransfer.Amino): MsgForceTransfer {
+    const {
+      value: { sender, amount, transferFromAddress, transferToAddress },
+    } = data;
+
+    return new MsgForceTransfer(
+      sender,
+      Coin.fromAmino(amount),
+      transferFromAddress,
+      transferToAddress
+    );
+  }
+}
+
+export namespace MsgForceTransfer {
+  export interface Amino {
+    type: 'osmosis/tokenfactory/force-transfer';
+    value: {
+      sender: AccAddress;
+      amount: Coin.Amino;
+      transferFromAddress: AccAddress;
+      transferToAddress: AccAddress;
+    };
+  }
+
+  export interface Data {
+    '@type': '/osmosis.tokenfactory.v1beta1.MsgForceTransfer';
+    sender: AccAddress;
+    amount: Coin.Data;
+    transferFromAddress: AccAddress;
+    transferToAddress: AccAddress;
+  }
+
+  export type Proto = MsgForceTransfer_pb;
+}

src/core/wasm/msgs/tokenfactory/MsgMint.spec.ts → src/core/tokenfactory/MsgMint.spec.ts

@@ -1,4 +1,4 @@
-import { Coin } from '../../../Coin';
+import { Coin } from '../Coin';
 import { MsgMint } from './MsgMint';
 
 describe('MsgMint', () => {

src/core/wasm/msgs/tokenfactory/MsgMint.ts → src/core/tokenfactory/MsgMint.ts

@@ -1,8 +1,8 @@
-import { JSONSerializable } from '../../../../util/json';
-import { AccAddress } from '../../../bech32';
+import { JSONSerializable } from '../../util/json';
+import { AccAddress } from '../bech32';
 import { Any } from '@terra-money/terra.proto/google/protobuf/any';
-import { MsgMint as MsgMint_pb } from '@terra-money/terra.proto/cosmwasm/tokenfactory/v1beta1/tx';
-import { Coin } from '../../../Coin';
+import { MsgMint as MsgMint_pb } from '@terra-money/terra.proto/osmosis/tokenfactory/v1beta1/tx';
+import { Coin } from '../Coin';
 
 /**
  * MsgMint is the sdk.Msg type for allowing an admin account to mint