Fix minor bugs for release (#72)

Signed-off-by: Kipkap <[email protected]>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hashgraph/hedera-metamask-snaps",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "description": "A collection of Hedera related Metamask snaps that expose and utilize Hedera functionality inside Metamask",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

packages/hedera-wallet-snap/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hashgraph/hedera-wallet-snap-monorepo",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "private": true,
   "description": "Hedera Wallet Snap unlocks wallet functionality via Metamask that any other apps can interact with, thereby turning Metamask into a native Hedera wallet without relying on Hedera JSON-RPC Relay.",
   "homepage": "https://github.com/hashgraph/hedera-metamask-snaps#readme",

packages/hedera-wallet-snap/packages/site/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hashgraph/hedera-wallet-snap-site",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "private": true,
   "license": "Apache-2.0",
   "scripts": {

packages/hedera-wallet-snap/packages/snap/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## [0.2.4](https://github.com/hashgraph/hedera-metamask-snaps/compare/v0.2.4...v0.2.4) (2024-02-05)
+
+### :page_with_curl: Documentation
+
+- Refer to the [Hedera Wallet Snap Wiki](https://docs.tuum.tech/hedera-wallet-snap/) for more info on how the snap works and how to integrate it into your own application.
+
+### :rocket: Features
+
+### :bug: Bug Fixes
+
+- Fixed some import issues
+
 ## [0.2.3](https://github.com/hashgraph/hedera-metamask-snaps/compare/v0.2.3...v0.2.3) (2024-02-02)
 
 ### :page_with_curl: Documentation

packages/hedera-wallet-snap/packages/snap/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hashgraph/hedera-wallet-snap",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "description": "Hedera Wallet Snap unlocks wallet functionality via Metamask that any other apps can interact with, thereby turning Metamask into a native Hedera wallet without relying on Hedera JSON-RPC Relay.",
   "keywords": [
     "MetaMask",

packages/hedera-wallet-snap/packages/snap/snap.manifest.json

@@ -1,13 +1,13 @@
 {
-  "version": "0.2.3",
+  "version": "0.2.4",
   "description": "Hedera Wallet unlocks wallet functionality via Metamask that any other apps can interact with, thereby turning Metamask into a native Hedera wallet without relying on Hedera JSON-RPC Relay.",
   "proposedName": "Hedera Wallet",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/hashgraph/hedera-metamask-snaps.git"
   },
   "source": {
-    "shasum": "g6gofXCeKQf0dIKntm0UGIntbbn4MqFAPyhDWeKJK8M=",
+    "shasum": "GW5ZWO6uAdBmSjuVTZtszHzTfHTb4/uASBVTOxvPCU4=",
     "location": {
       "npm": {
         "filePath": "dist/snap.js",

packages/hedera-wallet-snap/packages/snap/src/rpc/transactions/transferCrypto.ts

@@ -21,12 +21,12 @@
 import { providerErrors } from '@metamask/rpc-errors';
 import { divider, heading, text } from '@metamask/snaps-ui';
 import _ from 'lodash';
-import { AccountInfo } from 'src/types/account';
 import { SimpleTransfer, TxReceipt } from '../../services/hedera';
 import { HederaServiceImpl } from '../../services/impl/hedera';
 import { createHederaClient } from '../../snap/account';
 import { generateCommonPanel, snapDialog } from '../../snap/dialog';
 import { updateSnapState } from '../../snap/state';
+import { AccountInfo } from '../../types/account';
 import {
   GetAccountInfoRequestParams,
   ServiceFee,

packages/hedera-wallet-snap/packages/snap/src/services/hedera.ts

@@ -148,6 +148,9 @@ export type HederaService = {
 };
 
 export type SimpleHederaClient = {
+  // close the client
+  close(): void;
+
   // get the associated client
   getClient(): Client;
 

packages/hedera-wallet-snap/packages/snap/src/services/impl/hedera/client/index.ts

@@ -49,6 +49,10 @@ export class SimpleHederaClientImpl implements SimpleHederaClient {
     this._privateKey = privateKey;
   }
 
+  close() {
+    this._client.close();
+  }
+
   getClient(): Client {
     return this._client;
   }

packages/hedera-wallet-snap/packages/snap/src/services/impl/hedera/index.ts

@@ -31,9 +31,9 @@ import _ from 'lodash';
 
 import { StakingInfoJson } from '@hashgraph/sdk/lib/StakingInfo';
 import { providerErrors } from '@metamask/rpc-errors';
-import { AccountInfo } from 'src/types/account';
 import { Wallet } from '../../../domain/wallet/abstract';
 import { PrivateKeySoftwareWallet } from '../../../domain/wallet/software-private-key';
+import { AccountInfo } from '../../../types/account';
 import { FetchResponse, fetchDataFromUrl } from '../../../utils/fetch';
 import { timestampToString } from '../../../utils/helper';
 import {

packages/hedera-wallet-snap/packages/snap/src/snap/account.ts

@@ -104,15 +104,6 @@ export async function setCurrentAccount(
       const { accountIdOrEvmAddress, curve = 'ECDSA_SECP256K1' } =
         nonMetamaskAccount.externalAccount;
       if (ethers.isAddress(accountIdOrEvmAddress)) {
-        if (curve !== 'ECDSA_SECP256K1') {
-          console.error(
-            `You must use 'ECDSA_SECP256K1' as the curve if you want to import an EVM address. Please make sure to pass in the correct value for "curve".`,
-          );
-          throw providerErrors.unsupportedMethod(
-            `You must use 'ECDSA_SECP256K1' as the curve if you want to import an EVM address. Please make sure to pass in the correct value for "curve".`,
-          );
-        }
-
         const { connectedAddress: _connectedAddress, keyStore: _keyStore } =
           await connectEVMAccount(
             origin,
@@ -229,6 +220,16 @@ async function connectEVMAccount(
       const { keyStore } = state.accountState[addr][network];
 
       if (evmAddress === keyStore.address) {
+        if (keyStore.curve !== curve) {
+          console.error(
+            `You passed '${curve}' as the digital signature algorithm to use but the account was derived using ${keyStore.curve} on '${network}'. Please make sure to pass in the correct value for "curve".`,
+          );
+          throw providerErrors.custom({
+            code: 4200,
+            message: `You passed '${curve}' as the digital signature algorithm to use but the account was derived using ${keyStore.curve} on '${network}'. Please make sure to pass in the correct value for "curve".`,
+            data: { network, curve, evmAddress },
+          });
+        }
         connectedAddress = addr;
         result = keyStore;
         break;
@@ -390,6 +391,16 @@ async function connectHederaAccount(
     if (state.accountState[addr][network]) {
       const { keyStore } = state.accountState[addr][network];
       if (keyStore.hederaAccountId === accountId) {
+        if (keyStore.curve !== curve) {
+          console.error(
+            `You passed '${curve}' as the digital signature algorithm to use but the account was derived using ${keyStore.curve} on '${network}'. Please make sure to pass in the correct value for "curve".`,
+          );
+          throw providerErrors.custom({
+            code: 4200,
+            message: `You passed '${curve}' as the digital signature algorithm to use but the account was derived using ${keyStore.curve} on '${network}'. Please make sure to pass in the correct value for "curve".`,
+            data: { network, curve, accountId },
+          });
+        }
         connectedAddress = addr;
         result = keyStore;
         break;

packages/hedera-wallet-snap/packages/snap/src/utils/tuumService.ts

@@ -20,7 +20,7 @@
 
 import BigNumber from 'bignumber.js';
 import { ethers } from 'ethers';
-import { SimpleHederaClient, SimpleTransfer } from 'src/services/hedera';
+import { SimpleHederaClient, SimpleTransfer } from '../services/hedera';
 
 export type QueryCost = {
   serviceFeeToPay: number;