From b60b9f441f1ce3758c82e053738bec8d335c7cee Mon Sep 17 00:00:00 2001 From: Brad Decker Date: Fri, 5 May 2023 10:55:41 -0500 Subject: [PATCH] Bundle size reduction: Upgrading ethereumjs/tx and ethereumjs/common (#18302) * upgrade ethereumjs/tx and deps * Yarn dedupe --------- Co-authored-by: Dan J Miller --- app/scripts/controllers/transactions/index.js | 20 +- .../controllers/transactions/index.test.js | 2 +- .../transactions/tx-gas-utils.test.js | 4 +- app/scripts/metamask-controller.js | 2 +- builds.yml | 3 + lavamoat/browserify/beta/policy.json | 571 +++++++++++------- lavamoat/browserify/desktop/policy.json | 571 +++++++++++------- lavamoat/browserify/flask/policy.json | 571 +++++++++++------- lavamoat/browserify/main/policy.json | 571 +++++++++++------- lavamoat/build-system/policy.json | 4 - package.json | 18 +- shared/constants/network.ts | 29 +- ui/components/ui/box/box.d.ts | 12 +- .../optimism/buildUnserializedTransaction.js | 4 +- yarn.lock | 515 ++++++++-------- 15 files changed, 1677 insertions(+), 1220 deletions(-) diff --git a/app/scripts/controllers/transactions/index.js b/app/scripts/controllers/transactions/index.js index 032ed4225..e31215171 100644 --- a/app/scripts/controllers/transactions/index.js +++ b/app/scripts/controllers/transactions/index.js @@ -3,7 +3,7 @@ import { ObservableStore } from '@metamask/obs-store'; import { bufferToHex, keccak, toBuffer, isHexString } from 'ethereumjs-util'; import EthQuery from 'ethjs-query'; import { ethErrors } from 'eth-rpc-errors'; -import Common from '@ethereumjs/common'; +import { Common, Hardfork } from '@ethereumjs/common'; import { TransactionFactory } from '@ethereumjs/tx'; import NonceTracker from 'nonce-tracker'; import log from 'loglevel'; @@ -41,7 +41,6 @@ import { import { isSwapsDefaultTokenAddress } from '../../../../shared/modules/swaps.utils'; import { MetaMetricsEventCategory } from '../../../../shared/constants/metametrics'; import { - HARDFORKS, CHAIN_ID_TO_GAS_LIMIT_BUFFER_MAP, NETWORK_TYPES, NetworkStatus, @@ -275,7 +274,7 @@ export default class TransactionController extends EventEmitter { // This logic below will have to be updated each time a hardfork happens // that carries with it a new Transaction type. It is inconsequential for // hardforks that do not include new types. - const hardfork = supportsEIP1559 ? HARDFORKS.LONDON : HARDFORKS.BERLIN; + const hardfork = supportsEIP1559 ? Hardfork.London : Hardfork.Berlin; // type will be one of our default network names or 'rpc'. the default // network names are sufficient configuration, simply pass the name as the @@ -295,7 +294,7 @@ export default class TransactionController extends EventEmitter { const networkStatus = this.getNetworkStatus(); const networkId = this.getNetworkId(); - const customChainParams = { + return Common.custom({ name, chainId, // It is improbable for a transaction to be signed while the network @@ -309,13 +308,8 @@ export default class TransactionController extends EventEmitter { // hardcoding networkId to 'loading'. networkId: networkStatus === NetworkStatus.Available ? parseInt(networkId, 10) : 0, - }; - - return Common.forCustomChain( - NETWORK_TYPES.MAINNET, - customChainParams, hardfork, - ); + }); } /** @@ -1548,9 +1542,9 @@ export default class TransactionController extends EventEmitter { // add r,s,v values for provider request purposes see createMetamaskMiddleware // and JSON rpc standard for further explanation - txMeta.r = bufferToHex(signedEthTx.r); - txMeta.s = bufferToHex(signedEthTx.s); - txMeta.v = bufferToHex(signedEthTx.v); + txMeta.r = addHexPrefix(signedEthTx.r.toString(16)); + txMeta.s = addHexPrefix(signedEthTx.s.toString(16)); + txMeta.v = addHexPrefix(signedEthTx.v.toString(16)); this.txStateManager.updateTransaction( txMeta, diff --git a/app/scripts/controllers/transactions/index.test.js b/app/scripts/controllers/transactions/index.test.js index 3767572b7..12e39d5ac 100644 --- a/app/scripts/controllers/transactions/index.test.js +++ b/app/scripts/controllers/transactions/index.test.js @@ -1152,7 +1152,7 @@ describe('Transaction Controller', function () { ); const rawTx = await txController.signTransaction('1'); const ethTx = TransactionFactory.fromSerializedData(toBuffer(rawTx)); - assert.equal(ethTx.common.chainIdBN().toNumber(), 5); + assert.equal(Number(ethTx.common.chainId()), 5); }); }); diff --git a/app/scripts/controllers/transactions/tx-gas-utils.test.js b/app/scripts/controllers/transactions/tx-gas-utils.test.js index 97858da26..2c9100d8a 100644 --- a/app/scripts/controllers/transactions/tx-gas-utils.test.js +++ b/app/scripts/controllers/transactions/tx-gas-utils.test.js @@ -1,6 +1,6 @@ import { strict as assert } from 'assert'; import { TransactionFactory } from '@ethereumjs/tx'; -import Common from '@ethereumjs/common'; +import { Common } from '@ethereumjs/common'; import { hexToBn } from '../../lib/util'; import { bnToHex } from '../../../../shared/modules/conversion.utils'; import TxUtils from './tx-gas-utils'; @@ -37,7 +37,7 @@ describe('txUtils', function () { common: new Common({ chain: 'goerli' }), }); assert.equal( - ethTx.common.chainIdBN().toNumber(), + Number(ethTx.common.chainId()), 5, 'chainId is set from tx params', ); diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index 0e239bb73..48e18e5a3 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -15,7 +15,7 @@ import createSubscriptionManager from 'eth-json-rpc-filters/subscriptionManager' import { errorCodes as rpcErrorCodes, EthereumRpcError } from 'eth-rpc-errors'; import { Mutex } from 'await-semaphore'; import log from 'loglevel'; -import TrezorKeyring from 'eth-trezor-keyring'; +import TrezorKeyring from '@metamask/eth-trezor-keyring'; import LedgerBridgeKeyring from '@metamask/eth-ledger-bridge-keyring'; import LatticeKeyring from 'eth-lattice-keyring'; import { MetaMaskKeyring as QRHardwareKeyring } from '@keystonehq/metamask-airgapped-keyring'; diff --git a/builds.yml b/builds.yml index fe455afbe..00fbd00df 100644 --- a/builds.yml +++ b/builds.yml @@ -154,6 +154,9 @@ env: - APPLY_LAVAMOAT - FILE_NAMES + # This variable is read by Trezor's source and breaks build if not included + - ASSET_PREFIX: null + ### # API keys to 3rd party services ### diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json index 5f7721bcf..2581ffd89 100644 --- a/lavamoat/browserify/beta/policy.json +++ b/lavamoat/browserify/beta/policy.json @@ -119,9 +119,9 @@ "@ethereumjs/common": { "packages": { "@ethereumjs/common>crc-32": true, + "@ethereumjs/tx>@ethereumjs/util": true, "browserify>buffer": true, - "browserify>events": true, - "ethereumjs-util": true + "browserify>events": true } }, "@ethereumjs/common>crc-32": { @@ -133,9 +133,87 @@ "@ethereumjs/tx": { "packages": { "@ethereumjs/common": true, + "@ethereumjs/tx>@chainsafe/ssz": true, + "@ethereumjs/tx>@ethereumjs/rlp": true, + "@ethereumjs/tx>@ethereumjs/util": true, + "@ethereumjs/tx>ethereum-cryptography": true, + "@ethersproject/providers": true, "browserify>buffer": true, - "browserify>insert-module-globals>is-buffer": true, - "ethereumjs-util": true + "browserify>insert-module-globals>is-buffer": true + } + }, + "@ethereumjs/tx>@chainsafe/ssz": { + "packages": { + "@ethereumjs/tx>@chainsafe/ssz>@chainsafe/persistent-merkle-tree": true, + "@ethereumjs/tx>@chainsafe/ssz>case": true, + "browserify": true, + "browserify>buffer": true + } + }, + "@ethereumjs/tx>@chainsafe/ssz>@chainsafe/persistent-merkle-tree": { + "globals": { + "WeakRef": true + }, + "packages": { + "browserify": true + } + }, + "@ethereumjs/tx>@ethereumjs/rlp": { + "globals": { + "TextEncoder": true + } + }, + "@ethereumjs/tx>@ethereumjs/util": { + "globals": { + "console.warn": true + }, + "packages": { + "@ethereumjs/tx>@chainsafe/ssz": true, + "@ethereumjs/tx>@ethereumjs/rlp": true, + "@ethereumjs/tx>ethereum-cryptography": true, + "browserify>buffer": true, + "browserify>events": true, + "browserify>insert-module-globals>is-buffer": true + } + }, + "@ethereumjs/tx>ethereum-cryptography": { + "globals": { + "TextDecoder": true, + "crypto": true + }, + "packages": { + "@ethereumjs/tx>ethereum-cryptography>@noble/hashes": true, + "@ethereumjs/tx>ethereum-cryptography>@noble/secp256k1": true, + "@ethereumjs/tx>ethereum-cryptography>@scure/bip32": true + } + }, + "@ethereumjs/tx>ethereum-cryptography>@noble/hashes": { + "globals": { + "TextEncoder": true, + "crypto": true + } + }, + "@ethereumjs/tx>ethereum-cryptography>@noble/secp256k1": { + "globals": { + "crypto": true + }, + "packages": { + "browserify>browser-resolve": true + } + }, + "@ethereumjs/tx>ethereum-cryptography>@scure/bip32": { + "packages": { + "@ethereumjs/tx>ethereum-cryptography>@scure/bip32>@noble/secp256k1": true, + "@metamask/key-tree>@noble/hashes": true, + "@metamask/key-tree>@scure/base": true + } + }, + "@ethereumjs/tx>ethereum-cryptography>@scure/bip32>@noble/secp256k1": { + "globals": { + "crypto": true + }, + "packages": { + "browserify>browser-resolve": true } }, "@ethersproject/abi": { @@ -411,10 +489,10 @@ }, "@keystonehq/bc-ur-registry-eth": { "packages": { + "@ethereumjs/tx>@ethereumjs/util": true, "@keystonehq/bc-ur-registry-eth>@keystonehq/bc-ur-registry": true, "@keystonehq/bc-ur-registry-eth>hdkey": true, "browserify>buffer": true, - "eth-lattice-keyring>@ethereumjs/util": true, "uuid": true } }, @@ -441,8 +519,8 @@ "@keystonehq/metamask-airgapped-keyring": { "packages": { "@ethereumjs/tx": true, - "@keystonehq/bc-ur-registry-eth": true, "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring": true, + "@keystonehq/metamask-airgapped-keyring>@keystonehq/bc-ur-registry-eth": true, "@keystonehq/metamask-airgapped-keyring>@metamask/obs-store": true, "browserify>buffer": true, "browserify>events": true, @@ -453,19 +531,61 @@ "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring": { "packages": { "@ethereumjs/tx": true, - "@keystonehq/bc-ur-registry-eth": true, + "@ethereumjs/tx>@ethereumjs/util": true, "@keystonehq/bc-ur-registry-eth>hdkey": true, + "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring>@keystonehq/bc-ur-registry-eth": true, "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring>rlp": true, "browserify>buffer": true, - "eth-lattice-keyring>@ethereumjs/util": true, "uuid": true } }, + "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring>@keystonehq/bc-ur-registry-eth": { + "packages": { + "@ethereumjs/tx>@ethereumjs/util": true, + "@keystonehq/bc-ur-registry-eth>hdkey": true, + "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring>@keystonehq/bc-ur-registry-eth>@keystonehq/bc-ur-registry": true, + "browserify>buffer": true, + "uuid": true + } + }, + "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring>@keystonehq/bc-ur-registry-eth>@keystonehq/bc-ur-registry": { + "globals": { + "define": true + }, + "packages": { + "@ngraveio/bc-ur": true, + "@ngraveio/bc-ur>crc>buffer": true, + "browserify>buffer": true, + "ethereumjs-wallet>bs58check": true, + "wait-on>rxjs>tslib": true + } + }, "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring>rlp": { "globals": { "TextEncoder": true } }, + "@keystonehq/metamask-airgapped-keyring>@keystonehq/bc-ur-registry-eth": { + "packages": { + "@ethereumjs/tx>@ethereumjs/util": true, + "@keystonehq/bc-ur-registry-eth>hdkey": true, + "@keystonehq/metamask-airgapped-keyring>@keystonehq/bc-ur-registry-eth>@keystonehq/bc-ur-registry": true, + "browserify>buffer": true, + "uuid": true + } + }, + "@keystonehq/metamask-airgapped-keyring>@keystonehq/bc-ur-registry-eth>@keystonehq/bc-ur-registry": { + "globals": { + "define": true + }, + "packages": { + "@ngraveio/bc-ur": true, + "@ngraveio/bc-ur>crc>buffer": true, + "browserify>buffer": true, + "ethereumjs-wallet>bs58check": true, + "wait-on>rxjs>tslib": true + } + }, "@keystonehq/metamask-airgapped-keyring>@metamask/obs-store": { "packages": { "@keystonehq/metamask-airgapped-keyring>@metamask/obs-store>through2": true, @@ -833,7 +953,7 @@ "packages": { "@metamask/eth-json-rpc-infura>@metamask/utils": true, "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware>pify": true, - "@metamask/eth-keyring-controller>@metamask/eth-sig-util": true, + "@metamask/eth-trezor-keyring>@metamask/eth-sig-util": true, "@metamask/safe-event-emitter": true, "browserify>browser-resolve": true, "eth-rpc-errors": true, @@ -852,7 +972,7 @@ "@metamask/eth-json-rpc-middleware>@metamask/utils": true, "@metamask/eth-json-rpc-middleware>pify": true, "@metamask/eth-json-rpc-middleware>safe-stable-stringify": true, - "@metamask/eth-keyring-controller>@metamask/eth-sig-util": true, + "@metamask/eth-trezor-keyring>@metamask/eth-sig-util": true, "eth-rpc-errors": true, "json-rpc-engine": true, "vinyl>clone": true @@ -879,9 +999,9 @@ "@metamask/eth-keyring-controller": { "packages": { "@metamask/eth-keyring-controller>@metamask/eth-hd-keyring": true, - "@metamask/eth-keyring-controller>@metamask/eth-sig-util": true, "@metamask/eth-keyring-controller>@metamask/eth-simple-keyring": true, "@metamask/eth-keyring-controller>obs-store": true, + "@metamask/eth-trezor-keyring>@metamask/eth-sig-util": true, "@metamask/rpc-methods>@metamask/browser-passworder": true, "browserify>events": true } @@ -891,38 +1011,20 @@ "TextEncoder": true }, "packages": { - "@metamask/eth-keyring-controller>@metamask/eth-sig-util": true, + "@ethereumjs/tx>@ethereumjs/util": true, + "@ethereumjs/tx>ethereum-cryptography": true, + "@metamask/eth-trezor-keyring>@metamask/eth-sig-util": true, "@metamask/scure-bip39": true, - "@metamask/utils>@ethereumjs/tx>ethereum-cryptography": true, - "browserify>buffer": true, - "eth-lattice-keyring>@ethereumjs/util": true - } - }, - "@metamask/eth-keyring-controller>@metamask/eth-sig-util": { - "packages": { - "@metamask/eth-keyring-controller>@metamask/eth-sig-util>ethjs-util": true, - "@metamask/utils>@ethereumjs/tx>ethereum-cryptography": true, - "bn.js": true, - "browserify>buffer": true, - "eth-lattice-keyring>@ethereumjs/util": true, - "eth-sig-util>tweetnacl": true, - "eth-sig-util>tweetnacl-util": true - } - }, - "@metamask/eth-keyring-controller>@metamask/eth-sig-util>ethjs-util": { - "packages": { - "browserify>buffer": true, - "ethjs>ethjs-util>is-hex-prefixed": true, - "ethjs>ethjs-util>strip-hex-prefix": true + "browserify>buffer": true } }, "@metamask/eth-keyring-controller>@metamask/eth-simple-keyring": { "packages": { - "@metamask/eth-keyring-controller>@metamask/eth-sig-util": true, - "@metamask/utils>@ethereumjs/tx>ethereum-cryptography": true, + "@ethereumjs/tx>@ethereumjs/util": true, + "@ethereumjs/tx>ethereum-cryptography": true, + "@metamask/eth-trezor-keyring>@metamask/eth-sig-util": true, "browserify>buffer": true, "browserify>events": true, - "eth-lattice-keyring>@ethereumjs/util": true, "ethereumjs-wallet>randombytes": true } }, @@ -990,17 +1092,17 @@ "@metamask/eth-ledger-bridge-keyring>hdkey": { "packages": { "@metamask/eth-ledger-bridge-keyring>hdkey>secp256k1": true, + "@metamask/eth-trezor-keyring>hdkey>coinstring": true, "browserify>assert": true, "browserify>crypto-browserify": true, - "eth-trezor-keyring>hdkey>coinstring": true, "ethereumjs-wallet>safe-buffer": true } }, "@metamask/eth-ledger-bridge-keyring>hdkey>secp256k1": { "packages": { + "@metamask/eth-trezor-keyring>hdkey>secp256k1>bip66": true, "bn.js": true, "browserify>insert-module-globals>is-buffer": true, - "eth-trezor-keyring>hdkey>secp256k1>bip66": true, "ethereumjs-util>create-hash": true, "ethereumjs-wallet>safe-buffer": true, "ganache>secp256k1>elliptic": true @@ -1119,6 +1221,194 @@ "webpack>events": true } }, + "@metamask/eth-trezor-keyring": { + "globals": { + "setTimeout": true + }, + "packages": { + "@ethereumjs/tx": true, + "@ethereumjs/tx>@ethereumjs/util": true, + "@metamask/eth-trezor-keyring>@trezor/connect-plugin-ethereum": true, + "@metamask/eth-trezor-keyring>@trezor/connect-web": true, + "@metamask/eth-trezor-keyring>hdkey": true, + "browserify>buffer": true, + "browserify>events": true + } + }, + "@metamask/eth-trezor-keyring>@metamask/eth-sig-util": { + "packages": { + "@ethereumjs/tx>@ethereumjs/util": true, + "@ethereumjs/tx>ethereum-cryptography": true, + "@metamask/eth-trezor-keyring>@metamask/eth-sig-util>ethjs-util": true, + "bn.js": true, + "browserify>buffer": true, + "eth-sig-util>tweetnacl": true, + "eth-sig-util>tweetnacl-util": true + } + }, + "@metamask/eth-trezor-keyring>@metamask/eth-sig-util>ethjs-util": { + "packages": { + "browserify>buffer": true, + "ethjs>ethjs-util>is-hex-prefixed": true, + "ethjs>ethjs-util>strip-hex-prefix": true + } + }, + "@metamask/eth-trezor-keyring>@trezor/connect-plugin-ethereum": { + "packages": { + "@metamask/eth-trezor-keyring>@metamask/eth-sig-util": true + } + }, + "@metamask/eth-trezor-keyring>@trezor/connect-web": { + "globals": { + "addEventListener": true, + "btoa": true, + "chrome": true, + "clearInterval": true, + "clearTimeout": true, + "console.warn": true, + "document.body": true, + "document.createElement": true, + "document.createTextNode": true, + "document.getElementById": true, + "document.querySelectorAll": true, + "navigator.usb.requestDevice": true, + "open": true, + "removeEventListener": true, + "setInterval": true, + "setTimeout": true + }, + "packages": { + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect": true, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/utils": true, + "browserify>events": true, + "wait-on>rxjs>tslib": true + } + }, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect": { + "globals": { + "__TREZOR_CONNECT_SRC": true, + "chrome": true, + "console.error": true, + "console.log": true, + "console.warn": true, + "location": true, + "navigator": true + }, + "packages": { + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport": true, + "wait-on>rxjs>tslib": true + } + }, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport": { + "globals": { + "fetch": true, + "navigator.usb": true, + "onconnect": "write", + "setTimeout": true + }, + "packages": { + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>bytebuffer": true, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>long": true, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>protobufjs": true, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/utils": true, + "browserify>buffer": true, + "browserify>events": true, + "lavamoat>json-stable-stringify": true + } + }, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>bytebuffer": { + "globals": { + "console": true, + "define": true + }, + "packages": { + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>bytebuffer>long": true + } + }, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>bytebuffer>long": { + "globals": { + "define": true + } + }, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>long": { + "globals": { + "WebAssembly.Instance": true, + "WebAssembly.Module": true + } + }, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>protobufjs": { + "globals": { + "process": true, + "setTimeout": true + }, + "packages": { + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>protobufjs>@protobufjs/aspromise": true, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>protobufjs>@protobufjs/base64": true, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>protobufjs>@protobufjs/codegen": true, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>protobufjs>@protobufjs/eventemitter": true, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>protobufjs>@protobufjs/fetch": true, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>protobufjs>@protobufjs/float": true, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>protobufjs>@protobufjs/inquire": true, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>protobufjs>@protobufjs/path": true, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>protobufjs>@protobufjs/pool": true, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>protobufjs>@protobufjs/utf8": true + } + }, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>protobufjs>@protobufjs/codegen": { + "globals": { + "console.log": true + } + }, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>protobufjs>@protobufjs/fetch": { + "globals": { + "XMLHttpRequest": true + }, + "packages": { + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>protobufjs>@protobufjs/aspromise": true, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>protobufjs>@protobufjs/inquire": true + } + }, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/utils": { + "globals": { + "AbortController": true, + "clearTimeout": true, + "setTimeout": true + }, + "packages": { + "browserify>buffer": true + } + }, + "@metamask/eth-trezor-keyring>hdkey": { + "packages": { + "@metamask/eth-trezor-keyring>hdkey>coinstring": true, + "@metamask/eth-trezor-keyring>hdkey>secp256k1": true, + "browserify>assert": true, + "browserify>crypto-browserify": true, + "ethereumjs-wallet>safe-buffer": true + } + }, + "@metamask/eth-trezor-keyring>hdkey>coinstring": { + "packages": { + "@metamask/eth-trezor-keyring>hdkey>coinstring>bs58": true, + "browserify>buffer": true, + "ethereumjs-util>create-hash": true + } + }, + "@metamask/eth-trezor-keyring>hdkey>secp256k1": { + "packages": { + "@metamask/eth-trezor-keyring>hdkey>secp256k1>bip66": true, + "bn.js": true, + "browserify>insert-module-globals>is-buffer": true, + "ethereumjs-util>create-hash": true, + "ethereumjs-wallet>safe-buffer": true, + "ganache>secp256k1>elliptic": true + } + }, + "@metamask/eth-trezor-keyring>hdkey>secp256k1>bip66": { + "packages": { + "ethereumjs-wallet>safe-buffer": true + } + }, "@metamask/etherscan-link": { "globals": { "URL": true @@ -1468,67 +1758,6 @@ "superstruct": true } }, - "@metamask/utils>@ethereumjs/tx>@chainsafe/ssz": { - "packages": { - "@metamask/utils>@ethereumjs/tx>@chainsafe/ssz>@chainsafe/persistent-merkle-tree": true, - "@metamask/utils>@ethereumjs/tx>@chainsafe/ssz>case": true, - "browserify": true, - "browserify>buffer": true - } - }, - "@metamask/utils>@ethereumjs/tx>@chainsafe/ssz>@chainsafe/persistent-merkle-tree": { - "globals": { - "WeakRef": true - }, - "packages": { - "browserify": true - } - }, - "@metamask/utils>@ethereumjs/tx>@ethereumjs/rlp": { - "globals": { - "TextEncoder": true - } - }, - "@metamask/utils>@ethereumjs/tx>ethereum-cryptography": { - "globals": { - "TextDecoder": true, - "crypto": true - }, - "packages": { - "@metamask/utils>@ethereumjs/tx>ethereum-cryptography>@noble/hashes": true, - "@metamask/utils>@ethereumjs/tx>ethereum-cryptography>@noble/secp256k1": true, - "@metamask/utils>@ethereumjs/tx>ethereum-cryptography>@scure/bip32": true - } - }, - "@metamask/utils>@ethereumjs/tx>ethereum-cryptography>@noble/hashes": { - "globals": { - "TextEncoder": true, - "crypto": true - } - }, - "@metamask/utils>@ethereumjs/tx>ethereum-cryptography>@noble/secp256k1": { - "globals": { - "crypto": true - }, - "packages": { - "browserify>browser-resolve": true - } - }, - "@metamask/utils>@ethereumjs/tx>ethereum-cryptography>@scure/bip32": { - "packages": { - "@metamask/key-tree>@noble/hashes": true, - "@metamask/key-tree>@scure/base": true, - "@metamask/utils>@ethereumjs/tx>ethereum-cryptography>@scure/bip32>@noble/secp256k1": true - } - }, - "@metamask/utils>@ethereumjs/tx>ethereum-cryptography>@scure/bip32>@noble/secp256k1": { - "globals": { - "crypto": true - }, - "packages": { - "browserify>browser-resolve": true - } - }, "@ngraveio/bc-ur": { "packages": { "@ngraveio/bc-ur>@apocentre/alias-sampling": true, @@ -1566,6 +1795,15 @@ "browserify>buffer": true } }, + "@ngraveio/bc-ur>crc>buffer": { + "globals": { + "console": true + }, + "packages": { + "base64-js": true, + "browserify>buffer>ieee754": true + } + }, "@ngraveio/bc-ur>jsbi": { "globals": { "define": true @@ -2742,37 +2980,16 @@ "setInterval": true }, "packages": { + "@ethereumjs/tx": true, + "@ethereumjs/tx>@ethereumjs/util": true, "browserify>buffer": true, "browserify>crypto-browserify": true, "browserify>events": true, - "eth-lattice-keyring>@ethereumjs/tx": true, - "eth-lattice-keyring>@ethereumjs/util": true, "eth-lattice-keyring>bn.js": true, "eth-lattice-keyring>gridplus-sdk": true, "eth-lattice-keyring>rlp": true } }, - "eth-lattice-keyring>@ethereumjs/tx": { - "packages": { - "@ethereumjs/common": true, - "browserify>buffer": true, - "browserify>insert-module-globals>is-buffer": true, - "ethereumjs-util": true - } - }, - "eth-lattice-keyring>@ethereumjs/util": { - "globals": { - "console.warn": true - }, - "packages": { - "@metamask/utils>@ethereumjs/tx>@chainsafe/ssz": true, - "@metamask/utils>@ethereumjs/tx>@ethereumjs/rlp": true, - "@metamask/utils>@ethereumjs/tx>ethereum-cryptography": true, - "browserify>buffer": true, - "browserify>events": true, - "browserify>insert-module-globals>is-buffer": true - } - }, "eth-lattice-keyring>bn.js": { "globals": { "Buffer": true @@ -2785,6 +3002,7 @@ "globals": { "AbortController": true, "Request": true, + "URL": true, "__values": true, "caches": true, "clearTimeout": true, @@ -2795,12 +3013,12 @@ "setTimeout": true }, "packages": { + "@ethereumjs/common": true, "@ethereumjs/common>crc-32": true, + "@ethereumjs/tx": true, "@ethersproject/abi": true, "bn.js": true, "browserify>buffer": true, - "eth-lattice-keyring>gridplus-sdk>@ethereumjs/common": true, - "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx": true, "eth-lattice-keyring>gridplus-sdk>bech32": true, "eth-lattice-keyring>gridplus-sdk>bignumber.js": true, "eth-lattice-keyring>gridplus-sdk>bitwise": true, @@ -2817,30 +3035,6 @@ "lodash": true } }, - "eth-lattice-keyring>gridplus-sdk>@ethereumjs/common": { - "packages": { - "@ethereumjs/common>crc-32": true, - "browserify>buffer": true, - "browserify>events": true, - "ethereumjs-util": true - } - }, - "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx": { - "packages": { - "browserify>buffer": true, - "browserify>insert-module-globals>is-buffer": true, - "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>@ethereumjs/common": true, - "ethereumjs-util": true - } - }, - "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>@ethereumjs/common": { - "packages": { - "@ethereumjs/common>crc-32": true, - "browserify>buffer": true, - "browserify>events": true, - "ethereumjs-util": true - } - }, "eth-lattice-keyring>gridplus-sdk>bignumber.js": { "globals": { "crypto": true, @@ -3012,87 +3206,6 @@ "browserify>browser-resolve": true } }, - "eth-trezor-keyring": { - "globals": { - "setTimeout": true - }, - "packages": { - "@ethereumjs/tx": true, - "browserify>buffer": true, - "browserify>events": true, - "eth-trezor-keyring>hdkey": true, - "eth-trezor-keyring>trezor-connect": true, - "ethereumjs-util": true - } - }, - "eth-trezor-keyring>hdkey": { - "packages": { - "browserify>assert": true, - "browserify>crypto-browserify": true, - "eth-trezor-keyring>hdkey>coinstring": true, - "eth-trezor-keyring>hdkey>secp256k1": true, - "ethereumjs-wallet>safe-buffer": true - } - }, - "eth-trezor-keyring>hdkey>coinstring": { - "packages": { - "browserify>buffer": true, - "eth-trezor-keyring>hdkey>coinstring>bs58": true, - "ethereumjs-util>create-hash": true - } - }, - "eth-trezor-keyring>hdkey>secp256k1": { - "packages": { - "bn.js": true, - "browserify>insert-module-globals>is-buffer": true, - "eth-trezor-keyring>hdkey>secp256k1>bip66": true, - "ethereumjs-util>create-hash": true, - "ethereumjs-wallet>safe-buffer": true, - "ganache>secp256k1>elliptic": true - } - }, - "eth-trezor-keyring>hdkey>secp256k1>bip66": { - "packages": { - "ethereumjs-wallet>safe-buffer": true - } - }, - "eth-trezor-keyring>trezor-connect": { - "globals": { - "__TREZOR_CONNECT_SRC": true, - "addEventListener": true, - "btoa": true, - "chrome": true, - "clearInterval": true, - "clearTimeout": true, - "console": true, - "document.body": true, - "document.createElement": true, - "document.createTextNode": true, - "document.getElementById": true, - "document.querySelectorAll": true, - "location": true, - "navigator": true, - "open": true, - "removeEventListener": true, - "setInterval": true, - "setTimeout": true - }, - "packages": { - "@babel/runtime": true, - "@metamask/eth-keyring-controller>@metamask/eth-sig-util": true, - "browserify>events": true, - "eth-trezor-keyring>trezor-connect>cross-fetch": true - } - }, - "eth-trezor-keyring>trezor-connect>cross-fetch": { - "globals": { - "Blob": true, - "FileReader": true, - "FormData": true, - "URLSearchParams.prototype.isPrototypeOf": true, - "XMLHttpRequest": true - } - }, "ethereumjs-abi": { "packages": { "bn.js": true, diff --git a/lavamoat/browserify/desktop/policy.json b/lavamoat/browserify/desktop/policy.json index 1fcdff317..f0fa38c5f 100644 --- a/lavamoat/browserify/desktop/policy.json +++ b/lavamoat/browserify/desktop/policy.json @@ -119,9 +119,9 @@ "@ethereumjs/common": { "packages": { "@ethereumjs/common>crc-32": true, + "@ethereumjs/tx>@ethereumjs/util": true, "browserify>buffer": true, - "browserify>events": true, - "ethereumjs-util": true + "browserify>events": true } }, "@ethereumjs/common>crc-32": { @@ -133,9 +133,87 @@ "@ethereumjs/tx": { "packages": { "@ethereumjs/common": true, + "@ethereumjs/tx>@chainsafe/ssz": true, + "@ethereumjs/tx>@ethereumjs/rlp": true, + "@ethereumjs/tx>@ethereumjs/util": true, + "@ethereumjs/tx>ethereum-cryptography": true, + "@ethersproject/providers": true, "browserify>buffer": true, - "browserify>insert-module-globals>is-buffer": true, - "ethereumjs-util": true + "browserify>insert-module-globals>is-buffer": true + } + }, + "@ethereumjs/tx>@chainsafe/ssz": { + "packages": { + "@ethereumjs/tx>@chainsafe/ssz>@chainsafe/persistent-merkle-tree": true, + "@ethereumjs/tx>@chainsafe/ssz>case": true, + "browserify": true, + "browserify>buffer": true + } + }, + "@ethereumjs/tx>@chainsafe/ssz>@chainsafe/persistent-merkle-tree": { + "globals": { + "WeakRef": true + }, + "packages": { + "browserify": true + } + }, + "@ethereumjs/tx>@ethereumjs/rlp": { + "globals": { + "TextEncoder": true + } + }, + "@ethereumjs/tx>@ethereumjs/util": { + "globals": { + "console.warn": true + }, + "packages": { + "@ethereumjs/tx>@chainsafe/ssz": true, + "@ethereumjs/tx>@ethereumjs/rlp": true, + "@ethereumjs/tx>ethereum-cryptography": true, + "browserify>buffer": true, + "browserify>events": true, + "browserify>insert-module-globals>is-buffer": true + } + }, + "@ethereumjs/tx>ethereum-cryptography": { + "globals": { + "TextDecoder": true, + "crypto": true + }, + "packages": { + "@ethereumjs/tx>ethereum-cryptography>@noble/hashes": true, + "@ethereumjs/tx>ethereum-cryptography>@noble/secp256k1": true, + "@ethereumjs/tx>ethereum-cryptography>@scure/bip32": true + } + }, + "@ethereumjs/tx>ethereum-cryptography>@noble/hashes": { + "globals": { + "TextEncoder": true, + "crypto": true + } + }, + "@ethereumjs/tx>ethereum-cryptography>@noble/secp256k1": { + "globals": { + "crypto": true + }, + "packages": { + "browserify>browser-resolve": true + } + }, + "@ethereumjs/tx>ethereum-cryptography>@scure/bip32": { + "packages": { + "@ethereumjs/tx>ethereum-cryptography>@scure/bip32>@noble/secp256k1": true, + "@metamask/key-tree>@noble/hashes": true, + "@metamask/key-tree>@scure/base": true + } + }, + "@ethereumjs/tx>ethereum-cryptography>@scure/bip32>@noble/secp256k1": { + "globals": { + "crypto": true + }, + "packages": { + "browserify>browser-resolve": true } }, "@ethersproject/abi": { @@ -411,10 +489,10 @@ }, "@keystonehq/bc-ur-registry-eth": { "packages": { + "@ethereumjs/tx>@ethereumjs/util": true, "@keystonehq/bc-ur-registry-eth>@keystonehq/bc-ur-registry": true, "@keystonehq/bc-ur-registry-eth>hdkey": true, "browserify>buffer": true, - "eth-lattice-keyring>@ethereumjs/util": true, "uuid": true } }, @@ -441,8 +519,8 @@ "@keystonehq/metamask-airgapped-keyring": { "packages": { "@ethereumjs/tx": true, - "@keystonehq/bc-ur-registry-eth": true, "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring": true, + "@keystonehq/metamask-airgapped-keyring>@keystonehq/bc-ur-registry-eth": true, "@keystonehq/metamask-airgapped-keyring>@metamask/obs-store": true, "browserify>buffer": true, "browserify>events": true, @@ -453,19 +531,61 @@ "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring": { "packages": { "@ethereumjs/tx": true, - "@keystonehq/bc-ur-registry-eth": true, + "@ethereumjs/tx>@ethereumjs/util": true, "@keystonehq/bc-ur-registry-eth>hdkey": true, + "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring>@keystonehq/bc-ur-registry-eth": true, "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring>rlp": true, "browserify>buffer": true, - "eth-lattice-keyring>@ethereumjs/util": true, "uuid": true } }, + "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring>@keystonehq/bc-ur-registry-eth": { + "packages": { + "@ethereumjs/tx>@ethereumjs/util": true, + "@keystonehq/bc-ur-registry-eth>hdkey": true, + "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring>@keystonehq/bc-ur-registry-eth>@keystonehq/bc-ur-registry": true, + "browserify>buffer": true, + "uuid": true + } + }, + "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring>@keystonehq/bc-ur-registry-eth>@keystonehq/bc-ur-registry": { + "globals": { + "define": true + }, + "packages": { + "@ngraveio/bc-ur": true, + "@ngraveio/bc-ur>crc>buffer": true, + "browserify>buffer": true, + "ethereumjs-wallet>bs58check": true, + "wait-on>rxjs>tslib": true + } + }, "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring>rlp": { "globals": { "TextEncoder": true } }, + "@keystonehq/metamask-airgapped-keyring>@keystonehq/bc-ur-registry-eth": { + "packages": { + "@ethereumjs/tx>@ethereumjs/util": true, + "@keystonehq/bc-ur-registry-eth>hdkey": true, + "@keystonehq/metamask-airgapped-keyring>@keystonehq/bc-ur-registry-eth>@keystonehq/bc-ur-registry": true, + "browserify>buffer": true, + "uuid": true + } + }, + "@keystonehq/metamask-airgapped-keyring>@keystonehq/bc-ur-registry-eth>@keystonehq/bc-ur-registry": { + "globals": { + "define": true + }, + "packages": { + "@ngraveio/bc-ur": true, + "@ngraveio/bc-ur>crc>buffer": true, + "browserify>buffer": true, + "ethereumjs-wallet>bs58check": true, + "wait-on>rxjs>tslib": true + } + }, "@keystonehq/metamask-airgapped-keyring>@metamask/obs-store": { "packages": { "@keystonehq/metamask-airgapped-keyring>@metamask/obs-store>through2": true, @@ -904,7 +1024,7 @@ "packages": { "@metamask/eth-json-rpc-infura>@metamask/utils": true, "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware>pify": true, - "@metamask/eth-keyring-controller>@metamask/eth-sig-util": true, + "@metamask/eth-trezor-keyring>@metamask/eth-sig-util": true, "@metamask/safe-event-emitter": true, "browserify>browser-resolve": true, "eth-rpc-errors": true, @@ -923,7 +1043,7 @@ "@metamask/eth-json-rpc-middleware>@metamask/utils": true, "@metamask/eth-json-rpc-middleware>pify": true, "@metamask/eth-json-rpc-middleware>safe-stable-stringify": true, - "@metamask/eth-keyring-controller>@metamask/eth-sig-util": true, + "@metamask/eth-trezor-keyring>@metamask/eth-sig-util": true, "eth-rpc-errors": true, "json-rpc-engine": true, "vinyl>clone": true @@ -950,9 +1070,9 @@ "@metamask/eth-keyring-controller": { "packages": { "@metamask/eth-keyring-controller>@metamask/eth-hd-keyring": true, - "@metamask/eth-keyring-controller>@metamask/eth-sig-util": true, "@metamask/eth-keyring-controller>@metamask/eth-simple-keyring": true, "@metamask/eth-keyring-controller>obs-store": true, + "@metamask/eth-trezor-keyring>@metamask/eth-sig-util": true, "@metamask/rpc-methods>@metamask/browser-passworder": true, "browserify>events": true } @@ -962,38 +1082,20 @@ "TextEncoder": true }, "packages": { - "@metamask/eth-keyring-controller>@metamask/eth-sig-util": true, + "@ethereumjs/tx>@ethereumjs/util": true, + "@ethereumjs/tx>ethereum-cryptography": true, + "@metamask/eth-trezor-keyring>@metamask/eth-sig-util": true, "@metamask/scure-bip39": true, - "@metamask/utils>@ethereumjs/tx>ethereum-cryptography": true, - "browserify>buffer": true, - "eth-lattice-keyring>@ethereumjs/util": true - } - }, - "@metamask/eth-keyring-controller>@metamask/eth-sig-util": { - "packages": { - "@metamask/eth-keyring-controller>@metamask/eth-sig-util>ethjs-util": true, - "@metamask/utils>@ethereumjs/tx>ethereum-cryptography": true, - "bn.js": true, - "browserify>buffer": true, - "eth-lattice-keyring>@ethereumjs/util": true, - "eth-sig-util>tweetnacl": true, - "eth-sig-util>tweetnacl-util": true - } - }, - "@metamask/eth-keyring-controller>@metamask/eth-sig-util>ethjs-util": { - "packages": { - "browserify>buffer": true, - "ethjs>ethjs-util>is-hex-prefixed": true, - "ethjs>ethjs-util>strip-hex-prefix": true + "browserify>buffer": true } }, "@metamask/eth-keyring-controller>@metamask/eth-simple-keyring": { "packages": { - "@metamask/eth-keyring-controller>@metamask/eth-sig-util": true, - "@metamask/utils>@ethereumjs/tx>ethereum-cryptography": true, + "@ethereumjs/tx>@ethereumjs/util": true, + "@ethereumjs/tx>ethereum-cryptography": true, + "@metamask/eth-trezor-keyring>@metamask/eth-sig-util": true, "browserify>buffer": true, "browserify>events": true, - "eth-lattice-keyring>@ethereumjs/util": true, "ethereumjs-wallet>randombytes": true } }, @@ -1061,17 +1163,17 @@ "@metamask/eth-ledger-bridge-keyring>hdkey": { "packages": { "@metamask/eth-ledger-bridge-keyring>hdkey>secp256k1": true, + "@metamask/eth-trezor-keyring>hdkey>coinstring": true, "browserify>assert": true, "browserify>crypto-browserify": true, - "eth-trezor-keyring>hdkey>coinstring": true, "ethereumjs-wallet>safe-buffer": true } }, "@metamask/eth-ledger-bridge-keyring>hdkey>secp256k1": { "packages": { + "@metamask/eth-trezor-keyring>hdkey>secp256k1>bip66": true, "bn.js": true, "browserify>insert-module-globals>is-buffer": true, - "eth-trezor-keyring>hdkey>secp256k1>bip66": true, "ethereumjs-util>create-hash": true, "ethereumjs-wallet>safe-buffer": true, "ganache>secp256k1>elliptic": true @@ -1190,6 +1292,194 @@ "webpack>events": true } }, + "@metamask/eth-trezor-keyring": { + "globals": { + "setTimeout": true + }, + "packages": { + "@ethereumjs/tx": true, + "@ethereumjs/tx>@ethereumjs/util": true, + "@metamask/eth-trezor-keyring>@trezor/connect-plugin-ethereum": true, + "@metamask/eth-trezor-keyring>@trezor/connect-web": true, + "@metamask/eth-trezor-keyring>hdkey": true, + "browserify>buffer": true, + "browserify>events": true + } + }, + "@metamask/eth-trezor-keyring>@metamask/eth-sig-util": { + "packages": { + "@ethereumjs/tx>@ethereumjs/util": true, + "@ethereumjs/tx>ethereum-cryptography": true, + "@metamask/eth-trezor-keyring>@metamask/eth-sig-util>ethjs-util": true, + "bn.js": true, + "browserify>buffer": true, + "eth-sig-util>tweetnacl": true, + "eth-sig-util>tweetnacl-util": true + } + }, + "@metamask/eth-trezor-keyring>@metamask/eth-sig-util>ethjs-util": { + "packages": { + "browserify>buffer": true, + "ethjs>ethjs-util>is-hex-prefixed": true, + "ethjs>ethjs-util>strip-hex-prefix": true + } + }, + "@metamask/eth-trezor-keyring>@trezor/connect-plugin-ethereum": { + "packages": { + "@metamask/eth-trezor-keyring>@metamask/eth-sig-util": true + } + }, + "@metamask/eth-trezor-keyring>@trezor/connect-web": { + "globals": { + "addEventListener": true, + "btoa": true, + "chrome": true, + "clearInterval": true, + "clearTimeout": true, + "console.warn": true, + "document.body": true, + "document.createElement": true, + "document.createTextNode": true, + "document.getElementById": true, + "document.querySelectorAll": true, + "navigator.usb.requestDevice": true, + "open": true, + "removeEventListener": true, + "setInterval": true, + "setTimeout": true + }, + "packages": { + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect": true, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/utils": true, + "browserify>events": true, + "wait-on>rxjs>tslib": true + } + }, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect": { + "globals": { + "__TREZOR_CONNECT_SRC": true, + "chrome": true, + "console.error": true, + "console.log": true, + "console.warn": true, + "location": true, + "navigator": true + }, + "packages": { + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport": true, + "wait-on>rxjs>tslib": true + } + }, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport": { + "globals": { + "fetch": true, + "navigator.usb": true, + "onconnect": "write", + "setTimeout": true + }, + "packages": { + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>bytebuffer": true, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>long": true, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>protobufjs": true, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/utils": true, + "browserify>buffer": true, + "browserify>events": true, + "lavamoat>json-stable-stringify": true + } + }, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>bytebuffer": { + "globals": { + "console": true, + "define": true + }, + "packages": { + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>bytebuffer>long": true + } + }, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>bytebuffer>long": { + "globals": { + "define": true + } + }, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>long": { + "globals": { + "WebAssembly.Instance": true, + "WebAssembly.Module": true + } + }, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>protobufjs": { + "globals": { + "process": true, + "setTimeout": true + }, + "packages": { + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>protobufjs>@protobufjs/aspromise": true, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>protobufjs>@protobufjs/base64": true, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>protobufjs>@protobufjs/codegen": true, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>protobufjs>@protobufjs/eventemitter": true, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>protobufjs>@protobufjs/fetch": true, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>protobufjs>@protobufjs/float": true, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>protobufjs>@protobufjs/inquire": true, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>protobufjs>@protobufjs/path": true, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>protobufjs>@protobufjs/pool": true, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>protobufjs>@protobufjs/utf8": true + } + }, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>protobufjs>@protobufjs/codegen": { + "globals": { + "console.log": true + } + }, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>protobufjs>@protobufjs/fetch": { + "globals": { + "XMLHttpRequest": true + }, + "packages": { + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>protobufjs>@protobufjs/aspromise": true, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>protobufjs>@protobufjs/inquire": true + } + }, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/utils": { + "globals": { + "AbortController": true, + "clearTimeout": true, + "setTimeout": true + }, + "packages": { + "browserify>buffer": true + } + }, + "@metamask/eth-trezor-keyring>hdkey": { + "packages": { + "@metamask/eth-trezor-keyring>hdkey>coinstring": true, + "@metamask/eth-trezor-keyring>hdkey>secp256k1": true, + "browserify>assert": true, + "browserify>crypto-browserify": true, + "ethereumjs-wallet>safe-buffer": true + } + }, + "@metamask/eth-trezor-keyring>hdkey>coinstring": { + "packages": { + "@metamask/eth-trezor-keyring>hdkey>coinstring>bs58": true, + "browserify>buffer": true, + "ethereumjs-util>create-hash": true + } + }, + "@metamask/eth-trezor-keyring>hdkey>secp256k1": { + "packages": { + "@metamask/eth-trezor-keyring>hdkey>secp256k1>bip66": true, + "bn.js": true, + "browserify>insert-module-globals>is-buffer": true, + "ethereumjs-util>create-hash": true, + "ethereumjs-wallet>safe-buffer": true, + "ganache>secp256k1>elliptic": true + } + }, + "@metamask/eth-trezor-keyring>hdkey>secp256k1>bip66": { + "packages": { + "ethereumjs-wallet>safe-buffer": true + } + }, "@metamask/etherscan-link": { "globals": { "URL": true @@ -1902,67 +2192,6 @@ "superstruct": true } }, - "@metamask/utils>@ethereumjs/tx>@chainsafe/ssz": { - "packages": { - "@metamask/utils>@ethereumjs/tx>@chainsafe/ssz>@chainsafe/persistent-merkle-tree": true, - "@metamask/utils>@ethereumjs/tx>@chainsafe/ssz>case": true, - "browserify": true, - "browserify>buffer": true - } - }, - "@metamask/utils>@ethereumjs/tx>@chainsafe/ssz>@chainsafe/persistent-merkle-tree": { - "globals": { - "WeakRef": true - }, - "packages": { - "browserify": true - } - }, - "@metamask/utils>@ethereumjs/tx>@ethereumjs/rlp": { - "globals": { - "TextEncoder": true - } - }, - "@metamask/utils>@ethereumjs/tx>ethereum-cryptography": { - "globals": { - "TextDecoder": true, - "crypto": true - }, - "packages": { - "@metamask/utils>@ethereumjs/tx>ethereum-cryptography>@noble/hashes": true, - "@metamask/utils>@ethereumjs/tx>ethereum-cryptography>@noble/secp256k1": true, - "@metamask/utils>@ethereumjs/tx>ethereum-cryptography>@scure/bip32": true - } - }, - "@metamask/utils>@ethereumjs/tx>ethereum-cryptography>@noble/hashes": { - "globals": { - "TextEncoder": true, - "crypto": true - } - }, - "@metamask/utils>@ethereumjs/tx>ethereum-cryptography>@noble/secp256k1": { - "globals": { - "crypto": true - }, - "packages": { - "browserify>browser-resolve": true - } - }, - "@metamask/utils>@ethereumjs/tx>ethereum-cryptography>@scure/bip32": { - "packages": { - "@metamask/key-tree>@noble/hashes": true, - "@metamask/key-tree>@scure/base": true, - "@metamask/utils>@ethereumjs/tx>ethereum-cryptography>@scure/bip32>@noble/secp256k1": true - } - }, - "@metamask/utils>@ethereumjs/tx>ethereum-cryptography>@scure/bip32>@noble/secp256k1": { - "globals": { - "crypto": true - }, - "packages": { - "browserify>browser-resolve": true - } - }, "@ngraveio/bc-ur": { "packages": { "@ngraveio/bc-ur>@apocentre/alias-sampling": true, @@ -2000,6 +2229,15 @@ "browserify>buffer": true } }, + "@ngraveio/bc-ur>crc>buffer": { + "globals": { + "console": true + }, + "packages": { + "base64-js": true, + "browserify>buffer>ieee754": true + } + }, "@ngraveio/bc-ur>jsbi": { "globals": { "define": true @@ -3176,37 +3414,16 @@ "setInterval": true }, "packages": { + "@ethereumjs/tx": true, + "@ethereumjs/tx>@ethereumjs/util": true, "browserify>buffer": true, "browserify>crypto-browserify": true, "browserify>events": true, - "eth-lattice-keyring>@ethereumjs/tx": true, - "eth-lattice-keyring>@ethereumjs/util": true, "eth-lattice-keyring>bn.js": true, "eth-lattice-keyring>gridplus-sdk": true, "eth-lattice-keyring>rlp": true } }, - "eth-lattice-keyring>@ethereumjs/tx": { - "packages": { - "@ethereumjs/common": true, - "browserify>buffer": true, - "browserify>insert-module-globals>is-buffer": true, - "ethereumjs-util": true - } - }, - "eth-lattice-keyring>@ethereumjs/util": { - "globals": { - "console.warn": true - }, - "packages": { - "@metamask/utils>@ethereumjs/tx>@chainsafe/ssz": true, - "@metamask/utils>@ethereumjs/tx>@ethereumjs/rlp": true, - "@metamask/utils>@ethereumjs/tx>ethereum-cryptography": true, - "browserify>buffer": true, - "browserify>events": true, - "browserify>insert-module-globals>is-buffer": true - } - }, "eth-lattice-keyring>bn.js": { "globals": { "Buffer": true @@ -3219,6 +3436,7 @@ "globals": { "AbortController": true, "Request": true, + "URL": true, "__values": true, "caches": true, "clearTimeout": true, @@ -3229,12 +3447,12 @@ "setTimeout": true }, "packages": { + "@ethereumjs/common": true, "@ethereumjs/common>crc-32": true, + "@ethereumjs/tx": true, "@ethersproject/abi": true, "bn.js": true, "browserify>buffer": true, - "eth-lattice-keyring>gridplus-sdk>@ethereumjs/common": true, - "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx": true, "eth-lattice-keyring>gridplus-sdk>bech32": true, "eth-lattice-keyring>gridplus-sdk>bignumber.js": true, "eth-lattice-keyring>gridplus-sdk>bitwise": true, @@ -3251,30 +3469,6 @@ "lodash": true } }, - "eth-lattice-keyring>gridplus-sdk>@ethereumjs/common": { - "packages": { - "@ethereumjs/common>crc-32": true, - "browserify>buffer": true, - "browserify>events": true, - "ethereumjs-util": true - } - }, - "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx": { - "packages": { - "browserify>buffer": true, - "browserify>insert-module-globals>is-buffer": true, - "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>@ethereumjs/common": true, - "ethereumjs-util": true - } - }, - "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>@ethereumjs/common": { - "packages": { - "@ethereumjs/common>crc-32": true, - "browserify>buffer": true, - "browserify>events": true, - "ethereumjs-util": true - } - }, "eth-lattice-keyring>gridplus-sdk>bignumber.js": { "globals": { "crypto": true, @@ -3446,87 +3640,6 @@ "browserify>browser-resolve": true } }, - "eth-trezor-keyring": { - "globals": { - "setTimeout": true - }, - "packages": { - "@ethereumjs/tx": true, - "browserify>buffer": true, - "browserify>events": true, - "eth-trezor-keyring>hdkey": true, - "eth-trezor-keyring>trezor-connect": true, - "ethereumjs-util": true - } - }, - "eth-trezor-keyring>hdkey": { - "packages": { - "browserify>assert": true, - "browserify>crypto-browserify": true, - "eth-trezor-keyring>hdkey>coinstring": true, - "eth-trezor-keyring>hdkey>secp256k1": true, - "ethereumjs-wallet>safe-buffer": true - } - }, - "eth-trezor-keyring>hdkey>coinstring": { - "packages": { - "browserify>buffer": true, - "eth-trezor-keyring>hdkey>coinstring>bs58": true, - "ethereumjs-util>create-hash": true - } - }, - "eth-trezor-keyring>hdkey>secp256k1": { - "packages": { - "bn.js": true, - "browserify>insert-module-globals>is-buffer": true, - "eth-trezor-keyring>hdkey>secp256k1>bip66": true, - "ethereumjs-util>create-hash": true, - "ethereumjs-wallet>safe-buffer": true, - "ganache>secp256k1>elliptic": true - } - }, - "eth-trezor-keyring>hdkey>secp256k1>bip66": { - "packages": { - "ethereumjs-wallet>safe-buffer": true - } - }, - "eth-trezor-keyring>trezor-connect": { - "globals": { - "__TREZOR_CONNECT_SRC": true, - "addEventListener": true, - "btoa": true, - "chrome": true, - "clearInterval": true, - "clearTimeout": true, - "console": true, - "document.body": true, - "document.createElement": true, - "document.createTextNode": true, - "document.getElementById": true, - "document.querySelectorAll": true, - "location": true, - "navigator": true, - "open": true, - "removeEventListener": true, - "setInterval": true, - "setTimeout": true - }, - "packages": { - "@babel/runtime": true, - "@metamask/eth-keyring-controller>@metamask/eth-sig-util": true, - "browserify>events": true, - "eth-trezor-keyring>trezor-connect>cross-fetch": true - } - }, - "eth-trezor-keyring>trezor-connect>cross-fetch": { - "globals": { - "Blob": true, - "FileReader": true, - "FormData": true, - "URLSearchParams.prototype.isPrototypeOf": true, - "XMLHttpRequest": true - } - }, "ethereumjs-abi": { "packages": { "bn.js": true, diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json index 1fcdff317..f0fa38c5f 100644 --- a/lavamoat/browserify/flask/policy.json +++ b/lavamoat/browserify/flask/policy.json @@ -119,9 +119,9 @@ "@ethereumjs/common": { "packages": { "@ethereumjs/common>crc-32": true, + "@ethereumjs/tx>@ethereumjs/util": true, "browserify>buffer": true, - "browserify>events": true, - "ethereumjs-util": true + "browserify>events": true } }, "@ethereumjs/common>crc-32": { @@ -133,9 +133,87 @@ "@ethereumjs/tx": { "packages": { "@ethereumjs/common": true, + "@ethereumjs/tx>@chainsafe/ssz": true, + "@ethereumjs/tx>@ethereumjs/rlp": true, + "@ethereumjs/tx>@ethereumjs/util": true, + "@ethereumjs/tx>ethereum-cryptography": true, + "@ethersproject/providers": true, "browserify>buffer": true, - "browserify>insert-module-globals>is-buffer": true, - "ethereumjs-util": true + "browserify>insert-module-globals>is-buffer": true + } + }, + "@ethereumjs/tx>@chainsafe/ssz": { + "packages": { + "@ethereumjs/tx>@chainsafe/ssz>@chainsafe/persistent-merkle-tree": true, + "@ethereumjs/tx>@chainsafe/ssz>case": true, + "browserify": true, + "browserify>buffer": true + } + }, + "@ethereumjs/tx>@chainsafe/ssz>@chainsafe/persistent-merkle-tree": { + "globals": { + "WeakRef": true + }, + "packages": { + "browserify": true + } + }, + "@ethereumjs/tx>@ethereumjs/rlp": { + "globals": { + "TextEncoder": true + } + }, + "@ethereumjs/tx>@ethereumjs/util": { + "globals": { + "console.warn": true + }, + "packages": { + "@ethereumjs/tx>@chainsafe/ssz": true, + "@ethereumjs/tx>@ethereumjs/rlp": true, + "@ethereumjs/tx>ethereum-cryptography": true, + "browserify>buffer": true, + "browserify>events": true, + "browserify>insert-module-globals>is-buffer": true + } + }, + "@ethereumjs/tx>ethereum-cryptography": { + "globals": { + "TextDecoder": true, + "crypto": true + }, + "packages": { + "@ethereumjs/tx>ethereum-cryptography>@noble/hashes": true, + "@ethereumjs/tx>ethereum-cryptography>@noble/secp256k1": true, + "@ethereumjs/tx>ethereum-cryptography>@scure/bip32": true + } + }, + "@ethereumjs/tx>ethereum-cryptography>@noble/hashes": { + "globals": { + "TextEncoder": true, + "crypto": true + } + }, + "@ethereumjs/tx>ethereum-cryptography>@noble/secp256k1": { + "globals": { + "crypto": true + }, + "packages": { + "browserify>browser-resolve": true + } + }, + "@ethereumjs/tx>ethereum-cryptography>@scure/bip32": { + "packages": { + "@ethereumjs/tx>ethereum-cryptography>@scure/bip32>@noble/secp256k1": true, + "@metamask/key-tree>@noble/hashes": true, + "@metamask/key-tree>@scure/base": true + } + }, + "@ethereumjs/tx>ethereum-cryptography>@scure/bip32>@noble/secp256k1": { + "globals": { + "crypto": true + }, + "packages": { + "browserify>browser-resolve": true } }, "@ethersproject/abi": { @@ -411,10 +489,10 @@ }, "@keystonehq/bc-ur-registry-eth": { "packages": { + "@ethereumjs/tx>@ethereumjs/util": true, "@keystonehq/bc-ur-registry-eth>@keystonehq/bc-ur-registry": true, "@keystonehq/bc-ur-registry-eth>hdkey": true, "browserify>buffer": true, - "eth-lattice-keyring>@ethereumjs/util": true, "uuid": true } }, @@ -441,8 +519,8 @@ "@keystonehq/metamask-airgapped-keyring": { "packages": { "@ethereumjs/tx": true, - "@keystonehq/bc-ur-registry-eth": true, "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring": true, + "@keystonehq/metamask-airgapped-keyring>@keystonehq/bc-ur-registry-eth": true, "@keystonehq/metamask-airgapped-keyring>@metamask/obs-store": true, "browserify>buffer": true, "browserify>events": true, @@ -453,19 +531,61 @@ "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring": { "packages": { "@ethereumjs/tx": true, - "@keystonehq/bc-ur-registry-eth": true, + "@ethereumjs/tx>@ethereumjs/util": true, "@keystonehq/bc-ur-registry-eth>hdkey": true, + "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring>@keystonehq/bc-ur-registry-eth": true, "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring>rlp": true, "browserify>buffer": true, - "eth-lattice-keyring>@ethereumjs/util": true, "uuid": true } }, + "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring>@keystonehq/bc-ur-registry-eth": { + "packages": { + "@ethereumjs/tx>@ethereumjs/util": true, + "@keystonehq/bc-ur-registry-eth>hdkey": true, + "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring>@keystonehq/bc-ur-registry-eth>@keystonehq/bc-ur-registry": true, + "browserify>buffer": true, + "uuid": true + } + }, + "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring>@keystonehq/bc-ur-registry-eth>@keystonehq/bc-ur-registry": { + "globals": { + "define": true + }, + "packages": { + "@ngraveio/bc-ur": true, + "@ngraveio/bc-ur>crc>buffer": true, + "browserify>buffer": true, + "ethereumjs-wallet>bs58check": true, + "wait-on>rxjs>tslib": true + } + }, "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring>rlp": { "globals": { "TextEncoder": true } }, + "@keystonehq/metamask-airgapped-keyring>@keystonehq/bc-ur-registry-eth": { + "packages": { + "@ethereumjs/tx>@ethereumjs/util": true, + "@keystonehq/bc-ur-registry-eth>hdkey": true, + "@keystonehq/metamask-airgapped-keyring>@keystonehq/bc-ur-registry-eth>@keystonehq/bc-ur-registry": true, + "browserify>buffer": true, + "uuid": true + } + }, + "@keystonehq/metamask-airgapped-keyring>@keystonehq/bc-ur-registry-eth>@keystonehq/bc-ur-registry": { + "globals": { + "define": true + }, + "packages": { + "@ngraveio/bc-ur": true, + "@ngraveio/bc-ur>crc>buffer": true, + "browserify>buffer": true, + "ethereumjs-wallet>bs58check": true, + "wait-on>rxjs>tslib": true + } + }, "@keystonehq/metamask-airgapped-keyring>@metamask/obs-store": { "packages": { "@keystonehq/metamask-airgapped-keyring>@metamask/obs-store>through2": true, @@ -904,7 +1024,7 @@ "packages": { "@metamask/eth-json-rpc-infura>@metamask/utils": true, "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware>pify": true, - "@metamask/eth-keyring-controller>@metamask/eth-sig-util": true, + "@metamask/eth-trezor-keyring>@metamask/eth-sig-util": true, "@metamask/safe-event-emitter": true, "browserify>browser-resolve": true, "eth-rpc-errors": true, @@ -923,7 +1043,7 @@ "@metamask/eth-json-rpc-middleware>@metamask/utils": true, "@metamask/eth-json-rpc-middleware>pify": true, "@metamask/eth-json-rpc-middleware>safe-stable-stringify": true, - "@metamask/eth-keyring-controller>@metamask/eth-sig-util": true, + "@metamask/eth-trezor-keyring>@metamask/eth-sig-util": true, "eth-rpc-errors": true, "json-rpc-engine": true, "vinyl>clone": true @@ -950,9 +1070,9 @@ "@metamask/eth-keyring-controller": { "packages": { "@metamask/eth-keyring-controller>@metamask/eth-hd-keyring": true, - "@metamask/eth-keyring-controller>@metamask/eth-sig-util": true, "@metamask/eth-keyring-controller>@metamask/eth-simple-keyring": true, "@metamask/eth-keyring-controller>obs-store": true, + "@metamask/eth-trezor-keyring>@metamask/eth-sig-util": true, "@metamask/rpc-methods>@metamask/browser-passworder": true, "browserify>events": true } @@ -962,38 +1082,20 @@ "TextEncoder": true }, "packages": { - "@metamask/eth-keyring-controller>@metamask/eth-sig-util": true, + "@ethereumjs/tx>@ethereumjs/util": true, + "@ethereumjs/tx>ethereum-cryptography": true, + "@metamask/eth-trezor-keyring>@metamask/eth-sig-util": true, "@metamask/scure-bip39": true, - "@metamask/utils>@ethereumjs/tx>ethereum-cryptography": true, - "browserify>buffer": true, - "eth-lattice-keyring>@ethereumjs/util": true - } - }, - "@metamask/eth-keyring-controller>@metamask/eth-sig-util": { - "packages": { - "@metamask/eth-keyring-controller>@metamask/eth-sig-util>ethjs-util": true, - "@metamask/utils>@ethereumjs/tx>ethereum-cryptography": true, - "bn.js": true, - "browserify>buffer": true, - "eth-lattice-keyring>@ethereumjs/util": true, - "eth-sig-util>tweetnacl": true, - "eth-sig-util>tweetnacl-util": true - } - }, - "@metamask/eth-keyring-controller>@metamask/eth-sig-util>ethjs-util": { - "packages": { - "browserify>buffer": true, - "ethjs>ethjs-util>is-hex-prefixed": true, - "ethjs>ethjs-util>strip-hex-prefix": true + "browserify>buffer": true } }, "@metamask/eth-keyring-controller>@metamask/eth-simple-keyring": { "packages": { - "@metamask/eth-keyring-controller>@metamask/eth-sig-util": true, - "@metamask/utils>@ethereumjs/tx>ethereum-cryptography": true, + "@ethereumjs/tx>@ethereumjs/util": true, + "@ethereumjs/tx>ethereum-cryptography": true, + "@metamask/eth-trezor-keyring>@metamask/eth-sig-util": true, "browserify>buffer": true, "browserify>events": true, - "eth-lattice-keyring>@ethereumjs/util": true, "ethereumjs-wallet>randombytes": true } }, @@ -1061,17 +1163,17 @@ "@metamask/eth-ledger-bridge-keyring>hdkey": { "packages": { "@metamask/eth-ledger-bridge-keyring>hdkey>secp256k1": true, + "@metamask/eth-trezor-keyring>hdkey>coinstring": true, "browserify>assert": true, "browserify>crypto-browserify": true, - "eth-trezor-keyring>hdkey>coinstring": true, "ethereumjs-wallet>safe-buffer": true } }, "@metamask/eth-ledger-bridge-keyring>hdkey>secp256k1": { "packages": { + "@metamask/eth-trezor-keyring>hdkey>secp256k1>bip66": true, "bn.js": true, "browserify>insert-module-globals>is-buffer": true, - "eth-trezor-keyring>hdkey>secp256k1>bip66": true, "ethereumjs-util>create-hash": true, "ethereumjs-wallet>safe-buffer": true, "ganache>secp256k1>elliptic": true @@ -1190,6 +1292,194 @@ "webpack>events": true } }, + "@metamask/eth-trezor-keyring": { + "globals": { + "setTimeout": true + }, + "packages": { + "@ethereumjs/tx": true, + "@ethereumjs/tx>@ethereumjs/util": true, + "@metamask/eth-trezor-keyring>@trezor/connect-plugin-ethereum": true, + "@metamask/eth-trezor-keyring>@trezor/connect-web": true, + "@metamask/eth-trezor-keyring>hdkey": true, + "browserify>buffer": true, + "browserify>events": true + } + }, + "@metamask/eth-trezor-keyring>@metamask/eth-sig-util": { + "packages": { + "@ethereumjs/tx>@ethereumjs/util": true, + "@ethereumjs/tx>ethereum-cryptography": true, + "@metamask/eth-trezor-keyring>@metamask/eth-sig-util>ethjs-util": true, + "bn.js": true, + "browserify>buffer": true, + "eth-sig-util>tweetnacl": true, + "eth-sig-util>tweetnacl-util": true + } + }, + "@metamask/eth-trezor-keyring>@metamask/eth-sig-util>ethjs-util": { + "packages": { + "browserify>buffer": true, + "ethjs>ethjs-util>is-hex-prefixed": true, + "ethjs>ethjs-util>strip-hex-prefix": true + } + }, + "@metamask/eth-trezor-keyring>@trezor/connect-plugin-ethereum": { + "packages": { + "@metamask/eth-trezor-keyring>@metamask/eth-sig-util": true + } + }, + "@metamask/eth-trezor-keyring>@trezor/connect-web": { + "globals": { + "addEventListener": true, + "btoa": true, + "chrome": true, + "clearInterval": true, + "clearTimeout": true, + "console.warn": true, + "document.body": true, + "document.createElement": true, + "document.createTextNode": true, + "document.getElementById": true, + "document.querySelectorAll": true, + "navigator.usb.requestDevice": true, + "open": true, + "removeEventListener": true, + "setInterval": true, + "setTimeout": true + }, + "packages": { + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect": true, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/utils": true, + "browserify>events": true, + "wait-on>rxjs>tslib": true + } + }, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect": { + "globals": { + "__TREZOR_CONNECT_SRC": true, + "chrome": true, + "console.error": true, + "console.log": true, + "console.warn": true, + "location": true, + "navigator": true + }, + "packages": { + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport": true, + "wait-on>rxjs>tslib": true + } + }, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport": { + "globals": { + "fetch": true, + "navigator.usb": true, + "onconnect": "write", + "setTimeout": true + }, + "packages": { + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>bytebuffer": true, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>long": true, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>protobufjs": true, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/utils": true, + "browserify>buffer": true, + "browserify>events": true, + "lavamoat>json-stable-stringify": true + } + }, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>bytebuffer": { + "globals": { + "console": true, + "define": true + }, + "packages": { + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>bytebuffer>long": true + } + }, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>bytebuffer>long": { + "globals": { + "define": true + } + }, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>long": { + "globals": { + "WebAssembly.Instance": true, + "WebAssembly.Module": true + } + }, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>protobufjs": { + "globals": { + "process": true, + "setTimeout": true + }, + "packages": { + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>protobufjs>@protobufjs/aspromise": true, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>protobufjs>@protobufjs/base64": true, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>protobufjs>@protobufjs/codegen": true, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>protobufjs>@protobufjs/eventemitter": true, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>protobufjs>@protobufjs/fetch": true, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>protobufjs>@protobufjs/float": true, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>protobufjs>@protobufjs/inquire": true, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>protobufjs>@protobufjs/path": true, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>protobufjs>@protobufjs/pool": true, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>protobufjs>@protobufjs/utf8": true + } + }, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>protobufjs>@protobufjs/codegen": { + "globals": { + "console.log": true + } + }, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>protobufjs>@protobufjs/fetch": { + "globals": { + "XMLHttpRequest": true + }, + "packages": { + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>protobufjs>@protobufjs/aspromise": true, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>protobufjs>@protobufjs/inquire": true + } + }, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/utils": { + "globals": { + "AbortController": true, + "clearTimeout": true, + "setTimeout": true + }, + "packages": { + "browserify>buffer": true + } + }, + "@metamask/eth-trezor-keyring>hdkey": { + "packages": { + "@metamask/eth-trezor-keyring>hdkey>coinstring": true, + "@metamask/eth-trezor-keyring>hdkey>secp256k1": true, + "browserify>assert": true, + "browserify>crypto-browserify": true, + "ethereumjs-wallet>safe-buffer": true + } + }, + "@metamask/eth-trezor-keyring>hdkey>coinstring": { + "packages": { + "@metamask/eth-trezor-keyring>hdkey>coinstring>bs58": true, + "browserify>buffer": true, + "ethereumjs-util>create-hash": true + } + }, + "@metamask/eth-trezor-keyring>hdkey>secp256k1": { + "packages": { + "@metamask/eth-trezor-keyring>hdkey>secp256k1>bip66": true, + "bn.js": true, + "browserify>insert-module-globals>is-buffer": true, + "ethereumjs-util>create-hash": true, + "ethereumjs-wallet>safe-buffer": true, + "ganache>secp256k1>elliptic": true + } + }, + "@metamask/eth-trezor-keyring>hdkey>secp256k1>bip66": { + "packages": { + "ethereumjs-wallet>safe-buffer": true + } + }, "@metamask/etherscan-link": { "globals": { "URL": true @@ -1902,67 +2192,6 @@ "superstruct": true } }, - "@metamask/utils>@ethereumjs/tx>@chainsafe/ssz": { - "packages": { - "@metamask/utils>@ethereumjs/tx>@chainsafe/ssz>@chainsafe/persistent-merkle-tree": true, - "@metamask/utils>@ethereumjs/tx>@chainsafe/ssz>case": true, - "browserify": true, - "browserify>buffer": true - } - }, - "@metamask/utils>@ethereumjs/tx>@chainsafe/ssz>@chainsafe/persistent-merkle-tree": { - "globals": { - "WeakRef": true - }, - "packages": { - "browserify": true - } - }, - "@metamask/utils>@ethereumjs/tx>@ethereumjs/rlp": { - "globals": { - "TextEncoder": true - } - }, - "@metamask/utils>@ethereumjs/tx>ethereum-cryptography": { - "globals": { - "TextDecoder": true, - "crypto": true - }, - "packages": { - "@metamask/utils>@ethereumjs/tx>ethereum-cryptography>@noble/hashes": true, - "@metamask/utils>@ethereumjs/tx>ethereum-cryptography>@noble/secp256k1": true, - "@metamask/utils>@ethereumjs/tx>ethereum-cryptography>@scure/bip32": true - } - }, - "@metamask/utils>@ethereumjs/tx>ethereum-cryptography>@noble/hashes": { - "globals": { - "TextEncoder": true, - "crypto": true - } - }, - "@metamask/utils>@ethereumjs/tx>ethereum-cryptography>@noble/secp256k1": { - "globals": { - "crypto": true - }, - "packages": { - "browserify>browser-resolve": true - } - }, - "@metamask/utils>@ethereumjs/tx>ethereum-cryptography>@scure/bip32": { - "packages": { - "@metamask/key-tree>@noble/hashes": true, - "@metamask/key-tree>@scure/base": true, - "@metamask/utils>@ethereumjs/tx>ethereum-cryptography>@scure/bip32>@noble/secp256k1": true - } - }, - "@metamask/utils>@ethereumjs/tx>ethereum-cryptography>@scure/bip32>@noble/secp256k1": { - "globals": { - "crypto": true - }, - "packages": { - "browserify>browser-resolve": true - } - }, "@ngraveio/bc-ur": { "packages": { "@ngraveio/bc-ur>@apocentre/alias-sampling": true, @@ -2000,6 +2229,15 @@ "browserify>buffer": true } }, + "@ngraveio/bc-ur>crc>buffer": { + "globals": { + "console": true + }, + "packages": { + "base64-js": true, + "browserify>buffer>ieee754": true + } + }, "@ngraveio/bc-ur>jsbi": { "globals": { "define": true @@ -3176,37 +3414,16 @@ "setInterval": true }, "packages": { + "@ethereumjs/tx": true, + "@ethereumjs/tx>@ethereumjs/util": true, "browserify>buffer": true, "browserify>crypto-browserify": true, "browserify>events": true, - "eth-lattice-keyring>@ethereumjs/tx": true, - "eth-lattice-keyring>@ethereumjs/util": true, "eth-lattice-keyring>bn.js": true, "eth-lattice-keyring>gridplus-sdk": true, "eth-lattice-keyring>rlp": true } }, - "eth-lattice-keyring>@ethereumjs/tx": { - "packages": { - "@ethereumjs/common": true, - "browserify>buffer": true, - "browserify>insert-module-globals>is-buffer": true, - "ethereumjs-util": true - } - }, - "eth-lattice-keyring>@ethereumjs/util": { - "globals": { - "console.warn": true - }, - "packages": { - "@metamask/utils>@ethereumjs/tx>@chainsafe/ssz": true, - "@metamask/utils>@ethereumjs/tx>@ethereumjs/rlp": true, - "@metamask/utils>@ethereumjs/tx>ethereum-cryptography": true, - "browserify>buffer": true, - "browserify>events": true, - "browserify>insert-module-globals>is-buffer": true - } - }, "eth-lattice-keyring>bn.js": { "globals": { "Buffer": true @@ -3219,6 +3436,7 @@ "globals": { "AbortController": true, "Request": true, + "URL": true, "__values": true, "caches": true, "clearTimeout": true, @@ -3229,12 +3447,12 @@ "setTimeout": true }, "packages": { + "@ethereumjs/common": true, "@ethereumjs/common>crc-32": true, + "@ethereumjs/tx": true, "@ethersproject/abi": true, "bn.js": true, "browserify>buffer": true, - "eth-lattice-keyring>gridplus-sdk>@ethereumjs/common": true, - "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx": true, "eth-lattice-keyring>gridplus-sdk>bech32": true, "eth-lattice-keyring>gridplus-sdk>bignumber.js": true, "eth-lattice-keyring>gridplus-sdk>bitwise": true, @@ -3251,30 +3469,6 @@ "lodash": true } }, - "eth-lattice-keyring>gridplus-sdk>@ethereumjs/common": { - "packages": { - "@ethereumjs/common>crc-32": true, - "browserify>buffer": true, - "browserify>events": true, - "ethereumjs-util": true - } - }, - "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx": { - "packages": { - "browserify>buffer": true, - "browserify>insert-module-globals>is-buffer": true, - "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>@ethereumjs/common": true, - "ethereumjs-util": true - } - }, - "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>@ethereumjs/common": { - "packages": { - "@ethereumjs/common>crc-32": true, - "browserify>buffer": true, - "browserify>events": true, - "ethereumjs-util": true - } - }, "eth-lattice-keyring>gridplus-sdk>bignumber.js": { "globals": { "crypto": true, @@ -3446,87 +3640,6 @@ "browserify>browser-resolve": true } }, - "eth-trezor-keyring": { - "globals": { - "setTimeout": true - }, - "packages": { - "@ethereumjs/tx": true, - "browserify>buffer": true, - "browserify>events": true, - "eth-trezor-keyring>hdkey": true, - "eth-trezor-keyring>trezor-connect": true, - "ethereumjs-util": true - } - }, - "eth-trezor-keyring>hdkey": { - "packages": { - "browserify>assert": true, - "browserify>crypto-browserify": true, - "eth-trezor-keyring>hdkey>coinstring": true, - "eth-trezor-keyring>hdkey>secp256k1": true, - "ethereumjs-wallet>safe-buffer": true - } - }, - "eth-trezor-keyring>hdkey>coinstring": { - "packages": { - "browserify>buffer": true, - "eth-trezor-keyring>hdkey>coinstring>bs58": true, - "ethereumjs-util>create-hash": true - } - }, - "eth-trezor-keyring>hdkey>secp256k1": { - "packages": { - "bn.js": true, - "browserify>insert-module-globals>is-buffer": true, - "eth-trezor-keyring>hdkey>secp256k1>bip66": true, - "ethereumjs-util>create-hash": true, - "ethereumjs-wallet>safe-buffer": true, - "ganache>secp256k1>elliptic": true - } - }, - "eth-trezor-keyring>hdkey>secp256k1>bip66": { - "packages": { - "ethereumjs-wallet>safe-buffer": true - } - }, - "eth-trezor-keyring>trezor-connect": { - "globals": { - "__TREZOR_CONNECT_SRC": true, - "addEventListener": true, - "btoa": true, - "chrome": true, - "clearInterval": true, - "clearTimeout": true, - "console": true, - "document.body": true, - "document.createElement": true, - "document.createTextNode": true, - "document.getElementById": true, - "document.querySelectorAll": true, - "location": true, - "navigator": true, - "open": true, - "removeEventListener": true, - "setInterval": true, - "setTimeout": true - }, - "packages": { - "@babel/runtime": true, - "@metamask/eth-keyring-controller>@metamask/eth-sig-util": true, - "browserify>events": true, - "eth-trezor-keyring>trezor-connect>cross-fetch": true - } - }, - "eth-trezor-keyring>trezor-connect>cross-fetch": { - "globals": { - "Blob": true, - "FileReader": true, - "FormData": true, - "URLSearchParams.prototype.isPrototypeOf": true, - "XMLHttpRequest": true - } - }, "ethereumjs-abi": { "packages": { "bn.js": true, diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json index 5f7721bcf..2581ffd89 100644 --- a/lavamoat/browserify/main/policy.json +++ b/lavamoat/browserify/main/policy.json @@ -119,9 +119,9 @@ "@ethereumjs/common": { "packages": { "@ethereumjs/common>crc-32": true, + "@ethereumjs/tx>@ethereumjs/util": true, "browserify>buffer": true, - "browserify>events": true, - "ethereumjs-util": true + "browserify>events": true } }, "@ethereumjs/common>crc-32": { @@ -133,9 +133,87 @@ "@ethereumjs/tx": { "packages": { "@ethereumjs/common": true, + "@ethereumjs/tx>@chainsafe/ssz": true, + "@ethereumjs/tx>@ethereumjs/rlp": true, + "@ethereumjs/tx>@ethereumjs/util": true, + "@ethereumjs/tx>ethereum-cryptography": true, + "@ethersproject/providers": true, "browserify>buffer": true, - "browserify>insert-module-globals>is-buffer": true, - "ethereumjs-util": true + "browserify>insert-module-globals>is-buffer": true + } + }, + "@ethereumjs/tx>@chainsafe/ssz": { + "packages": { + "@ethereumjs/tx>@chainsafe/ssz>@chainsafe/persistent-merkle-tree": true, + "@ethereumjs/tx>@chainsafe/ssz>case": true, + "browserify": true, + "browserify>buffer": true + } + }, + "@ethereumjs/tx>@chainsafe/ssz>@chainsafe/persistent-merkle-tree": { + "globals": { + "WeakRef": true + }, + "packages": { + "browserify": true + } + }, + "@ethereumjs/tx>@ethereumjs/rlp": { + "globals": { + "TextEncoder": true + } + }, + "@ethereumjs/tx>@ethereumjs/util": { + "globals": { + "console.warn": true + }, + "packages": { + "@ethereumjs/tx>@chainsafe/ssz": true, + "@ethereumjs/tx>@ethereumjs/rlp": true, + "@ethereumjs/tx>ethereum-cryptography": true, + "browserify>buffer": true, + "browserify>events": true, + "browserify>insert-module-globals>is-buffer": true + } + }, + "@ethereumjs/tx>ethereum-cryptography": { + "globals": { + "TextDecoder": true, + "crypto": true + }, + "packages": { + "@ethereumjs/tx>ethereum-cryptography>@noble/hashes": true, + "@ethereumjs/tx>ethereum-cryptography>@noble/secp256k1": true, + "@ethereumjs/tx>ethereum-cryptography>@scure/bip32": true + } + }, + "@ethereumjs/tx>ethereum-cryptography>@noble/hashes": { + "globals": { + "TextEncoder": true, + "crypto": true + } + }, + "@ethereumjs/tx>ethereum-cryptography>@noble/secp256k1": { + "globals": { + "crypto": true + }, + "packages": { + "browserify>browser-resolve": true + } + }, + "@ethereumjs/tx>ethereum-cryptography>@scure/bip32": { + "packages": { + "@ethereumjs/tx>ethereum-cryptography>@scure/bip32>@noble/secp256k1": true, + "@metamask/key-tree>@noble/hashes": true, + "@metamask/key-tree>@scure/base": true + } + }, + "@ethereumjs/tx>ethereum-cryptography>@scure/bip32>@noble/secp256k1": { + "globals": { + "crypto": true + }, + "packages": { + "browserify>browser-resolve": true } }, "@ethersproject/abi": { @@ -411,10 +489,10 @@ }, "@keystonehq/bc-ur-registry-eth": { "packages": { + "@ethereumjs/tx>@ethereumjs/util": true, "@keystonehq/bc-ur-registry-eth>@keystonehq/bc-ur-registry": true, "@keystonehq/bc-ur-registry-eth>hdkey": true, "browserify>buffer": true, - "eth-lattice-keyring>@ethereumjs/util": true, "uuid": true } }, @@ -441,8 +519,8 @@ "@keystonehq/metamask-airgapped-keyring": { "packages": { "@ethereumjs/tx": true, - "@keystonehq/bc-ur-registry-eth": true, "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring": true, + "@keystonehq/metamask-airgapped-keyring>@keystonehq/bc-ur-registry-eth": true, "@keystonehq/metamask-airgapped-keyring>@metamask/obs-store": true, "browserify>buffer": true, "browserify>events": true, @@ -453,19 +531,61 @@ "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring": { "packages": { "@ethereumjs/tx": true, - "@keystonehq/bc-ur-registry-eth": true, + "@ethereumjs/tx>@ethereumjs/util": true, "@keystonehq/bc-ur-registry-eth>hdkey": true, + "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring>@keystonehq/bc-ur-registry-eth": true, "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring>rlp": true, "browserify>buffer": true, - "eth-lattice-keyring>@ethereumjs/util": true, "uuid": true } }, + "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring>@keystonehq/bc-ur-registry-eth": { + "packages": { + "@ethereumjs/tx>@ethereumjs/util": true, + "@keystonehq/bc-ur-registry-eth>hdkey": true, + "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring>@keystonehq/bc-ur-registry-eth>@keystonehq/bc-ur-registry": true, + "browserify>buffer": true, + "uuid": true + } + }, + "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring>@keystonehq/bc-ur-registry-eth>@keystonehq/bc-ur-registry": { + "globals": { + "define": true + }, + "packages": { + "@ngraveio/bc-ur": true, + "@ngraveio/bc-ur>crc>buffer": true, + "browserify>buffer": true, + "ethereumjs-wallet>bs58check": true, + "wait-on>rxjs>tslib": true + } + }, "@keystonehq/metamask-airgapped-keyring>@keystonehq/base-eth-keyring>rlp": { "globals": { "TextEncoder": true } }, + "@keystonehq/metamask-airgapped-keyring>@keystonehq/bc-ur-registry-eth": { + "packages": { + "@ethereumjs/tx>@ethereumjs/util": true, + "@keystonehq/bc-ur-registry-eth>hdkey": true, + "@keystonehq/metamask-airgapped-keyring>@keystonehq/bc-ur-registry-eth>@keystonehq/bc-ur-registry": true, + "browserify>buffer": true, + "uuid": true + } + }, + "@keystonehq/metamask-airgapped-keyring>@keystonehq/bc-ur-registry-eth>@keystonehq/bc-ur-registry": { + "globals": { + "define": true + }, + "packages": { + "@ngraveio/bc-ur": true, + "@ngraveio/bc-ur>crc>buffer": true, + "browserify>buffer": true, + "ethereumjs-wallet>bs58check": true, + "wait-on>rxjs>tslib": true + } + }, "@keystonehq/metamask-airgapped-keyring>@metamask/obs-store": { "packages": { "@keystonehq/metamask-airgapped-keyring>@metamask/obs-store>through2": true, @@ -833,7 +953,7 @@ "packages": { "@metamask/eth-json-rpc-infura>@metamask/utils": true, "@metamask/eth-json-rpc-infura>eth-json-rpc-middleware>pify": true, - "@metamask/eth-keyring-controller>@metamask/eth-sig-util": true, + "@metamask/eth-trezor-keyring>@metamask/eth-sig-util": true, "@metamask/safe-event-emitter": true, "browserify>browser-resolve": true, "eth-rpc-errors": true, @@ -852,7 +972,7 @@ "@metamask/eth-json-rpc-middleware>@metamask/utils": true, "@metamask/eth-json-rpc-middleware>pify": true, "@metamask/eth-json-rpc-middleware>safe-stable-stringify": true, - "@metamask/eth-keyring-controller>@metamask/eth-sig-util": true, + "@metamask/eth-trezor-keyring>@metamask/eth-sig-util": true, "eth-rpc-errors": true, "json-rpc-engine": true, "vinyl>clone": true @@ -879,9 +999,9 @@ "@metamask/eth-keyring-controller": { "packages": { "@metamask/eth-keyring-controller>@metamask/eth-hd-keyring": true, - "@metamask/eth-keyring-controller>@metamask/eth-sig-util": true, "@metamask/eth-keyring-controller>@metamask/eth-simple-keyring": true, "@metamask/eth-keyring-controller>obs-store": true, + "@metamask/eth-trezor-keyring>@metamask/eth-sig-util": true, "@metamask/rpc-methods>@metamask/browser-passworder": true, "browserify>events": true } @@ -891,38 +1011,20 @@ "TextEncoder": true }, "packages": { - "@metamask/eth-keyring-controller>@metamask/eth-sig-util": true, + "@ethereumjs/tx>@ethereumjs/util": true, + "@ethereumjs/tx>ethereum-cryptography": true, + "@metamask/eth-trezor-keyring>@metamask/eth-sig-util": true, "@metamask/scure-bip39": true, - "@metamask/utils>@ethereumjs/tx>ethereum-cryptography": true, - "browserify>buffer": true, - "eth-lattice-keyring>@ethereumjs/util": true - } - }, - "@metamask/eth-keyring-controller>@metamask/eth-sig-util": { - "packages": { - "@metamask/eth-keyring-controller>@metamask/eth-sig-util>ethjs-util": true, - "@metamask/utils>@ethereumjs/tx>ethereum-cryptography": true, - "bn.js": true, - "browserify>buffer": true, - "eth-lattice-keyring>@ethereumjs/util": true, - "eth-sig-util>tweetnacl": true, - "eth-sig-util>tweetnacl-util": true - } - }, - "@metamask/eth-keyring-controller>@metamask/eth-sig-util>ethjs-util": { - "packages": { - "browserify>buffer": true, - "ethjs>ethjs-util>is-hex-prefixed": true, - "ethjs>ethjs-util>strip-hex-prefix": true + "browserify>buffer": true } }, "@metamask/eth-keyring-controller>@metamask/eth-simple-keyring": { "packages": { - "@metamask/eth-keyring-controller>@metamask/eth-sig-util": true, - "@metamask/utils>@ethereumjs/tx>ethereum-cryptography": true, + "@ethereumjs/tx>@ethereumjs/util": true, + "@ethereumjs/tx>ethereum-cryptography": true, + "@metamask/eth-trezor-keyring>@metamask/eth-sig-util": true, "browserify>buffer": true, "browserify>events": true, - "eth-lattice-keyring>@ethereumjs/util": true, "ethereumjs-wallet>randombytes": true } }, @@ -990,17 +1092,17 @@ "@metamask/eth-ledger-bridge-keyring>hdkey": { "packages": { "@metamask/eth-ledger-bridge-keyring>hdkey>secp256k1": true, + "@metamask/eth-trezor-keyring>hdkey>coinstring": true, "browserify>assert": true, "browserify>crypto-browserify": true, - "eth-trezor-keyring>hdkey>coinstring": true, "ethereumjs-wallet>safe-buffer": true } }, "@metamask/eth-ledger-bridge-keyring>hdkey>secp256k1": { "packages": { + "@metamask/eth-trezor-keyring>hdkey>secp256k1>bip66": true, "bn.js": true, "browserify>insert-module-globals>is-buffer": true, - "eth-trezor-keyring>hdkey>secp256k1>bip66": true, "ethereumjs-util>create-hash": true, "ethereumjs-wallet>safe-buffer": true, "ganache>secp256k1>elliptic": true @@ -1119,6 +1221,194 @@ "webpack>events": true } }, + "@metamask/eth-trezor-keyring": { + "globals": { + "setTimeout": true + }, + "packages": { + "@ethereumjs/tx": true, + "@ethereumjs/tx>@ethereumjs/util": true, + "@metamask/eth-trezor-keyring>@trezor/connect-plugin-ethereum": true, + "@metamask/eth-trezor-keyring>@trezor/connect-web": true, + "@metamask/eth-trezor-keyring>hdkey": true, + "browserify>buffer": true, + "browserify>events": true + } + }, + "@metamask/eth-trezor-keyring>@metamask/eth-sig-util": { + "packages": { + "@ethereumjs/tx>@ethereumjs/util": true, + "@ethereumjs/tx>ethereum-cryptography": true, + "@metamask/eth-trezor-keyring>@metamask/eth-sig-util>ethjs-util": true, + "bn.js": true, + "browserify>buffer": true, + "eth-sig-util>tweetnacl": true, + "eth-sig-util>tweetnacl-util": true + } + }, + "@metamask/eth-trezor-keyring>@metamask/eth-sig-util>ethjs-util": { + "packages": { + "browserify>buffer": true, + "ethjs>ethjs-util>is-hex-prefixed": true, + "ethjs>ethjs-util>strip-hex-prefix": true + } + }, + "@metamask/eth-trezor-keyring>@trezor/connect-plugin-ethereum": { + "packages": { + "@metamask/eth-trezor-keyring>@metamask/eth-sig-util": true + } + }, + "@metamask/eth-trezor-keyring>@trezor/connect-web": { + "globals": { + "addEventListener": true, + "btoa": true, + "chrome": true, + "clearInterval": true, + "clearTimeout": true, + "console.warn": true, + "document.body": true, + "document.createElement": true, + "document.createTextNode": true, + "document.getElementById": true, + "document.querySelectorAll": true, + "navigator.usb.requestDevice": true, + "open": true, + "removeEventListener": true, + "setInterval": true, + "setTimeout": true + }, + "packages": { + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect": true, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/utils": true, + "browserify>events": true, + "wait-on>rxjs>tslib": true + } + }, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect": { + "globals": { + "__TREZOR_CONNECT_SRC": true, + "chrome": true, + "console.error": true, + "console.log": true, + "console.warn": true, + "location": true, + "navigator": true + }, + "packages": { + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport": true, + "wait-on>rxjs>tslib": true + } + }, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport": { + "globals": { + "fetch": true, + "navigator.usb": true, + "onconnect": "write", + "setTimeout": true + }, + "packages": { + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>bytebuffer": true, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>long": true, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>protobufjs": true, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/utils": true, + "browserify>buffer": true, + "browserify>events": true, + "lavamoat>json-stable-stringify": true + } + }, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>bytebuffer": { + "globals": { + "console": true, + "define": true + }, + "packages": { + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>bytebuffer>long": true + } + }, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>bytebuffer>long": { + "globals": { + "define": true + } + }, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>long": { + "globals": { + "WebAssembly.Instance": true, + "WebAssembly.Module": true + } + }, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>protobufjs": { + "globals": { + "process": true, + "setTimeout": true + }, + "packages": { + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>protobufjs>@protobufjs/aspromise": true, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>protobufjs>@protobufjs/base64": true, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>protobufjs>@protobufjs/codegen": true, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>protobufjs>@protobufjs/eventemitter": true, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>protobufjs>@protobufjs/fetch": true, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>protobufjs>@protobufjs/float": true, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>protobufjs>@protobufjs/inquire": true, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>protobufjs>@protobufjs/path": true, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>protobufjs>@protobufjs/pool": true, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>protobufjs>@protobufjs/utf8": true + } + }, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>protobufjs>@protobufjs/codegen": { + "globals": { + "console.log": true + } + }, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>protobufjs>@protobufjs/fetch": { + "globals": { + "XMLHttpRequest": true + }, + "packages": { + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>protobufjs>@protobufjs/aspromise": true, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>protobufjs>@protobufjs/inquire": true + } + }, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/utils": { + "globals": { + "AbortController": true, + "clearTimeout": true, + "setTimeout": true + }, + "packages": { + "browserify>buffer": true + } + }, + "@metamask/eth-trezor-keyring>hdkey": { + "packages": { + "@metamask/eth-trezor-keyring>hdkey>coinstring": true, + "@metamask/eth-trezor-keyring>hdkey>secp256k1": true, + "browserify>assert": true, + "browserify>crypto-browserify": true, + "ethereumjs-wallet>safe-buffer": true + } + }, + "@metamask/eth-trezor-keyring>hdkey>coinstring": { + "packages": { + "@metamask/eth-trezor-keyring>hdkey>coinstring>bs58": true, + "browserify>buffer": true, + "ethereumjs-util>create-hash": true + } + }, + "@metamask/eth-trezor-keyring>hdkey>secp256k1": { + "packages": { + "@metamask/eth-trezor-keyring>hdkey>secp256k1>bip66": true, + "bn.js": true, + "browserify>insert-module-globals>is-buffer": true, + "ethereumjs-util>create-hash": true, + "ethereumjs-wallet>safe-buffer": true, + "ganache>secp256k1>elliptic": true + } + }, + "@metamask/eth-trezor-keyring>hdkey>secp256k1>bip66": { + "packages": { + "ethereumjs-wallet>safe-buffer": true + } + }, "@metamask/etherscan-link": { "globals": { "URL": true @@ -1468,67 +1758,6 @@ "superstruct": true } }, - "@metamask/utils>@ethereumjs/tx>@chainsafe/ssz": { - "packages": { - "@metamask/utils>@ethereumjs/tx>@chainsafe/ssz>@chainsafe/persistent-merkle-tree": true, - "@metamask/utils>@ethereumjs/tx>@chainsafe/ssz>case": true, - "browserify": true, - "browserify>buffer": true - } - }, - "@metamask/utils>@ethereumjs/tx>@chainsafe/ssz>@chainsafe/persistent-merkle-tree": { - "globals": { - "WeakRef": true - }, - "packages": { - "browserify": true - } - }, - "@metamask/utils>@ethereumjs/tx>@ethereumjs/rlp": { - "globals": { - "TextEncoder": true - } - }, - "@metamask/utils>@ethereumjs/tx>ethereum-cryptography": { - "globals": { - "TextDecoder": true, - "crypto": true - }, - "packages": { - "@metamask/utils>@ethereumjs/tx>ethereum-cryptography>@noble/hashes": true, - "@metamask/utils>@ethereumjs/tx>ethereum-cryptography>@noble/secp256k1": true, - "@metamask/utils>@ethereumjs/tx>ethereum-cryptography>@scure/bip32": true - } - }, - "@metamask/utils>@ethereumjs/tx>ethereum-cryptography>@noble/hashes": { - "globals": { - "TextEncoder": true, - "crypto": true - } - }, - "@metamask/utils>@ethereumjs/tx>ethereum-cryptography>@noble/secp256k1": { - "globals": { - "crypto": true - }, - "packages": { - "browserify>browser-resolve": true - } - }, - "@metamask/utils>@ethereumjs/tx>ethereum-cryptography>@scure/bip32": { - "packages": { - "@metamask/key-tree>@noble/hashes": true, - "@metamask/key-tree>@scure/base": true, - "@metamask/utils>@ethereumjs/tx>ethereum-cryptography>@scure/bip32>@noble/secp256k1": true - } - }, - "@metamask/utils>@ethereumjs/tx>ethereum-cryptography>@scure/bip32>@noble/secp256k1": { - "globals": { - "crypto": true - }, - "packages": { - "browserify>browser-resolve": true - } - }, "@ngraveio/bc-ur": { "packages": { "@ngraveio/bc-ur>@apocentre/alias-sampling": true, @@ -1566,6 +1795,15 @@ "browserify>buffer": true } }, + "@ngraveio/bc-ur>crc>buffer": { + "globals": { + "console": true + }, + "packages": { + "base64-js": true, + "browserify>buffer>ieee754": true + } + }, "@ngraveio/bc-ur>jsbi": { "globals": { "define": true @@ -2742,37 +2980,16 @@ "setInterval": true }, "packages": { + "@ethereumjs/tx": true, + "@ethereumjs/tx>@ethereumjs/util": true, "browserify>buffer": true, "browserify>crypto-browserify": true, "browserify>events": true, - "eth-lattice-keyring>@ethereumjs/tx": true, - "eth-lattice-keyring>@ethereumjs/util": true, "eth-lattice-keyring>bn.js": true, "eth-lattice-keyring>gridplus-sdk": true, "eth-lattice-keyring>rlp": true } }, - "eth-lattice-keyring>@ethereumjs/tx": { - "packages": { - "@ethereumjs/common": true, - "browserify>buffer": true, - "browserify>insert-module-globals>is-buffer": true, - "ethereumjs-util": true - } - }, - "eth-lattice-keyring>@ethereumjs/util": { - "globals": { - "console.warn": true - }, - "packages": { - "@metamask/utils>@ethereumjs/tx>@chainsafe/ssz": true, - "@metamask/utils>@ethereumjs/tx>@ethereumjs/rlp": true, - "@metamask/utils>@ethereumjs/tx>ethereum-cryptography": true, - "browserify>buffer": true, - "browserify>events": true, - "browserify>insert-module-globals>is-buffer": true - } - }, "eth-lattice-keyring>bn.js": { "globals": { "Buffer": true @@ -2785,6 +3002,7 @@ "globals": { "AbortController": true, "Request": true, + "URL": true, "__values": true, "caches": true, "clearTimeout": true, @@ -2795,12 +3013,12 @@ "setTimeout": true }, "packages": { + "@ethereumjs/common": true, "@ethereumjs/common>crc-32": true, + "@ethereumjs/tx": true, "@ethersproject/abi": true, "bn.js": true, "browserify>buffer": true, - "eth-lattice-keyring>gridplus-sdk>@ethereumjs/common": true, - "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx": true, "eth-lattice-keyring>gridplus-sdk>bech32": true, "eth-lattice-keyring>gridplus-sdk>bignumber.js": true, "eth-lattice-keyring>gridplus-sdk>bitwise": true, @@ -2817,30 +3035,6 @@ "lodash": true } }, - "eth-lattice-keyring>gridplus-sdk>@ethereumjs/common": { - "packages": { - "@ethereumjs/common>crc-32": true, - "browserify>buffer": true, - "browserify>events": true, - "ethereumjs-util": true - } - }, - "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx": { - "packages": { - "browserify>buffer": true, - "browserify>insert-module-globals>is-buffer": true, - "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>@ethereumjs/common": true, - "ethereumjs-util": true - } - }, - "eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>@ethereumjs/common": { - "packages": { - "@ethereumjs/common>crc-32": true, - "browserify>buffer": true, - "browserify>events": true, - "ethereumjs-util": true - } - }, "eth-lattice-keyring>gridplus-sdk>bignumber.js": { "globals": { "crypto": true, @@ -3012,87 +3206,6 @@ "browserify>browser-resolve": true } }, - "eth-trezor-keyring": { - "globals": { - "setTimeout": true - }, - "packages": { - "@ethereumjs/tx": true, - "browserify>buffer": true, - "browserify>events": true, - "eth-trezor-keyring>hdkey": true, - "eth-trezor-keyring>trezor-connect": true, - "ethereumjs-util": true - } - }, - "eth-trezor-keyring>hdkey": { - "packages": { - "browserify>assert": true, - "browserify>crypto-browserify": true, - "eth-trezor-keyring>hdkey>coinstring": true, - "eth-trezor-keyring>hdkey>secp256k1": true, - "ethereumjs-wallet>safe-buffer": true - } - }, - "eth-trezor-keyring>hdkey>coinstring": { - "packages": { - "browserify>buffer": true, - "eth-trezor-keyring>hdkey>coinstring>bs58": true, - "ethereumjs-util>create-hash": true - } - }, - "eth-trezor-keyring>hdkey>secp256k1": { - "packages": { - "bn.js": true, - "browserify>insert-module-globals>is-buffer": true, - "eth-trezor-keyring>hdkey>secp256k1>bip66": true, - "ethereumjs-util>create-hash": true, - "ethereumjs-wallet>safe-buffer": true, - "ganache>secp256k1>elliptic": true - } - }, - "eth-trezor-keyring>hdkey>secp256k1>bip66": { - "packages": { - "ethereumjs-wallet>safe-buffer": true - } - }, - "eth-trezor-keyring>trezor-connect": { - "globals": { - "__TREZOR_CONNECT_SRC": true, - "addEventListener": true, - "btoa": true, - "chrome": true, - "clearInterval": true, - "clearTimeout": true, - "console": true, - "document.body": true, - "document.createElement": true, - "document.createTextNode": true, - "document.getElementById": true, - "document.querySelectorAll": true, - "location": true, - "navigator": true, - "open": true, - "removeEventListener": true, - "setInterval": true, - "setTimeout": true - }, - "packages": { - "@babel/runtime": true, - "@metamask/eth-keyring-controller>@metamask/eth-sig-util": true, - "browserify>events": true, - "eth-trezor-keyring>trezor-connect>cross-fetch": true - } - }, - "eth-trezor-keyring>trezor-connect>cross-fetch": { - "globals": { - "Blob": true, - "FileReader": true, - "FormData": true, - "URLSearchParams.prototype.isPrototypeOf": true, - "XMLHttpRequest": true - } - }, "ethereumjs-abi": { "packages": { "bn.js": true, diff --git a/lavamoat/build-system/policy.json b/lavamoat/build-system/policy.json index 211f6476c..d5b552bdc 100644 --- a/lavamoat/build-system/policy.json +++ b/lavamoat/build-system/policy.json @@ -6545,14 +6545,12 @@ "Element": true, "HTMLElement": true, "Intl": true, - "PerformanceObserver": true, "SVGElement": true, "WorkerGlobalScope": true, "YAML_SILENCE_DEPRECATION_WARNINGS": true, "YAML_SILENCE_WARNINGS": true, "__dirname": true, "__filename": true, - "__magic__": true, "assertDoc": true, "atob": true, "btoa": true, @@ -6560,8 +6558,6 @@ "console": true, "define": true, "document": true, - "globalThis": "write", - "localStorage": true, "location": true, "navigator": true, "new": true, diff --git a/package.json b/package.json index d02bb1714..afaf7c54a 100644 --- a/package.json +++ b/package.json @@ -214,8 +214,8 @@ "@babel/runtime": "^7.5.5", "@download/blockies": "^1.0.3", "@ensdomains/content-hash": "^2.5.6", - "@ethereumjs/common": "^2.3.1", - "@ethereumjs/tx": "^3.2.1", + "@ethereumjs/common": "^3.1.1", + "@ethereumjs/tx": "^4.1.1", "@ethersproject/abi": "^5.6.4", "@ethersproject/bignumber": "^5.6.2", "@ethersproject/contracts": "^5.7.0", @@ -224,7 +224,7 @@ "@formatjs/intl-relativetimeformat": "^5.2.6", "@fortawesome/fontawesome-free": "^5.13.0", "@keystonehq/bc-ur-registry-eth": "^0.12.1", - "@keystonehq/metamask-airgapped-keyring": "^0.6.1", + "@keystonehq/metamask-airgapped-keyring": "^0.9.2", "@lavamoat/snow": "^1.5.0", "@material-ui/core": "^4.11.0", "@metamask/address-book-controller": "^2.0.0", @@ -240,8 +240,9 @@ "@metamask/eth-json-rpc-middleware": "^11.0.0", "@metamask/eth-json-rpc-provider": "^1.0.0", "@metamask/eth-keyring-controller": "^10.0.1", - "@metamask/eth-ledger-bridge-keyring": "^0.13.0", + "@metamask/eth-ledger-bridge-keyring": "^0.15.0", "@metamask/eth-token-tracker": "^4.0.0", + "@metamask/eth-trezor-keyring": "^1.0.0", "@metamask/etherscan-link": "^2.2.0", "@metamask/gas-fee-controller": "^4.0.0", "@metamask/jazzicon": "^2.0.0", @@ -299,12 +300,11 @@ "eth-block-tracker": "^7.0.0", "eth-ens-namehash": "^2.0.8", "eth-json-rpc-filters": "^6.0.0", - "eth-lattice-keyring": "^0.12.3", + "eth-lattice-keyring": "^0.12.4", "eth-method-registry": "^2.0.0", "eth-query": "^2.1.2", "eth-rpc-errors": "^4.0.2", "eth-sig-util": "^3.0.0", - "eth-trezor-keyring": "^0.10.0", "ethereum-ens-network-map": "^1.0.2", "ethereumjs-abi": "^0.6.4", "ethereumjs-util": "^7.0.10", @@ -616,7 +616,11 @@ "@storybook/core>@storybook/core-server>webpack>watchpack>watchpack-chokidar2>chokidar>fsevents": false, "resolve-url-loader>es6-iterator>es5-ext": false, "@storybook/test-runner>playwright": true, - "playwright": false + "playwright": false, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/transport>protobufjs": false, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/utxo-lib>blake-hash": false, + "@metamask/eth-trezor-keyring>@trezor/connect-web>@trezor/connect>@trezor/utxo-lib>tiny-secp256k1": false, + "@metamask/eth-trezor-keyring>hdkey>secp256k1": false } }, "packageManager": "yarn@3.2.4" diff --git a/shared/constants/network.ts b/shared/constants/network.ts index bd3bec0fa..f4a840762 100644 --- a/shared/constants/network.ts +++ b/shared/constants/network.ts @@ -3,14 +3,14 @@ import { capitalize, pick } from 'lodash'; * A type representing any valid value for 'type' for setProviderType and other * methods that add or manipulate networks in MetaMask state. */ -export type NetworkType = typeof NETWORK_TYPES[keyof typeof NETWORK_TYPES]; +export type NetworkType = (typeof NETWORK_TYPES)[keyof typeof NETWORK_TYPES]; /** * A union type of all possible hard-coded chain ids. This type is not * exhaustive and cannot be used for typing chainId in areas where the user or * dapp may specify any chainId. */ -export type ChainId = typeof CHAIN_IDS[keyof typeof CHAIN_IDS]; +export type ChainId = (typeof CHAIN_IDS)[keyof typeof CHAIN_IDS]; /** * A type that is a union type of all possible hardcoded currency symbols. @@ -18,13 +18,13 @@ export type ChainId = typeof CHAIN_IDS[keyof typeof CHAIN_IDS]; * or dapp may supply their own symbol. */ export type CurrencySymbol = - typeof CURRENCY_SYMBOLS[keyof typeof CURRENCY_SYMBOLS]; + (typeof CURRENCY_SYMBOLS)[keyof typeof CURRENCY_SYMBOLS]; /** * Test networks have special symbols that combine the network name and 'ETH' * so that they are distinct from mainnet and other networks that use 'ETH'. */ export type TestNetworkCurrencySymbol = - typeof TEST_NETWORK_TICKER_MAP[keyof typeof TEST_NETWORK_TICKER_MAP]; + (typeof TEST_NETWORK_TICKER_MAP)[keyof typeof TEST_NETWORK_TICKER_MAP]; /** * An object containing preferences for an RPC definition @@ -482,27 +482,6 @@ export const ETHERSCAN_SUPPORTED_NETWORKS = { }, }; -/** - * Hardforks are points in the chain where logic is changed significantly - * enough where there is a fork and the new fork becomes the active chain. - * These constants are presented in chronological order starting with BERLIN - * because when we first needed to track the hardfork we had launched support - * for EIP-2718 (where transactions can have types and different shapes) and - * EIP-2930 (optional access lists), which were included in BERLIN. - * - * BERLIN - forked at block number 12,244,000, included typed transactions and - * optional access lists - * LONDON - future, upcoming fork that introduces the baseFeePerGas, an amount - * of the ETH transaction fees that will be burned instead of given to the - * miner. This change necessitated the third type of transaction envelope to - * specify maxFeePerGas and maxPriorityFeePerGas moving the fee bidding system - * to a second price auction model. - */ -export const HARDFORKS = { - BERLIN: 'berlin', - LONDON: 'london', -} as const; - export const CHAIN_ID_TO_GAS_LIMIT_BUFFER_MAP = { [CHAIN_IDS.OPTIMISM]: 1, [CHAIN_IDS.OPTIMISM_TESTNET]: 1, diff --git a/ui/components/ui/box/box.d.ts b/ui/components/ui/box/box.d.ts index c738f6fd1..3baeba841 100644 --- a/ui/components/ui/box/box.d.ts +++ b/ui/components/ui/box/box.d.ts @@ -19,7 +19,7 @@ import { export type BoxChildren = React.ReactNode | ((...args: any[]) => any); export type BoxFlexDirection = - | typeof FLEX_DIRECTION[keyof typeof FLEX_DIRECTION] + | (typeof FLEX_DIRECTION)[keyof typeof FLEX_DIRECTION] | null; export type BoxFlexDirectionArray = [ BoxFlexDirection, @@ -28,7 +28,7 @@ export type BoxFlexDirectionArray = [ BoxFlexDirection?, ]; -export type BoxFlexWrap = typeof FLEX_WRAP[keyof typeof FLEX_WRAP] | null; +export type BoxFlexWrap = (typeof FLEX_WRAP)[keyof typeof FLEX_WRAP] | null; export type BoxFlexWrapArray = [ BoxFlexWrap, BoxFlexWrap?, @@ -36,7 +36,7 @@ export type BoxFlexWrapArray = [ BoxFlexWrap?, ]; -export type BoxTextAlign = typeof TEXT_ALIGN[keyof typeof TEXT_ALIGN] | null; +export type BoxTextAlign = (typeof TEXT_ALIGN)[keyof typeof TEXT_ALIGN] | null; export type BoxTextAlignArray = [ BoxTextAlign, BoxTextAlign?, @@ -44,7 +44,7 @@ export type BoxTextAlignArray = [ BoxTextAlign?, ]; -export type BoxDisplay = typeof DISPLAY[keyof typeof DISPLAY] | null; +export type BoxDisplay = (typeof DISPLAY)[keyof typeof DISPLAY] | null; export type BoxDisplayArray = [ BoxDisplay, BoxDisplay?, @@ -52,10 +52,10 @@ export type BoxDisplayArray = [ BoxDisplay?, ]; -export type BoxWidth = typeof BLOCK_SIZES[keyof typeof BLOCK_SIZES] | null; +export type BoxWidth = (typeof BLOCK_SIZES)[keyof typeof BLOCK_SIZES] | null; export type BoxWidthArray = [BoxWidth, BoxWidth?, BoxWidth?, BoxWidth?]; -export type BoxHeight = typeof BLOCK_SIZES[keyof typeof BLOCK_SIZES] | null; +export type BoxHeight = (typeof BLOCK_SIZES)[keyof typeof BLOCK_SIZES] | null; export type BoxHeightArray = [BoxHeight, BoxHeight?, BoxHeight?, BoxHeight?]; export type SizeNumber = diff --git a/ui/helpers/utils/optimism/buildUnserializedTransaction.js b/ui/helpers/utils/optimism/buildUnserializedTransaction.js index cae5e6a8d..07badbbf2 100644 --- a/ui/helpers/utils/optimism/buildUnserializedTransaction.js +++ b/ui/helpers/utils/optimism/buildUnserializedTransaction.js @@ -1,6 +1,6 @@ import { omit } from 'lodash'; import { BN } from 'ethereumjs-util'; -import Common, { Chain, Hardfork } from '@ethereumjs/common'; +import { Common, Hardfork } from '@ethereumjs/common'; import { TransactionFactory } from '@ethereumjs/tx'; import { stripHexPrefix } from '../../../../shared/modules/hexstring-utils'; @@ -17,7 +17,7 @@ function buildTransactionCommon(txMeta) { // genesis points to the mainnet genesis, not the Optimism genesis — but // considering that all we want to do is serialize a transaction, this works // fine for our use case. - return Common.forCustomChain(Chain.Mainnet, { + return Common.custom({ chainId: new BN(stripHexPrefix(txMeta.chainId), 16), networkId: new BN(txMeta.metamaskNetworkId, 10), // Optimism only supports type-0 transactions; it does not support any of diff --git a/yarn.lock b/yarn.lock index 3d700eced..39656d679 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2010,27 +2010,7 @@ __metadata: languageName: node linkType: hard -"@ethereumjs/common@npm:2.4.0": - version: 2.4.0 - resolution: "@ethereumjs/common@npm:2.4.0" - dependencies: - crc-32: ^1.2.0 - ethereumjs-util: ^7.1.0 - checksum: 46af3714500f24fe9586f0a65571fb9510c828699674106428f288fd0cfad667c1188f071f288184891d165edf0ed3f95440e00f062dacfcac9d871b709b5fd3 - languageName: node - linkType: hard - -"@ethereumjs/common@npm:^2.3.1, @ethereumjs/common@npm:^2.4.0, @ethereumjs/common@npm:^2.6.3": - version: 2.6.5 - resolution: "@ethereumjs/common@npm:2.6.5" - dependencies: - crc-32: ^1.2.0 - ethereumjs-util: ^7.1.5 - checksum: 0143386f267ef01b7a8bb1847596f964ad58643c084e5fd8e3a0271a7bf8428605dbf38cbb92c84f6622080ad095abeb765f178c02d86ec52abf9e8a4c0e4ecf - languageName: node - linkType: hard - -"@ethereumjs/common@npm:^3.1.1": +"@ethereumjs/common@npm:3.1.1, @ethereumjs/common@npm:^3.1.1": version: 3.1.1 resolution: "@ethereumjs/common@npm:3.1.1" dependencies: @@ -2040,6 +2020,16 @@ __metadata: languageName: node linkType: hard +"@ethereumjs/common@npm:^2.6.3": + version: 2.6.5 + resolution: "@ethereumjs/common@npm:2.6.5" + dependencies: + crc-32: ^1.2.0 + ethereumjs-util: ^7.1.5 + checksum: 0143386f267ef01b7a8bb1847596f964ad58643c084e5fd8e3a0271a7bf8428605dbf38cbb92c84f6622080ad095abeb765f178c02d86ec52abf9e8a4c0e4ecf + languageName: node + linkType: hard + "@ethereumjs/rlp@npm:^4.0.1": version: 4.0.1 resolution: "@ethereumjs/rlp@npm:4.0.1" @@ -2049,27 +2039,7 @@ __metadata: languageName: node linkType: hard -"@ethereumjs/tx@npm:3.3.0": - version: 3.3.0 - resolution: "@ethereumjs/tx@npm:3.3.0" - dependencies: - "@ethereumjs/common": ^2.4.0 - ethereumjs-util: ^7.1.0 - checksum: f0720d4c7ccb670c50f61a3c26bf87181f3fddd4fe7f6c93753cca7c1442497719842ffb293db776c8c9a8c7107f18cb03eda3625d53cc5dda1bab736ff2a166 - languageName: node - linkType: hard - -"@ethereumjs/tx@npm:3.5.1, @ethereumjs/tx@npm:^3.2.0, @ethereumjs/tx@npm:^3.2.1, @ethereumjs/tx@npm:^3.3.0": - version: 3.5.1 - resolution: "@ethereumjs/tx@npm:3.5.1" - dependencies: - "@ethereumjs/common": ^2.6.3 - ethereumjs-util: ^7.1.4 - checksum: ed17780314592eca96f7aed392707b55af713964a9ac8e5a1ba5b1a0d7cd90ced80d3793bc24e2ce7a5b4852cefae31af8731c5cf54cece48ada16c5dcb2713b - languageName: node - linkType: hard - -"@ethereumjs/tx@npm:^4.1.1": +"@ethereumjs/tx@npm:4.1.1, @ethereumjs/tx@npm:^4.0.0, @ethereumjs/tx@npm:^4.0.2, @ethereumjs/tx@npm:^4.1.1": version: 4.1.1 resolution: "@ethereumjs/tx@npm:4.1.1" dependencies: @@ -2088,6 +2058,16 @@ __metadata: languageName: node linkType: hard +"@ethereumjs/tx@npm:^3.3.0": + version: 3.5.1 + resolution: "@ethereumjs/tx@npm:3.5.1" + dependencies: + "@ethereumjs/common": ^2.6.3 + ethereumjs-util: ^7.1.4 + checksum: ed17780314592eca96f7aed392707b55af713964a9ac8e5a1ba5b1a0d7cd90ced80d3793bc24e2ce7a5b4852cefae31af8731c5cf54cece48ada16c5dcb2713b + languageName: node + linkType: hard + "@ethereumjs/util@npm:^8.0.0, @ethereumjs/util@npm:^8.0.2, @ethereumjs/util@npm:^8.0.5": version: 8.0.5 resolution: "@ethereumjs/util@npm:8.0.5" @@ -3310,17 +3290,17 @@ __metadata: languageName: node linkType: hard -"@keystonehq/base-eth-keyring@npm:^0.7.1": - version: 0.7.1 - resolution: "@keystonehq/base-eth-keyring@npm:0.7.1" +"@keystonehq/base-eth-keyring@npm:^0.10.2": + version: 0.10.2 + resolution: "@keystonehq/base-eth-keyring@npm:0.10.2" dependencies: - "@ethereumjs/tx": 3.5.1 + "@ethereumjs/tx": ^4.0.2 "@ethereumjs/util": ^8.0.0 - "@keystonehq/bc-ur-registry-eth": ^0.12.1 + "@keystonehq/bc-ur-registry-eth": ^0.15.2 hdkey: ^2.0.1 rlp: ^3.0.0 uuid: ^8.3.2 - checksum: c170be46fddbfe26a9500eb70c248160e15c71cdbd330b01705d5fc51313ae7bb314f4a9e731883b3e63943936394aba20bc30652173574be620e423b86129e2 + checksum: 689e204a70828508ed9ca9da8d943cf948c7f8e84c17053944f13cfbd69d2b96bb9694542fe48753cad7a985a2e9bd80e1fc0c7b5f78158e6dc7e8487ecec2d1 languageName: node linkType: hard @@ -3336,6 +3316,18 @@ __metadata: languageName: node linkType: hard +"@keystonehq/bc-ur-registry-eth@npm:^0.15.2": + version: 0.15.2 + resolution: "@keystonehq/bc-ur-registry-eth@npm:0.15.2" + dependencies: + "@ethereumjs/util": ^8.0.0 + "@keystonehq/bc-ur-registry": 0.5.4 + hdkey: ^2.0.1 + uuid: ^8.3.2 + checksum: 8541040c3eea59aa39d6a9b9f17acfe505956b01ffa977e54c51c14f45b6b8af4ca3dd594866934dd06939fbd752a3d5b1ba46e017df86362c2c67de52005860 + languageName: node + linkType: hard + "@keystonehq/bc-ur-registry@npm:0.5.0-alpha.5": version: 0.5.0-alpha.5 resolution: "@keystonehq/bc-ur-registry@npm:0.5.0-alpha.5" @@ -3347,6 +3339,17 @@ __metadata: languageName: node linkType: hard +"@keystonehq/bc-ur-registry@npm:0.5.4": + version: 0.5.4 + resolution: "@keystonehq/bc-ur-registry@npm:0.5.4" + dependencies: + "@ngraveio/bc-ur": ^1.1.5 + bs58check: ^2.1.2 + tslib: ^2.3.0 + checksum: d8e4b8c4cd2a7b21fad2e24895f7b32937b64f93d0f1540833be9dcb36062a44c8fc21204502f046c0e771370ba7ff6ce2356438028229813b4f15b2ecb714c6 + languageName: node + linkType: hard + "@keystonehq/bc-ur-registry@patch:@keystonehq/bc-ur-registry@npm%3A0.5.0-alpha.5#./.yarn/patches/@keystonehq-bc-ur-registry-npm-0.5.0-alpha.5-b95c7992a6.patch::locator=metamask-crx%40workspace%3A.": version: 0.5.0-alpha.5 resolution: "@keystonehq/bc-ur-registry@patch:@keystonehq/bc-ur-registry@npm%3A0.5.0-alpha.5#./.yarn/patches/@keystonehq-bc-ur-registry-npm-0.5.0-alpha.5-b95c7992a6.patch::version=0.5.0-alpha.5&hash=2b9ed1&locator=metamask-crx%40workspace%3A." @@ -3358,17 +3361,17 @@ __metadata: languageName: node linkType: hard -"@keystonehq/metamask-airgapped-keyring@npm:^0.6.1": - version: 0.6.1 - resolution: "@keystonehq/metamask-airgapped-keyring@npm:0.6.1" +"@keystonehq/metamask-airgapped-keyring@npm:^0.9.2": + version: 0.9.2 + resolution: "@keystonehq/metamask-airgapped-keyring@npm:0.9.2" dependencies: - "@ethereumjs/tx": ^3.3.0 - "@keystonehq/base-eth-keyring": ^0.7.1 - "@keystonehq/bc-ur-registry-eth": ^0.12.1 + "@ethereumjs/tx": ^4.0.2 + "@keystonehq/base-eth-keyring": ^0.10.2 + "@keystonehq/bc-ur-registry-eth": ^0.15.2 "@metamask/obs-store": ^7.0.0 rlp: ^2.2.6 uuid: ^8.3.2 - checksum: c01207728ce0003d0f6efe7e10c7339b513fdeb5c63c7d6bf916d663da9194a7b94d79f5d93b160d1270648dcd3996ee69e26b82786132db0f6570019a34fd58 + checksum: 6ac0868a26d152e51d4a9e7c02c197ec6a6bc0cb56f99ec211c10b28b9acb33cce903fa87297bbbe547c61417b81c59324ee95da96b2a8cd0a2daadc772f9d6e languageName: node linkType: hard @@ -3907,15 +3910,15 @@ __metadata: languageName: node linkType: hard -"@metamask/eth-ledger-bridge-keyring@npm:^0.13.0": - version: 0.13.0 - resolution: "@metamask/eth-ledger-bridge-keyring@npm:0.13.0" +"@metamask/eth-ledger-bridge-keyring@npm:^0.15.0": + version: 0.15.0 + resolution: "@metamask/eth-ledger-bridge-keyring@npm:0.15.0" dependencies: - "@ethereumjs/tx": ^3.2.0 + "@ethereumjs/tx": ^4.1.1 eth-sig-util: ^2.0.0 ethereumjs-util: ^7.0.9 hdkey: 0.8.0 - checksum: 6aa98c17cefad9b8d3b879d9b0ab2357a500a932a57c54ba8dadabf9e1153469346b929e49853523f2ff300293746ceb07c7941f2c17adaf3feef3f30e95619a + checksum: a4c7ec98904c95cbbbf8f6e3e07ba26ff0328e8d20a94bb8bc2c1da2a944306bcf741a77d85586f25ed8f8f90bb1308d87751e6046d9fb1e531221e2804110e2 languageName: node linkType: hard @@ -3933,19 +3936,6 @@ __metadata: languageName: node linkType: hard -"@metamask/eth-sig-util@npm:^4.0.0": - version: 4.0.0 - resolution: "@metamask/eth-sig-util@npm:4.0.0" - dependencies: - ethereumjs-abi: ^0.6.8 - ethereumjs-util: ^6.2.1 - ethjs-util: ^0.1.6 - tweetnacl: ^1.0.3 - tweetnacl-util: ^0.15.1 - checksum: 983fc1d4ba2d23d8d87024013edc38660456be978641087fa4c9ca4a1c8ea0cb33e5b6845153e3f8d76adf297d38479fcfd16ed871916fee8814cca05b85b458 - languageName: node - linkType: hard - "@metamask/eth-simple-keyring@npm:^5.0.0": version: 5.0.0 resolution: "@metamask/eth-simple-keyring@npm:5.0.0" @@ -3973,6 +3963,20 @@ __metadata: languageName: node linkType: hard +"@metamask/eth-trezor-keyring@npm:^1.0.0": + version: 1.0.0 + resolution: "@metamask/eth-trezor-keyring@npm:1.0.0" + dependencies: + "@ethereumjs/tx": ^4.0.0 + "@ethereumjs/util": ^8.0.0 + "@metamask/eth-sig-util": ^5.0.2 + "@trezor/connect-plugin-ethereum": ^9.0.1 + "@trezor/connect-web": ^9.0.6 + hdkey: 0.8.0 + checksum: fd7110ac7cd1f91f6fbb02718c2a03e7cc9940449c2382c1e7513b22a65f22905cd08c9d8dc3c87ac11d7a25cd092146f29cd6bc1b53b36694c5933bbb65ed41 + languageName: node + linkType: hard + "@metamask/etherscan-link@npm:^2.2.0": version: 2.2.0 resolution: "@metamask/etherscan-link@npm:2.2.0" @@ -6580,60 +6584,104 @@ __metadata: languageName: node linkType: hard -"@trezor/blockchain-link@npm:1.1.0": - version: 1.1.0 - resolution: "@trezor/blockchain-link@npm:1.1.0" +"@trezor/blockchain-link@npm:^2.1.8": + version: 2.1.8 + resolution: "@trezor/blockchain-link@npm:2.1.8" dependencies: - bignumber.js: ^9.0.1 - es6-promise: ^4.2.8 - events: ^3.2.0 - ripple-lib: 1.10.0 - tiny-worker: ^2.3.0 - ws: ^7.4.0 - checksum: 94766454d43b2907c4a814688e6659f064fb26a543fe54a72b7fb2b958bdd984d86720575c2a2b1efe6b34728d4b583b3e78f5169e754ae4ecc1625f2a280021 + "@trezor/utils": ^9.0.6 + "@trezor/utxo-lib": ^1.0.4 + "@types/web": ^0.0.91 + bignumber.js: ^9.1.1 + events: ^3.3.0 + ripple-lib: ^1.10.1 + socks-proxy-agent: 6.1.1 + ws: 7.5.9 + checksum: c24c7b1cd01d0bf71a9b3a66b053c0b212209599e2362b7166f2eb7e9ca8bc7a6cb377dbc83351b8d4406356a1d58beb32b2cdfd763b1b262ab4fa13eab1bb0c languageName: node linkType: hard -"@trezor/connect-common@npm:0.0.4": - version: 0.0.4 - resolution: "@trezor/connect-common@npm:0.0.4" - checksum: 7223d48e7d0a43184e2d5ddb1109a75af73e90f8713450cf411df8d9b0c5290ad2ff9e59e8ac92ec84bc926f48c2e1be27da9ac25c4f635a9fc96a442daf51fd +"@trezor/connect-common@npm:0.0.12": + version: 0.0.12 + resolution: "@trezor/connect-common@npm:0.0.12" + checksum: e35a7750eb5686cff53f3d11bd7be26a46f4d1bb95d22c9af3b270203a5aca0af239446cb4a50bb744e3a922dcf35976efb3839537337f63249656eb15eee65d languageName: node linkType: hard -"@trezor/rollout@npm:^1.2.1": - version: 1.2.1 - resolution: "@trezor/rollout@npm:1.2.1" - dependencies: - cross-fetch: ^3.1.4 - runtypes: ^5.0.1 - checksum: 00f32782d383e97596ad053fdb1638c8060acd34b1bd5a9d1482b72818a57587465f4f499b27ecc383d87c9f14e7db684934db3590da02d75637fb3c106f81e6 +"@trezor/connect-plugin-ethereum@npm:^9.0.1": + version: 9.0.1 + resolution: "@trezor/connect-plugin-ethereum@npm:9.0.1" + peerDependencies: + "@metamask/eth-sig-util": ^5.0.2 + checksum: 24ae4103d4873cc5ca083577ca0f561e983fa9eebd3c2bdb1de1ee1c509f773b9bca758a21c05043212aef997cd8544fc820f7b6764c0c43edb9ab77efbc10ae languageName: node linkType: hard -"@trezor/transport@npm:1.0.1": - version: 1.0.1 - resolution: "@trezor/transport@npm:1.0.1" +"@trezor/connect-web@npm:^9.0.6": + version: 9.0.7 + resolution: "@trezor/connect-web@npm:9.0.7" dependencies: + "@trezor/connect": 9.0.7 + "@trezor/utils": ^9.0.6 + events: ^3.3.0 + checksum: b2c02dc3c721d05cd07c7a6cef13be368fd510c2322c707778d87081022706fd5b9b70e94b3097b5496a52332eea9f548c272ac8e0a761359be18c9747fa26f4 + languageName: node + linkType: hard + +"@trezor/connect@npm:9.0.7": + version: 9.0.7 + resolution: "@trezor/connect@npm:9.0.7" + dependencies: + "@trezor/blockchain-link": ^2.1.8 + "@trezor/connect-common": 0.0.12 + "@trezor/transport": ^1.1.8 + "@trezor/utils": ^9.0.6 + "@trezor/utxo-lib": ^1.0.4 + bignumber.js: ^9.1.1 + blakejs: ^1.2.1 + bowser: ^2.11.0 + cross-fetch: ^3.1.5 + events: ^3.3.0 + parse-uri: 1.0.7 + randombytes: 2.1.0 + tslib: 2.5.0 + checksum: fb2a01e910872c2cf581c71e7d73d0ba92c5815bf379e12d360896fcadcff5304aaacec696c8ad66ce11a39a237cdea5d0517c9d39b90e99e45f4b8669987113 + languageName: node + linkType: hard + +"@trezor/transport@npm:^1.1.8": + version: 1.1.8 + resolution: "@trezor/transport@npm:1.1.8" + dependencies: + "@trezor/utils": ^9.0.6 bytebuffer: ^5.0.1 - json-stable-stringify: ^1.0.1 + json-stable-stringify: ^1.0.2 long: ^4.0.0 - protobufjs: ^6.11.2 - checksum: 0c495d669b80cd684d0fe825a401877c012d0fbffc5f3d7a30127b09308069beaa0be7b2a4718d667925a973c73f9cab6e22e2f33c4ac3f05de4a4704e776ee7 + prettier: 2.8.4 + protobufjs: ^6.11.3 + checksum: 6f5d49e0e9740548902517c66a1194e39747df02d4174b662c1b38ebc81e66522952adf9117a6321fe7628a224d3efb972850aaeb6586efea9658a761db5ed04 languageName: node linkType: hard -"@trezor/utxo-lib@npm:1.0.0-beta.10": - version: 1.0.0-beta.10 - resolution: "@trezor/utxo-lib@npm:1.0.0-beta.10" +"@trezor/utils@npm:^9.0.6": + version: 9.0.6 + resolution: "@trezor/utils@npm:9.0.6" + checksum: 634f3cd72c1928705f01c3570f77377d103f0b930166b0bc8f0998b46f540816427dd935b5b0bef6c3af49fcdccb2453bf00de18b1c001d3a037ffcce0874ffc + languageName: node + linkType: hard + +"@trezor/utxo-lib@npm:^1.0.4": + version: 1.0.4 + resolution: "@trezor/utxo-lib@npm:1.0.4" dependencies: + "@trezor/utils": ^9.0.6 bchaddrjs: ^0.5.2 bech32: ^2.0.0 bip66: ^1.1.5 bitcoin-ops: ^1.4.1 blake-hash: ^2.0.0 - bn.js: ^4.0.0 - bs58: ^4.0.1 + blakejs: ^1.2.1 + bn.js: ^5.2.1 + bs58: ^5.0.0 bs58check: ^2.1.2 create-hash: ^1.2.0 create-hmac: ^1.1.7 @@ -6643,7 +6691,7 @@ __metadata: typeforce: ^1.18.0 varuint-bitcoin: ^1.1.2 wif: ^2.0.6 - checksum: 2dee4c528c5c0686963b18b99b1672bf2090ed259a4e0f975541d78a6e4a1e1b7b523a02908436e5765bbe395f0623b38c24a234e07ca7f13c21ac2346cfdc82 + checksum: 0f46de171885552cfd3de5ddbd957be50969d73beef930d8bf4e2755276c308271f71ff416965646e5d0bcd5d2b0d0c20038314684a95af1d5bad019f37d1e9d languageName: node linkType: hard @@ -7686,6 +7734,13 @@ __metadata: languageName: node linkType: hard +"@types/uuid@npm:^9.0.0": + version: 9.0.1 + resolution: "@types/uuid@npm:9.0.1" + checksum: c472b8a77cbeded4bc529220b8611afa39bd64677f507838f8083d8aac8033b1f88cb9ddaa2f8589e0dcd2317291d0f6e1379f82d5ceebd6f74f3b4825288e00 + languageName: node + linkType: hard + "@types/vinyl-fs@npm:*": version: 2.4.12 resolution: "@types/vinyl-fs@npm:2.4.12" @@ -7732,6 +7787,13 @@ __metadata: languageName: node linkType: hard +"@types/web@npm:^0.0.91": + version: 0.0.91 + resolution: "@types/web@npm:0.0.91" + checksum: a1a493d0774475aed8ec0c55835bd0fcc6b272f1708b9daf403f77c6654728ce6bddb295bc71104fd5f159cc346ff765bc7b54e8c00a4af560f33fcc016f30cf + languageName: node + linkType: hard + "@types/webpack-env@npm:^1.16.0": version: 1.16.3 resolution: "@types/webpack-env@npm:1.16.3" @@ -10193,6 +10255,13 @@ __metadata: languageName: node linkType: hard +"base-x@npm:^4.0.0": + version: 4.0.0 + resolution: "base-x@npm:4.0.0" + checksum: b25db9e07eb1998472a20557c7f00c797dc0595f79df95155ab74274e7fa98b9f2659b3ee547ac8773666b7f69540656793aeb97ad2b1ceccdb6fa5faaf69ac0 + languageName: node + linkType: hard + "base32-encode@npm:^1.2.0": version: 1.2.0 resolution: "base32-encode@npm:1.2.0" @@ -10336,10 +10405,10 @@ __metadata: languageName: node linkType: hard -"bignumber.js@npm:^9.0.0, bignumber.js@npm:^9.0.1": - version: 9.1.0 - resolution: "bignumber.js@npm:9.1.0" - checksum: 52ec2bb5a3874d7dc1a1018f28f8f7aff4683515ffd09d6c2d93191343c76567ae0ee32cc45149d53afb2b904bc62ed471a307b35764beea7e9db78e56bef6c6 +"bignumber.js@npm:^9.0.0, bignumber.js@npm:^9.0.1, bignumber.js@npm:^9.1.1": + version: 9.1.1 + resolution: "bignumber.js@npm:9.1.1" + checksum: ad243b7e2f9120b112d670bb3d674128f0bd2ca1745b0a6c9df0433bd2c0252c43e6315d944c2ac07b4c639e7496b425e46842773cf89c6a2dcd4f31e5c4b11e languageName: node linkType: hard @@ -10422,7 +10491,7 @@ __metadata: languageName: node linkType: hard -"blakejs@npm:^1.1.0": +"blakejs@npm:^1.1.0, blakejs@npm:^1.2.1": version: 1.2.1 resolution: "blakejs@npm:1.2.1" checksum: d699ba116cfa21d0b01d12014a03e484dd76d483133e6dc9eb415aa70a119f08beb3bcefb8c71840106a00b542cba77383f8be60cd1f0d4589cb8afb922eefbe @@ -10991,6 +11060,15 @@ __metadata: languageName: node linkType: hard +"bs58@npm:^5.0.0": + version: 5.0.0 + resolution: "bs58@npm:5.0.0" + dependencies: + base-x: ^4.0.0 + checksum: 2475cb0684e07077521aac718e604a13e0f891d58cff923d437a2f7e9e28703ab39fce9f84c7c703ab369815a675f11e3bd394d38643bfe8969fbe42e6833d45 + languageName: node + linkType: hard + "bs58check@npm:2.1.2, bs58check@npm:<3.0.0, bs58check@npm:^2.1.2": version: 2.1.2 resolution: "bs58check@npm:2.1.2" @@ -11500,18 +11578,6 @@ __metadata: languageName: node linkType: hard -"cbor-web@npm:^7.0.6": - version: 7.0.6 - resolution: "cbor-web@npm:7.0.6" - peerDependencies: - bignumber.js: ^9.0.1 - peerDependenciesMeta: - bignumber.js: - optional: true - checksum: 101a33cfa4842c8ee2935a1d6385e61064d7a9790cb5bf4b27fabd364ed9613e6e9eb8b5d6d44a2cf1635bc8479c1bac2986a64b346021c2b79c07d750b771f8 - languageName: node - linkType: hard - "cbor@npm:^5.2.0": version: 5.2.0 resolution: "cbor@npm:5.2.0" @@ -12869,7 +12935,7 @@ __metadata: languageName: node linkType: hard -"cross-fetch@npm:^2.1.0, cross-fetch@npm:^3.1.4": +"cross-fetch@npm:^2.1.0, cross-fetch@npm:^3.1.5": version: 3.1.5 resolution: "cross-fetch@npm:3.1.5" dependencies: @@ -14721,13 +14787,6 @@ __metadata: languageName: node linkType: hard -"es6-promise@npm:^4.2.8": - version: 4.2.8 - resolution: "es6-promise@npm:4.2.8" - checksum: 95614a88873611cb9165a85d36afa7268af5c03a378b35ca7bda9508e1d4f1f6f19a788d4bc755b3fd37c8ebba40782018e02034564ff24c9d6fa37e959ad57d - languageName: node - linkType: hard - "es6-set@npm:^0.1.5, es6-set@npm:~0.1.5": version: 0.1.5 resolution: "es6-set@npm:0.1.5" @@ -15259,13 +15318,6 @@ __metadata: languageName: node linkType: hard -"esm@npm:^3.2.25": - version: 3.2.25 - resolution: "esm@npm:3.2.25" - checksum: 978aabe2de83541c105605a6d60a26ed8e627ef6bb0a7605fe15a95bbdea6b8348bd045255cb22219c054dd09a81a94823df00843d9e97f42419c92015ce3a64 - languageName: node - linkType: hard - "espree@npm:9.5.0": version: 9.5.0 resolution: "espree@npm:9.5.0" @@ -15480,17 +15532,17 @@ __metadata: languageName: node linkType: hard -"eth-lattice-keyring@npm:^0.12.3": - version: 0.12.3 - resolution: "eth-lattice-keyring@npm:0.12.3" +"eth-lattice-keyring@npm:^0.12.4": + version: 0.12.4 + resolution: "eth-lattice-keyring@npm:0.12.4" dependencies: - "@ethereumjs/tx": 3.3.0 + "@ethereumjs/tx": 4.1.1 "@ethereumjs/util": ^8.0.0 "@noble/secp256k1": ^1.7.0 bn.js: ^5.2.0 - gridplus-sdk: ^2.2.9 + gridplus-sdk: ^2.5.1 rlp: ^3.0.0 - checksum: a477240eea9927c85cc5d485b9f640a00a172f395b00591843120fb0f4bc7d62221d0dc27f237c7e0c2c741e8198d3f49428dbc2be5b4afcf112e1038192e733 + checksum: 4a9bdca08471bfc0440e41a2955571a849e9d512611e4e217e4b9c3e5cdf4d1cd51b4eb16fa06493015dd989cd4c4d346fe7e28d8d4720de0d18365dab02da77 languageName: node linkType: hard @@ -15584,19 +15636,6 @@ __metadata: languageName: node linkType: hard -"eth-trezor-keyring@npm:^0.10.0": - version: 0.10.0 - resolution: "eth-trezor-keyring@npm:0.10.0" - dependencies: - "@ethereumjs/tx": ^3.2.1 - "@metamask/eth-sig-util": ^4.0.0 - ethereumjs-util: ^7.0.9 - hdkey: 0.8.0 - trezor-connect: 8.2.6-extended - checksum: 19af3aa2b855aafd02f342367a17c33536ea2627a5b034e728c4dc0d80091da8b8bd44eaad84b1613a803c9b4850b877976bae7b56f34d24f22170750cdba2a0 - languageName: node - linkType: hard - "ethereum-bloom-filters@npm:^1.0.6": version: 1.0.7 resolution: "ethereum-bloom-filters@npm:1.0.7" @@ -15764,7 +15803,7 @@ __metadata: languageName: node linkType: hard -"ethereumjs-util@npm:^6.0.0, ethereumjs-util@npm:^6.2.1": +"ethereumjs-util@npm:^6.0.0": version: 6.2.1 resolution: "ethereumjs-util@npm:6.2.1" dependencies: @@ -18236,13 +18275,14 @@ __metadata: languageName: node linkType: hard -"gridplus-sdk@npm:^2.2.9": - version: 2.4.3 - resolution: "gridplus-sdk@npm:2.4.3" +"gridplus-sdk@npm:^2.5.1": + version: 2.5.1 + resolution: "gridplus-sdk@npm:2.5.1" dependencies: - "@ethereumjs/common": 2.4.0 - "@ethereumjs/tx": 3.3.0 + "@ethereumjs/common": 3.1.1 + "@ethereumjs/tx": 4.1.1 "@ethersproject/abi": ^5.5.0 + "@types/uuid": ^9.0.0 aes-js: ^3.1.1 bech32: ^2.0.0 bignumber.js: ^9.0.1 @@ -18258,7 +18298,7 @@ __metadata: rlp: ^3.0.0 secp256k1: 4.0.2 uuid: ^9.0.0 - checksum: 07cd99cdf9056168c5b703f56c6be69e771348a48af234c895e6acca68b29acb227c4b1a9f7ff53e45f676a08aca60c06bffd23dab408a7f6356b368c173abd2 + checksum: f5738cff0343c3af9ec51dbaa47b08f1b124880afa7e68de52375aa085c06c7d0cc1c016683d9aa681996c973aed24153c4902ea7f4b2040d6a95102e9e20ea7 languageName: node linkType: hard @@ -22129,12 +22169,12 @@ __metadata: languageName: node linkType: hard -"json-stable-stringify@npm:^1.0.0, json-stable-stringify@npm:^1.0.1": - version: 1.0.1 - resolution: "json-stable-stringify@npm:1.0.1" +"json-stable-stringify@npm:^1.0.0, json-stable-stringify@npm:^1.0.1, json-stable-stringify@npm:^1.0.2": + version: 1.0.2 + resolution: "json-stable-stringify@npm:1.0.2" dependencies: - jsonify: ~0.0.0 - checksum: 65d6cbf0fca72a4136999f65f4401cf39a129f7aeff0fdd987ac3d3423a2113659294045fb8377e6e20d865cac32b1b8d70f3d87346c9786adcee60661d96ca5 + jsonify: ^0.0.1 + checksum: ec10863493fb728481ed7576551382768a173d5b884758db530def00523b862083a3fd70fee24b39e2f47f5f502e22f9a1489dd66da3535b63bf6241dbfca800 languageName: node linkType: hard @@ -22220,10 +22260,10 @@ __metadata: languageName: node linkType: hard -"jsonify@npm:~0.0.0": - version: 0.0.0 - resolution: "jsonify@npm:0.0.0" - checksum: d8d4ed476c116e6987a460dcb82f22284686caae9f498ac87b0502c1765ac1522f4f450a4cad4cc368d202fd3b27a3860735140a82867fc6d558f5f199c38bce +"jsonify@npm:^0.0.1, jsonify@npm:~0.0.0": + version: 0.0.1 + resolution: "jsonify@npm:0.0.1" + checksum: 027287e1c0294fce15f18c0ff990cfc2318e7f01fb76515f784d5cd0784abfec6fc5c2355c3a2f2cb0ad7f4aa2f5b74ebbfe4e80476c35b2d13cabdb572e1134 languageName: node linkType: hard @@ -23922,8 +23962,8 @@ __metadata: "@babel/runtime": ^7.5.5 "@download/blockies": ^1.0.3 "@ensdomains/content-hash": ^2.5.6 - "@ethereumjs/common": ^2.3.1 - "@ethereumjs/tx": ^3.2.1 + "@ethereumjs/common": ^3.1.1 + "@ethereumjs/tx": ^4.1.1 "@ethersproject/abi": ^5.6.4 "@ethersproject/bignumber": ^5.7.0 "@ethersproject/contracts": ^5.7.0 @@ -23933,7 +23973,7 @@ __metadata: "@fortawesome/fontawesome-free": ^5.13.0 "@json-rpc-specification/meta-schema": ^1.0.6 "@keystonehq/bc-ur-registry-eth": ^0.12.1 - "@keystonehq/metamask-airgapped-keyring": ^0.6.1 + "@keystonehq/metamask-airgapped-keyring": ^0.9.2 "@lavamoat/allow-scripts": ^2.0.3 "@lavamoat/lavapack": ^5.0.0 "@lavamoat/snow": ^1.5.0 @@ -23957,8 +23997,9 @@ __metadata: "@metamask/eth-json-rpc-middleware": ^11.0.0 "@metamask/eth-json-rpc-provider": ^1.0.0 "@metamask/eth-keyring-controller": ^10.0.1 - "@metamask/eth-ledger-bridge-keyring": ^0.13.0 + "@metamask/eth-ledger-bridge-keyring": ^0.15.0 "@metamask/eth-token-tracker": ^4.0.0 + "@metamask/eth-trezor-keyring": ^1.0.0 "@metamask/etherscan-link": ^2.2.0 "@metamask/forwarder": ^1.1.0 "@metamask/gas-fee-controller": ^4.0.0 @@ -24101,12 +24142,11 @@ __metadata: eth-block-tracker: ^7.0.0 eth-ens-namehash: ^2.0.8 eth-json-rpc-filters: ^6.0.0 - eth-lattice-keyring: ^0.12.3 + eth-lattice-keyring: ^0.12.4 eth-method-registry: ^2.0.0 eth-query: ^2.1.2 eth-rpc-errors: ^4.0.2 eth-sig-util: ^3.0.0 - eth-trezor-keyring: ^0.10.0 ethereum-ens-network-map: ^1.0.2 ethereumjs-abi: ^0.6.4 ethereumjs-util: ^7.0.10 @@ -26541,10 +26581,10 @@ __metadata: languageName: node linkType: hard -"parse-uri@npm:^1.0.3": - version: 1.0.3 - resolution: "parse-uri@npm:1.0.3" - checksum: 842cabbde29ed047e7b2cb95eaca595e3e22b8ac712d973915a198a718199407e800d4bb71a6603d7169913eed84c3cd830666367048ef3d6eecbc0b2559d665 +"parse-uri@npm:1.0.7": + version: 1.0.7 + resolution: "parse-uri@npm:1.0.7" + checksum: 0d4386a586bda98bcdd041f9b1a7e9a6c16bc2ab198c90531f2d169eb2eb520477cc059a75c5cf0695eb3c9e69ff6b90793d07781ab83e2de1cbb255ec66e37f languageName: node linkType: hard @@ -27534,6 +27574,15 @@ __metadata: languageName: node linkType: hard +"prettier@npm:2.8.4, prettier@npm:^2.7.1": + version: 2.8.4 + resolution: "prettier@npm:2.8.4" + bin: + prettier: bin-prettier.js + checksum: c173064bf3df57b6d93d19aa98753b9b9dd7657212e33b41ada8e2e9f9884066bb9ca0b4005b89b3ab137efffdf8fbe0b462785aba20364798ff4303aadda57e + languageName: node + linkType: hard + "prettier@npm:>=2.2.1 <=2.3.0": version: 2.3.0 resolution: "prettier@npm:2.3.0" @@ -27543,15 +27592,6 @@ __metadata: languageName: node linkType: hard -"prettier@npm:^2.7.1": - version: 2.7.1 - resolution: "prettier@npm:2.7.1" - bin: - prettier: bin-prettier.js - checksum: 55a4409182260866ab31284d929b3cb961e5fdb91fe0d2e099dac92eaecec890f36e524b4c19e6ceae839c99c6d7195817579cdffc8e2c80da0cb794463a748b - languageName: node - linkType: hard - "pretty-error@npm:^2.1.1": version: 2.1.2 resolution: "pretty-error@npm:2.1.2" @@ -27790,7 +27830,7 @@ __metadata: languageName: node linkType: hard -"protobufjs@npm:^6.11.2": +"protobufjs@npm:^6.11.3": version: 6.11.3 resolution: "protobufjs@npm:6.11.3" dependencies: @@ -28147,7 +28187,7 @@ __metadata: languageName: node linkType: hard -"randombytes@npm:^2.0.0, randombytes@npm:^2.0.1, randombytes@npm:^2.0.5, randombytes@npm:^2.0.6, randombytes@npm:^2.1.0": +"randombytes@npm:2.1.0, randombytes@npm:^2.0.0, randombytes@npm:^2.0.1, randombytes@npm:^2.0.5, randombytes@npm:^2.0.6, randombytes@npm:^2.1.0": version: 2.1.0 resolution: "randombytes@npm:2.1.0" dependencies: @@ -29919,9 +29959,9 @@ __metadata: languageName: node linkType: hard -"ripple-lib@npm:1.10.0": - version: 1.10.0 - resolution: "ripple-lib@npm:1.10.0" +"ripple-lib@npm:^1.10.1": + version: 1.10.1 + resolution: "ripple-lib@npm:1.10.1" dependencies: "@types/lodash": ^4.14.136 "@types/ws": ^7.2.0 @@ -29934,7 +29974,7 @@ __metadata: ripple-keypairs: ^1.0.3 ripple-lib-transactionparser: 0.8.2 ws: ^7.2.0 - checksum: 622ba7657326a651c0d7c17be8abf599e3fd4911e4567c92fe338368598496fd0221ec73bcf76bc31d292ba3dc27d0caa145df89d6fc9fcb3284a2ffafe76fec + checksum: 6f021d8d69932ab835cb62beaf28164afa5d744ce4e6bd4658b4430d1576133ccb72e09927884c8ad47d9d327f015180463e50358768eb273c032b3c0ac1756e languageName: node linkType: hard @@ -30017,13 +30057,6 @@ __metadata: languageName: node linkType: hard -"runtypes@npm:^5.0.1": - version: 5.0.1 - resolution: "runtypes@npm:5.0.1" - checksum: f48ae7a9b60a019b0e1977d12ef6147054bb825c1d6bc2f5484464864165601c34032a9ead76a122f6511bc62783370b131bce5346a79df47a35d46b1760b7a8 - languageName: node - linkType: hard - "rustbn.js@npm:~0.2.0": version: 0.2.0 resolution: "rustbn.js@npm:0.2.0" @@ -30943,6 +30976,17 @@ __metadata: languageName: node linkType: hard +"socks-proxy-agent@npm:6.1.1": + version: 6.1.1 + resolution: "socks-proxy-agent@npm:6.1.1" + dependencies: + agent-base: ^6.0.2 + debug: ^4.3.1 + socks: ^2.6.1 + checksum: 9a8a4f791bba0060315cf7291ca6f9db37d6fc280fd0860d73d8887d3efe4c22e823aa25a8d5375f6079279f8dc91b50c075345179bf832bfe3c7c26d3582e3c + languageName: node + linkType: hard + "socks-proxy-agent@npm:^7.0.0": version: 7.0.0 resolution: "socks-proxy-agent@npm:7.0.0" @@ -32638,15 +32682,6 @@ __metadata: languageName: node linkType: hard -"tiny-worker@npm:^2.3.0": - version: 2.3.0 - resolution: "tiny-worker@npm:2.3.0" - dependencies: - esm: ^3.2.25 - checksum: 33492c9b0623e064dd39bc64d61e7031a3ba146ed1d6de179c3f8c2e3b965061e204e602c0b019fa363ccca1e6939fc2e8d03c4ad070450cc491d47cd5382409 - languageName: node - linkType: hard - "title-case@npm:^2.1.0": version: 2.1.1 resolution: "title-case@npm:2.1.1" @@ -32843,27 +32878,6 @@ __metadata: languageName: node linkType: hard -"trezor-connect@npm:8.2.6-extended": - version: 8.2.6-extended - resolution: "trezor-connect@npm:8.2.6-extended" - dependencies: - "@babel/runtime": ^7.15.4 - "@trezor/blockchain-link": 1.1.0 - "@trezor/connect-common": 0.0.4 - "@trezor/rollout": ^1.2.1 - "@trezor/transport": 1.0.1 - "@trezor/utxo-lib": 1.0.0-beta.10 - bignumber.js: ^9.0.1 - bowser: ^2.11.0 - cbor-web: ^7.0.6 - cross-fetch: ^3.1.4 - events: ^3.3.0 - parse-uri: ^1.0.3 - tiny-worker: ^2.3.0 - checksum: d4149ad7f1722447e3b2ebc4f7d895e90a5afa69207cf99c00a50c38d95b379de3e8cc826cd443c14bf8154e3e2f582227d3282d1dcccf7ccb8a8e2bbdfdf48b - languageName: node - linkType: hard - "trim-newlines@npm:^3.0.0": version: 3.0.1 resolution: "trim-newlines@npm:3.0.1" @@ -32974,6 +32988,13 @@ __metadata: languageName: node linkType: hard +"tslib@npm:2.5.0, tslib@npm:^2.0.0, tslib@npm:^2.0.1, tslib@npm:^2.0.3, tslib@npm:^2.1.0, tslib@npm:^2.3.0, tslib@npm:^2.4.0": + version: 2.5.0 + resolution: "tslib@npm:2.5.0" + checksum: ae3ed5f9ce29932d049908ebfdf21b3a003a85653a9a140d614da6b767a93ef94f460e52c3d787f0e4f383546981713f165037dc2274df212ea9f8a4541004e1 + languageName: node + linkType: hard + "tslib@npm:^1.8.1, tslib@npm:^1.9.0, tslib@npm:^1.9.3": version: 1.14.1 resolution: "tslib@npm:1.14.1" @@ -32981,13 +33002,6 @@ __metadata: languageName: node linkType: hard -"tslib@npm:^2.0.0, tslib@npm:^2.0.1, tslib@npm:^2.0.3, tslib@npm:^2.1.0, tslib@npm:^2.3.0, tslib@npm:^2.4.0": - version: 2.4.1 - resolution: "tslib@npm:2.4.1" - checksum: 19480d6e0313292bd6505d4efe096a6b31c70e21cf08b5febf4da62e95c265c8f571f7b36fcc3d1a17e068032f59c269fab3459d6cd3ed6949eafecf64315fca - languageName: node - linkType: hard - "tslib@npm:~2.0.1": version: 2.0.3 resolution: "tslib@npm:2.0.3" @@ -34983,7 +34997,7 @@ __metadata: languageName: node linkType: hard -"ws@npm:7.4.6, ws@npm:^7, ws@npm:^7.2.0, ws@npm:^7.3.1, ws@npm:^7.4.0, ws@npm:^7.4.6": +"ws@npm:7.4.6": version: 7.4.6 resolution: "ws@npm:7.4.6" peerDependencies: @@ -34998,6 +35012,21 @@ __metadata: languageName: node linkType: hard +"ws@npm:7.5.9, ws@npm:^7, ws@npm:^7.2.0, ws@npm:^7.3.1, ws@npm:^7.4.6": + version: 7.5.9 + resolution: "ws@npm:7.5.9" + peerDependencies: + bufferutil: ^4.0.1 + utf-8-validate: ^5.0.2 + peerDependenciesMeta: + bufferutil: + optional: true + utf-8-validate: + optional: true + checksum: c3c100a181b731f40b7f2fddf004aa023f79d64f489706a28bc23ff88e87f6a64b3c6651fbec3a84a53960b75159574d7a7385709847a62ddb7ad6af76f49138 + languageName: node + linkType: hard + "ws@npm:^5.1.1": version: 5.2.3 resolution: "ws@npm:5.2.3"