Merge pull request #257 from enkryptcom/develop

Release: v1.15.0
enkryptcom · Mar 29, 2023 · 22700f1 · 22700f1 · github-actions · Mar 29, 2023
2 parents b86505c + feccec9
commit 22700f1
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 10 deletions.
diff --git a/packages/extension/package.json b/packages/extension/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@enkryptcom/extension",
-  "version": "1.14.0",
+  "version": "1.15.0",
   "private": true,
   "scripts": {
     "zip": "cd dist; zip -r release.zip *;",

diff --git a/packages/extension/src/libs/activity-state/index.ts b/packages/extension/src/libs/activity-state/index.ts
@@ -33,14 +33,13 @@ class ActivityState {
       .filter((item) => item.status === ActivityStatus.success && item.nonce)
       .map((item) => item.nonce);
     for (let i = 0; i < combined.length; i++) {
-      if (
-        !existingHashes.includes(combined[i].transactionHash) &&
-        combined[i].timestamp > currentTime - MAX_PENDING_TIME
-      ) {
+      if (!existingHashes.includes(combined[i].transactionHash)) {
         if (
           combined[i].status !== ActivityStatus.pending ||
           !combined[i].nonce ||
-          !minedNonces.includes(combined[i].nonce)
+          !minedNonces.includes(combined[i].nonce) ||
+          (combined[i].status === ActivityStatus.pending &&
+            combined[i].timestamp > currentTime - MAX_PENDING_TIME)
         )
           cleanArr.push(combined[i]);
       }

diff --git a/packages/extension/src/libs/market-data/index.ts b/packages/extension/src/libs/market-data/index.ts
@@ -9,7 +9,7 @@ import {
 import BigNumber from "bignumber.js";
 import cacheFetch from "../cache-fetch";
 import { CoingeckoPlatform } from "@enkryptcom/types";
-const COINGECKO_ENDPOINT = "https://api.coingecko.com/api/v3/";
+const COINGECKO_ENDPOINT = "https://partners.mewapi.io/coingecko/api/v3/";
 const FIAT_EXCHANGE_RATE_ENDPOINT =
   "https://mainnet.mewwallet.dev/v2/prices/exchange-rates";
 const REFRESH_DELAY = 1000 * 60 * 5;
@@ -142,6 +142,7 @@ class MarketData {
     )
       .then((res) => res.json())
       .then((json) => {
+        console.log(json);
         const allTokens = json as CoinGeckoToken[];
         const tokens: Record<string, CoinGeckoToken> = {};
         allTokens.forEach((token) => {

diff --git a/packages/extension/src/providers/swap/types/ChangellySwapProvider.ts b/packages/extension/src/providers/swap/types/ChangellySwapProvider.ts
@@ -250,7 +250,7 @@ export class ChangellySwapProvider extends SwapProvider {
       urlSearchParams.append("vs_currencies", "usd");
 
       const pricesRes = await fetch(
-        `https://api.coingecko.com/api/v3/simple/price?${urlSearchParams.toString()}`
+        `https://partners.mewapi.io/coingecko/api/v3/simple/price?${urlSearchParams.toString()}`
       );
 
       const prices = await pricesRes.json();

diff --git a/packages/extension/src/ui/action/views/swap-best-offer/index.vue b/packages/extension/src/ui/action/views/swap-best-offer/index.vue
@@ -293,7 +293,7 @@ onMounted(async () => {
       params.append("ids", network.value.coingeckoID!);
       params.append("vs_currencies", "usd");
       fetch(
-        `https://api.coingecko.com/api/v3/simple/price?${params.toString()}`
+        `https://partners.mewapi.io/coingecko/api/v3/simple/price?${params.toString()}`
       )
         .then((res) => {
           clearTimeout(timeoutId);

diff --git a/packages/hw-wallets/src/configs.ts b/packages/hw-wallets/src/configs.ts
@@ -55,6 +55,11 @@ const bip44Paths = {
     basePath: "m/44'/60'/0'/0",
     label: "Ethereum",
   },
+  rootstock: {
+    path: "m/44'/137'/0'/0/{index}",
+    basePath: "m/44'/137'/0'/0",
+    label: "Rootstock",
+  },
   rootstockLedger: {
     path: "m/44'/137'/0'/{index}",
     basePath: "m/44'/137'/0'/0",

diff --git a/packages/hw-wallets/src/trezor/configs.ts b/packages/hw-wallets/src/trezor/configs.ts
@@ -7,5 +7,6 @@ const supportedPaths = {
   [NetworkNames.EthereumClassic]: [bip44Paths.ethereumClassic],
   [NetworkNames.Ropsten]: [bip44Paths.ethereumTestnet],
   [NetworkNames.Goerli]: [bip44Paths.ethereumTestnet],
+  [NetworkNames.Rootstock]: [bip44Paths.rootstock],
 };
 export { supportedPaths };
diff --git a/packages/hw-wallets/src/trezor/index.ts b/packages/hw-wallets/src/trezor/index.ts
@@ -113,7 +113,7 @@ class TrezorEthereum implements HWWalletProvider {
       }).then((result) => {
         if (!result.success)
           throw new Error((result.payload as any).error as string);
-        const rv = BigInt(result.payload.v.replace("0x", ""));
+        const rv = BigInt(parseInt(result.payload.v, 16));
         const cv = tx.common.chainId() * 2n + 35n;
         return toRpcSig(
           bigIntToHex(rv - cv),