Merge pull request #318 from terra-money/revert-316-fix/sign-mode

Revert "Fix/sign mode"

package.json

@@ -84,7 +84,7 @@
   },
   "dependencies": {
     "@terra-money/legacy.proto": "npm:@terra-money/terra.proto@^0.1.7",
-    "@terra-money/terra.proto": "^2.1.0-beta.1",
+    "@terra-money/terra.proto": "~2.0.0",
     "axios": "^0.26.1",
     "bech32": "^2.0.0",
     "bip32": "^2.0.6",

src/client/lcd/api/FeeGrantAPI.spec.ts

@@ -44,22 +44,4 @@ describe('FeeGrantAPI', () => {
       ).rejects.toThrow();
     });
   });
-
-  /* TODO: unblock after v2.1.0-beta.1 applied
-  it('allowancesByGranter', async () => {
-    const res = await feeGrant.allowancesByGranter(
-      'terra1x46rqay4d3cssq8gxxvqz8xt6nwlz4td20k38v'
-    );
-
-    expect(res.allowances[0]).toMatchObject({
-      granter: expect.any(String),
-      grantee: expect.any(String),
-    });
-
-    const allowanceData = res.allowances[0].allowance.toData();
-    expect(allowanceData['@type']).toMatch(/cosmos.feegrant.v1beta1/g);
-
-    expect(res.pagination).not.toBeUndefined();
-  });
-  */
 });

src/client/lcd/api/FeeGrantAPI.ts

@@ -5,6 +5,7 @@ import { Pagination, PaginationOptions } from '../APIRequester';
 import { LCDClient } from '../LCDClient';
 
 export class FeeGrantAPI extends BaseAPI {
+
   constructor(public lcd: LCDClient) {
     super(lcd.apiRequester);
   }
@@ -53,34 +54,4 @@ export class FeeGrantAPI extends BaseAPI {
       }>(`/cosmos/feegrant/v1beta1/allowance/${granter}/${grantee}`)
       .then(d => Allowance.fromData(d.allowance.allowance));
   }
-
-  public async allowancesByGranter(
-    granter: AccAddress,
-    params: Partial<PaginationOptions> = {}
-  ): Promise<{
-    allowances: {
-      granter: AccAddress;
-      grantee: AccAddress;
-      allowance: Allowance;
-    }[];
-    pagination: Pagination;
-  }> {
-    return this.c
-      .get<{
-        allowances: {
-          granter: AccAddress;
-          grantee: AccAddress;
-          allowance: Allowance.Data;
-        }[];
-        pagination: Pagination;
-      }>(`/cosmos/feegrant/v1beta1/issued/${granter}`, params)
-      .then(d => ({
-        allowances: d.allowances.map(allowance => ({
-          granter: allowance.granter,
-          grantee: allowance.grantee,
-          allowance: Allowance.fromData(allowance.allowance),
-        })),
-        pagination: d.pagination,
-      }));
-  }
 }

src/core/Msg.ts

@@ -40,12 +40,6 @@ import {
   MsgUndelegate,
   StakingMsg,
 } from './staking/msgs';
-import {
-  MsgCreatePeriodicVestingAccount,
-  MsgCreateVestingAccount,
-  MsgDonateAllVestingTokens,
-  VestingMsg,
-} from './vesting/msgs';
 import {
   MsgStoreCode,
   MsgMigrateCode,
@@ -97,7 +91,6 @@ export type Msg =
   | OracleMsg
   | SlashingMsg
   | StakingMsg
-  | VestingMsg
   | WasmMsg
   | IbcTransferMsg
   | IbcClientMsg
@@ -116,7 +109,6 @@ export namespace Msg {
     | OracleMsg.Amino
     | SlashingMsg.Amino
     | StakingMsg.Amino
-    | VestingMsg.Amino
     | WasmMsg.Amino
     | IbcTransferMsg.Amino
     | CrisisMsg.Amino;
@@ -131,7 +123,6 @@ export namespace Msg {
     | OracleMsg.Data
     | SlashingMsg.Data
     | StakingMsg.Data
-    | VestingMsg.Data
     | WasmMsg.Data
     | IbcTransferMsg.Data
     | IbcClientMsg.Data
@@ -149,7 +140,6 @@ export namespace Msg {
     | OracleMsg.Proto
     | SlashingMsg.Proto
     | StakingMsg.Proto
-    | VestingMsg.Proto
     | WasmMsg.Proto
     | IbcTransferMsg.Proto
     | IbcClientMsg.Proto
@@ -248,13 +238,6 @@ export namespace Msg {
       case 'cosmos-sdk/MsgEditValidator':
         return MsgEditValidator.fromAmino(data, isClassic);
 
-      case 'cosmos-sdk/MsgCreatePeriodicVestingAccount':
-        return MsgCreatePeriodicVestingAccount.fromAmino(data, isClassic);
-      case 'cosmos-sdk/MsgCreateVestingAccount':
-        return MsgCreateVestingAccount.fromAmino(data, isClassic);
-      case 'cosmos-sdk/MsgDonateAllVestingTokens':
-        return MsgDonateAllVestingTokens.fromAmino(data, isClassic);
-
       // wasm
       case 'wasm/MsgStoreCode':
         return MsgStoreCode.fromAmino(data, isClassic);
@@ -352,14 +335,6 @@ export namespace Msg {
       case '/cosmos.staking.v1beta1.MsgEditValidator':
         return MsgEditValidator.fromData(data, isClassic);
 
-      // vesting
-      case '/cosmos.vesting.v1beta1.MsgCreatePeriodicVestingAccount':
-        return MsgCreatePeriodicVestingAccount.fromData(data, isClassic);
-      case '/cosmos.vesting.v1beta1.MsgCreateVestingAccount':
-        return MsgCreateVestingAccount.fromData(data, isClassic);
-      case '/cosmos.vesting.v1beta1.MsgDonateAllVestingTokens':
-        return MsgDonateAllVestingTokens.fromData(data, isClassic);
-
       // wasm
       case '/terra.wasm.v1beta1.MsgStoreCode':
       case '/cosmwasm.wasm.v1.MsgStoreCode':
@@ -505,14 +480,6 @@ export namespace Msg {
       case '/cosmos.staking.v1beta1.MsgEditValidator':
         return MsgEditValidator.unpackAny(proto, isClassic);
 
-      // vesting
-      case '/cosmos.vesting.v1beta1.MsgCreatePeriodicVestingAccount':
-        return MsgCreatePeriodicVestingAccount.unpackAny(proto, isClassic);
-      case '/cosmos.vesting.v1beta1.MsgCreateVestingAccount':
-        return MsgCreateVestingAccount.unpackAny(proto, isClassic);
-      case '/cosmos.vesting.v1beta1.MsgDonateAllVestingTokens':
-        return MsgDonateAllVestingTokens.unpackAny(proto, isClassic);
-
       // wasm
       case '/terra.wasm.v1beta1.MsgStoreCode':
       case '/cosmwasm.wasm.v1.MsgStoreCode':

src/core/SignatureV2.ts

@@ -8,8 +8,6 @@ import {
 } from '@terra-money/terra.proto/cosmos/tx/signing/v1beta1/signing';
 import { MultiSignature } from '@terra-money/terra.proto/cosmos/crypto/multisig/v1beta1/multisig';
 
-export { SignMode } from '@terra-money/terra.proto/cosmos/tx/signing/v1beta1/signing';
-
 export class SignatureV2 {
   constructor(
     public public_key: PublicKey,

src/core/index.ts

@@ -72,9 +72,6 @@ export * from './treasury/PolicyConstraints';
 // Upgrade
 export * from './upgrade';
 
-// Vesting
-export * from './vesting';
-
 // WASM
 export * from './wasm';
 export * from './wasm/msgs';