feat: make snaps build and run

lerna.json

@@ -2,7 +2,7 @@
   "packages": [
     "packages/*"
   ],
-  "version": "1.0.0-alpha.21",
+  "version": "1.0.1",
   "useWorkspaces": true,
   "npmClient": "yarn"
 }

packages/adapter/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/metamask-snaps-adapter",
-  "version": "1.0.0-alpha.21",
+  "version": "1.0.1",
   "description": "",
   "author": "pastaghost <[email protected]> (http://www.github.com/pastaghost)",
   "homepage": "https://github.com/shapeshift/metamask-snaps/tree/main/packages/adapter",
@@ -28,8 +28,9 @@
     "@metamask/snaps-ui": "1.0.1",
     "@shapeshiftoss/hdwallet-core": "^1.50.4",
     "@shapeshiftoss/logger": "^1.1.3",
-    "@shapeshiftoss/metamask-snaps": "^1.0.0-alpha.21",
-    "@shapeshiftoss/metamask-snaps-types": "^1.0.0-alpha.21"
+    "@shapeshiftoss/metamask-snaps": "^1.0.1",
+    "@shapeshiftoss/metamask-snaps-types": "^1.0.1",
+    "p-queue": "^7.4.1"
   },
   "peerDependencies": {
     "@shapeshiftoss/caip": "*",
@@ -60,7 +61,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "54beb75f060ee91836861205eaaf04226f40a326",
+  "gitHead": "dff70c07a9132a258ab89fc1e3f2169ec2e3fcff",
   "installConfig": {
     "hoistingLimits": "dependencies"
   },

packages/adapter/src/utils.test.ts

@@ -1,6 +1,5 @@
 describe('utils', () => {
   describe('getMetaMaskProvider', () => {})
-  describe('metaMaskFlaskSupported', () => {})
   describe('shapeShiftSnapInstalled', () => {})
   describe('isLocked', () => {})
   describe('enableShapeShiftsnap', () => {})

packages/adapter/src/utils.ts

@@ -7,6 +7,7 @@ import type {
   ShapeShiftSnapRPCResponse,
 } from '@shapeshiftoss/metamask-snaps-types'
 import assert from 'assert'
+import PQueue from 'p-queue'
 
 import { logger } from './lib/logger'
 import { walletRequestSnaps } from './metamask/metamask'
@@ -39,27 +40,15 @@ export const getMetaMaskProvider = async (): Promise<Provider | undefined> => {
   return undefined
 }
 
-export const metaMaskFlaskSupported = async (externalProvider?: any): Promise<boolean> => {
-  try {
-    const provider = externalProvider || (await getMetaMaskProvider())
-
-    const isFlask = (await provider.request({ method: 'web3_clientVersion' }))?.includes('flask')
-    assert(isFlask, 'Please install MetaMask Flask.')
-  } catch (error) {
-    moduleLogger.error({ fn: 'metaMaskFlaskSupported' }, error)
-  }
-  return true
-}
-
 export const shapeShiftSnapInstalled = async (snapId: string): Promise<boolean> => {
-  const provider = await getMetaMaskProvider()
-  if (provider === undefined) {
-    throw new Error('Could not get MetaMask provider')
-  }
-  if (provider.request === undefined) {
-    throw new Error('MetaMask provider does not define a .request() method')
-  }
   try {
+    const provider = await getMetaMaskProvider()
+    if (provider === undefined) {
+      throw new Error('Could not get MetaMask provider')
+    }
+    if (provider.request === undefined) {
+      throw new Error('MetaMask provider does not define a .request() method')
+    }
     const ret = await provider.request({
       method: 'wallet_getSnaps',
     })
@@ -119,7 +108,6 @@ export const enableShapeShiftSnap = async (
     },
   }
   try {
-    assert(metaMaskFlaskSupported(), 'Please install MetaMask Flask.')
     const snapIsInstalled = await shapeShiftSnapInstalled(snapId)
     if (!snapIsInstalled) {
       const res = await walletRequestSnaps(snapId, version)
@@ -133,6 +121,10 @@ export const enableShapeShiftSnap = async (
   return ret
 }
 
+// Flask only supports a max. of 5 queued requests, so this ensures we're under that
+// by limiting to 5 concurrent snap JSON-RPC request in a 40ms window
+const flaskRpcRequestsQueue = new PQueue({ concurrency: 5, interval: 40 })
+
 export const sendFlaskRPCRequest = async <T extends ShapeShiftSnapRPCResponse>(
   request: ShapeShiftSnapRPCRequest,
   snapId: string,
@@ -145,13 +137,15 @@ export const sendFlaskRPCRequest = async <T extends ShapeShiftSnapRPCResponse>(
     if (provider.request === undefined) {
       throw new Error('MetaMask provider does not define a .request() method')
     }
-    const ret = await provider.request({
-      method: 'wallet_invokeSnap',
-      params: {
-        snapId,
-        request,
-      },
-    })
+    const ret = await flaskRpcRequestsQueue.add(() =>
+      provider.request?.({
+        method: 'wallet_invokeSnap',
+        params: {
+          snapId,
+          request,
+        },
+      }),
+    )
     return ret as T
   } catch (error) {
     moduleLogger.error(error, { fn: 'sendFlaskRPCRequest' }, `${request.method} RPC call failed.`)

packages/adapter/src/utxo/bitcoin/bitcoin.ts

@@ -3,6 +3,7 @@ import type {
   BitcoinBroadcastTransactionResponse,
   BitcoinGetAddressAdapterParams,
   BitcoinGetAddressResponse,
+  BitcoinGetPublicKeysResponse,
   BitcoinSignTransactionAdapterParams,
   BitcoinSignTransactionResponse,
 } from '@shapeshiftoss/metamask-snaps-types'
@@ -27,6 +28,21 @@ export const BTCGetAddress = async (
   }
 }
 
+export const BTCGetPublicKeys = async (
+  params: BitcoinGetAddressAdapterParams,
+): Promise<BitcoinGetPublicKeysResponse> => {
+  const { addressParams, snapId } = params
+  try {
+    return await sendFlaskRPCRequest(
+      { method: 'btc_getPublicKeys', params: { addressParams } },
+      snapId,
+    )
+  } catch (error) {
+    moduleLogger.error(error, { fn: 'BTCGetPublicKeys' }, `btc_getPublicKeys RPC call failed.`)
+    return Promise.reject(error)
+  }
+}
+
 export const BTCSignTransaction = async (
   params: BitcoinSignTransactionAdapterParams,
 ): Promise<BitcoinSignTransactionResponse> => {

packages/adapter/src/utxo/bitcoincash/bitcoincash.ts

@@ -3,6 +3,7 @@ import type {
   BitcoinCashBroadcastTransactionResponse,
   BitcoinCashGetAddressAdapterParams,
   BitcoinCashGetAddressResponse,
+  BitcoinCashGetPublicKeysResponse,
   BitcoinCashSignTransactionAdapterParams,
   BitcoinCashSignTransactionResponse,
 } from '@shapeshiftoss/metamask-snaps-types'
@@ -32,6 +33,21 @@ export const BCHGetAddress = async (
   }
 }
 
+export const BCHGetPublicKeys = async (
+  params: BitcoinCashGetAddressAdapterParams,
+): Promise<BitcoinCashGetPublicKeysResponse> => {
+  const { addressParams, snapId } = params
+  try {
+    return await sendFlaskRPCRequest(
+      { method: 'bch_getPublicKeys', params: { addressParams } },
+      snapId,
+    )
+  } catch (error) {
+    moduleLogger.error(error, { fn: 'BCHGetPublicKeys' }, `bch_getPublicKeys RPC call failed.`)
+    return Promise.reject(error)
+  }
+}
+
 export const BCHSignTransaction = async (
   params: BitcoinCashSignTransactionAdapterParams,
 ): Promise<BitcoinCashSignTransactionResponse> => {

packages/adapter/src/utxo/dogecoin/dogecoin.ts

@@ -3,6 +3,7 @@ import type {
   DogecoinBroadcastTransactionResponse,
   DogecoinGetAddressAdapterParams,
   DogecoinGetAddressResponse,
+  DogecoinGetPublicKeysResponse,
   DogecoinSignTransactionAdapterParams,
   DogecoinSignTransactionResponse,
 } from '@shapeshiftoss/metamask-snaps-types'
@@ -30,6 +31,25 @@ export const dogecoinGetAddress = async (
   }
 }
 
+export const dogecoinGetPublicKeys = async (
+  params: DogecoinGetAddressAdapterParams,
+): Promise<DogecoinGetPublicKeysResponse> => {
+  const { addressParams, snapId } = params
+  try {
+    return await sendFlaskRPCRequest(
+      { method: 'doge_getPublicKeys', params: { addressParams } },
+      snapId,
+    )
+  } catch (error) {
+    moduleLogger.error(
+      error,
+      { fn: 'dogecoinGetPublicKeys' },
+      `doge_getPublicKeys RPC call failed.`,
+    )
+    return Promise.reject(error)
+  }
+}
+
 export const dogecoinSignTransaction = async (
   params: DogecoinSignTransactionAdapterParams,
 ): Promise<DogecoinSignTransactionResponse> => {

packages/adapter/src/utxo/litecoin/litecoin.ts

@@ -3,6 +3,7 @@ import type {
   LitecoinBroadcastTransactionResponse,
   LitecoinGetAddressAdapterParams,
   LitecoinGetAddressResponse,
+  LitecoinGetPublicKeysResponse,
   LitecoinSignTransactionAdapterParams,
   LitecoinSignTransactionResponse,
 } from '@shapeshiftoss/metamask-snaps-types'
@@ -30,6 +31,21 @@ export const LTCGetAddress = async (
   }
 }
 
+export const LTCGetPublicKeys = async (
+  params: LitecoinGetAddressAdapterParams,
+): Promise<LitecoinGetPublicKeysResponse> => {
+  const { addressParams, snapId } = params
+  try {
+    return await sendFlaskRPCRequest(
+      { method: 'ltc_getPublicKeys', params: { addressParams } },
+      snapId,
+    )
+  } catch (error) {
+    moduleLogger.error(error, { fn: 'LTCGetPublicKeys' }, `ltc_getPublicKeys RPC call failed.`)
+    return Promise.reject(error)
+  }
+}
+
 export const LTCSignTransaction = async (
   params: LitecoinSignTransactionAdapterParams,
 ): Promise<LitecoinSignTransactionResponse> => {

packages/sandbox/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "sandbox",
-  "version": "1.0.0-alpha.21",
+  "version": "1.0.1",
   "license": "MIT",
   "homepage": "https://shapeshift.github.io/metamask-snaps/",
   "scripts": {
@@ -26,7 +26,7 @@
     "@reduxjs/toolkit": "^1.8.3",
     "@shapeshiftoss/hdwallet-core": "^1.50.4",
     "@shapeshiftoss/logger": "^1.1.2",
-    "@shapeshiftoss/metamask-snaps-adapter": "^1.0.0-alpha.21",
+    "@shapeshiftoss/metamask-snaps-adapter": "^1.0.1",
     "@testing-library/jest-dom": "^5.16.4",
     "@testing-library/react": "^13.0.1",
     "@testing-library/user-event": "^14.1.0",

packages/sandbox/src/components/AssetCardList/AssetCardListConfig.ts

@@ -1,6 +1,6 @@
 import {
-  BCHBroadcastTransaction,
   BCHGetAddress,
+  BCHBroadcastTransaction,
   BCHSignTransaction,
   BTCBroadcastTransaction,
   BTCGetAddress,
@@ -11,9 +11,9 @@ import {
   dogecoinBroadcastTransaction,
   dogecoinGetAddress,
   dogecoinSignTransaction,
-  LTCBroadcastTransaction,
   LTCGetAddress,
   LTCSignTransaction,
+  LTCBroadcastTransaction,
   thorchainBroadcastTransaction,
   thorchainGetAddress,
   thorchainSignTransaction,

packages/snap/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/metamask-snaps",
-  "version": "1.0.0-alpha.21",
+  "version": "1.0.1",
   "description": "A multi-chain Snap for MetaMask by ShapeShift.",
   "license": "MIT",
   "author": "pastaghost <[email protected]> (http://www.github.com/pastaghost)",
@@ -47,7 +47,7 @@
     "@shapeshiftoss/hdwallet-core": "^1.50.4",
     "@shapeshiftoss/hdwallet-native": "^1.50.4",
     "@shapeshiftoss/logger": "^1.1.2",
-    "@shapeshiftoss/metamask-snaps-types": "^1.0.0-alpha.21",
+    "@shapeshiftoss/metamask-snaps-types": "^1.0.1",
     "@shapeshiftoss/types": "^8.3.0",
     "@shapeshiftoss/unchained-client": "10.1.1",
     "eth-rpc-errors": "^4.0.3",
@@ -117,5 +117,5 @@
     "hoistingLimits": "workspaces"
   },
   "packageManager": "[email protected]",
-  "gitHead": "54beb75f060ee91836861205eaaf04226f40a326"
+  "gitHead": "dff70c07a9132a258ab89fc1e3f2169ec2e3fcff"
 }

packages/snap/snap.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.0-alpha.21",
+  "version": "1.0.1",
   "description": "The ShapeShift Multichain snap evolves your wallet to support 11 chains in one snap, including Bitcoin, Dogecoin, Litecoin, Cosmos, Binance Chain, Bitcoin Cash, THORChain, Osmosis, and Secret Network.",
   "proposedName": "ShapeShift Multichain",
   "repository": {
@@ -15,7 +15,7 @@
         "registry": "https://registry.npmjs.org/"
       }
     },
-    "shasum": "6BFw+qPCNlvOwsg02OhdBLlwyVCV2sjqPoUWxXY7eRc="
+    "shasum": "TGIuQx3ItIAjD1Zp1hl+53YY1ULXSoRQGQx9ppn1pFM="
   },
   "initialPermissions": {
     "endowment:network-access": {},

packages/snap/src/index.ts

@@ -47,21 +47,25 @@ import {
 import {
   bitcoinBroadcastTransaction,
   bitcoinGetAddress,
+  bitcoinGetPublicKeys,
   bitcoinSignTransaction,
 } from './rpc/utxo/bitcoin'
 import {
   bitcoincashBroadcastTransaction,
   bitcoincashGetAddress,
+  bitcoincashGetPublicKeys,
   bitcoincashSignTransaction,
 } from './rpc/utxo/bitcoincash'
 import {
   dogecoinBroadcastTransaction,
   dogecoinGetAddress,
+  dogecoinGetPublicKeys,
   dogecoinSignTransaction,
 } from './rpc/utxo/dogecoin'
 import {
   litecoinBroadcastTransaction,
   litecoinGetAddress,
+  litecoinGetPublicKeys,
   litecoinSignTransaction,
 } from './rpc/utxo/litecoin'
 
@@ -99,12 +103,16 @@ export const onRpcRequest: OnRpcRequestHandler = async ({ request, origin }: RPC
       return await binanceBroadcastTransaction({ origin, ...params })
     case 'bch_getAddress':
       return await bitcoincashGetAddress(params)
+    case 'bch_getPublicKeys':
+      return await bitcoincashGetPublicKeys(params)
     case 'bch_signTransaction':
       return await bitcoincashSignTransaction({ origin, ...params })
     case 'bch_broadcastTransaction':
       return await bitcoincashBroadcastTransaction({ origin, ...params })
     case 'btc_getAddress':
       return await bitcoinGetAddress(params)
+    case 'btc_getPublicKeys':
+      return await bitcoinGetPublicKeys(params)
     case 'btc_signTransaction':
       return await bitcoinSignTransaction({ origin, ...params })
     case 'btc_broadcastTransaction':
@@ -117,6 +125,8 @@ export const onRpcRequest: OnRpcRequestHandler = async ({ request, origin }: RPC
       return await cosmosBroadcastTransaction({ origin, ...params })
     case 'doge_getAddress':
       return await dogecoinGetAddress(params)
+    case 'doge_getPublicKeys':
+      return await dogecoinGetPublicKeys(params)
     case 'doge_signTransaction':
       return await dogecoinSignTransaction({ origin, ...params })
     case 'doge_broadcastTransaction':
@@ -135,6 +145,8 @@ export const onRpcRequest: OnRpcRequestHandler = async ({ request, origin }: RPC
       return await kavaBroadcastTransaction({ origin, ...params })
     case 'ltc_getAddress':
       return await litecoinGetAddress(params)
+    case 'ltc_getPublicKeys':
+      return await litecoinGetPublicKeys(params)
     case 'ltc_signTransaction':
       return await litecoinSignTransaction({ origin, ...params })
     case 'ltc_broadcastTransaction':