* Replace legacy.proto to terra.proto where terra.proto should be used.

* Update protobuf package for Terra Classic, @terra-money/terra.proto@0.1.7, to @classic-terra/terra.proto@1.1.0 * Add burn_tax_split to treasury params * Add AddBurnTaxExemptionAddressProposal and RemoveBurnTaxExemptionAddressProposal * Update version of GitHub workflow in the deprecate state
terra-money · Feb 24, 2023 · 637bf5d · 637bf5d
1 parent 168afed
commit 637bf5d
Show file tree

Hide file tree

Showing 58 changed files with 1,173 additions and 6,354 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -6,15 +6,15 @@ jobs:
 
     steps:
       - name: Begin CI...
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setup Node
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
 
       - name: Use cached node_modules
-        uses: actions/cache@v1
+        uses: actions/cache@v3
         with:
           path: node_modules
           key: nodeModules-${{ hashFiles('**/package-lock.json') }}

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@terra-money/terra.js",
-  "version": "3.1.7",
+  "version": "3.1.8",
   "description": "The JavaScript SDK for Terra",
   "license": "MIT",
   "author": "Terraform Labs, PTE.",
@@ -83,7 +83,7 @@
     "webpack-cli": "^4.3.0"
   },
   "dependencies": {
-    "@terra-money/legacy.proto": "npm:@terra-money/terra.proto@^0.1.7",
+    "@classic-terra/terra.proto": "^1.1.0",
     "@terra-money/terra.proto": "^2.1.0",
     "axios": "^0.27.2",
     "bech32": "^2.0.0",

diff --git a/src/client/lcd/APIRequester.ts b/src/client/lcd/APIRequester.ts
@@ -1,5 +1,5 @@
 import Axios, { AxiosInstance } from 'axios';
-import { OrderBy as OrderBy_pb } from '@terra-money/legacy.proto/cosmos/tx/v1beta1/service';
+import { OrderBy as OrderBy_pb } from '@terra-money/terra.proto/cosmos/tx/v1beta1/service';
 
 export type APIParams = Record<string, string | number | null | undefined>;
 

diff --git a/src/client/lcd/Wallet.ts b/src/client/lcd/Wallet.ts
@@ -2,8 +2,7 @@ import { LCDClient } from './LCDClient';
 import { Key } from '../../key';
 import { CreateTxOptions } from '../lcd/api/TxAPI';
 import { Tx } from '../../core/Tx';
-import { SignMode as SignModeV1 } from '@terra-money/legacy.proto/cosmos/tx/signing/v1beta1/signing';
-import { SignMode as SignModeV2 } from '@terra-money/terra.proto/cosmos/tx/signing/v1beta1/signing';
+import { SignMode } from '@terra-money/terra.proto/cosmos/tx/signing/v1beta1/signing';
 
 export class Wallet {
   constructor(public lcd: LCDClient, public key: Key) {}
@@ -53,7 +52,7 @@ export class Wallet {
     options: CreateTxOptions & {
       sequence?: number;
       accountNumber?: number;
-      signMode?: SignModeV1 | SignModeV2;
+      signMode?: SignMode;
     }
   ): Promise<Tx> {
     let accountNumber = options.accountNumber;
@@ -80,11 +79,7 @@ export class Wallet {
         accountNumber,
         sequence,
         chainID: this.lcd.config.chainID,
-        signMode:
-          options.signMode ||
-          (this.lcd.config.isClassic
-            ? SignModeV1.SIGN_MODE_DIRECT
-            : SignModeV2.SIGN_MODE_DIRECT),
+        signMode: options.signMode || SignMode.SIGN_MODE_DIRECT,
       },
       this.lcd.config.isClassic
     );

diff --git a/src/client/lcd/api/GovAPI.ts b/src/client/lcd/api/GovAPI.ts
@@ -13,7 +13,7 @@ import {
 
 import { APIParams, Pagination, PaginationOptions } from '../APIRequester';
 import { TxSearchResult } from './TxAPI';
-import { ProposalStatus } from '@terra-money/legacy.proto/cosmos/gov/v1beta1/gov';
+import { ProposalStatus } from '@terra-money/terra.proto/cosmos/gov/v1beta1/gov';
 import { LCDClient } from '../LCDClient';
 
 export interface GovParams {

diff --git a/src/client/lcd/api/IbcTransferAPI.ts b/src/client/lcd/api/IbcTransferAPI.ts
@@ -1,6 +1,5 @@
 import { BaseAPI } from './BaseAPI';
 import { APIParams, Pagination, PaginationOptions } from '../APIRequester';
-//import { DenomTrace } from '@terra-money/legacy.proto/ibc/applications/transfer/v1/query'
 import { DenomTrace } from '../../../core/ibc/applications/transfer/v1/DenomTrace';
 import { LCDClient } from '../LCDClient';
 

diff --git a/src/client/lcd/api/StakingAPI.spec.ts b/src/client/lcd/api/StakingAPI.spec.ts
@@ -40,7 +40,7 @@ const checkDelegations = (delegations: Delegation[]) => {
 // };
 
 const delegator = test1.accAddress;
-const validator = 'terravaloper1gtw2uxdkdt3tvq790ckjz8jm8qgwkdw3uptstn';
+const validator = 'terravaloper1q8w4u2wyhx574m70gwe8km5za2ptanny9mnqy3';
 
 describe('StakingAPI', () => {
   it('parameters', async () => {

diff --git a/src/client/lcd/api/TendermintAPI.spec.ts b/src/client/lcd/api/TendermintAPI.spec.ts
@@ -1,6 +1,6 @@
 import { TendermintAPI } from './TendermintAPI';
 import { Tx } from '../../../core/Tx';
-import { Tx as Tx_pb } from '@terra-money/legacy.proto/cosmos/tx/v1beta1/tx';
+import { Tx as Tx_pb } from '@terra-money/terra.proto/cosmos/tx/v1beta1/tx';
 import { LCDClient } from '../LCDClient';
 
 const terra = new LCDClient({

diff --git a/src/client/lcd/api/TreasuryAPI.spec.ts b/src/client/lcd/api/TreasuryAPI.spec.ts
@@ -46,6 +46,7 @@ describe('TreasuryAPI', () => {
         window_short: expect.any(Number),
         window_long: expect.any(Number),
         window_probation: expect.any(Number),
+        burn_tax_split: expect.any(Dec),
       });
     }
   });

diff --git a/src/client/lcd/api/TreasuryAPI.ts b/src/client/lcd/api/TreasuryAPI.ts
@@ -38,6 +38,11 @@ export interface TreasuryParams {
    * Number of epochs defining the probationary period after genesis, during which monetary policy levers Tax Rate and Reward Weight do not change.
    */
   window_probation: number;
+
+  /**
+   * Factor that determines how much tax will be allocated to the community pool
+   */
+  burn_tax_split: Dec;
 }
 
 export namespace TreasuryParams {
@@ -49,6 +54,7 @@ export namespace TreasuryParams {
     window_short: string;
     window_long: string;
     window_probation: string;
+    burn_tax_split: string;
   }
 }
 export class TreasuryAPI extends BaseAPI {
@@ -178,6 +184,7 @@ export class TreasuryAPI extends BaseAPI {
         window_long: Number.parseInt(d.window_long),
         window_short: Number.parseInt(d.window_short),
         window_probation: Number.parseInt(d.window_probation),
+        burn_tax_split: new Dec(d.burn_tax_split),
       }));
   }
 }
diff --git a/src/client/lcd/api/TxAPI.ts b/src/client/lcd/api/TxAPI.ts
@@ -15,8 +15,7 @@ import { hashToHex } from '../../../util/hash';
 import { LCDClient } from '../LCDClient';
 import { TxLog } from '../../../core';
 import { APIParams, Pagination, PaginationOptions } from '../APIRequester';
-import { BroadcastMode as BroadcastModeV1 } from '@terra-money/legacy.proto/cosmos/tx/v1beta1/service';
-import { BroadcastMode as BroadcastModeV2 } from '@terra-money/terra.proto/cosmos/tx/v1beta1/service';
+import { BroadcastMode } from '@terra-money/terra.proto/cosmos/tx/v1beta1/service';
 
 interface Wait {
   height: number;
@@ -400,7 +399,7 @@ export class TxAPI extends BaseAPI {
 
   private async _broadcast<T>(
     tx: Tx,
-    mode: keyof typeof BroadcastModeV1 | BroadcastModeV2
+    mode: keyof typeof BroadcastMode
   ): Promise<T> {
     return await this.c.post<any>(`/cosmos/tx/v1beta1/txs`, {
       tx_bytes: this.encode(tx),

diff --git a/src/core/auth/Account.ts b/src/core/auth/Account.ts
@@ -1,4 +1,4 @@
-import { Any } from '@terra-money/legacy.proto/google/protobuf/any';
+import { Any } from '@terra-money/terra.proto/google/protobuf/any';
 import { BaseAccount } from './BaseAccount';
 import { LazyGradedVestingAccount } from './LazyGradedVestingAccount';
 import { ContinuousVestingAccount } from './ContinuousVestingAccount';

diff --git a/src/core/auth/BaseAccount.ts b/src/core/auth/BaseAccount.ts
@@ -1,8 +1,6 @@
 import { PublicKey } from '../PublicKey';
 import { JSONSerializable } from '../../util/json';
 import { AccAddress } from '../bech32';
-// import { BaseAccount as BaseAccount_pb } from '@terra-money/legacy.proto/cosmos/auth/v1beta1/auth';
-// import { Any } from '@terra-money/legacy.proto/google/protobuf/any';
 import { BaseAccount as BaseAccount_pb } from '@terra-money/terra.proto/cosmos/auth/v1beta1/auth';
 import { Any } from '@terra-money/terra.proto/google/protobuf/any';
 import * as Long from 'long';

diff --git a/src/core/auth/LazyGradedVestingAccount.ts b/src/core/auth/LazyGradedVestingAccount.ts
@@ -2,13 +2,13 @@ import { Denom } from '../Denom';
 import { JSONSerializable } from '../../util/json';
 import { BaseVestingAccount } from './BaseVestingAccount';
 import { Dec } from '../numeric';
-import { BaseVestingAccount as BaseVestingAccount_pb } from '@terra-money/legacy.proto/cosmos/vesting/v1beta1/vesting';
+import { BaseVestingAccount as BaseVestingAccount_pb } from '@classic-terra/terra.proto/cosmos/vesting/v1beta1/vesting';
 import {
   LazyGradedVestingAccount as LazyGradedVestingAccount_pb,
   Schedule as Schedule_pb,
   VestingSchedule as VestingSchedule_pb,
-} from '@terra-money/legacy.proto/terra/vesting/v1beta1/vesting';
-import { Any } from '@terra-money/legacy.proto/google/protobuf/any';
+} from '@classic-terra/terra.proto/terra/vesting/v1beta1/vesting';
+import { Any } from '@terra-money/terra.proto/google/protobuf/any';
 import * as Long from 'long';
 import { PublicKey } from '../PublicKey';
 

diff --git a/src/core/bank/msgs/MsgMultiSend.ts b/src/core/bank/msgs/MsgMultiSend.ts
@@ -1,9 +1,7 @@
 import { JSONSerializable } from '../../../util/json';
 import { Coins } from '../../Coins';
 import { AccAddress } from '../../bech32';
-import { Any } from '@terra-money/legacy.proto/google/protobuf/any';
-// there's no difference between two protos
-//import { MsgMultiSend as MsgMultiSend_legacy_pb } from '@terra-money/legacy.proto/cosmos/bank/v1beta1/tx';
+import { Any } from '@terra-money/terra.proto/google/protobuf/any';
 import { MsgMultiSend as MsgMultiSend_pb } from '@terra-money/terra.proto/cosmos/bank/v1beta1/tx';
 import {
   Input as Input_pb,

diff --git a/src/core/bank/msgs/MsgSend.ts b/src/core/bank/msgs/MsgSend.ts
@@ -1,9 +1,7 @@
 import { Coins } from '../../Coins';
 import { JSONSerializable } from '../../../util/json';
 import { AccAddress } from '../../bech32';
-import { Any } from '@terra-money/legacy.proto/google/protobuf/any';
-// there's no difference between two protos
-//import { MsgSend as MsgSend_legacy_pb } from '@terra-money/legacy.proto/cosmos/bank/v1beta1/tx';
+import { Any } from '@terra-money/terra.proto/google/protobuf/any';
 import { MsgSend as MsgSend_pb } from '@terra-money/terra.proto/cosmos/bank/v1beta1/tx';
 
 /**

diff --git a/src/core/crisis/MsgVerifyInvariant.ts b/src/core/crisis/MsgVerifyInvariant.ts
@@ -1,6 +1,5 @@
 import { JSONSerializable } from '../../util/json';
-import { Any } from '@terra-money/legacy.proto/google/protobuf/any';
-//import { MsgVerifyInvariant as MsgVerifyInvariant_pb } from '@terra-money/legacy.proto/cosmos/crisis/v1beta1/tx';
+import { Any } from '@terra-money/terra.proto/google/protobuf/any';
 import { MsgVerifyInvariant as MsgVerifyInvariant_pb } from '@terra-money/terra.proto/cosmos/crisis/v1beta1/tx';
 import { AccAddress } from '../bech32';
 

diff --git a/src/core/distribution/msgs/MsgFundCommunityPool.ts b/src/core/distribution/msgs/MsgFundCommunityPool.ts
@@ -2,8 +2,6 @@ import { JSONSerializable } from '../../../util/json';
 import { AccAddress } from '../../bech32';
 import { Coins } from '../../Coins';
 import { Any } from '@terra-money/terra.proto/google/protobuf/any';
-// there's no difference between two protos
-// import { MsgFundCommunityPool as MsgFundCommunityPool_legacy_pb } from '@terra-money/legacy.proto/cosmos/distribution/v1beta1/tx';
 import { MsgFundCommunityPool as MsgFundCommunityPool_pb } from '@terra-money/terra.proto/cosmos/distribution/v1beta1/tx';
 
 export class MsgFundCommunityPool extends JSONSerializable<

diff --git a/src/core/distribution/msgs/MsgSetWithdrawAddress.ts b/src/core/distribution/msgs/MsgSetWithdrawAddress.ts
@@ -1,8 +1,6 @@
 import { JSONSerializable } from '../../../util/json';
 import { AccAddress } from '../../bech32';
 import { Any } from '@terra-money/terra.proto/google/protobuf/any';
-// there's no difference between two protos
-// import { MsgSetWithdrawAddress as MsgSetWithdrawAddress_legacy_pb } from '@terra-money/legacy.proto/cosmos/distribution/v1beta1/tx';
 import { MsgSetWithdrawAddress as MsgSetWithdrawAddress_pb } from '@terra-money/terra.proto/cosmos/distribution/v1beta1/tx';
 
 /**

diff --git a/src/core/distribution/msgs/MsgWithdrawDelegatorReward.ts b/src/core/distribution/msgs/MsgWithdrawDelegatorReward.ts
@@ -1,8 +1,6 @@
 import { JSONSerializable } from '../../../util/json';
 import { AccAddress, ValAddress } from '../../bech32';
 import { Any } from '@terra-money/terra.proto/google/protobuf/any';
-// there's no difference between two protos
-// import { MsgWithdrawDelegatorReward as MsgWithdrawDelegatorReward_legacy_pb } from '@terra-money/legacy.proto/cosmos/distribution/v1beta1/tx';
 import { MsgWithdrawDelegatorReward as MsgWithdrawDelegatorReward_pb } from '@terra-money/terra.proto/cosmos/distribution/v1beta1/tx';
 
 /**

diff --git a/src/core/distribution/msgs/MsgWithdrawValidatorCommission.ts b/src/core/distribution/msgs/MsgWithdrawValidatorCommission.ts
@@ -1,7 +1,7 @@
 import { JSONSerializable } from '../../../util/json';
 import { ValAddress } from '../../bech32';
 import { Any } from '@terra-money/terra.proto/google/protobuf/any';
-import { MsgWithdrawValidatorCommission as MsgWithdrawValidatorCommission_pb } from '@terra-money/legacy.proto/cosmos/distribution/v1beta1/tx';
+import { MsgWithdrawValidatorCommission as MsgWithdrawValidatorCommission_pb } from '@terra-money/terra.proto/cosmos/distribution/v1beta1/tx';
 
 /**
  * A validator can withdraw their outstanding commission rewards accrued from all

diff --git a/src/core/distribution/proposals/CommunityPoolSpendProposal.ts b/src/core/distribution/proposals/CommunityPoolSpendProposal.ts
@@ -1,9 +1,7 @@
 import { JSONSerializable } from '../../../util/json';
 import { Coins } from '../../Coins';
 import { AccAddress } from '../../bech32';
-import { Any } from '@terra-money/legacy.proto/google/protobuf/any';
-// there's no difference between two protos
-// import { CommunityPoolSpendProposal as CommunityPoolSpendProposal_legacy_pb } from '@terra-money/legacy.proto/cosmos/distribution/v1beta1/distribution';
+import { Any } from '@terra-money/terra.proto/google/protobuf/any';
 import { CommunityPoolSpendProposal as CommunityPoolSpendProposal_pb } from '@terra-money/terra.proto/cosmos/distribution/v1beta1/distribution';
 
 /**

diff --git a/src/core/feegrant/allowances/index.ts b/src/core/feegrant/allowances/index.ts
@@ -5,7 +5,7 @@ import { AllowedMsgAllowance } from './AllowedMsgAllowance';
 export * from './BasicAllowance';
 export * from './PeriodicAllowance';
 export * from './AllowedMsgAllowance';
-import { Any } from '@terra-money/legacy.proto/google/protobuf/any';
+import { Any } from '@terra-money/terra.proto/google/protobuf/any';
 
 export type Allowance =
   | BasicAllowance

diff --git a/src/core/gov/Proposal.ts b/src/core/gov/Proposal.ts
@@ -21,6 +21,10 @@ import {
   UpdateAdminProposal,
   UpdateInstantiateConfigProposal,
 } from '../wasm/proposals';
+import {
+  AddBurnTaxExemptionAddressProposal,
+  RemoveBurnTaxExemptionAddressProposal,
+} from '../treasury/proposals';
 import {
   Proposal as Proposal_pb,
   ProposalStatus,
@@ -253,7 +257,9 @@ export namespace Proposal {
     | SudoContractProposal
     | UnpinCodesProposal
     | UpdateAdminProposal
-    | UpdateInstantiateConfigProposal;
+    | UpdateInstantiateConfigProposal
+    | AddBurnTaxExemptionAddressProposal
+    | RemoveBurnTaxExemptionAddressProposal;
 
   export namespace Content {
     export type Amino =
@@ -272,7 +278,9 @@ export namespace Proposal {
       | SudoContractProposal.Amino
       | UnpinCodesProposal.Amino
       | UpdateAdminProposal.Amino
-      | UpdateInstantiateConfigProposal.Amino;
+      | UpdateInstantiateConfigProposal.Amino
+      | AddBurnTaxExemptionAddressProposal.Amino
+      | RemoveBurnTaxExemptionAddressProposal.Amino;
 
     export type Data =
       | TextProposal.Data
@@ -290,7 +298,9 @@ export namespace Proposal {
       | SudoContractProposal.Data
       | UnpinCodesProposal.Data
       | UpdateAdminProposal.Data
-      | UpdateInstantiateConfigProposal.Data;
+      | UpdateInstantiateConfigProposal.Data
+      | AddBurnTaxExemptionAddressProposal.Data
+      | RemoveBurnTaxExemptionAddressProposal.Data;
 
     export type Proto =
       | TextProposal.Proto
@@ -308,7 +318,9 @@ export namespace Proposal {
       | SudoContractProposal.Proto
       | UnpinCodesProposal.Proto
       | UpdateAdminProposal.Proto
-      | UpdateInstantiateConfigProposal.Proto;
+      | UpdateInstantiateConfigProposal.Proto
+      | AddBurnTaxExemptionAddressProposal.Proto
+      | RemoveBurnTaxExemptionAddressProposal.Proto;
 
     export function fromAmino(
       amino: Proposal.Content.Amino,
@@ -352,6 +364,13 @@ export namespace Proposal {
           return UpdateAdminProposal.fromAmino(amino, isClassic);
         case 'wasm/UpdateInstantiateConfigProposal':
           return UpdateInstantiateConfigProposal.fromAmino(amino, isClassic);
+        case 'treasury/AddBurnTaxExemptionAddressProposal':
+          return AddBurnTaxExemptionAddressProposal.fromAmino(amino, isClassic);
+        case 'treasury/RemoveBurnTaxExemptionAddressProposal':
+          return RemoveBurnTaxExemptionAddressProposal.fromAmino(
+            amino,
+            isClassic
+          );
       }
     }
 
@@ -392,6 +411,13 @@ export namespace Proposal {
           return UpdateAdminProposal.fromData(data, isClassic);
         case '/cosmwasm.wasm.v1.UpdateInstantiateConfigProposal':
           return UpdateInstantiateConfigProposal.fromData(data, isClassic);
+        case '/terra.treasury.v1beta1.AddBurnTaxExemptionAddressProposal':
+          return AddBurnTaxExemptionAddressProposal.fromData(data, isClassic);
+        case '/terra.treasury.v1beta1.RemoveBurnTaxExemptionAddressProposal':
+          return RemoveBurnTaxExemptionAddressProposal.fromData(
+            data,
+            isClassic
+          );
       }
     }
 
@@ -433,6 +459,16 @@ export namespace Proposal {
           return UpdateAdminProposal.unpackAny(anyProto, isClassic);
         case '/cosmwasm.wasm.v1.UpdateInstantiateConfigProposal':
           return UpdateInstantiateConfigProposal.unpackAny(anyProto, isClassic);
+        case '/terra.treasury.v1beta1.AddBurnTaxExemptionAddressProposal':
+          return AddBurnTaxExemptionAddressProposal.unpackAny(
+            anyProto,
+            isClassic
+          );
+        case '/terra.treasury.v1beta1.RemoveBurnTaxExemptionAddressProposal':
+          return RemoveBurnTaxExemptionAddressProposal.unpackAny(
+            anyProto,
+            isClassic
+          );
       }
 
       throw `Proposal content ${typeUrl} not recognized`;

diff --git a/src/core/ibc/applications/transfer/v1/DenomTrace.ts b/src/core/ibc/applications/transfer/v1/DenomTrace.ts
@@ -1,4 +1,4 @@
-import { DenomTrace as DenomTrace_pb } from '@terra-money/legacy.proto/ibc/applications/transfer/v1/transfer';
+import { DenomTrace as DenomTrace_pb } from '@terra-money/terra.proto/ibc/applications/transfer/v1/transfer';
 import { JSONSerializable } from '../../../../../util/json';
 
 /**

diff --git a/src/core/market/msgs/MsgSwap.ts b/src/core/market/msgs/MsgSwap.ts
@@ -2,8 +2,8 @@ import { JSONSerializable } from '../../../util/json';
 import { Coin } from '../../Coin';
 import { Denom } from '../../Denom';
 import { AccAddress } from '../../bech32';
-import { MsgSwap as MsgSwap_pb } from '@terra-money/legacy.proto/terra/market/v1beta1/tx';
-import { Any } from '@terra-money/legacy.proto/google/protobuf/any';
+import { MsgSwap as MsgSwap_pb } from '@classic-terra/terra.proto/terra/market/v1beta1/tx';
+import { Any } from '@terra-money/terra.proto/google/protobuf/any';
 
 /**
  * Executes a market swap between 2 denominations at the exchange rate registered by the