Merge branch 'main' of https://github.com/terra-money/feather.js into…

… feat/tx/events

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@terra-money/feather.js",
-  "version": "2.0.0-beta.16",
+  "version": "2.0.1",
   "description": "The JavaScript SDK for Terra and Feather chains",
   "license": "MIT",
   "author": "Terraform Labs, PTE.",
@@ -85,7 +85,6 @@
     "webpack-cli": "^4.3.0"
   },
   "dependencies": {
-    "@ethersproject/bytes": "^5.7.0",
     "@terra-money/legacy.proto": "npm:@terra-money/terra.proto@^0.1.7",
     "@terra-money/terra.proto": "^4.0.4",
     "assert": "^2.0.0",
@@ -96,7 +95,6 @@
     "bufferutil": "^4.0.3",
     "crypto-browserify": "^3.12.0",
     "decimal.js": "^10.2.1",
-    "ethers": "^5.7.2",
     "jscrypto": "^1.0.1",
     "keccak256": "^1.0.6",
     "long": "^5.2.3",

src/core/Msg.ts

@@ -77,7 +77,6 @@ import {
   MsgSetBeforeSendHook,
   TokenFactoryMsg,
 } from './tokenfactory';
-import { JAXMsgExecuteContract, JAXMsgStoreCode, JaxMsg } from './jax/msgs';
 import { MsgTransfer, IbcTransferMsg } from './ibc/applications/transfer';
 import {
   MsgCreateClient,
@@ -142,7 +141,6 @@ export type Msg =
   | AllianceMsg
   | CustomMsg
   | CrisisMsg
-  | JaxMsg
   | MsgAuctionBid
   | FeeshareMsg
   | TokenFactoryMsg;
@@ -163,7 +161,6 @@ export namespace Msg {
     | AllianceMsg.Amino
     | CustomMsg.Amino
     | CrisisMsg.Amino
-    | JaxMsg.Amino
     | MsgAuctionBid.Amino
     | FeeshareMsg.Amino
     | TokenFactoryMsg.Amino;
@@ -187,7 +184,6 @@ export namespace Msg {
     | AllianceMsg.Data
     | CustomMsg.Data
     | CrisisMsg.Data
-    | JaxMsg.Data
     | MsgAuctionBid.Data
     | FeeshareMsg.Data
     | TokenFactoryMsg.Data;
@@ -210,7 +206,6 @@ export namespace Msg {
     | IbcChannelMsg.Proto
     | AllianceMsg.Proto
     | CrisisMsg.Proto
-    | JaxMsg.Proto
     | MsgAuctionBid.Proto
     | FeeshareMsg.Proto
     | TokenFactoryMsg.Proto;
@@ -484,17 +479,6 @@ export namespace Msg {
           data as MsgVerifyInvariant.Amino,
           isClassic
         );
-      // jax
-      case 'jax/MsgExecuteContract':
-        return JAXMsgExecuteContract.fromAmino(
-          data as JAXMsgExecuteContract.Amino,
-          isClassic
-        );
-      case 'jax/MsgStoreCode':
-        return JAXMsgStoreCode.fromAmino(
-          data as JAXMsgStoreCode.Amino,
-          isClassic
-        );
 
       // Pob module
       case 'pob/MsgAuctionBid':
@@ -707,12 +691,6 @@ export namespace Msg {
       case '/cosmos.crisis.v1beta1.MsgVerifyInvariant':
         return MsgVerifyInvariant.fromData(data, isClassic);
 
-      // jax
-      case '/jax.MsgExecuteContract':
-        return JAXMsgExecuteContract.fromData(data, isClassic);
-      case '/jax.MsgStoreCode':
-        return JAXMsgStoreCode.fromData(data, isClassic);
-
       // pob module
       case '/pob.builder.v1.MsgAuctionBid':
         return MsgAuctionBid.fromData(data, isClassic);
@@ -919,12 +897,6 @@ export namespace Msg {
       case '/cosmos.crisis.v1beta1.MsgVerifyInvariant':
         return MsgVerifyInvariant.unpackAny(proto, isClassic);
 
-      // jax
-      case '/jax.MsgExecuteContract':
-        return JAXMsgExecuteContract.unpackAny(proto, isClassic);
-      case '/jax.MsgStoreCode':
-        return JAXMsgStoreCode.unpackAny(proto, isClassic);
-
       case '/pob.builder.v1.MsgAuctionBid':
         return MsgAuctionBid.unpackAny(proto, isClassic);
 

src/core/PublicKey.ts

@@ -6,7 +6,7 @@ import { PubKey as PubKey_pb } from '@terra-money/terra.proto/cosmos/crypto/secp
 import { PubKey as ValConsPubKey_pb } from '@terra-money/terra.proto/cosmos/crypto/ed25519/keys';
 import { bech32 } from 'bech32';
 import { publicKeyConvert } from 'secp256k1';
-import { keccak256 } from 'ethers/lib/utils';
+import keccak256 from 'keccak256';
 
 // As discussed in https://github.com/binance-chain/javascript-sdk/issues/163
 // Prefixes listed here: https://github.com/tendermint/tendermint/blob/d419fffe18531317c28c29a292ad7d253f6cafdf/docs/spec/blockchain/encoding.md#public-key-cryptography
@@ -257,12 +257,8 @@ export class InjectivePubKey extends JSONSerializable<
       publicKeyConvert(fixedPubKey, false)
     ).toString('hex');
 
-    const addressBuffer = Buffer.from(
-      keccak256(Buffer.from(decompressedPublicKey.substring(2), 'hex')).replace(
-        '0x',
-        ''
-      ),
-      'hex'
+    const addressBuffer = keccak256(
+      Buffer.from(decompressedPublicKey.substring(2), 'hex')
     ).subarray(-20);
 
     return addressBuffer;

src/core/index.ts

@@ -24,10 +24,6 @@ export { MsgRedelegate as MsgAllianceRedelegate } from './alliance/msgs/MsgRedel
 export { MsgClaimDelegationRewards as MsgClaimDelegationRewards } from './alliance/msgs/MsgClaimDelegationRewards';
 export * from './alliance/proposals';
 
-// JAX
-export { MsgExecuteContract as JAXMsgExecuteContract } from './jax/msgs/MsgExecuteContract';
-export { MsgStoreCode as JAXMsgStoreCode } from './jax/msgs/MsgStoreCode';
-
 // Auth
 export * from './auth/Account';
 export * from './auth/BaseAccount';